Fix installation paths for automount map files, thank albecasa for report in bug 385113 and Dustin Polke for fix.

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

3 files changed, 133 insertions, 6 deletions

diff --git a/net-fs/autofs/ChangeLog b/net-fs/autofs/ChangeLog
index be8c79ebde58..02243e1a1c1a 100644
--- a/net-fs/autofs/ChangeLog
+++ b/net-fs/autofs/ChangeLog
@@ -1,6 +1,12 @@
 # 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.135 2011/10/09 16:46:08 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/ChangeLog,v 1.136 2011/10/14 20:15:13 pva Exp $
+
+*autofs-5.0.6-r4 (14 Oct 2011)
+
+  14 Oct 2011; Peter Volkov <pva@gentoo.org> +autofs-5.0.6-r4.ebuild:
+  Fix installation paths for automount map files, thank albecasa for report in
+  bug 385113 and Dustin Polke for fix.
 
   09 Oct 2011; Markus Meier <maekke@gentoo.org> autofs-5.0.6-r3.ebuild:
   x86 stable, bug #379569
diff --git a/net-fs/autofs/Manifest b/net-fs/autofs/Manifest
index 1c2632fa1e1e..e00e741b6a85 100644
--- a/net-fs/autofs/Manifest
+++ b/net-fs/autofs/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX auto.master 267 RMD160 4e8e79ef65122f4a1c6227298c8c4e39f3dd5846 SHA1 88da29f5d82a1073471eed654c99ff1fc3c064f3 SHA256 47df928601dc31bc8c23781bd0475b7ecb5bd09525c92a8772d51e0dc660b414
 AUX auto.misc 319 RMD160 363c7b0be2d0d79c93b3b74968ae197df49962b4 SHA1 17a5e54accde91da5130599c4375ff3beda99f52 SHA256 7fa3f3cee3d8b0e859316b89fa3fcbad9da03f757de2d3d1a317af94b700e078
@@ -169,13 +169,14 @@ EBUILD autofs-5.0.5.ebuild 2835 RMD160 5c5ca0c11ae8205f85bc8fbec7e2b95f206bbb91
 EBUILD autofs-5.0.6-r1.ebuild 3702 RMD160 589d540d027f97a674a4723db36d997118d17172 SHA1 bf120380ceb21c7d6a72c8e09b50c64c0ceb8d89 SHA256 f2f8f94c1f6c1e75bd7acfdfc83d1a5ba1bce3368c0fa230989edb466a652107
 EBUILD autofs-5.0.6-r2.ebuild 3826 RMD160 79a773c7af48ff4bc18097c35f7453352e0860b2 SHA1 f23e8f39bb80d92e7530e1b5b9b38ddd58317e10 SHA256 9ed7b30e3fa651e7dc57971de42a046e6c5f29b36c90f311989894ad0a2ab5ab
 EBUILD autofs-5.0.6-r3.ebuild 3829 RMD160 3518ebbcd7313d99adf2a6054949c3aaf2e533f6 SHA1 1e02d5b0a707a23321d24bb35d147aeadb16aa48 SHA256 631ceadff6bff37a56903290ad5e7f989ddb8dff33ff07733ecf54f9d871b5cf
+EBUILD autofs-5.0.6-r4.ebuild 3894 RMD160 ca2cb4f1da00ee5843bf06f1140ecf312d4f4d04 SHA1 6f4012b227ca9739c724d3432a325ea14b4a4d92 SHA256 e28b1ac232cf470e339906ac879aee000fa1d1b138754f1e612f7ffd53b4e909
 EBUILD autofs-5.0.6.ebuild 3485 RMD160 7c7accf22b56f49a3fa89fd0356a12ef17f39399 SHA1 24ebb4e411afb5721b1acd634ab2e516aae237f0 SHA256 faa6b414e896e49b3b8bac1507f3a43baa0399cd84b29c4ad517ac3ff59ba1e0
-MISC ChangeLog 22284 RMD160 b88a09f769fa4b10d6e292580fd0819543c85757 SHA1 9fc3ee5d3f6a402f8514aaad76afac8c60b64819 SHA256 826356df3f8bbba41e772ea76be4860cb5abc0a599849f15f6f7d3cf227cc763
+MISC ChangeLog 22502 RMD160 3b6b70dfcb3059b61e97d500e4c33d3d17628c3d SHA1 a2ed486534b056d1068ead5f4118c8185e524c5a SHA256 2110de0e39d037247eaecfbc32e5360196c1cf3e18d5d132667b1436382e71a5
 MISC metadata.xml 530 RMD160 417c66e2ec6e8627d23373d76d8c187a4dced885 SHA1 7629fc63948229c175548cc8ca24774316fe41b1 SHA256 454c11f4af437af306f09746ed10abe0d565c2b9b4b232b3d892dca494e0d768
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk6R0BcACgkQkKaRLQcq0GLEngCdEE8w+Eyg3rL7pHfPFR2pfDzr
-kboAoKVgxe6kX58e217rsT9F33Qvcvz+
-=BfMM
+iF4EAREIAAYFAk6Yl+cACgkQGrk+8vGYmwcTOQD+M2pdnP3xC0cOiQ0VROh9b2yy
+mbUgRvOTzax7+RMZsI8BAO72+pEzbYqS3unKJvag2sTDDzR6nx6L4evDCjEoQUVZ
+=BFei
 -----END PGP SIGNATURE-----
diff --git a/net-fs/autofs/autofs-5.0.6-r4.ebuild b/net-fs/autofs/autofs-5.0.6-r4.ebuild
new file mode 100644
index 000000000000..70aa055e0b42
--- /dev/null
+++ b/net-fs/autofs/autofs-5.0.6-r4.ebuild
@@ -0,0 +1,120 @@
+# 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-r4.ebuild,v 1.1 2011/10/14 20:15:13 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}
+	sys-devel/flex
+	virtual/yacc"
+
+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
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=381315
+	epatch "${FILESDIR}"/${P}-revert-ldap.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
+	# --with-mapdir is for bug #385113
+	econf \
+		--with-confdir=/etc/conf.d \
+		--with-mapdir=/etc/autofs \
+		$(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."
+}