17312236 Upgrade Wireshark to version 1.10.1
authorPetr Sumbera <petr.sumbera@oracle.com>
Thu, 15 Aug 2013 12:22:05 -0700
changeset 1438 d200c16f9c03
parent 1437 bb7ccf69cdad
child 1439 367c040a86bc
17312236 Upgrade Wireshark to version 1.10.1 17235096 problem in UTILITY/WIRESHARK
components/wireshark/Makefile
components/wireshark/patches/bug8717.patch
components/wireshark/patches/lib-version.patch
components/wireshark/wireshark-common.p5m
--- a/components/wireshark/Makefile	Thu Aug 15 09:22:09 2013 -0700
+++ b/components/wireshark/Makefile	Thu Aug 15 12:22:05 2013 -0700
@@ -23,12 +23,12 @@
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		wireshark
-COMPONENT_VERSION=	1.10.0
+COMPONENT_VERSION=	1.10.1
 COMPONENT_PROJECT_URL=	http://www.wireshark.org/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.bz2
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:1f4b377ba6284a51797bcc437aa2918bfaeb5d30908cd6194bd09f7054c65add
+    sha256:06499544f053cc1f73529278ede0ac210d709cada8267e81d908bd346cc0c5bc
 COMPONENT_ARCHIVE_URL=	$(COMPONENT_PROJECT_URL)download/src/all-versions/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	utility/wireshark
 
--- a/components/wireshark/patches/bug8717.patch	Thu Aug 15 09:22:09 2013 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-See:
-
-https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8717
-http://anonsvn.wireshark.org/viewvc?view=revision&revision=49802
-
---- epan/dissectors/packet-dcp-etsi.c	2013/06/06 02:10:22	49801
-+++ epan/dissectors/packet-dcp-etsi.c	2013/06/06 02:53:36	49802
[email protected]@ -518,9 +518,10 @@
-       if(li)
-         proto_item_append_text(li, " (length error (%d))", real_len);
-     }
--    if (real_len)
-+    else {
-       next_tvb = dissect_pft_fragmented(tvb, pinfo, pft_tree, findex, fcount,
-                                         seq, offset, real_len, fec, rsk, rsz);
-+    }
-     pinfo->fragmented = save_fragmented;
-   } else {
-     next_tvb = tvb_new_subset_remaining (tvb, offset);
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/wireshark/patches/lib-version.patch	Thu Aug 15 12:22:05 2013 -0700
@@ -0,0 +1,13 @@
+See: http://anonsvn.wireshark.org/viewvc?view=revision&revision=51015
+
+--- epan/Makefile.in	2013-08-13 01:55:16.320083735 -0700
++++ epan/Makefile.in	2013-08-13 04:27:28.704041892 -0700
[email protected]@ -594,7 +594,7 @@
+ noinst_LTLIBRARIES = libwireshark_generated.la libwireshark_asmopt.la
+ lib_LTLIBRARIES = libwireshark.la
+ # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
+-libwireshark_la_LDFLAGS = -version-info 3:1:1 @[email protected]
++libwireshark_la_LDFLAGS = -version-info 4:0:1 @[email protected]
+ LIBWIRESHARK_SRC = \
+ 	addr_and_mask.c		\
+ 	addr_resolv.c		\
--- a/components/wireshark/wireshark-common.p5m	Thu Aug 15 09:22:09 2013 -0700
+++ b/components/wireshark/wireshark-common.p5m	Thu Aug 15 12:22:05 2013 -0700
@@ -35,8 +35,8 @@
     value=PSARC/2007/334
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 file exec_attr.dumpcap path=etc/security/exec_attr.d/diagnostic:wireshark:wireshark-common
-file path=usr/lib/$(MACH64)/libwireshark.so.3.0.0
-file path=usr/lib/$(MACH64)/libwiretap.so.3.0.0
+file path=usr/lib/$(MACH64)/libwireshark.so.3.1.0
+file path=usr/lib/$(MACH64)/libwiretap.so.3.0.1
 file path=usr/lib/$(MACH64)/libwsutil.so.3.0.0
 file path=usr/lib/$(MACH64)/wireshark/plugins/$(IPS_COMPONENT_VERSION)/asn1.so
 file path=usr/lib/$(MACH64)/wireshark/plugins/$(IPS_COMPONENT_VERSION)/docsis.so
@@ -285,10 +285,10 @@
 file path=usr/share/wireshark/ws.css
 
 license wireshark.license license=GPLv2
-link path=usr/lib/$(MACH64)/libwireshark.so target=libwireshark.so.3.0.0
-link path=usr/lib/$(MACH64)/libwireshark.so.3 target=libwireshark.so.3.0.0
-link path=usr/lib/$(MACH64)/libwiretap.so target=libwiretap.so.3.0.0
-link path=usr/lib/$(MACH64)/libwiretap.so.3 target=libwiretap.so.3.0.0
+link path=usr/lib/$(MACH64)/libwireshark.so target=libwireshark.so.3.1.0
+link path=usr/lib/$(MACH64)/libwireshark.so.3 target=libwireshark.so.3.1.0
+link path=usr/lib/$(MACH64)/libwiretap.so target=libwiretap.so.3.0.1
+link path=usr/lib/$(MACH64)/libwiretap.so.3 target=libwiretap.so.3.0.1
 link path=usr/lib/$(MACH64)/libwsutil.so target=libwsutil.so.3.0.0
 link path=usr/lib/$(MACH64)/libwsutil.so.3 target=libwsutil.so.3.0.0