commit: 2599ee817a0bfed88ecfd7fd86260c0be56abb63
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 26 13:32:12 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Aug 26 13:59:14 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2599ee81
sys-auth/pambase: add 20250826
Mike Gilbert (12):
Run black on pambase.py
Simplify debug and nullok options
Eliminate local_users_only variable
Drop unused krb5_authtok variable
Fix debug option for krb5
Inline krb5_params
Drop unused variable 'likeauth'
Inline 'unix_authtok' variable
Drop blank variables logic
tox: enable py313
Replace --sha512 and --yescrypt with --encrypt option
Rework pam_krb5 auth
Thibaud CANALE (3):
system-login: put lastlog failed login after MotD
system-login: display lastlog previous login too
templates/*: replace groups of spaces by tabulations
Bug: https://bugs.gentoo.org/939892
Bug: https://bugs.gentoo.org/950228
Bug: https://bugs.gentoo.org/956600
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-auth/pambase/Manifest | 1 +
...se-999999999.ebuild => pambase-20250826.ebuild} | 53 ++++++++++++----------
sys-auth/pambase/pambase-999999999.ebuild | 53 ++++++++++++----------
3 files changed, 61 insertions(+), 46 deletions(-)
diff --git a/sys-auth/pambase/Manifest b/sys-auth/pambase/Manifest
index 43c975757259..7168378e37d5 100644
--- a/sys-auth/pambase/Manifest
+++ b/sys-auth/pambase/Manifest
@@ -2,3 +2,4 @@ DIST pambase-20220214.tar.gz 3372 BLAKE2B
fc560005c48598d972cf68bfbd33784be7d7e5
DIST pambase-20240128.tar.bz2 5131 BLAKE2B
0950fff720f3a9d761a82303eaa7b997bfac635111b6cae772f7d9de2846147dbb4224326e5dba1868cb54a8a76076c2efed6615c861bbfa78256aba4f475da2
SHA512
6b4ad390c46f33947436892a5f19111a1c9f4ded406ae8ffe76539c94d541611b74ba697d76522b46da41f53aae45eb67c274fc0d6caec94d40c1691487624e6
DIST pambase-20250223.tar.bz2 5124 BLAKE2B
ea89d43c93d85baafa1a6951ae80c6306c762ab0524f84de86ed4b6a1abc1056e85c6b1f13012615ce2db40e113ce51e17ddcd274d5f4f4f94a0ec9315318500
SHA512
ce31d08f3fa51879cddab158ffed3dc9929c37a56e7dc2f757f7e87e72076a75d10874cba2020f398a198c0156ffc4ecc2ec5d6d654ca36f135a4f1837094b57
DIST pambase-20250228.tar.bz2 5144 BLAKE2B
ab4c8e84cc21e25ac12b66a3d9943becb62d4f53c2f9c201c79f2a1f1f1320f4bad2b56a2a76924386d7dbe9656abf5a0bd92bbbedda23088a26128aa743e79f
SHA512
e2ccbcd0c3e6f9fb035a2489a79bdfff5f12fe9393517d3b7ddb3bbd7a6a6e5b358663b1423166b0250931d50f608bb81a9f486fc53dbc7126b3980617387c94
+DIST pambase-20250826.tar.bz2 4925 BLAKE2B
c6929aa506b94b9215bd2c686fd9965d6c3a77f36c7a2d114ca5b2c39a30e2209a84408ee855559837d54161e359723889b89bb9c048bb36b00c7156495968fc
SHA512
c9bc07ac617891ddab6f2a8358b10899462d9b54fcc3642d222dd2402914f24225854103b6c581aa2041fb0feb0f94688e07aad10ab94c3a629b4cd2937bd785
diff --git a/sys-auth/pambase/pambase-999999999.ebuild
b/sys-auth/pambase/pambase-20250826.ebuild
similarity index 74%
copy from sys-auth/pambase/pambase-999999999.ebuild
copy to sys-auth/pambase/pambase-20250826.ebuild
index 01b62511d022..090d44646b70 100644
--- a/sys-auth/pambase/pambase-999999999.ebuild
+++ b/sys-auth/pambase/pambase-20250826.ebuild
@@ -3,9 +3,9 @@
EAPI=8
-PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_COMPAT=( python3_{11..13} )
-inherit pam python-any-r1 readme.gentoo-r1
+inherit edo pam python-any-r1 readme.gentoo-r1
DESCRIPTION="PAM base configuration files"
HOMEPAGE="https://github.com/gentoo/pambase";
@@ -70,27 +70,34 @@ python_check_deps() {
}
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' '--openrc') \
- $(usex yescrypt '--yescrypt' '') \
- $(usex sssd '--sssd' '') \
- || die
+ local crypt=md5
+ # TODO: sha256, blowfish, gost_yescrypt
+ use sha512 && crypt=sha512
+ use yescrypt && crypt=yescrypt
+
+ local pamargs=(
+ $(usev caps '--caps')
+ $(usev debug '--debug')
+ $(usev elogind '--elogind')
+ $(usev gnome-keyring '--gnome-keyring')
+ $(usev homed '--homed')
+ $(usev minimal '--minimal')
+ $(usev mktemp '--mktemp')
+ $(usev nullok '--nullok')
+ $(usev pam_krb5 '--krb5')
+ $(usev pam_ssh '--pam-ssh')
+ $(usev passwdqc '--passwdqc')
+ $(usev pwhistory '--pwhistory')
+ $(usev pwquality '--pwquality')
+ $(usev securetty '--securetty')
+ $(usev selinux '--selinux')
+ $(usex systemd '--systemd' '--openrc')
+ $(usev sssd '--sssd')
+
+ --encrypt=${crypt}
+ )
+
+ edo ${EPYTHON} ./${PN}.py "${pamargs[@]}"
}
src_test() { :; }
diff --git a/sys-auth/pambase/pambase-999999999.ebuild
b/sys-auth/pambase/pambase-999999999.ebuild
index 01b62511d022..090d44646b70 100644
--- a/sys-auth/pambase/pambase-999999999.ebuild
+++ b/sys-auth/pambase/pambase-999999999.ebuild
@@ -3,9 +3,9 @@
EAPI=8
-PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_COMPAT=( python3_{11..13} )
-inherit pam python-any-r1 readme.gentoo-r1
+inherit edo pam python-any-r1 readme.gentoo-r1
DESCRIPTION="PAM base configuration files"
HOMEPAGE="https://github.com/gentoo/pambase";
@@ -70,27 +70,34 @@ python_check_deps() {
}
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' '--openrc') \
- $(usex yescrypt '--yescrypt' '') \
- $(usex sssd '--sssd' '') \
- || die
+ local crypt=md5
+ # TODO: sha256, blowfish, gost_yescrypt
+ use sha512 && crypt=sha512
+ use yescrypt && crypt=yescrypt
+
+ local pamargs=(
+ $(usev caps '--caps')
+ $(usev debug '--debug')
+ $(usev elogind '--elogind')
+ $(usev gnome-keyring '--gnome-keyring')
+ $(usev homed '--homed')
+ $(usev minimal '--minimal')
+ $(usev mktemp '--mktemp')
+ $(usev nullok '--nullok')
+ $(usev pam_krb5 '--krb5')
+ $(usev pam_ssh '--pam-ssh')
+ $(usev passwdqc '--passwdqc')
+ $(usev pwhistory '--pwhistory')
+ $(usev pwquality '--pwquality')
+ $(usev securetty '--securetty')
+ $(usev selinux '--selinux')
+ $(usex systemd '--systemd' '--openrc')
+ $(usev sssd '--sssd')
+
+ --encrypt=${crypt}
+ )
+
+ edo ${EPYTHON} ./${PN}.py "${pamargs[@]}"
}
src_test() { :; }
