gentoo (valentine's day) resync : 14.02.2021

4 files changed, 123 insertions, 4 deletions

diff --git a/sys-auth/pambase/Manifest b/sys-auth/pambase/Manifest
index fc1697848354..070d832456e8 100644
--- a/sys-auth/pambase/Manifest
+++ b/sys-auth/pambase/Manifest
@@ -1,4 +1,6 @@
 DIST pambase-20201103.tar.gz 3295 BLAKE2B 7e104b5342842a21e10dce6e5c5a2d330ec06146b4791b888518463d915eebefbd694a809ff676b32c9c43945087935dc5c3496ae93ac17b7e4fd4e2e2974d1a SHA512 b94e47780f45c5e897b5fd073ce2184a901d241d51516ac5007658b1ae423d0f34c37a09a9e1d055962aa7158675ea7740dfe6466fad5e4a1b50b66a0812f51d
+DIST pambase-20210201.1.tar.gz 3345 BLAKE2B bc12164181de98b3c5b8ed3b72bc6a84b5c6039f389a87da94e5cb9312fa4e221e6317bcd496d5c634c60cd6fbb8c8cd2f4b845687ef942a707fe687f5184afd SHA512 74ab4d7c19a20c088d667ae92e4dcb99b33584ba56df46184173432fd297bd47917494b81cb5ad3f5f49ad5a797c008527399f329e56f2799f5fc376eaa59236
 EBUILD pambase-20201103.ebuild 2772 BLAKE2B d953df87a7801ef83ee9f1efeb6a9fd9f9ca3c2713004b3fb6ad853903a36e21fd70f17dd9eefabc5483ff6141238514487ae491afa98908d2f4c121b9597d91 SHA512 c43f51170fdc005d2fda51e3ab1eeafcf9ce6a3bd84ddbb63aa608e9f5548b1bfb367c8084e9b08f6a621d77298682d3ba8192baad0b641183b4bdfb8db47436
-EBUILD pambase-999999999.ebuild 2772 BLAKE2B d953df87a7801ef83ee9f1efeb6a9fd9f9ca3c2713004b3fb6ad853903a36e21fd70f17dd9eefabc5483ff6141238514487ae491afa98908d2f4c121b9597d91 SHA512 c43f51170fdc005d2fda51e3ab1eeafcf9ce6a3bd84ddbb63aa608e9f5548b1bfb367c8084e9b08f6a621d77298682d3ba8192baad0b641183b4bdfb8db47436
-MISC metadata.xml 3810 BLAKE2B f4485cfec915c9e239c9328e6df338ba787ab26c3bb4f84773aa29361f4e2c48b56afb787c176fb38e8dc1c923e07c5baa6aeb5dba2774fe61f20250baf36b7d SHA512 ea58b1a801e68eeb8b7325192f5f26b406879bb70a46383222ffb9f69c71e5f9803532f2cca510ec0bc5cc3a96ceb165ed11725341a51b123fe8d4a712f4c26a
+EBUILD pambase-20210201.1.ebuild 2898 BLAKE2B 514d785cb2a0466ea47687c297afa36ac2d8052400beff9e8697c22b470c980369071038cad9693df6f36b48d37f23e4b27288a95e41bce1b325fab0ef426cd7 SHA512 1f272617eedcd27310bc6ab55164bcfcbea83f91e178f6d7f561569b551f5f57b21fc149577654f1fd1b75499414c4bbc7e5e59e43a54436c8b396bc831ea889
+EBUILD pambase-999999999.ebuild 2889 BLAKE2B 9e390cbaa743cbf1cb2172f93757672462785a6672bfdf77013a3ae6c930cca5ae55fde3ce0a5c12cc887d805d4eb42edef41f3f8dc0002d63ed75e5e0412c55 SHA512 d3f635a0caa16712ae211d8faff05611acc1f7203b88879b36de080c6902b9cfef70e0cbdc889b9925a8baaac6decea5c939e5aca22c780209ccc2eacd3c8af2
+MISC metadata.xml 3934 BLAKE2B ca15cea69fca97ebe00c624a8bf63293a348446b9cf6a2450338087b894f68e35cc5de037119a9534e4046e7ba6364e60397749d6ef4678f3220739603a77888 SHA512 9550417607667acdffdfb1ca9936bf697ae995a42d8be788d7215a8231bff8d92ed0caaa926450234f4720d6731efa6b9ace35900a3d6a0ce9040574399ccb77
diff --git a/sys-auth/pambase/metadata.xml b/sys-auth/pambase/metadata.xml
index 6b0d63269f7e..d9afbc2959ea 100644
--- a/sys-auth/pambase/metadata.xml
+++ b/sys-auth/pambase/metadata.xml
@@ -17,6 +17,10 @@
 			Use pam_systemd module to register user sessions in the systemd
 			control group hierarchy.
 		</flag>
+		<flag name="homed">
+			Use pam_systemd_home module to manage home directories with
+			the systemd-homed service
+		</flag>
 		<flag name="debug">
 			Enable debug information logging on syslog(3) for all the
 			modules supporting this in the system authentication and system
diff --git a/sys-auth/pambase/pambase-20210201.1.ebuild b/sys-auth/pambase/pambase-20210201.1.ebuild
new file mode 100644
index 000000000000..6a54131b47e8
--- /dev/null
+++ b/sys-auth/pambase/pambase-20210201.1.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit pam python-any-r1 readme.gentoo-r1
+
+DESCRIPTION="PAM base configuration files"
+HOMEPAGE="https://github.com/gentoo/pambase"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/gentoo/pambase.git"
+else
+	SRC_URI="https://github.com/gentoo/pambase/archive/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	S="${WORKDIR}/${PN}-${P}"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="caps debug elogind gnome-keyring homed minimal mktemp +nullok pam_krb5 pam_ssh +passwdqc pwhistory pwquality securetty selinux +sha512 systemd"
+
+RESTRICT="binchecks"
+
+REQUIRED_USE="
+	?? ( elogind systemd )
+	?? ( passwdqc pwquality )
+	pwhistory? ( || ( passwdqc pwquality ) )
+	homed? ( !pam_krb5 )
+	pam_krb5? ( !homed )
+"
+
+MIN_PAM_REQ=1.4.0
+
+RDEPEND="
+	>=sys-libs/pam-${MIN_PAM_REQ}
+	elogind? ( sys-auth/elogind[pam] )
+	gnome-keyring? ( gnome-base/gnome-keyring[pam] )
+	mktemp? ( sys-auth/pam_mktemp )
+	pam_krb5? (
+		>=sys-libs/pam-${MIN_PAM_REQ}
+		sys-auth/pam_krb5
+	)
+	caps? ( sys-libs/libcap[pam] )
+	pam_ssh? ( sys-auth/pam_ssh )
+	passwdqc? ( >=sys-auth/passwdqc-1.4.0-r1 )
+	pwquality? ( dev-libs/libpwquality[pam] )
+	selinux? ( sys-libs/pam[selinux] )
+	sha512? ( >=sys-libs/pam-${MIN_PAM_REQ} )
+	homed? ( sys-apps/systemd[homed] )
+	systemd? ( sys-apps/systemd[pam] )
+"
+
+BDEPEND="$(python_gen_any_dep '
+		dev-python/jinja[${PYTHON_USEDEP}]
+	')"
+
+python_check_deps() {
+	has_version -b "dev-python/jinja[${PYTHON_USEDEP}]"
+}
+
+src_configure() {
+	${EPYTHON} ./${PN}.py \
+		$(usex caps '--caps' '') \
+		$(usex debug '--debug' '') \
+		$(usex elogind '--elogind' '') \
+		$(usex gnome-keyring '--gnome-keyring' '') \
+		$(usex homed '--homed' '') \
+		$(usex minimal '--minimal' '') \
+		$(usex mktemp '--mktemp' '') \
+		$(usex nullok '--nullok' '') \
+		$(usex pam_krb5 '--krb5' '') \
+		$(usex pam_ssh '--pam-ssh' '') \
+		$(usex passwdqc '--passwdqc' '') \
+		$(usex pwhistory '--pwhistory' '') \
+		$(usex pwquality '--pwquality' '') \
+		$(usex securetty '--securetty' '') \
+		$(usex selinux '--selinux' '') \
+		$(usex sha512 '--sha512' '') \
+		$(usex systemd '--systemd' '') \
+	|| die
+}
+
+src_test() { :; }
+
+src_install() {
+	local DOC_CONTENTS
+
+	if use passwdqc; then
+		DOC_CONTENTS="To amend the existing password policy please see the man 5 passwdqc.conf
+				page and then edit the /etc/security/passwdqc.conf file"
+	fi
+
+	if use pwquality; then
+		DOC_CONTENTS="To amend the existing password policy please see the man 5 pwquality.conf
+				page and then edit the /etc/security/pwquality.conf file"
+	fi
+
+	{ use passwdqc || use pwquality; } && readme.gentoo_create_doc
+
+	dopamd -r stack/.
+}
+
+pkg_postinst() {
+	{ use passwdqc || use pwquality; } && readme.gentoo_print_elog
+}
diff --git a/sys-auth/pambase/pambase-999999999.ebuild b/sys-auth/pambase/pambase-999999999.ebuild
index 085421e24509..e3fe00b01f59 100644
--- a/sys-auth/pambase/pambase-999999999.ebuild
+++ b/sys-auth/pambase/pambase-999999999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -21,7 +21,7 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="caps debug elogind gnome-keyring minimal mktemp +nullok pam_krb5 pam_ssh +passwdqc pwhistory pwquality securetty selinux +sha512 systemd"
+IUSE="caps debug elogind gnome-keyring homed minimal mktemp +nullok pam_krb5 pam_ssh +passwdqc pwhistory pwquality securetty selinux +sha512 systemd"
 
 RESTRICT="binchecks"
 
@@ -29,6 +29,8 @@ REQUIRED_USE="
 	?? ( elogind systemd )
 	?? ( passwdqc pwquality )
 	pwhistory? ( || ( passwdqc pwquality ) )
+	homed? ( !pam_krb5 )
+	pam_krb5? ( !homed )
 "
 
 MIN_PAM_REQ=1.4.0
@@ -48,6 +50,7 @@ RDEPEND="
 	pwquality? ( dev-libs/libpwquality[pam] )
 	selinux? ( sys-libs/pam[selinux] )
 	sha512? ( >=sys-libs/pam-${MIN_PAM_REQ} )
+	homed? ( sys-apps/systemd[homed] )
 	systemd? ( sys-apps/systemd[pam] )
 "
 
@@ -65,6 +68,7 @@ src_configure() {
 		$(usex debug '--debug' '') \
 		$(usex elogind '--elogind' '') \
 		$(usex gnome-keyring '--gnome-keyring' '') \
+		$(usex homed '--homed' '') \
 		$(usex minimal '--minimal' '') \
 		$(usex mktemp '--mktemp' '') \
 		$(usex nullok '--nullok' '') \