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

(Portage version: 2.1.5_rc6)

3 files changed, 84 insertions, 3 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/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
++ -----------------------