From: Martin Jackson <mjolnir@gentoo.org>
Date: Sat, 10 Feb 2007 06:57:47 +0000 (+0000)
Subject: Add patch to help with GCC 3.4 issues
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=60456b2f761f73e71a5f14a8e6c88b870dbd02e4;p=gentoo.git

Add patch to help with GCC 3.4 issues
Package-Manager: portage-2.1.1-r2
---

diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index 1934e67d6f7e..f1105ed5e44d 100644
--- a/net-analyzer/wireshark/ChangeLog
+++ b/net-analyzer/wireshark/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/wireshark
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.44 2007/02/03 23:59:28 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.45 2007/02/10 06:57:47 mjolnir Exp $
+
+  10 Feb 2007; Martin Jackson <mjolnir@gentoo.org>
+  +files/wireshark-epan_dissectors_packet-diameter.diff,
+  wireshark-0.99.5.ebuild:
+  Add patch from FC3/FreeBSD to fix GCC 3.4 link error (#165340)
 
 *wireshark-0.99.5 (03 Feb 2007)
 
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 0d9b4419318c..db637c5ba357 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,3 +1,7 @@
+AUX wireshark-epan_dissectors_packet-diameter.diff 1106 RMD160 600471845a90d24f6bb65b46c9d2f8e9c851a78d SHA1 c37922ea7e2d12115aaa55ffe361f4724cbfd9f0 SHA256 cf8a00c20abf51456d90b4ff0b6cd19bd64e2796a7268c355a1c482e434c3505
+MD5 6cfe46e4398d7657b708cf8014f93e72 files/wireshark-epan_dissectors_packet-diameter.diff 1106
+RMD160 600471845a90d24f6bb65b46c9d2f8e9c851a78d files/wireshark-epan_dissectors_packet-diameter.diff 1106
+SHA256 cf8a00c20abf51456d90b4ff0b6cd19bd64e2796a7268c355a1c482e434c3505 files/wireshark-epan_dissectors_packet-diameter.diff 1106
 AUX wireshark-except-double-free.diff 664 RMD160 2b61f03f5148975f6438351c11de18a500deabc5 SHA1 0239e19ba0ebd2cfb4ab4987a8a4c56646cd9250 SHA256 dc02a5f3e4bdbd128a2ba08f38880358f747661a93ca0b3fe1918c67b255c369
 MD5 555b2ee8663c2a28c7ed7423ea9b2299 files/wireshark-except-double-free.diff 664
 RMD160 2b61f03f5148975f6438351c11de18a500deabc5 files/wireshark-except-double-free.diff 664
@@ -12,14 +16,14 @@ EBUILD wireshark-0.99.4.ebuild 4244 RMD160 3224430b94c0284c7deb1b343ab807b5c6a15
 MD5 16d2c321d660c6258528c64bcdfc402b wireshark-0.99.4.ebuild 4244
 RMD160 3224430b94c0284c7deb1b343ab807b5c6a15387 wireshark-0.99.4.ebuild 4244
 SHA256 1b04b6f78cad61f20b7f965ecc91d7694c4058ed6fbf04c5be39a123906e2f28 wireshark-0.99.4.ebuild 4244
-EBUILD wireshark-0.99.5.ebuild 4356 RMD160 891b2f2543d683bcc059c264c736246850c3aca7 SHA1 9e8fe535e2b2a082f7626bec5bfaec7477ebbd71 SHA256 58efdf335f9829c01b220f9eebaafa9cbe0466d476f2821308d753d9472041f5
-MD5 d6533ca858a037d47f2d55682bd21d34 wireshark-0.99.5.ebuild 4356
-RMD160 891b2f2543d683bcc059c264c736246850c3aca7 wireshark-0.99.5.ebuild 4356
-SHA256 58efdf335f9829c01b220f9eebaafa9cbe0466d476f2821308d753d9472041f5 wireshark-0.99.5.ebuild 4356
-MISC ChangeLog 6346 RMD160 7e827c8d05128f02cd4b2e08cedccc5c7c633534 SHA1 850b2698a49a6ba841d90d1cf5ddf143fd32c994 SHA256 94768d197e88de1bd5b0d897fa77a2f34caf09c3b72753d90f3dda80cad61f78
-MD5 350778c0c7ddf5b421c8f70a2c670368 ChangeLog 6346
-RMD160 7e827c8d05128f02cd4b2e08cedccc5c7c633534 ChangeLog 6346
-SHA256 94768d197e88de1bd5b0d897fa77a2f34caf09c3b72753d90f3dda80cad61f78 ChangeLog 6346
+EBUILD wireshark-0.99.5.ebuild 4422 RMD160 9af4085f40f814670706beaafcb9ada7826d7262 SHA1 4608aaf00ecbcf3b0162cca125f09ae157575271 SHA256 b46120a2ace8c2e22169bfd4a13978aab4d4835b6479b2876c8a918e1555870a
+MD5 cab75b29036e58d3d8c42b38e8162931 wireshark-0.99.5.ebuild 4422
+RMD160 9af4085f40f814670706beaafcb9ada7826d7262 wireshark-0.99.5.ebuild 4422
+SHA256 b46120a2ace8c2e22169bfd4a13978aab4d4835b6479b2876c8a918e1555870a wireshark-0.99.5.ebuild 4422
+MISC ChangeLog 6544 RMD160 9b0163b4214d3b28e8a992faa09635ac49e6b349 SHA1 dee350b018f9c503fcac7679e7710e2c397bc0a0 SHA256 e65efcbd60af04dc94456535995739940341ed992331811b5233b7a7641df16b
+MD5 ed53468d09c7d1157375e1e6a49ce49e ChangeLog 6544
+RMD160 9b0163b4214d3b28e8a992faa09635ac49e6b349 ChangeLog 6544
+SHA256 e65efcbd60af04dc94456535995739940341ed992331811b5233b7a7641df16b ChangeLog 6544
 MISC metadata.xml 241 RMD160 e54fec44f06e7d8c93e399d9bd98e56f231920be SHA1 3f1b8ff204522d99acbe339fe83cbc916d460554 SHA256 684412188c16efe278e263e010f4bf09d33f17f2762d4829516e3e3a47ab3c02
 MD5 94e03a4ff2917efc81b0e0f07040afde metadata.xml 241
 RMD160 e54fec44f06e7d8c93e399d9bd98e56f231920be metadata.xml 241
diff --git a/net-analyzer/wireshark/files/wireshark-epan_dissectors_packet-diameter.diff b/net-analyzer/wireshark/files/wireshark-epan_dissectors_packet-diameter.diff
new file mode 100644
index 000000000000..e71aaba61516
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-epan_dissectors_packet-diameter.diff
@@ -0,0 +1,19 @@
+--- dissectors/packet-diameter.c.orig	Thu May 12 03:07:06 2005
++++ dissectors/packet-diameter.c	Thu May 12 02:54:14 2005
+@@ -2022,13 +2022,13 @@
+ 		  { "Flags", "diameter.flags", FT_UINT8, BASE_HEX, NULL, 0x0,
+ 		    "", HFILL }},
+ 		{ &hf_diameter_flags_request,
+-		  { "Request", "diameter.flags.request", FT_BOOLEAN, 8, TFS(&flags_set_truth), DIAM_FLAGS_R,
++		  { "Request ", "diameter.flags.request", FT_BOOLEAN, 8, TFS(&flags_set_truth), DIAM_FLAGS_R,
+ 			"", HFILL }},
+ 		{ &hf_diameter_flags_proxyable,
+-		  { "Proxyable", "diameter.flags.proxyable", FT_BOOLEAN, 8, TFS(&flags_set_truth), DIAM_FLAGS_P,
++		  { "Proxyable ", "diameter.flags.proxyable", FT_BOOLEAN, 8, TFS(&flags_set_truth), DIAM_FLAGS_P,
+ 			"", HFILL }},
+ 		{ &hf_diameter_flags_error,
+-		  { "Error","diameter.flags.error", FT_BOOLEAN, 8, TFS(&flags_set_truth), DIAM_FLAGS_E,
++		  { "Error ","diameter.flags.error", FT_BOOLEAN, 8, TFS(&flags_set_truth), DIAM_FLAGS_E,
+ 			"", HFILL }},
+ 		{ &hf_diameter_flags_T,
+ 		  { "T(Potentially re-transmitted message)","diameter.flags.T", FT_BOOLEAN, 8, TFS(&flags_set_truth),DIAM_FLAGS_T,
diff --git a/net-analyzer/wireshark/wireshark-0.99.5.ebuild b/net-analyzer/wireshark/wireshark-0.99.5.ebuild
index e808b72f82ad..474a2b325968 100644
--- a/net-analyzer/wireshark/wireshark-0.99.5.ebuild
+++ b/net-analyzer/wireshark/wireshark-0.99.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-0.99.5.ebuild,v 1.1 2007/02/03 23:59:28 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-0.99.5.ebuild,v 1.2 2007/02/10 06:57:47 mjolnir Exp $
 
 inherit libtool flag-o-matic eutils autotools
 
@@ -58,6 +58,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"/epan
 	epatch "${FILESDIR}"/wireshark-except-double-free.diff
+	epatch "${FILESDIR}"/wireshark-epan_dissectors_packet-diameter.diff
 }
 
 src_compile() {