Fix error introduced by autofs-5.0.3-map-type-in-map-name.patch (patch taken from redhat rawhide autofs-5.0.3-11), also fix bug #219607

Package-Manager: portage-2.1.5_rc6

4 files changed, 87 insertions, 5 deletions

diff --git a/net-fs/autofs/ChangeLog b/net-fs/autofs/ChangeLog
index 0709c78d63c9..b8f4a7d6bd30 100644
--- a/net-fs/autofs/ChangeLog
+++ b/net-fs/autofs/ChangeLog
@@ -1,6 +1,14 @@
 # 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.70 2008/04/28 13:32:32 stefaan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/ChangeLog,v 1.71 2008/04/28 19:53:27 stefaan Exp $
+
+*autofs-5.0.3-r4 (28 Apr 2008)
+
+  28 Apr 2008; Stefaan De Roeck <stefaan@gentoo.org>
+  +files/autofs-5.0.3-map-patch-fix.patch, -autofs-5.0.3-r3.ebuild,
+  +autofs-5.0.3-r4.ebuild:
+  Fix error introduced by autofs-5.0.3-map-type-in-map-name.patch (patch
+  taken from redhat rawhide autofs-5.0.3-11), also fix bug #219607
 
 *autofs-5.0.3-r3 (28 Apr 2008)
 
diff --git a/net-fs/autofs/Manifest b/net-fs/autofs/Manifest
index d4690024997d..514b89fc6eef 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-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
 AUX autofs.rc10 6373 RMD160 bbff8d48111f33a36afd4bf1628d7366a87478fd SHA1 957f37f6e61c89ab0cb452f7a1e7e55e4d0f9070 SHA256 e8ddf8aac8ae593be10ad9640f739f2ddc4d23566bdaeb9b1ac70a3d5c4f31ec
@@ -60,7 +61,7 @@ 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-r3.ebuild 3368 RMD160 0beacb037ca1dd774b9235819a100c85a01fecf6 SHA1 f4b6aaff6c3d2cdb43c4bcb3cf9457683460e10a SHA256 b8620a8a1346629ea2b82a455130d48f17aba32e1bf0d81941f5244cfda38ad2
+EBUILD autofs-5.0.3-r4.ebuild 3498 RMD160 df5b2460b2e76f2493ffcff0e9bd6b0550c1c39d SHA1 980b1cc4dd897e940b4ce987dc951d9f17640c37 SHA256 62508a2ddbe365a91f196badf1ae8b4903fa753ee653eaa8a3b392fea7cf3fed
 EBUILD autofs-5.0.3.ebuild 1635 RMD160 3b0d5e7c5100f60e7d6da903000142e676dce338 SHA1 e4d85cdbbbc89daec1e536fda5f9b6faf4ddf95f SHA256 a5839d8964101cec67d5ec3e70870122acab999906db3d65c40a0ea9ab77604c
-MISC ChangeLog 10405 RMD160 d0b64af5ecbaa065e3d8e01fa67568a7a9cf414b SHA1 2183bce3307960d0c7bc4dc3aa8f5827a4e2dc81 SHA256 f5e7ce9ac46355aff056c2690cb22decd9bed666cf424ff41833a96a12ff0932
+MISC ChangeLog 10726 RMD160 e701df5bcdf3770f6c2ba65c7f18931cd4208b89 SHA1 b8807f14602c7bff6d391460c40de45acaeadbc5 SHA256 8dc3fe2d5264b7c9dd79cb4271a155d0b3d079463af36906d1c9b398e1832ccb
 MISC metadata.xml 258 RMD160 3e5f58364805d3e42d35bb18afabc84771edc6e3 SHA1 f889879c2dfdef80624ebebd791c1b944ff859ae SHA256 3a3251d51801f0288687f235aed354e0f68cb6f90775941ba03b83bfd71e5dae
diff --git a/net-fs/autofs/autofs-5.0.3-r3.ebuild b/net-fs/autofs/autofs-5.0.3-r4.ebuild
index b28dc53e2977..b64cc2f24050 100644
--- a/net-fs/autofs/autofs-5.0.3-r3.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-r3.ebuild,v 1.1 2008/04/28 13:32:32 stefaan Exp $
+# $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 $
 
 inherit eutils multilib autotools
 
@@ -34,6 +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_LIST="
 		${P}-ldap-page-control-configure-fix.patch
 		${P}-xfn-not-supported.patch
@@ -80,7 +82,7 @@ src_compile() {
 		--enable-ignore-busy \
 		|| die "configure failed"
 
-	emake || die "make failed"
+	emake DONTSTRIP=1 || die "make failed"
 }
 
 src_install() {
diff --git a/net-fs/autofs/files/autofs-5.0.3-map-patch-fix.patch b/net-fs/autofs/files/autofs-5.0.3-map-patch-fix.patch
new file mode 100644
index 000000000000..4336c8dafd64
--- /dev/null
+++ b/net-fs/autofs/files/autofs-5.0.3-map-patch-fix.patch
@@ -0,0 +1,71 @@
+--- autofs-5.0.3-map-type-in-map-name.patch.old	2008-04-28 17:47:07.000000000 +0200
++++ autofs-5.0.3-map-type-in-map-name.patch	2008-04-01 05:57:45.000000000 +0200
+@@ -1,19 +1,6 @@
+-diff --git a/CHANGELOG b/CHANGELOG
+-index af5a1b0..76f2477 100644
+---- a/CHANGELOG
+-+++ b/CHANGELOG
+-@@ -12,6 +12,7 @@
+- - update fix expire working harder than needed.
+- - add missing check for zero length NIS key (Wengang Wang).
+- - init SASL callbacks on every ldap lookup library load.
+-+- fix incorrect match of map type name when included in map name.
+-  
+- 14/01/2008 autofs-5.0.3
+- -----------------------
+-diff --git a/lib/master_tok.l b/lib/master_tok.l
+-index b379940..4bbe033 100644
+---- a/lib/master_tok.l
+-+++ b/lib/master_tok.l
++diff -up autofs-5.0.3/lib/master_tok.l.map-type-in-map-name autofs-5.0.3/lib/master_tok.l
++--- autofs-5.0.3/lib/master_tok.l.map-type-in-map-name	2008-04-01 11:14:00.000000000 +0800
+++++ autofs-5.0.3/lib/master_tok.l	2008-04-01 11:14:00.000000000 +0800
+ @@ -77,6 +77,7 @@ int my_yyinput(char *, int);
+  char buff[1024];
+  char *bptr;
+@@ -22,7 +9,7 @@
+  
+  %}
+  
+-@@ -190,13 +191,27 @@ OPTNTOUT	(-n{OPTWS}|-n{OPTWS}={OPTWS}|--negative-timeout{OPTWS}|--negative-timeo
++@@ -190,13 +191,27 @@ OPTNTOUT	(-n{OPTWS}|-n{OPTWS}={OPTWS}|--
+  	{OPTWS}\\\n{OPTWS} {}
+  
+  	{MULTI} {
+@@ -39,9 +26,10 @@
+ +		}
+  	}
+  
+- 	{MTYPE} {
++-	{MTYPE} {
+ -		strcpy(master_lval.strtype, master_text);
+ -		return(MAPTYPE);
+++	{MTYPE}/({DNSERVERSTR}|{DNATTRSTR}=)? {
+ +		tlen = master_leng - 1;
+ +		if (bptr != buff && isblank(master_text[tlen])) {
+ +			strncat(buff, master_text, tlen);
+@@ -54,7 +42,7 @@
+  	}
+  
+  	{MULTISEP} { return(DDASH); }
+-@@ -226,7 +241,7 @@ OPTNTOUT	(-n{OPTWS}|-n{OPTWS}={OPTWS}|--negative-timeout{OPTWS}|--negative-timeo
++@@ -226,7 +241,7 @@ OPTNTOUT	(-n{OPTWS}|-n{OPTWS}={OPTWS}|--
+  		yyless(0);
+  	}
+  
+@@ -63,3 +51,15 @@
+  		BEGIN(DNSTR);
+  		yyless(0);
+  	}
++diff -up autofs-5.0.3/lib/master_parse.y.map-type-in-map-name autofs-5.0.3/lib/master_parse.y
++diff -up autofs-5.0.3/CHANGELOG.map-type-in-map-name autofs-5.0.3/CHANGELOG
++--- autofs-5.0.3/CHANGELOG.map-type-in-map-name	2008-04-01 11:14:00.000000000 +0800
+++++ autofs-5.0.3/CHANGELOG	2008-04-01 11:14:00.000000000 +0800
++@@ -10,6 +10,7 @@
++ - fix unlink of mount tree incorrectly causing autofs mount fail.
++ - add missing check for zero length NIS key (Wengang Wang).
++ - init SASL callbacks on every ldap lookup library load.
+++- fix incorrect match of map type name when included in map name.
++  
++ 14/01/2008 autofs-5.0.3
++ -----------------------