Fix regression in the ipv6 lookup, bug #373577 thank Juergen Rose for report and Dustin Polke for the fix.

Package-Manager: portage-2.1.10.3/cvs/Linux x86_64

4 files changed, 173 insertions, 2 deletions

diff --git a/net-fs/autofs/ChangeLog b/net-fs/autofs/ChangeLog
index 8fccf0a692cf..a4981cc93ba1 100644
--- a/net-fs/autofs/ChangeLog
+++ b/net-fs/autofs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-fs/autofs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/ChangeLog,v 1.111 2011/06/28 14:06:07 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/ChangeLog,v 1.112 2011/07/01 11:24:07 pva Exp $
+
+*autofs-5.0.6-r1 (01 Jul 2011)
+
+  01 Jul 2011; Peter Volkov <pva@gentoo.org> +autofs-5.0.6-r1.ebuild,
+  +files/autofs-5.0.6-ipv6_name_lookup_regression.patch:
+  Fix regression in the ipv6 lookup, bug #373577 thank Juergen Rose for report
+  and Dustin Polke for the fix.
 
 *autofs-5.0.6 (28 Jun 2011)
 
diff --git a/net-fs/autofs/Manifest b/net-fs/autofs/Manifest
index 4fd760aa62e2..19758f448ed1 100644
--- a/net-fs/autofs/Manifest
+++ b/net-fs/autofs/Manifest
@@ -17,6 +17,7 @@ AUX autofs-5.0.5-fix-building-without-sasl.patch 469 RMD160 63727a0f759f57291fb0
 AUX autofs-5.0.5-fix-install-deadlink.patch 544 RMD160 1fc3e01015a0b18e90a41754654ca6b7b1f3f30c SHA1 6170d1f7cd2ba88063967154b92d2ef67d760160 SHA256 48393e00ddb51c5b0588ea45711abb16bf256c487c584062bc3de59b30bae053
 AUX autofs-5.0.5-respect-user-flags-and-fix-asneeded-v1.patch 4400 RMD160 441f8c5488267036da65f69234f11fd82015f809 SHA1 94016e5fde7286e54f8ca0c465dc3f1fe3bbd3ba SHA256 ab5cbc585fb3f6f753d08345beffbb4a188d8f957fad3ee9c81487baca6e69ec
 AUX autofs-5.0.5-respect-user-flags-and-fix-asneeded.patch 3851 RMD160 df4fec7045a4dea512745f91fbbb3c7d00d2cf9f SHA1 b9e175dffcb65cb83fc34a15dce3c91f279278f3 SHA256 f69b3fcc717e96826fa6f6b2766423bc6d12cee06b739b0f10b99ffa3e4589ad
+AUX autofs-5.0.6-ipv6_name_lookup_regression.patch 1278 RMD160 badddcaa5c852d21d9f6d63db513eb4374c4ea69 SHA1 42224c808a41c1597d6f3a0d04a48b81a72d9322 SHA256 fdc02dbb0896dbfc71d042c1837e7c93983762f5683791fb99f931e6f98dda05
 AUX autofs-5.0.6-respect-user-flags-and-fix-asneeded.patch 3895 RMD160 a06e62c8f0f1de0c5eccfe8cf429b2ea13ccb8eb SHA1 f8eed2d5f17100dfe8269db4c38ea7bec953c2ed SHA256 4f063e952349c0a4dba6895b2271034dd2905a649cdc0b672343123490e4aaa8
 AUX autofs.confd9 799 RMD160 ef61372f9f804dc5b9f662d3810b8a8c80b635de SHA1 80612d8fa46c2b9b7ffdd8d3e711e6d14f0af19f SHA256 c19db9095a5b21bcc0da40adad7141800ddb43db09548adf4c91fd813d9b5e1f
 AUX autofs.rc11 7469 RMD160 e8472a75e3804a83cdb31fb1a9e293a87492ba0b SHA1 be29dc822d5216bd40edf1067df04eb5b56455a1 SHA256 a050aff19d249598d789859fbfd01ac72d73a68f83d9edb96661aae76a5f5481
@@ -160,6 +161,7 @@ EBUILD autofs-5.0.5-r3.ebuild 3438 RMD160 666a8f707a7047b6b72031cbdf590ef5b62597
 EBUILD autofs-5.0.5-r4.ebuild 3516 RMD160 c5c11b56ba6a1de59bd29a7765bb35ed41c319af SHA1 6df08fe663680dff6a5862e07907234682388b55 SHA256 0de21df4abadc6a7315e7df225869ba03bb2f531c8a56efe28edafebd9c831b6
 EBUILD autofs-5.0.5-r5.ebuild 3374 RMD160 41f3d38a90d35e9c3d718260cc997208d0ea1858 SHA1 965ab1e86ea9368a42752b64e6e8d8b6fc1d12a7 SHA256 4468f9b6170af3199f49f8437afa8d956254c1838698a7666275319ff0f0dbc6
 EBUILD autofs-5.0.5.ebuild 2835 RMD160 5c5ca0c11ae8205f85bc8fbec7e2b95f206bbb91 SHA1 0d342ceed013e86f9c7f3a97706bde018843b301 SHA256 5107794cdebe88a072bb8ea82e42b0e17de242da17e032d515fb19a650dab8fe
+EBUILD autofs-5.0.6-r1.ebuild 3701 RMD160 72a006edc352b47ce1154892957af93ab9766827 SHA1 b848475d358ce5509cfe278aa528c37f72d21fd8 SHA256 8d3b1e62aef9aaff0e6725fdca80b21ca6b21333a984ccf9d7aa1ba512003404
 EBUILD autofs-5.0.6.ebuild 3485 RMD160 7c7accf22b56f49a3fa89fd0356a12ef17f39399 SHA1 24ebb4e411afb5721b1acd634ab2e516aae237f0 SHA256 faa6b414e896e49b3b8bac1507f3a43baa0399cd84b29c4ad517ac3ff59ba1e0
-MISC ChangeLog 18887 RMD160 d421a11626ac01869f895fc96439b0eed88f88b0 SHA1 0daa55dc4e11a5eaa3e64902fc6e096e2b762318 SHA256 02cf90c709212b5a7afdde046913404687afa837f584208ba105687eacf56903
+MISC ChangeLog 19158 RMD160 735c7a84a71ee07a22eae2ec2bec1b26014ea0ab SHA1 20a4d3120457352254eb236abd44c417b8a49d35 SHA256 ccb4b6cbc5b1d3907ee09e3452e99f92f2e8747de7f00312b32fa9ad09d66978
 MISC metadata.xml 629 RMD160 e54d3bf18dc419c0e900d81ed9aca1432e555d65 SHA1 64893b5cd342d35c9278df1b63fa106629b5ccf4 SHA256 2f9dffb787ccf5f094c9f839c60f32cc78f12546b56da94fec2c1fbb23e07e2b
diff --git a/net-fs/autofs/autofs-5.0.6-r1.ebuild b/net-fs/autofs/autofs-5.0.6-r1.ebuild
new file mode 100644
index 000000000000..388a730a26f4
--- /dev/null
+++ b/net-fs/autofs/autofs-5.0.6-r1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/autofs-5.0.6-r1.ebuild,v 1.1 2011/07/01 11:24:07 pva Exp $
+
+EAPI="4"
+inherit eutils multilib autotools linux-info
+
+DESCRIPTION="Kernel based automounter"
+HOMEPAGE="http://www.linux-consulting.com/Amd_AutoFS/autofs.html"
+PATCH_VER=""
+[[ -n ${PATCH_VER} ]] && \
+	PATCHSET_URI="mirror://gentoo/${P}-patches-${PATCH_VER}.tar.lzma"
+SRC_URI="mirror://kernel/linux/daemons/${PN}/v5/${P}.tar.bz2
+	${PATCHSET_URI}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="hesiod ldap sasl"
+
+# USE="sasl" adds SASL support to the LDAP module which will not be build. If
+# SASL support should be available, please add "ldap" to the USE flags.
+REQUIRED_USE="sasl? ( ldap )"
+
+# currently, sasl code assumes the presence of kerberosV
+RDEPEND="hesiod? ( net-dns/hesiod )
+	ldap? ( >=net-nds/openldap-2.0
+		sasl? ( dev-libs/cyrus-sasl
+			dev-libs/libxml2
+			virtual/krb5 ) )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	# Upstream's patchset
+	if [[ -n ${PATCH_VER} ]]; then
+		EPATCH_SUFFIX="patch" \
+			epatch "${WORKDIR}"/patches
+	fi
+
+	# Fix for bug #210762
+	# Upstream reference: http://thread.gmane.org/gmane.linux.kernel.autofs/4203
+	epatch "${FILESDIR}"/${PN}-5.0.3-heimdal.patch
+
+	# Accumulated fixes for bugs
+	#    #154797: Respect CC and CFLAGS
+	#    #253412: Respect LDFLAGS
+	#    #247969: Link order for --as-needed
+	epatch "${FILESDIR}"/${P}-respect-user-flags-and-fix-asneeded.patch
+
+	# do not include <nfs/nfs.h>, rather <linux/nfs.h>,
+	# as the former is a lame header for the latter (bug #157968)
+	sed 's@nfs/nfs.h@linux/nfs.h@' -i include/rpc_subs.h || die
+
+	# Upstream reference: http://thread.gmane.org/gmane.linux.kernel.autofs/5371
+	epatch "${FILESDIR}"/${PN}-5.0.5-fix-install-deadlink.patch
+
+	# Upstream reference: http://thread.gmane.org/gmane.linux.kernel.autofs/6039
+	# Disable LDAP specific code if USE="-ldap", let's see what upstream says...
+	epatch "${FILESDIR}"/${PN}-5.0.5-fix-building-without-ldap.patch
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=361899
+	epatch "${FILESDIR}"/${PN}-5.0.5-add-missing-endif-HAVE_SASL-in-modules-lookup_ldap.c.patch
+
+	# Fix for bug #373577
+	# Upstream reference: http://article.gmane.org/gmane.linux.kernel.autofs/6187
+	# Fix regression in IPv6 name lookup regression
+	epatch "${FILESDIR}"/${P}-ipv6_name_lookup_regression.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	# work around bug #355975 (mount modifies timestamp of /etc/mtab)
+	# with >=sys-apps/util-linux-2.19,
+	addpredict "/etc/mtab"
+
+	# --with-confdir is for bug #361481
+	econf \
+		--with-confdir=/etc/conf.d \
+		$(use_with ldap openldap) \
+		$(use_with sasl) \
+		$(use_with hesiod) \
+		--enable-ignore-busy
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc README* CHANGELOG CREDITS COPYRIGHT INSTALL
+
+	# kernel patches
+	docinto patches
+	dodoc patches/${PN}4-2.6.??{,.?{,?}}-v5-update-????????.patch
+
+	newinitd "${FILESDIR}"/autofs5.initd autofs
+	insinto etc/autofs
+	newins "${FILESDIR}"/autofs5-auto.master auto.master
+}
+
+pkg_postinst() {
+	if kernel_is -lt 2 6 30; then
+		elog "This version of ${PN} requires a kernel with autofs4 supporting"
+		elog "protocol version 5.00. Patches for kernels older than 2.6.30 have"
+		elog "been installed into"
+		elog "${EROOT}usr/share/doc/${P}/patches."
+		elog "For further instructions how to patch the kernel, please refer to"
+		elog "${EROOT}usr/share/doc/${P}/INSTALL."
+		elog
+	fi
+	elog "If you plan on using autofs for automounting remote NFS mounts,"
+	elog "please check that both portmap (or rpcbind) and rpc.statd/lockd"
+	elog "are running."
+}
diff --git a/net-fs/autofs/files/autofs-5.0.6-ipv6_name_lookup_regression.patch b/net-fs/autofs/files/autofs-5.0.6-ipv6_name_lookup_regression.patch
new file mode 100644
index 000000000000..7465a98a3993
--- /dev/null
+++ b/net-fs/autofs/files/autofs-5.0.6-ipv6_name_lookup_regression.patch
@@ -0,0 +1,49 @@
+--- modules/replicated.c
++++ modules/replicated.c	
+@@ -1111,7 +1111,8 @@ static int add_host_addrs(struct host **list, const char *host,
+                          unsigned int weight, unsigned int options)
+ {
+ 	struct addrinfo hints, *ni, *this;
+-	char *name = strdup(host);
++	char *n_ptr;
++	char *name = n_ptr = strdup(host);
+ 	int len;
+ 	char buf[MAX_ERR_BUF];
+ 	int rr = 0;
+@@ -1125,15 +1126,17 @@ static int add_host_addrs(struct host **list, const char *host,
+ 	}
+ 	len = strlen(name);
+ 
+-	if (name[0] == '[' && name[--len] == ']')
++	if (name[0] == '[' && name[--len] == ']') {
+ 		name[len] = '\0';
++		name++;
++	}
+ 
+ 	memset(&hints, 0, sizeof(hints));
+ 	hints.ai_flags = AI_NUMERICHOST;
+ 	hints.ai_family = AF_UNSPEC;
+ 	hints.ai_socktype = SOCK_DGRAM;
+ 
+-	ret = getaddrinfo(name + 1, NULL, &hints, &ni);
++	ret = getaddrinfo(name, NULL, &hints, &ni);
+ 	if (ret)
+ 		goto try_name;
+ 
+@@ -1153,7 +1156,7 @@ try_name:
+ 	hints.ai_family = AF_UNSPEC;
+ 	hints.ai_socktype = SOCK_DGRAM;
+ 
+-	ret = getaddrinfo(name + 1, NULL, &hints, &ni);
++	ret = getaddrinfo(name, NULL, &hints, &ni);
+ 	if (ret) {
+ 		error(LOGOPT_ANY, "hostname lookup failed: %s",
+ 			gai_strerror(ret));
+@@ -1172,7 +1175,7 @@ try_name:
+ 	}
+ 	freeaddrinfo(ni);
+ done:
+-	free(name);
++	free(n_ptr);
+ 	return ret;
+ }