up to 1.1.7, build fails with weird libtool errors

diff --git a/pam-DESTDIR.patch b/pam-DESTDIR.patch
deleted file mode 100644 (file)
index 53cce7a..0000000
--- a/pam-DESTDIR.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- Linux-PAM-1.1.6/modules/pam_namespace/Makefile.am~ 2012-08-15 13:08:43.000000000 +0200
-+++ Linux-PAM-1.1.6/modules/pam_namespace/Makefile.am  2012-11-27 12:11:03.796446562 +0100
-@@ -40,7 +40,7 @@
-   secureconf_SCRIPTS = namespace.init
- 
- install-data-local:
--      mkdir -p $(namespaceddir)
-+      mkdir -p $(DESTDIR)$(namespaceddir)
- endif
- 
- 
---- Linux-PAM-1.1.6/modules/pam_sepermit/Makefile.am~  2012-08-15 13:08:43.000000000 +0200
-+++ Linux-PAM-1.1.6/modules/pam_sepermit/Makefile.am   2012-11-27 12:21:56.806423526 +0100
-@@ -35,7 +35,7 @@
-   securelib_LTLIBRARIES = pam_sepermit.la
- 
- install-data-local:
--      mkdir -p $(sepermitlockdir)
-+      mkdir -p $(DESTDIR)$(sepermitlockdir)
- endif
- if ENABLE_REGENERATE_MAN
- noinst_DATA = README pam_sepermit.8 sepermit.conf.5

diff --git a/pam-RLIM.patch b/pam-RLIM.patch
deleted file mode 100644 (file)
index 493a8d2..0000000
--- a/pam-RLIM.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- Linux-PAM-1.1.6/modules/pam_unix/pam_unix_passwd.c~        2012-08-15 13:08:43.000000000 +0200
-+++ Linux-PAM-1.1.6/modules/pam_unix/pam_unix_passwd.c 2012-11-27 12:08:05.996452834 +0100
-@@ -58,6 +58,7 @@
- #include <signal.h>
- #include <errno.h>
- #include <sys/wait.h>
-+#include <sys/resource.h>
- 
- #include <security/_pam_macros.h>
- 

diff --git a/pam.spec b/pam.spec
index bc51bc64cb12a685a527a25fa4a8721b0c52154e..723da3e24bcc0a8b2cc8b877ccfbc91a0c5b39f1 100644 (file)
--- a/pam.spec
+++ b/pam.spec
@@ -16,14 +16,14 @@ Summary(ru.UTF-8):  Интструмент, обеспечивающий ауте
 Summary(tr.UTF-8):     Modüler, artımsal doğrulama birimleri
 Summary(uk.UTF-8):     Інструмент, що забезпечує аутентифікацію для програм
 Name:          pam
-Version:       1.1.6
-Release:       3
+Version:       1.1.7
+Release:       0.1
 Epoch:         1
 License:       GPL or BSD
 Group:         Base
 #Source0:      http://ftp.kernel.org/pub/linux/libs/pam/library/Linux-PAM-%{version}.tar.bz2
 Source0:       https://fedorahosted.org/releases/l/i/linux-pam/Linux-PAM-%{version}.tar.bz2
-# Source0-md5: 7b73e58b7ce79ffa321d408de06db2c4
+# Source0-md5: 9f90888cd22212a6b5af2920f4eaaf1b
 #xSource1:     http://ftp.kernel.org/pub/linux/libs/pam/library/Linux-PAM-%{version}.tar.bz2.sign
 # xSource1-md5:        2435d4a23aaf871bcec436f863b0de6c
 Source2:       ftp://ftp.pld-linux.org/software/pam/%{name}-pld-%{pam_pld_version}.tar.gz
@@ -36,12 +36,11 @@ Source7:    system-auth.5
 Source8:       config-util.5
 Source9:       %{name}.tmpfiles
 Patch0:                %{name}-pld-modules.patch
-Patch1:                %{name}-RLIM.patch
+Patch1:                %{name}_unix_passwd-typo.patch
 Patch2:                %{name}-tally-fail-close.patch
 Patch3:                %{name}-mkhomedir-notfound.patch
 Patch4:                %{name}-db-gdbm.patch
 Patch5:                %{name}-exec-failok.patch
-Patch6:                %{name}-DESTDIR.patch
 URL:           http://www.kernel.org/pub/linux/libs/pam/
 %{?with_audit:BuildRequires:   audit-libs-devel >= 1.6.9}
 BuildRequires: autoconf >= 2.61
@@ -239,7 +238,6 @@ Moduł PAM pozwalający na zmianę kontekstów SELinuksa.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1
 
 %build
 %{__libtoolize}
@@ -266,18 +264,18 @@ Moduł PAM pozwalający na zmianę kontekstów SELinuksa.
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_libdir},/etc/pam.d,/var/{log,run/sepermit}} \
-       $RPM_BUILD_ROOT/usr/lib/tmpfiles.d
+       $RPM_BUILD_ROOT%{systemdtmpfilesdir}
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
 %if %{with selinux}
-install modules/pam_selinux/.libs/pam_selinux_check $RPM_BUILD_ROOT%{_sbindir}
-install modules/pam_selinux/pam_selinux_check.8 $RPM_BUILD_ROOT%{_mandir}/man8
-install %{SOURCE6} $RPM_BUILD_ROOT/etc/pam.d/pam_selinux_check
+install -p modules/pam_selinux/.libs/pam_selinux_check $RPM_BUILD_ROOT%{_sbindir}
+cp -p modules/pam_selinux/pam_selinux_check.8 $RPM_BUILD_ROOT%{_mandir}/man8
+cp -p %{SOURCE6} $RPM_BUILD_ROOT/etc/pam.d/pam_selinux_check
 %endif
 
-install %{SOURCE9} $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/%{name}.conf
+cp -p %{SOURCE9} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf
 
 install -d doc/txts
 for r in modules/pam_*/README ; do
@@ -307,12 +305,12 @@ ln -sf /%{_lib}/$(echo libpam_misc.so.*.*.*) $RPM_BUILD_ROOT%{_libdir}/libpam_mi
 ln -sf /%{_lib}/$(echo libpamc.so.*.*.*) $RPM_BUILD_ROOT%{_libdir}/libpamc.so
 cd -
 
-install %{SOURCE3} $RPM_BUILD_ROOT/etc/pam.d/other
-install %{SOURCE4} $RPM_BUILD_ROOT/etc/pam.d/system-auth
-install %{SOURCE5} $RPM_BUILD_ROOT/etc/pam.d/config-util
+cp -p %{SOURCE3} $RPM_BUILD_ROOT/etc/pam.d/other
+cp -p %{SOURCE4} $RPM_BUILD_ROOT/etc/pam.d/system-auth
+cp -p %{SOURCE5} $RPM_BUILD_ROOT/etc/pam.d/config-util
 
-install %{SOURCE7} $RPM_BUILD_ROOT%{_mandir}/man5/system-auth.5
-install %{SOURCE8} $RPM_BUILD_ROOT%{_mandir}/man5/config-util.5
+cp -p %{SOURCE7} $RPM_BUILD_ROOT%{_mandir}/man5/system-auth.5
+cp -p %{SOURCE8} $RPM_BUILD_ROOT%{_mandir}/man5/config-util.5
 
 # Make sure every module subdirectory gave us a module.  Yes, this is hackish.
 for dir in modules/pam_* ; do
@@ -344,7 +342,7 @@ done
 # useless - shut up check-files
 rm -f $RPM_BUILD_ROOT/%{_lib}/security/*.{la,a}
 rm -f $RPM_BUILD_ROOT/%{_lib}/lib*.so
-rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/Linux-PAM
+rm -rf $RPM_BUILD_ROOT%{_docdir}/Linux-PAM
 
 %if %{without selinux}
 rm -rf $RPM_BUILD_ROOT{/%{_lib}/security/pam_selinux.so,%{_sbindir}/pam_selinux_check,%{_mandir}/man8/pam_selinux*.8*}

diff --git a/pam_unix_passwd-typo.patch b/pam_unix_passwd-typo.patch
new file mode 100644 (file)
index 0000000..08ea68f
--- /dev/null
+++ b/pam_unix_passwd-typo.patch
@@ -0,0 +1,11 @@
+--- Linux-PAM-1.1.7/modules/pam_unix/pam_unix_passwd.c~        2013-08-29 15:09:08.000000000 +0300
++++ Linux-PAM-1.1.7/modules/pam_unix/pam_unix_passwd.c 2013-09-13 17:49:28.090104727 +0300
+@@ -255,7 +255,7 @@
+       close(fds[0]);       /* close here to avoid possible SIGPIPE above */
+       close(fds[1]);
+       /* wait for helper to complete: */
+-      while ((rc=waitpid(child, &retval, 0) < 0 && errno == EINTR);
++      while ((rc=waitpid(child, &retval, 0) < 0 && errno == EINTR));
+       if (rc<0) {
+         pam_syslog(pamh, LOG_ERR, "unix_update waitpid failed: %m");
+         retval = PAM_AUTHTOK_ERR;