# HG changeset patch
# User Petr Sumbera <petr.sumbera@oracle.com>
# Date 1343199925 25200
# Node ID 3d14753950e0588c78b37979e6b53334d2739507
# Parent  19eda0ce91e01a15703471cd68b9e1743f35e5b0
7186316 Upgrade Wireshark to version 1.8.1
7186320 Problem with network/wireshark
7184327 SIGBUS in emem_tree_insert32_array+0x94()

diff -r 19eda0ce91e0 -r 3d14753950e0 components/wireshark/Makefile
--- a/components/wireshark/Makefile	Tue Jul 24 10:14:00 2012 -0700
+++ b/components/wireshark/Makefile	Wed Jul 25 00:05:25 2012 -0700
@@ -23,12 +23,12 @@
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		wireshark
-COMPONENT_VERSION=	1.8.0
+COMPONENT_VERSION=	1.8.1
 COMPONENT_PROJECT_URL=	http://www.wireshark.org/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.bz2
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:4cb802f116bbdcfa71afbc842dbfacd8f96594f4b221cbb5616d5c17bc696a62
+    sha256:5966a3e23d34972eb35433ae8198fccf1945617f71b89c1af26dada9f342feb7
 COMPONENT_ARCHIVE_URL=	$(COMPONENT_PROJECT_URL)download/src/all-versions/$(COMPONENT_ARCHIVE)
 
 include ../../make-rules/prep.mk
diff -r 19eda0ce91e0 -r 3d14753950e0 components/wireshark/wireshark-common.p5m
--- a/components/wireshark/wireshark-common.p5m	Tue Jul 24 10:14:00 2012 -0700
+++ b/components/wireshark/wireshark-common.p5m	Wed Jul 25 00:05:25 2012 -0700
@@ -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.2.0.0
-file path=usr/lib/libwiretap.so.2.0.0
+file path=usr/lib/libwireshark.so.2.0.1
+file path=usr/lib/libwiretap.so.2.1.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)/docsis.so
@@ -292,10 +292,10 @@
 file path=usr/share/wireshark/ws.css
 
 license wireshark.license license=GPLv2
-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/libwireshark.so target=libwireshark.so.2.0.1
+link path=usr/lib/libwireshark.so.2 target=libwireshark.so.2.0.1
+link path=usr/lib/libwiretap.so target=libwiretap.so.2.1.0
+link path=usr/lib/libwiretap.so.2 target=libwiretap.so.2.1.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
 
diff -r 19eda0ce91e0 -r 3d14753950e0 components/wireshark/wireshark.license
--- a/components/wireshark/wireshark.license	Tue Jul 24 10:14:00 2012 -0700
+++ b/components/wireshark/wireshark.license	Wed Jul 25 00:05:25 2012 -0700
@@ -314,10 +314,9 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -351,8 +350,7 @@
 Public License instead of this License.
 
 ------------------------------------------------------------------------
-Parts of Wireshark are covered by one or more of the following additional
-Notices:
+Parts of this software are licensed as follows
 
    Copyright (c) 1988, 1992, 1993
         The Regents of the University of California.  All rights reserved.