diff options
| author | Steve Wills <swills@FreeBSD.org> | 2018-04-06 20:00:08 +0000 |
|---|---|---|
| committer | Steve Wills <swills@FreeBSD.org> | 2018-04-06 20:00:08 +0000 |
| commit | a5dff160b44e0ff20e40e83a9dc532c32434a72b (patch) | |
| tree | e7bc4e5cc502f358dfe5ce6991640ca4e6275543 /sysutils/google-compute-engine-oslogin | |
| parent | bab09b455d3ee19a7f9a81ea36ab2a3b325aec02 (diff) | |
| download | ports-a5dff160b44e0ff20e40e83a9dc532c32434a72b.tar.gz ports-a5dff160b44e0ff20e40e83a9dc532c32434a72b.zip | |
sysutils/google-compute-engine-oslogin: update to version 1.1.5
PR: 226936
Submitted by: Helen Koike <helen.koike@collabora.com> (maintainer)
Notes
Notes:
svn path=/head/; revision=466686
Diffstat (limited to 'sysutils/google-compute-engine-oslogin')
8 files changed, 24 insertions, 33 deletions
diff --git a/sysutils/google-compute-engine-oslogin/Makefile b/sysutils/google-compute-engine-oslogin/Makefile index f495bdd70a97..3652a7c79623 100644 --- a/sysutils/google-compute-engine-oslogin/Makefile +++ b/sysutils/google-compute-engine-oslogin/Makefile @@ -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 \ diff --git a/sysutils/google-compute-engine-oslogin/distinfo b/sysutils/google-compute-engine-oslogin/distinfo index 218a7a9936b3..8915356e67b6 100644 --- a/sysutils/google-compute-engine-oslogin/distinfo +++ b/sysutils/google-compute-engine-oslogin/distinfo @@ -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 diff --git a/sysutils/google-compute-engine-oslogin/files/patch-Makefile b/sysutils/google-compute-engine-oslogin/files/patch-Makefile deleted file mode 100644 index f80e5295bef8..000000000000 --- a/sysutils/google-compute-engine-oslogin/files/patch-Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.orig 2017-12-13 23:47:59 UTC -+++ Makefile -@@ -15,7 +15,7 @@ AUTHKEYS_INSTALL_PATH = /usr/bin - JSON_INCLUDE_PATH = /usr/include/json-c - INCLUDE_FLAGS = -I$(JSON_INCLUDE_PATH) - --CXX = g++ -+CXX ?= g++ - CXXFLAGS += -fPIC# -Wall - PAMFLAGS = $(LDFLAGS) $(INCLUDE_FLAGS) -shared - NSSFLAGS = $(LDFLAGS) $(INCLUDE_FLAGS) -shared -Wl,-soname,$(NSS_LIBRARY_SONAME) diff --git a/sysutils/google-compute-engine-oslogin/files/patch-bin_google__oslogin__control b/sysutils/google-compute-engine-oslogin/files/patch-bin_google__oslogin__control index 4a7122951497..42b8a20dc577 100644 --- a/sysutils/google-compute-engine-oslogin/files/patch-bin_google__oslogin__control +++ b/sysutils/google-compute-engine-oslogin/files/patch-bin_google__oslogin__control @@ -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 diff --git a/sysutils/google-compute-engine-oslogin/files/patch-nss__module_nss__oslogin.cc b/sysutils/google-compute-engine-oslogin/files/patch-nss__module_nss__oslogin.cc index 14e17802d6a3..fdf9f363ee31 100644 --- a/sysutils/google-compute-engine-oslogin/files/patch-nss__module_nss__oslogin.cc +++ b/sysutils/google-compute-engine-oslogin/files/patch-nss__module_nss__oslogin.cc @@ -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> diff --git a/sysutils/google-compute-engine-oslogin/files/patch-pam__module_pam__oslogin__admin.cc b/sysutils/google-compute-engine-oslogin/files/patch-pam__module_pam__oslogin__admin.cc index 343d64a74838..2195f5f76f45 100644 --- a/sysutils/google-compute-engine-oslogin/files/patch-pam__module_pam__oslogin__admin.cc +++ b/sysutils/google-compute-engine-oslogin/files/patch-pam__module_pam__oslogin__admin.cc @@ -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 @@ diff --git a/sysutils/google-compute-engine-oslogin/files/patch-pam__module_pam__oslogin__login.cc b/sysutils/google-compute-engine-oslogin/files/patch-pam__module_pam__oslogin__login.cc index 08ce7062b08b..d27b6ae04dab 100644 --- a/sysutils/google-compute-engine-oslogin/files/patch-pam__module_pam__oslogin__login.cc +++ b/sysutils/google-compute-engine-oslogin/files/patch-pam__module_pam__oslogin__login.cc @@ -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 @@ diff --git a/sysutils/google-compute-engine-oslogin/files/patch-utils_oslogin__utils.cc b/sysutils/google-compute-engine-oslogin/files/patch-utils_oslogin__utils.cc index 82830fc235d7..fa74bacf80a0 100644 --- a/sysutils/google-compute-engine-oslogin/files/patch-utils_oslogin__utils.cc +++ b/sysutils/google-compute-engine-oslogin/files/patch-utils_oslogin__utils.cc @@ -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) { |