Index: head/sysutils/google-compute-engine-oslogin/files/patch-pam__module_pam__oslogin__admin.cc =================================================================== --- head/sysutils/google-compute-engine-oslogin/files/patch-pam__module_pam__oslogin__admin.cc (revision 501378) +++ head/sysutils/google-compute-engine-oslogin/files/patch-pam__module_pam__oslogin__admin.cc (nonexistent) @@ -1,28 +0,0 @@ ---- pam_module/pam_oslogin_admin.cc.orig 2019-01-24 19:28:43 UTC -+++ pam_module/pam_oslogin_admin.cc -@@ -14,7 +14,6 @@ - - #define PAM_SM_ACCOUNT - #include --#include - #include - #include - #include -@@ -50,7 +49,7 @@ PAM_EXTERN int pam_sm_acct_mgmt(pam_handle_t *pamh, in - int pam_result = PAM_SUCCESS; - const char *user_name; - if ((pam_result = pam_get_user(pamh, &user_name, NULL)) != PAM_SUCCESS) { -- pam_syslog(pamh, LOG_INFO, "Could not get pam user."); -+ syslog(LOG_INFO, "Could not get pam user."); - return pam_result; - } - -@@ -81,7 +80,7 @@ PAM_EXTERN int pam_sm_acct_mgmt(pam_handle_t *pamh, in - if (HttpGet(url.str(), &response, &http_code) && http_code == 200 && - ParseJsonToSuccess(response)) { - if (!file_exists) { -- pam_syslog(pamh, LOG_INFO, -+ syslog(LOG_INFO, - "Granting sudo permissions to organization user %s.", - user_name); - std::ofstream sudoers_file; Property changes on: head/sysutils/google-compute-engine-oslogin/files/patch-pam__module_pam__oslogin__admin.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/google-compute-engine-oslogin/files/patch-utils_oslogin__utils.cc =================================================================== --- head/sysutils/google-compute-engine-oslogin/files/patch-utils_oslogin__utils.cc (revision 501378) +++ head/sysutils/google-compute-engine-oslogin/files/patch-utils_oslogin__utils.cc (nonexistent) @@ -1,29 +0,0 @@ ---- utils/oslogin_utils.cc.orig 2019-01-24 19:28:43 UTC -+++ utils/oslogin_utils.cc -@@ -23,8 +23,7 @@ - #include - #include - --#ifdef __GNUC__ --#if __GNUC__ > 4 || \ -+#if defined(__clang__) || __GNUC__ > 4 || \ - (__GNUC__ == 4 && (__GNUC_MINOR__ > 9 || \ - (__GNUC_MINOR__ == 9 && \ - __GNUC_PATCHLEVEL__ > 0))) -@@ -34,7 +33,6 @@ - #include - #define Regex boost - #endif --#endif - - #include "oslogin_utils.h" - -@@ -292,7 +290,7 @@ bool ValidatePasswd(struct passwd* result, BufferManag - } - } - if (strlen(result->pw_shell) == 0) { -- if (!buf->AppendString("/bin/bash", &result->pw_shell, errnop)) { -+ if (!buf->AppendString("/bin/sh", &result->pw_shell, errnop)) { - return false; - } - } Property changes on: head/sysutils/google-compute-engine-oslogin/files/patch-utils_oslogin__utils.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/google-compute-engine-oslogin/files/patch-nss__cache_nss__cache.cc =================================================================== --- head/sysutils/google-compute-engine-oslogin/files/patch-nss__cache_nss__cache.cc (revision 501378) +++ head/sysutils/google-compute-engine-oslogin/files/patch-nss__cache_nss__cache.cc (nonexistent) @@ -1,13 +0,0 @@ ---- nss_cache/nss_cache.cc.orig 2018-06-11 17:16:50 UTC -+++ nss_cache/nss_cache.cc -@@ -31,8 +31,8 @@ using oslogin_utils::MutexLock; - using oslogin_utils::NssCache; - - // File paths for the nss cache file. --static const char kDefaultFilePath[] = "/etc/oslogin_passwd.cache"; --static const char kDefaultBackupFilePath[] = "/etc/oslogin_passwd.cache.bak"; -+static const char kDefaultFilePath[] = "%%PREFIX%%/etc/oslogin_passwd.cache"; -+static const char kDefaultBackupFilePath[] = "%%PREFIX%%/etc/oslogin_passwd.cache.bak"; - - // Local NSS Cache size. This affects the maximum number of passwd entries per - // http request. Property changes on: head/sysutils/google-compute-engine-oslogin/files/patch-nss__cache_nss__cache.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/google-compute-engine-oslogin/files/patch-pam__module_pam__oslogin__login.cc =================================================================== --- head/sysutils/google-compute-engine-oslogin/files/patch-pam__module_pam__oslogin__login.cc (revision 501378) +++ head/sysutils/google-compute-engine-oslogin/files/patch-pam__module_pam__oslogin__login.cc (nonexistent) @@ -1,89 +0,0 @@ ---- pam_module/pam_oslogin_login.cc.orig 2019-02-20 12:34:55 UTC -+++ pam_module/pam_oslogin_login.cc -@@ -14,7 +14,6 @@ - - #define PAM_SM_ACCOUNT - #include --#include - #include - #include - #include -@@ -53,7 +52,7 @@ PAM_EXTERN int pam_sm_acct_mgmt(pam_handle_t *pamh, in - int pam_result = PAM_PERM_DENIED; - const char *user_name; - if ((pam_result = pam_get_user(pamh, &user_name, NULL)) != PAM_SUCCESS) { -- pam_syslog(pamh, LOG_INFO, "Could not get pam user."); -+ syslog(LOG_INFO, "Could not get pam user."); - return pam_result; - } - string str_user_name(user_name); -@@ -100,7 +99,7 @@ PAM_EXTERN int pam_sm_acct_mgmt(pam_handle_t *pamh, in - chown(users_filename.c_str(), 0, 0); - chmod(users_filename.c_str(), S_IRUSR | S_IWUSR | S_IRGRP); - } -- pam_syslog(pamh, LOG_INFO, -+ syslog(LOG_INFO, - "Granting login permission for organization user %s.", - user_name); - pam_result = PAM_SUCCESS; -@@ -108,7 +107,7 @@ PAM_EXTERN int pam_sm_acct_mgmt(pam_handle_t *pamh, in - if (file_exists) { - remove(users_filename.c_str()); - } -- pam_syslog(pamh, LOG_INFO, -+ syslog(LOG_INFO, - "Denying login permission for organization user %s.", - user_name); - -@@ -128,7 +127,7 @@ PAM_EXTERN int pam_sm_authenticate(pam_handle_t * pamh - { - const char* user_name; - if (pam_get_user(pamh, &user_name, NULL) != PAM_SUCCESS) { -- pam_syslog(pamh, LOG_INFO, "Could not get pam user."); -+ syslog(LOG_INFO, "Could not get pam user."); - return PAM_PERM_DENIED; - } - -@@ -155,7 +154,7 @@ PAM_EXTERN int pam_sm_authenticate(pam_handle_t * pamh - - response = ""; - if (!StartSession(email, &response)) { -- pam_syslog(pamh, LOG_ERR, -+ syslog(LOG_ERR, - "Bad response from the two-factor start session request: %s", - response.empty() ? "empty response" : response.c_str()); - return PAM_PERM_DENIED; -@@ -163,7 +162,7 @@ PAM_EXTERN int pam_sm_authenticate(pam_handle_t * pamh - - string status; - if (!ParseJsonToKey(response, "status", &status)) { -- pam_syslog(pamh, LOG_ERR, -+ syslog(LOG_ERR, - "Failed to parse status from start session response"); - return PAM_PERM_DENIED; - } -@@ -179,7 +178,7 @@ PAM_EXTERN int pam_sm_authenticate(pam_handle_t * pamh - - std::vector challenges; - if (!ParseJsonToChallenges(response, &challenges)) { -- pam_syslog(pamh, LOG_ERR, -+ syslog(LOG_ERR, - "Failed to parse challenge values from JSON response"); - return PAM_PERM_DENIED; - } -@@ -242,13 +241,13 @@ PAM_EXTERN int pam_sm_authenticate(pam_handle_t * pamh - pam_error(pamh, "Unable to get user input"); - } - } else { -- pam_syslog(pamh, LOG_ERR, "Unsupported challenge type %s", -+ syslog(LOG_ERR, "Unsupported challenge type %s", - challenge.type.c_str()); - return PAM_PERM_DENIED; - } - - if (!ContinueSession(email, user_token, session_id, challenge, &response)) { -- pam_syslog(pamh, LOG_ERR, -+ syslog(LOG_ERR, - "Bad response from two-factor continue session request: %s", - response.empty() ? "empty response" : response.c_str()); - return PAM_PERM_DENIED; Property changes on: head/sysutils/google-compute-engine-oslogin/files/patch-pam__module_pam__oslogin__login.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/google-compute-engine-oslogin/files/patch-libnss__cache__oslogin_nss__cache__oslogin.c =================================================================== --- head/sysutils/google-compute-engine-oslogin/files/patch-libnss__cache__oslogin_nss__cache__oslogin.c (revision 501378) +++ head/sysutils/google-compute-engine-oslogin/files/patch-libnss__cache__oslogin_nss__cache__oslogin.c (nonexistent) @@ -1,47 +0,0 @@ ---- libnss_cache_oslogin/nss_cache_oslogin.c.orig 2018-10-11 16:53:23 UTC -+++ libnss_cache_oslogin/nss_cache_oslogin.c -@@ -16,6 +16,7 @@ - - #include "nss_cache_oslogin.h" - -+#include - #include - - // Locking implementation: use pthreads. -@@ -32,7 +33,7 @@ static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZ - - static FILE *p_file = NULL; - static char p_filename[NSS_CACHE_OSLOGIN_PATH_LENGTH] = -- "/etc/oslogin_passwd.cache"; -+ "%%PREFIX%%/etc/oslogin_passwd.cache"; - #ifdef BSD - extern int fgetpwent_r(FILE *, struct passwd *, char *, size_t, - struct passwd **); -@@ -434,4 +435,27 @@ enum nss_status _nss_cache_oslogin_getpwnam_r(const ch - NSS_CACHE_OSLOGIN_UNLOCK(); - - return ret; -+} -+ -+NSS_METHOD_PROTOTYPE(__nss_compat_getpwnam_r); -+NSS_METHOD_PROTOTYPE(__nss_compat_getpwuid_r); -+NSS_METHOD_PROTOTYPE(__nss_compat_getpwent_r); -+NSS_METHOD_PROTOTYPE(__nss_compat_setpwent); -+NSS_METHOD_PROTOTYPE(__nss_compat_endpwent); -+ -+static ns_mtab methods[] = { -+ { NSDB_PASSWD, "getpwnam_r", __nss_compat_getpwnam_r, (void*)_nss_cache_oslogin_getpwnam_r }, -+ { NSDB_PASSWD, "getpwuid_r", __nss_compat_getpwuid_r, (void*)_nss_cache_oslogin_getpwuid_r }, -+ { NSDB_PASSWD, "getpwent_r", __nss_compat_getpwent_r, (void*)_nss_cache_oslogin_getpwent_r }, -+ { NSDB_PASSWD, "endpwent", __nss_compat_endpwent, (void*)_nss_cache_oslogin_endpwent }, -+ { NSDB_PASSWD, "setpwent", __nss_compat_setpwent, (void*)_nss_cache_oslogin_setpwent }, -+}; -+ -+ns_mtab * -+nss_module_register (const char *name, unsigned int *size, -+ nss_module_unregister_fn *unregister) -+{ -+ *size = sizeof (methods) / sizeof (methods[0]); -+ *unregister = NULL; -+ return (methods); - } Property changes on: head/sysutils/google-compute-engine-oslogin/files/patch-libnss__cache__oslogin_nss__cache__oslogin.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/google-compute-engine-oslogin/files/patch-nss__module_nss__oslogin.cc =================================================================== --- head/sysutils/google-compute-engine-oslogin/files/patch-nss__module_nss__oslogin.cc (revision 501378) +++ head/sysutils/google-compute-engine-oslogin/files/patch-nss__module_nss__oslogin.cc (nonexistent) @@ -1,41 +0,0 @@ ---- nss_module/nss_oslogin.cc.orig 2018-10-11 16:53:23 UTC -+++ nss_module/nss_oslogin.cc -@@ -16,6 +16,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -103,4 +104,30 @@ int _nss_oslogin_getpwnam_r(const char *name, struct p - // nss_getpwent_r() is intentionally left unimplemented. This functionality is - // now covered by the nss_cache binary and nss_cache module. - -+void _nss_oslogin_getpwent_r() {} -+void _nss_oslogin_endpwent() {} -+void _nss_oslogin_setpwent() {} -+ -+NSS_METHOD_PROTOTYPE(__nss_compat_getpwnam_r); -+NSS_METHOD_PROTOTYPE(__nss_compat_getpwuid_r); -+NSS_METHOD_PROTOTYPE(__nss_compat_getpwent_r); -+NSS_METHOD_PROTOTYPE(__nss_compat_setpwent); -+NSS_METHOD_PROTOTYPE(__nss_compat_endpwent); -+ -+static ns_mtab methods[] = { -+ { NSDB_PASSWD, "getpwnam_r", __nss_compat_getpwnam_r, (void*)_nss_oslogin_getpwnam_r }, -+ { NSDB_PASSWD, "getpwuid_r", __nss_compat_getpwuid_r, (void*)_nss_oslogin_getpwuid_r }, -+ { NSDB_PASSWD, "getpwent_r", __nss_compat_getpwent_r, (void*)_nss_oslogin_getpwent_r }, -+ { NSDB_PASSWD, "endpwent", __nss_compat_endpwent, (void*)_nss_oslogin_endpwent }, -+ { NSDB_PASSWD, "setpwent", __nss_compat_setpwent, (void*)_nss_oslogin_setpwent }, -+}; -+ -+ns_mtab * -+nss_module_register (const char *name, unsigned int *size, -+ nss_module_unregister_fn *unregister) -+{ -+ *size = sizeof (methods) / sizeof (methods[0]); -+ *unregister = NULL; -+ return (methods); -+} - } // extern "C" Property changes on: head/sysutils/google-compute-engine-oslogin/files/patch-nss__module_nss__oslogin.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/google-compute-engine-oslogin/Makefile =================================================================== --- head/sysutils/google-compute-engine-oslogin/Makefile (revision 501378) +++ head/sysutils/google-compute-engine-oslogin/Makefile (revision 501379) @@ -1,48 +1,50 @@ # $FreeBSD$ PORTNAME= google-compute-engine-oslogin -DISTVERSION= 1.4.3 +DISTVERSION= 1.5.2 CATEGORIES= sysutils -MAINTAINER= helen.koike@collabora.com +MAINTAINER= lucas.kanashiro@collabora.com COMMENT= OS Login Guest Environment for Google Compute Engine LICENSE= APACHE20 -LICENSE_FILE= ${WRKSRC}/../LICENSE +LICENSE_FILE= ${WRKSRC}/../../LICENSE LIB_DEPENDS= libcurl.so:ftp/curl \ libjson-c.so:devel/json-c RUN_DEPENDS= gsed:textproc/gsed \ ${LOCALBASE}/lib/pam_mkhomedir.so:security/pam_mkhomedir USES= compiler:c++11-lang gmake localbase:ldflags USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= GoogleCloudPlatform GH_PROJECT= compute-image-packages -GH_TAGNAME= 20190124 +GH_TAGNAME= 20190416 + MAKE_ARGS= JSON_INCLUDE_PATH=${LOCALBASE}/include/json-c \ BIN_INSTALL_PATH=/bin \ PAM_INSTALL_PATH=/lib \ AUTHKEYS_INSTALL_PATH=/bin \ NSS_LIBRARY_SONAME=nss_oslogin.so.1 -WRKSRC_SUBDIR= google_compute_engine_oslogin +WRKSRC_SUBDIR= packages/google-compute-engine-oslogin PLIST_SUB= DISTVERSION=${DISTVERSION} post-patch: @${REINPLACE_CMD} -e 's!%%PREFIX%%!${PREFIX}!' \ ${WRKSRC}/bin/google_oslogin_control \ ${WRKSRC}/libnss_cache_oslogin/nss_cache_oslogin.c \ ${WRKSRC}/nss_cache/nss_cache.cc post-install: ${LN} -sf libnss_${PORTNAME}-${DISTVERSION}.so ${STAGEDIR}${PREFIX}/lib/nss_oslogin.so.1 ${LN} -sf libnss_cache_${PORTNAME}-${DISTVERSION}.so ${STAGEDIR}${PREFIX}/lib/nss_cache_oslogin.so.1 ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/google_authorized_keys \ ${STAGEDIR}${PREFIX}/lib/libnss_google-compute-engine-oslogin-${DISTVERSION}.so \ + ${STAGEDIR}${PREFIX}/lib/libnss_cache_google-compute-engine-oslogin-${DISTVERSION}.so \ ${STAGEDIR}${PREFIX}/lib/pam_oslogin_admin.so \ ${STAGEDIR}${PREFIX}/lib/pam_oslogin_login.so .include Index: head/sysutils/google-compute-engine-oslogin/distinfo =================================================================== --- head/sysutils/google-compute-engine-oslogin/distinfo (revision 501378) +++ head/sysutils/google-compute-engine-oslogin/distinfo (revision 501379) @@ -1,3 +1,3 @@ -TIMESTAMP = 1550662804 -SHA256 (GoogleCloudPlatform-compute-image-packages-1.4.3-20190124_GH0.tar.gz) = 09637f951245729c66eb5b7b9ed49bead31349b29829baf5c8a4e5d45405a2f4 -SIZE (GoogleCloudPlatform-compute-image-packages-1.4.3-20190124_GH0.tar.gz) = 126211 +TIMESTAMP = 1556630405 +SHA256 (GoogleCloudPlatform-compute-image-packages-1.5.2-20190416_GH0.tar.gz) = cef65af726b7c32db9035266804e0393b54196fabd1007026554bae2d9540de4 +SIZE (GoogleCloudPlatform-compute-image-packages-1.5.2-20190416_GH0.tar.gz) = 130216