[98948] trunk/dports/net/wireshark

ricci at macports.org ricci at macports.org
Sun Oct 21 21:13:58 PDT 2012


Revision: 98948
          http://trac.macports.org//changeset/98948
Author:   ricci at macports.org
Date:     2012-10-21 21:13:58 -0700 (Sun, 21 Oct 2012)
Log Message:
-----------
wireshark: add patch as per #36562 to resolve #36562

Modified Paths:
--------------
    trunk/dports/net/wireshark/Portfile

Added Paths:
-----------
    trunk/dports/net/wireshark/files/patch-epan-dissectors-pacet-dtls.c.diff

Modified: trunk/dports/net/wireshark/Portfile
===================================================================
--- trunk/dports/net/wireshark/Portfile	2012-10-22 02:22:21 UTC (rev 98947)
+++ trunk/dports/net/wireshark/Portfile	2012-10-22 04:13:58 UTC (rev 98948)
@@ -3,7 +3,7 @@
 PortSystem 1.0
 name		wireshark
 version		1.8.3
-revision	0
+revision	1
 categories	net
 license		{GPL-2 GPL-3}
 maintainers	darkart.com:opendarwin.org
@@ -27,6 +27,8 @@
 
 conflicts	wireshark-devel
 
+patchfiles	patch-epan-dissectors-pacet-dtls.c.diff
+
 depends_build 		\
 		port:pkgconfig
 depends_lib 		\

Added: trunk/dports/net/wireshark/files/patch-epan-dissectors-pacet-dtls.c.diff
===================================================================
--- trunk/dports/net/wireshark/files/patch-epan-dissectors-pacet-dtls.c.diff	                        (rev 0)
+++ trunk/dports/net/wireshark/files/patch-epan-dissectors-pacet-dtls.c.diff	2012-10-22 04:13:58 UTC (rev 98948)
@@ -0,0 +1,22 @@
+--- epan/dissectors/packet-dtls.c	2012/08/14 22:12:31	44510
++++ 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;
+ }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20121021/c0aabed7/attachment.html>


More information about the macports-changes mailing list