diff --git a/Linux-PAM-1.1.5-docs.tar.bz2 b/Linux-PAM-1.1.5-docs.tar.bz2 deleted file mode 100644 index 889234a..0000000 --- a/Linux-PAM-1.1.5-docs.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e4b10ffebe2e5cc355bd37c4e17a2288eb90d1396b06961738a7e7ef848c754c -size 498228 diff --git a/Linux-PAM-1.1.5.tar.bz2 b/Linux-PAM-1.1.5.tar.bz2 deleted file mode 100644 index 0c2ab97..0000000 --- a/Linux-PAM-1.1.5.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:65def4df04254dc4c5156859d36c34ad6d7afbcf3adbf2780530ebc4dbf2a116 -size 1123524 diff --git a/Linux-PAM-1.1.6-docs.tar.bz2 b/Linux-PAM-1.1.6-docs.tar.bz2 new file mode 100644 index 0000000..e8d827a --- /dev/null +++ b/Linux-PAM-1.1.6-docs.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0244321b1c4b8a71064d984880566890cc809b1c77bdd0550f121fa7d8450497 +size 147359 diff --git a/Linux-PAM-1.1.6.tar.bz2 b/Linux-PAM-1.1.6.tar.bz2 new file mode 100644 index 0000000..0b4e759 --- /dev/null +++ b/Linux-PAM-1.1.6.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bab887d6280f47fc3963df3b95735a27a16f0f663636163ddf3acab5f1149fc2 +size 1147538 diff --git a/missing-DESTDIR.diff b/missing-DESTDIR.diff new file mode 100644 index 0000000..4ec7bf4 --- /dev/null +++ b/missing-DESTDIR.diff @@ -0,0 +1,38 @@ +From d7e6b921cd34f7ad8fc4d05065c75d13ba330896 Mon Sep 17 00:00:00 2001 +From: Tomas Mraz +Date: Fri, 17 Aug 2012 12:46:40 +0000 +Subject: Add missing $(DESTDIR) when making directories on install. + +modules/pam_namespace/Makefile.am: Add missing $(DESTDIR) when making +$(namespaceddir) on install. +modules/pam_sepermit/Makefile.am: Add missing $(DESTDIR) when making +$(sepermitlockdir) on install. +--- +diff --git a/modules/pam_namespace/Makefile.am b/modules/pam_namespace/Makefile.am +index a28f196..ebb00f3 100644 +--- a/modules/pam_namespace/Makefile.am ++++ b/modules/pam_namespace/Makefile.am +@@ -40,7 +40,7 @@ if HAVE_UNSHARE + secureconf_SCRIPTS = namespace.init + + install-data-local: +- mkdir -p $(namespaceddir) ++ mkdir -p $(DESTDIR)$(namespaceddir) + endif + + +diff --git a/modules/pam_sepermit/Makefile.am b/modules/pam_sepermit/Makefile.am +index cfc5594..bc82275 100644 +--- a/modules/pam_sepermit/Makefile.am ++++ b/modules/pam_sepermit/Makefile.am +@@ -35,7 +35,7 @@ if HAVE_LIBSELINUX + 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 +-- +cgit v0.9.0.2 diff --git a/pam-fix-includes.patch b/pam-fix-includes.patch index 9898b94..9cc771e 100644 --- a/pam-fix-includes.patch +++ b/pam-fix-includes.patch @@ -1,20 +1,5 @@ -Index: Linux-PAM-1.1.5/modules/pam_unix/pam_unix_acct.c -=================================================================== ---- Linux-PAM-1.1.5.orig/modules/pam_unix/pam_unix_acct.c -+++ Linux-PAM-1.1.5/modules/pam_unix/pam_unix_acct.c -@@ -47,6 +47,8 @@ - #include /* for time() */ - #include - #include -+#include -+#include - - #include - -Index: Linux-PAM-1.1.5/modules/pam_unix/pam_unix_passwd.c -=================================================================== ---- Linux-PAM-1.1.5.orig/modules/pam_unix/pam_unix_passwd.c -+++ Linux-PAM-1.1.5/modules/pam_unix/pam_unix_passwd.c +--- modules/pam_unix/pam_unix_passwd.c ++++ modules/pam_unix/pam_unix_passwd.c @@ -54,6 +54,7 @@ #include #include diff --git a/pam.changes b/pam.changes index 7cedb87..db3555c 100644 --- a/pam.changes +++ b/pam.changes @@ -1,7 +1,21 @@ +------------------------------------------------------------------- +Wed Sep 19 14:20:54 CEST 2012 - kukuk@suse.de + +- Fix building in Factory (add patch missing-DESTDIR.diff) + +------------------------------------------------------------------- +Fri Sep 14 10:55:31 CEST 2012 - kukuk@suse.de + +- Update to Linux-PAM 1.1.6 + - Update translations + - pam_cracklib: Add more checks for weak passwords + - pam_lastlog: Never lock out root + - Lot of bug fixes and smaller enhancements + ------------------------------------------------------------------- Thu Jun 21 11:59:52 UTC 2012 - aj@suse.de -- Include correct headers for getrlimit. +- Include correct headers for getrlimit (add patch pam-fix-includes.patch). ------------------------------------------------------------------- Mon Apr 23 15:30:02 UTC 2012 - jengelh@medozas.de diff --git a/pam.spec b/pam.spec index 7abb120..7a48c3a 100644 --- a/pam.spec +++ b/pam.spec @@ -30,6 +30,8 @@ BuildRequires: pkgconfig(libtirpc) %if %{enable_selinux} BuildRequires: libselinux-devel %endif +BuildRequires: autoconf +BuildRequires: automake %define libpam_so_version 0.83.1 %define libpam_misc_so_version 0.82.0 %define libpamc_so_version 0.82.1 @@ -38,7 +40,7 @@ BuildRequires: libselinux-devel Obsoletes: pam-64bit %endif # -Version: 1.1.5 +Version: 1.1.6 Release: 0 Summary: A Security Tool that Provides Authentication for Applications License: GPL-2.0+ or BSD-3-Clause @@ -58,6 +60,7 @@ Source8: etc.environment Source9: baselibs.conf Patch0: pam_tally-deprecated.diff Patch1: pam-fix-includes.patch +Patch2: missing-DESTDIR.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -107,9 +110,11 @@ building both PAM-aware applications and modules for use with PAM. %prep %setup -q -n Linux-PAM-%{version} -b 1 %patch0 -p0 -%patch1 -p1 +%patch1 -p0 +%patch2 -p1 %build +autoreconf export CFLAGS="%optflags -DNDEBUG" %configure \ --sbindir=/sbin \