diff --git a/.gitignore b/.gitignore index fecc7cb..15322e5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ *.src.rpm *.tar.bz2 +/Linux-PAM-1.3.1.tar.xz +/Linux-PAM-1.3.1.tar.xz.asc diff --git a/pam-1.1.6-noflex.patch b/pam-1.1.6-noflex.patch deleted file mode 100644 index 6410a8d..0000000 --- a/pam-1.1.6-noflex.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up Linux-PAM-1.1.6/doc/Makefile.am.noflex Linux-PAM-1.1.6/doc/Makefile.am ---- Linux-PAM-1.1.6/doc/Makefile.am.noflex 2012-08-15 13:08:43.000000000 +0200 -+++ Linux-PAM-1.1.6/doc/Makefile.am 2012-08-17 14:13:11.904949748 +0200 -@@ -2,7 +2,7 @@ - # Copyright (c) 2005, 2006 Thorsten Kukuk - # - --SUBDIRS = man specs sag adg mwg -+SUBDIRS = man sag adg mwg - - CLEANFILES = *~ - -diff -up Linux-PAM-1.1.6/Makefile.am.noflex Linux-PAM-1.1.6/Makefile.am ---- Linux-PAM-1.1.6/Makefile.am.noflex 2012-08-15 13:08:43.000000000 +0200 -+++ Linux-PAM-1.1.6/Makefile.am 2012-08-17 14:15:36.705359892 +0200 -@@ -4,7 +4,7 @@ - - AUTOMAKE_OPTIONS = 1.9 gnu dist-bzip2 check-news - --SUBDIRS = libpam tests libpamc libpam_misc modules po conf doc examples xtests -+SUBDIRS = libpam tests libpamc libpam_misc modules po doc examples xtests - - CLEANFILES = *~ - diff --git a/pam-1.3.1-noflex.patch b/pam-1.3.1-noflex.patch new file mode 100644 index 0000000..c65d225 --- /dev/null +++ b/pam-1.3.1-noflex.patch @@ -0,0 +1,24 @@ +diff -up Linux-PAM-1.3.1/doc/Makefile.am.noflex Linux-PAM-1.3.1/doc/Makefile.am +--- Linux-PAM-1.3.1/doc/Makefile.am.noflex 2017-02-10 11:10:15.000000000 +0100 ++++ Linux-PAM-1.3.1/doc/Makefile.am 2018-05-18 14:53:50.300997606 +0200 +@@ -2,7 +2,7 @@ + # Copyright (c) 2005, 2006 Thorsten Kukuk + # + +-SUBDIRS = man specs sag adg mwg ++SUBDIRS = man sag adg mwg + + CLEANFILES = *~ + +diff -up Linux-PAM-1.3.1/Makefile.am.noflex Linux-PAM-1.3.1/Makefile.am +--- Linux-PAM-1.3.1/Makefile.am.noflex 2018-05-18 14:53:50.301997629 +0200 ++++ Linux-PAM-1.3.1/Makefile.am 2018-05-18 14:55:31.576353800 +0200 +@@ -4,7 +4,7 @@ + + AUTOMAKE_OPTIONS = 1.9 gnu dist-bzip2 dist-xz check-news + +-SUBDIRS = libpam tests libpamc libpam_misc modules po conf doc examples xtests ++SUBDIRS = libpam tests libpamc libpam_misc modules po doc examples xtests + + CLEANFILES = *~ + diff --git a/pam.spec b/pam.spec index 19d2892..fa5a15f 100644 --- a/pam.spec +++ b/pam.spec @@ -2,18 +2,16 @@ Summary: An extensible library which provides authentication for applications Name: pam -Version: 1.3.0 -Release: 10%{?dist} +Version: 1.3.1 +Release: 1%{?dist} # The library is BSD licensed with option to relicense as GPLv2+ # - this option is redundant as the BSD license allows that anyway. # pam_timestamp, pam_loginuid, and pam_console modules are GPLv2+. License: BSD and GPLv2+ Group: System Environment/Base -Source0: http://www.linux-pam.org/library/Linux-PAM-%{version}.tar.bz2 -# This is the old location that might be revived in future: -#Source0: http://ftp.us.kernel.org/pub/linux/libs/pam/library/Linux-PAM-%{version}.tar.bz2 -#Source1: http://ftp.us.kernel.org/pub/linux/libs/pam/library/Linux-PAM-%{version}.tar.bz2.sign -Source2: https://fedorahosted.org/releases/p/a/pam-redhat/pam-redhat-%{pam_redhat_version}.tar.bz2 +Source0: https://github.com/linux-pam/linux-pam/releases/download/v%{version}/Linux-PAM-%{version}.tar.xz +Source1: https://github.com/linux-pam/linux-pam/releases/download/v%{version}/Linux-PAM-%{version}.tar.xz.asc +Source2: https://releases.pagure.org/pam-redhat/pam-redhat-%{pam_redhat_version}.tar.bz2 Source5: other.pamd Source6: system-auth.pamd Source7: password-auth.pamd @@ -32,7 +30,7 @@ Patch4: pam-1.1.0-console-nochmod.patch Patch5: pam-1.1.0-notally.patch Patch7: pam-1.2.1-faillock.patch Patch8: pam-1.2.1-faillock-admin-group.patch -Patch9: pam-1.1.6-noflex.patch +Patch9: pam-1.3.1-noflex.patch Patch10: pam-1.1.3-nouserenv.patch Patch13: pam-1.1.6-limits-user.patch Patch15: pam-1.1.8-full-relro.patch @@ -266,7 +264,6 @@ fi %license gpl-2.0.txt %doc doc/txts %doc doc/sag/*.txt doc/sag/html -%doc doc/specs/rfc86.0.txt %{_pamlibdir}/libpam.so.* %{_pamlibdir}/libpamc.so.* %{_pamlibdir}/libpam_misc.so.* @@ -372,12 +369,16 @@ fi %{_libdir}/libpam_misc.so %doc doc/mwg/*.txt doc/mwg/html %doc doc/adg/*.txt doc/adg/html +%doc doc/specs/rfc86.0.txt %changelog +* Fri May 18 2018 Tomáš Mráz 1.3.1-1 +- new upstream release 1.3.1 with multiple improvements + * Thu Feb 08 2018 Fedora Release Engineering - 1.3.0-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild -* Thu Jan 30 2018 Tomáš Mráz 1.3.0-9 +* Tue Jan 30 2018 Tomáš Mráz 1.3.0-9 - and the NIS support now also requires libnsl2 * Sat Jan 20 2018 Björn Esser - 1.3.0-8 diff --git a/sources b/sources index 76e5e62..ff21d93 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ -29eab110f57e8d60471081a6278a5a92 pam-redhat-0.99.11.tar.bz2 -da4b2289b7cfb19583d54e9eaaef1c3a Linux-PAM-1.3.0.tar.bz2 +SHA512 (Linux-PAM-1.3.1.tar.xz) = 6bc8e2a5b64686f0a23846221c5228c88418ba485b17c53b3a12f91262b5bb73566d6b6a5daa1f63bbae54310aee918b987e44a72ce809b4e7c668f0fadfe08e +SHA512 (Linux-PAM-1.3.1.tar.xz.asc) = 8b3ad3f4f29fad663e375296dca00f736b3de764f11d7b7aa615d00efe1c702c9060f244967f2d84d8ef3a342c3a1f8eba6dd52847df427bb3ce0ff765a8108a +SHA512 (pam-redhat-0.99.11.tar.bz2) = 2897ff3837a24e62dae0b90b85b1b70f9c783b56a0597dd1a52ef24011f74cc5b669f6b76ddac7ee230f32c3295bc3520ef9e88d49b50e52e476b37e85ac548e