Add upstream patch (bug #437032).

Package-Manager: portage-2.2.0_alpha134/cvs/Linux x86_64

4 files changed, 37 insertions, 8 deletions

diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index fe51f8feb137..495f1a4102bb 100644
--- a/net-analyzer/wireshark/ChangeLog
+++ b/net-analyzer/wireshark/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/wireshark
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.402 2012/10/02 23:45:42 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.403 2012/10/03 15:24:07 jer Exp $
+
+  03 Oct 2012; Jeroen Roovers <jer@gentoo.org> wireshark-1.8.3.ebuild,
+  +files/wireshark-1.8.3-dtls-sctp.patch:
+  Add upstream patch (bug #437032).
 
 *wireshark-1.8.3 (02 Oct 2012)
 *wireshark-1.6.11 (02 Oct 2012)
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index bb561025e153..32b6f92e2aed 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -6,6 +6,7 @@ AUX wireshark-1.6.6-gtk-pcap.patch 841 SHA256 862c301f450fcb775e3bd907e5a6ca667b
 AUX wireshark-1.8.1-ldflags.patch 312 SHA256 b4cf259892774b4a72ab90b7ea28fbf3c923993f8f68831627d79a45637f5948 SHA512 a6cae46b7bf1f82977f8c905f109efeb72b1bf7bf9413639dd0c783147070be04efac7ec5ac92c9eda682500c5596cfcb2ade424d7bd85278c7842f5aff2ad98 WHIRLPOOL 0aa07f0d26318d203ea2bfb0369eb4fe57f80958e24f20f8579e218d8c3967effb64461112cf30cd15322cc6ed76c75dac0091781ed4526c091f4cddb40daf29
 AUX wireshark-1.8.2-CVE-2012-3548.patch 722 SHA256 02e0ba7d19aa721e569aa5452bdfdd15786d440cdae48cdd932935c3f9e299a5 SHA512 279d3b91245ab6e9b2f9f88a208587ec068ae6d156edba993904fda422b931359d777b3cb8235e4301470ca3e3a12b3424fb4ea52a7d704bf62f7d81918c4d88 WHIRLPOOL 00a281fe94fea104c4381853144012bdc1eeebaa4557a89e4aacd2d4a85036a39992407f10b273a00867af77f343c988cd98c807fb658b4e36e4170bc24cdd6b
 AUX wireshark-1.8.2-python3.patch 2728 SHA256 e4656a840cd4ab09138ef18bf4fb45e6623ace40ff09b13cc42ec216aab75895 SHA512 1018c05648a21e9dce456de58fef92db7237a374ae4d1f1b050bcc13764f17a6eb6e97d3d5d73e6f584cdd389f588aa4a1c1e4843079e10d239ef95acf9e2c51 WHIRLPOOL 2dec75d08f650da2dae4540a616b728290646d4b9b0dfb52624ca7b1f79036125e85c49a2e7cf9696b74f71c8253970b35f5d10737c838cde3e5c6054532329a
+AUX wireshark-1.8.3-dtls-sctp.patch 680 SHA256 4e8c697c99085c0f715659b63f7f4e78015d329e6fae16c2dcaa328c7c7a229d SHA512 79d2da1d3560a1d20c06083841bc59d3438ca246e3277a5763c8ee81cef0efc6ac1a089df2fd45474f03893009b7393388cf05e798f33ecd0a02b75533316aff WHIRLPOOL 9be98672f51022295149f5b23b9378599308ba6028ba8d7cec5634ae1349cc5460838e0d61e64ec61abbd78497446152c13938633ea23d2d329223fb99709dc4
 DIST wireshark-1.6.10.tar.bz2 22026939 SHA256 a00797d8cb436531a79cd823a53c6475cc2f52d41a72efff926af4a964dd56a6 SHA512 e99b7cf2d2bfbb3102ad41fea407b47577672927f0b0f4dee8cfadde6c4a8c638b6f1b0111846794a5c7beffb426122310ae67e43bfa26c1014c1362654962d7 WHIRLPOOL 43e2c08701ad099df48646e6ae3dcdd7d6d972247cbe0e9b592635dbf8050b770cefea708895b0b8def26020fae2fa7c9f04aee7195a422119a5dd168ce47237
 DIST wireshark-1.6.11.tar.bz2 22048186 SHA256 8bbac117e3f516e566c1c8f997c3ddd41eedd77fb0818fd6317eeb72f8d31a37 SHA512 4a560513a6c386f63de5c48bebe0f56b9c547b34650261c091311b30f75e122146251ea177fe6616ffebc8bfec62a2a1e24a445ab8d28122859495a434cfaec0 WHIRLPOOL 388986b30c562adea3090ad239bcf4c73c8afa102c57aaeb0131dc76dc4a5c6eac5615ebac43b561404dd63f49edf5eb686e82966595cbe8e4f05d39a1bc8f3d
 DIST wireshark-1.8.2.tar.bz2 24121798 SHA256 3f0e688d889345033e0a7e4f36aea78248e5c7b32d0dfc19eac044188aac11cc SHA512 219ec8249072773719162851515eb9c29a01693c9ba4d57976afad1e58d30cac9aefb482d3c6113386c39cfab775919ad68a888e94de8d62af0e8b8da7c3991b WHIRLPOOL 08bbe59e096de90a99766aa49c6d419351b1e178f5eb2e9160e00900c695dd46515448571ebbf19172679db0637f82359757c302cd87ea176936eb32c3625ba1
@@ -14,13 +15,13 @@ EBUILD wireshark-1.6.10-r2.ebuild 6466 SHA256 fa0a4d2f19852240721045b58abe661eaf
 EBUILD wireshark-1.6.11.ebuild 6415 SHA256 f2eca4384db45bdeda0c18d3340b8054ee9372af7a86f831dc7c65307303ad26 SHA512 80f52bb4cdfcd783180e94e7bf8d1387efb59ce1b22b1c59f72367ac25136f7bcdf4d85830d24a5c020ef3a3cc4475c308b078da7336b7f7efa178c7dfed01cc WHIRLPOOL d33784df6404f78c1d45f380fef6b2ac880fc1f2eedbedbb26e13c342a2093042257672cdc4d2f05281b7c4cc5805d080dccda052f47e420ff2e3cb734ee4ff4
 EBUILD wireshark-1.8.2-r2.ebuild 6455 SHA256 9685183389fc7da4323182db0149340012391839814c27c606876c192fd95f5c SHA512 c04026738a303160843bc241c185f26327a896e1a89cd654fc20af4b642e75a8ea5f75c03ee30e3b22d4ae1d40b029e833cb7cb2f41eacd7c87775c0ae18f15c WHIRLPOOL ffe4792bbb2d857e9a9da6f2f197ac18274e67beafd50b81c5b91d437d009076347beb3251127c67485a13428520e595ea786a6968d77be70251d6c06aa19416
 EBUILD wireshark-1.8.2-r3.ebuild 6529 SHA256 dff7db5b279f94f45a39143af0fbb9efa830e9ec2bec20109543885de061a3d0 SHA512 218af752485bf9880430fe35a871ac7baf753717a6dd226e389d7b6bc90640460d84204d645c9020d763b3315a1be6efab8a7913748dad7c9c3fdb9f29fc3397 WHIRLPOOL 86bfb07b309f62605f727544c5e6029899669b760ac45c775627a71d8d80ffb8617255f067cc216c1894a68369da0c612cdbd7814dabeb53201a6c716af9df55
-EBUILD wireshark-1.8.3.ebuild 6424 SHA256 c9bcee8eb7dc679f4559c9990f192ad1ba21753e2a486f8dfe7790cf4fb2e37f SHA512 43f04f3441c4be7f6b5752194ea00c7a431b5512b65c2fd54fc4da8ffdfb6598d32ccf67abcf04606eee0d6fd21edcbca1d705d82d2f981a0acba0da0782f44d WHIRLPOOL 8a9f978d4dc90f487db1794e07b932e27b86009c57b04ccbb4b55ddbf6e38be8b84d03c32086b925d5f6515a3bd53b15c8fb9f71e0bbb23c82748790ddd0b84d
-MISC ChangeLog 58603 SHA256 64eb1f8574613ecbe2c36e7939e347d51b1e8286f80c1cb3f57d895e3b697f84 SHA512 da3a9aba4f04b2fb272a8001d5e60bc3c6d29bae94d6eaf4673f2125869f16bc9a6c2942d2e402b3cfeeb345f86cf05cffa795387513f47ce222aaf34e2313ce WHIRLPOOL f93d51ec6335abad222535c3308c3c4a2c592dde1ef7569d51866e41bd3381d29d6efffe231016cd7d70001b775bc5f486af5de4e7a95f6decc86505594b7be8
+EBUILD wireshark-1.8.3.ebuild 6474 SHA256 b55ce3dfe8ba1184168e31ec0547c32a40814ca7423fec9bd209a73fc61246f1 SHA512 856ba97ad8609791e1b20dbd1bd108c9c1af5dde14a287637974392941befe8bcb6dfed353d9324d9ffaa3932116a195a2f58d847c3da6f2778e1d5bf5bac7fd WHIRLPOOL d42060dd7fce492989456a9388ac6242c0d5102510a75159de58063c247d5472595f48cbe3acf5cad3e05bc7b8cd8ca0d60aaa2a5cf6798b89ad077ba8ac6e5b
+MISC ChangeLog 58753 SHA256 d56fa53d578298b91d479e2b50fa4ae1baf568113915a9b6800a17d4c2eab53c SHA512 0525439680d6431c5ca8d8307e6f92cc31a0416d7addaa4dd273d04c8138d72f3bfc3b8d78b7246b171e41f6066ec224c117e308b0750a5496d9e5653c384310 WHIRLPOOL 93aa5b42ea5254d7f2fe99374c6d2b6ea87a279c1b65c430a3d363dd83e85b8356adb4c7599a95280e788c8ed72c67a53ea12ed7e2ffd0d84310c80c8fc09d7f
 MISC metadata.xml 2531 SHA256 7061b38f182ceca328fa1ae6599f97d30a6f67b402eba676fd011baaa0ed1c7f SHA512 1b7feab8dcd1b3c183b71dcafb04f09f61203bb767d95748a0860bcba6c874a53aed09833f5d8d797e599c0063a0f269171170b06003ca57a257b687a18ebaff WHIRLPOOL ee0ae5b99f54c32db6bb8bfd0cf60e6c9cfea5204ec4ac1042ba2c242a035e074648ab5e40e332de79a58e950bfe36780bf382aae27c16ee2a6855be621fe13a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBrfKcACgkQVWmRsqeSphMcPwCdEX+7WPvQgffCxJditz0YwY3x
-1uQAn1qocw3KgBNd4q93v8OgRjtwhR2k
-=YUfg
+iEYEAREIAAYFAlBsWJgACgkQVWmRsqeSphO/dwCfRP1zwYxyyj4qNr5r8O8+HQ1o
+oIQAn1BLrJNh7vWfEydVu57S5OB8Fh92
+=2x5L
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/wireshark/files/wireshark-1.8.3-dtls-sctp.patch b/net-analyzer/wireshark/files/wireshark-1.8.3-dtls-sctp.patch
new file mode 100644
index 000000000000..f5cfc9964dde
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-1.8.3-dtls-sctp.patch
@@ -0,0 +1,22 @@
+--- a/epan/dissectors/packet-dtls.c
++++ b/epan/dissectors/packet-dtls.c
+@@ -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/net-analyzer/wireshark/wireshark-1.8.3.ebuild b/net-analyzer/wireshark/wireshark-1.8.3.ebuild
index 1fc8e7fa8b41..38dece773154 100644
--- a/net-analyzer/wireshark/wireshark-1.8.3.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.8.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.8.3.ebuild,v 1.1 2012/10/02 23:45:42 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.8.3.ebuild,v 1.2 2012/10/03 15:24:07 jer Exp $
 
 EAPI="4"
 PYTHON_DEPEND="python? 2"
@@ -106,7 +106,9 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.8.1-ldflags.patch
+	epatch \
+		"${FILESDIR}"/${PN}-1.8.1-ldflags.patch \
+		"${FILESDIR}"/${PN}-1.8.3-dtls-sctp.patch
 	sed -i -e 's|.png||g' ${PN}.desktop || die
 	eautoreconf
 }