Build fails without zlib, this patch fixes it, bug #244931, thank emos696 AT hotmail.com for this work.

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.26-openvz.git-35f41f1 i686

4 files changed, 23 insertions, 4 deletions

diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index cfd385c5c7c1..423c6bccd2f0 100644
--- a/net-analyzer/wireshark/ChangeLog
+++ b/net-analyzer/wireshark/ChangeLog
@@ -1,6 +1,11 @@
 # 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.131 2008/10/22 18:36:49 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.132 2008/10/30 05:40:43 pva Exp $
+
+  30 Oct 2008; Peter Volkov <pva@gentoo.org>
+  +files/wireshark-1.0.4-zlib-build.patch, wireshark-1.0.4.ebuild:
+  Build fails without zlib, this patch fixes it, bug #244931, thank emos696
+  AT hotmail.com for this work.
 
   22 Oct 2008; Guy Martin <gmsoft@gentoo.org> wireshark-1.0.4.ebuild:
   hppa stable, #242996
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 7be0cd6cf8d4..736b9ace1917 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,5 +1,6 @@
 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.1.1--as-needed.patch 314 RMD160 5a9af8d8c1c2a6d2109413201659bd00f04a7bcd SHA1 87015021390434032716f244bc5432993c37f00f SHA256 f01cb55439c550c337f76354edd6f837e242544971a1f2dd3b45e911e75b42a7
 AUX wireshark-1.1.1-misc-warnings.patch 4670 RMD160 2de4bf9047358e17d26aa61861dd008d017a930f SHA1 27474af46f1a40ac97a744507103e8f08888fbd7 SHA256 c6fd74828754eadd7932acccee36828d0d6f511d327866a935afdc3beabaa4af
 AUX wireshark-except-double-free.diff 664 RMD160 2b61f03f5148975f6438351c11de18a500deabc5 SHA1 0239e19ba0ebd2cfb4ab4987a8a4c56646cd9250 SHA256 dc02a5f3e4bdbd128a2ba08f38880358f747661a93ca0b3fe1918c67b255c369
@@ -7,7 +8,7 @@ DIST wireshark-1.0.3.tar.bz2 13104737 RMD160 02714cf78ddc8aefb3506509ceb31d35b44
 DIST wireshark-1.0.4.tar.bz2 13126757 RMD160 741b6618ba34b55079f15d5725a1e9a22a4fc351 SHA1 8e75a6d909a1da803db77f6f86fdd5096e5bbac8 SHA256 20a37f018a4e2644fdb373f2d9c5d43d4f43e41f1fa29ac6edb53045c0a70e3a
 DIST wireshark-1.1.1.tar.gz 17856811 RMD160 522a717e9163b844e452cb3d50376f113335aca9 SHA1 5d6d57a6e67b30fbbd8241c9305002d410a3e920 SHA256 e55f72b7910a4556411bace181e9ecdb3c7da6b8510ade7a632a5144cee4a94a
 EBUILD wireshark-1.0.3.ebuild 4981 RMD160 3011fd330a111acf197b1f535d855dc796a738ff SHA1 20f351fbeb0d2aea981155cfcd129adefbd3b386 SHA256 4849cdd99f2d1212667ec7d6004711821e15e24ea06f9305ae9c527fe7777a44
-EBUILD wireshark-1.0.4.ebuild 4968 RMD160 349c9fea1a593384c9026e10e421a141b71c2795 SHA1 bb0d78bb7f4fae71c92a58c655cdebc59aa45dc9 SHA256 5bc7fe3b3e7ccf71e43be9389b1eadf2173807446092abfff0ddd6dc8c1679de
+EBUILD wireshark-1.0.4.ebuild 5017 RMD160 8f5ea8d284c6cd9ebafb442229a134f5fc469dfb SHA1 c880d51bd6fc2581e438afac3137925e9ff25798 SHA256 0f7f9687009bde250732a0de6a834159c1f0480fca530fd2d7fd407c10ad70b1
 EBUILD wireshark-1.1.1.ebuild 4877 RMD160 41554c22880caec66f8cd7bb4f6166e77a4f17e8 SHA1 7fdd83bed14bebbda885a73f21d75b96edbf33d7 SHA256 743847dde1635d343813d1b7a0a9c2cb4e0f63ad0c2c7719ef7ae454da812823
-MISC ChangeLog 20330 RMD160 fb4cd8d8277fdad243e0c731605de28b3a484b5e SHA1 39d5ccec187a191fe7d53c324c534c1c157cdafd SHA256 6b3f382867db6a524490fb9be5c8465c44b2acc92a67176e72f1a4ec7ef72014
+MISC ChangeLog 20548 RMD160 eea2d2f234e788be40a4eb2252d0b99fd84e484b SHA1 ab61e9ad80dcbfbcfcde03dc170566926a3921ff SHA256 fc721d4227dc9204a8ce137dc4a51d15a653e81ab9b6cf076f06193bb0fb75f2
 MISC metadata.xml 2154 RMD160 01af8905d25e6c387902d30766daedcd37d94e0e SHA1 d68e79d413654ce72c553d508d7aa96f27fe85b5 SHA256 48c540fcec9cf1e5eebe132d7f90e8330b413f4eb6469761a88720eaa6a2233a
diff --git a/net-analyzer/wireshark/files/wireshark-1.0.4-zlib-build.patch b/net-analyzer/wireshark/files/wireshark-1.0.4-zlib-build.patch
new file mode 100644
index 000000000000..ccc8b60bf128
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-1.0.4-zlib-build.patch
@@ -0,0 +1,12 @@
+http://anonsvn.wireshark.org/viewvc?view=rev&revision=26524
+
+--- trunk-1.0/wiretap/file_access.c	2008/10/23 14:30:35	26523
++++ trunk-1.0/wiretap/file_access.c	2008/10/23 16:38:52	26524
+@@ -978,6 +978,7 @@
+ static FILE *wtap_dump_file_fdopen(wtap_dumper *wdh _U_, int fd)
+ {
+ 	return fdopen(fd, "wb");
++}
+ #endif
+ 
+ /* internally writing raw bytes (compressed or not) */
diff --git a/net-analyzer/wireshark/wireshark-1.0.4.ebuild b/net-analyzer/wireshark/wireshark-1.0.4.ebuild
index a13f393706b5..71ea33a4e9a3 100644
--- a/net-analyzer/wireshark/wireshark-1.0.4.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.0.4.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.4.ebuild,v 1.6 2008/10/22 18:36:49 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.0.4.ebuild,v 1.7 2008/10/30 05:40:43 pva Exp $
 
 EAPI=1
 WANT_AUTOMAKE="1.9"
@@ -62,6 +62,7 @@ src_unpack() {
 	cd "${S}"
 	epatch "${FILESDIR}"/${PN}-0.99.7-asneeded.patch
 	epatch "${FILESDIR}"/${PN}-0.99.8-as-needed.patch
+	epatch "${FILESDIR}"/${P}-zlib-build.patch #244931
 
 	cd "${S}"/epan
 	epatch "${FILESDIR}"/wireshark-except-double-free.diff