Added some of the debian patches that fix up LDAP and Hesiod in 4.1.3.

4 files changed, 25 insertions, 8 deletions

diff --git a/net-fs/autofs/files/auto.master b/net-fs/autofs/files/auto.master
index 346bef542d8a..fdabf5d873fa 100644
--- a/net-fs/autofs/files/auto.master
+++ b/net-fs/autofs/files/auto.master
@@ -1,9 +1,9 @@
-# $Id: auto.master,v 1.2 2004/12/09 07:25:12 robbat2 Exp $
+# $Id: auto.master,v 1.3 2004/12/09 08:25:48 robbat2 Exp $
 # Sample auto.master file
 # Format of this file:
 # mountpoint map options
 # For details of the format look at autofs(8).
 #/net	/etc/autofs/auto.net
-/misc	/etc/autofs/auto.misc
+#/misc	/etc/autofs/auto.misc
 #/home  /etc/autofs/auto.home
 
diff --git a/net-fs/autofs/files/auto.net b/net-fs/autofs/files/auto.net
index 11bcc30e6bb8..aad4647ac5d3 100644
--- a/net-fs/autofs/files/auto.net
+++ b/net-fs/autofs/files/auto.net
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: auto.net,v 1.1 2004/12/09 07:25:12 robbat2 Exp $
+# $Id: auto.net,v 1.2 2004/12/09 08:25:48 robbat2 Exp $
 
 # This file must be executable to work! chmod 755!
 
@@ -22,7 +22,7 @@ opts="-fstype=nfs,hard,intr,nodev,nosuid,nonstrict"
 # Newer distributions get this right
 SHOWMOUNT="/usr/sbin/showmount --no-headers -e $key"
 
-$SHOWMOUNT | sort +0 | \
+$SHOWMOUNT | LC_ALL=C sort +0 | \
 	awk -v key="$key" -v opts="$opts" -- '
 	BEGIN		{ ORS=""; first=1 }
 			{ if (first) { print opts; first=0 }; print " \\\n\t" $1, key ":" $1 }
diff --git a/net-fs/autofs/files/autofs.rc9 b/net-fs/autofs/files/autofs.rc9
index ea0235fc1c51..78cd45f2d678 100644
--- a/net-fs/autofs/files/autofs.rc9
+++ b/net-fs/autofs/files/autofs.rc9
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/files/autofs.rc9,v 1.1 2004/12/09 07:25:12 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/files/autofs.rc9,v 1.2 2004/12/09 08:25:48 robbat2 Exp $
 
 # rc file for automount using a Sun-style "master map".
 # We first look for a local /etc/autofs/auto.master, then a YP
@@ -139,9 +139,17 @@ function getmounts()
 start() {
 	ebegin "Starting automounter"
 	# ensure autofs support is loaded
-	grep -q autofs /proc/filesystems || modprobe -q autofs
-	[ $? -ne 0 ] && eend 1 "No autofs support available"
-	# now start working
+	grep -q autofs /proc/filesystems || modprobe -q autofs autofs4
+	if [ $? -ne 0 ]; then
+		eend 1 "No autofs support available"
+		exit 1
+	fi
+	# Check that maps exist
+	if [ -z "$(getmounts)" ]; then
+		eend 1 "No automount maps defined"
+		exit 1
+	fi
+	# Now go
 	getmounts | while read cmd timeout time mnt rest
 	do
 		#FIXME: this works but it really sucks
diff --git a/net-fs/autofs/files/digest-autofs-4.1.3-r2 b/net-fs/autofs/files/digest-autofs-4.1.3-r2
new file mode 100644
index 000000000000..e109b9913ec5
--- /dev/null
+++ b/net-fs/autofs/files/digest-autofs-4.1.3-r2
@@ -0,0 +1,9 @@
+MD5 f43a09e94c4bd512ec58ac06e9d42c60 autofs-4.1.3.tar.bz2 125234
+MD5 d408ddcd5dafca8d2907b788f93b225c autofs-4.1.3-strict.patch 1626
+MD5 f2e7950dab204719162be84b63857abc autofs-4.1.3-mtab_lock.patch 551
+MD5 9efa8126decb509011646d4a4ed0779f autofs-4.1.3-bad_chdir.patch 6343
+MD5 e404ec690f3ef118ade6f0e605228258 autofs-4.1.3-non_block_ping.patch 7934
+MD5 3cd31c9522651686f4b5ace5cf63c430 autofs-4.1.3-signal-race-fix.patch 635
+MD5 14681387a1fc5229c2c73f593334071b autofs-4.1.3-sock-leak-fix.patch 1236
+MD5 bc536e7fe6e3c79f9b66a4254bf0ad43 autofs-4.1.3-replicated_server_select.patch 962
+MD5 5d2cb735d77cd397d3de600bf3e321e6 autofs-4.1.3-miscfixes.patch.gz 3058