From 7d90fafd865b510e67ab7e405ac3c5d564250bf4 Mon Sep 17 00:00:00 2001
From: Peter Hatina <phatina@redhat.com>
Date: Mon, 3 Dec 2012 09:01:35 +0100
Subject: [PATCH] upgrade to 1.8.4

---
 .gitignore                      |  1 +
 sources                         |  2 +-
 wireshark-dissector-table.patch | 21 ---------------------
 wireshark.spec                  | 10 ++++++----
 4 files changed, 8 insertions(+), 26 deletions(-)
 delete mode 100644 wireshark-dissector-table.patch

diff --git a/.gitignore b/.gitignore
index 2e3e873..ea0d1e7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,4 @@ wireshark-1.2.10.tar.bz2
 /wireshark-1.8.1.tar.bz2
 /wireshark-1.8.2.tar.bz2
 /wireshark-1.8.3.tar.bz2
+/wireshark-1.8.4.tar.bz2
diff --git a/sources b/sources
index a4fb033..1e5cca0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-898b4c60e32efcd77ecf875a6ad07a92  wireshark-1.8.3.tar.bz2
+ce22aa0fe7ecb5af39c93ff905c7d026  wireshark-1.8.4.tar.bz2
diff --git a/wireshark-dissector-table.patch b/wireshark-dissector-table.patch
deleted file mode 100644
index dee8582..0000000
--- a/wireshark-dissector-table.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-+++ trunk/epan/dissectors/packet-dtls.c	2012/08/15 06:14:10	44511
-@@ -2724,7 +2724,6 @@
- 
-   register_dissector("dtls", dissect_dtls, proto_dtls);
-   dtls_handle = find_dissector("dtls");
--  dissector_add_uint("sctp.ppi", DIAMETER_DTLS_PROTOCOL_ID, dtls_handle);
-   dtls_associations = g_tree_new(ssl_association_cmp);
- 
-   register_init_routine(dtls_init);
-@@ -2750,8 +2749,10 @@
-   dtls_parse_uat();
-   dtls_parse_old_keys();
- 
--  if (initialized == FALSE)
-+  if (initialized == FALSE) {
-     heur_dissector_add("udp", dissect_dtls_heur, proto_dtls);
-+    dissector_add_uint("sctp.ppi", DIAMETER_DTLS_PROTOCOL_ID, find_dissector("dtls"));
-+  }
- 
-   initialized = TRUE;
- }
diff --git a/wireshark.spec b/wireshark.spec
index b8fe520..8dd1805 100644
--- a/wireshark.spec
+++ b/wireshark.spec
@@ -20,8 +20,8 @@
 
 Summary:	Network traffic analyzer
 Name:		wireshark
-Version:	1.8.3
-Release:	2%{?dist}
+Version:	1.8.4
+Release:	1%{?dist}
 License:	GPL+
 Group:		Applications/Internet
 Source0:	http://wireshark.org/download/src/%{name}-%{version}.tar.bz2
@@ -40,7 +40,6 @@ Patch3:		wireshark-libtool-pie.patch
 Patch4:		wireshark-1.6.1-group-msg.patch
 Patch5:		wireshark-1.6.0-soname.patch
 Patch6:		wireshark-1.8.2-python-symbols.patch
-Patch7:		wireshark-dissector-table.patch
 
 Url:		http://www.wireshark.org/
 BuildRequires:	libpcap-devel >= 0.9
@@ -138,7 +137,6 @@ and plugins.
 %patch4 -p1 -b .group-msg
 %patch5 -p1 -b .soname
 %patch6 -p1 -b .python-symbols
-%patch7 -p1 -b .dtls
 
 %build
 %ifarch s390 s390x sparcv9 sparc64
@@ -364,6 +362,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/aclocal/*
 
 %changelog
+* Mon Dec 03 2012 Peter Hatina <phatina@redhat.com> - 1.8.4-1
+- upgrade to 1.8.4
+- see http://www.wireshark.org/docs/relnotes/wireshark-1.8.4.html
+
 * Tue Oct 16 2012 Peter Hatina <phatina@redhat.com> - 1.8.3-2
 - backport dissector table fix
 - TODO: remove this after new release