[packages/coreutils/AC-branch] drop pam_keyinit from pam for ac

glen glen at pld-linux.org
Tue Apr 21 11:49:48 CEST 2015


commit 211e0494cec68951bca6da803520c23f45e496bf
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Tue Apr 21 12:49:40 2015 +0300

    drop pam_keyinit from pam for ac

 coreutils.spec | 7 +------
 runuser-l.pamd | 1 -
 su-l.pamd      | 1 -
 3 files changed, 1 insertion(+), 8 deletions(-)
---
diff --git a/coreutils.spec b/coreutils.spec
index f24bee8..1d02831 100644
--- a/coreutils.spec
+++ b/coreutils.spec
@@ -7,7 +7,7 @@ Summary:	GNU Core-utils - basic command line utilities
 Summary(pl.UTF-8):	GNU Core-utils - podstawowe narzędzia działające z linii poleceń
 Name:		coreutils
 Version:	8.10
-Release:	5
+Release:	6
 License:	GPL v3+
 Group:		Applications/System
 Source0:	http://ftp.gnu.org/gnu/coreutils/%{name}-%{version}.tar.xz
@@ -204,11 +204,6 @@ rm -f $RPM_BUILD_ROOT%{_mandir}/*/man1/{hostname,kill,uptime}.1
 # always remove, never packaged but sometimes installed
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 
-%if "%{pld_release}" == "ac"
-# not present in ac, no point searching it
-%{__sed} -i -e '/pam_keyinit.so/d' $RPM_BUILD_ROOT/etc/pam.d/sudo*
-%endif
-
 %find_lang %{name}
 
 %clean
diff --git a/runuser-l.pamd b/runuser-l.pamd
index fa1e4d8..e1d12c5 100644
--- a/runuser-l.pamd
+++ b/runuser-l.pamd
@@ -1,4 +1,3 @@
 #%PAM-1.0
 auth		include		runuser
-session		optional	pam_keyinit.so force revoke
 session		include		runuser
diff --git a/su-l.pamd b/su-l.pamd
index 656a139..c9b8f2e 100644
--- a/su-l.pamd
+++ b/su-l.pamd
@@ -2,5 +2,4 @@
 auth		include		su
 account		include		su
 password	include		su
-session		optional	pam_keyinit.so force revoke
 session		include		su
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/coreutils.git/commitdiff/211e0494cec68951bca6da803520c23f45e496bf



More information about the pld-cvs-commit mailing list