Date: Fri, 6 Apr 2018 20:00:08 +0000 (UTC) From: Steve Wills <swills@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r466686 - in head/sysutils/google-compute-engine-oslogin: . files Message-ID: <201804062000.w36K08GO043508@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: swills Date: Fri Apr 6 20:00:08 2018 New Revision: 466686 URL: https://svnweb.freebsd.org/changeset/ports/466686 Log: sysutils/google-compute-engine-oslogin: update to version 1.1.5 PR: 226936 Submitted by: Helen Koike <helen.koike@collabora.com> (maintainer) Deleted: head/sysutils/google-compute-engine-oslogin/files/patch-Makefile Modified: head/sysutils/google-compute-engine-oslogin/Makefile (contents, props changed) head/sysutils/google-compute-engine-oslogin/distinfo (contents, props changed) head/sysutils/google-compute-engine-oslogin/files/patch-bin_google__oslogin__control (contents, props changed) head/sysutils/google-compute-engine-oslogin/files/patch-nss__module_nss__oslogin.cc (contents, props changed) head/sysutils/google-compute-engine-oslogin/files/patch-pam__module_pam__oslogin__admin.cc (contents, props changed) head/sysutils/google-compute-engine-oslogin/files/patch-pam__module_pam__oslogin__login.cc (contents, props changed) head/sysutils/google-compute-engine-oslogin/files/patch-utils_oslogin__utils.cc (contents, props changed) Modified: head/sysutils/google-compute-engine-oslogin/Makefile ============================================================================== --- head/sysutils/google-compute-engine-oslogin/Makefile Fri Apr 6 19:17:44 2018 (r466685) +++ head/sysutils/google-compute-engine-oslogin/Makefile Fri Apr 6 20:00:08 2018 (r466686) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= google-compute-engine-oslogin -DISTVERSION= 1.1.2 -PORTREVISION= 1 +DISTVERSION= 1.1.5 CATEGORIES= sysutils MAINTAINER= helen.koike@collabora.com @@ -22,7 +21,7 @@ USE_GCC= any USE_GITHUB= yes GH_ACCOUNT= GoogleCloudPlatform GH_PROJECT= compute-image-packages -GH_TAGNAME= 20171213 +GH_TAGNAME= 20180227 MAKE_ARGS= JSON_INCLUDE_PATH=${LOCALBASE}/include/json-c \ BIN_INSTALL_PATH=/bin \ PAM_INSTALL_PATH=/lib \ Modified: head/sysutils/google-compute-engine-oslogin/distinfo ============================================================================== --- head/sysutils/google-compute-engine-oslogin/distinfo Fri Apr 6 19:17:44 2018 (r466685) +++ head/sysutils/google-compute-engine-oslogin/distinfo Fri Apr 6 20:00:08 2018 (r466686) @@ -1,3 +1,3 @@ -TIMESTAMP = 1514471176 -SHA256 (GoogleCloudPlatform-compute-image-packages-1.1.2-20171213_GH0.tar.gz) = 483d97c6d64cd7d9002247db63af8cb591e526a09ce52fd8d545c66da3ebb181 -SIZE (GoogleCloudPlatform-compute-image-packages-1.1.2-20171213_GH0.tar.gz) = 131055 +TIMESTAMP = 1522046585 +SHA256 (GoogleCloudPlatform-compute-image-packages-1.1.5-20180227_GH0.tar.gz) = 80e8c8059273f76e82343993a0282c51b633ba8c8dc5a14664919ee1b9e0fbaf +SIZE (GoogleCloudPlatform-compute-image-packages-1.1.5-20180227_GH0.tar.gz) = 135485 Modified: head/sysutils/google-compute-engine-oslogin/files/patch-bin_google__oslogin__control ============================================================================== --- head/sysutils/google-compute-engine-oslogin/files/patch-bin_google__oslogin__control Fri Apr 6 19:17:44 2018 (r466685) +++ head/sysutils/google-compute-engine-oslogin/files/patch-bin_google__oslogin__control Fri Apr 6 20:00:08 2018 (r466686) @@ -1,6 +1,6 @@ ---- bin/google_oslogin_control.orig 2017-12-13 23:47:59 UTC +--- bin/google_oslogin_control.orig 2018-02-27 22:53:04 UTC +++ bin/google_oslogin_control -@@ -65,29 +65,31 @@ overwrite_file() { +@@ -65,22 +65,24 @@ overwrite_file() { remove_from_config() { config=$1 @@ -30,17 +30,20 @@ } add_to_pam_config() { - remove_from_config ${pam_config} -- sed -i "/account.*pam_nologin.so/ a${added_comment}\n${pam_admin}" ${pam_config}.new -- sed -i "/account.*pam_nologin.so/ a${added_comment}\n${pam_login}" ${pam_config}.new -- sed -i "/pam_loginuid.so/ a${added_comment}\n${pam_homedir}" ${pam_config}.new -+ gsed -i "/account.*pam_nologin.so/ a${added_comment}\n${pam_admin}" ${pam_config}.new -+ gsed -i "/account.*pam_nologin.so/ a${added_comment}\n${pam_login}" ${pam_config}.new -+ gsed -i "/session.*pam_permit.so/ a${added_comment}\n${pam_homedir}" ${pam_config}.new +@@ -97,9 +99,9 @@ ${pam_homedir} + " + echo "${added_config}$(cat ${pam_config}.new)" > ${pam_config}.new + else +- sed -i "/account.*pam_nologin.so/ a${added_comment}\n${pam_admin}" ${pam_config}.new +- sed -i "/account.*pam_nologin.so/ a${added_comment}\n${pam_login}" ${pam_config}.new +- sed -i "/pam_loginuid.so/ a${added_comment}\n${pam_homedir}" ${pam_config}.new ++ gsed -i "/account.*pam_nologin.so/ a${added_comment}\n${pam_admin}" ${pam_config}.new ++ gsed -i "/account.*pam_nologin.so/ a${added_comment}\n${pam_login}" ${pam_config}.new ++ gsed -i "/session.*pam_permit.so/ a${added_comment}\n${pam_homedir}" ${pam_config}.new + fi } - restart_service() { -@@ -100,7 +102,7 @@ restart_service() { +@@ -113,7 +115,7 @@ restart_service() { fi fi if which service > /dev/null 2>&1; then Modified: 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 Fri Apr 6 19:17:44 2018 (r466685) +++ head/sysutils/google-compute-engine-oslogin/files/patch-nss__module_nss__oslogin.cc Fri Apr 6 20:00:08 2018 (r466686) @@ -1,4 +1,4 @@ ---- nss_module/nss_oslogin.cc.orig 2017-12-13 23:47:59 UTC +--- nss_module/nss_oslogin.cc.orig 2018-02-27 22:53:04 UTC +++ nss_module/nss_oslogin.cc @@ -16,6 +16,7 @@ #include <errno.h> Modified: 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 Fri Apr 6 19:17:44 2018 (r466685) +++ head/sysutils/google-compute-engine-oslogin/files/patch-pam__module_pam__oslogin__admin.cc Fri Apr 6 20:00:08 2018 (r466686) @@ -1,4 +1,4 @@ ---- pam_module/pam_oslogin_admin.cc.orig 2017-12-13 23:47:59 UTC +--- pam_module/pam_oslogin_admin.cc.orig 2018-02-27 22:53:04 UTC +++ pam_module/pam_oslogin_admin.cc @@ -14,7 +14,6 @@ Modified: 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 Fri Apr 6 19:17:44 2018 (r466685) +++ head/sysutils/google-compute-engine-oslogin/files/patch-pam__module_pam__oslogin__login.cc Fri Apr 6 20:00:08 2018 (r466686) @@ -1,4 +1,4 @@ ---- pam_module/pam_oslogin_login.cc.orig 2017-12-13 23:47:59 UTC +--- pam_module/pam_oslogin_login.cc.orig 2018-02-27 22:53:04 UTC +++ pam_module/pam_oslogin_login.cc @@ -14,7 +14,6 @@ Modified: head/sysutils/google-compute-engine-oslogin/files/patch-utils_oslogin__utils.cc ============================================================================== --- head/sysutils/google-compute-engine-oslogin/files/patch-utils_oslogin__utils.cc Fri Apr 6 19:17:44 2018 (r466685) +++ head/sysutils/google-compute-engine-oslogin/files/patch-utils_oslogin__utils.cc Fri Apr 6 20:00:08 2018 (r466686) @@ -1,6 +1,6 @@ ---- utils/oslogin_utils.cc.orig 2017-12-13 23:47:59 UTC +--- utils/oslogin_utils.cc.orig 2018-02-27 22:53:04 UTC +++ utils/oslogin_utils.cc -@@ -218,7 +218,14 @@ bool ValidatePasswd(struct passwd* resul +@@ -222,7 +222,14 @@ bool ValidatePasswd(struct passwd* resul } } if (strlen(result->pw_shell) == 0) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201804062000.w36K08GO043508>