mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2026-03-01 19:41:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

sys-auth/google-oslogin: Version bump to 20250123.00

Browse Source 
Bug: https://github.com/flatcar/Flatcar/issues/713
Signed-off-by: James Le Cuirot <jlecuirot@microsoft.com>
This commit is contained in:
James Le Cuirot 2025-03-31 16:10:42 +01:00
parent b4a6cf7190
commit fabe88d0d6
No known key found for this signature in database
GPG Key ID: 1226415D00DD3137
5 changed files with 14 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog/updates/2025-03-31-google-oslogin-20250123.00.md Normal file
View File

@ -0,0 +1 @@
- Google OS Login Guest Environment ([20250123.00](https://github.com/GoogleCloudPlatform/guest-oslogin/releases/tag/20250123.00))

2
sdk_container/src/third_party/coreos-overlay/sys-auth/google-oslogin/Manifest vendored
View File

@ -1 +1 @@
DIST guest-oslogin-20200910.00.tar.gz 42599 BLAKE2B 6c2917f03277834e54050e5bf94943dc311c70e3150247b91cee5835b09fb197686788373ab8cdff4f3f8e4baa85dd515bcb22a99530475bd7c3991d1d272ece SHA512 575813becdd7046b9c5813f33aad440737df6d0fa1d9345f8f4340fda4bc348b27860231ed163196cf06609fd3311fe2bbf45486c260c45a0a38795a95f09834
DIST guest-oslogin-20250123.00.tar.gz 58083 BLAKE2B 3e6b974664769e2afe4ae91295d94f7a68b52e2f37208cb301de8e2e3bc06a0e9496713143ecd54075ee2a6db91e47ca38118d501e06ce3f177444e007c06210 SHA512 cbdc553d6847b61b61c93cb1335fc23d932385ff787a5b2321afb033635bfbee5a37962791cd09f8ccb40f2366a44f03a0d1733609b381e079b528caa6305f89

8
sdk_container/src/third_party/coreos-overlay/sys-auth/google-oslogin/files/google-oslogin-pkg-config.patch vendored
View File

@ -4,11 +4,11 @@
SHELL = /bin/sh
TOPDIR = $(realpath ..)
-CPPFLAGS = -Iinclude -I/usr/include/json-c
+CPPFLAGS := -Iinclude $(shell $(PKG_CONFIG) --cflags libcurl json-c pam)
-CPPFLAGS += -I. -I/usr/include/json-c
+CPPFLAGS += -I. $(shell $(PKG_CONFIG) --cflags libcurl json-c pam)
FLAGS = -fPIC -Wall -g
CFLAGS = $(FLAGS) -Wstrict-prototypes
CXXFLAGS = $(FLAGS)
CFLAGS += $(FLAGS) -Wstrict-prototypes
CXXFLAGS += $(FLAGS)
LDFLAGS = -shared -Wl,-soname,$(SONAME)
-LDLIBS = -lcurl -ljson-c

31
sdk_container/src/third_party/coreos-overlay/sys-auth/google-oslogin/files/google-oslogin-var-lib.patch vendored
View File

@ -1,30 +1,15 @@
From 66c1d03b541211ed4707b0608422856ece90f1c2 Mon Sep 17 00:00:00 2001
From: Andrew Jeddeloh <andrew.jeddeloh@coreos.com>
Date: Fri, 6 Jul 2018 15:54:40 -0700
Subject: [PATCH] pam_module: use /var/lib/ instead of /var
pam_module: use /var/lib/ instead of /var
--- a/src/pam/pam_oslogin_admin.cc
+++ b/src/pam/pam_oslogin_admin.cc
@@ -36,7 +36,7 @@ using oslogin_utils::ParseJsonToEmail;
using oslogin_utils::UrlEncode;
using oslogin_utils::kMetadataServerUrl;
--- a/src/oslogin_utils.cc
+++ b/src/oslogin_utils.cc
@@ -57,8 +57,8 @@
// Regex for validating user names.
static const char kUserNameRegex[] = "^[a-zA-Z0-9._][a-zA-Z0-9._-]{0,31}$";
-static const char kSudoersDir[] = "/var/google-sudoers.d/";
+static const char kSudoersDir[] = "/var/lib/google-sudoers.d/";
extern "C" {
--- a/src/pam/pam_oslogin_login.cc
+++ b/src/pam/pam_oslogin_login.cc
@@ -36,7 +36,7 @@ using oslogin_utils::ParseJsonToEmail;
using oslogin_utils::UrlEncode;
using oslogin_utils::kMetadataServerUrl;
-static const char kUsersDir[] = "/var/google-users.d/";
+static const char kSudoersDir[] = "/var/lib/google-sudoers.d/";
+static const char kUsersDir[] = "/var/lib/google-users.d/";
extern "C" {
namespace oslogin_utils {
--
2.16.4

3
sdk_container/src/third_party/coreos-overlay/sys-auth/google-oslogin/google-oslogin-20200910.00-r4.ebuild → sdk_container/src/third_party/coreos-overlay/sys-auth/google-oslogin/google-oslogin-20250123.00.ebuild vendored
View File

@ -64,9 +64,6 @@ src_install() {
INSTALL_CRON=$(usex !systemd 1 '') \
install
# Flatcar doesn't need this script.
rm "${ED}"/usr/bin/google_oslogin_control || die
# man pages need fixing up for Gentoo QA but Flatcar drops them anyway.
rm -r "${ED}"/usr/share/man || die