View | Details | Raw Unified | Return to bug 226936
Collapse All | Expand All

(-)google-compute-engine-oslogin-1.1.5/Makefile (-2 / +2 lines)
Lines 1-7 Link Here
1
# $FreeBSD$
1
# $FreeBSD$
2
2
3
PORTNAME=	google-compute-engine-oslogin
3
PORTNAME=	google-compute-engine-oslogin
4
DISTVERSION=	1.1.2
4
DISTVERSION=	1.1.5
5
CATEGORIES=	sysutils
5
CATEGORIES=	sysutils
6
6
7
MAINTAINER=	helen.koike@collabora.com
7
MAINTAINER=	helen.koike@collabora.com
Lines 21-27 Link Here
21
USE_GITHUB=	yes
21
USE_GITHUB=	yes
22
GH_ACCOUNT=	GoogleCloudPlatform
22
GH_ACCOUNT=	GoogleCloudPlatform
23
GH_PROJECT=	compute-image-packages
23
GH_PROJECT=	compute-image-packages
24
GH_TAGNAME=	20171213
24
GH_TAGNAME=	20180227
25
MAKE_ARGS=	JSON_INCLUDE_PATH=${LOCALBASE}/include/json-c \
25
MAKE_ARGS=	JSON_INCLUDE_PATH=${LOCALBASE}/include/json-c \
26
		BIN_INSTALL_PATH=/bin \
26
		BIN_INSTALL_PATH=/bin \
27
		PAM_INSTALL_PATH=/lib \
27
		PAM_INSTALL_PATH=/lib \
(-)google-compute-engine-oslogin-1.1.5/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1514471176
1
TIMESTAMP = 1522046585
2
SHA256 (GoogleCloudPlatform-compute-image-packages-1.1.2-20171213_GH0.tar.gz) = 483d97c6d64cd7d9002247db63af8cb591e526a09ce52fd8d545c66da3ebb181
2
SHA256 (GoogleCloudPlatform-compute-image-packages-1.1.5-20180227_GH0.tar.gz) = 80e8c8059273f76e82343993a0282c51b633ba8c8dc5a14664919ee1b9e0fbaf
3
SIZE (GoogleCloudPlatform-compute-image-packages-1.1.2-20171213_GH0.tar.gz) = 131055
3
SIZE (GoogleCloudPlatform-compute-image-packages-1.1.5-20180227_GH0.tar.gz) = 135485
(-)google-compute-engine-oslogin-1.1.5/files/patch-Makefile (-11 lines)
Lines 1-11 Link Here
1
--- Makefile.orig	2017-12-13 23:47:59 UTC
2
+++ Makefile
3
@@ -15,7 +15,7 @@ AUTHKEYS_INSTALL_PATH = /usr/bin
4
 JSON_INCLUDE_PATH = /usr/include/json-c
5
 INCLUDE_FLAGS = -I$(JSON_INCLUDE_PATH)
6
 
7
-CXX = g++
8
+CXX ?= g++
9
 CXXFLAGS += -fPIC# -Wall
10
 PAMFLAGS = $(LDFLAGS) $(INCLUDE_FLAGS) -shared
11
 NSSFLAGS = $(LDFLAGS) $(INCLUDE_FLAGS) -shared -Wl,-soname,$(NSS_LIBRARY_SONAME)
(-)google-compute-engine-oslogin-1.1.5/files/patch-bin_google__oslogin__control (-11 / +14 lines)
Lines 1-6 Link Here
1
--- bin/google_oslogin_control.orig	2017-12-13 23:47:59 UTC
1
--- bin/google_oslogin_control.orig	2018-02-27 22:53:04 UTC
2
+++ bin/google_oslogin_control
2
+++ bin/google_oslogin_control
3
@@ -65,29 +65,31 @@ overwrite_file() {
3
@@ -65,22 +65,24 @@ overwrite_file() {
4
 
4
 
5
 remove_from_config() {
5
 remove_from_config() {
6
   config=$1
6
   config=$1
Lines 30-46 Link Here
30
 }
30
 }
31
 
31
 
32
 add_to_pam_config() {
32
 add_to_pam_config() {
33
   remove_from_config ${pam_config}
33
@@ -97,9 +99,9 @@ ${pam_homedir}
34
-  sed -i "/account.*pam_nologin.so/ a${added_comment}\n${pam_admin}" ${pam_config}.new
34
 "
35
-  sed -i "/account.*pam_nologin.so/ a${added_comment}\n${pam_login}" ${pam_config}.new
35
     echo "${added_config}$(cat ${pam_config}.new)" > ${pam_config}.new
36
-  sed -i "/pam_loginuid.so/ a${added_comment}\n${pam_homedir}" ${pam_config}.new
36
   else
37
+  gsed -i "/account.*pam_nologin.so/ a${added_comment}\n${pam_admin}" ${pam_config}.new
37
-    sed -i "/account.*pam_nologin.so/ a${added_comment}\n${pam_admin}" ${pam_config}.new
38
+  gsed -i "/account.*pam_nologin.so/ a${added_comment}\n${pam_login}" ${pam_config}.new
38
-    sed -i "/account.*pam_nologin.so/ a${added_comment}\n${pam_login}" ${pam_config}.new
39
+  gsed -i "/session.*pam_permit.so/ a${added_comment}\n${pam_homedir}" ${pam_config}.new
39
-    sed -i "/pam_loginuid.so/ a${added_comment}\n${pam_homedir}" ${pam_config}.new
40
+    gsed -i "/account.*pam_nologin.so/ a${added_comment}\n${pam_admin}" ${pam_config}.new
41
+    gsed -i "/account.*pam_nologin.so/ a${added_comment}\n${pam_login}" ${pam_config}.new
42
+    gsed -i "/session.*pam_permit.so/ a${added_comment}\n${pam_homedir}" ${pam_config}.new
43
   fi
40
 }
44
 }
41
 
45
 
42
 restart_service() {
46
@@ -113,7 +115,7 @@ restart_service() {
43
@@ -100,7 +102,7 @@ restart_service() {
44
     fi
47
     fi
45
   fi
48
   fi
46
   if which service > /dev/null 2>&1; then
49
   if which service > /dev/null 2>&1; then
(-)google-compute-engine-oslogin-1.1.5/files/patch-nss__module_nss__oslogin.cc (-1 / +1 lines)
Lines 1-4 Link Here
1
--- nss_module/nss_oslogin.cc.orig	2017-12-13 23:47:59 UTC
1
--- nss_module/nss_oslogin.cc.orig	2018-02-27 22:53:04 UTC
2
+++ nss_module/nss_oslogin.cc
2
+++ nss_module/nss_oslogin.cc
3
@@ -16,6 +16,7 @@
3
@@ -16,6 +16,7 @@
4
 #include <errno.h>
4
 #include <errno.h>
(-)google-compute-engine-oslogin-1.1.5/files/patch-pam__module_pam__oslogin__admin.cc (-1 / +1 lines)
Lines 1-4 Link Here
1
--- pam_module/pam_oslogin_admin.cc.orig	2017-12-13 23:47:59 UTC
1
--- pam_module/pam_oslogin_admin.cc.orig	2018-02-27 22:53:04 UTC
2
+++ pam_module/pam_oslogin_admin.cc
2
+++ pam_module/pam_oslogin_admin.cc
3
@@ -14,7 +14,6 @@
3
@@ -14,7 +14,6 @@
4
 
4
 
(-)google-compute-engine-oslogin-1.1.5/files/patch-pam__module_pam__oslogin__login.cc (-1 / +1 lines)
Lines 1-4 Link Here
1
--- pam_module/pam_oslogin_login.cc.orig	2017-12-13 23:47:59 UTC
1
--- pam_module/pam_oslogin_login.cc.orig	2018-02-27 22:53:04 UTC
2
+++ pam_module/pam_oslogin_login.cc
2
+++ pam_module/pam_oslogin_login.cc
3
@@ -14,7 +14,6 @@
3
@@ -14,7 +14,6 @@
4
 
4
 
(-)google-compute-engine-oslogin-1.1.5/files/patch-utils_oslogin__utils.cc (-2 / +2 lines)
Lines 1-6 Link Here
1
--- utils/oslogin_utils.cc.orig	2017-12-13 23:47:59 UTC
1
--- utils/oslogin_utils.cc.orig	2018-02-27 22:53:04 UTC
2
+++ utils/oslogin_utils.cc
2
+++ utils/oslogin_utils.cc
3
@@ -218,7 +218,14 @@ bool ValidatePasswd(struct passwd* resul
3
@@ -222,7 +222,14 @@ bool ValidatePasswd(struct passwd* resul
4
     }
4
     }
5
   }
5
   }
6
   if (strlen(result->pw_shell) == 0) {
6
   if (strlen(result->pw_shell) == 0) {

Return to bug 226936