--- a/components/wireshark/patches/man.patch Thu Mar 15 11:00:00 2012 -0700
+++ b/components/wireshark/patches/man.patch Thu Mar 15 12:14:50 2012 -0700
@@ -1,6 +1,6 @@
---- doc/tshark.pod.orig Wed Oct 19 10:42:24 2011
-+++ doc/tshark.pod Wed Oct 19 10:44:12 2011
-@@ -406,9 +406,9 @@
+--- doc/tshark.pod
++++ doc/tshark.pod
+@@ -419,9 +419,9 @@
Network interface names should match one of the names listed in
"B<tshark -D>" (described above); a number, as reported by
@@ -13,7 +13,7 @@
If no interface is specified, B<TShark> searches the list of
interfaces, choosing the first non-loopback interface if there are any
-@@ -996,7 +996,7 @@
+@@ -1102,7 +1102,7 @@
=head1 CAPTURE FILTER SYNTAX
@@ -22,7 +22,7 @@
or, if that doesn't exist, L<http://wiki.wireshark.org/CaptureFilters>.
=head1 READ FILTER SYNTAX
-@@ -1228,7 +1228,7 @@
+@@ -1355,7 +1355,7 @@
=head1 SEE ALSO
@@ -31,8 +31,8 @@
pcap(3), dumpcap(1), text2pcap(1), mergecap(1)
=head1 NOTES
---- doc/wireshark.pod.template.orig Wed Oct 19 10:42:29 2011
-+++ doc/wireshark.pod.template Wed Oct 19 10:43:51 2011
+--- doc/wireshark.pod.template
++++ doc/wireshark.pod.template
@@ -309,9 +309,9 @@
Network interface names should match one of the names listed in
@@ -46,7 +46,7 @@
If no interface is specified, B<Wireshark> searches the list of
interfaces, choosing the first non-loopback interface if there are any
-@@ -2343,7 +2343,7 @@
+@@ -2349,7 +2349,7 @@
=head1 CAPTURE FILTER SYNTAX
@@ -55,7 +55,7 @@
or, if that doesn't exist, L<http://wiki.wireshark.org/CaptureFilters>.
=head1 DISPLAY FILTER SYNTAX
-@@ -2678,7 +2678,7 @@
+@@ -2705,7 +2705,7 @@
=head1 SEE ALSO
@@ -64,9 +64,9 @@
pcap(3), dumpcap(1), mergecap(1), text2pcap(1)
=head1 NOTES
---- doc/capinfos.pod.orig Wed Oct 26 09:10:07 2011
-+++ doc/capinfos.pod Wed Oct 26 09:10:26 2011
-@@ -317,7 +317,7 @@
+--- doc/capinfos.pod
++++ doc/capinfos.pod
+@@ -319,7 +319,7 @@
=head1 SEE ALSO
@@ -75,27 +75,28 @@
dumpcap(1)
=head1 NOTES
---- doc/dumpcap.pod.orig Wed Oct 26 09:13:27 2011
-+++ doc/dumpcap.pod Wed Oct 26 09:14:40 2011
-@@ -259,13 +259,13 @@
+--- doc/dumpcap.pod
++++ doc/dumpcap.pod
+@@ -265,13 +265,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(4) or, if that doesn't exist, tcpdump(1),
++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),
+-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)
=head1 NOTES
---- doc/editcap.pod.orig Wed Oct 26 09:13:34 2011
-+++ doc/editcap.pod Wed Oct 26 09:14:47 2011
-@@ -340,7 +340,7 @@
+--- doc/editcap.pod
++++ doc/editcap.pod
+@@ -368,7 +368,7 @@
=head1 SEE ALSO
@@ -104,8 +105,8 @@
capinfos(1), text2pcap(1), od(1)
=head1 NOTES
---- doc/mergecap.pod.orig Wed Oct 26 09:13:43 2011
-+++ doc/mergecap.pod Wed Oct 26 09:14:55 2011
+--- doc/mergecap.pod
++++ doc/mergecap.pod
@@ -134,7 +134,7 @@
=head1 SEE ALSO
@@ -115,9 +116,9 @@
text2pcap(1)
=head1 NOTES
---- doc/rawshark.pod.orig Wed Oct 26 09:13:52 2011
-+++ doc/rawshark.pod Wed Oct 26 09:15:02 2011
-@@ -467,7 +467,7 @@
+--- doc/rawshark.pod
++++ doc/rawshark.pod
+@@ -488,7 +488,7 @@
=head1 SEE ALSO
@@ -126,9 +127,9 @@
pcap(3), dumpcap(1), text2pcap(1)
=head1 NOTES
---- doc/text2pcap.pod.orig Wed Oct 26 09:14:00 2011
-+++ doc/text2pcap.pod Wed Oct 26 09:15:09 2011
-@@ -198,7 +198,7 @@
+--- doc/text2pcap.pod
++++ doc/text2pcap.pod
+@@ -202,7 +202,7 @@
=head1 SEE ALSO
@@ -137,20 +138,22 @@
editcap(1), strptime(3).
=head1 NOTES
---- doc/wireshark-filter.pod.template.orig Wed Oct 26 09:14:08 2011
-+++ doc/wireshark-filter.pod.template Wed Oct 26 09:15:19 2011
-@@ -387,12 +387,12 @@
+--- doc/wireshark-filter.pod
++++ doc/wireshark-filter.pod
+@@ -400,13 +400,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,
+-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(5) or, if that doesn't exist,
+tcpdump(1), 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(4), tcpdump(1), pcap(3)
++wireshark(1), tshark(1), editcap(1), pcap-filter(5), tcpdump(1), pcap(3)
=head1 AUTHORS
--- a/components/wireshark/wireshark-common.p5m Thu Mar 15 11:00:00 2012 -0700
+++ b/components/wireshark/wireshark-common.p5m Thu Mar 15 12:14:50 2012 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -54,9 +54,9 @@
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.0.0.1
-file path=usr/lib/libwiretap.so.0.0.1
-file path=usr/lib/libwsutil.so.0.0.0
+file path=usr/lib/libwireshark.so.1.1.1
+file path=usr/lib/libwiretap.so.1.0.1
+file path=usr/lib/libwsutil.so.1.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
@@ -97,10 +97,12 @@
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/Cisco.xml
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/TGPPSh.xml
+file path=usr/share/wireshark/diameter/Vodafone.xml
file path=usr/share/wireshark/diameter/chargecontrol.xml
file path=usr/share/wireshark/diameter/dictionary.dtd
file path=usr/share/wireshark/diameter/dictionary.xml
@@ -140,14 +142,18 @@
file path=usr/share/wireshark/ipmap.html
file path=usr/share/wireshark/manuf
file path=usr/share/wireshark/mergecap.html
+file path=usr/share/wireshark/pdml2html.xsl
file path=usr/share/wireshark/radius/README.radius_dictionary
file path=usr/share/wireshark/radius/dictionary
file path=usr/share/wireshark/radius/dictionary.3com
file path=usr/share/wireshark/radius/dictionary.3gpp
file path=usr/share/wireshark/radius/dictionary.3gpp2
file path=usr/share/wireshark/radius/dictionary.acc
+file path=usr/share/wireshark/radius/dictionary.acme
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.sr
file path=usr/share/wireshark/radius/dictionary.alteon
file path=usr/share/wireshark/radius/dictionary.altiga
file path=usr/share/wireshark/radius/dictionary.alvarion
@@ -156,6 +162,7 @@
file path=usr/share/wireshark/radius/dictionary.aruba
file path=usr/share/wireshark/radius/dictionary.ascend
file path=usr/share/wireshark/radius/dictionary.asn
+file path=usr/share/wireshark/radius/dictionary.audiocodes
file path=usr/share/wireshark/radius/dictionary.avaya
file path=usr/share/wireshark/radius/dictionary.azaire
file path=usr/share/wireshark/radius/dictionary.bay
@@ -175,6 +182,7 @@
file path=usr/share/wireshark/radius/dictionary.cosine
file path=usr/share/wireshark/radius/dictionary.dhcp
file path=usr/share/wireshark/radius/dictionary.digium
+file path=usr/share/wireshark/radius/dictionary.eltex
file path=usr/share/wireshark/radius/dictionary.epygi
file path=usr/share/wireshark/radius/dictionary.ericsson
file path=usr/share/wireshark/radius/dictionary.erx
@@ -190,6 +198,7 @@
file path=usr/share/wireshark/radius/dictionary.h3c
file path=usr/share/wireshark/radius/dictionary.hp
file path=usr/share/wireshark/radius/dictionary.huawei
+file path=usr/share/wireshark/radius/dictionary.iea
file path=usr/share/wireshark/radius/dictionary.infonet
file path=usr/share/wireshark/radius/dictionary.ipunplugged
file path=usr/share/wireshark/radius/dictionary.issanni
@@ -206,6 +215,7 @@
file path=usr/share/wireshark/radius/dictionary.microsoft
file path=usr/share/wireshark/radius/dictionary.mikrotik
file path=usr/share/wireshark/radius/dictionary.motorola
+file path=usr/share/wireshark/radius/dictionary.motorola.wimax
file path=usr/share/wireshark/radius/dictionary.navini
file path=usr/share/wireshark/radius/dictionary.netscreen
file path=usr/share/wireshark/radius/dictionary.networkphysics
@@ -234,12 +244,16 @@
file path=usr/share/wireshark/radius/dictionary.rfc3580
file path=usr/share/wireshark/radius/dictionary.rfc4072
file path=usr/share/wireshark/radius/dictionary.rfc4372
+file path=usr/share/wireshark/radius/dictionary.rfc4603
file path=usr/share/wireshark/radius/dictionary.rfc4675
file path=usr/share/wireshark/radius/dictionary.rfc4679
file path=usr/share/wireshark/radius/dictionary.rfc4818
file path=usr/share/wireshark/radius/dictionary.rfc4849
file path=usr/share/wireshark/radius/dictionary.rfc5090
file path=usr/share/wireshark/radius/dictionary.rfc5176
+file path=usr/share/wireshark/radius/dictionary.rfc5580
+file path=usr/share/wireshark/radius/dictionary.rfc5607
+file path=usr/share/wireshark/radius/dictionary.rfc5904
file path=usr/share/wireshark/radius/dictionary.riverstone
file path=usr/share/wireshark/radius/dictionary.roaringpenguin
file path=usr/share/wireshark/radius/dictionary.shasta
@@ -254,8 +268,7 @@
file path=usr/share/wireshark/radius/dictionary.telkom
file path=usr/share/wireshark/radius/dictionary.trapeze
file path=usr/share/wireshark/radius/dictionary.tropos
-file path=usr/share/wireshark/radius/dictionary.tunnel
-file path=usr/share/wireshark/radius/dictionary.unisphere
+file path=usr/share/wireshark/radius/dictionary.ukerna
file path=usr/share/wireshark/radius/dictionary.unix
file path=usr/share/wireshark/radius/dictionary.usr
file path=usr/share/wireshark/radius/dictionary.utstarcom
@@ -264,7 +277,9 @@
file path=usr/share/wireshark/radius/dictionary.vqp
file path=usr/share/wireshark/radius/dictionary.walabi
file path=usr/share/wireshark/radius/dictionary.waverider
+file path=usr/share/wireshark/radius/dictionary.wichorus
file path=usr/share/wireshark/radius/dictionary.wimax
+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
@@ -283,12 +298,12 @@
file path=usr/share/wireshark/ws.css
license wireshark.license license=GPLv3
-link path=usr/lib/libwireshark.so target=libwireshark.so.0.0.1
-link path=usr/lib/libwireshark.so.0 target=libwireshark.so.0.0.1
-link path=usr/lib/libwiretap.so target=libwiretap.so.0.0.1
-link path=usr/lib/libwiretap.so.0 target=libwiretap.so.0.0.1
-link path=usr/lib/libwsutil.so target=libwsutil.so.0.0.0
-link path=usr/lib/libwsutil.so.0 target=libwsutil.so.0.0.0
+link path=usr/lib/libwireshark.so target=libwireshark.so.1.1.1
+link path=usr/lib/libwireshark.so.1 target=libwireshark.so.1.1.1
+link path=usr/lib/libwiretap.so target=libwiretap.so.1.0.1
+link path=usr/lib/libwiretap.so.1 target=libwiretap.so.1.0.1
+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
depend type=optional fmri=diagnostic/wireshark/wireshark@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
depend type=optional fmri=diagnostic/wireshark/tshark@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)