From 93f986da59826e8b966f49e10262020ea2792cd0 Mon Sep 17 00:00:00 2001
From: huangzq6 <huangzhenqiang2@huawei.com>
Date: Tue, 12 May 2020 20:23:25 +0800
Subject: [PATCH] enable --with-libpam

---
 chpasswd    |  5 +++++
 newusers    |  5 +++++
 shadow.spec | 30 ++++++++++++++++++------------
 3 files changed, 28 insertions(+), 12 deletions(-)
 create mode 100644 chpasswd
 create mode 100644 newusers

diff --git a/chpasswd b/chpasswd
new file mode 100644
index 0000000..15c4663
--- /dev/null
+++ b/chpasswd
@@ -0,0 +1,5 @@
+#%PAM-1.0
+# This tool only uses the password stack.
+password   substack system-auth
+-password   optional    pam_gnome_keyring.so use_authtok
+password   substack postlogin
diff --git a/newusers b/newusers
new file mode 100644
index 0000000..15c4663
--- /dev/null
+++ b/newusers
@@ -0,0 +1,5 @@
+#%PAM-1.0
+# This tool only uses the password stack.
+password   substack system-auth
+-password   optional    pam_gnome_keyring.so use_authtok
+password   substack postlogin
diff --git a/shadow.spec b/shadow.spec
index cd2b31e..729c8f8 100644
--- a/shadow.spec
+++ b/shadow.spec
@@ -1,6 +1,6 @@
 Name: shadow
 Version: 4.8.1
-Release: 1
+Release: 2
 Epoch: 2
 License: BSD and GPLv2+
 Summary: Tools for managing accounts and shadow password files
@@ -10,6 +10,8 @@ Source2: shadow-utils.useradd
 Source3: shadow-utils.login.defs
 Source4: shadow-bsd.txt
 Source5: https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
+Source6: chpasswd
+Source7: newusers
 # fix unknown item 'LASTLOG_MAX_UID'
 Patch0:  shadow-4.5-goodname.patch
 Patch1:  fix-logmsg.patch
@@ -24,7 +26,7 @@ Patch8:  shadow-utils-fix-lock-file-residue.patch
 BuildRequires: gcc, libselinux-devel, audit-libs-devel, libsemanage-devel
 BuildRequires: libacl-devel, libattr-devel gdb
 BuildRequires: bison, flex, gnome-doc-utils, docbook-style-xsl, docbook-dtds
-BuildRequires: autoconf, automake, libtool, gettext-devel, itstool
+BuildRequires: autoconf, automake, libtool, gettext-devel, itstool, pam-devel
 Requires: libselinux
 Requires: audit
 Requires: setup
@@ -62,7 +64,7 @@ autoreconf -fiv
         --with-sha-crypt \
         --with-selinux \
         --without-libcrack \
-        --without-libpam \
+        --with-libpam \
         --disable-shared \
         --with-group-name-max-length=32
 %make_build
@@ -73,7 +75,8 @@ rm -rf $RPM_BUILD_ROOT
 install -d -m 755 $RPM_BUILD_ROOT/%{_sysconfdir}/default
 install -p -c -m 0644 %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/login.defs
 install -p -c -m 0600 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/default/useradd
-
+install -p -c -m 0644 %{SOURCE6} $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d/chpasswd
+install -p -c -m 0644 %{SOURCE7} $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d/newusers
 
 ln -s useradd $RPM_BUILD_ROOT%{_sbindir}/adduser
 ln -s useradd.8 $RPM_BUILD_ROOT/%{_mandir}/man8/adduser.8
@@ -90,8 +93,6 @@ rm $RPM_BUILD_ROOT/%{_bindir}/login
 rm $RPM_BUILD_ROOT/%{_bindir}/passwd
 rm $RPM_BUILD_ROOT/%{_bindir}/su
 rm $RPM_BUILD_ROOT/%{_bindir}/faillog
-rm $RPM_BUILD_ROOT/%{_sysconfdir}/login.access
-rm $RPM_BUILD_ROOT/%{_sysconfdir}/limits
 rm $RPM_BUILD_ROOT/%{_sbindir}/logoutd
 rm $RPM_BUILD_ROOT/%{_sbindir}/nologin
 rm $RPM_BUILD_ROOT/%{_mandir}/man1/chfn.*
@@ -108,14 +109,8 @@ rm $RPM_BUILD_ROOT/%{_mandir}/man1/passwd.*
 rm $RPM_BUILD_ROOT/%{_mandir}/*/man1/passwd.*
 rm $RPM_BUILD_ROOT/%{_mandir}/man1/su.*
 rm $RPM_BUILD_ROOT/%{_mandir}/*/man1/su.*
-rm $RPM_BUILD_ROOT/%{_mandir}/man5/limits.*
-rm $RPM_BUILD_ROOT/%{_mandir}/*/man5/limits.*
-rm $RPM_BUILD_ROOT/%{_mandir}/man5/login.access.*
-rm $RPM_BUILD_ROOT/%{_mandir}/*/man5/login.access.*
 rm $RPM_BUILD_ROOT/%{_mandir}/man5/passwd.*
 rm $RPM_BUILD_ROOT/%{_mandir}/*/man5/passwd.*
-rm $RPM_BUILD_ROOT/%{_mandir}/man5/porttime.*
-rm $RPM_BUILD_ROOT/%{_mandir}/*/man5/porttime.*
 rm $RPM_BUILD_ROOT/%{_mandir}/man5/suauth.*
 rm $RPM_BUILD_ROOT/%{_mandir}/*/man5/suauth.*
 rm $RPM_BUILD_ROOT/%{_mandir}/man8/logoutd.*
@@ -128,6 +123,11 @@ rm $RPM_BUILD_ROOT/%{_mandir}/man5/faillog.*
 rm $RPM_BUILD_ROOT/%{_mandir}/*/man5/faillog.*
 rm $RPM_BUILD_ROOT/%{_mandir}/man8/faillog.*
 rm $RPM_BUILD_ROOT/%{_mandir}/*/man8/faillog.*
+rm $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d/chfn
+rm $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d/chsh
+rm $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d/login
+rm $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d/passwd
+rm $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d/su
 
 find $RPM_BUILD_ROOT%{_mandir} -depth -type d -empty -delete
 %find_lang shadow
@@ -160,11 +160,17 @@ done
 %{_sbindir}/newusers
 %{_sbindir}/vipw
 %{_sbindir}/vigr
+%{_sysconfdir}/pam.d/chpasswd
+%{_sysconfdir}/pam.d/groupmems
+%{_sysconfdir}/pam.d/newusers
 
 %files help
 %{_mandir}/*/*
 
 %changelog
+* Tue May 12 2020 steven<steven_ygui@163.com> - 2:4.8.1-2
+- Enable --with-libpam config during compiling
+
 * Fri Apr 24 2020 steven<steven_ygui@163.com> - 2:4.8.1-1
 - Upgrade version to 4.8.1
 
-- 
Gitee