diff -r 730cc64572b5 -r 5a99bd9fadaf components/wireshark/wireshark-common.p5m --- 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. # 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)