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

(-)Makefile (-9 / +7 lines)
Lines 1-8 Link Here
1
# $FreeBSD$
1
# $FreeBSD$
2
2
3
PORTNAME=	google-compute-engine-oslogin
3
PORTNAME=	google-compute-engine-oslogin
4
DISTVERSION=	20191018.00
4
DISTVERSION=	20200918.00
5
PORTREVISION=	1
6
CATEGORIES=	sysutils
5
CATEGORIES=	sysutils
7
6
8
MAINTAINER=	ports@FreeBSD.org
7
MAINTAINER=	ports@FreeBSD.org
Lines 21-30 Link Here
21
USE_GITHUB=	yes
20
USE_GITHUB=	yes
22
GH_ACCOUNT=	GoogleCloudPlatform
21
GH_ACCOUNT=	GoogleCloudPlatform
23
GH_PROJECT=	guest-oslogin
22
GH_PROJECT=	guest-oslogin
24
GH_TAGNAME=	5a710bb
23
GH_TAGNAME=	4076091
25
24
26
PLIST_SUB+=	DISTVERSION=${DISTVERSION}
27
28
MAKE_ARGS=	CPPFLAGS="-Iinclude -I${LOCALBASE}/include/json-c -I${LOCALBASE}/include" \
25
MAKE_ARGS=	CPPFLAGS="-Iinclude -I${LOCALBASE}/include/json-c -I${LOCALBASE}/include" \
29
		LDLIBS="-lcurl -ljson-c -L${LOCALBASE}/lib" \
26
		LDLIBS="-lcurl -ljson-c -L${LOCALBASE}/lib" \
30
		DESTDIR=${STAGEDIR}${PREFIX} \
27
		DESTDIR=${STAGEDIR}${PREFIX} \
Lines 34-44 Link Here
34
		MANDIR=${PREFIX}/man
31
		MANDIR=${PREFIX}/man
35
32
36
post-install:
33
post-install:
37
	${LN} -sf libnss_oslogin-${DISTVERSION}.so ${STAGEDIR}${PREFIX}/lib/nss_oslogin.so.1
34
	${LN} -sf libnss_oslogin.so ${STAGEDIR}${PREFIX}/lib/nss_oslogin.so.2
38
	${LN} -sf libnss_cache_oslogin-${DISTVERSION}.so ${STAGEDIR}${PREFIX}/lib/nss_cache_oslogin.so.1
35
	${LN} -sf libnss_cache_oslogin.so ${STAGEDIR}${PREFIX}/lib/nss_cache_oslogin.so.2
39
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/google_authorized_keys \
36
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/google_authorized_keys \
40
		${STAGEDIR}${PREFIX}/lib/libnss_oslogin-${DISTVERSION}.so \
37
		${STAGEDIR}${PREFIX}/bin/google_oslogin_nss_cache \
41
		${STAGEDIR}${PREFIX}/lib/libnss_cache_oslogin-${DISTVERSION}.so \
38
		${STAGEDIR}${PREFIX}/lib/libnss_oslogin.so \
39
		${STAGEDIR}${PREFIX}/lib/libnss_cache_oslogin.so \
42
		${STAGEDIR}${PREFIX}/lib/pam_oslogin_admin.so \
40
		${STAGEDIR}${PREFIX}/lib/pam_oslogin_admin.so \
43
		${STAGEDIR}${PREFIX}/lib/pam_oslogin_login.so
41
		${STAGEDIR}${PREFIX}/lib/pam_oslogin_login.so
44
42
(-)distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1571819820
1
TIMESTAMP = 1600502715
2
SHA256 (GoogleCloudPlatform-guest-oslogin-20191018.00-5a710bb_GH0.tar.gz) = e2416461d61b1f4a81cf13a883ea2922271d09882c951eec61c1d3ca398c927e
2
SHA256 (GoogleCloudPlatform-guest-oslogin-20200918.00-4076091_GH0.tar.gz) = 03832cbc6d35593eebea8c6c6d66b69cb6abc5a22ae6dfbf61a73e767de2295c
3
SIZE (GoogleCloudPlatform-guest-oslogin-20191018.00-5a710bb_GH0.tar.gz) = 36556
3
SIZE (GoogleCloudPlatform-guest-oslogin-20200918.00-4076091_GH0.tar.gz) = 43256
(-)files/patch-src_Makefile (-7 / +37 lines)
Lines 1-29 Link Here
1
--- src/Makefile.orig	2019-10-23 08:18:46 UTC
1
--- src/Makefile.orig	2020-09-18 19:18:56 UTC
2
+++ src/Makefile
2
+++ src/Makefile
3
@@ -70,17 +70,21 @@ install: all
3
@@ -24,8 +24,10 @@ PRESETDIR = /lib/systemd/system-preset
4
 	install -d $(DESTDIR)$(PAMDIR)
4
 NSS_OSLOGIN_SONAME       = libnss_oslogin.so.2
5
 NSS_CACHE_OSLOGIN_SONAME = libnss_cache_oslogin.so.2
6
 
7
-NSS_OSLOGIN              = libnss_oslogin-$(VERSION).so
8
-NSS_CACHE_OSLOGIN        = libnss_cache_oslogin-$(VERSION).so
9
+#NSS_OSLOGIN              = libnss_oslogin-$(VERSION).so
10
+#NSS_CACHE_OSLOGIN        = libnss_cache_oslogin-$(VERSION).so
11
+NSS_OSLOGIN              = libnss_oslogin.so
12
+NSS_CACHE_OSLOGIN        = libnss_cache_oslogin.so
13
 
14
 PAM_LOGIN                = pam_oslogin_login.so
15
 PAM_ADMIN                = pam_oslogin_admin.so
16
@@ -73,15 +75,21 @@ install: all
5
 	install -d $(DESTDIR)$(BINDIR)
17
 	install -d $(DESTDIR)$(BINDIR)
6
 	install -d $(DESTDIR)$(MANDIR)/man8
18
 	install -d $(DESTDIR)$(MANDIR)/man8
19
 	# NSS modules
7
-	install -m 0644 -t $(DESTDIR)$(LIBDIR) $(NSS_OSLOGIN) $(NSS_CACHE_OSLOGIN)
20
-	install -m 0644 -t $(DESTDIR)$(LIBDIR) $(NSS_OSLOGIN) $(NSS_CACHE_OSLOGIN)
8
+	install -m 0644 $(NSS_CACHE_OSLOGIN) $(DESTDIR)$(LIBDIR)
21
+	install -m 0644 $(NSS_CACHE_OSLOGIN) $(DESTDIR)$(LIBDIR)
9
+	install -m 0644 $(NSS_OSLOGIN) $(DESTDIR)$(LIBDIR)
22
+	install -m 0644 $(NSS_OSLOGIN) $(DESTDIR)$(LIBDIR)
10
 	ln -sf $(NSS_OSLOGIN)         $(DESTDIR)$(LIBDIR)/$(NSS_OSLOGIN_SONAME)
23
 	ln -sf $(NSS_OSLOGIN)         $(DESTDIR)$(LIBDIR)/$(NSS_OSLOGIN_SONAME)
11
 	ln -sf $(NSS_CACHE_OSLOGIN)   $(DESTDIR)$(LIBDIR)/$(NSS_CACHE_OSLOGIN_SONAME)
24
 	ln -sf $(NSS_CACHE_OSLOGIN)   $(DESTDIR)$(LIBDIR)/$(NSS_CACHE_OSLOGIN_SONAME)
25
 	# PAM modules
12
-	install -m 0644 -t $(DESTDIR)$(PAMDIR) $(PAM_ADMIN) $(PAM_LOGIN)
26
-	install -m 0644 -t $(DESTDIR)$(PAMDIR) $(PAM_ADMIN) $(PAM_LOGIN)
13
-	install -m 0755 -t $(DESTDIR)$(BINDIR) $(BINARIES) $(TOPDIR)/google_oslogin_control
14
-	install -m 0644 -t $(DESTDIR)$(MANDIR)/man8 $(TOPDIR)/man/nss-oslogin.8 $(TOPDIR)/man/nss-cache-oslogin.8
15
+	install -m 0644 $(PAM_LOGIN) $(DESTDIR)$(PAMDIR)
27
+	install -m 0644 $(PAM_LOGIN) $(DESTDIR)$(PAMDIR)
16
+	install -m 0644 $(PAM_ADMIN) $(DESTDIR)$(PAMDIR)
28
+	install -m 0644 $(PAM_ADMIN) $(DESTDIR)$(PAMDIR)
29
+
30
 	# Control file
31
-	install -m 0755 -t $(DESTDIR)$(BINDIR) $(BINARIES) $(TOPDIR)/google_oslogin_control
17
+	install -m 0755 $(TOPDIR)/google_oslogin_control $(DESTDIR)$(BINDIR)
32
+	install -m 0755 $(TOPDIR)/google_oslogin_control $(DESTDIR)$(BINDIR)
18
+	install -m 0755 $(BINARIES) $(DESTDIR)$(BINDIR)
33
+	install -m 0755 $(BINARIES) $(DESTDIR)$(BINDIR)
34
+
35
 	# Manpages
36
-	install -m 0644 -t $(DESTDIR)$(MANDIR)/man8 $(TOPDIR)/man/nss-oslogin.8 $(TOPDIR)/man/nss-cache-oslogin.8
37
+	install -m 0644 $(TOPDIR)/man/nss-oslogin.8 $(DESTDIR)$(MANDIR)/man8
19
+	install -m 0644 $(TOPDIR)/man/nss-cache-oslogin.8 $(DESTDIR)$(MANDIR)/man8
38
+	install -m 0644 $(TOPDIR)/man/nss-cache-oslogin.8 $(DESTDIR)$(MANDIR)/man8
20
+	install -m 0644 $(TOPDIR)/man/nss-oslogin.8 $(DESTDIR)$(MANDIR)/man8
21
 	gzip -9 $(DESTDIR)$(MANDIR)/man8/nss-oslogin.8
39
 	gzip -9 $(DESTDIR)$(MANDIR)/man8/nss-oslogin.8
22
 	gzip -9 $(DESTDIR)$(MANDIR)/man8/nss-cache-oslogin.8
40
 	gzip -9 $(DESTDIR)$(MANDIR)/man8/nss-cache-oslogin.8
23
 	ln -sf nss-oslogin.8.gz       $(DESTDIR)$(MANDIR)/man8/$(NSS_OSLOGIN_SONAME).8.gz
41
 	ln -sf nss-oslogin.8.gz       $(DESTDIR)$(MANDIR)/man8/$(NSS_OSLOGIN_SONAME).8.gz
24
 	ln -sf nss-cache-oslogin.8.gz $(DESTDIR)$(MANDIR)/man8/$(NSS_CACHE_OSLOGIN_SONAME).8.gz
42
@@ -89,16 +97,10 @@ install: all
25
 ifdef INSTALL_SELINUX
43
 ifdef INSTALL_SELINUX
44
 	# SELinux policy package
26
 	install -d $(DESTDIR)/usr/share/selinux/packages
45
 	install -d $(DESTDIR)/usr/share/selinux/packages
27
-	install -m 0644 -t $(DESTDIR)/usr/share/selinux/packages $(TOPDIR)/selinux/oslogin.pp
46
-	install -m 0644 -t $(DESTDIR)/usr/share/selinux/packages $(TOPDIR)/selinux/oslogin.pp
28
+	install -m 0644 $(TOPDIR)/selinux/oslogin.pp $(DESTDIR)/usr/share/selinux/packages
47
+	install -m 0644 $(TOPDIR)/selinux/oslogin.pp $(DESTDIR)/usr/share/selinux/packages
29
 endif
48
 endif
49
 ifdef INSTALL_CRON
50
 	# Cache refresh cron
51
 	install -d $(DESTDIR)$(CRONDIR)
52
 	install -m 0644 $(TOPDIR)/cron.d $(DESTDIR)$(CRONDIR)/google-compute-engine-oslogin
53
-else
54
-	# Cache refresh systemd timer
55
-	install -d $(DESTDIR)$(SYSTEMDDIR)
56
-	install -m 0644 -t $(DESTDIR)$(SYSTEMDDIR) $(TOPDIR)/google-oslogin-cache.timer $(TOPDIR)/google-oslogin-cache.service
57
-	install -d $(DESTDIR)$(PRESETDIR)
58
-	install -m 0644 -t $(DESTDIR)$(PRESETDIR) $(TOPDIR)/90-google-compute-engine-oslogin.preset
59
 endif
(-)files/patch-src_nss_nss__cache__oslogin.c (-11 lines)
Lines 1-11 Link Here
1
--- src/nss/nss_cache_oslogin.c.orig	2019-10-23 07:01:45 UTC
2
+++ src/nss/nss_cache_oslogin.c
3
@@ -439,7 +439,7 @@ DECLARE_NSS_METHOD_TABLE(methods,
4
     { NSDB_PASSWD, "getgrent_r", __nss_compat_getgrent_r,
5
       (void*)_nss_cache_oslogin_getgrent_r },
6
     { NSDB_PASSWD, "endgrent",   __nss_compat_endgrent,
7
-      (void*)_nss_cache_oslogin_endgrent },
8
+      (void*)_nss_cache_endgrent },
9
     { NSDB_PASSWD, "setgrent",   __nss_compat_setgrent,
10
       (void*)_nss_cache_oslogin_setgrent },
11
 )
(-)files/patch-src_nss_nss__oslogin.cc (-7 / +7 lines)
Lines 1-11 Link Here
1
--- src/nss/nss_oslogin.cc.orig	2019-10-23 06:43:42 UTC
1
--- src/nss/nss_oslogin.cc.orig	2020-09-18 19:18:56 UTC
2
+++ src/nss/nss_oslogin.cc
2
+++ src/nss/nss_oslogin.cc
3
@@ -225,7 +225,7 @@ enum nss_status _nss_oslogin_initgroups_dyn(const char
3
@@ -226,7 +226,7 @@ enum nss_status _nss_oslogin_initgroups_dyn(const char
4
   if (p_file == NULL)
5
     return NSS_STATUS_NOTFOUND;
4
     return NSS_STATUS_NOTFOUND;
5
 
6
   struct passwd *userp;
6
   struct passwd *userp;
7
-  while ((userp = fgetpwent(p_file)) != NULL)
7
-  while ((userp = fgetpwent(p_file)) != NULL) {
8
+  while ((userp = getpwent()) != NULL)
8
+  while ((userp = getpwent()) != NULL) {
9
     if (strcmp(userp->pw_name, user) == 0)
9
     if (strcmp(userp->pw_name, user) == 0) {
10
       fclose(p_file);
10
       return NSS_STATUS_NOTFOUND;
11
       return NSS_STATUS_NOTFOUND;
11
   fclose(p_file);
(-)pkg-descr (-8 / +9 lines)
Lines 2-18 Link Here
2
instances.
2
instances.
3
The OS Login package has the following components:
3
The OS Login package has the following components:
4
4
5
- Authorized Keys Command to fetch SSH keys from the user's OS Login profile and
5
- Authorized Keys Command to fetch SSH keys from the user's OS Login
6
make them available to sshd.
6
  profile and make them available to sshd.
7
- NSS Module provides support for making OS Login user and group information
7
- NSS Module provides support for making OS Login user and group information
8
available to the system, using NSS (Name Service Switch) functionality.
8
  available to the system, using NSS (Name Service Switch) functionality.
9
- PAM Module provides authorization and authentication support allowing the
9
- PAM Module provides authorization and authentication support
10
system to use data stored in Google Cloud IAM permissions to control both, the
10
  allowing the system to use data stored in Google Cloud IAM permissions
11
ability to log into an instance, and to perform operations as root (sudo).
11
  to control both, the ability to log into an instance, and to perform
12
  operations as root (sudo).
12
- Utils provides common code to support the components listed above.
13
- Utils provides common code to support the components listed above.
13
14
14
In addition to the main components, there are also utilities for packaging and
15
In addition to the main components, there are also utilities for
15
installing these components:
16
packaging and installing these components:
16
17
17
- bin contains a shell script for (de)activating the package components.
18
- bin contains a shell script for (de)activating the package components.
18
19
(-)pkg-plist (-4 / +4 lines)
Lines 1-12 Link Here
1
bin/google_authorized_keys
1
bin/google_authorized_keys
2
bin/google_oslogin_control
2
bin/google_oslogin_control
3
bin/google_oslogin_nss_cache
3
bin/google_oslogin_nss_cache
4
lib/libnss_cache_oslogin-%%DISTVERSION%%.so
4
lib/libnss_cache_oslogin.so
5
lib/libnss_cache_oslogin.so.2
5
lib/libnss_cache_oslogin.so.2
6
lib/libnss_oslogin-%%DISTVERSION%%.so
6
lib/libnss_oslogin.so
7
lib/libnss_oslogin.so.2
7
lib/libnss_oslogin.so.2
8
lib/nss_cache_oslogin.so.1
8
lib/nss_cache_oslogin.so.2
9
lib/nss_oslogin.so.1
9
lib/nss_oslogin.so.2
10
lib/pam_oslogin_admin.so
10
lib/pam_oslogin_admin.so
11
lib/pam_oslogin_login.so
11
lib/pam_oslogin_login.so
12
man/man8/libnss_cache_oslogin.so.2.8.gz
12
man/man8/libnss_cache_oslogin.so.2.8.gz

Return to bug 246298