# HG changeset patch # User Petr Sumbera # Date 1381822349 25200 # Node ID 5d4a0834a0777920b7cd486f0376e0dbc535e7f3 # Parent f6f36f8682b53edb4d9e3a801c811a285b7f1fdc 17508584 Upgrade Wireshark to version 1.10.2 17442735 problem in UTILITY/WIRESHARK diff -r f6f36f8682b5 -r 5d4a0834a077 components/wireshark/Makefile --- a/components/wireshark/Makefile Mon Oct 14 13:59:45 2013 -0700 +++ b/components/wireshark/Makefile Tue Oct 15 00:32:29 2013 -0700 @@ -23,12 +23,12 @@ include ../../make-rules/shared-macros.mk COMPONENT_NAME= wireshark -COMPONENT_VERSION= 1.10.1 +COMPONENT_VERSION= 1.10.2 COMPONENT_PROJECT_URL= http://www.wireshark.org/ COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION) COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.bz2 COMPONENT_ARCHIVE_HASH= \ - sha256:06499544f053cc1f73529278ede0ac210d709cada8267e81d908bd346cc0c5bc + sha256:b7a83314424e13639c591de924aa240bc5f3d9cae01dde69bf858fa04b22a33d COMPONENT_ARCHIVE_URL= $(COMPONENT_PROJECT_URL)download/src/all-versions/$(COMPONENT_ARCHIVE) COMPONENT_BUGDB= utility/wireshark diff -r f6f36f8682b5 -r 5d4a0834a077 components/wireshark/patches/evb.patch --- a/components/wireshark/patches/evb.patch Mon Oct 14 13:59:45 2013 -0700 +++ b/components/wireshark/patches/evb.patch Tue Oct 15 00:32:29 2013 -0700 @@ -14,7 +14,7 @@ =================================================================== --- epan/etypes.h (revision 41973) +++ epan/etypes.h (working copy) -@@ -492,6 +492,10 @@ +@@ -514,6 +514,10 @@ #define ETHERTYPE_HSR 0x892F /* High-availability Seamless Redundancy (IEC62439 Part 3) */ #endif @@ -23,7 +23,7 @@ +#endif + #ifndef ETHERTYPE_LOOP - #define ETHERTYPE_LOOP 0x9000 /* used for layer 2 testing (do i see my own frames on the wire) */ + #define ETHERTYPE_LOOP 0x9000 /* used for layer 2 testing (do i see my own frames on the wire) */ #endif Index: epan/dissectors/packet-ecp.c =================================================================== diff -r f6f36f8682b5 -r 5d4a0834a077 components/wireshark/patches/lib-version.patch --- a/components/wireshark/patches/lib-version.patch Mon Oct 14 13:59:45 2013 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,13 +0,0 @@ -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 -@@ -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 @LDFLAGS_SHAREDLIB@ -+libwireshark_la_LDFLAGS = -version-info 4:0:1 @LDFLAGS_SHAREDLIB@ - LIBWIRESHARK_SRC = \ - addr_and_mask.c \ - addr_resolv.c \ diff -r f6f36f8682b5 -r 5d4a0834a077 components/wireshark/patches/man.patch --- a/components/wireshark/patches/man.patch Mon Oct 14 13:59:45 2013 -0700 +++ b/components/wireshark/patches/man.patch Tue Oct 15 00:32:29 2013 -0700 @@ -1,6 +1,6 @@ --- doc/tshark.pod +++ doc/tshark.pod -@@ -439,9 +439,9 @@ +@@ -449,9 +449,9 @@ Network interface names should match one of the names listed in "B" (described above); a number, as reported by @@ -13,7 +13,7 @@ If no interface is specified, B searches the list of interfaces, choosing the first non-loopback interface if there are any -@@ -1328,7 +1328,7 @@ +@@ -1403,7 +1403,7 @@ =head1 CAPTURE FILTER SYNTAX @@ -22,18 +22,18 @@ or, if that doesn't exist, L. =head1 READ FILTER SYNTAX -@@ -1589,7 +1589,7 @@ +@@ -1672,7 +1672,7 @@ =head1 SEE ALSO wireshark-filter(4), wireshark(1), editcap(1), pcap(3), dumpcap(1), --text2pcap(1), mergecap(1), pcap-filter(7) or tcpdump(8) if it doesn't exist. -+text2pcap(1), mergecap(1), pcap-filter(5) or tcpdump(1) if it doesn't exist. +-text2pcap(1), mergecap(1), pcap-filter(7) or tcpdump(8) ++text2pcap(1), mergecap(1), pcap-filter(5) or tcpdump(1) =head1 NOTES --- doc/wireshark.pod.template +++ doc/wireshark.pod.template -@@ -354,9 +354,9 @@ +@@ -363,9 +363,9 @@ Network interface names should match one of the names listed in "B" (described above); a number, as reported by @@ -46,7 +46,7 @@ If no interface is specified, B searches the list of interfaces, choosing the first non-loopback interface if there are any -@@ -2435,7 +2435,7 @@ +@@ -2457,7 +2457,7 @@ =head1 CAPTURE FILTER SYNTAX @@ -55,29 +55,29 @@ or, if that doesn't exist, L. =head1 DISPLAY FILTER SYNTAX -@@ -2807,7 +2807,7 @@ +@@ -2837,7 +2837,7 @@ =head1 SEE ALSO wireshark-filter(4), tshark(1), editcap(1), pcap(3), dumpcap(1), mergecap(1), --text2pcap(1), pcap-filter(7) or tcpdump(8) if it doesn't exist. -+text2pcap(1), pcap-filter(5) or tcpdump(1) if it doesn't exist. +-text2pcap(1), pcap-filter(7) or tcpdump(8) ++text2pcap(1), pcap-filter(5) or tcpdump(1) =head1 NOTES --- doc/capinfos.pod +++ doc/capinfos.pod -@@ -320,7 +320,7 @@ +@@ -332,7 +332,7 @@ =head1 SEE ALSO pcap(3), wireshark(1), mergecap(1), editcap(1), tshark(1), --dumpcap(1), pcap-filter(7) or tcpdump(8) if it doesn't exist -+dumpcap(1), pcap-filter(5) or tcpdump(1) if it doesn't exist +-dumpcap(1), pcap-filter(7) or tcpdump(8) ++dumpcap(1), pcap-filter(5) or tcpdump(1) =head1 NOTES --- doc/dumpcap.pod +++ doc/dumpcap.pod -@@ -314,13 +314,13 @@ +@@ -342,13 +342,13 @@ =head1 CAPTURE FILTER SYNTAX @@ -88,19 +88,19 @@ =head1 SEE ALSO wireshark(1), tshark(1), editcap(1), mergecap(1), capinfos(1), pcap(3), --pcap-filter(7) or tcpdump(8) if it doesn't exist. -+pcap-filter(5) or tcpdump(1) if it doesn't exist. +-pcap-filter(7) or tcpdump(8) ++pcap-filter(5) or tcpdump(1) =head1 NOTES --- doc/editcap.pod +++ doc/editcap.pod -@@ -369,7 +369,7 @@ +@@ -339,7 +339,7 @@ =head1 SEE ALSO pcap(3), wireshark(1), tshark(1), mergecap(1), dumpcap(1), capinfos(1), --text2pcap(1), od(1), pcap-filter(7) or tcpdump(8) if it doesn't exist. -+text2pcap(1), od(1), pcap-filter(5) or tcpdump(1) if it doesn't exist. +-text2pcap(1), od(1), pcap-filter(7) or tcpdump(8) ++text2pcap(1), od(1), pcap-filter(5) or tcpdump(1) =head1 NOTES @@ -110,42 +110,43 @@ =head1 SEE ALSO pcap(3), wireshark(1), tshark(1), dumpcap(1), editcap(1), text2pcap(1), --pcap-filter(7) or tcpdump(8) if it doesn't exist. -+pcap-filter(5) or tcpdump(1) if it doesn't exist. +-pcap-filter(7) or tcpdump(8) ++pcap-filter(5) or tcpdump(1) =head1 NOTES --- doc/rawshark.pod +++ doc/rawshark.pod -@@ -493,7 +493,7 @@ +@@ -507,7 +507,7 @@ =head1 SEE ALSO wireshark-filter(4), wireshark(1), tshark(1), editcap(1), pcap(3), dumpcap(1), --text2pcap(1), pcap-filter(7) or tcpdump(8) if it doesn't exist. -+text2pcap(1), pcap-filter(5) or tcpdump(1) if it doesn't exist. +-text2pcap(1), pcap-filter(7) or tcpdump(8) ++text2pcap(1), pcap-filter(5) or tcpdump(1) =head1 NOTES --- doc/text2pcap.pod +++ doc/text2pcap.pod -@@ -211,7 +211,7 @@ +@@ -223,7 +223,7 @@ =head1 SEE ALSO od(1), pcap(3), wireshark(1), tshark(1), dumpcap(1), mergecap(1), --editcap(1), strptime(3), pcap-filter(7) or tcpdump(8) if it doesn't exist. -+editcap(1), strptime(3), pcap-filter(5) or tcpdump(1) if it doesn't exist. +-editcap(1), strptime(3), pcap-filter(7) or tcpdump(8) ++editcap(1), strptime(3), pcap-filter(5) or tcpdump(1) =head1 NOTES --- doc/wireshark-filter.pod +++ doc/wireshark-filter.pod -@@ -422,13 +422,13 @@ - the Perl-Compatible Regular Expressions library: see B. +@@ -414,13 +414,13 @@ + See L or L for more information. This manpage does not describe the capture filter syntax, which is -different. See the manual page of pcap-filter(7) or, if that doesn't exist, +-tcpdump(8), or, if that doesn't exist, L +different. See the manual page of pcap-filter(5) or, if that doesn't exist, - tcpdump(8), or, if that doesn't exist, L ++tcpdump(1), or, if that doesn't exist, L for a description of capture filters. =head1 SEE ALSO diff -r f6f36f8682b5 -r 5d4a0834a077 components/wireshark/wireshark-common.p5m --- a/components/wireshark/wireshark-common.p5m Mon Oct 14 13:59:45 2013 -0700 +++ b/components/wireshark/wireshark-common.p5m Tue Oct 15 00:32:29 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.1.0 -file path=usr/lib/$(MACH64)/libwiretap.so.3.0.1 +file path=usr/lib/$(MACH64)/libwireshark.so.3.1.1 +file path=usr/lib/$(MACH64)/libwiretap.so.3.0.2 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.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)/libwireshark.so target=libwireshark.so.3.1.1 +link path=usr/lib/$(MACH64)/libwireshark.so.3 target=libwireshark.so.3.1.1 +link path=usr/lib/$(MACH64)/libwiretap.so target=libwiretap.so.3.0.2 +link path=usr/lib/$(MACH64)/libwiretap.so.3 target=libwiretap.so.3.0.2 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