diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild index a91885d554..63f0f6bc7e 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild @@ -211,6 +211,5 @@ RDEPEND="${RDEPEND} RDEPEND+=" amd64? ( app-emulation/qemu-guest-agent - sys-auth/google-oslogin ) " diff --git a/sdk_container/src/third_party/coreos-overlay/sys-auth/google-oslogin/Manifest b/sdk_container/src/third_party/coreos-overlay/sys-auth/google-oslogin/Manifest deleted file mode 100644 index f1bedb2e82..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-auth/google-oslogin/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST 20200910.00.tar.gz 42599 BLAKE2B 6c2917f03277834e54050e5bf94943dc311c70e3150247b91cee5835b09fb197686788373ab8cdff4f3f8e4baa85dd515bcb22a99530475bd7c3991d1d272ece SHA512 575813becdd7046b9c5813f33aad440737df6d0fa1d9345f8f4340fda4bc348b27860231ed163196cf06609fd3311fe2bbf45486c260c45a0a38795a95f09834 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-auth/google-oslogin/files/0001-pam_module-use-var-lib-instead-of-var.patch b/sdk_container/src/third_party/coreos-overlay/sys-auth/google-oslogin/files/0001-pam_module-use-var-lib-instead-of-var.patch deleted file mode 100644 index 65fae86284..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-auth/google-oslogin/files/0001-pam_module-use-var-lib-instead-of-var.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 66c1d03b541211ed4707b0608422856ece90f1c2 Mon Sep 17 00:00:00 2001 -From: Andrew Jeddeloh -Date: Fri, 6 Jul 2018 15:54:40 -0700 -Subject: [PATCH] pam_module: use /var/lib/ instead of /var - ---- - guest-oslogin/src/pam/pam_oslogin_admin.cc | 2 +- - guest-oslogin/src/pam/pam_oslogin_login.cc | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/guest-oslogin/src/pam/pam_oslogin_admin.cc b/guest-oslogin/src/pam/pam_oslogin_admin.cc -index 04d0808..376916e 100644 ---- a/guest-oslogin/src/pam/pam_oslogin_admin.cc -+++ b/guest-oslogin/src/pam/pam_oslogin_admin.cc -@@ -36,7 +36,7 @@ using oslogin_utils::ParseJsonToEmail; - using oslogin_utils::UrlEncode; - using oslogin_utils::kMetadataServerUrl; - --static const char kSudoersDir[] = "/var/google-sudoers.d/"; -+static const char kSudoersDir[] = "/var/lib/google-sudoers.d/"; - - extern "C" { - -diff --git a/guest-oslogin/src/pam/pam_oslogin_login.cc b/guest-oslogin/src/pam/pam_oslogin_login.cc -index 9e708f4..428600b 100644 ---- a/guest-oslogin/src/pam/pam_oslogin_login.cc -+++ b/guest-oslogin/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 kUsersDir[] = "/var/lib/google-users.d/"; - - extern "C" { - --- -2.16.4 - diff --git a/sdk_container/src/third_party/coreos-overlay/sys-auth/google-oslogin/files/60-flatcar-google-oslogin.conf b/sdk_container/src/third_party/coreos-overlay/sys-auth/google-oslogin/files/60-flatcar-google-oslogin.conf deleted file mode 100644 index d9f62661bf..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-auth/google-oslogin/files/60-flatcar-google-oslogin.conf +++ /dev/null @@ -1,3 +0,0 @@ -# Needed for google oslogin -AuthorizedKeysCommand /usr/libexec/google_authorized_keys -AuthorizedKeysCommandUser root diff --git a/sdk_container/src/third_party/coreos-overlay/sys-auth/google-oslogin/files/group.conf b/sdk_container/src/third_party/coreos-overlay/sys-auth/google-oslogin/files/group.conf deleted file mode 100644 index 881c111e1d..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-auth/google-oslogin/files/group.conf +++ /dev/null @@ -1,2 +0,0 @@ -# Instruct oslogin to add the docker group to user that login via ssh -sshd;*;*;Al0000-2400;docker diff --git a/sdk_container/src/third_party/coreos-overlay/sys-auth/google-oslogin/files/nsswitch.conf b/sdk_container/src/third_party/coreos-overlay/sys-auth/google-oslogin/files/nsswitch.conf deleted file mode 100644 index 07af435bc0..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-auth/google-oslogin/files/nsswitch.conf +++ /dev/null @@ -1,19 +0,0 @@ -# /etc/nsswitch.conf: -# Keep this in sync with nsswitch.conf from coreos/baselayout -passwd: files usrfiles sss systemd cache_oslogin oslogin -shadow: files usrfiles sss -group: files usrfiles sss systemd cache_oslogin oslogin - -hosts: files usrfiles dns myhostname -networks: files usrfiles dns - -services: files usrfiles -protocols: files usrfiles -rpc: files usrfiles - -ethers: files -netmasks: files -netgroup: files -bootparams: files -automount: files -aliases: files diff --git a/sdk_container/src/third_party/coreos-overlay/sys-auth/google-oslogin/files/oslogin-sudoers b/sdk_container/src/third_party/coreos-overlay/sys-auth/google-oslogin/files/oslogin-sudoers deleted file mode 100644 index fed889fb8c..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-auth/google-oslogin/files/oslogin-sudoers +++ /dev/null @@ -1 +0,0 @@ -#includedir /var/lib/google-sudoers.d diff --git a/sdk_container/src/third_party/coreos-overlay/sys-auth/google-oslogin/files/pam_sshd b/sdk_container/src/third_party/coreos-overlay/sys-auth/google-oslogin/files/pam_sshd deleted file mode 100644 index 9452354ce5..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-auth/google-oslogin/files/pam_sshd +++ /dev/null @@ -1,12 +0,0 @@ -# Needed for oslogin support (needs to be prepended) -auth [default=ignore] pam_group.so -auth [success=done perm_denied=die default=ignore] pam_oslogin_login.so -account [success=ok default=ignore] pam_oslogin_admin.so -account [success=ok ignore=ignore default=die] pam_oslogin_login.so -session [success=ok default=ignore] pam_mkhomedir.so - -# Keep this file in sync with the net-misc/openssh/files/sshd.pam_include.2 -auth include system-remote-login -account include system-remote-login -password include system-remote-login -session include system-remote-login diff --git a/sdk_container/src/third_party/coreos-overlay/sys-auth/google-oslogin/files/sshd_config b/sdk_container/src/third_party/coreos-overlay/sys-auth/google-oslogin/files/sshd_config deleted file mode 100644 index 7b51b214e4..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-auth/google-oslogin/files/sshd_config +++ /dev/null @@ -1,17 +0,0 @@ -# This is an old SSHD config file, unused in new Flatcar -# installations. We provide it for backward compatibility. - -# Use most defaults for sshd configuration. -Subsystem sftp internal-sftp -ClientAliveInterval 180 -UseDNS no -UsePAM yes -PrintLastLog no # handled by PAM -PrintMotd no # handled by PAM -# Needed for google oslogin -AuthorizedKeysCommand /usr/libexec/google_authorized_keys -AuthorizedKeysCommandUser root -# Temporarily accept ssh-rsa algorithm for openssh >= 8.8, -# until most ssh clients could deprecate ssh-rsa. -HostkeyAlgorithms +ssh-rsa -PubkeyAcceptedAlgorithms +ssh-rsa diff --git a/sdk_container/src/third_party/coreos-overlay/sys-auth/google-oslogin/google-oslogin-20200910.00-r3.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-auth/google-oslogin/google-oslogin-20200910.00-r3.ebuild deleted file mode 100644 index 679e0c0b3a..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-auth/google-oslogin/google-oslogin-20200910.00-r3.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="Components to support Google Cloud OS Login. This contains bits that belong in USR" -HOMEPAGE="https://github.com/GoogleCloudPlatform/guest-oslogin" -SRC_URI="https://github.com/GoogleCloudPlatform/guest-oslogin/archive/${PV}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64" -IUSE="" - -inherit pam toolchain-funcs - -DEPEND=" - net-misc/curl[ssl] - dev-libs/json-c - sys-libs/pam -" - -RDEPEND="${DEPEND}" - -S=${WORKDIR}/guest-oslogin-${PV}/ - -src_prepare() { - eapply -p2 "$FILESDIR/0001-pam_module-use-var-lib-instead-of-var.patch" - default -} - -src_compile() { - emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" \ - VERSION=${PV} \ - JSON_INCLUDE_PATH="${SYSROOT%/}/usr/include/json-c" -} - -src_install() { - dolib.so src/libnss_cache_oslogin-${PV}.so - dolib.so src/libnss_oslogin-${PV}.so - - exeinto /usr/libexec - doexe src/google_authorized_keys - doexe src/google_oslogin_nss_cache - - dopammod src/pam_oslogin_admin.so - dopammod src/pam_oslogin_login.so - - # config files the base Ignition config will create links to - insinto /usr/share/google-oslogin - doins "${FILESDIR}/sshd_config" - doins "${FILESDIR}/60-flatcar-google-oslogin.conf" - doins "${FILESDIR}/nsswitch.conf" - doins "${FILESDIR}/pam_sshd" - doins "${FILESDIR}/oslogin-sudoers" - doins "${FILESDIR}/group.conf" -}