Fix building on 64bit systems due to implicit string prototypes.

Package-Manager: portage-2.2_rc18/cvs/Linux 2.6.28 x86_64

4 files changed, 38 insertions, 4 deletions

diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index 12a9343706e5..c7382675507d 100644
--- a/net-analyzer/wireshark/ChangeLog
+++ b/net-analyzer/wireshark/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/wireshark
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.143 2008/12/18 18:20:26 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.144 2008/12/26 09:02:51 vapier Exp $
+
+  26 Dec 2008; Mike Frysinger <vapier@gentoo.org>
+  +files/wireshark-1.0.5-text2pcap-protos.patch, wireshark-1.0.5.ebuild:
+  Fix building on 64bit systems due to implicit string prototypes.
 
   18 Dec 2008; Tobias Scherbaum <dertobi123@gentoo.org>
   wireshark-1.0.5.ebuild:
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index fdaac7d6be9b..92633ba3a878 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,7 +1,11 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX wireshark-0.99.7-asneeded.patch 339 RMD160 faa516dd3dfd8bd6218f66d3bedb5490b0896f5b SHA1 ec2b8952f8fe55471e923c086a6e9b48e06ce7a8 SHA256 9fc8b3ec3fcf1cca714c78c28c1883503abfcfce4fe175e43c6d7ec14ddc9478
 AUX wireshark-0.99.8-as-needed.patch 395 RMD160 2e06f641e9789db717544bfd1568e4bf6e85855c SHA1 a18b6fcc85b40c00fc1d30bcdfc81d13dc33e904 SHA256 d2f996a79fa3117296b25c10a1d4a3f0f8027a678de4e37e6c60bfb47a4754b9
 AUX wireshark-1.0.4-zlib-build.patch 370 RMD160 f3403f6813460c9630d782fddd1478db60a87363 SHA1 83aa0694fc836b89a1ce5cf2748510daeb0ec108 SHA256 21ca38ec05e3e6b4fddf196c038d39b748b59256a40333b3623eff59715aff00
 AUX wireshark-1.0.5-glib-1-build.patch 721 RMD160 d4de28a4e8b45e2b2243b0d113a7f767a0d2f7f1 SHA1 89caa207c6d4e74c3b3a2f47cd62304ff58b341b SHA256 536c1e3bdfc609fa0867c7d37e4f4b88b24d4525a1687992ee7606c365eaef0a
+AUX wireshark-1.0.5-text2pcap-protos.patch 487 RMD160 20e64be01b281c48516969c508c04455111de300 SHA1 432751cd931baefba3bd13cfa07c3d9863b7c82e SHA256 991e12325670c81f4927c6dc2b665eb8c8938d8f3f0cdfab58601dd37a00d8a4
 AUX wireshark-1.1.1--as-needed.patch 314 RMD160 5a9af8d8c1c2a6d2109413201659bd00f04a7bcd SHA1 87015021390434032716f244bc5432993c37f00f SHA256 f01cb55439c550c337f76354edd6f837e242544971a1f2dd3b45e911e75b42a7
 AUX wireshark-1.1.1-misc-warnings.patch 5519 RMD160 24b02a98a96861621f3ebd14534bc16ab162b4a6 SHA1 2110476f7079b15982c384fa9e0c0754162a6b52 SHA256 ff335d097283d3d32a47952c33684e2485e7f506f26088957deb3c4a06121d30
 AUX wireshark-except-double-free.diff 664 RMD160 2b61f03f5148975f6438351c11de18a500deabc5 SHA1 0239e19ba0ebd2cfb4ab4987a8a4c56646cd9250 SHA256 dc02a5f3e4bdbd128a2ba08f38880358f747661a93ca0b3fe1918c67b255c369
@@ -9,7 +13,14 @@ DIST wireshark-1.0.4.tar.bz2 13126757 RMD160 741b6618ba34b55079f15d5725a1e9a22a4
 DIST wireshark-1.0.5.tar.bz2 13144320 RMD160 72b1ac2e78a02e84525b6ecd6563698b5b7474fc SHA1 593aaf3a7527e8ca74e4982caeb5a77831b121db SHA256 4f923e24d674ac62ded3da402a4de6d402886d80e3d7cac91cf026921f32fcf7
 DIST wireshark-1.1.1.tar.gz 17856811 RMD160 522a717e9163b844e452cb3d50376f113335aca9 SHA1 5d6d57a6e67b30fbbd8241c9305002d410a3e920 SHA256 e55f72b7910a4556411bace181e9ecdb3c7da6b8510ade7a632a5144cee4a94a
 EBUILD wireshark-1.0.4.ebuild 5023 RMD160 fe695d6eb4d09a78775c50259012f93cf821ac92 SHA1 52fd64fd410b4aaf5bd42afa2c658b63d5b42f9d SHA256 2003524940e631e83ce4d5fbd3029c2a96eeb0438655f86066b1bf75338bf29f
-EBUILD wireshark-1.0.5.ebuild 4903 RMD160 c8fd817ef15c0ef2f5483a61910aa074d96367b2 SHA1 a154432e639f4637366df2c98d37029752af28ee SHA256 e5275cd1570cbbbdf9c23bf5dd994fbabcf58f476abb2105aff2782f5274267b
+EBUILD wireshark-1.0.5.ebuild 4950 RMD160 2cadc6b79baa2f8d021cfe1a0ee55c01572e3838 SHA1 ebfda05895fe1f1f68c348b48cd200221d15fd2d SHA256 93bf69963f6dc31656339b1e5c9dd79ca09bb6c823829a94a767d5ceb500c030
 EBUILD wireshark-1.1.1.ebuild 4877 RMD160 41554c22880caec66f8cd7bb4f6166e77a4f17e8 SHA1 7fdd83bed14bebbda885a73f21d75b96edbf33d7 SHA256 743847dde1635d343813d1b7a0a9c2cb4e0f63ad0c2c7719ef7ae454da812823
-MISC ChangeLog 21991 RMD160 d4f16582266cb66da674375dbcfdb5544777b8e4 SHA1 03c6f89caff36ad2375b3cf95e15bd87152c8cd7 SHA256 23b62357a1e5f9d7389a7a72bde235cd7ba4c16c7de5c3e9239acaee77ee67ab
+MISC ChangeLog 22178 RMD160 24720010d42a5db56162968c1bc4849283f7c75b SHA1 7a54724d135ae6e2d61636942d2a350341aae28f SHA256 75b6acc18359e2c6519feb2cea0aa35ca76af18a2be12e810cd113104131b006
 MISC metadata.xml 2154 RMD160 01af8905d25e6c387902d30766daedcd37d94e0e SHA1 d68e79d413654ce72c553d508d7aa96f27fe85b5 SHA256 48c540fcec9cf1e5eebe132d7f90e8330b413f4eb6469761a88720eaa6a2233a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAklUncQACgkQn/5bYzqsSmEvQACfdK/6WRjZZ3djwWV9cFisoyUw
+S9wAn15TjbUDX3w7WPzhOuREvxrMxk0Z
+=9bMK
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/wireshark/files/wireshark-1.0.5-text2pcap-protos.patch b/net-analyzer/wireshark/files/wireshark-1.0.5-text2pcap-protos.patch
new file mode 100644
index 000000000000..eed2df16a70b
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-1.0.5-text2pcap-protos.patch
@@ -0,0 +1,18 @@
+defining _XOPEN_SOURCE to nothing means the oldest version which means glibc
+will not provide the strdup() prototype.  this leads to an implicit decl which
+leads to a return type of "int" -- 32bits of a ptr on a 64bit arch leads to
+kaboom.
+
+https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3161
+
+--- text2pcap.c
++++ text2pcap.c
+@@ -90,7 +90,7 @@
+ #  define __USE_XOPEN
+ #endif
+ #ifndef _XOPEN_SOURCE
+-#  define _XOPEN_SOURCE
++#  define _XOPEN_SOURCE 600
+ #endif
+ 
+ #include <ctype.h>
diff --git a/net-analyzer/wireshark/wireshark-1.0.5.ebuild b/net-analyzer/wireshark/wireshark-1.0.5.ebuild
index 42f3192fbb6b..bcdf43ba02c9 100644
--- a/net-analyzer/wireshark/wireshark-1.0.5.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.0.5.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-analyzer/wireshark/wireshark-1.0.5.ebuild,v 1.9 2008/12/18 18:20:26 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.0.5.ebuild,v 1.10 2008/12/26 09:02:51 vapier Exp $
 
 EAPI=1
 WANT_AUTOMAKE="1.9"
@@ -61,6 +61,7 @@ src_unpack() {
 	epatch "${FILESDIR}/${PN}-0.99.7-asneeded.patch"
 	epatch "${FILESDIR}/${PN}-0.99.8-as-needed.patch"
 	epatch "${FILESDIR}/${P}-glib-1-build.patch"
+	epatch "${FILESDIR}"/${P}-text2pcap-protos.patch
 
 	cd "${S}/epan"
 	epatch "${FILESDIR}/wireshark-except-double-free.diff"