16290695 Upgrade Wireshark to version 1.8.5 s11u1-sru S11.1SRU7.1
authorPetr Sumbera <petr.sumbera@oracle.com>
Tue, 02 Apr 2013 01:22:25 -0700
branchs11u1-sru
changeset 2547 63302ab98be7
parent 2546 3b891ae0835b
child 2548 5418a9de3963
16290695 Upgrade Wireshark to version 1.8.5 15936694 problem in UTILITY/WIRESHARK
components/wireshark/Makefile
components/wireshark/patches/Bug7784.patch
components/wireshark/wireshark-common.p5m
--- a/components/wireshark/Makefile	Tue Apr 02 01:12:45 2013 -0700
+++ b/components/wireshark/Makefile	Tue Apr 02 01:22:25 2013 -0700
@@ -18,17 +18,17 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		wireshark
-COMPONENT_VERSION=	1.8.3
+COMPONENT_VERSION=	1.8.5
 COMPONENT_PROJECT_URL=	http://www.wireshark.org/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.bz2
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:83a85ff506b5e2a70f03c49de7af291802404983a23c7779e0f4ac3e672a2fb3
+    sha256:d4e4798216974a3c45e74b03644ee33b64481d2fe5c788c002266e5f141ee372
 COMPONENT_ARCHIVE_URL=	$(COMPONENT_PROJECT_URL)download/src/all-versions/$(COMPONENT_ARCHIVE)
 
 include ../../make-rules/prep.mk
--- a/components/wireshark/patches/Bug7784.patch	Tue Apr 02 01:12:45 2013 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-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	Tue Apr 02 01:12:45 2013 -0700
+++ b/components/wireshark/wireshark-common.p5m	Tue Apr 02 01:22:25 2013 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -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.3
-file path=usr/lib/libwiretap.so.2.1.3
+file path=usr/lib/libwireshark.so.2.0.5
+file path=usr/lib/libwiretap.so.2.1.5
 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
@@ -293,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.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/libwireshark.so target=libwireshark.so.2.0.5
+link path=usr/lib/libwireshark.so.2 target=libwireshark.so.2.0.5
+link path=usr/lib/libwiretap.so target=libwiretap.so.2.1.5
+link path=usr/lib/libwiretap.so.2 target=libwiretap.so.2.1.5
 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