4 files changed, 23 insertions, 32 deletions
diff --git a/system/nss_ldap/README b/system/nss_ldap/README
index 7d14062fdb..14cc5db421 100644
--- a/system/nss_ldap/README
+++ b/system/nss_ldap/README
@@ -1,7 +1,9 @@
 The resolution of the entities defined in RFC 2307 is generally performed
 by a set of UNIX C library calls (such as getpwnam() to return the attributes
 of a user).  The nss_ldap module provides the means for Solaris and Linux
-workstations to this information (such as users, hosts, and groups) from
-LDAP directories.  The modules is the reference implementation of RFC 2307,
+workstations to get this information (such as users, hosts, and groups) from
+LDAP directories.  The module is the reference implementation of RFC 2307,
 and has been studied by vendors such as Sun (who developed the original
 Name Service Switch interface).
+
+This requires CVSTools.
diff --git a/system/nss_ldap/doinst.sh b/system/nss_ldap/doinst.sh
index abd60ac5b6..54dc31ad8a 100644
--- a/system/nss_ldap/doinst.sh
+++ b/system/nss_ldap/doinst.sh
@@ -1,14 +1,12 @@
-#!/bin/sh
 config() {
   NEW="$1"
-  OLD="`dirname $NEW`/`basename $NEW .new`"
-  # If there's no config file by that name, mv it over:
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
   if [ ! -r $OLD ]; then
     mv $NEW $OLD
-  elif [ "`cat $OLD | md5sum`" = "`cat $NEW | md5sum`" ]; then # toss the redundant copy
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
     rm $NEW
   fi
-  # Otherwise, we leave the .new copy for the admin to consider...
 }
+
 config etc/ldap.conf.new
 
diff --git a/system/nss_ldap/nss_ldap.SlackBuild b/system/nss_ldap/nss_ldap.SlackBuild
index 775a8ddc0b..90d4b276c9 100644
--- a/system/nss_ldap/nss_ldap.SlackBuild
+++ b/system/nss_ldap/nss_ldap.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for nss_ldap
 
-# Copyright (c) 2009  Chris Walker <kris240376@gmail.com>
+# Copyright (c) 2009-2011  Chris Walker <kris240376@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -15,9 +15,6 @@
 #   copyright notice, this list of conditions and the following disclaimer
 #   in the documentation and/or other materials provided with the
 #   distribution.
-# * Neither the name of the {company} nor the names of its
-#   contributors may be used to endorse or promote products derived from
-#   this software without specific prior written permission.
 #
 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -32,16 +29,14 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=nss_ldap
-VERSION=264
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-265}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -70,7 +65,7 @@ set -e
 rm -rf $TMP/$PRGNAM-$VERSION $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-tar xzvf $CWD/$PRGNAM-$VERSION.tar.gz || exit 1
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
@@ -84,23 +79,19 @@ CXXFLAGS="$SLKCFLAGS" \
   --enable-rfc2307bis \
   --build=$ARCH-slackware-linux
 
-make || exit 1
-make install DESTDIR=$PKG || exit 1
-
-( cd $PKG/usr/man
-  find . -type f -exec gzip -9 {} \;
-  for i in $(find . -type l); do ln -s $(readlink $i).gz $i.gz; rm $i; done
-)
+make
+make install DESTDIR=$PKG
 
 mv $PKG/etc/ldap.conf $PKG/etc/ldap.conf.new
 mv $PKG/etc/nsswitch.ldap $PKG/etc/nsswitch.conf-ldap
 
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+rm -rf $PKG/usr/usr	# no idea why this happens
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-install -o root -g root -m 644 \
-    ANNOUNCE AUTHORS COPYING ChangeLog INSTALL NEWS README \
-    doc/README.AIX doc/README.HPUX doc/README.IRS doc/README.SFU \
-    doc/README.paged doc/SolarisInstallNotes.txt $CWD/$PRGNAM.SlackBuild \
-    $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  ANNOUNCE AUTHORS COPYING ChangeLog INSTALL NEWS README doc/README* doc/*.txt \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/system/nss_ldap/nss_ldap.info b/system/nss_ldap/nss_ldap.info
index 79b9b54aa7..ee7e59283b 100644
--- a/system/nss_ldap/nss_ldap.info
+++ b/system/nss_ldap/nss_ldap.info
@@ -1,10 +1,10 @@
 PRGNAM="nss_ldap"
-VERSION="264"
+VERSION="265"
 HOMEPAGE="http://www.padl.com/OSS/nss_ldap.html"
-DOWNLOAD="http://www.padl.com/download/nss_ldap-264.tar.gz"
-MD5SUM="eebab40c6ce2f54e5c377b4895c0c93a"
+DOWNLOAD="http://www.padl.com/download/nss_ldap-265.tar.gz"
+MD5SUM="c1cb02d1a85538cf16bca6f6a562abe4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Christopher Walker"
 EMAIL="kris240376@gmail.com"
-APPROVED="Erik Hanson"
+APPROVED="rworkman"