sys-apps/shadow: Revbumps to fix pam usage of chpasswd and newusers

Closes: https://bugs.gentoo.org/712372
Package-Manager: Portage-2.3.94, Repoman-2.3.21
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>

diff --git a/sys-apps/shadow/files/pam.d-include/chpasswd b/sys-apps/shadow/files/pam.d-include/chpasswd
new file mode 100644 (file)
index 0000000..1043726
--- /dev/null
+++ b/sys-apps/shadow/files/pam.d-include/chpasswd
@@ -0,0 +1,3 @@
+#%PAM-1.0
+
+password   include     system-auth

diff --git a/sys-apps/shadow/shadow-4.8-r3.ebuild b/sys-apps/shadow/shadow-4.8-r4.ebuild
similarity index 98%
rename from sys-apps/shadow/shadow-4.8-r3.ebuild
rename to sys-apps/shadow/shadow-4.8-r4.ebuild
index 54f1a3d52e847c95427cd9c120379d62d9b44eee..7dbee719cd43eb617055d772b30a960f4f29e27a 100644 (file)
--- a/sys-apps/shadow/shadow-4.8-r3.ebuild
+++ b/sys-apps/shadow/shadow-4.8-r4.ebuild
@@ -152,6 +152,10 @@ src_install() {
                        newpamd "${FILESDIR}"/pam.d-include/passwd ${x}
                done
 
+               for x in chpasswd newusers ; do
+                       newpamd "${FILESDIR}"/pam.d-include/chpasswd ${x}
+               done
+
                newpamd "${FILESDIR}"/pam.d-include/shadow-r1 groupmems
 
                # comment out login.defs options that pam hates

diff --git a/sys-apps/shadow/shadow-4.8.1-r1.ebuild b/sys-apps/shadow/shadow-4.8.1-r2.ebuild
similarity index 98%
rename from sys-apps/shadow/shadow-4.8.1-r1.ebuild
rename to sys-apps/shadow/shadow-4.8.1-r2.ebuild
index 864ebb3923b0b177059374098c3b6b17c5f69b3b..65f9a6539c890314c939883cf28a746b90307005 100644 (file)
--- a/sys-apps/shadow/shadow-4.8.1-r1.ebuild
+++ b/sys-apps/shadow/shadow-4.8.1-r2.ebuild
@@ -152,6 +152,10 @@ src_install() {
                        newpamd "${FILESDIR}"/pam.d-include/passwd ${x}
                done
 
+               for x in chpasswd newusers ; do
+                       newpamd "${FILESDIR}"/pam.d-include/chpasswd ${x}
+               done
+
                newpamd "${FILESDIR}"/pam.d-include/shadow-r1 groupmems
 
                # comment out login.defs options that pam hates