upstream patch to fix bug #165896 - hopefully

Package-Manager: portage-2.1.2-r9

4 files changed, 42 insertions, 10 deletions

diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index f1105ed5e44d..e3a9884440ab 100644
--- a/net-analyzer/wireshark/ChangeLog
+++ b/net-analyzer/wireshark/ChangeLog
@@ -1,6 +1,10 @@
 # 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.45 2007/02/10 06:57:47 mjolnir Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.46 2007/02/16 22:47:34 dragonheart Exp $
+
+  16 Feb 2007; Daniel Black <dragonheart@gentoo.org>
+  +files/wireshark-0.99.5-sizet.patch, wireshark-0.99.5.ebuild:
+  upstream patch to fix bug #165896 - hopefully
 
   10 Feb 2007; Martin Jackson <mjolnir@gentoo.org>
   +files/wireshark-epan_dissectors_packet-diameter.diff,
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index db637c5ba357..b6cf07ccc7c6 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,3 +1,10 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX wireshark-0.99.5-sizet.patch 290 RMD160 f162ca06aab5b3f62269c3690bef965c1eceef95 SHA1 3afbd56f4dbcccda7e74cda158553786f88fd7f4 SHA256 9081276cb7e8ba74e4f9289e89f3e0bced9e1163b4e7e5cefb3cf7b131605375
+MD5 9cf68b2290e19ac343fdc91bbff3620f files/wireshark-0.99.5-sizet.patch 290
+RMD160 f162ca06aab5b3f62269c3690bef965c1eceef95 files/wireshark-0.99.5-sizet.patch 290
+SHA256 9081276cb7e8ba74e4f9289e89f3e0bced9e1163b4e7e5cefb3cf7b131605375 files/wireshark-0.99.5-sizet.patch 290
 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
@@ -16,14 +23,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 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
+EBUILD wireshark-0.99.5.ebuild 4465 RMD160 5fba44d253805afff47fd1fb2dcfd3a0c657665f SHA1 729af0cdf0a4c09a90745159a9fa5859f5fc6c34 SHA256 79d59d656caadc222149e46ec5f7e9b13c509b2ed748ebabb5bfd5c77f653985
+MD5 6722195b65fd5fbf1bdc9af3f7dd8835 wireshark-0.99.5.ebuild 4465
+RMD160 5fba44d253805afff47fd1fb2dcfd3a0c657665f wireshark-0.99.5.ebuild 4465
+SHA256 79d59d656caadc222149e46ec5f7e9b13c509b2ed748ebabb5bfd5c77f653985 wireshark-0.99.5.ebuild 4465
+MISC ChangeLog 6714 RMD160 c20b55a3f74d4b85e26a7558a4729962c3c94915 SHA1 9ef1ce4cf78196903b3e9c7028ce47b3acb12eb7 SHA256 08d7076620e5391cc0c2bd4c65678e2e519416036cf51bd08cf9b19d937890d4
+MD5 7007e8c28284b25935183217a6b52eee ChangeLog 6714
+RMD160 c20b55a3f74d4b85e26a7558a4729962c3c94915 ChangeLog 6714
+SHA256 08d7076620e5391cc0c2bd4c65678e2e519416036cf51bd08cf9b19d937890d4 ChangeLog 6714
 MISC metadata.xml 241 RMD160 e54fec44f06e7d8c93e399d9bd98e56f231920be SHA1 3f1b8ff204522d99acbe339fe83cbc916d460554 SHA256 684412188c16efe278e263e010f4bf09d33f17f2762d4829516e3e3a47ab3c02
 MD5 94e03a4ff2917efc81b0e0f07040afde metadata.xml 241
 RMD160 e54fec44f06e7d8c93e399d9bd98e56f231920be metadata.xml 241
@@ -37,3 +44,10 @@ SHA256 85ae4fb2135d27ce392f55dc72be383af5985b30a8594268e4065b569a570e4d files/di
 MD5 8c4800c83cacdb6bdaba3dfce8ff2bd2 files/digest-wireshark-0.99.5 259
 RMD160 f10ce49cc68b01414423bb6d5a566088d659f4d9 files/digest-wireshark-0.99.5 259
 SHA256 10ade9a82e7e0d50bed6dac4edce4fccc71c249dc01d40586abc7b94e135bd68 files/digest-wireshark-0.99.5 259
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.2 (GNU/Linux)
+
+iD8DBQFF1jSnmdTrptrqvGERArmeAJ9ogMy55f/RHsZkUk4V9Zub6Ix/5ACfalO4
+FBuen2ho5Ewx0YSdK2eJgq4=
+=F6iK
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/wireshark/files/wireshark-0.99.5-sizet.patch b/net-analyzer/wireshark/files/wireshark-0.99.5-sizet.patch
new file mode 100644
index 000000000000..1b2cfad7ff12
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-0.99.5-sizet.patch
@@ -0,0 +1,13 @@
+--- crypt/airpdcap_interop.h.orig	2007-02-02 09:56:19.000000000 +1100
++++ crypt/airpdcap_interop.h	2007-02-10 15:29:13.000000000 +1100
+@@ -86,8 +86,10 @@
+ #endif
+ 
+ #ifndef	size_t
++#ifndef	_SIZE_T
+ typedef	gsize	size_t;
+ #endif
++#endif
+ 
+ #ifdef WIN32
+ #include <winsock2.h>  /* ntohs() */
diff --git a/net-analyzer/wireshark/wireshark-0.99.5.ebuild b/net-analyzer/wireshark/wireshark-0.99.5.ebuild
index 474a2b325968..81de69b57654 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.2 2007/02/10 06:57:47 mjolnir Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-0.99.5.ebuild,v 1.3 2007/02/16 22:47:34 dragonheart Exp $
 
 inherit libtool flag-o-matic eutils autotools
 
@@ -57,6 +57,7 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	cd "${S}"/epan
+	epatch "${FILESDIR}"/${P}-sizet.patch
 	epatch "${FILESDIR}"/wireshark-except-double-free.diff
 	epatch "${FILESDIR}"/wireshark-epan_dissectors_packet-diameter.diff
 }