7168947 Upgrade Wireshark to version 1.6.7 7159388 Problem with network/wir...

Petr Sumbera

2012-05-17 55bef27910b46fb6ec96e6f9e4bda9fa4ab84d06

7168947 Upgrade Wireshark to version 1.6.7
7159388 Problem with network/wireshark

 components/wireshark/Makefile

@@ -23,12 +23,12 @@
include ../../make-rules/shared-macros.mk

COMPONENT_NAME=        wireshark
COMPONENT_VERSION=    1.6.5
COMPONENT_VERSION=    1.6.7
COMPONENT_PROJECT_URL=    http://www.wireshark.org/
COMPONENT_SRC=        $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE=    $(COMPONENT_SRC).tar.bz2
COMPONENT_ARCHIVE_HASH=    \
    sha256:151768199f9b50f5593b97025a33303df4d3b3983a203be89d8a1f5ba830bfcd
    sha256:1e9d806d02ebfc3a70b948b4e82d19ba5bcde671eb229b18569149f95681f17b
COMPONENT_ARCHIVE_URL=    $(COMPONENT_PROJECT_URL)download/src/all-versions/$(COMPONENT_ARCHIVE)

include ../../make-rules/prep.mk

 components/wireshark/tshark.p5m

@@ -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>
@@ -43,6 +43,6 @@
file path=usr/sbin/tshark
file path=usr/share/man/man1/tshark.1

license wireshark.license license=GPLv3
license wireshark.license license=GPLv2

depend type=optional fmri=diagnostic/wireshark/wireshark@1.4.7,5.11-0.172

 components/wireshark/wireshark-common.p5m

@@ -54,8 +54,8 @@
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.1
file path=usr/lib/libwiretap.so.1.0.1
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/wireshark/plugins/$(IPS_COMPONENT_VERSION)/asn1.so
file path=usr/lib/wireshark/plugins/$(IPS_COMPONENT_VERSION)/coseventcomm.so
@@ -297,11 +297,11 @@
file path=usr/share/wireshark/wireshark.html
file path=usr/share/wireshark/ws.css

license wireshark.license license=GPLv3
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
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


 components/wireshark/wireshark.p5m

@@ -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>
@@ -50,4 +50,4 @@
file wireshark-$(IPS_COMPONENT_VERSION)/image/wsicon64.png \
    path=usr/share/pixmaps/wireshark.png

license wireshark.license license=GPLv3
license wireshark.license license=GPLv2