Support also heimdal's krb5 implementation (fixes bug #210762) + some QA

Package-Manager: portage-2.1.5_rc6

5 files changed, 151 insertions, 6 deletions

diff --git a/net-fs/autofs/ChangeLog b/net-fs/autofs/ChangeLog
index b8f4a7d6bd30..2daecb42adbe 100644
--- a/net-fs/autofs/ChangeLog
+++ b/net-fs/autofs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-fs/autofs
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/ChangeLog,v 1.71 2008/04/28 19:53:27 stefaan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/ChangeLog,v 1.72 2008/05/03 09:16:59 stefaan Exp $
+
+*autofs-5.0.3-r5 (03 May 2008)
+
+  03 May 2008; Stefaan De Roeck <stefaan@gentoo.org>
+  +files/autofs-5.0.3-heimdal.patch, autofs-5.0.3-r4.ebuild,
+  +autofs-5.0.3-r5.ebuild:
+  Support also heimdal's krb5 implementation (fixes bug #210762) + some QA
 
 *autofs-5.0.3-r4 (28 Apr 2008)
 
diff --git a/net-fs/autofs/Manifest b/net-fs/autofs/Manifest
index 514b89fc6eef..9359c23e41cf 100644
--- a/net-fs/autofs/Manifest
+++ b/net-fs/autofs/Manifest
@@ -2,6 +2,7 @@ AUX auto.master 267 RMD160 4e8e79ef65122f4a1c6227298c8c4e39f3dd5846 SHA1 88da29f
 AUX auto.misc 319 RMD160 363c7b0be2d0d79c93b3b74968ae197df49962b4 SHA1 17a5e54accde91da5130599c4375ff3beda99f52 SHA256 7fa3f3cee3d8b0e859316b89fa3fcbad9da03f757de2d3d1a317af94b700e078
 AUX auto.net 1134 RMD160 6396a1d4faac5e9a2bf0f83d53fa7e3c578840f9 SHA1 7a6c88657d22630f688ca80cc5ca782a93eb33f0 SHA256 5ff54fb5e8588b7e7503fca90cad179acec1dbe85a4b81f9c2320151f6b34602
 AUX autofs-4.1.3-signal-race-fix.patch 426 RMD160 1cd4bdc099d29e75d5b6833ffbd2c93f22bf4a3d SHA1 31d20235bd414e8a74de19d951e3f7cf3b61c035 SHA256 1f7f25ce97546c038b71cb9a4ba7dd1fe88e9cd66f0fc34c8411fd76bd7b60de
+AUX autofs-5.0.3-heimdal.patch 1380 RMD160 ed40e452a7648aec1b25e1002c99929be97b8bf9 SHA1 3f7d05c14e52a9a8160a43a38a7b736bb81bb68b SHA256 ca62546abf6b6ae2ed95f53d439d25770f20e70651fdaf5a0edf9d69920b108a
 AUX autofs-5.0.3-map-patch-fix.patch 2543 RMD160 3be39a53ddc5125b9ca09f636f3099c02b15de20 SHA1 4d0613ba4c9f51b1bdfdc2f854f02b0acc2681fa SHA256 7a905f5784b9ecddb757cc998033827b58c2c3f4ea514fd746d1d99d8f0f1d5b
 AUX autofs.confd 186 RMD160 812709be1af1cfc35fa313907496bfb4e9490386 SHA1 51cfe6ffa36ee5bc02f61a3d500469d73e3aa266 SHA256 d32c102ae6bab4958d230366cd42c1a67fab4f38e0d6abdf0c4a94cd71dffa45
 AUX autofs.confd9 799 RMD160 ef61372f9f804dc5b9f662d3810b8a8c80b635de SHA1 80612d8fa46c2b9b7ffdd8d3e711e6d14f0af19f SHA256 c19db9095a5b21bcc0da40adad7141800ddb43db09548adf4c91fd813d9b5e1f
@@ -61,7 +62,8 @@ EBUILD autofs-4.1.3-r9.ebuild 3116 RMD160 17db10c7bfb0b148416703824ce944aa2901f7
 EBUILD autofs-4.1.3.ebuild 1923 RMD160 eaab58530b774637b8b3ae8600a99e17eb31c0ca SHA1 cace6b8fae4c228c99b278a84e0889ce51c23a13 SHA256 655ab0f95d4d71fb37788ef6bd35c1cca0abd8b2714d67cbb26837c8477d95f7
 EBUILD autofs-5.0.3-r1.ebuild 2252 RMD160 769805c5ff06c8acc6dde7e60d9c365058271a82 SHA1 da7f063ee957643b8e0d91a7432d64160c6cbddd SHA256 727d68be090f5eb1646798e45b897f0e951ea2699118838e7d4140a24d00821e
 EBUILD autofs-5.0.3-r2.ebuild 2616 RMD160 a0d4f7d661f393f2bf1c92118ab3dad7c0ff8ed3 SHA1 2c6f89546d43b004719441bc208ab95ab0e67ee0 SHA256 c99bd677715659372729c48fd9115728db65dabe79b55bab6727ea88346a4423
-EBUILD autofs-5.0.3-r4.ebuild 3498 RMD160 df5b2460b2e76f2493ffcff0e9bd6b0550c1c39d SHA1 980b1cc4dd897e940b4ce987dc951d9f17640c37 SHA256 62508a2ddbe365a91f196badf1ae8b4903fa753ee653eaa8a3b392fea7cf3fed
+EBUILD autofs-5.0.3-r4.ebuild 3502 RMD160 3c23739fd994bd642c6703b2e94978eff453be33 SHA1 0ec3dd05654eeaa930f70fc54e21499e56af2bb3 SHA256 8475a1468b62e93a7c3331ae6e7fd9a03dc5dca63cc949e54a32553869b481b5
+EBUILD autofs-5.0.3-r5.ebuild 3565 RMD160 f02c5317c21647486b597d3bbeb1cc827d437b45 SHA1 7cdb65e9094a8b2ffcd530bc52ebcd85c2bfce82 SHA256 7d3cee73490fb4165f24d0c780a1087b60c8a56ec2861a33b3674f10a47d2317
 EBUILD autofs-5.0.3.ebuild 1635 RMD160 3b0d5e7c5100f60e7d6da903000142e676dce338 SHA1 e4d85cdbbbc89daec1e536fda5f9b6faf4ddf95f SHA256 a5839d8964101cec67d5ec3e70870122acab999906db3d65c40a0ea9ab77604c
-MISC ChangeLog 10726 RMD160 e701df5bcdf3770f6c2ba65c7f18931cd4208b89 SHA1 b8807f14602c7bff6d391460c40de45acaeadbc5 SHA256 8dc3fe2d5264b7c9dd79cb4271a155d0b3d079463af36906d1c9b398e1832ccb
+MISC ChangeLog 10975 RMD160 423109d727135d4535fc0a280f89a1954b9f663b SHA1 cd72c40fc0df94ec1854dfa4ba65e55dab205440 SHA256 b0af3009cfd96cc9b9202ddf3d8d8e8f32b55dced92c15215742907aa74e1f54
 MISC metadata.xml 258 RMD160 3e5f58364805d3e42d35bb18afabc84771edc6e3 SHA1 f889879c2dfdef80624ebebd791c1b944ff859ae SHA256 3a3251d51801f0288687f235aed354e0f68cb6f90775941ba03b83bfd71e5dae
diff --git a/net-fs/autofs/autofs-5.0.3-r4.ebuild b/net-fs/autofs/autofs-5.0.3-r4.ebuild
index b64cc2f24050..7576051d810c 100644
--- a/net-fs/autofs/autofs-5.0.3-r4.ebuild
+++ b/net-fs/autofs/autofs-5.0.3-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/autofs-5.0.3-r4.ebuild,v 1.1 2008/04/28 19:53:27 stefaan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/autofs-5.0.3-r4.ebuild,v 1.2 2008/05/03 09:16:59 stefaan Exp $
 
 inherit eutils multilib autotools
 
@@ -34,8 +34,8 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 
 src_unpack() {
 	unpack ${P}.tar.bz2
-	patch ${DISTDIR}/${P}-map-type-in-map-name.patch \
-		< ${FILESDIR}/${P}-map-patch-fix.patch || die "failed to patch"
+	patch "${DISTDIR}"/${P}-map-type-in-map-name.patch \
+		< "${FILESDIR}"/${P}-map-patch-fix.patch || die "failed to patch"
 	PATCH_LIST="
 		${P}-ldap-page-control-configure-fix.patch
 		${P}-xfn-not-supported.patch
diff --git a/net-fs/autofs/autofs-5.0.3-r5.ebuild b/net-fs/autofs/autofs-5.0.3-r5.ebuild
new file mode 100644
index 000000000000..a497ff0c14f3
--- /dev/null
+++ b/net-fs/autofs/autofs-5.0.3-r5.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/autofs-5.0.3-r5.ebuild,v 1.1 2008/05/03 09:16:59 stefaan Exp $
+
+inherit eutils multilib autotools
+
+IUSE="ldap sasl"
+DESCRIPTION="Kernel based automounter"
+HOMEPAGE="http://www.linux-consulting.com/Amd_AutoFS/autofs.html"
+SRC_URI_BASE="mirror://kernel/linux/daemons/${PN}/v5"
+SRC_URI="${SRC_URI_BASE}/${P}.tar.bz2
+		${SRC_URI_BASE}/${P}-ldap-page-control-configure-fix.patch
+		${SRC_URI_BASE}/${P}-xfn-not-supported.patch
+		${SRC_URI_BASE}/${P}-basedn-with-spaces-fix-3.patch
+		${SRC_URI_BASE}/${P}-nfs4-tcp-only.patch
+		${SRC_URI_BASE}/${P}-correct-ldap-lib.patch
+		${SRC_URI_BASE}/${P}-dont-fail-on-empty-master-fix-2.patch
+		${SRC_URI_BASE}/${P}-expire-works-too-hard.patch
+		${SRC_URI_BASE}/${P}-unlink-mount-return-fix.patch
+		${SRC_URI_BASE}/${P}-update-linux-auto_fs4-h.patch
+		${SRC_URI_BASE}/${P}-expire-works-too-hard-update.patch
+		${SRC_URI_BASE}/${P}-expire-works-too-hard-update-2.patch
+		${SRC_URI_BASE}/${P}-handle-zero-length-nis-key.patch
+		${SRC_URI_BASE}/${PN}-5.0.2-init-cb-on-load.patch
+		${SRC_URI_BASE}/${P}-map-type-in-map-name.patch
+		${SRC_URI_BASE}/${P}-mount-thread-create-cond-handling.patch"
+DEPEND="virtual/libc
+		ldap? ( >=net-nds/openldap-2.0 )
+		sasl? ( virtual/krb5 )"
+			# currently, sasl code assumes the presence of kerberosV
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+src_unpack() {
+	unpack ${P}.tar.bz2
+	patch "${DISTDIR}"/${P}-map-type-in-map-name.patch \
+		< "${FILESDIR}"/${P}-map-patch-fix.patch || die "failed to patch"
+	PATCH_LIST="
+		${P}-ldap-page-control-configure-fix.patch
+		${P}-xfn-not-supported.patch
+		${P}-basedn-with-spaces-fix-3.patch
+		${P}-nfs4-tcp-only.patch
+		${P}-correct-ldap-lib.patch
+		${P}-dont-fail-on-empty-master-fix-2.patch
+		${P}-expire-works-too-hard.patch
+		${P}-unlink-mount-return-fix.patch
+		${P}-update-linux-auto_fs4-h.patch
+		${P}-expire-works-too-hard-update.patch
+		${P}-expire-works-too-hard-update-2.patch
+		${P}-handle-zero-length-nis-key.patch
+		${PN}-5.0.2-init-cb-on-load.patch
+		${P}-map-type-in-map-name.patch
+		${P}-mount-thread-create-cond-handling.patch"
+	for i in ${PATCH_LIST}; do
+		EPATCH_OPTS="-p1 -d ${S}" epatch ${DISTDIR}/${i}
+	done
+
+	# fixes bug #210762
+	epatch "${FILESDIR}"/${P}-heimdal.patch
+
+	cd "${S}"
+
+	# # use CC and CFLAGS from environment (bug #154797)
+	# write these values in Makefile.conf
+	(echo "# Use the compiler and cflags determined by configure";
+	echo "CC := @CC@"; echo "CFLAGS := @CFLAGS@") >> Makefile.conf.in
+	# make sure Makefile.conf is parsed after Makefile.rules
+	sed -ni '/include Makefile.conf/{x; n; G}; p' Makefile
+	sed -i 's/^\(CC\|CXX\).*//' Makefile.rules
+	sed -i 's/^CFLAGS=-fPIE.*//' configure.in
+
+	# do not include <nfs/nfs.h>, rather <linux/nfs.h>,
+	# as the former is a lame header for the latter (bug #157968)
+	sed -i 's@nfs/nfs.h@linux/nfs.h@' include/rpc_subs.h
+
+	eautoreconf || die "Autoconf failed"
+}
+
+src_compile() {
+	CFLAGS="${CFLAGS}" \
+	econf \
+		$(use_with ldap openldap) \
+		$(use_with sasl) \
+		--enable-ignore-busy \
+		|| die "configure failed"
+
+	emake DONTSTRIP=1 || die "make failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+
+	newinitd "${FILESDIR}"/autofs5.rc1 autofs
+}
+
+pkg_postinst() {
+	elog "Note: If you plan on using autofs for automounting"
+	elog "remote NFS mounts without having the NFS daemon running"
+	elog "please add portmap to your default run-level."
+}
diff --git a/net-fs/autofs/files/autofs-5.0.3-heimdal.patch b/net-fs/autofs/files/autofs-5.0.3-heimdal.patch
new file mode 100644
index 000000000000..707364df2f97
--- /dev/null
+++ b/net-fs/autofs/files/autofs-5.0.3-heimdal.patch
@@ -0,0 +1,35 @@
+--- autofs-5.0.3.orig/modules/cyrus-sasl.c	2008-04-28 16:17:03.000000000 +0200
++++ autofs-5.0.3/modules/cyrus-sasl.c	2008-04-28 16:41:58.000000000 +0200
+@@ -66,6 +66,15 @@
+ #endif
+ #endif
+ 
++/**
++ * The type of a principal is different for MIT Krb5 and Heimdal.
++ * These macros are provided by Heimdal, and introduced here for MIT.
++ */
++#ifndef krb5_realm_length
++#define krb5_realm_length(r) ((r).length)
++#define krb5_realm_data(r) ((r).data)
++#endif
++
+ /*
+  *  Once a krb5 credentials cache is setup, we need to set the KRB5CCNAME
+  *  environment variable so that the library knows where to find it.
+@@ -452,11 +461,11 @@
+ 
+ 	/* setup a principal for the ticket granting service */
+ 	ret = krb5_build_principal_ext(ctxt->krb5ctxt, &tgs_princ,
+-		krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)->length,
+-		krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)->data,
++		krb5_realm_length(*krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)),
++		krb5_realm_data(*krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)),
+ 		strlen(KRB5_TGS_NAME), KRB5_TGS_NAME,
+-		krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)->length,
+-		krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)->data,
++		krb5_realm_length(*krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)),
++		krb5_realm_data(*krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)),
+ 		0);
+ 	if (ret) {
+ 		error(logopt,
+