From 29e539125f8c1a419ae2b2e1a1d59866317dba1c Mon Sep 17 00:00:00 2001 From: Michael Weiser Date: Mon, 16 Mar 2020 19:23:07 +0100 Subject: [PATCH] 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 --- sys-apps/shadow/files/pam.d-include/chpasswd | 3 +++ .../shadow/{shadow-4.8-r3.ebuild => shadow-4.8-r4.ebuild} | 4 ++++ .../shadow/{shadow-4.8.1-r1.ebuild => shadow-4.8.1-r2.ebuild} | 4 ++++ 3 files changed, 11 insertions(+) create mode 100644 sys-apps/shadow/files/pam.d-include/chpasswd rename sys-apps/shadow/{shadow-4.8-r3.ebuild => shadow-4.8-r4.ebuild} (98%) rename sys-apps/shadow/{shadow-4.8.1-r1.ebuild => shadow-4.8.1-r2.ebuild} (98%) 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 000000000000..1043726b0e50 --- /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 54f1a3d52e84..7dbee719cd43 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 864ebb3923b0..65f9a6539c89 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 -- 2.26.2