gcc-3.3 fix

4 files changed, 67 insertions, 16 deletions

diff --git a/net-dialup/ppp/ChangeLog b/net-dialup/ppp/ChangeLog
index 02d6503b0e0d..bc678f2a275c 100644
--- a/net-dialup/ppp/ChangeLog
+++ b/net-dialup/ppp/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-dialup/ppp
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ChangeLog,v 1.23 2003/05/23 05:54:49 killian Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ChangeLog,v 1.24 2003/05/25 23:17:54 lu_zero Exp $
+
+  26 May 2003; Luca Barbato <lu_zero@gentoo.org> ppp-2.4.1-r14.ebuild:
+  gcc-3.3 fix and moving the patches in src_unpack.
 
 *ppp-2.4.1-r14 (22 May 2003)
 
diff --git a/net-dialup/ppp/Manifest b/net-dialup/ppp/Manifest
index 91044fd3d127..a53bca9912f5 100644
--- a/net-dialup/ppp/Manifest
+++ b/net-dialup/ppp/Manifest
@@ -1,24 +1,25 @@
-MD5 82b040b74127399320c4305aae497a51 ChangeLog 4004
-MD5 ae2d6b49149fbbcd69f324fff708b7da ppp-2.4.1-r14.ebuild 4424
+MD5 c7f9be450115ca81a4e2541684b4c754 ChangeLog 4128
+MD5 b91ab0463f5f144df86959a7ffbc6946 ppp-2.4.1-r14.ebuild 4550
 MD5 0ed8d8e9cf25b5a4816b39a086f727f4 ppp-2.4.1-r11.ebuild 3126
 MD5 e82e7badfed3b07e43e9e24350ac27f1 ppp-2.4.1-r12.ebuild 3914
 MD5 303dde8eb9f6cba4ceec5bae7981869a ppp-2.4.1-r13.ebuild 4519
-MD5 5f6f3203688bc5a2eceef8301f482c9f files/chat-default 344
-MD5 4fda43c2f3f8b5b58a58e5d238991c0b files/digest-ppp-2.4.1-r14 65
+MD5 c0a3fbe6a293dc2ee14fbd809950ee09 files/net.ppp0 4658
 MD5 4fda43c2f3f8b5b58a58e5d238991c0b files/digest-ppp-2.4.1-r11 65
 MD5 4fda43c2f3f8b5b58a58e5d238991c0b files/digest-ppp-2.4.1-r12 65
-MD5 4fda43c2f3f8b5b58a58e5d238991c0b files/digest-ppp-2.4.1-r13 65
-MD5 0713ffc9ae6e3ee4ef0f5c3cb752b3ea files/ip-down 285
 MD5 c74b7e519f593babcfc3821832d72819 files/ip-up 282
 MD5 5d83af7b897082a0b1ecd70a2cc2a0c7 files/modules.ppp 268
-MD5 86cdaf133f7a79fb464f02d83afc7734 files/plog 146
 MD5 05b7394b35a2342033b52134568bf6b8 files/poff 2723
 MD5 4e62cdeb360ca0a22becbd2deb6f2dac files/pon 957
 MD5 44cc662ba9aa61dd9add3ddd4c5ded57 files/pon.1 3607
 MD5 eb5dfeb9b6a2c8b4b2f23df4980952e0 files/ppp-2.4.1-MSCHAPv2-fix.patch 507
 MD5 824964465508977f9d0836f029d6b02f files/ppp-2.4.1-openssl-0.9.6-mppe-patch.gz 36112
 MD5 f82a3ae0dba4ce6031bbf1405071e827 files/ppp-2.4.1-r10.patch 311
-MD5 feb6723fa9b971cb443cff79693db0cd files/ppp-crypto-fix.patch.bz2 35770
 MD5 f0ad3e0c62aec1771536caf00e28b9c6 files/pppoe.html 7605
-MD5 c0a3fbe6a293dc2ee14fbd809950ee09 files/net.ppp0 4658
+MD5 4fda43c2f3f8b5b58a58e5d238991c0b files/digest-ppp-2.4.1-r13 65
+MD5 0713ffc9ae6e3ee4ef0f5c3cb752b3ea files/ip-down 285
+MD5 86cdaf133f7a79fb464f02d83afc7734 files/plog 146
+MD5 feb6723fa9b971cb443cff79693db0cd files/ppp-crypto-fix.patch.bz2 35770
+MD5 8368eb79ad4618c3c6753801b5c4c689 files/gcc3.3-multiline.patch 1673
+MD5 5f6f3203688bc5a2eceef8301f482c9f files/chat-default 344
 MD5 271b9ea36d7e7c5c6587036927d604e6 files/confd.ppp0 3309
+MD5 4fda43c2f3f8b5b58a58e5d238991c0b files/digest-ppp-2.4.1-r14 65
diff --git a/net-dialup/ppp/files/gcc3.3-multiline.patch b/net-dialup/ppp/files/gcc3.3-multiline.patch
new file mode 100644
index 000000000000..47e08a2b0024
--- /dev/null
+++ b/net-dialup/ppp/files/gcc3.3-multiline.patch
@@ -0,0 +1,39 @@
+diff -ruN ppp-2.4.1.pppoe4.orig/pppd/plugins/pppoe/pppoe.c ppp-2.4.1.pppoe4/pppd/plugins/pppoe/pppoe.c
+--- ppp-2.4.1.pppoe4.orig/pppd/plugins/pppoe/pppoe.c	2001-08-06 14:35:21.000000000 +0200
++++ ppp-2.4.1.pppoe4/pppd/plugins/pppoe/pppoe.c	2003-05-25 23:43:42.000000000 +0200
+@@ -197,8 +197,8 @@
+ 
+     if (pppoe_srv_name !=NULL) {
+ 	if (strlen (pppoe_srv_name) > 255) {
+-	    poe_error (ses," Service name too long
+-	                (maximum allowed 256 chars)");
++	    poe_error (ses," Service name too long "
++	                "(maximum allowed 256 chars)");
+ 	    poe_die(-1);
+ 	}
+ 	ses->filt->stag = make_filter_tag(PTT_SRV_NAME,
+diff -ruN ppp-2.4.1.pppoe4.orig/pppd/plugins/pppoe/pppoed.c ppp-2.4.1.pppoe4/pppd/plugins/pppoe/pppoed.c
+--- ppp-2.4.1.pppoe4.orig/pppd/plugins/pppoe/pppoed.c	2000-08-06 17:39:28.000000000 +0200
++++ ppp-2.4.1.pppoe4/pppd/plugins/pppoe/pppoed.c	2003-05-25 23:51:02.000000000 +0200
+@@ -168,8 +168,8 @@
+ 	case 'A':			/* AC override */
+ 	    poe_info (sess,"AC name override to %s", optarg);
+ 	    if (strlen (optarg) > 255) {
+-		poe_error (sess," AC name too long 
+-			  (maximum allowed 256 chars)");
++		poe_error (sess," AC name too long" 
++			  "(maximum allowed 256 chars)");
+ 		poe_die(-1);
+ 	    }
+ 	    if ((sess->filt->ntag= malloc (sizeof (struct pppoe_tag) + 
+@@ -186,8 +186,8 @@
+ 	case 'E':			/* AC service name override */
+ 	    poe_info (sess,"AC service name override to %s", optarg);
+ 	    if (strlen (optarg) > 255) {
+-		poe_error (sess," Service name too long 
+-	          (maximum allowed 256 chars)");
++		poe_error (sess," Service name too long" 
++	          "(maximum allowed 256 chars)");
+ 		poe_die(-1);
+ 	    }
+ 	    
diff --git a/net-dialup/ppp/ppp-2.4.1-r14.ebuild b/net-dialup/ppp/ppp-2.4.1-r14.ebuild
index 84842d2fffde..f812fe0b6312 100644
--- a/net-dialup/ppp/ppp-2.4.1-r14.ebuild
+++ b/net-dialup/ppp/ppp-2.4.1-r14.ebuild
@@ -17,9 +17,10 @@ SLOT="0"
 LICENSE="BSD GPL-2"
 KEYWORDS="~x86 ~ppc ~sparc ~hppa"
 
-src_compile() {
-
-    use crypt && {
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	use crypt && {
 		#I took the liberty of combining the two crypto patches
 		einfo "Applying ppp-crypto-fix.patch..."
 		bzcat ${FILESDIR}/ppp-crypto-fix.patch.bz2 | patch -p1
@@ -29,11 +30,18 @@ src_compile() {
 	epatch ${FILESDIR}/${P}-r10.patch
 
 	use activefilter && {
-    		# enable option active-filter
-    		mv pppd/Makefile.linux pppd/Makefile.linux.orig
-    		sed -e 's/^#FILTER=y/FILTER=y/' <pppd/Makefile.linux.orig >pppd/Makefile.linux
+    	# enable option active-filter
+    	einfo "Enabling active-filter"
+		mv pppd/Makefile.linux pppd/Makefile.linux.orig
+    	sed -e 's/^#FILTER=y/FILTER=y/' <pppd/Makefile.linux.orig > \
+		pppd/Makefile.linux
 	}
+	epatch ${FILESDIR}/gcc3.3-multiline.patch
+}
 
+src_compile() {
+	cd ${S}
+   
 	./configure --prefix=/usr || die
     
 	#fix Makefiles to compile optimized