Try to fix bug #77077, by removing signal-race-fix.patch.

(Portage version: 2.0.51-r15)

4 files changed, 121 insertions, 33 deletions

diff --git a/net-fs/autofs/ChangeLog b/net-fs/autofs/ChangeLog
index 8b88c3ebe895..ab3a6019e720 100644
--- a/net-fs/autofs/ChangeLog
+++ b/net-fs/autofs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-fs/autofs
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/ChangeLog,v 1.37 2005/01/10 19:57:46 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/ChangeLog,v 1.38 2005/02/05 10:39:42 robbat2 Exp $
+
+*autofs-4.1.3-r3 (05 Feb 2005)
+
+  05 Feb 2005; Robin H. Johnson <robbat2@gentoo.org> +autofs-4.1.3-r3.ebuild:
+  Try to fix bug #77077, by removing signal-race-fix.patch.
 
   10 Jan 2005; Gustavo Zacarias <gustavoz@gentoo.org> autofs-4.1.3-r2.ebuild:
   Stable on sparc
diff --git a/net-fs/autofs/Manifest b/net-fs/autofs/Manifest
index 8641576fc75f..ab814de05c67 100644
--- a/net-fs/autofs/Manifest
+++ b/net-fs/autofs/Manifest
@@ -1,44 +1,36 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 2f12e530203a74bea880e97715ec7f70 ChangeLog 5622
-MD5 44f4d9269d0d413a5705c63763d13b89 autofs-3.1.7-r3.ebuild 1285
-MD5 517e323f25fec842b06d2fe2dd3fbe4a autofs-3.1.7-r4.ebuild 1735
-MD5 9b1633cf8ba801b528f62fbbd605ee92 autofs-3.1.7-r5.ebuild 1749
-MD5 2ec9b6db2017b88545921a17e7fd5ab1 autofs-3.1.7-r6.ebuild 1783
+MD5 e820df1a57ba682652efee940b0ac147 autofs-4.1.3-r2.ebuild 2928
 MD5 9630b044705f7d7767adaed924e12819 autofs-4.0.0.ebuild 1928
 MD5 6295dea1b85bae2ee4f821c93a203707 autofs-4.1.3.ebuild 1932
-MD5 3281a009cd789c5c937c9e6a3124e792 metadata.xml 287
+MD5 2ec9b6db2017b88545921a17e7fd5ab1 autofs-3.1.7-r6.ebuild 1783
+MD5 44f4d9269d0d413a5705c63763d13b89 autofs-3.1.7-r3.ebuild 1285
 MD5 3d3cf02251e5c203425b834ca9ab4089 autofs-4.1.3-r1.ebuild 2864
-MD5 e820df1a57ba682652efee940b0ac147 autofs-4.1.3-r2.ebuild 2928
-MD5 256e713e8b47896dd2049326ec26fc78 files/auto.home 239
-MD5 759f43aeed6787d6b6d7556d03afe782 files/auto.master 267
-MD5 aa40e8bef91418943312910e73d05eed files/auto.misc 319
+MD5 9b1633cf8ba801b528f62fbbd605ee92 autofs-3.1.7-r5.ebuild 1749
+MD5 f0366bb39e933b0fa11173bc8432b173 autofs-4.1.3-r3.ebuild 2858
+MD5 270ba7e124d0d9f498418ccd36848707 ChangeLog 5793
+MD5 3281a009cd789c5c937c9e6a3124e792 metadata.xml 287
+MD5 517e323f25fec842b06d2fe2dd3fbe4a autofs-3.1.7-r4.ebuild 1735
 MD5 a132f5883b92e2b509fa66e429f913ab files/autofs.confd 186
+MD5 3e9a4415d9928180bd9d1a7a09d4d2e7 files/ldap_config.patch 785
+MD5 759f43aeed6787d6b6d7556d03afe782 files/auto.master 267
+MD5 b7b301269f0796121d1f29c4a128b79e files/auto.net 1132
+MD5 39ac8cc927dab754a7694abdb1a2cdc5 files/open_max.diff 408
+MD5 7fa23f910baa8aa00609bd74a60c8e34 files/autofs1.confd 137
+MD5 2f74c237baee9004a019d3365ab04c0d files/digest-autofs-4.1.3-r1 586
+MD5 f311a86fdf3a03702afac9cf4fd74528 files/digest-autofs-4.1.3-r2 660
+MD5 4e3ad0d70f88a0cb691ea5442f95421f files/digest-autofs-4.1.3-r3 584
 MD5 1b6efbe0072911c5c960a27e09a9d024 files/autofs.rc6 3717
 MD5 4cc7219397b1bdb60da3f150bd7d9230 files/autofs.rc7 3624
 MD5 539a3f843f501558cb01ca8c124e83f4 files/autofs.rc8 5186
-MD5 7fa23f910baa8aa00609bd74a60c8e34 files/autofs1.confd 137
-MD5 41de856a77a074078968ff244b863f88 files/automount.diff 322
+MD5 256cbf81075ea92d6fd45d915037f302 files/autofs.rc9 5598
+MD5 7b562ed7d75738124cadc9de83d4a335 files/digest-autofs-4.0.0 66
+MD5 ba9378bfaf4e17d13789ac9a056ddb3b files/digest-autofs-4.1.3 65
+MD5 552ad0cdacd4354b83dba94670ec0e99 files/autofs.confd9 799
+MD5 256e713e8b47896dd2049326ec26fc78 files/auto.home 239
+MD5 aa40e8bef91418943312910e73d05eed files/auto.misc 319
 MD5 ee656860c0682821d144556f674ca481 files/digest-autofs-3.1.7-r3 64
 MD5 ee656860c0682821d144556f674ca481 files/digest-autofs-3.1.7-r4 64
 MD5 ee656860c0682821d144556f674ca481 files/digest-autofs-3.1.7-r5 64
 MD5 ee656860c0682821d144556f674ca481 files/digest-autofs-3.1.7-r6 64
-MD5 7b562ed7d75738124cadc9de83d4a335 files/digest-autofs-4.0.0 66
-MD5 ba9378bfaf4e17d13789ac9a056ddb3b files/digest-autofs-4.1.3 65
-MD5 a872a3743192bbca4f78ecec7f74df03 files/ldap.diff 367
-MD5 3e9a4415d9928180bd9d1a7a09d4d2e7 files/ldap_config.patch 785
+MD5 41de856a77a074078968ff244b863f88 files/automount.diff 322
 MD5 77884391a3fbf365a88f5d2230b548d9 files/nisyp.patch 419
-MD5 39ac8cc927dab754a7694abdb1a2cdc5 files/open_max.diff 408
-MD5 b7b301269f0796121d1f29c4a128b79e files/auto.net 1132
-MD5 552ad0cdacd4354b83dba94670ec0e99 files/autofs.confd9 799
-MD5 256cbf81075ea92d6fd45d915037f302 files/autofs.rc9 5598
-MD5 2f74c237baee9004a019d3365ab04c0d files/digest-autofs-4.1.3-r1 586
-MD5 f311a86fdf3a03702afac9cf4fd74528 files/digest-autofs-4.1.3-r2 660
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFB4t5EKRy60XGEcJIRArSVAJ90VsCVawsekbyS5GM0VGhxb+NkMwCgmKUT
-p1jF2A3OPPkxM8elGjCmqTw=
-=Fkei
------END PGP SIGNATURE-----
+MD5 a872a3743192bbca4f78ecec7f74df03 files/ldap.diff 367
diff --git a/net-fs/autofs/autofs-4.1.3-r3.ebuild b/net-fs/autofs/autofs-4.1.3-r3.ebuild
new file mode 100644
index 000000000000..80dd1f839c59
--- /dev/null
+++ b/net-fs/autofs/autofs-4.1.3-r3.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2005 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-r3.ebuild,v 1.1 2005/02/05 10:39:42 robbat2 Exp $
+
+inherit eutils
+
+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="~x86 ~alpha ~ppc ~sparc ~amd64 ~ia64 ~ppc64"
+
+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
+
+	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/lib/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.rc9 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/lib/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/digest-autofs-4.1.3-r3 b/net-fs/autofs/files/digest-autofs-4.1.3-r3
new file mode 100644
index 000000000000..e7bd1851d65d
--- /dev/null
+++ b/net-fs/autofs/files/digest-autofs-4.1.3-r3
@@ -0,0 +1,8 @@
+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 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