svn commit: r494231 - in head/sysutils/google-compute-engine-oslogin: . files
Steve Wills
swills at FreeBSD.org
Fri Mar 1 03:14:33 UTC 2019
Author: swills
Date: Fri Mar 1 03:14:31 2019
New Revision: 494231
URL: https://svnweb.freebsd.org/changeset/ports/494231
Log:
sysutils/google-compute-engine-oslogin: update to 1.4.3
PR: 235737
Submitted by: Lucas Kanashiro <lucas.kanashiro at collabora.com>
Approved by: Helen Koike <helen.koike at collabora.com> (maintainer)
Deleted:
head/sysutils/google-compute-engine-oslogin/files/patch-bin_google__oslogin__control
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-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 Mar 1 03:05:04 2019 (r494230)
+++ head/sysutils/google-compute-engine-oslogin/Makefile Fri Mar 1 03:14:31 2019 (r494231)
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= google-compute-engine-oslogin
-DISTVERSION= 1.3.1
-PORTREVISION= 1
+DISTVERSION= 1.4.3
CATEGORIES= sysutils
MAINTAINER= helen.koike at collabora.com
@@ -21,8 +20,7 @@ USE_LDCONFIG= yes
USE_GITHUB= yes
GH_ACCOUNT= GoogleCloudPlatform
GH_PROJECT= compute-image-packages
-GH_TAGNAME= 20181011
-
+GH_TAGNAME= 20190124
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 Mar 1 03:05:04 2019 (r494230)
+++ head/sysutils/google-compute-engine-oslogin/distinfo Fri Mar 1 03:14:31 2019 (r494231)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1539895280
-SHA256 (GoogleCloudPlatform-compute-image-packages-1.3.1-20181011_GH0.tar.gz) = c9fb44fb8c4bbde108a2aeba44f11938c7840256ca078804ec3c720a47e79144
-SIZE (GoogleCloudPlatform-compute-image-packages-1.3.1-20181011_GH0.tar.gz) = 147405
+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
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 Mar 1 03:05:04 2019 (r494230)
+++ head/sysutils/google-compute-engine-oslogin/files/patch-pam__module_pam__oslogin__admin.cc Fri Mar 1 03:14:31 2019 (r494231)
@@ -1,4 +1,4 @@
---- pam_module/pam_oslogin_admin.cc.orig 2018-10-11 16:53:23 UTC
+--- pam_module/pam_oslogin_admin.cc.orig 2019-01-24 19:28:43 UTC
+++ pam_module/pam_oslogin_admin.cc
@@ -14,7 +14,6 @@
@@ -8,7 +8,7 @@
#include <security/pam_modules.h>
#include <sys/stat.h>
#include <sys/types.h>
-@@ -48,7 +47,7 @@ PAM_EXTERN int pam_sm_acct_mgmt(pam_handle_t *pamh, in
+@@ -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) {
@@ -16,10 +16,10 @@
+ syslog(LOG_INFO, "Could not get pam user.");
return pam_result;
}
- string str_user_name(user_name);
-@@ -82,7 +81,7 @@ PAM_EXTERN int pam_sm_acct_mgmt(pam_handle_t *pamh, in
+
+@@ -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 &&
- ParseJsonToAuthorizeResponse(response)) {
+ ParseJsonToSuccess(response)) {
if (!file_exists) {
- pam_syslog(pamh, LOG_INFO,
+ syslog(LOG_INFO,
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 Mar 1 03:05:04 2019 (r494230)
+++ head/sysutils/google-compute-engine-oslogin/files/patch-pam__module_pam__oslogin__login.cc Fri Mar 1 03:14:31 2019 (r494231)
@@ -1,4 +1,4 @@
---- pam_module/pam_oslogin_login.cc.orig 2018-10-11 16:53:23 UTC
+--- pam_module/pam_oslogin_login.cc.orig 2019-02-20 12:34:55 UTC
+++ pam_module/pam_oslogin_login.cc
@@ -14,7 +14,6 @@
@@ -8,7 +8,7 @@
#include <security/pam_modules.h>
#include <sys/stat.h>
#include <sys/types.h>
-@@ -46,7 +45,7 @@ PAM_EXTERN int pam_sm_acct_mgmt(pam_handle_t *pamh, in
+@@ -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) {
@@ -17,7 +17,7 @@
return pam_result;
}
string str_user_name(user_name);
-@@ -93,7 +92,7 @@ PAM_EXTERN int pam_sm_acct_mgmt(pam_handle_t *pamh, in
+@@ -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);
}
@@ -26,12 +26,64 @@
"Granting login permission for organization user %s.",
user_name);
pam_result = PAM_SUCCESS;
-@@ -101,7 +100,7 @@ PAM_EXTERN int pam_sm_acct_mgmt(pam_handle_t *pamh, in
+@@ -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);
+ "Denying login permission for organization user %s.",
+ user_name);
- pam_result = PAM_PERM_DENIED;
+@@ -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<oslogin_utils::Challenge> 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;
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 Mar 1 03:05:04 2019 (r494230)
+++ head/sysutils/google-compute-engine-oslogin/files/patch-utils_oslogin__utils.cc Fri Mar 1 03:14:31 2019 (r494231)
@@ -1,4 +1,4 @@
---- utils/oslogin_utils.cc.orig 2018-11-13 21:29:55 UTC
+--- utils/oslogin_utils.cc.orig 2019-01-24 19:28:43 UTC
+++ utils/oslogin_utils.cc
@@ -23,8 +23,7 @@
#include <iostream>
@@ -18,7 +18,7 @@
#include "oslogin_utils.h"
-@@ -279,7 +277,7 @@ bool ValidatePasswd(struct passwd* result, BufferManag
+@@ -292,7 +290,7 @@ bool ValidatePasswd(struct passwd* result, BufferManag
}
}
if (strlen(result->pw_shell) == 0) {
More information about the svn-ports-all
mailing list