Slackware 14.1slackware-14.1

Mon Nov  4 17:08:47 UTC 2013
Slackware 14.1 x86_64 stable is released!

It's been another interesting release cycle here at Slackware bringing
new features like support for UEFI machines, updated compilers and
development tools, the switch from MySQL to MariaDB, and many more
improvements throughout the system.  Thanks to the team, the upstream
developers, the dedicated Slackware community, and everyone else who
pitched in to help make this release a reality.

The ISOs are off to be replicated, a 6 CD-ROM 32-bit set and a
dual-sided
32-bit/64-bit x86/x86_64 DVD.  Please consider supporting the Slackware
project by picking up a copy from store.slackware.com.  We're taking
pre-orders now, and offer a discount if you sign up for a subscription.

Have fun!  :-)

4 files changed, 55 insertions, 66 deletions

diff --git a/source/n/autofs/autofs-5.0.5-fix-libxml2-workaround-configure.patch b/source/n/autofs/autofs-5.0.5-fix-libxml2-workaround-configure.patch
deleted file mode 100644
index 197ac6bd3..000000000
--- a/source/n/autofs/autofs-5.0.5-fix-libxml2-workaround-configure.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-autofs-5.0.5 - fix libxml2 workaround configure
-
-From: Ian Kent <raven@themaw.net>
-
-The configure logic related to work around the libxml2 library
-reload issues is not quite right. The xml code is needed if
-ldap is used so it is sufficient to require inclusion of the
-workaround code if autofs is being built with LDAP support.
----
-
-diff --git a/daemon/Makefile b/daemon/Makefile
-index 371ec72..9e9d635 100644
---- a/daemon/Makefile
-+++ b/daemon/Makefile
-@@ -23,10 +23,8 @@ LDFLAGS += -rdynamic
- LIBS = -ldl
- 
- ifeq ($(LDAP), 1)
--  ifeq ($(SASL), 1)
-     CFLAGS += $(XML_FLAGS)
-     LIBS += $(XML_LIBS)
--  endif
- endif
- 
- all: automount
-diff --git a/daemon/automount.c b/daemon/automount.c
-index 979ecd6..7c44d4b 100644
---- a/daemon/automount.c
-+++ b/daemon/automount.c
-@@ -38,10 +38,12 @@
- #include <sys/utsname.h>
- 
- #include "automount.h"
--#ifdef LIBXML2_WORKAROUND
-+#if defined(LIBXML2_WORKAROUND) || defined(TIRPC_WORKAROUND)
- #include <dlfcn.h>
-+#ifdef WITH_LDAP
- #include <libxml/parser.h>
- #endif
-+#endif
- 
- const char *program;		/* Initialized with argv[0] */
- const char *version = VERSION_STRING;	/* Program version */
-@@ -2110,7 +2112,7 @@ int main(int argc, char *argv[])
- 		exit(1);
- 	}
- 
--#ifdef LIBXML2_WORKAROUND
-+#if defined(WITH_LDAP) && defined(LIBXML2_WORKAROUND)
- 	void *dh_xml2 = dlopen("libxml2.so", RTLD_NOW);
- 	if (!dh_xml2)
- 		dh_xml2 = dlopen("libxml2.so.2", RTLD_NOW);
-@@ -2158,7 +2160,7 @@ int main(int argc, char *argv[])
- 	if (dh_tirpc)
- 		dlclose(dh_tirpc);
- #endif
--#ifdef LIBXML2_WORKAROUND
-+#if defined(WITH_LDAP) && defined( LIBXML2_WORKAROUND)
- 	if (dh_xml2) {
- 		xmlCleanupParser();
- 		dlclose(dh_xml2);
diff --git a/source/n/autofs/autofs-5.0.7.tar.sign b/source/n/autofs/autofs-5.0.7.tar.sign
new file mode 100644
index 000000000..321e4054a
--- /dev/null
+++ b/source/n/autofs/autofs-5.0.7.tar.sign
@@ -0,0 +1,17 @@
+-----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.SlackBuild b/source/n/autofs/autofs.SlackBuild
index 7fb29caeb..5441894fc 100755
--- a/source/n/autofs/autofs.SlackBuild
+++ b/source/n/autofs/autofs.SlackBuild
@@ -1,7 +1,7 @@
 
 #!/bin/sh
 
-# Copyright 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2010, 2013  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,8 +23,8 @@
 
 
 PKGNAM=autofs
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-2}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
@@ -61,10 +61,11 @@ mkdir -p $TMP $PKG
 
 cd $TMP
 rm -rf $PKGNAM-$VERSION
-tar xf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
+tar xf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1
 cd $PKGNAM-$VERSION || exit 1
 
-zcat $CWD/autofs-5.0.5-fix-libxml2-workaround-configure.patch.gz | patch -p1 || 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 \) \
@@ -87,6 +88,9 @@ CPPFLAGS="$SLKCFLAGS" \
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
 
+# Referenced in the auto.master config file, but not created:
+mkdir -p $PKG/etc/auto.master.d
+
 mv $PKG/etc/init.d $PKG/etc/rc.d
 mv $PKG/etc/rc.d/autofs $PKG/etc/rc.d/rc.autofs.new
 chmod 644 $PKG/etc/rc.d/rc.autofs.new
diff --git a/source/n/autofs/autofs.sasl.diff b/source/n/autofs/autofs.sasl.diff
new file mode 100644
index 000000000..8b451031c
--- /dev/null
+++ b/source/n/autofs/autofs.sasl.diff
@@ -0,0 +1,29 @@
+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;