7202384 Upgrade Wireshark to version 1.8.3
authorPetr Sumbera <petr.sumbera@oracle.com>
Tue, 09 Oct 2012 00:57:59 -0700
changeset 1009 49c5130fdb42
parent 1008 85cbcf3980ca
child 1010 7dd8255e425e
7202384 Upgrade Wireshark to version 1.8.3 7195081 Problem with network/wireshark
components/wireshark/Makefile
components/wireshark/patches/Bug7784.patch
components/wireshark/wireshark-common.p5m
--- a/components/wireshark/Makefile	Mon Oct 08 07:58:20 2012 -0700
+++ b/components/wireshark/Makefile	Tue Oct 09 00:57:59 2012 -0700
@@ -23,12 +23,12 @@
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		wireshark
-COMPONENT_VERSION=	1.8.2
+COMPONENT_VERSION=	1.8.3
 COMPONENT_PROJECT_URL=	http://www.wireshark.org/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.bz2
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:3f0e688d889345033e0a7e4f36aea78248e5c7b32d0dfc19eac044188aac11cc
+    sha256:83a85ff506b5e2a70f03c49de7af291802404983a23c7779e0f4ac3e672a2fb3
 COMPONENT_ARCHIVE_URL=	$(COMPONENT_PROJECT_URL)download/src/all-versions/$(COMPONENT_ARCHIVE)
 
 include ../../make-rules/prep.mk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/wireshark/patches/Bug7784.patch	Tue Oct 09 00:57:59 2012 -0700
@@ -0,0 +1,27 @@
+See:
+
+https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7784
+http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=44511
+
+--- epan/dissectors/packet-dtls.c	2012/08/14 22:12:31	44510
++++ epan/dissectors/packet-dtls.c	2012/08/15 06:14:10	44511
[email protected]@ -2724,7 +2724,6 @@
+ 
+   register_dissector("dtls", dissect_dtls, proto_dtls);
+   dtls_handle = find_dissector("dtls");
+-  dissector_add_uint("sctp.ppi", DIAMETER_DTLS_PROTOCOL_ID, dtls_handle);
+   dtls_associations = g_tree_new(ssl_association_cmp);
+ 
+   register_init_routine(dtls_init);
[email protected]@ -2750,8 +2749,10 @@
+   dtls_parse_uat();
+   dtls_parse_old_keys();
+ 
+-  if (initialized == FALSE)
++  if (initialized == FALSE) {
+     heur_dissector_add("udp", dissect_dtls_heur, proto_dtls);
++    dissector_add_uint("sctp.ppi", DIAMETER_DTLS_PROTOCOL_ID, find_dissector("dtls"));
++  }
+ 
+   initialized = TRUE;
+ }
--- a/components/wireshark/wireshark-common.p5m	Mon Oct 08 07:58:20 2012 -0700
+++ b/components/wireshark/wireshark-common.p5m	Tue Oct 09 00:57:59 2012 -0700
@@ -54,8 +54,8 @@
 dir path=usr/share/wireshark/tpncp
 dir path=usr/share/wireshark/wimaxasncp
 file exec_attr.dumpcap path=etc/security/exec_attr.d/diagnostic:wireshark:wireshark-common
-file path=usr/lib/libwireshark.so.2.0.2
-file path=usr/lib/libwiretap.so.2.1.2
+file path=usr/lib/libwireshark.so.2.0.3
+file path=usr/lib/libwiretap.so.2.1.3
 file path=usr/lib/libwsutil.so.2.0.0
 file path=usr/lib/wireshark/plugins/$(IPS_COMPONENT_VERSION)/asn1.so
 file path=usr/lib/wireshark/plugins/$(IPS_COMPONENT_VERSION)/docsis.so
@@ -91,6 +91,7 @@
 file path=usr/share/wireshark/console.lua
 file path=usr/share/wireshark/dfilters
 file path=usr/share/wireshark/dftest.html
+file path=usr/share/wireshark/diameter/AlcatelLucent.xml
 file path=usr/share/wireshark/diameter/Cisco.xml
 file path=usr/share/wireshark/diameter/Ericsson.xml
 file path=usr/share/wireshark/diameter/TGPPGmb.xml
@@ -292,10 +293,10 @@
 file path=usr/share/wireshark/ws.css
 
 license wireshark.license license=GPLv2
-link path=usr/lib/libwireshark.so target=libwireshark.so.2.0.2
-link path=usr/lib/libwireshark.so.2 target=libwireshark.so.2.0.2
-link path=usr/lib/libwiretap.so target=libwiretap.so.2.1.2
-link path=usr/lib/libwiretap.so.2 target=libwiretap.so.2.1.2
+link path=usr/lib/libwireshark.so target=libwireshark.so.2.0.3
+link path=usr/lib/libwireshark.so.2 target=libwireshark.so.2.0.3
+link path=usr/lib/libwiretap.so target=libwiretap.so.2.1.3
+link path=usr/lib/libwiretap.so.2 target=libwiretap.so.2.1.3
 link path=usr/lib/libwsutil.so target=libwsutil.so.2.0.0
 link path=usr/lib/libwsutil.so.2 target=libwsutil.so.2.0.0