From 3605c453567187e87439dc294bcc400d8a66aede63b7e8b04ce782f155c407be Mon Sep 17 00:00:00 2001 From: Thorsten Kukuk Date: Thu, 23 Jun 2016 09:30:50 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Linux-PAM/pam-config?expand=0&rev=82 --- common-account-pc | 13 ------------- common-auth-pc | 15 --------------- common-password-pc | 13 ------------- common-session-pc | 16 ---------------- pam-config.changes | 4 +--- pam-config.spec | 23 +++++++++-------------- 6 files changed, 10 insertions(+), 74 deletions(-) delete mode 100644 common-account-pc delete mode 100644 common-auth-pc delete mode 100644 common-password-pc delete mode 100644 common-session-pc diff --git a/common-account-pc b/common-account-pc deleted file mode 100644 index 240557b..0000000 --- a/common-account-pc +++ /dev/null @@ -1,13 +0,0 @@ -#%PAM-1.0 -# -# This file is autogenerated by pam-config. All changes -# will be overwritten. -# -# Account-related modules common to all services -# -# This file is included from other service-specific PAM config files, -# and should contain a list of the account modules that define -# the central access policy for use on the system. The default is to -# only deny service to users whose accounts are expired. -# -account required pam_unix.so try_first_pass diff --git a/common-auth-pc b/common-auth-pc deleted file mode 100644 index ebfea9b..0000000 --- a/common-auth-pc +++ /dev/null @@ -1,15 +0,0 @@ -#%PAM-1.0 -# -# This file is autogenerated by pam-config. All changes -# will be overwritten. -# -# Authentication-related modules common to all services -# -# This file is included from other service-specific PAM config files, -# and should contain a list of the authentication modules that define -# the central authentication scheme for use on the system -# (e.g., /etc/shadow, LDAP, Kerberos, etc.). The default is to use the -# traditional Unix authentication mechanisms. -# -auth required pam_env.so -auth required pam_unix.so try_first_pass diff --git a/common-password-pc b/common-password-pc deleted file mode 100644 index f7d9736..0000000 --- a/common-password-pc +++ /dev/null @@ -1,13 +0,0 @@ -#%PAM-1.0 -# -# This file is autogenerated by pam-config. All changes -# will be overwritten. -# -# Password-related modules common to all services -# -# This file is included from other service-specific PAM config files, -# and should contain a list of modules that define the services to be -# used to change user passwords. -# -password requisite pam_cracklib.so -password required pam_unix.so use_authtok nullok shadow try_first_pass diff --git a/common-session-pc b/common-session-pc deleted file mode 100644 index 870749b..0000000 --- a/common-session-pc +++ /dev/null @@ -1,16 +0,0 @@ -#%PAM-1.0 -# -# This file is autogenerated by pam-config. All changes -# will be overwritten. -# -# Session-related modules common to all services -# -# This file is included from other service-specific PAM config files, -# and should contain a list of modules that define tasks to be performed -# at the start and end of sessions of *any* kind (both interactive and -# non-interactive -# -session required pam_limits.so -session required pam_unix.so try_first_pass -session optional pam_umask.so -session optional pam_env.so diff --git a/pam-config.changes b/pam-config.changes index a2b47a4..03f7560 100644 --- a/pam-config.changes +++ b/pam-config.changes @@ -1,8 +1,6 @@ ------------------------------------------------------------------- -Tue May 31 15:41:15 CEST 2016 - kukuk@suse.de +Thu Jun 23 11:20:02 CEST 2016 - kukuk@suse.de -- No %ghost entries anymore, common-*-pc files are now real config - files for better tracking of modifications. - Update to version 0.91 - Adjust for Linux-PAM 1.3.0 - Automatically replace obsolete PAM modules no longer installed diff --git a/pam-config.spec b/pam-config.spec index 0725ca5..0a57f0e 100644 --- a/pam-config.spec +++ b/pam-config.spec @@ -23,12 +23,8 @@ Group: System/Management Version: 0.91 Release: 0 PreReq: pam >= 1.3.0 -Url: https://github.com/SUSE/pam-config +Url: https://github.com/SUSE/pam-config Source: %{name}-%{version}.tar.bz2 -Source1: common-account-pc -Source2: common-auth-pc -Source3: common-password-pc -Source4: common-session-pc BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -50,14 +46,13 @@ make %{?_smp_mflags} %install make install DESTDIR=$RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d -install -m 644 %SOURCE1 $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d/ -install -m 644 %SOURCE2 $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d/ -install -m 644 %SOURCE3 $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d/ -install -m 644 %SOURCE4 $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d/ +for i in account auth password session ; do + touch $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d/common-$i-pc +done %{find_lang} pam-config %post -if [ "$1" = "1" ]; then +if [ ! -f /etc/pam.d/common-auth-pc ] ; then pam-config --debug --create --force else pam-config --debug --update ||: @@ -88,9 +83,9 @@ fi %defattr(-,root,root) %{_sbindir}/pam-config %doc %{_mandir}/man8/pam-config.8* -%config %{_sysconfdir}/pam.d/common-account-pc -%config %{_sysconfdir}/pam.d/common-auth-pc -%config %{_sysconfdir}/pam.d/common-password-pc -%config %{_sysconfdir}/pam.d/common-session-pc +%ghost %config %{_sysconfdir}/pam.d/common-account-pc +%ghost %config %{_sysconfdir}/pam.d/common-auth-pc +%ghost %config %{_sysconfdir}/pam.d/common-password-pc +%ghost %config %{_sysconfdir}/pam.d/common-session-pc %changelog