[Lunar-commits] <moonbase> Linux-PAM: Bump to version 1.0.1

[Stefan Wold]

commit c4ea1750cee0017a74169ccf316b8bddcc4f8e32
Author: Stefan Wold <ratler at lunar-linux.org>
Date:   Tue Jun 24 21:04:04 2008 +0200

    Linux-PAM: Bump to version 1.0.1
    * Updated redhat modules
    * Updated patch set
    * No longer necessary to rebuild vixie-cron
    * Updated short description
    * New test code in BUILD to verify that the pam_modules
      will run ok with pam. Also checking that no module have
      been linked against pthreads since this could cause major
      problems.
---
 security/Linux-PAM/BUILD        |   35 +++++++++++++++++++++++++++--------
 security/Linux-PAM/DETAILS      |   21 +++++++++++----------
 security/Linux-PAM/POST_INSTALL |    6 ------
 security/Linux-PAM/PRE_BUILD    |    5 +++--
 4 files changed, 41 insertions(+), 26 deletions(-)

diff --git a/security/Linux-PAM/BUILD b/security/Linux-PAM/BUILD
index 8b623db..89a6ae0 100644
--- a/security/Linux-PAM/BUILD
+++ b/security/Linux-PAM/BUILD
@@ -6,24 +6,43 @@
   export SGML2PS=no
   export PS2PDF=no
 
-  # Fix for automake 1.10
+  # Stop pam_env from installing /etc/environment
+  sedit "/^sysconf_DATA/d" modules/pam_env/Makefile.am  &&
+
   aclocal -I m4 &&
   automake --add-missing --gnu &&
   autoconf &&
-  # End fix
 
   ./configure  --libdir=/lib                            \
                --enable-docdir=/usr/share/doc/Linux-PAM \
                --disable-prelude                        \
                --mandir=/usr/share/man                  \
-               --disable-berkdb                         \
+               --enable-db=no                           \
+               --disable-selinux                        \
+               --disable-audit                          \
+               --enable-isadir=../../lib/security       \
                $OPTS &&
 
-  sedit  "s/examples//"  Makefile              &&
-  sedit  "s/read yes//"     conf/install_conf  &&
+  sedit  "s/examples//"  Makefile           &&
+  sedit  "s/read yes//"  conf/install_conf  &&
 
   make &&
-  make check &&
+
+  # Test our modules, we don't want a broken system
+  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
+	  echo ERROR module: ${module} cannot be loaded.
+	  exit 1
+	fi
+    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
+	fi
+  done &&
+
   prepare_install &&
   make install &&
 
@@ -45,7 +64,7 @@
   # We have to clean up a bit after Linux-PAM
   rm -f /lib/security/*.la &&
 
-  [ -f /etc/environment ] || touch /etc/environment && 
+  [ -f /etc/environment ] || touch /etc/environment &&
   [ -f /etc/security/limits.conf ] || install -m 0644 modules/pam_limits/limits.conf /etc/security/
 
-) > $C_FIFO 2>&1  
+) > $C_FIFO 2>&1
diff --git a/security/Linux-PAM/DETAILS b/security/Linux-PAM/DETAILS
index a1deffa..69b7107 100644
--- a/security/Linux-PAM/DETAILS
+++ b/security/Linux-PAM/DETAILS
@@ -1,20 +1,21 @@
           MODULE=Linux-PAM
-         VERSION=0.99.7.1
-        PVERSION=1.8
-       RHVERSION=0.99.7-1
+         VERSION=1.0.1
+        PVERSION=1.9
+       RHVERSION=0.99.9-1
           SOURCE=$MODULE-$VERSION.tar.bz2
          SOURCE2=$MODULE-patches-$PVERSION.tar.bz2
-   SOURCE_URL[0]=$KERNEL_URL/pub/linux/libs/pam/pre/library/
-   SOURCE_URL[1]=ftp://ftp.kernel.org/pub/linux/libs/pam/pre/library/
+   SOURCE_URL[0]=$KERNEL_URL/pub/linux/libs/pam/library/
+   SOURCE_URL[1]=ftp://ftp.kernel.org/pub/linux/libs/pam/library/
      SOURCE2_URL=$PATCH_URL
-      SOURCE_VFY=sha1:40f8ba7280fbd8260cfe2ec06b86f972c79eb9d2
-     SOURCE2_VFY=sha1:fea43efb7fe728c06424ee573f2029269f91c8f6
-        WEB_SITE=http://www.us.kernel.org/pub/linux/libs/pam
+      SOURCE_VFY=sha1:c1cdcd28141344b3501121d32e0d57d2a3c14422
+     SOURCE2_VFY=sha1:cc287af3e18cc687d842eef782f3c48756a01fd1
+        WEB_SITE=http://www.kernel.org/pub/linux/libs/pam
       MAINTAINER=ratler at lunar-linux.org
          ENTERED=20010922
-         UPDATED=20070415
-           SHORT="Flexibile authentication mechanisms."
+         UPDATED=20080624
+           SHORT="Pluggable Authentication Modules"
 PSAFE=no
+
 cat << EOF
 Linux-PAM provides a flexible mechanism for authenticating users. PAM
 was invented by SUN Microsystems.
diff --git a/security/Linux-PAM/POST_INSTALL b/security/Linux-PAM/POST_INSTALL
index dce8e00..da21957 100644
--- a/security/Linux-PAM/POST_INSTALL
+++ b/security/Linux-PAM/POST_INSTALL
@@ -3,9 +3,3 @@ if [ "$RElin_PAM_AWARE" == "y" ]; then
         lin -c $mod
   done
 fi
-
-# Vixie-cron pick up LIBPAM_EXTENSION version which can change
-# between Linux-PAM releases
-if module_installed vixie-cron; then
-  lin -c vixie-cron
-fi
diff --git a/security/Linux-PAM/PRE_BUILD b/security/Linux-PAM/PRE_BUILD
index f676c59..54822d4 100644
--- a/security/Linux-PAM/PRE_BUILD
+++ b/security/Linux-PAM/PRE_BUILD
@@ -7,14 +7,15 @@ cd $SOURCE_DIRECTORY                        &&
 unpack $SOURCE2                                &&
 
 # Unpack redhat specific modules
-tar -jxf ${MODULE}-patches-${PVERSION}/pam-redhat-${RHVERSION}.tar.bz2 &&
+tar -jxf ${MODULE}-patches-${PVERSION}/pam-redhat-${RHVERSION}.tar.bz2 \
+--strip-components=1 -C modules &&
 
 # Apply our patches
 for i in redhat lunar
 do
   cat ${MODULE}-patches-${PVERSION}/list.${i}-patches | while read fname
     do
-      patch_it ${MODULE}-patches-${PVERSION}/${i}-patches/${fname} 1
+      patch_it ${MODULE}-patches-${PVERSION}/${i}-patches/${fname} 1 || exit 1
     done
 done