gentoo resync : 22.12.2021

4 files changed, 119 insertions, 4 deletions

diff --git a/sys-auth/pambase/Manifest b/sys-auth/pambase/Manifest
index 911685c5f819..88a3933cc343 100644
--- a/sys-auth/pambase/Manifest
+++ b/sys-auth/pambase/Manifest
@@ -1,4 +1,6 @@
 DIST pambase-20210201.1.tar.gz 3345 BLAKE2B bc12164181de98b3c5b8ed3b72bc6a84b5c6039f389a87da94e5cb9312fa4e221e6317bcd496d5c634c60cd6fbb8c8cd2f4b845687ef942a707fe687f5184afd SHA512 74ab4d7c19a20c088d667ae92e4dcb99b33584ba56df46184173432fd297bd47917494b81cb5ad3f5f49ad5a797c008527399f329e56f2799f5fc376eaa59236
-EBUILD pambase-20210201.1.ebuild 2866 BLAKE2B 6f142f9197f8db5797b753dcc016d2ea56574e02702c490d40d6d8ff2488189b56852c4dd614e4ba8832b235d9a595c135cb6d54fc1c2e767c296f37a20ba0c3 SHA512 e27c2257c6b71a750e36b3de7b4725c11b5c3c819a0ec2f0461687157d08828e5265d12b65882aebc55217390f1cd33df5be7bafd442c5a69535e7d09a2c0e6d
-EBUILD pambase-999999999.ebuild 2941 BLAKE2B 8cdd1697869dd1e1ade3db363b981631c97b7e9978165a172c20c0c04e968157dcfc76807307959b7639e22a530072868e733f0ccc1a2b16497a641318efe403 SHA512 16186f1385141d853daa0c7bada3021d9495f88d5d43ab11347ced115789e4daeecdbf57c599c16e21463c11102946ee022f3849a0ebf24ff2ce24f0d4e6f2ab
+DIST pambase-20211218.tar.gz 3366 BLAKE2B b07ae0b8f9480e0ad456fcfbd46da008182dedf3542b14c27cbe5d65a68290898751cd3e5a59cb8f040ced6316a70cdbc7afdd54ef2965a20ba537c686f76b36 SHA512 8aaaf15f9f82ce9f717a988676d00435e60bada05927843967b505a972d96a2ab7bab9971bd5476b8a8bda76c7063fa4d452818a89eccd4066f65d3f1b2fb3d7
+EBUILD pambase-20210201.1.ebuild 2867 BLAKE2B 31cbb3f7819bf1e43373155c1caa507dd75f52d99704f6f311d30d029343f8800023726aa4bd9a395ee8c7ba3f2d7e779cf98f510843ade7b7c3e3dcd8ae8488 SHA512 04ade06772081bd7565536f8acb7d23018eeda99a46252548dd79c6731812bc8b41736c353efe0da6aac6784d0617ca886f92210f42b062764893b39fb735c2c
+EBUILD pambase-20211218-r1.ebuild 2987 BLAKE2B e7354705c5fe852fd43fd1651ed483295f9af56b789907e6d9938859678d5a92f3e3a78b88e92d01fee6b8a97db27c86d0606e243b3f932522f43b03805d72ba SHA512 cfb6ef6d5639542dcc9e5d971713474fbc3e3878ab61ab41519bd8e5d1aa35a34ddec1a3cf9a774abf73c5045fedbe67aec2e22e400f4804391c1e24b6c9d831
+EBUILD pambase-999999999.ebuild 2979 BLAKE2B 999f604a69ea308b88b82bcc1c05a98f25d319fba59fcf356355d15f04b258e55070873c243e64c7e571ad65c55ee74b8d56d1ae033593a03f08e2fdd041e85f SHA512 9cf831acbc09aab08e7265bcc6313aac40ff43f2c39bed7f8414da406b9a2bbd4eab39788e31edb343628d123be5dc42fba06b0424855c33ab262f0985d11a32
 MISC metadata.xml 4061 BLAKE2B c877f6450ccfc91a3f3ee1bf10301cf21913f66a6d5f32f6698ea852006094243432a2fbc635821532355841ec074aa1ea426a745254f62e2e595d8049b3b75a SHA512 4c46b27df8f3b31c8f9474cf2b01c46014a3374c508f65970deb16476fbcf5710855322eb61d7fa65ac44a1fba60a2a223a26e890da3fed50102964f97306767
diff --git a/sys-auth/pambase/pambase-20210201.1.ebuild b/sys-auth/pambase/pambase-20210201.1.ebuild
index b4166689528b..6b1d2ac83aa1 100644
--- a/sys-auth/pambase/pambase-20210201.1.ebuild
+++ b/sys-auth/pambase/pambase-20210201.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit pam python-any-r1 readme.gentoo-r1
 
diff --git a/sys-auth/pambase/pambase-20211218-r1.ebuild b/sys-auth/pambase/pambase-20211218-r1.ebuild
new file mode 100644
index 000000000000..5719f207d53a
--- /dev/null
+++ b/sys-auth/pambase/pambase-20211218-r1.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+
+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"
+	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 yescrypt"
+
+RESTRICT="binchecks"
+
+REQUIRED_USE="
+	?? ( elogind systemd )
+	?? ( passwdqc pwquality )
+	?? ( sha512 yescrypt )
+	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] )
+	yescrypt? ( sys-libs/libxcrypt[system] )
+"
+
+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' '') \
+		$(usex yescrypt '--yescrypt' '') \
+	|| 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 e0387fbc8c5a..866bf8998786 100644
--- a/sys-auth/pambase/pambase-999999999.ebuild
+++ b/sys-auth/pambase/pambase-999999999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit pam python-any-r1 readme.gentoo-r1
 
@@ -83,6 +83,7 @@ src_configure() {
 		$(usex selinux '--selinux' '') \
 		$(usex sha512 '--sha512' '') \
 		$(usex systemd '--systemd' '') \
+		$(usex yescrypt '--yescrypt' '') \
 	|| die
 }