From 0a6b103e2d9faa60c4b0d94403412123058102a174242530f7cb6a8efedd8bc3 Mon Sep 17 00:00:00 2001 From: Thorsten Kukuk Date: Thu, 22 Feb 2018 15:24:58 +0000 Subject: [PATCH 1/2] - Update to version 0.95: - fix migration from pam_unix2/pam_pwcheck to pam_unix/pam_cracklib OBS-URL: https://build.opensuse.org/package/show/Linux-PAM/pam-config?expand=0&rev=87 --- pam-config-0.94.tar.bz2 | 3 --- pam-config-0.95.tar.bz2 | 3 +++ pam-config.changes | 6 ++++++ pam-config.spec | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) delete mode 100644 pam-config-0.94.tar.bz2 create mode 100644 pam-config-0.95.tar.bz2 diff --git a/pam-config-0.94.tar.bz2 b/pam-config-0.94.tar.bz2 deleted file mode 100644 index c4e793c..0000000 --- a/pam-config-0.94.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7579cf8363da4bbd212267faea2b39a36952da64219b31185f3cdb5621963387 -size 324486 diff --git a/pam-config-0.95.tar.bz2 b/pam-config-0.95.tar.bz2 new file mode 100644 index 0000000..2fde8cc --- /dev/null +++ b/pam-config-0.95.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:554c07df87bf25d21d3b54ec000595aea9b97ae05f95c2df599dc010fc97b4dd +size 324353 diff --git a/pam-config.changes b/pam-config.changes index 7b063a6..d7fb851 100644 --- a/pam-config.changes +++ b/pam-config.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 22 16:25:04 CET 2018 - kukuk@suse.de + +- Update to version 0.95: + - fix migration from pam_unix2/pam_pwcheck to pam_unix/pam_cracklib + ------------------------------------------------------------------- Mon Jan 15 17:06:23 CET 2018 - kukuk@suse.de diff --git a/pam-config.spec b/pam-config.spec index 458c067..353c78f 100644 --- a/pam-config.spec +++ b/pam-config.spec @@ -20,7 +20,7 @@ Name: pam-config Summary: Modify common PAM configuration files License: GPL-2.0 Group: System/Management -Version: 0.94 +Version: 0.95 Release: 0 PreReq: pam >= 1.3.0 Url: https://github.com/SUSE/pam-config From 283a2d2d9a55c54851be30fdcfc33e275be2725318dae18b51551c95a4b1250e Mon Sep 17 00:00:00 2001 From: Thorsten Kukuk Date: Fri, 23 Feb 2018 12:36:57 +0000 Subject: [PATCH 2/2] - Use %license instead of %doc [bsc#1082318] OBS-URL: https://build.opensuse.org/package/show/Linux-PAM/pam-config?expand=0&rev=88 --- pam-config.changes | 5 +++++ pam-config.spec | 34 +++++++++++++++------------------- 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/pam-config.changes b/pam-config.changes index d7fb851..8e575f6 100644 --- a/pam-config.changes +++ b/pam-config.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Feb 23 12:36:32 UTC 2018 - kukuk@suse.com + +- Use %license instead of %doc [bsc#1082318] + ------------------------------------------------------------------- Thu Feb 22 16:25:04 CET 2018 - kukuk@suse.de diff --git a/pam-config.spec b/pam-config.spec index 353c78f..7a9c2d7 100644 --- a/pam-config.spec +++ b/pam-config.spec @@ -1,7 +1,7 @@ # # spec file for package pam-config # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,15 +17,14 @@ Name: pam-config -Summary: Modify common PAM configuration files -License: GPL-2.0 -Group: System/Management Version: 0.95 Release: 0 -PreReq: pam >= 1.3.0 -Url: https://github.com/SUSE/pam-config +Summary: Modify common PAM configuration files +License: GPL-2.0-only +Group: System/Management +URL: https://github.com/SUSE/pam-config Source: %{name}-%{version}.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-build +PreReq: pam >= 1.3.0 %description pam-config is a command line utility to maintain the common PAM @@ -34,8 +33,6 @@ files. It can be used to configure a system for different network or hardware based authentication schemes. pam-config can also add/adjust/remove other PAM modules and their options. - - %prep %setup -q @@ -44,15 +41,15 @@ add/adjust/remove other PAM modules and their options. make %{?_smp_mflags} %install -make install DESTDIR=$RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d +%make_install +mkdir -p %{buildroot}/%{_sysconfdir}/pam.d for i in account auth password session ; do - touch $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d/common-$i-pc + touch %{buildroot}/%{_sysconfdir}/pam.d/common-$i-pc done -%{find_lang} pam-config +%find_lang pam-config %post -if [ ! -f /etc/pam.d/common-auth-pc ] ; then +if [ ! -f %{_sysconfdir}/pam.d/common-auth-pc ] ; then pam-config --debug --create --force else pam-config --debug --update ||: @@ -61,13 +58,13 @@ fi %postun if [ $1 = 0 ]; then # Deinstall - dir=/etc/security + dir=%{_sysconfdir}/security for conf in pam_unix2.conf pam_pwcheck.conf ; do if [ -f $dir/$conf.pam-config-backup -a ! -f $dir/$conf ]; then mv -v $dir/$conf.pam-config-backup $dir/$conf fi done - dir=/etc/pam.d + dir=%{_sysconfdir}/pam.d for pamd in common-account common-auth common-password common-session ; do if [ -f $dir/$pamd.pam-config-backup -a -L $dir/$pamd ]; then rm -v $dir/$pamd && mv -v $dir/$pamd.pam-config-backup $dir/$pamd @@ -80,10 +77,9 @@ if [ $1 = 0 ]; then fi %files -f pam-config.lang -%defattr(-,root,root) -%doc COPYING +%license COPYING %{_sbindir}/pam-config -%doc %{_mandir}/man8/pam-config.8* +%{_mandir}/man8/pam-config.8* %ghost %config %{_sysconfdir}/pam.d/common-account-pc %ghost %config %{_sysconfdir}/pam.d/common-auth-pc %ghost %config %{_sysconfdir}/pam.d/common-password-pc