From c101ea49671b31cd577a4d420883dabb16d39e747cba5b4196df1fb8b2cd7127 Mon Sep 17 00:00:00 2001
From: Andreas Stieger <andreas.stieger@gmx.de>
Date: Tue, 24 Jul 2012 06:59:00 +0000
Subject: [PATCH] Accepting request 128812 from
 home:AndreasStieger:branches:network:utilities

update to upstream 1.8.1 (bnc#772738, CVE-2012-4048, CVE-2012-4049)

OBS-URL: https://build.opensuse.org/request/show/128812
OBS-URL: https://build.opensuse.org/package/show/network:utilities/wireshark?expand=0&rev=63
---
 wireshark-1.8.0-gmodule.patch | 12 ------------
 wireshark-1.8.0.tar.bz2       |  3 ---
 wireshark-1.8.1.tar.bz2       |  3 +++
 wireshark.changes             | 22 ++++++++++++++++++++++
 wireshark.spec                |  5 +----
 5 files changed, 26 insertions(+), 19 deletions(-)
 delete mode 100644 wireshark-1.8.0-gmodule.patch
 delete mode 100644 wireshark-1.8.0.tar.bz2
 create mode 100644 wireshark-1.8.1.tar.bz2

diff --git a/wireshark-1.8.0-gmodule.patch b/wireshark-1.8.0-gmodule.patch
deleted file mode 100644
index a725cc4..0000000
--- a/wireshark-1.8.0-gmodule.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: Makefile.in
-===================================================================
---- Makefile.in.orig	2012-06-23 12:08:53.000000000 +0100
-+++ Makefile.in	2012-06-23 12:09:00.000000000 +0100
-@@ -1051,6 +1051,7 @@ wireshark_LDADD = \
- 	@LIBGNUTLS_LIBS@		\
- 	@LIBSMI_LDFLAGS@		\
- 	@PORTAUDIO_LIBS@		\
-+	-lgmodule-2.0	\
- 	@GTK_LIBS@ -lm
- 
- wireshark_CFLAGS = $(AM_CLEAN_CFLAGS) $(py_dissectors_dir)
diff --git a/wireshark-1.8.0.tar.bz2 b/wireshark-1.8.0.tar.bz2
deleted file mode 100644
index 75076b2..0000000
--- a/wireshark-1.8.0.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4cb802f116bbdcfa71afbc842dbfacd8f96594f4b221cbb5616d5c17bc696a62
-size 24425043
diff --git a/wireshark-1.8.1.tar.bz2 b/wireshark-1.8.1.tar.bz2
new file mode 100644
index 0000000..5744918
--- /dev/null
+++ b/wireshark-1.8.1.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5966a3e23d34972eb35433ae8198fccf1945617f71b89c1af26dada9f342feb7
+size 24125571
diff --git a/wireshark.changes b/wireshark.changes
index 100eeee..5185efe 100644
--- a/wireshark.changes
+++ b/wireshark.changes
@@ -1,3 +1,25 @@
+-------------------------------------------------------------------
+Tue Jul 24 05:00:53 UTC 2012 - andreas.stieger@gmx.de
+
+- update to upstream 1.8.1 (bnc#772738)
+  + vulnerabilities fixed:
+    * The PPP dissector could crash
+      (wnpa-sec-2012-11 CVE-2012-4048)
+    * The NFS dissector could use excessive amounts of CPU
+      (wnpa-sec-2012-12 CVE-2012-4049)
+  + bug fixes:
+    * Wireshark crashes on bootp filter
+    * Wireshark > 1.4 does not correctly read Association ID for PS
+      Poll packets
+    * Radius-EAP broken since 1.8.0 release
+    * SNMP incorrectly marks SNMPv3 "discovery" packet as malformed
+    * Widgets are not properly expanded in GTK3
+    * Find Next Mark duplicated on Edit Menu
+    * DVB-CI/CI+: fix offset error in operator_info apdu
+    * Unable to correctly identify IEC 61850 MMS packets
+    * WinPcap doesn't install if vcredist_x64 requires reboot
+- remove wireshark-1.8.0-gmodule.patch, fixed upstream
+
 -------------------------------------------------------------------
 Fri Jun 22 21:13:23 UTC 2012 - andreas.stieger@gmx.de
 
diff --git a/wireshark.spec b/wireshark.spec
index 1343f2b..7277322 100644
--- a/wireshark.spec
+++ b/wireshark.spec
@@ -20,7 +20,7 @@
 %define use_caps 0
 
 Name:           wireshark
-Version:        1.8.0
+Version:        1.8.1
 Release:        0
 Summary:        A Network Traffic Analyser
 License:        GPL-2.0+
@@ -34,8 +34,6 @@ Patch1:         %{name}-1.2.0-disable-warning-dialog.patch
 Patch2:         %{name}-1.2.0-geoip.patch
 # PATCH-FIX-OPENSUSE wireshark-1.2.4-enable_lua.patch bnc#650434
 Patch4:         %{name}-1.2.4-enable_lua.patch
-# PATCH-FIX-OPENSUSE wireshark-1.8.0-gmodule.patch andreas.stieger@gmx.de -- fix "undefined reference to symbol 'g_module_name'" when linking
-Patch5:         wireshark-1.8.0-gmodule.patch
 BuildRequires:  bison
 BuildRequires:  cairo-devel
 BuildRequires:  flex
@@ -95,7 +93,6 @@ view the reconstructed stream of a TCP session.
 %setup -q
 %patch2
 %patch4
-%patch5
 
 sed -i 's/^Icon=wireshark.png$/Icon=wireshark/' wireshark.desktop
 # run as root on 11.3 and older - bnc#349782