Add patch from upstream to fix encrypt conflicts, bug 100488.

Package-Manager: portage-2.0.51.22-r2

4 files changed, 59 insertions, 9 deletions

diff --git a/net-analyzer/ethereal/ChangeLog b/net-analyzer/ethereal/ChangeLog
index 19df05fe835e..47d632e1880d 100644
--- a/net-analyzer/ethereal/ChangeLog
+++ b/net-analyzer/ethereal/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/ethereal
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ChangeLog,v 1.132 2005/07/27 23:42:16 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ChangeLog,v 1.133 2005/07/28 17:13:04 ka0ttic Exp $
+
+  28 Jul 2005; Aaron Walker <ka0ttic@gentoo.org>
+  +files/ethereal-0.10.12-fix-encrypted-conflict.diff,
+  ethereal-0.10.12.ebuild:
+  Add patch from upstream to fix encrypt conflicts, bug 100488.
 
   27 Jul 2005; Bryan Østergaard <kloeri@gentoo.org>
   ethereal-0.10.12.ebuild:
diff --git a/net-analyzer/ethereal/Manifest b/net-analyzer/ethereal/Manifest
index 9768e8356fb2..5d405346b428 100644
--- a/net-analyzer/ethereal/Manifest
+++ b/net-analyzer/ethereal/Manifest
@@ -1,19 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 c39cc94a8cf53dd5ee1154198149a4f1 ethereal-0.10.12.ebuild 3477
-MD5 c197a642ecd8faf1ac997c497a965b3b ethereal-0.10.11.ebuild 3478
-MD5 d60b75d9ad73c4b7bcec713db5c8e5c9 ChangeLog 10254
-MD5 17a9be2cf8cb9f24e7e5b398392483b4 metadata.xml 224
+MD5 2906b82a38c8b1f1a627e51c9cd77325 ethereal-0.10.12.ebuild 3571
 MD5 d654937d7e27a24b2ddfa68e276a64dc ethereal-0.10.11-r1.ebuild 3679
+MD5 c8ce9362b1ebd71e2cd2e73b3c1794fd ChangeLog 10451
+MD5 17a9be2cf8cb9f24e7e5b398392483b4 metadata.xml 224
+MD5 c197a642ecd8faf1ac997c497a965b3b ethereal-0.10.11.ebuild 3478
 MD5 5f6da5f1fabdf39da22bbb5ea224fab1 files/digest-ethereal-0.10.11 70
 MD5 34bd8a0285aea402be479f40304aa947 files/digest-ethereal-0.10.12 70
 MD5 a4d5fb3621ed4e86f311718f1447a870 files/fifo.patch 1138
+MD5 e37a324c1e08bfd08a70fd5958dadeb4 files/ethereal-0.10.12-fix-encrypted-conflict.diff 2838
 MD5 5f6da5f1fabdf39da22bbb5ea224fab1 files/digest-ethereal-0.10.11-r1 70
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFC6BvsKf2g/qXtneoRAl+hAJ9gU9++Vob5tp3rEn3ni8Eeo4gILgCgmBVn
-u2EAMxy2E3QsiY10IjrjgAY=
-=x9he
+iD8DBQFC6RI+EZCkKN40op4RAofsAKCJnbE5k54fGPQQSQ5Q1Wp++X0+fQCcDAY5
+qJk9uGKptr+Quu36bSVEhhk=
+=yE/v
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/ethereal/ethereal-0.10.12.ebuild b/net-analyzer/ethereal/ethereal-0.10.12.ebuild
index 5747c76871dc..84e4d37796fc 100644
--- a/net-analyzer/ethereal/ethereal-0.10.12.ebuild
+++ b/net-analyzer/ethereal/ethereal-0.10.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ethereal-0.10.12.ebuild,v 1.6 2005/07/27 23:42:16 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ethereal-0.10.12.ebuild,v 1.7 2005/07/28 17:13:04 ka0ttic Exp $
 
 inherit libtool flag-o-matic eutils
 
@@ -38,6 +38,12 @@ DEPEND="${RDEPEND}
 	sys-devel/flex
 	sys-apps/sed"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-fix-encrypted-conflict.diff
+}
+
 src_compile() {
 
 	replace-flags -O? -O
diff --git a/net-analyzer/ethereal/files/ethereal-0.10.12-fix-encrypted-conflict.diff b/net-analyzer/ethereal/files/ethereal-0.10.12-fix-encrypted-conflict.diff
new file mode 100644
index 000000000000..b03d9ba68130
--- /dev/null
+++ b/net-analyzer/ethereal/files/ethereal-0.10.12-fix-encrypted-conflict.diff
@@ -0,0 +1,38 @@
+Index: epan/radius_dict.l
+===================================================================
+--- epan/radius_dict.l	(revision 15119)
++++ epan/radius_dict.l	(working copy)
+@@ -65,7 +65,7 @@
+ 	static gchar* attr_vendor = NULL;
+ 	static gchar* vendor_name = NULL;
+ 	static gchar* value_repr = NULL;
+-	static gboolean encrypt = FALSE;
++	static gboolean encrypted = FALSE;
+ 	static gboolean has_tag = FALSE;
+ 	static gchar* current_vendor = NULL;
+ 	
+@@ -97,7 +97,7 @@
+ <VENDOR_W_NAME>[0-9]+   { add_vendor(vendor_name,strtol(yytext,NULL,10)); BEGIN OUT; }
+ <VENDOR_W_NAME>0x[0-9a-f]+   { add_vendor(vendor_name,strtol(yytext,NULL,16)); BEGIN OUT; }
+ 
+-<ATTR>[0-9a-z_-]+					{ attr_name = g_strdup(yytext); encrypt = FALSE; has_tag = FALSE; BEGIN ATTR_W_NAME; }
++<ATTR>[0-9a-z_-]+					{ attr_name = g_strdup(yytext); encrypted = FALSE; has_tag = FALSE; BEGIN ATTR_W_NAME; }
+ <ATTR_W_NAME>[0-9]+					{ attr_id = g_strdup(yytext);  BEGIN ATTR_W_ID;}
+ <ATTR_W_NAME>0x[0-9a-f]+			{ attr_id = g_strdup_printf("%u",(int)strtoul(yytext,NULL,16)); BEGIN ATTR_W_ID;}
+ <ATTR_W_ID>integer					{ attr_type = radius_integer;  BEGIN ATTR_W_TYPE; }
+@@ -109,11 +109,11 @@
+ <ATTR_W_ID>ifid						{ attr_type = radius_ifid;  BEGIN ATTR_W_TYPE; }
+ <ATTR_W_ID>[0-9a-z_-]+				{ attr_type = radius_octets;  BEGIN ATTR_W_TYPE; }
+ <ATTR_W_TYPE>has_tag[,]?			{ has_tag = TRUE; attr_vendor = NULL;  BEGIN ATTR_W_VENDOR; }
+-<ATTR_W_TYPE>encrypt=1[,]?			{ encrypt=TRUE;  attr_vendor = NULL;  BEGIN ATTR_W_VENDOR; }
++<ATTR_W_TYPE>encrypt=1[,]?			{ encrypted=TRUE;  attr_vendor = NULL;  BEGIN ATTR_W_VENDOR; }
+ <ATTR_W_TYPE>[,0-9a-z_-]+=([^\n]+)	{ /* ignore other parameters */  attr_vendor = NULL;  BEGIN ATTR_W_VENDOR; }
+-<ATTR_W_TYPE>[0-9a-z_-]+			{ attr_vendor = g_strdup(yytext);  add_attribute(attr_name,attr_id,attr_type,attr_vendor,encrypt,has_tag); attr_vendor = NULL;  BEGIN OUT; }
+-<ATTR_W_TYPE>\n						{ add_attribute(attr_name,attr_id,attr_type,current_vendor ? g_strdup(current_vendor) : NULL ,encrypt,has_tag); linenums[include_stack_ptr]++;  BEGIN OUT; }
+-<ATTR_W_VENDOR>\n					{ add_attribute(attr_name,attr_id,attr_type,attr_vendor,encrypt,has_tag); linenums[include_stack_ptr]++; BEGIN OUT; };
++<ATTR_W_TYPE>[0-9a-z_-]+			{ attr_vendor = g_strdup(yytext);  add_attribute(attr_name,attr_id,attr_type,attr_vendor,encrypted,has_tag); attr_vendor = NULL;  BEGIN OUT; }
++<ATTR_W_TYPE>\n						{ add_attribute(attr_name,attr_id,attr_type,current_vendor ? g_strdup(current_vendor) : NULL ,encrypted,has_tag); linenums[include_stack_ptr]++;  BEGIN OUT; }
++<ATTR_W_VENDOR>\n					{ add_attribute(attr_name,attr_id,attr_type,attr_vendor,encrypted,has_tag); linenums[include_stack_ptr]++; BEGIN OUT; };
+ 
+ <VALUE>[0-9a-z-]+					{ attr_name = g_strdup(yytext); BEGIN VALUE_W_ATTR; }
+ <VALUE_W_ATTR>[^[:blank:]]+			{ value_repr = g_strdup(yytext); BEGIN VALUE_W_NAME; }