[wireshark/f18] fix dissector table

[Peter Hatina]

commit 266176a774fd95e1b38d32b68a56c66aad68122d
Author: Peter Hatina <phatina at redhat.com>
Date:   Mon Oct 29 08:53:19 2012 +0100

    fix dissector table

 wireshark-dissector-table.patch |   21 +++++++++++++++++++++
 wireshark.spec                  |    8 +++++++-
 2 files changed, 28 insertions(+), 1 deletions(-)
---
diff --git a/wireshark-dissector-table.patch b/wireshark-dissector-table.patch
new file mode 100644
index 0000000..dee8582
--- /dev/null
+++ b/wireshark-dissector-table.patch
@@ -0,0 +1,21 @@
++++ 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 8f01c4a..62686c2 100644
--- a/wireshark.spec
+++ b/wireshark.spec
@@ -13,7 +13,7 @@
 Summary:	Network traffic analyzer
 Name:		wireshark
 Version:	1.8.3
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPL+
 Group:		Applications/Internet
 Source0:	http://wireshark.org/download/src/%{name}-%{version}.tar.bz2
@@ -31,6 +31,7 @@ Patch2:		wireshark-1.2.4-enable_lua.patch
 Patch3:		wireshark-libtool-pie.patch
 Patch4:		wireshark-1.6.1-group-msg.patch
 Patch5:		wireshark-1.6.0-soname.patch
+Patch6:		wireshark-dissector-table.patch
 
 Url:		http://www.wireshark.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -120,6 +121,7 @@ and plugins.
 %patch3 -p1 -b .v4cleanup
 %patch4 -p1 -b .group-msg
 %patch5 -p1 -b .soname
+%patch6 -p1 -b .dtls
 
 %build
 %ifarch s390 s390x sparcv9 sparc64
@@ -349,6 +351,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/aclocal/*
 
 %changelog
+* Mon Oct 29 2012 Peter Hatina <phatina at redhat.com> - 1.8.3-3
+- backport dissector table fix
+- TODO: remove this after new release
+
 * Mon Oct 22 2012 Peter Hatina <phatina at redhat.com> - 1.8.3-2
 - conditional GeoIP dependency fix