[Lunar-commits] <moonbase> Linux-PAM: Fix for bug #429. Module should now install even when /tmp is mounted noexec

[Stefan Wold]

commit c850f1929fdae507983e66a0bcbf96e5fa687543
Author: Stefan Wold <ratler at lunar-linux.org>
Date:   Sun Aug 22 19:15:41 2010 +0200

    Linux-PAM: Fix for bug #429. Module should now install even when /tmp is mounted noexec
---
 security/Linux-PAM/BUILD   |    7 ++-----
 security/Linux-PAM/DETAILS |    4 ++--
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/security/Linux-PAM/BUILD b/security/Linux-PAM/BUILD
index af33861..7c05e09 100644
--- a/security/Linux-PAM/BUILD
+++ b/security/Linux-PAM/BUILD
@@ -32,11 +32,11 @@
   ldconfig -n $SOURCE_DIRECTORY/libpam/.libs &&
   find $SOURCE_DIRECTORY/modules -name "pam*.so" | while read module; do
 	if ! env LD_LIBRARY_PATH=$SOURCE_DIRECTORY/libpam/.libs \
-	  $SOURCE_DIRECTORY/$MODULE-patches-$PVERSION/dlopen.sh -ldl -lpam -L$SOURCE_DIRECTORY/libpam/.libs ${module} ; then
+	  $SOURCE_DIRECTORY/$MODULE-patches-$PVERSION/dlopen.sh $SOURCE_DIRECTORY -ldl -lpam -L$SOURCE_DIRECTORY/libpam/.libs ${module} ; then
 	  echo ERROR module: ${module} cannot be loaded.
 	  exit 1
 	fi
-    if env LD_LIBRARY_PATH=$SOURCE_DIRECTORY/libpam/.libs \
+  if env LD_LIBRARY_PATH=$SOURCE_DIRECTORY/libpam/.libs \
 	  LD_PRELOAD=$SOURCE_DIRECTORY/libpam/.libs/libpam.so ldd -r ${module} | fgrep -q libpthread ; then
 	  echo ERROR module: ${module} pulls threading libraries.
 	  exit 1
@@ -70,9 +70,6 @@
   # More doc
   gather_docs AUTHORS Copyright &&
 
-  # We have to clean up a bit after Linux-PAM
-  rm -f /lib/security/*.la &&
-
   [ -f /etc/environment ] || touch /etc/environment &&
   [ -f /etc/security/limits.conf ] || install -m 0644 modules/pam_limits/limits.conf /etc/security/
 
diff --git a/security/Linux-PAM/DETAILS b/security/Linux-PAM/DETAILS
index 978d8c2..5bf0ade 100644
--- a/security/Linux-PAM/DETAILS
+++ b/security/Linux-PAM/DETAILS
@@ -1,6 +1,6 @@
           MODULE=Linux-PAM
          VERSION=1.1.1
-        PVERSION=2.1
+        PVERSION=2.2
        RHVERSION=0.99.10-1
           SOURCE=$MODULE-$VERSION.tar.bz2
          SOURCE2=$MODULE-patches-$PVERSION.tar.bz2
@@ -8,7 +8,7 @@
    SOURCE_URL[1]=ftp://ftp.kernel.org/pub/linux/libs/pam/library/
      SOURCE2_URL=$PATCH_URL
       SOURCE_VFY=sha1:8baf11b04396230ba7cf8b2bfb2d2bd75aab8fa6
-     SOURCE2_VFY=sha1:fb34b46d14f4a2bc12f9d745486602fdc7480180
+     SOURCE2_VFY=sha1:fde999a00571832e626a8c07d07380796c37b1f6
         WEB_SITE=http://www.kernel.org/pub/linux/libs/pam
       MAINTAINER=ratler at lunar-linux.org
          ENTERED=20010922