Fixed freeze on start issue, bug #260457, thank haarp for report.

Package-Manager: portage-2.1.6.7/cvs/Linux x86_64

5 files changed, 48 insertions, 32 deletions

diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index ec6ecfcd5c41..7fb30eb94adf 100644
--- a/net-analyzer/wireshark/ChangeLog
+++ b/net-analyzer/wireshark/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-analyzer/wireshark
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.152 2009/02/11 17:14:37 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.153 2009/03/05 17:57:30 pva Exp $
+
+*wireshark-1.0.6-r1 (05 Mar 2009)
+
+  05 Mar 2009; Peter Volkov <pva@gentoo.org>
+  -files/wireshark-1.0.5-glib-1-build.patch,
+  +files/wireshark-1.0-sigpipe.patch, -wireshark-1.0.5.ebuild,
+  +wireshark-1.0.6-r1.ebuild:
+  Fixed freeze on start issue, bug #260457, thank haarp for report.
 
   11 Feb 2009; Tobias Scherbaum <dertobi123@gentoo.org>
   wireshark-1.0.6.ebuild:
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 10f4428dd223..8ff1e14e4af1 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,14 +1,13 @@
 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.5-glib-1-build.patch 721 RMD160 d4de28a4e8b45e2b2243b0d113a7f767a0d2f7f1 SHA1 89caa207c6d4e74c3b3a2f47cd62304ff58b341b SHA256 536c1e3bdfc609fa0867c7d37e4f4b88b24d4525a1687992ee7606c365eaef0a
+AUX wireshark-1.0-sigpipe.patch 850 RMD160 a240a1317681516d207ca1694b0e44584008530b SHA1 8f127c22daa77ce9f658f3b1d3f897e428ee9dde SHA256 3a5130838a48b65cb21b4e25913347cee05689b4641c1dfb407facf9fa4f9f59
 AUX wireshark-1.0.5-text2pcap-protos.patch 487 RMD160 20e64be01b281c48516969c508c04455111de300 SHA1 432751cd931baefba3bd13cfa07c3d9863b7c82e SHA256 991e12325670c81f4927c6dc2b665eb8c8938d8f3f0cdfab58601dd37a00d8a4
 AUX wireshark-1.1.2--as-needed.patch 830 RMD160 fd192d107147c65ef52625b51b59a2bf4e2f65c3 SHA1 7a743a42542fa59423870a0205e8ed7aa6bde70e SHA256 34aa27c611021c9a515cc4fed9778148395761bf6f4272130d3e83abcc13a499
 AUX wireshark-except-double-free.diff 664 RMD160 2b61f03f5148975f6438351c11de18a500deabc5 SHA1 0239e19ba0ebd2cfb4ab4987a8a4c56646cd9250 SHA256 dc02a5f3e4bdbd128a2ba08f38880358f747661a93ca0b3fe1918c67b255c369
-DIST wireshark-1.0.5.tar.bz2 13144320 RMD160 72b1ac2e78a02e84525b6ecd6563698b5b7474fc SHA1 593aaf3a7527e8ca74e4982caeb5a77831b121db SHA256 4f923e24d674ac62ded3da402a4de6d402886d80e3d7cac91cf026921f32fcf7
 DIST wireshark-1.0.6.tar.bz2 13161721 RMD160 5037c3c5f38c914233f064efb3dbe409896b3e0b SHA1 1aa726e32905a2815d01a9f33df84a873b11c7ef SHA256 7b4adacd86ba9f1c6a3a0dc74303d03635cd361c23c312ff9698e0c2a44b9f0d
 DIST wireshark-1.1.2.tar.gz 18365823 RMD160 19898543f9d7d7544a5547f823b7d8bdd6d01b48 SHA1 e02a4344a14ad508d99add35ab2cdca5786e7fa2 SHA256 a4f91012c8e2aff275dc6463389d118aa29898e8b488e2fc7de0f5ff19414e3b
-EBUILD wireshark-1.0.5.ebuild 4950 RMD160 2cadc6b79baa2f8d021cfe1a0ee55c01572e3838 SHA1 ebfda05895fe1f1f68c348b48cd200221d15fd2d SHA256 93bf69963f6dc31656339b1e5c9dd79ca09bb6c823829a94a767d5ceb500c030
+EBUILD wireshark-1.0.6-r1.ebuild 4976 RMD160 c1616fea5c5f1fbfbfd75802ce1956da454a1541 SHA1 f96d115d640918a8b49c81699af6f7af0892d42f SHA256 d108d12ea24f9f49ad72dc5a3ca0308fdf4eff16d1b99b6ce8e562df2eb700e0
 EBUILD wireshark-1.0.6.ebuild 4914 RMD160 e29be00f32294c15955363b9c461fba4a93fd7d3 SHA1 4d9ab33ff92381fac491ee5f7c3995a4960c017c SHA256 acd29f468048d786c9333d0d9e3bcdb724b0b9c333863d6d14c06a0e1a527d38
 EBUILD wireshark-1.1.2.ebuild 4804 RMD160 b47b603327fbac008eeeebc3b91bf1ee86fb32bc SHA1 b8c555d16abad8fc8ffc0ef235fa0e4c5971d2a3 SHA256 826e1ac7b9f44ab507da736ecf9283a11830f40354325a2feba42228f9ca1cb7
-MISC ChangeLog 23338 RMD160 cded5037ab2a1bdcd9b788768796e04da36c38c8 SHA1 32aec87455a850284d5aaa2a931b52c12b94dc63 SHA256 627534025a811505a75a6fe1e6eee86301da2ef3d22e9a23970c2f31b42e5f60
+MISC ChangeLog 23618 RMD160 bde1ea788343bddaccae96c53466ed2a7672a896 SHA1 cc834641586c7a49ecdf99a98f96b17963effed1 SHA256 07299d18b81b0000912c38be07ae559173ad6d769023c8f6cf43c65177068283
 MISC metadata.xml 2154 RMD160 01af8905d25e6c387902d30766daedcd37d94e0e SHA1 d68e79d413654ce72c553d508d7aa96f27fe85b5 SHA256 48c540fcec9cf1e5eebe132d7f90e8330b413f4eb6469761a88720eaa6a2233a
diff --git a/net-analyzer/wireshark/files/wireshark-1.0-sigpipe.patch b/net-analyzer/wireshark/files/wireshark-1.0-sigpipe.patch
new file mode 100644
index 000000000000..ad81e382e221
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-1.0-sigpipe.patch
@@ -0,0 +1,31 @@
+https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1740
+https://bugs.gentoo.org/show_bug.cgi?id=260457
+
+=== modified file 'capture_opts.c'
+--- capture_opts.c	2009-03-05 16:59:51 +0000
++++ capture_opts.c	2009-03-05 17:06:49 +0000
+@@ -59,6 +59,7 @@
+ # include "inet_v6defs.h"
+ #endif
+ 
++#include <signal.h>
+ #include <glib.h>
+ 
+ #include <epan/packet.h>
+@@ -759,6 +760,15 @@
+             "Dropped");
+     }
+ 
++#ifndef _WIN32
++    /* handle SIGPIPE signal to default action */
++    struct sigaction act;
++    act.sa_handler = SIG_DFL;
++    sigemptyset(&act.sa_mask);
++    act.sa_flags = SA_RESTART;
++    sigaction(SIGPIPE,&act,NULL);
++#endif	
++
+     while (1) {    /* XXX - Add signal handling? */
+         for (stat_entry = g_list_first(stat_list); stat_entry != NULL; stat_entry = g_list_next(stat_entry)) {
+             if_stat = stat_entry->data;
+
diff --git a/net-analyzer/wireshark/files/wireshark-1.0.5-glib-1-build.patch b/net-analyzer/wireshark/files/wireshark-1.0.5-glib-1-build.patch
deleted file mode 100644
index 3d54d9f1f490..000000000000
--- a/net-analyzer/wireshark/files/wireshark-1.0.5-glib-1-build.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- trunk-1.0/epan/to_str.c	2008/12/12 20:16:43	26973
-+++ trunk-1.0/epan/to_str.c	2008/12/12 20:28:21	26974
-@@ -344,6 +344,19 @@
- #define	COMMA(do_it)	((do_it) ? ", " : "")
- 
- /*
-+ * GLib 1.2[.x] doesn't define G_MAXINT32 or G_MININT32; if they're not
-+ * defined, we define them as the maximum and minimum 32-bit signed
-+ * 2's-complement number.
-+ * Copied from epan/dfilter/scanner.l
-+ */
-+#ifndef G_MAXINT32
-+#define G_MAXINT32      ((gint32)0x7FFFFFFF)
-+#endif
-+#ifndef G_MININT32
-+#define G_MININT32      ((gint32)0x80000000)
-+#endif
-+
-+/*
-  * Maximum length of a string showing days/hours/minutes/seconds.
-  * (Does not include the terminating '\0'.)
-  * Includes space for a '-' sign for any negative components.
diff --git a/net-analyzer/wireshark/wireshark-1.0.5.ebuild b/net-analyzer/wireshark/wireshark-1.0.6-r1.ebuild
index bcdf43ba02c9..7094ff54734d 100644
--- a/net-analyzer/wireshark/wireshark-1.0.5.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.0.6-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 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.10 2008/12/26 09:02:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.0.6-r1.ebuild,v 1.1 2009/03/05 17:57:30 pva Exp $
 
 EAPI=1
 WANT_AUTOMAKE="1.9"
@@ -17,7 +17,7 @@ SRC_URI="http://www.wireshark.org/download/src/all-versions/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="adns gtk ipv6 lua portaudio gnutls gcrypt zlib kerberos threads profile smi +pcap pcre +caps selinux"
 
 RDEPEND="zlib? ( sys-libs/zlib )
@@ -60,8 +60,8 @@ src_unpack() {
 	cd "${S}"
 	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
+	epatch "${FILESDIR}/${PN}-1.0.5-text2pcap-protos.patch"
+	epatch "${FILESDIR}/wireshark-1.0-sigpipe.patch" #260457
 
 	cd "${S}/epan"
 	epatch "${FILESDIR}/wireshark-except-double-free.diff"