diff --git a/testing/pam/pam.SlackBuild b/testing/pam/pam.SlackBuild index f210c7e..a29e8d0 100644 --- a/testing/pam/pam.SlackBuild +++ b/testing/pam/pam.SlackBuild @@ -26,7 +26,7 @@ SRCNAM=Linux-PAM PRGNAM=pam -VERSION=${VERSION:-1.1.6} +VERSION=${VERSION:-1.1.8} BUILD=${BUILD:-1} TAG=${TAG:-_msb} @@ -38,7 +38,7 @@ if [ -z "$ARCH" ]; then esac fi -wget -c http://www.linux-pam.org/library/Linux-PAM-1.1.6.tar.bz2 +wget -c http://www.linux-pam.org/library/$SRCNAM-$VERSION.tar.bz2 NUMJOBS=${NUMJOBS:-" -j8 "} @@ -75,8 +75,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -patch -p1 < $CWD/pam_destdir.patch - CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/testing/pam/pam_destdir.patch b/testing/pam/pam_destdir.patch deleted file mode 100644 index 0a497de..0000000 --- a/testing/pam/pam_destdir.patch +++ /dev/null @@ -1,38 +0,0 @@ -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.1