gentoo auto-resync : 19:01:2024 - 08:07:41

4 files changed, 136 insertions, 14 deletions

diff --git a/sys-auth/pambase/Manifest b/sys-auth/pambase/Manifest
index 6bffadf80968..4c10b686af92 100644
--- a/sys-auth/pambase/Manifest
+++ b/sys-auth/pambase/Manifest
@@ -1,4 +1,6 @@
 DIST pambase-20220214.tar.gz 3372 BLAKE2B fc560005c48598d972cf68bfbd33784be7d7e5a12f5ebcd06e708241a169b1bcf7cb7dcd7109f44c2d9802ae0b294eaeb61782640f0b0cb9767f2ecf8c053c7f SHA512 57d037944cf6d9db69d5eb8ce32b087ac4781fae13c1daba1e248a1818dfcbbf2cb66fce79cad7808f2b0f89d3f3dd05455a1c8f3c976561769b056dc8bf7323
+DIST pambase-20240119.tar.bz2 5132 BLAKE2B 830afd9fe570a8b782a8bf4e0b5f73e50fff59b884a95bf67352de76529f81c2b7482c352b561ece19c662480827a99923df4658049fe857937436b01cf69a98 SHA512 8cbf9196a008a575652b95071cef32d7117370887c9194f2c80de6ae725edb3cff52385555d09bb1c5492d8f068d17f358f8fdf72d9bd4b4f7743ec3a0c98cc8
 EBUILD pambase-20220214.ebuild 2990 BLAKE2B 1b4df77cb1ef13c8e89c2293b7ba960cf7b1932d3660c2e6352b6a03e6c69b08d23a671ae67c9aa7c5fd99c851daa718dc51516eb9aac1a2884b395d6be169ee SHA512 17c4084e974a02ca4c502bc1b4adcc3a36265869bade04dbc7fe0d7614d9adeb3e6e016edaa0a0a96561c2e25b17119687b9df52322187bb789eb9293f5595dd
-EBUILD pambase-999999999.ebuild 2983 BLAKE2B 4f21d3d3b134e1c0ea1a91f4a1fd76e25724d1e28ea4474184873041c6e8b1abca28be7b2ba7a6f4b4a99667a6e85cb59449cba8d377b86060f2e5268e5f27e9 SHA512 1586fbe7d95257d12c0ffdd9cd40403f4d1fce5c93dc0846853652f94e2a15f763d093f9e270de8e0f1cb46cdb801245f5248ab4067b35fa73abb49f4995ebef
-MISC metadata.xml 4168 BLAKE2B 898cfb8b48119e7a6f1bb5d435463331cf8a338ef015921ee96559e080883f60d56a4f7b94bef4b104681f42cb0ad245be82503b3d25260e3d142a35bee1ba05 SHA512 043f0f87f0fb5228eff5656ee52e4d889e9d9a0d5e7c1a0da266c5526f2a91728260a6b791c727d8e0cd16c2c3876c1ae6288a0334487637e68ab465bda83875
+EBUILD pambase-20240119.ebuild 3041 BLAKE2B c200d80e0ec0304700e56ecacb09a30a4f64c86ce582d021a2c68f63ad44a9e5ecc21a6efda91c78d452324f0d52055e78555634ae1a143d869435a84853bae9 SHA512 0524d107c9a4f98cee9b62f55b14e7b8b27c26c51859bc7e9fd2d97da61ff6961f5b3972417bb49d16b03a6d91dbc0a043206a80ee27f5fed29f62ee79b15a49
+EBUILD pambase-999999999.ebuild 3041 BLAKE2B c200d80e0ec0304700e56ecacb09a30a4f64c86ce582d021a2c68f63ad44a9e5ecc21a6efda91c78d452324f0d52055e78555634ae1a143d869435a84853bae9 SHA512 0524d107c9a4f98cee9b62f55b14e7b8b27c26c51859bc7e9fd2d97da61ff6961f5b3972417bb49d16b03a6d91dbc0a043206a80ee27f5fed29f62ee79b15a49
+MISC metadata.xml 4170 BLAKE2B 72042c7e3593a7f26805df66721d0399820c1f719d1f889d83bd043ee45e6f36f7d25abb96def26340a2492ccfadca644712b43216d3ca25681eb5140a735062 SHA512 da2b81ae108f79d425928963a6a69eb565d0ff1c38755085004e3a6ef3c54ab76266db9be75692bc69c622c3a86c6f42fd2f6d8cc692914cd97dd278dfcba745
diff --git a/sys-auth/pambase/metadata.xml b/sys-auth/pambase/metadata.xml
index 8c6bc7d0d64a..45396281fe28 100644
--- a/sys-auth/pambase/metadata.xml
+++ b/sys-auth/pambase/metadata.xml
@@ -72,8 +72,8 @@
 		</flag>
 		<flag name="pam_krb5">
 			Enable pam_krb5 module on system auth stack, as an alternative
-			to pam_unix. If Kerberos authentication succeed, only pam_unix
-			will be ignore, and all the other modules will proceed as usual,
+			to pam_unix. If Kerberos authentication succeeds, only pam_unix
+			will be ignorde, and all the other modules will proceed as usual,
 			including Gnome Keyring and other session modules. It requires
 			<pkg>sys-libs/pam</pkg> as PAM implementation.
 		</flag>
diff --git a/sys-auth/pambase/pambase-20240119.ebuild b/sys-auth/pambase/pambase-20240119.ebuild
new file mode 100644
index 000000000000..f1bcc8c30fab
--- /dev/null
+++ b/sys-auth/pambase/pambase-20240119.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+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://anongit.gentoo.org/git/proj/pambase.git
+		https://github.com/gentoo/pambase.git
+	"
+else
+	SRC_URI="https://gitweb.gentoo.org/proj/pambase.git/snapshot/${P}.tar.bz2"
+
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+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() {
+	python_has_version "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 f1a0a423fa7e..f1bcc8c30fab 100644
--- a/sys-auth/pambase/pambase-999999999.ebuild
+++ b/sys-auth/pambase/pambase-999999999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit pam python-any-r1 readme.gentoo-r1
 
@@ -12,11 +12,14 @@ HOMEPAGE="https://github.com/gentoo/pambase"
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://github.com/gentoo/pambase.git"
+	EGIT_REPO_URI="
+		https://anongit.gentoo.org/git/proj/pambase.git
+		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}"
+	SRC_URI="https://gitweb.gentoo.org/proj/pambase.git/snapshot/${P}.tar.bz2"
+
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 LICENSE="MIT"
@@ -55,10 +58,11 @@ RDEPEND="
 	systemd? ( sys-apps/systemd[pam] )
 	yescrypt? ( sys-libs/libxcrypt[system] )
 "
-
-BDEPEND="$(python_gen_any_dep '
+BDEPEND="
+	$(python_gen_any_dep '
 		dev-python/jinja[${PYTHON_USEDEP}]
-	')"
+	')
+"
 
 python_check_deps() {
 	python_has_version "dev-python/jinja[${PYTHON_USEDEP}]"