Refix bug #120403 with permission from robbat2

(Portage version: 2.1_rc2-r3)

4 files changed, 120 insertions, 3 deletions

diff --git a/net-fs/autofs/ChangeLog b/net-fs/autofs/ChangeLog
index d1e922089f03..97b7a8242840 100644
--- a/net-fs/autofs/ChangeLog
+++ b/net-fs/autofs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-fs/autofs
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/ChangeLog,v 1.54 2006/05/20 03:34:57 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/ChangeLog,v 1.55 2006/05/28 04:52:22 antarus Exp $
+
+*autofs-4.1.3-r6 (28 May 2006)
+
+  28 May 2006; Alec Warner <antarus@gentoo.org>
+  -files/autofs-4.1.3-fix-sort-opts.patch, files/auto.net,
+  -autofs-4.1.3-r5.ebuild, +autofs-4.1.3-r6.ebuild:
+  Refix bug #120403 with permission from robbat2
 
 *autofs-4.1.3-r5 (20 May 2006)
 
diff --git a/net-fs/autofs/autofs-4.1.3-r6.ebuild b/net-fs/autofs/autofs-4.1.3-r6.ebuild
new file mode 100644
index 000000000000..8a71b67a47dc
--- /dev/null
+++ b/net-fs/autofs/autofs-4.1.3-r6.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/autofs-4.1.3-r6.ebuild,v 1.1 2006/05/28 04:52:22 antarus Exp $
+
+inherit eutils multilib
+
+IUSE="ldap"
+DESCRIPTION="Kernel based automounter"
+HOMEPAGE="http://www.linux-consulting.com/Amd_AutoFS/autofs.html"
+SRC_URI_BASE="mirror://kernel/linux/daemons/${PN}/v4"
+SRC_URI="${SRC_URI_BASE}/${P}.tar.bz2
+		${SRC_URI_BASE}/${P}-strict.patch
+		${SRC_URI_BASE}/${P}-mtab_lock.patch
+		${SRC_URI_BASE}/${P}-bad_chdir.patch
+		${SRC_URI_BASE}/${P}-non_block_ping.patch
+		${SRC_URI_BASE}/${P}-sock-leak-fix.patch
+		${SRC_URI_BASE}/${P}-replicated_server_select.patch
+		mirror://gentoo/${P}-miscfixes.patch.gz"
+DEPEND="virtual/libc
+		ldap? ( >=net-nds/openldap-2.0 )"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="alpha amd64 ia64 ~mips ppc ppc64 sparc x86"
+
+src_unpack() {
+	unpack ${P}.tar.bz2
+	PATCH_LIST="${P}-strict.patch ${P}-mtab_lock.patch ${P}-bad_chdir.patch ${P}-non_block_ping.patch ${P}-sock-leak-fix.patch ${P}-replicated_server_select.patch ${P}-miscfixes.patch.gz"
+	for i in ${PATCH_LIST}; do
+		EPATCH_OPTS="-p1 -d ${S}" epatch ${DISTDIR}/${i}
+	done
+
+	# Upstream version of this patch is incorrect
+	epatch "${FILESDIR}"/${P}-signal-race-fix.patch
+
+	cd ${S}
+	autoconf || die "Autoconf failed"
+
+	cd ${S}/daemon
+	sed -i 's/LIBS \= \-ldl/LIBS \= \-ldl \-lnsl \$\{LIBLDAP\}/' Makefile || die "LIBLDAP change failed"
+}
+
+src_compile() {
+	local myconf
+	use ldap || myconf="--without-openldap"
+
+	econf ${myconf} || die
+	sed -i -e '/^\(CFLAGS\|CXXFLAGS\|LDFLAGS\)[[:space:]]*=/d' Makefile.rules || die "Failed to remove (C|CXX|LD)FLAGS"
+	emake || die "make failed"
+}
+
+src_install() {
+	into /usr
+	dosbin daemon/automount
+	exeinto /usr/$(get_libdir)/autofs
+	doexe modules/*.so
+
+	dodoc COPYING COPYRIGHT NEWS README* TODO CHANGELOG CREDITS
+	cd ${S}/samples
+	docinto samples ; dodoc auto.misc auto.master
+	cd ${S}/man
+	sed -i 's:\/etc\/:\/etc\/autofs\/:g' *.8 *.5 *.in || die "Failed to update path in manpages"
+	doman auto.master.5 autofs.5 autofs.8 automount.8
+
+	dodir /etc/autofs /etc/init.d /etc/conf.d
+	insinto /etc/autofs ; doins ${FILESDIR}/auto.master
+	insinto /etc/autofs ; doins ${FILESDIR}/auto.misc
+	exeinto /etc/autofs ; doexe ${FILESDIR}/auto.net # chmod 755 is important!
+
+	exeinto /etc/init.d ; newexe ${FILESDIR}/autofs.rc11 autofs
+	insinto /etc/conf.d ; newins ${FILESDIR}/autofs.confd9 autofs
+	if use ldap; then
+		cd ${S}/samples
+		docinto samples ; dodoc ldap* auto.master.ldap
+		insinto /etc/openldap/schema ; doins autofs.schema
+		exeinto /usr/$(get_libdir)/autofs ; doexe autofs-ldap-auto-master
+	fi
+}
+
+pkg_postinst() {
+	einfo "Note: If you plan on using autofs for automounting"
+	einfo "remote NFS mounts without having the NFS daemon running"
+	einfo "please add portmap to your default run-level."
+	echo ""
+	einfo "Also the normal autofs status has been renamed stats"
+	einfo "as there is already a predefined Gentoo status"
+}
diff --git a/net-fs/autofs/files/auto.net b/net-fs/autofs/files/auto.net
index aad4647ac5d3..3156f367041a 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.2 2004/12/09 08:25:48 robbat2 Exp $
+# $Id: auto.net,v 1.3 2006/05/28 04:52:22 antarus 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 | LC_ALL=C sort +0 | \
+$SHOWMOUNT | LC_ALL=C sort +k 1 | \
 	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/digest-autofs-4.1.3-r6 b/net-fs/autofs/files/digest-autofs-4.1.3-r6
new file mode 100644
index 000000000000..c5a58779c3e8
--- /dev/null
+++ b/net-fs/autofs/files/digest-autofs-4.1.3-r6
@@ -0,0 +1,24 @@
+MD5 9efa8126decb509011646d4a4ed0779f autofs-4.1.3-bad_chdir.patch 6343
+RMD160 a406cdaa048c7b44cf93bb05df35bf2f790c6cfb autofs-4.1.3-bad_chdir.patch 6343
+SHA256 ba89a372971daa3d689366f7708ec24034c294e485a88d921fb2eac573f95b0f autofs-4.1.3-bad_chdir.patch 6343
+MD5 5d2cb735d77cd397d3de600bf3e321e6 autofs-4.1.3-miscfixes.patch.gz 3058
+RMD160 ad3d831ac3dd60eba633f976bf0cd38c4f05c6a6 autofs-4.1.3-miscfixes.patch.gz 3058
+SHA256 630f9ee90d23b02ffaa5fe379c4f1bca7db61b8f24f9cd5a2764a0c99a7eddfc autofs-4.1.3-miscfixes.patch.gz 3058
+MD5 f2e7950dab204719162be84b63857abc autofs-4.1.3-mtab_lock.patch 551
+RMD160 f34aeb1e29d8ddc06259c51fcc1bccd48e2b7efc autofs-4.1.3-mtab_lock.patch 551
+SHA256 13494713f698c29281bc5d27a7b4b2dbb7692b6d18f770fada71ab3b28c33fca autofs-4.1.3-mtab_lock.patch 551
+MD5 e404ec690f3ef118ade6f0e605228258 autofs-4.1.3-non_block_ping.patch 7934
+RMD160 6df2da01f032d8d33ef56db62964b68e14b16ca8 autofs-4.1.3-non_block_ping.patch 7934
+SHA256 882a8ddb30b30232bed1afe9b891721ebbaec54c7122e625df3382e6099e8460 autofs-4.1.3-non_block_ping.patch 7934
+MD5 bc536e7fe6e3c79f9b66a4254bf0ad43 autofs-4.1.3-replicated_server_select.patch 962
+RMD160 52f13fed9e443e0810d3e29408b06e797344e8c1 autofs-4.1.3-replicated_server_select.patch 962
+SHA256 95e2f7d1ca19c67b8116a8d5f382a7bb116255fbd507dc6689faea7da9a67dad autofs-4.1.3-replicated_server_select.patch 962
+MD5 14681387a1fc5229c2c73f593334071b autofs-4.1.3-sock-leak-fix.patch 1236
+RMD160 09ca250b5711d04336f61fb7a227d99ae2b4d053 autofs-4.1.3-sock-leak-fix.patch 1236
+SHA256 6aaa548688e7d48eb735dfa9acb1c097b82f8ef68a3ca30aab70a92b9b36453b autofs-4.1.3-sock-leak-fix.patch 1236
+MD5 d408ddcd5dafca8d2907b788f93b225c autofs-4.1.3-strict.patch 1626
+RMD160 8527db5b40eb7d0bf7fcc6f47a5be5beb22905d3 autofs-4.1.3-strict.patch 1626
+SHA256 518a7930cb6bad18f045dfc493ce39816e6fbce0f80c444dd75a33d722a8caff autofs-4.1.3-strict.patch 1626
+MD5 f43a09e94c4bd512ec58ac06e9d42c60 autofs-4.1.3.tar.bz2 125234
+RMD160 7df2839fce00222609bd7977a9d6275276e232b4 autofs-4.1.3.tar.bz2 125234
+SHA256 9257a603815ee8c8d0f2935ff3c254b23f8007eee5fa8c9bf2e3661fdc171035 autofs-4.1.3.tar.bz2 125234