commit:     29e539125f8c1a419ae2b2e1a1d59866317dba1c
Author:     Michael Weiser <michael <AT> weiser <DOT> dinsnail <DOT> net>
AuthorDate: Mon Mar 16 18:23:07 2020 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Mar 16 18:24:18 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29e53912

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 <AT> gentoo.org>

 sys-apps/shadow/files/pam.d-include/chpasswd                       | 3 +++
 sys-apps/shadow/{shadow-4.8-r3.ebuild => shadow-4.8-r4.ebuild}     | 4 ++++
 sys-apps/shadow/{shadow-4.8.1-r1.ebuild => shadow-4.8.1-r2.ebuild} | 4 ++++
 3 files changed, 11 insertions(+)

diff --git a/sys-apps/shadow/files/pam.d-include/chpasswd 
b/sys-apps/shadow/files/pam.d-include/chpasswd
new file mode 100644
index 00000000000..1043726b0e5
--- /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 54f1a3d52e8..7dbee719cd4 100644
--- 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 864ebb3923b..65f9a6539c8 100644
--- 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

Reply via email to