7178057 Upgrade Wireshark to version 1.8.0
authorPetr Sumbera <petr.sumbera@oracle.com>
Fri, 22 Jun 2012 03:52:09 -0700
changeset 888 0e69712495b1
parent 887 9a18b753477c
child 889 87369d5f65ef
7178057 Upgrade Wireshark to version 1.8.0 7096761 snoop: network type 26 unknown or unsupported 7171305 Problem with network/wireshark
components/wireshark/Makefile
components/wireshark/patches/man.patch
components/wireshark/wireshark-common.p5m
--- a/components/wireshark/Makefile	Thu Jun 21 10:26:25 2012 -0700
+++ b/components/wireshark/Makefile	Fri Jun 22 03:52:09 2012 -0700
@@ -23,12 +23,12 @@
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		wireshark
-COMPONENT_VERSION=	1.6.7
+COMPONENT_VERSION=	1.8.0
 COMPONENT_PROJECT_URL=	http://www.wireshark.org/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.bz2
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:1e9d806d02ebfc3a70b948b4e82d19ba5bcde671eb229b18569149f95681f17b
+    sha256:4cb802f116bbdcfa71afbc842dbfacd8f96594f4b221cbb5616d5c17bc696a62
 COMPONENT_ARCHIVE_URL=	$(COMPONENT_PROJECT_URL)download/src/all-versions/$(COMPONENT_ARCHIVE)
 
 include ../../make-rules/prep.mk
@@ -41,7 +41,6 @@
 CONFIGURE_OPTIONS +=	--disable-usr-local
 CONFIGURE_OPTIONS +=	--disable-randpkt
 CONFIGURE_OPTIONS +=	--disable-dftest
-CONFIGURE_OPTIONS +=	--disable-idl2wrs
 CONFIGURE_OPTIONS +=	--with-krb5
 CONFIGURE_OPTIONS +=	CFLAGS="$(CFLAGS)" 
 CONFIGURE_OPTIONS +=	PATH="/usr/perl5/bin:/usr/gnu/bin:$(PATH)"
--- a/components/wireshark/patches/man.patch	Thu Jun 21 10:26:25 2012 -0700
+++ b/components/wireshark/patches/man.patch	Fri Jun 22 03:52:09 2012 -0700
@@ -1,6 +1,6 @@
 --- doc/tshark.pod
 +++ doc/tshark.pod
[email protected]@ -419,9 +419,9 @@
[email protected]@ -439,9 +439,9 @@
  
  Network interface names should match one of the names listed in
  "B<tshark -D>" (described above); a number, as reported by
@@ -13,27 +13,27 @@
  
  If no interface is specified, B<TShark> searches the list of
  interfaces, choosing the first non-loopback interface if there are any
[email protected]@ -1102,7 +1102,7 @@
[email protected]@ -1328,7 +1328,7 @@
  
  =head1 CAPTURE FILTER SYNTAX
  
--See the manual page of pcap-filter(4) or, if that doesn't exist, tcpdump(8),
+-See the manual page of pcap-filter(7) or, if that doesn't exist, tcpdump(8),
 +See the manual page of pcap-filter(5) or, if that doesn't exist, tcpdump(1),
  or, if that doesn't exist, L<http://wiki.wireshark.org/CaptureFilters>.
  
  =head1 READ FILTER SYNTAX
[email protected]@ -1355,7 +1355,7 @@
- 
[email protected]@ -1589,7 +1589,7 @@
  =head1 SEE ALSO
  
--wireshark-filter(4), wireshark(1), editcap(1), pcap-filter(4), tcpdump(8),
-+wireshark-filter(4), wireshark(1), editcap(1), pcap-filter(5), tcpdump(1),
- pcap(3), dumpcap(1), text2pcap(1), mergecap(1)
+ 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.
  
  =head1 NOTES
+ 
 --- doc/wireshark.pod.template
 +++ doc/wireshark.pod.template
[email protected]@ -309,9 +309,9 @@
[email protected]@ -354,9 +354,9 @@
  
  Network interface names should match one of the names listed in
  "B<wireshark -D>" (described above); a number, as reported by
@@ -46,114 +46,112 @@
  
  If no interface is specified, B<Wireshark> searches the list of
  interfaces, choosing the first non-loopback interface if there are any
[email protected]@ -2349,7 +2349,7 @@
[email protected]@ -2435,7 +2435,7 @@
  
  =head1 CAPTURE FILTER SYNTAX
  
--See the manual page of pcap-filter(4) or, if that doesn't exist, tcpdump(8),
+-See the manual page of pcap-filter(7) or, if that doesn't exist, tcpdump(8),
 +See the manual page of pcap-filter(5) or, if that doesn't exist, tcpdump(1),
  or, if that doesn't exist, L<http://wiki.wireshark.org/CaptureFilters>.
  
  =head1 DISPLAY FILTER SYNTAX
[email protected]@ -2705,7 +2705,7 @@
- 
[email protected]@ -2807,7 +2807,7 @@
  =head1 SEE ALSO
  
--wireshark-filter(4), tshark(1), editcap(1), pcap-filter(4), tcpdump(8),
-+wireshark-filter(4), tshark(1), editcap(1), pcap-filter(5), tcpdump(1),
- pcap(3), dumpcap(1), mergecap(1), text2pcap(1)
+ 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.
  
  =head1 NOTES
+ 
 --- doc/capinfos.pod
 +++ doc/capinfos.pod
[email protected]@ -319,7 +319,7 @@
- 
[email protected]@ -320,7 +320,7 @@
  =head1 SEE ALSO
  
--tcpdump(8), pcap(3), wireshark(1), mergecap(1), editcap(1), tshark(1),
-+tcpdump(1), pcap(3), wireshark(1), mergecap(1), editcap(1), tshark(1),
- dumpcap(1)
+ 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
  
  =head1 NOTES
+ 
 --- doc/dumpcap.pod
 +++ doc/dumpcap.pod
[email protected]@ -265,13 +265,13 @@
[email protected]@ -314,13 +314,13 @@
  
  =head1 CAPTURE FILTER SYNTAX
  
--See the manual page of pcap-filter(4) or, if that doesn't exist, tcpdump(8),
+-See the manual page of pcap-filter(7) or, if that doesn't exist, tcpdump(8),
 +See the manual page of pcap-filter(5) or, if that doesn't exist, tcpdump(1),
  or, if that doesn't exist, L<http://wiki.wireshark.org/CaptureFilters>.
  
  =head1 SEE ALSO
  
--wireshark(1), tshark(1), editcap(1), mergecap(1), capinfos(1), pcap-filter(4),
--tcpdump(8), pcap(3)
-+wireshark(1), tshark(1), editcap(1), mergecap(1), capinfos(1), pcap-filter(5),
-+tcpdump(1), pcap(3)
+ 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.
  
  =head1 NOTES
  
 --- doc/editcap.pod
 +++ doc/editcap.pod
[email protected]@ -368,7 +368,7 @@
- 
[email protected]@ -369,7 +369,7 @@
  =head1 SEE ALSO
  
--tcpdump(8), pcap(3), wireshark(1), tshark(1), mergecap(1), dumpcap(1),
-+tcpdump(1), pcap(3), wireshark(1), tshark(1), mergecap(1), dumpcap(1),
- capinfos(1), text2pcap(1), od(1)
+ 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.
  
  =head1 NOTES
+ 
 --- doc/mergecap.pod
 +++ doc/mergecap.pod
 @@ -134,7 +134,7 @@
- 
  =head1 SEE ALSO
  
--tcpdump(8), pcap(3), wireshark(1), tshark(1), dumpcap(1), editcap(1),
-+tcpdump(1), pcap(3), wireshark(1), tshark(1), dumpcap(1), editcap(1),
- text2pcap(1)
+ 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.
  
  =head1 NOTES
+ 
 --- doc/rawshark.pod
 +++ doc/rawshark.pod
[email protected]@ -488,7 +488,7 @@
- 
[email protected]@ -493,7 +493,7 @@
  =head1 SEE ALSO
  
--wireshark-filter(4), wireshark(1), tshark(1), editcap(1), tcpdump(8),
-+wireshark-filter(4), wireshark(1), tshark(1), editcap(1), tcpdump(1),
- pcap(3), dumpcap(1), text2pcap(1)
+ 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.
  
  =head1 NOTES
+ 
 --- doc/text2pcap.pod
 +++ doc/text2pcap.pod
[email protected]@ -202,7 +202,7 @@
- 
[email protected]@ -211,7 +211,7 @@
  =head1 SEE ALSO
  
--od(1), tcpdump(8), pcap(3), wireshark(1), tshark(1), dumpcap(1), mergecap(1),
-+od(1), tcpdump(1), pcap(3), wireshark(1), tshark(1), dumpcap(1), mergecap(1),
- editcap(1), strptime(3).
+ 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.
  
  =head1 NOTES
+ 
 --- doc/wireshark-filter.pod
 +++ doc/wireshark-filter.pod
[email protected]@ -400,13 +400,13 @@
[email protected]@ -421,13 +421,13 @@
  the Perl-Compatible Regular Expressions library: see B<http://www.pcre.org/>.
  
  This manpage does not describe the capture filter syntax, which is
--different. See the manual page of pcap-filter(4) or, if that doesn't exist,
--tcpdump(8), or, if that doesn't exist, L<http://wiki.wireshark.org/CaptureFilters>
+-different. See the manual page of pcap-filter(7) or, if that doesn't exist,
 +different. See the manual page of pcap-filter(5) or, if that doesn't exist,
-+tcpdump(1), or, if that doesn't exist, L<http://wiki.wireshark.org/CaptureFilters>
+ tcpdump(8), or, if that doesn't exist, L<http://wiki.wireshark.org/CaptureFilters>
  for a description of capture filters.
  
  =head1 SEE ALSO
  
--wireshark(1), tshark(1), editcap(1), pcap-filter(4), tcpdump(8), pcap(3)
-+wireshark(1), tshark(1), editcap(1), pcap-filter(5), tcpdump(1), pcap(3)
+-wireshark(1), tshark(1), editcap(1), pcap(3), pcap-filter(7) or tcpdump(8) if it
++wireshark(1), tshark(1), editcap(1), pcap(3), pcap-filter(5) or tcpdump(1) if it
+ doesn't exist.
  
  =head1 AUTHORS
- 
--- a/components/wireshark/wireshark-common.p5m	Thu Jun 21 10:26:25 2012 -0700
+++ b/components/wireshark/wireshark-common.p5m	Fri Jun 22 03:52:09 2012 -0700
@@ -54,25 +54,19 @@
 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.1.1.7
-file path=usr/lib/libwiretap.so.1.0.7
-file path=usr/lib/libwsutil.so.1.0.0
+file path=usr/lib/libwireshark.so.2.0.0
+file path=usr/lib/libwiretap.so.2.0.0
+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)/coseventcomm.so
-file path=usr/lib/wireshark/plugins/$(IPS_COMPONENT_VERSION)/cosnaming.so
 file path=usr/lib/wireshark/plugins/$(IPS_COMPONENT_VERSION)/docsis.so
 file path=usr/lib/wireshark/plugins/$(IPS_COMPONENT_VERSION)/ethercat.so
 file path=usr/lib/wireshark/plugins/$(IPS_COMPONENT_VERSION)/gryphon.so
-file path=usr/lib/wireshark/plugins/$(IPS_COMPONENT_VERSION)/interlink.so
 file path=usr/lib/wireshark/plugins/$(IPS_COMPONENT_VERSION)/irda.so
 file path=usr/lib/wireshark/plugins/$(IPS_COMPONENT_VERSION)/m2m.so
 file path=usr/lib/wireshark/plugins/$(IPS_COMPONENT_VERSION)/mate.so
 file path=usr/lib/wireshark/plugins/$(IPS_COMPONENT_VERSION)/opcua.so
-file path=usr/lib/wireshark/plugins/$(IPS_COMPONENT_VERSION)/parlay.so
 file path=usr/lib/wireshark/plugins/$(IPS_COMPONENT_VERSION)/profinet.so
-file path=usr/lib/wireshark/plugins/$(IPS_COMPONENT_VERSION)/sercosiii.so
 file path=usr/lib/wireshark/plugins/$(IPS_COMPONENT_VERSION)/stats_tree.so
-file path=usr/lib/wireshark/plugins/$(IPS_COMPONENT_VERSION)/tango.so
 file path=usr/lib/wireshark/plugins/$(IPS_COMPONENT_VERSION)/unistim.so
 file path=usr/lib/wireshark/plugins/$(IPS_COMPONENT_VERSION)/wimax.so
 file path=usr/lib/wireshark/plugins/$(IPS_COMPONENT_VERSION)/wimaxasncp.so
@@ -101,6 +95,7 @@
 file path=usr/share/wireshark/diameter/Ericsson.xml
 file path=usr/share/wireshark/diameter/TGPPGmb.xml
 file path=usr/share/wireshark/diameter/TGPPRx.xml
+file path=usr/share/wireshark/diameter/TGPPS9.xml
 file path=usr/share/wireshark/diameter/TGPPSh.xml
 file path=usr/share/wireshark/diameter/Vodafone.xml
 file path=usr/share/wireshark/diameter/chargecontrol.xml
@@ -137,7 +132,6 @@
 file path=usr/share/wireshark/help/getting_started.txt
 file path=usr/share/wireshark/help/overview.txt
 file path=usr/share/wireshark/help/toc
-file path=usr/share/wireshark/idl2wrs.html
 file path=usr/share/wireshark/init.lua
 file path=usr/share/wireshark/ipmap.html
 file path=usr/share/wireshark/manuf
@@ -153,6 +147,7 @@
 file path=usr/share/wireshark/radius/dictionary.airespace
 file path=usr/share/wireshark/radius/dictionary.alcatel
 file path=usr/share/wireshark/radius/dictionary.alcatel.esam
+file path=usr/share/wireshark/radius/dictionary.alcatel-lucent.xylan
 file path=usr/share/wireshark/radius/dictionary.alcatel.sr
 file path=usr/share/wireshark/radius/dictionary.alteon
 file path=usr/share/wireshark/radius/dictionary.altiga
@@ -282,7 +277,6 @@
 file path=usr/share/wireshark/radius/dictionary.wimax.wichorus
 file path=usr/share/wireshark/radius/dictionary.wispr
 file path=usr/share/wireshark/radius/dictionary.xedia
-file path=usr/share/wireshark/radius/dictionary.xylan
 file path=usr/share/wireshark/radius/dictionary.zyxel
 file path=usr/share/wireshark/randpkt.html
 file path=usr/share/wireshark/rawshark.html
@@ -298,12 +292,12 @@
 file path=usr/share/wireshark/ws.css
 
 license wireshark.license license=GPLv2
-link path=usr/lib/libwireshark.so target=libwireshark.so.1.1.7
-link path=usr/lib/libwireshark.so.1 target=libwireshark.so.1.1.7
-link path=usr/lib/libwiretap.so target=libwiretap.so.1.0.7
-link path=usr/lib/libwiretap.so.1 target=libwiretap.so.1.0.7
-link path=usr/lib/libwsutil.so target=libwsutil.so.1.0.0
-link path=usr/lib/libwsutil.so.1 target=libwsutil.so.1.0.0
+link path=usr/lib/libwireshark.so target=libwireshark.so.2.0.0
+link path=usr/lib/libwireshark.so.2 target=libwireshark.so.2.0.0
+link path=usr/lib/libwiretap.so target=libwiretap.so.2.0.0
+link path=usr/lib/libwiretap.so.2 target=libwiretap.so.2.0.0
+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
 
 depend type=optional fmri=diagnostic/wireshark/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 depend type=optional fmri=diagnostic/wireshark/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)