Fixed build failure in function 'dissect_sflow_sample_rawheaderdata'

Package-Manager: portage-2.2_rc23/cvs/Linux i686

4 files changed, 34 insertions, 4 deletions

diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index 7fb30eb94adf..df086c6d98c2 100644
--- a/net-analyzer/wireshark/ChangeLog
+++ b/net-analyzer/wireshark/ChangeLog
@@ -1,6 +1,10 @@
 # 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.153 2009/03/05 17:57:30 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.154 2009/03/08 11:54:00 pva Exp $
+
+  08 Mar 2009; Peter Volkov <pva@gentoo.org>
+  +files/wireshark-1.1.2-misc-warnings.patch, wireshark-1.1.2.ebuild:
+  Fixed build failure in function 'dissect_sflow_sample_rawheaderdata'
 
 *wireshark-1.0.6-r1 (05 Mar 2009)
 
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 8ff1e14e4af1..e6c91a1ca641 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -3,11 +3,12 @@ AUX wireshark-0.99.8-as-needed.patch 395 RMD160 2e06f641e9789db717544bfd1568e4bf
 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-1.1.2-misc-warnings.patch 823 RMD160 20a13891425581b1799c38d946128fd4f5293358 SHA1 19b70ea3eb86085d8292a461e4f50506a2b9c01e SHA256 3dd5bda276b072ebe44f4e4973e517149149e2b7efadcca2a0eb6c03f9a0fb4c
 AUX wireshark-except-double-free.diff 664 RMD160 2b61f03f5148975f6438351c11de18a500deabc5 SHA1 0239e19ba0ebd2cfb4ab4987a8a4c56646cd9250 SHA256 dc02a5f3e4bdbd128a2ba08f38880358f747661a93ca0b3fe1918c67b255c369
 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.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 23618 RMD160 bde1ea788343bddaccae96c53466ed2a7672a896 SHA1 cc834641586c7a49ecdf99a98f96b17963effed1 SHA256 07299d18b81b0000912c38be07ae559173ad6d769023c8f6cf43c65177068283
+EBUILD wireshark-1.1.2.ebuild 4851 RMD160 712a966e02e961b9f0f887f8d73c9caf6cf46765 SHA1 fe373fdabb30d0e5123cdc2cbffb33709dc99886 SHA256 91db019b685ec0e6b177f775728f79de28017145d4bcc2d1c4df222b21aa5077
+MISC ChangeLog 23805 RMD160 cf7821dde211411a0e939cd8d13f02f0a4abb019 SHA1 44c1bc31880d2e4785ca742ea2842953858b6a66 SHA256 7f84eac6972a93aef406679cf27d2cb87ec34f965161ec66da8ce1f11712e257
 MISC metadata.xml 2154 RMD160 01af8905d25e6c387902d30766daedcd37d94e0e SHA1 d68e79d413654ce72c553d508d7aa96f27fe85b5 SHA256 48c540fcec9cf1e5eebe132d7f90e8330b413f4eb6469761a88720eaa6a2233a
diff --git a/net-analyzer/wireshark/files/wireshark-1.1.2-misc-warnings.patch b/net-analyzer/wireshark/files/wireshark-1.1.2-misc-warnings.patch
new file mode 100644
index 000000000000..2da9a5224ea4
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-1.1.2-misc-warnings.patch
@@ -0,0 +1,24 @@
+https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3314
+
+=== modified file 'epan/dissectors/packet-sflow.c'
+--- epan/dissectors/packet-sflow.c	2009-03-08 10:18:22 +0000
++++ epan/dissectors/packet-sflow.c	2009-03-08 10:22:32 +0000
+@@ -563,13 +563,13 @@
+ {
+ 	guint32 	header_proto, frame_length;
+ 	volatile 	guint32 	header_length;
+-	tvbuff_t 	*next_tvb;
+-	proto_tree 	*sflow_header_tree;
++	tvbuff_t 	*volatile next_tvb;
++	proto_tree 	*volatile sflow_header_tree;
+ 	proto_item 	*ti;
+ 	/* stuff for saving column state before calling other dissectors.
+ 	 * Thanks to Guy Harris for the tip. */
+-	gboolean save_writable;
+-	gboolean save_in_error_pkt;
++	volatile gboolean save_writable;
++	volatile gboolean save_in_error_pkt;
+ 	volatile address 	save_dl_src;
+ 	volatile address 	save_dl_dst;
+ 	volatile address 	save_net_src;
+
diff --git a/net-analyzer/wireshark/wireshark-1.1.2.ebuild b/net-analyzer/wireshark/wireshark-1.1.2.ebuild
index 003b1f9f7f75..12a7a0632a82 100644
--- a/net-analyzer/wireshark/wireshark-1.1.2.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.1.2.ebuild
@@ -1,6 +1,6 @@
 # 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.1.2.ebuild,v 1.1 2009/01/19 09:40:18 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.1.2.ebuild,v 1.2 2009/03/08 11:54:00 pva Exp $
 
 EAPI=1
 inherit autotools libtool flag-o-matic eutils toolchain-funcs
@@ -71,6 +71,7 @@ src_unpack() {
 
 	cd "${S}"
 	epatch "${FILESDIR}/${PN}-1.1.2--as-needed.patch"
+	epatch "${FILESDIR}/${P}-misc-warnings.patch"
 	eautoreconf
 }