7 files changed, 45 insertions, 66 deletions
diff --git a/source/n/autofs/autofs-5.0.7.tar.sign b/source/n/autofs/autofs-5.0.7.tar.sign
deleted file mode 100644
index 321e4054..00000000
--- a/source/n/autofs/autofs-5.0.7.tar.sign
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.12 (GNU/Linux)
-
-iQIcBAABAgAGBQJQD42MAAoJEOdnc4D1T9ipQqgP/Rgv4TZ+THOwK5GzWkpw49cL
-Iyy1RgdcHYnPlohOBXQf9q5R4xkCtJ57qUWMnKaImPSDKnYUzvS3Ttg6IkdLdOET
-JwO4GrcAKf1Wf+z4eDRjMHd+wrNoau2HkIUSJLSzajExgWQ2127FmYc+GIZv3OAK
-IJac9kSqryjfVLFH5vW4TFgxN4rCMUW8dvCynSG3rSvpWT9CbXrVoKbwQCugpoj0
-tB+1nPlq51hwJjYOXNuPwVBkvtnbB9MbUN9QCtax7ORVdd8ptRBJe0K6z6efvU1G
-aoXKf/HthW+aP07Qb2D8Kz2NwArsS9b2MZMFnk0fkPW0vw3nhGqlWkHaZ72nRz+f
-clY+mv6gjZ0VIQP7/VH8f+8XGOvKipZabMmOx0gR9aEh9DxBqetti5/LHsgJhic3
-8bkXkze8qpLNtMleaPeSV3B4OUUDmGEU1+kdvPsU53eEJQGqqnvYsExhD6SfxT8d
-aksdFqvkEIfrxKxmedjEYo72NjJg/Fr4wYInW0RCEOekOunXV0sxYwZwmx/67EQ4
-PYbWxVT3iTKACa1zSyVQVPrONdXXkTwFGUY5IcRPOQ/05KHOJR8slmaOrRfya0de
-jilwKzuOxXMJlmhhPwPycoe0AEBWEzuq+pr/SX4pqJ/fnvyVbq30aVDEnJr8xHz4
-VIsuyeTjs3iSIL0UaN2c
-=/dIW
------END PGP SIGNATURE-----
diff --git a/source/n/autofs/autofs-5.1.4.tar.sign b/source/n/autofs/autofs-5.1.4.tar.sign
new file mode 100644
index 00000000..6b0e6fc6
--- /dev/null
+++ b/source/n/autofs/autofs-5.1.4.tar.sign
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIcBAABAgAGBQJaOLoGAAoJEOdnc4D1T9ipYvIP/1O0yXKY4dFn62NEhKRhRKl8
+pRveDV2YV6tp0W1L5Q+EOl8AtBI4NZ1Xy8TsQtFIj3Zd6J0mXY6nWj7XM48OZpBk
+u0RWmRe7hb8Q85I765iGsHwG7mtc3R4UseeJrludQ9/NU2GuUBFAtP0MVEO403mj
+N1nJHLLPXWfm/TBvwDLe6POApOAcLEovYPa2AGWyEtCDQWVgJSFmDCK6cBBo3NFb
+SMo+20sxN9o+BYxmpXRwNr9kNGOF0N1wOUHDfIzfIsZp0rzsCo40D1uPDDzL9QVQ
+Tpz2zKkUbIjRPI6X45JDcpXoLJU5jth8oY/fQDfGtNKOrht3safBZe/gRCjVpTAH
+ciBfBxylsMZsRAoafrXN71bfas/SjQKegDlBkbWBWqGjsyH2aqnKbBV6YT6A73KE
+dMog0SckAmyDHb6CEHOsm4ShMDjforDdSK85gb+5B7lTHZGXp/dhCFaA2i2zWbJA
+9v6HTMThwS7NFFGYPZWqf7ev7lLWESLZWQFzX35NJR+q8yojEBS0U+p2QhdPq4M8
+xyKNo0PxnlIL+yUKHfUxz/H8+65Vq3sPyfsjaqeElvrSZI0eaok3u/hHyjPj8y5j
+YDTBdnzW84sqelK9bxKj+uNUmZBwZSvLFhyX52b9zmvtEGTkBOY93VCwNjna9Z5N
+Ol8XFh+xDXdzqwZBoN8c
+=6Zla
+-----END PGP SIGNATURE-----
diff --git a/source/n/autofs/autofs.SlackBuild b/source/n/autofs/autofs.SlackBuild
index 5441894f..e059b178 100755
--- a/source/n/autofs/autofs.SlackBuild
+++ b/source/n/autofs/autofs.SlackBuild
@@ -1,7 +1,6 @@
+#!/bin/bash
 
-#!/bin/sh
-
-# Copyright 2010, 2013  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2010, 2013, 2017, 2018  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,6 +20,7 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=autofs
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
@@ -31,15 +31,23 @@ NUMJOBS=${NUMJOBS:-" -j7 "}
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) export ARCH=i486 ;;
+    i?86) export ARCH=i586 ;;
     arm*) export ARCH=arm ;;
     # Unless $ARCH is already set, use uname -m for all other archs:
        *) export ARCH=$( uname -m ) ;;
   esac
 fi
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
+  exit 0
+fi
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
@@ -52,7 +60,6 @@ else
   LIBDIRSUFFIX=""
 fi
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-$PKGNAM
 
@@ -64,8 +71,6 @@ rm -rf $PKGNAM-$VERSION
 tar xf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1
 cd $PKGNAM-$VERSION || exit 1
 
-zcat $CWD/autofs.sasl.diff.gz | patch -p1 -l --verbose || exit 1
-
 chown -R root:root .
 find . \
   \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -81,9 +86,10 @@ CPPFLAGS="$SLKCFLAGS" \
   --prefix=/usr \
   --mandir=/usr/man \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --with-libtirpc \
   --with-openldap \
   --without-sasl \
-  --build=$ARCH-slackware-linux
+  --build=$ARCH-slackware-linux || exit 1
 
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
@@ -96,11 +102,12 @@ mv $PKG/etc/rc.d/autofs $PKG/etc/rc.d/rc.autofs.new
 chmod 644 $PKG/etc/rc.d/rc.autofs.new
 
 # Prep the config files:
-( cd $PKG/etc
-  for file in auto.master auto.misc autofs_ldap_auth.conf default/autofs ; do
-    mv $file ${file}.new
-  done
-)
+for file in auto.master auto.misc autofs.conf autofs_ldap_auth.conf default/autofs ; do
+  mv $PKG/etc/$file $PKG/etc/${file}.new
+done
+
+# Fix a typo that's harmless but ugly:
+sed -i "s/syatem/system/g" $PKG/etc/default/autofs.new
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
diff --git a/source/n/autofs/autofs.sasl.diff b/source/n/autofs/autofs.sasl.diff
deleted file mode 100644
index 8b451031..00000000
--- a/source/n/autofs/autofs.sasl.diff
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -Nuar autofs-5.0.7-orig/modules/lookup_ldap.c autofs-5.0.7/modules/lookup_ldap.c
---- autofs-5.0.7-orig/modules/lookup_ldap.c     2012-10-02 11:44:21.000000000 -0400
-+++ autofs-5.0.7/modules/lookup_ldap.c  2012-10-02 11:44:46.000000000 -0400
-@@ -585,10 +585,12 @@
- {
-        LDAP *ldap;
-
-+#ifdef WITH_SASL
-        if (ctxt->extern_cert && ctxt->extern_key) {
-                set_env(logopt, ENV_LDAPTLS_CERT, ctxt->extern_cert);
-                set_env(logopt, ENV_LDAPTLS_KEY, ctxt->extern_key);
-        }
-+#endif
-
-        ldap = init_ldap_connection(logopt, uri, ctxt);
-        if (ldap) {
-@@ -1385,10 +1387,12 @@
-                defaults_free_searchdns(ctxt->sdns);
-        if (ctxt->dclist)
-                free_dclist(ctxt->dclist);
-+#ifdef WITH_SASL
-        if (ctxt->extern_cert)
-                free(ctxt->extern_cert);
-        if (ctxt->extern_key)
-                free(ctxt->extern_key);
-+#endif
-        free(ctxt);
-
-        return;
diff --git a/source/n/autofs/autofs.url b/source/n/autofs/autofs.url
new file mode 100644
index 00000000..313c67e6
--- /dev/null
+++ b/source/n/autofs/autofs.url
@@ -0,0 +1 @@
+http://www.kernel.org:/pub/linux/daemons/autofs/v5
diff --git a/source/n/autofs/doinst.sh b/source/n/autofs/doinst.sh
index 0b0d8030..49b6672f 100644
--- a/source/n/autofs/doinst.sh
+++ b/source/n/autofs/doinst.sh
@@ -19,6 +19,7 @@ fi
 
 config etc/auto.master.new
 config etc/auto.misc.new
+config etc/autofs.conf.new
 config etc/autofs_ldap_auth.conf.new
 config etc/default/autofs.new
 
diff --git a/source/n/autofs/slack-desc b/source/n/autofs/slack-desc
index a7af6c0b..776958f8 100644
--- a/source/n/autofs/slack-desc
+++ b/source/n/autofs/slack-desc
@@ -1,16 +1,16 @@
 # HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
+# The "handy ruler" below makes it easier to edit a package description. Line
 # up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
+# on the right side marks the last column you can put a character in. You must
+# make exactly 11 lines for the formatting to be correct. It's also
 # customary to leave one space after the ':'.
 
       |-----handy-ruler------------------------------------------------------|
 autofs: autofs (kernel-based automounter)
 autofs:
-autofs: autofs is a kernel-based automounter for Linux.  It performs a job
+autofs: autofs is a kernel-based automounter for Linux. It performs a job
 autofs: similar to amd(8) but relies on a small stub of kernel code instead of
-autofs: pretending to be an NFS server.  The result is simpler code, better
+autofs: pretending to be an NFS server. The result is simpler code, better
 autofs: reliability, and much faster operation in the common case (everything
 autofs: already mounted.)
 autofs: