7168950 Upgrade Wireshark to version 1.4.12 (S11SRU)
7159388 Problem with network/wireshark
--- a/components/wireshark/Makefile Tue May 22 04:06:19 2012 -0500
+++ b/components/wireshark/Makefile Tue May 22 04:14:54 2012 -0500
@@ -23,10 +23,10 @@
include ../../make-rules/shared-macros.mk
COMPONENT_NAME= wireshark
-COMPONENT_VERSION= 1.4.11
+COMPONENT_VERSION= 1.4.12
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.bz2
-COMPONENT_ARCHIVE_HASH= sha1:113a9afca9b20184050c5a23bfdd2a1d366cb6c6
+COMPONENT_ARCHIVE_HASH= sha1:b7f4a07f9ebaeb355dbd962cd10ad942852c341b
COMPONENT_ARCHIVE_URL= http://www.wireshark.org/download/src/all-versions/$(COMPONENT_ARCHIVE)
include ../../make-rules/prep.mk
--- a/components/wireshark/tshark.p5m Tue May 22 04:06:19 2012 -0500
+++ b/components/wireshark/tshark.p5m Tue May 22 04:14:54 2012 -0500
@@ -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/[email protected],5.11-0.172
--- a/components/wireshark/wireshark-common.p5m Tue May 22 04:06:19 2012 -0500
+++ b/components/wireshark/wireshark-common.p5m Tue May 22 04:14:54 2012 -0500
@@ -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>
@@ -282,7 +282,7 @@
file path=usr/share/wireshark/wireshark.html
file path=usr/share/wireshark/ws.css
-license wireshark.license license=GPLv3
+license wireshark.license license=GPLv2
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
--- a/components/wireshark/wireshark.p5m Tue May 22 04:06:19 2012 -0500
+++ b/components/wireshark/wireshark.p5m Tue May 22 04:14:54 2012 -0500
@@ -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>
@@ -52,4 +52,4 @@
legacy pkg=SUNWwireshark desc="Wireshark - Network protocol analyzer" \
name="Wireshark - Network protocol analyzer"
-license wireshark.license license=GPLv3
+license wireshark.license license=GPLv2