gentoo resync : 23.09.2020

3 files changed, 36 insertions, 11 deletions

diff --git a/sys-auth/pambase/Manifest b/sys-auth/pambase/Manifest
index db05926db1ea..33d290e1b392 100644
--- a/sys-auth/pambase/Manifest
+++ b/sys-auth/pambase/Manifest
@@ -1,5 +1,5 @@
 DIST pambase-20200304.tar.gz 3466 BLAKE2B e4d406460d435403ed7a46d517f9006cacc54a94f5019a573c81b331731c88679ed6d388354b5946894bdfada556b4c73735c3f4de88fc7678cd831c68ab46c3 SHA512 c2a7f3fd143637fbdf5c0a3c58ba5a3c23c5e8adb1f057d02b4b9d64660435fc529031a0f710a9e5fc7091710f78dcb2f3e1ff48f033fb491ddd0399ef05b189
-DIST pambase-20200817.tar.gz 3340 BLAKE2B 76a9afbf29ab9ee6f7d25943de8c7c7bdd3413ade64d7a7623d5aec297cd864c1696a6442179d8d7c52f4df00644d80486e0dc61255454aa72b18eb9ae901ed8 SHA512 5448335da1437776f6097e591a1bd52dc62fb1847622c19077f14cdf8a677bc916f220903e4c6e924d43360fec0010a23b9cdf62aeba2a617ef6208eac2438eb
+DIST pambase-20200917.tar.gz 3342 BLAKE2B 4dde3a6a4a22f02464a2a703a2385038c53c05398904dc47431880a16d7dd1ba89c8f5fdf19a7d50406f2487f8bdf90264ca2941cc6a2ad9d404e89c3d73edca SHA512 0cae27f7cd7ef258771b61110ba3ce5a44a0f9d71030670b2a40aa47a609d30ae3e3d7bc0649dcce25a2cfe2e1259e6d9ff435118ab1d2db771a162898ab5143
 EBUILD pambase-20200304.ebuild 2169 BLAKE2B 04b9658390ae7c88df12dfc4611665fd9bbdb21c4f7fe2c3e0d2b52eb795842a3f80f429a44d0f15027e2092d7f3cae7fb5978178b78cf580504feec194d6a84 SHA512 f718edc810dc14ed9f93816c997bf74e0563003535bcc82c524f3febdc7c8c32f187a954d5d99ecbd06a6c154b004d1ce0c86674e5f5a30eda3fe2368f771ef5
-EBUILD pambase-20200817.ebuild 1998 BLAKE2B 42923fa493d60e0d2197059c2568c307eceb52e2186edd25f687b227ca4b4cf3fea2b8a1bd8e1b7f4eaa9c7b0e027fbe88e1091a571d0a5b2ea3a2b736972712 SHA512 be84f55e7c498c2ba60093aad34e36909d4d514bba6db7e460d07b9768c8f46cb14c44c89f8987ffb32264b226836b09a1c8962e95c162cb10eed30602ebc245
-MISC metadata.xml 4065 BLAKE2B 001a1fff09797ee77e84c442c7d85ab11d7c8448f9eb34c2aad8e117091ddcdc639511d094e125e920139f94f4a5f7be53c13320848b760be099a1e79dc03cf5 SHA512 5552b7a640e13031aaa6fc9a42ffb3e0285fcd7293db94975d124b655ece670a15386b61a6f2ed71696d4ddc10442c813b86d07f46714374b3fe84ac2f60b937
+EBUILD pambase-20200917.ebuild 2640 BLAKE2B e5adae78bf0e9352a9912f5f6f9197206ebfa367754f16920eb55113e5a4f90d58908d40d0115c13215d6e7c6c235261dffba3facf3733b5ab75c8cd6277948e SHA512 69964dd314abe7bd2b6d86faaaa8f16c91fbdde84e2b3b76521e9d7bec5bce6dbbee5746cc95de9ff0b007e7d8798153a8da8f490fa2335829b5259303f103da
+MISC metadata.xml 4274 BLAKE2B 76b7588ad42eeff135eb81cf0f9e4eb1c1ce6329e62138cf934ea99cc74ae4eb45ad224072210cd5630484a71583e86d2d304a07e83f3f36284d760a73848195 SHA512 6f0fe0ac7c20e8203bc858ff54323c3e9ffb564fdb67da601c7a99218e3a5b7666bbc2c548314547a4d842cc0cd40058d98f7d13ca103cd427482fe25ff89af6
diff --git a/sys-auth/pambase/metadata.xml b/sys-auth/pambase/metadata.xml
index bb8fe7281268..f64b16605601 100644
--- a/sys-auth/pambase/metadata.xml
+++ b/sys-auth/pambase/metadata.xml
@@ -39,6 +39,12 @@
 			or providing example passwords when changing your system password.
 			It is used by default by OpenWall GNU/*/Linux and by FreeBSD.
 		</flag>
+		<flag name="pwhistory">
+			Enable pam_pwhistory module on system auth stack to save
+			the last passwords for each user in order to force password
+			change history and keep the user from alternating between
+			the same password too frequently.
+		</flag>
 		<flag name="pwquality">
 			Enable pam_pwquality module on system auth stack for passwd
 			quality validation. It is used be dafault by Fedora GNU/*/Linux.
@@ -78,11 +84,10 @@
 		</flag>
 		<flag name="minimal">
 			Disables the standard PAM modules that provide extra information
-			to users on login; this includes pam_tally (and pam_tally2 for
-			Linux PAM 1.1 and later), pam_lastlog, pam_motd and other
-			similar modules. This might not be a good idea on a multi-user
-			system but could reduce slightly the overhead on single-user
-			non-networked systems.
+			to users on login; this includes pam_lastlog, pam_motd, pam_mail
+			and other similar modules. This might not be a good idea on 
+			a multi-user system but could reduce slightly the overhead on
+			single-user non-networked systems.
 		</flag>
 		<flag name="nullok">
 			Enable the nullok option with the pam_unix module. This allows
diff --git a/sys-auth/pambase/pambase-20200817.ebuild b/sys-auth/pambase/pambase-20200917.ebuild
index 8639fcf1d2b8..a1bd1d6b4bae 100644
--- a/sys-auth/pambase/pambase-20200817.ebuild
+++ b/sys-auth/pambase/pambase-20200917.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{7..9} )
 
-inherit pam python-any-r1
+inherit pam python-any-r1 readme.gentoo-r1
 
 DESCRIPTION="PAM base configuration files"
 HOMEPAGE="https://github.com/gentoo/pambase"
@@ -14,13 +14,14 @@ SRC_URI="https://github.com/gentoo/pambase/archive/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="caps debug elogind gnome-keyring minimal mktemp +nullok pam_krb5 pam_ssh +passwdqc pwquality securetty selinux +sha512 systemd"
+IUSE="caps debug elogind gnome-keyring 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 ) )
 "
 
 MIN_PAM_REQ=1.4.0
@@ -36,7 +37,7 @@ RDEPEND="
 	)
 	caps? ( sys-libs/libcap[pam] )
 	pam_ssh? ( sys-auth/pam_ssh )
-	passwdqc? ( sys-auth/passwdqc )
+	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} )
@@ -65,6 +66,7 @@ src_configure() {
 	$(usex pam_krb5 '--krb5' '') \
 	$(usex pam_ssh '--pam-ssh' '') \
 	$(usex passwdqc '--passwdqc' '') \
+	$(usex pwhistory '--pwhistory' '') \
 	$(usex pwquality '--pwquality' '') \
 	$(usex securetty '--securetty' '') \
 	$(usex selinux '--selinux' '') \
@@ -75,5 +77,23 @@ src_configure() {
 src_test() { :; }
 
 src_install() {
+	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
+}