Fixed crash on bad bLength. Fixed crash if user is not in wireshark group, thank you M. Edward Borasky <znmeb AT cesmail.net> for report and Kevin Pyle <kevin.pyle AT bluecoat.com> for investigation and work with upstream to make this fixed. Removed old and vulnerable.

Package-Manager: portage-2.1.3.19

15 files changed, 190 insertions, 389 deletions

diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index 63473fe1ae41..62db7d431926 100644
--- a/net-analyzer/wireshark/ChangeLog
+++ b/net-analyzer/wireshark/ChangeLog
@@ -1,6 +1,22 @@
 # ChangeLog for net-analyzer/wireshark
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.75 2007/12/26 10:56:55 welp Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.76 2008/01/10 18:36:34 pva Exp $
+
+*wireshark-0.99.7-r1 (10 Jan 2008)
+
+  10 Jan 2008; <pva@gentoo.org> -files/wireshark-0.99.6-asneeded.patch,
+  -files/wireshark-0.99.6-asneeded-r1.patch,
+  -files/wireshark-0.99.6-gint64-warnings.patch,
+  -files/wireshark-0.99.6-libgcrypt.patch, -files/wireshark-0.99.6-lm.patch,
+  +files/wireshark-0.99.7-crash-emem.c.patch,
+  +files/wireshark-0.99.7-exit.patch,
+  -files/wireshark-epan_dissectors_packet-diameter.diff,
+  -wireshark-0.99.6.ebuild, -wireshark-0.99.6-r1.ebuild,
+  +wireshark-0.99.7-r1.ebuild:
+  Fixed crash on bad bLength. Fixed crash if user is not in wireshark group,
+  thank you M. Edward Borasky <znmeb AT cesmail.net> for report and Kevin Pyle
+  <kevin.pyle AT bluecoat.com> for investigation and work with upstream to
+  make this fixed. Removed old and vulnerable.
 
   26 Dec 2007; Peter Weller <welp@gentoo.org> wireshark-0.99.7.ebuild:
   Stable on amd64; bug 199958
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index f986f496b507..8f72770f83d3 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,67 +1,43 @@
-AUX wireshark-0.99.6-asneeded-r1.patch 1775 RMD160 cf44de4590086c71a79ca7c9757348a12dd230b4 SHA1 098b81e701b04aabf7c0e0f251240b7af803beba SHA256 95fe962a86219ed28d9ae2da56d7174ac4d2b4c142063fe2d78752fb2cf9e066
-MD5 d2da53a8aee7e567da7be57b2f019c14 files/wireshark-0.99.6-asneeded-r1.patch 1775
-RMD160 cf44de4590086c71a79ca7c9757348a12dd230b4 files/wireshark-0.99.6-asneeded-r1.patch 1775
-SHA256 95fe962a86219ed28d9ae2da56d7174ac4d2b4c142063fe2d78752fb2cf9e066 files/wireshark-0.99.6-asneeded-r1.patch 1775
-AUX wireshark-0.99.6-asneeded.patch 1913 RMD160 c461f0d5768de3387976790b7c9d749cc2780b95 SHA1 9a8e3538e421633534000c956351204fc7ce0d84 SHA256 b9819090848f02265d286fdc7b076b39b137cdb29024786fa9cf1b7098db89fd
-MD5 07eefc558b4a3e7bf40806a89e913a30 files/wireshark-0.99.6-asneeded.patch 1913
-RMD160 c461f0d5768de3387976790b7c9d749cc2780b95 files/wireshark-0.99.6-asneeded.patch 1913
-SHA256 b9819090848f02265d286fdc7b076b39b137cdb29024786fa9cf1b7098db89fd files/wireshark-0.99.6-asneeded.patch 1913
-AUX wireshark-0.99.6-gint64-warnings.patch 1840 RMD160 651ea3c62acb82cfe2efa6f841fe3f48d82558d1 SHA1 a75ffdfdfbbf1cc4c4f55794d5d692ff5cdd95ce SHA256 d5860378f4d7ba4fa7dcd41e5a987dbdc63c01c73dd2f5846c26159695a9a58e
-MD5 82d807b394d2ff1cb26728330a72fd23 files/wireshark-0.99.6-gint64-warnings.patch 1840
-RMD160 651ea3c62acb82cfe2efa6f841fe3f48d82558d1 files/wireshark-0.99.6-gint64-warnings.patch 1840
-SHA256 d5860378f4d7ba4fa7dcd41e5a987dbdc63c01c73dd2f5846c26159695a9a58e files/wireshark-0.99.6-gint64-warnings.patch 1840
-AUX wireshark-0.99.6-libgcrypt.patch 1453 RMD160 aa5bc6bffacc80af4a9a513e245f0c9d80440fc8 SHA1 ea871de5a3e487c2cf9f80f801e78e0bb68082c0 SHA256 339c61d2e70932dda19a8e77829fb1a82d1e44e843be6fef49d1e10489c34c83
-MD5 71da340790d1ffd8446e0961375d6b75 files/wireshark-0.99.6-libgcrypt.patch 1453
-RMD160 aa5bc6bffacc80af4a9a513e245f0c9d80440fc8 files/wireshark-0.99.6-libgcrypt.patch 1453
-SHA256 339c61d2e70932dda19a8e77829fb1a82d1e44e843be6fef49d1e10489c34c83 files/wireshark-0.99.6-libgcrypt.patch 1453
-AUX wireshark-0.99.6-lm.patch 1010 RMD160 80caa547e0ea4f8a84f42d349961d0684a47a692 SHA1 16757bdee861dafd801ddd83a8224f3215f2d1cb SHA256 0dfe8eb230a6cc09794de6252f3ada80fc1f740d54849882e491c52be563b8dd
-MD5 dd59d3fe8563f26a2f41eece4df07494 files/wireshark-0.99.6-lm.patch 1010
-RMD160 80caa547e0ea4f8a84f42d349961d0684a47a692 files/wireshark-0.99.6-lm.patch 1010
-SHA256 0dfe8eb230a6cc09794de6252f3ada80fc1f740d54849882e491c52be563b8dd files/wireshark-0.99.6-lm.patch 1010
 AUX wireshark-0.99.7-asneeded.patch 339 RMD160 faa516dd3dfd8bd6218f66d3bedb5490b0896f5b SHA1 ec2b8952f8fe55471e923c086a6e9b48e06ce7a8 SHA256 9fc8b3ec3fcf1cca714c78c28c1883503abfcfce4fe175e43c6d7ec14ddc9478
 MD5 e0c5d785bc887eadb2a4fc42a4dd782f files/wireshark-0.99.7-asneeded.patch 339
 RMD160 faa516dd3dfd8bd6218f66d3bedb5490b0896f5b files/wireshark-0.99.7-asneeded.patch 339
 SHA256 9fc8b3ec3fcf1cca714c78c28c1883503abfcfce4fe175e43c6d7ec14ddc9478 files/wireshark-0.99.7-asneeded.patch 339
+AUX wireshark-0.99.7-crash-emem.c.patch 1123 RMD160 e5dd57a30a6ca177dedb7263a51c0653f96e5c07 SHA1 a22f51cd20141277a99e40933245332319a6f8a4 SHA256 c48ca7c56d9d7489a943168aa4501fe9caba4e08cf3d309d51a20445b78cb361
+MD5 90eaad5aa3d3a97ee71781988aa02320 files/wireshark-0.99.7-crash-emem.c.patch 1123
+RMD160 e5dd57a30a6ca177dedb7263a51c0653f96e5c07 files/wireshark-0.99.7-crash-emem.c.patch 1123
+SHA256 c48ca7c56d9d7489a943168aa4501fe9caba4e08cf3d309d51a20445b78cb361 files/wireshark-0.99.7-crash-emem.c.patch 1123
+AUX wireshark-0.99.7-exit.patch 2553 RMD160 078fe05e5901c1e94e84bf0de5dba4974bf0d273 SHA1 aca76a59220825da884d98e12abce108945442fc SHA256 b7b4d4832fc7053620bd81e4ea3466a9aacf6341b3de093fe9fdf36c909fc07e
+MD5 8268e4350c645542c8a6859f2ec150c1 files/wireshark-0.99.7-exit.patch 2553
+RMD160 078fe05e5901c1e94e84bf0de5dba4974bf0d273 files/wireshark-0.99.7-exit.patch 2553
+SHA256 b7b4d4832fc7053620bd81e4ea3466a9aacf6341b3de093fe9fdf36c909fc07e files/wireshark-0.99.7-exit.patch 2553
 AUX wireshark-0.99.7-libgcrypt.patch 1460 RMD160 50746197a57eb99b86d192c8a3d5068cee527f07 SHA1 c0aec79a244b1d9e133de903c6953493958d2ef0 SHA256 01fd754829b3bc4714389dac9eaaf8d4f4457277794d60d69a55450042610814
 MD5 f5616c6212db9c61bcb71002f1c74bb5 files/wireshark-0.99.7-libgcrypt.patch 1460
 RMD160 50746197a57eb99b86d192c8a3d5068cee527f07 files/wireshark-0.99.7-libgcrypt.patch 1460
 SHA256 01fd754829b3bc4714389dac9eaaf8d4f4457277794d60d69a55450042610814 files/wireshark-0.99.7-libgcrypt.patch 1460
-AUX wireshark-epan_dissectors_packet-diameter.diff 1106 RMD160 600471845a90d24f6bb65b46c9d2f8e9c851a78d SHA1 c37922ea7e2d12115aaa55ffe361f4724cbfd9f0 SHA256 cf8a00c20abf51456d90b4ff0b6cd19bd64e2796a7268c355a1c482e434c3505
-MD5 6cfe46e4398d7657b708cf8014f93e72 files/wireshark-epan_dissectors_packet-diameter.diff 1106
-RMD160 600471845a90d24f6bb65b46c9d2f8e9c851a78d files/wireshark-epan_dissectors_packet-diameter.diff 1106
-SHA256 cf8a00c20abf51456d90b4ff0b6cd19bd64e2796a7268c355a1c482e434c3505 files/wireshark-epan_dissectors_packet-diameter.diff 1106
 AUX wireshark-except-double-free.diff 664 RMD160 2b61f03f5148975f6438351c11de18a500deabc5 SHA1 0239e19ba0ebd2cfb4ab4987a8a4c56646cd9250 SHA256 dc02a5f3e4bdbd128a2ba08f38880358f747661a93ca0b3fe1918c67b255c369
 MD5 555b2ee8663c2a28c7ed7423ea9b2299 files/wireshark-except-double-free.diff 664
 RMD160 2b61f03f5148975f6438351c11de18a500deabc5 files/wireshark-except-double-free.diff 664
 SHA256 dc02a5f3e4bdbd128a2ba08f38880358f747661a93ca0b3fe1918c67b255c369 files/wireshark-except-double-free.diff 664
-DIST wireshark-0.99.6.tar.bz2 11826043 RMD160 7c69e71e54d521d942bcbad9894547d9785f0948 SHA1 91f57158a75adca36c79c35525eb3cf57b927075 SHA256 118c4a5bfef00651fbe248e1d5c4e4f907b5e2982f47ccfecca2f7f48ab9d3b8
 DIST wireshark-0.99.7.tar.bz2 13179467 RMD160 558611675aa23313acbdb46650cf471959204bd0 SHA1 3cb6e11410d5151734db19d4fc03b42ecb226277 SHA256 2cbb3360507d8da13fa108e2fe9a4407a89b61fc0ddb6505d60f906b6c15eb82
-EBUILD wireshark-0.99.6-r1.ebuild 4705 RMD160 c993d20d28408fba6e74986daf625d9a1a14ebb4 SHA1 3a0106f48c9064b4fa43c560f68e84d69f005b61 SHA256 ccfd4c91c084e2c12d4188512a357eaf2af20976777dc21cfc737f757566dce9
-MD5 e428a54642eb239cc9e144c2d8b64b87 wireshark-0.99.6-r1.ebuild 4705
-RMD160 c993d20d28408fba6e74986daf625d9a1a14ebb4 wireshark-0.99.6-r1.ebuild 4705
-SHA256 ccfd4c91c084e2c12d4188512a357eaf2af20976777dc21cfc737f757566dce9 wireshark-0.99.6-r1.ebuild 4705
-EBUILD wireshark-0.99.6.ebuild 4512 RMD160 f24ddab48ddf606337526044ae823d4570ed55e1 SHA1 3ed581031afd00a3b394d2f6f05aa9833b99dd97 SHA256 5531fcbc8656b30ac84da7a30f017cf733e70e12537a085a70c8b1745dc56a1a
-MD5 7d702a2b6fbc2fa87e3d9db2d4e4e299 wireshark-0.99.6.ebuild 4512
-RMD160 f24ddab48ddf606337526044ae823d4570ed55e1 wireshark-0.99.6.ebuild 4512
-SHA256 5531fcbc8656b30ac84da7a30f017cf733e70e12537a085a70c8b1745dc56a1a wireshark-0.99.6.ebuild 4512
+EBUILD wireshark-0.99.7-r1.ebuild 5107 RMD160 3709b61da94f61f119de71fa2ef53e7f2f36b710 SHA1 bcf5bfd55466cfebbc867942c40933c6f9a4f2e5 SHA256 c4789c7eb84837aea4464230fe84502d3dbe62f85a3d5e4873e6137aa0c8feb1
+MD5 064606a0a3115b455d6f056c0da662cc wireshark-0.99.7-r1.ebuild 5107
+RMD160 3709b61da94f61f119de71fa2ef53e7f2f36b710 wireshark-0.99.7-r1.ebuild 5107
+SHA256 c4789c7eb84837aea4464230fe84502d3dbe62f85a3d5e4873e6137aa0c8feb1 wireshark-0.99.7-r1.ebuild 5107
 EBUILD wireshark-0.99.7.ebuild 4895 RMD160 359ce3eefe727942641b4cef82b2fba462e8ae24 SHA1 b15e2155e3903fc902bda4cb43ecec6b30771279 SHA256 d2f1bc2fbe273c8a6e1c83e0e276856243297a3b12259fd3c16e14afc747aa9f
 MD5 7a87dcdcc02f245ef61dd10359c19072 wireshark-0.99.7.ebuild 4895
 RMD160 359ce3eefe727942641b4cef82b2fba462e8ae24 wireshark-0.99.7.ebuild 4895
 SHA256 d2f1bc2fbe273c8a6e1c83e0e276856243297a3b12259fd3c16e14afc747aa9f wireshark-0.99.7.ebuild 4895
-MISC ChangeLog 11040 RMD160 b9ab7fcdef6596f26b26453fa0eeae6d6dcb4e39 SHA1 d6b27f9f29f41c5197dfacaf5d651a90a7cf3602 SHA256 e5110c7688289158aec05113b1b8c44788cc6329d3d8545726cbe47c6e656958
-MD5 15211b64e62dc47e7fc241d8873f0305 ChangeLog 11040
-RMD160 b9ab7fcdef6596f26b26453fa0eeae6d6dcb4e39 ChangeLog 11040
-SHA256 e5110c7688289158aec05113b1b8c44788cc6329d3d8545726cbe47c6e656958 ChangeLog 11040
+MISC ChangeLog 11826 RMD160 e40b73da03c1fb93b94694b9875a92cd5e908ec9 SHA1 138c7a55dfd1b4dafa5f93d5f136f669bd5e48f2 SHA256 a94c5ca7cc9e8ebd131de4f832b9b91bcface5121b89d8bf781e06fd6693ae72
+MD5 4b3401f0c03e3fd49bb7c53f1c66f4e7 ChangeLog 11826
+RMD160 e40b73da03c1fb93b94694b9875a92cd5e908ec9 ChangeLog 11826
+SHA256 a94c5ca7cc9e8ebd131de4f832b9b91bcface5121b89d8bf781e06fd6693ae72 ChangeLog 11826
 MISC metadata.xml 241 RMD160 e54fec44f06e7d8c93e399d9bd98e56f231920be SHA1 3f1b8ff204522d99acbe339fe83cbc916d460554 SHA256 684412188c16efe278e263e010f4bf09d33f17f2762d4829516e3e3a47ab3c02
 MD5 94e03a4ff2917efc81b0e0f07040afde metadata.xml 241
 RMD160 e54fec44f06e7d8c93e399d9bd98e56f231920be metadata.xml 241
 SHA256 684412188c16efe278e263e010f4bf09d33f17f2762d4829516e3e3a47ab3c02 metadata.xml 241
-MD5 0f2ef8290367ddf5a0c84810711dbae3 files/digest-wireshark-0.99.6 259
-RMD160 9531098dc7d8a6d421c0134393f003096beeb983 files/digest-wireshark-0.99.6 259
-SHA256 256e77c1d2b8df2a47d22fb56cf29354fb4cc4603d71a342b23f0958db43c4ac files/digest-wireshark-0.99.6 259
-MD5 0f2ef8290367ddf5a0c84810711dbae3 files/digest-wireshark-0.99.6-r1 259
-RMD160 9531098dc7d8a6d421c0134393f003096beeb983 files/digest-wireshark-0.99.6-r1 259
-SHA256 256e77c1d2b8df2a47d22fb56cf29354fb4cc4603d71a342b23f0958db43c4ac files/digest-wireshark-0.99.6-r1 259
 MD5 74b1c59684c65e7a25186de45dfbe58d files/digest-wireshark-0.99.7 259
 RMD160 92424b8b0fc6f6d75ff5796b10f37680134ee3e0 files/digest-wireshark-0.99.7 259
 SHA256 9a175f9dac1b3e2b2026334da35eda454d7ed799faf3315a873ec90e31a73406 files/digest-wireshark-0.99.7 259
+MD5 74b1c59684c65e7a25186de45dfbe58d files/digest-wireshark-0.99.7-r1 259
+RMD160 92424b8b0fc6f6d75ff5796b10f37680134ee3e0 files/digest-wireshark-0.99.7-r1 259
+SHA256 9a175f9dac1b3e2b2026334da35eda454d7ed799faf3315a873ec90e31a73406 files/digest-wireshark-0.99.7-r1 259
diff --git a/net-analyzer/wireshark/files/digest-wireshark-0.99.6 b/net-analyzer/wireshark/files/digest-wireshark-0.99.6
deleted file mode 100644
index 1593025f3afe..000000000000
--- a/net-analyzer/wireshark/files/digest-wireshark-0.99.6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e57a8c8b364c38df3da97e2ee9f0d0bc wireshark-0.99.6.tar.bz2 11826043
-RMD160 7c69e71e54d521d942bcbad9894547d9785f0948 wireshark-0.99.6.tar.bz2 11826043
-SHA256 118c4a5bfef00651fbe248e1d5c4e4f907b5e2982f47ccfecca2f7f48ab9d3b8 wireshark-0.99.6.tar.bz2 11826043
diff --git a/net-analyzer/wireshark/files/digest-wireshark-0.99.6-r1 b/net-analyzer/wireshark/files/digest-wireshark-0.99.6-r1
deleted file mode 100644
index 1593025f3afe..000000000000
--- a/net-analyzer/wireshark/files/digest-wireshark-0.99.6-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e57a8c8b364c38df3da97e2ee9f0d0bc wireshark-0.99.6.tar.bz2 11826043
-RMD160 7c69e71e54d521d942bcbad9894547d9785f0948 wireshark-0.99.6.tar.bz2 11826043
-SHA256 118c4a5bfef00651fbe248e1d5c4e4f907b5e2982f47ccfecca2f7f48ab9d3b8 wireshark-0.99.6.tar.bz2 11826043
diff --git a/net-analyzer/wireshark/files/digest-wireshark-0.99.7-r1 b/net-analyzer/wireshark/files/digest-wireshark-0.99.7-r1
new file mode 100644
index 000000000000..3dbb61dac57c
--- /dev/null
+++ b/net-analyzer/wireshark/files/digest-wireshark-0.99.7-r1
@@ -0,0 +1,3 @@
+MD5 ef04dfac3e7acc4a9cb2b107dd2a2f8a wireshark-0.99.7.tar.bz2 13179467
+RMD160 558611675aa23313acbdb46650cf471959204bd0 wireshark-0.99.7.tar.bz2 13179467
+SHA256 2cbb3360507d8da13fa108e2fe9a4407a89b61fc0ddb6505d60f906b6c15eb82 wireshark-0.99.7.tar.bz2 13179467
diff --git a/net-analyzer/wireshark/files/wireshark-0.99.6-asneeded-r1.patch b/net-analyzer/wireshark/files/wireshark-0.99.6-asneeded-r1.patch
deleted file mode 100644
index c80010834dd6..000000000000
--- a/net-analyzer/wireshark/files/wireshark-0.99.6-asneeded-r1.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./epan/Makefile.am.orig	2007-07-17 12:01:21.000000000 +0400
-+++ ./epan/Makefile.am	2007-07-17 12:02:27.000000000 +0400
-@@ -108,8 +108,8 @@
- #
- # Add the object files for missing routines, if any.
- #
--libwireshark_la_LIBADD = @G_ASCII_STRTOULL_LO@ @INET_ATON_LO@ @INET_PTON_LO@ @INET_NTOP_LO@ libwireshark_generated.la crypt/libairpdcap.la ftypes/libftypes.la dfilter/libdfilter.la dissectors/libcleandissectors.la dissectors/libdissectors.la dissectors/libasndissectors.la dissectors/libpidldissectors.la $(wslua_lib) @ADNS_LIBS@ @LIBGNUTLS_LIBS@ @LIBICONV@ @KRB5_LIBS@ @SNMP_LIBS@ @SSL_LIBS@ -lm
--libwireshark_la_DEPENDENCIES = @G_ASCII_STRTOULL_LO@ @INET_ATON_LO@ @INET_PTON_LO@ @INET_NTOP_LO@ libwireshark_generated.la crypt/libairpdcap.la ftypes/libftypes.la dfilter/libdfilter.la dissectors/libcleandissectors.la dissectors/libdissectors.la dissectors/libasndissectors.la dissectors/libpidldissectors.la $(wslua_lib)
-+libwireshark_la_LIBADD = @G_ASCII_STRTOULL_LO@ @INET_ATON_LO@ @INET_PTON_LO@ @INET_NTOP_LO@ libwireshark_generated.la crypt/libairpdcap.la ftypes/libftypes.la dfilter/libdfilter.la dissectors/libcleandissectors.la dissectors/libdissectors.la dissectors/libasndissectors.la dissectors/libpidldissectors.la ../wiretap/libwiretap.la $(wslua_lib) @ADNS_LIBS@ @LIBGNUTLS_LIBS@ @LIBICONV@ @KRB5_LIBS@ @SNMP_LIBS@ @SSL_LIBS@ -lm
-+libwireshark_la_DEPENDENCIES = @G_ASCII_STRTOULL_LO@ @INET_ATON_LO@ @INET_PTON_LO@ @INET_NTOP_LO@ libwireshark_generated.la crypt/libairpdcap.la ftypes/libftypes.la dfilter/libdfilter.la dissectors/libcleandissectors.la dissectors/libdissectors.la dissectors/libasndissectors.la dissectors/libpidldissectors.la ../wiretap/libwiretap.la $(wslua_lib)
- 
- #EXTRA_PROGRAMS = reassemble_test
- #reassemble_test_LDADD = $(GLIB_LIBS)
diff --git a/net-analyzer/wireshark/files/wireshark-0.99.6-asneeded.patch b/net-analyzer/wireshark/files/wireshark-0.99.6-asneeded.patch
deleted file mode 100644
index ed591dbaa266..000000000000
--- a/net-analyzer/wireshark/files/wireshark-0.99.6-asneeded.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ur wireshark-0.99.6.orig/epan/Makefile.am wireshark-0.99.6/epan/Makefile.am
---- wireshark-0.99.6.orig/epan/Makefile.am	2007-07-05 22:25:05.000000000 +0300
-+++ wireshark-0.99.6/epan/Makefile.am	2007-07-10 16:11:02.000000000 +0300
-@@ -108,8 +108,8 @@
- #
- # Add the object files for missing routines, if any.
- #
--libwireshark_la_LIBADD = @G_ASCII_STRTOULL_LO@ @INET_ATON_LO@ @INET_PTON_LO@ @INET_NTOP_LO@ libwireshark_generated.la crypt/libairpdcap.la ftypes/libftypes.la dfilter/libdfilter.la dissectors/libcleandissectors.la dissectors/libdissectors.la dissectors/libasndissectors.la dissectors/libpidldissectors.la $(wslua_lib) @ADNS_LIBS@ @LIBGNUTLS_LIBS@ @LIBICONV@ @KRB5_LIBS@ @SNMP_LIBS@ @SSL_LIBS@ -lm
--libwireshark_la_DEPENDENCIES = @G_ASCII_STRTOULL_LO@ @INET_ATON_LO@ @INET_PTON_LO@ @INET_NTOP_LO@ libwireshark_generated.la crypt/libairpdcap.la ftypes/libftypes.la dfilter/libdfilter.la dissectors/libcleandissectors.la dissectors/libdissectors.la dissectors/libasndissectors.la dissectors/libpidldissectors.la $(wslua_lib)
-+libwireshark_la_LIBADD = @G_ASCII_STRTOULL_LO@ @INET_ATON_LO@ @INET_PTON_LO@ @INET_NTOP_LO@ libwireshark_generated.la crypt/libairpdcap.la ftypes/libftypes.la dfilter/libdfilter.la dissectors/libcleandissectors.la dissectors/libdissectors.la dissectors/libasndissectors.la dissectors/libpidldissectors.la ${top_builddir}/wiretap/libwiretap.la $(wslua_lib) @ADNS_LIBS@ @LIBGNUTLS_LIBS@ @LIBICONV@ @KRB5_LIBS@ @SNMP_LIBS@ @SSL_LIBS@ -lm
-+libwireshark_la_DEPENDENCIES = @G_ASCII_STRTOULL_LO@ @INET_ATON_LO@ @INET_PTON_LO@ @INET_NTOP_LO@ libwireshark_generated.la crypt/libairpdcap.la ftypes/libftypes.la dfilter/libdfilter.la dissectors/libcleandissectors.la dissectors/libdissectors.la dissectors/libasndissectors.la dissectors/libpidldissectors.la ${top_builddir}/wiretap/libwiretap.la $(wslua_lib)
- 
- #EXTRA_PROGRAMS = reassemble_test
- #reassemble_test_LDADD = $(GLIB_LIBS)
diff --git a/net-analyzer/wireshark/files/wireshark-0.99.6-gint64-warnings.patch b/net-analyzer/wireshark/files/wireshark-0.99.6-gint64-warnings.patch
deleted file mode 100644
index 3d2e00e2b4dd..000000000000
--- a/net-analyzer/wireshark/files/wireshark-0.99.6-gint64-warnings.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff -Naur wireshark-0.99.6.orig/configure.in wireshark-0.99.6/configure.in
---- wireshark-0.99.6.orig/configure.in	2007-07-05 23:25:24.000000000 +0400
-+++ wireshark-0.99.6/configure.in	2007-07-10 14:45:20.000000000 +0400
-@@ -1215,16 +1215,19 @@
-   ],
-   [
-     AC_MSG_RESULT(no)
--    AC_WIRESHARK_CHECK_64BIT_FORMAT(ll,
-+    AC_WIRESHARK_CHECK_64BIT_FORMAT(l,
-       [
--	AC_WIRESHARK_CHECK_64BIT_FORMAT(L,
--	  [
--	    AC_WIRESHARK_CHECK_64BIT_FORMAT(q,
--	      [
--		AC_MSG_ERROR([neither %llx nor %Lx nor %qx worked on a 64-bit integer])
--	      ])
--	  ])
--      ])
-+      AC_WIRESHARK_CHECK_64BIT_FORMAT(ll,
-+       [
-+         AC_WIRESHARK_CHECK_64BIT_FORMAT(L,
-+           [
-+             AC_WIRESHARK_CHECK_64BIT_FORMAT(q,
-+               [
-+                 AC_MSG_ERROR([neither %lx nor %llx nor %Lx nor %qx worked on a 64-bit integer])
-+               ])
-+           ])
-+       ])
-+    ])
-   ])
- 
- GETOPT_C=""
-diff -Naur wireshark-0.99.6.orig/wiretap/configure.in wireshark-0.99.6/wiretap/configure.in
---- wireshark-0.99.6.orig/wiretap/configure.in	2007-07-05 23:25:16.000000000 +0400
-+++ wireshark-0.99.6/wiretap/configure.in	2007-07-10 14:49:20.000000000 +0400
-@@ -288,16 +288,19 @@
-   ],
-   [
-     AC_MSG_RESULT(no)
--    AC_WIRETAP_CHECK_64BIT_FORMAT(ll,
-+    AC_WIRETAP_CHECK_64BIT_FORMAT(l,
-       [
--	AC_WIRETAP_CHECK_64BIT_FORMAT(L,
--	  [
--	    AC_WIRETAP_CHECK_64BIT_FORMAT(q,
--	      [
--		AC_MSG_ERROR([neither %llx nor %Lx nor %qx worked on a 64-bit integer])
--	      ])
--	  ])
--      ])
-+      AC_WIRETAP_CHECK_64BIT_FORMAT(ll,
-+       [
-+         AC_WIRETAP_CHECK_64BIT_FORMAT(L,
-+           [
-+             AC_WIRETAP_CHECK_64BIT_FORMAT(q,
-+               [
-+                 AC_MSG_ERROR([neither %lx nor %llx nor %Lx nor %qx worked on a 64-bit integer])
-+               ])
-+           ])
-+       ])
-+    ])
-   ])
- 
- #
diff --git a/net-analyzer/wireshark/files/wireshark-0.99.6-libgcrypt.patch b/net-analyzer/wireshark/files/wireshark-0.99.6-libgcrypt.patch
deleted file mode 100644
index 139e3885142c..000000000000
--- a/net-analyzer/wireshark/files/wireshark-0.99.6-libgcrypt.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./epan/Makefile.am.orig	2007-07-17 12:03:46.000000000 +0400
-+++ ./epan/Makefile.am	2007-07-17 12:04:54.000000000 +0400
-@@ -108,7 +108,7 @@
- #
- # Add the object files for missing routines, if any.
- #
--libwireshark_la_LIBADD = @G_ASCII_STRTOULL_LO@ @INET_ATON_LO@ @INET_PTON_LO@ @INET_NTOP_LO@ libwireshark_generated.la crypt/libairpdcap.la ftypes/libftypes.la dfilter/libdfilter.la dissectors/libcleandissectors.la dissectors/libdissectors.la dissectors/libasndissectors.la dissectors/libpidldissectors.la ../wiretap/libwiretap.la $(wslua_lib) @ADNS_LIBS@ @LIBGNUTLS_LIBS@ @LIBICONV@ @KRB5_LIBS@ @SNMP_LIBS@ @SSL_LIBS@ -lm
-+libwireshark_la_LIBADD = @G_ASCII_STRTOULL_LO@ @INET_ATON_LO@ @INET_PTON_LO@ @INET_NTOP_LO@ libwireshark_generated.la crypt/libairpdcap.la ftypes/libftypes.la dfilter/libdfilter.la dissectors/libcleandissectors.la dissectors/libdissectors.la dissectors/libasndissectors.la dissectors/libpidldissectors.la ../wiretap/libwiretap.la $(wslua_lib) @ADNS_LIBS@ @LIBGCRYPT_LIBS@ @LIBGNUTLS_LIBS@ @LIBICONV@ @KRB5_LIBS@ @SNMP_LIBS@ @SSL_LIBS@ -lm
- libwireshark_la_DEPENDENCIES = @G_ASCII_STRTOULL_LO@ @INET_ATON_LO@ @INET_PTON_LO@ @INET_NTOP_LO@ libwireshark_generated.la crypt/libairpdcap.la ftypes/libftypes.la dfilter/libdfilter.la dissectors/libcleandissectors.la dissectors/libdissectors.la dissectors/libasndissectors.la dissectors/libpidldissectors.la ../wiretap/libwiretap.la $(wslua_lib)
- 
- #EXTRA_PROGRAMS = reassemble_test
diff --git a/net-analyzer/wireshark/files/wireshark-0.99.6-lm.patch b/net-analyzer/wireshark/files/wireshark-0.99.6-lm.patch
deleted file mode 100644
index a89d7bf145e5..000000000000
--- a/net-analyzer/wireshark/files/wireshark-0.99.6-lm.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=186424
-
-"Forgetting" -lm is a common mistake since glibc works without it. Other libc's
-are not as forgiving.
-
---- ./wiretap/configure.in.orig	2007-07-24 13:38:56.000000000 +0400
-+++ ./wiretap/configure.in	2007-07-24 13:50:08.000000000 +0400
-@@ -324,6 +324,10 @@
- ])
- AC_WIRETAP_PCAP_CHECK
- 
-+# C libraries that are not libc (like ulibc) requre -lm. bug #1704
-+AC_CHECK_LIBM
-+AC_SUBST(LIBM)
-+
- dnl zlib check
- AC_MSG_CHECKING(whether to use zlib for reading compressed capture files)
- 
---- ./wiretap/Makefile.am.orig	2007-07-24 13:38:46.000000000 +0400
-+++ ./wiretap/Makefile.am	2007-07-24 13:43:10.000000000 +0400
-@@ -69,8 +69,8 @@
- 	$(GENERATOR_SOURCES) 	\
- 	$(GENERATED_FILES)
- 
--libwiretap_la_LIBADD = libwiretap_generated.la
--libwiretap_la_DEPENDENCIES = libwiretap_generated.la
-+libwiretap_la_LIBADD = libwiretap_generated.la @LIBM@
-+libwiretap_la_DEPENDENCIES = libwiretap_generated.la @LIBM@
- 
- ascend-grammar.c : ascend-grammar.y
- 	@if [ -z "$(YACC)" ]; then \
diff --git a/net-analyzer/wireshark/files/wireshark-0.99.7-crash-emem.c.patch b/net-analyzer/wireshark/files/wireshark-0.99.7-crash-emem.c.patch
new file mode 100644
index 000000000000..ef58cc4d7513
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-0.99.7-crash-emem.c.patch
@@ -0,0 +1,32 @@
+http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2012
+http://anonsvn.wireshark.org/viewvc/viewvc.py?view=rev&revision=23557
+Author: 	gerald
+Date: 	Fri Nov 23 23:31:21 2007 UTC (6 weeks, 3 days ago)
+Log Message: 	
+
+Catch a bad bLength, which may cause a loop. Fixes bug 2012.
+
+--- trunk/epan/dissectors/packet-usb.c	2007/11/23 20:16:41	23556
++++ trunk/epan/dissectors/packet-usb.c	2007/11/23 23:31:21	23557
+@@ -34,6 +34,7 @@
+ #include <epan/emem.h>
+ #include <epan/tap.h>
+ #include <epan/conversation.h>
++#include <epan/expert.h>
+ #include <string.h>
+ #include "packet-usb.h"
+ 
+@@ -652,6 +653,13 @@
+     proto_tree_add_item(tree, hf_usb_bLength, tvb, offset, 1, TRUE);
+     bLength = tvb_get_guint8(tvb, offset);
+     offset++;
++    if (bLength < 3) {
++        item = proto_tree_add_text(parent_tree, tvb, offset - 1, 1,
++            "Invalid bLength: %u",  bLength);
++        expert_add_info_format(pinfo, item, PI_MALFORMED, PI_ERROR,
++            "Invalid bLength: %u",  bLength);
++        return offset;
++    }
+ 
+     /* bDescriptorType */
+     proto_tree_add_item(tree, hf_usb_bDescriptorType, tvb, offset, 1, TRUE);
diff --git a/net-analyzer/wireshark/files/wireshark-0.99.7-exit.patch b/net-analyzer/wireshark/files/wireshark-0.99.7-exit.patch
new file mode 100644
index 000000000000..3fa306997caf
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-0.99.7-exit.patch
@@ -0,0 +1,63 @@
+http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2177
+
+http://anonsvn.wireshark.org/viewvc/viewvc.py?view=rev&revision=24040
+Author: 	guy
+Date: 	Wed Jan 9 11:40:38 2008 UTC (28 hours, 3 minutes ago)
+Log Message: 	
+
+Use dup2() rather than eth_close() followed by dup() to ensure that a
+given file descriptor get duped to another descriptor.
+
+Handle exec errors in sync_pipe_open_command() the same way they're
+handled in sync_pipe_start(); that fixes bug 2177.
+
+--- trunk/capture_sync.c	2008/01/09 09:34:19	24039
++++ trunk/capture_sync.c	2008/01/09 11:40:38	24040
+@@ -507,13 +507,12 @@
+        * Child process - run dumpcap with the right arguments to make
+        * it just capture with the specified capture parameters
+        */
+-      eth_close(2);
+-      dup(sync_pipe[PIPE_WRITE]);
++      dup2(sync_pipe[PIPE_WRITE], 2);
+       eth_close(sync_pipe[PIPE_READ]);
+       execv(argv[0], (gpointer)argv);
+       g_snprintf(errmsg, sizeof errmsg, "Couldn't run %s in child process: %s",
+ 		argv[0], strerror(errno));
+-      sync_pipe_errmsg_to_parent(1, errmsg, "");
++      sync_pipe_errmsg_to_parent(2, errmsg, "");
+ 
+       /* Exit with "_exit()", so that we don't close the connection
+          to the X server (and cause stuff buffered up by our parent but
+@@ -589,6 +588,7 @@
+     PROCESS_INFORMATION pi;
+     int i;
+ #else
++    char errmsg[1024+1];
+     int sync_pipe[2];                       /* pipe used to send messages from child to parent */
+     enum PIPES { PIPE_READ, PIPE_WRITE };   /* Constants 0 and 1 for PIPE_READ and PIPE_WRITE */
+ #endif
+@@ -678,13 +678,18 @@
+          * Child process - run dumpcap with the right arguments to make
+          * it just capture with the specified capture parameters
+          */
+-        eth_close(1);
+-        dup(sync_pipe[PIPE_WRITE]);
++        dup2(sync_pipe[PIPE_WRITE], 1);
+         eth_close(sync_pipe[PIPE_READ]);
+         execv(argv[0], (gpointer)argv);
+-        *msg = g_strdup_printf("Couldn't run %s in child process: %s",
+-                argv[0], strerror(errno));
+-        return CANT_RUN_DUMPCAP;
++        g_snprintf(errmsg, sizeof errmsg, "Couldn't run %s in child process: %s",
++		   argv[0], strerror(errno));
++        sync_pipe_errmsg_to_parent(1, errmsg, "");
++
++        /* Exit with "_exit()", so that we don't close the connection
++           to the X server (and cause stuff buffered up by our parent but
++           not yet sent to be sent, as that stuff should only be sent by
++           our parent). */
++        _exit(2);
+     }
+ 
+     *read_fd = sync_pipe[PIPE_READ];
diff --git a/net-analyzer/wireshark/files/wireshark-epan_dissectors_packet-diameter.diff b/net-analyzer/wireshark/files/wireshark-epan_dissectors_packet-diameter.diff
deleted file mode 100644
index e71aaba61516..000000000000
--- a/net-analyzer/wireshark/files/wireshark-epan_dissectors_packet-diameter.diff
+++ /dev/null
@@ -1,19 +0,0 @@
---- dissectors/packet-diameter.c.orig	Thu May 12 03:07:06 2005
-+++ dissectors/packet-diameter.c	Thu May 12 02:54:14 2005
-@@ -2022,13 +2022,13 @@
- 		  { "Flags", "diameter.flags", FT_UINT8, BASE_HEX, NULL, 0x0,
- 		    "", HFILL }},
- 		{ &hf_diameter_flags_request,
--		  { "Request", "diameter.flags.request", FT_BOOLEAN, 8, TFS(&flags_set_truth), DIAM_FLAGS_R,
-+		  { "Request ", "diameter.flags.request", FT_BOOLEAN, 8, TFS(&flags_set_truth), DIAM_FLAGS_R,
- 			"", HFILL }},
- 		{ &hf_diameter_flags_proxyable,
--		  { "Proxyable", "diameter.flags.proxyable", FT_BOOLEAN, 8, TFS(&flags_set_truth), DIAM_FLAGS_P,
-+		  { "Proxyable ", "diameter.flags.proxyable", FT_BOOLEAN, 8, TFS(&flags_set_truth), DIAM_FLAGS_P,
- 			"", HFILL }},
- 		{ &hf_diameter_flags_error,
--		  { "Error","diameter.flags.error", FT_BOOLEAN, 8, TFS(&flags_set_truth), DIAM_FLAGS_E,
-+		  { "Error ","diameter.flags.error", FT_BOOLEAN, 8, TFS(&flags_set_truth), DIAM_FLAGS_E,
- 			"", HFILL }},
- 		{ &hf_diameter_flags_T,
- 		  { "T(Potentially re-transmitted message)","diameter.flags.T", FT_BOOLEAN, 8, TFS(&flags_set_truth),DIAM_FLAGS_T,
diff --git a/net-analyzer/wireshark/wireshark-0.99.6.ebuild b/net-analyzer/wireshark/wireshark-0.99.6.ebuild
deleted file mode 100644
index 3e436bce281a..000000000000
--- a/net-analyzer/wireshark/wireshark-0.99.6.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-0.99.6.ebuild,v 1.11 2007/08/02 15:48:29 falco Exp $
-
-WANT_AUTOMAKE="1.9"
-
-inherit autotools libtool flag-o-matic eutils toolchain-funcs
-
-DESCRIPTION="A network protocol analyzer formerly known as ethereal"
-HOMEPAGE="http://www.wireshark.org/"
-SRC_URI="mirror://sourceforge/wireshark/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="adns gtk ipv6 portaudio snmp ssl kerberos threads selinux"
-
-RDEPEND="sys-libs/zlib
-	snmp? ( net-analyzer/net-snmp )
-	gtk? ( >=dev-libs/glib-2.0.4
-		=x11-libs/gtk+-2*
-		x11-libs/pango
-		dev-libs/atk )
-	!gtk? ( =dev-libs/glib-1.2* )
-	ssl? ( dev-libs/openssl )
-	!ssl? (	net-libs/gnutls )
-	net-libs/libpcap
-	dev-libs/libpcre
-	adns? ( net-libs/adns )
-	kerberos? ( virtual/krb5 )
-	portaudio? ( media-libs/portaudio )
-	selinux? ( sec-policy/selinux-wireshark )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.15.0
-	dev-lang/perl
-	sys-devel/bison
-	sys-devel/flex
-	sys-apps/sed"
-
-pkg_setup() {
-	# bug 119208
-	if has_version "<=dev-lang/perl-5.8.8_rc1" && built_with_use dev-lang/perl minimal ; then
-		ewarn "wireshark will not build if dev-lang/perl is compiled with"
-		ewarn "USE=minimal. Rebuild dev-lang/perl with USE=-minimal and try again."
-		ebeep 5
-		die "dev-lang/perl compiled with USE=minimal"
-	fi
-
-	if ! use gtk; then
-		ewarn "USE=-gtk will mean no gui called wireshark will be created and"
-		ewarn "only command line utils are available"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-asneeded.patch
-	eautomake
-	cd epan
-	epatch "${FILESDIR}"/wireshark-except-double-free.diff
-	epatch "${FILESDIR}"/wireshark-epan_dissectors_packet-diameter.diff
-}
-
-src_compile() {
-	# optimization bug, see bug #165340
-	if [[ "$(gcc-version)" == "3.4" ]] ; then
-		elog "Found gcc 3.4, forcing -O3 into CFLAGS"
-		replace-flags -O? -O3
-	else
-		elog "Forcing -O into CFLAGS"
-		replace-flags -O? -O
-	fi
-
-	# see bug #133092
-	filter-flags -fstack-protector
-
-	local myconf
-
-	if use gtk; then
-		einfo "Building with gtk support"
-	else
-		einfo "Building without gtk support"
-		myconf="${myconf} --disable-wireshark"
-		# the asn1 plugin needs gtk
-		sed -i -e '/plugins.asn1/d' Makefile.in || die "sed failed"
-		sed -i -e '/^SUBDIRS/s/asn1//' plugins/Makefile.in || die "sed failed"
-	fi
-
-	#	$(use_with lua) \
-	econf $(use_with ssl) \
-		$(use_enable ipv6) \
-		$(use_with adns) \
-		$(use_with kerberos krb5) \
-		$(use_with snmp net-snmp) \
-		$(use_with portaudio) \
-		$(use_enable gtk gtk2) \
-		$(use_enable threads) \
-		--without-ucd-snmp \
-		--enable-dftest \
-		--enable-randpkt \
-		--sysconfdir=/etc/wireshark \
-		--enable-editcap \
-		--enable-capinfos \
-		--enable-text2pcap \
-		--disable-warnings-as-errors \
-		${myconf} || die "econf failed"
-
-	# fixes an access violation caused by libnetsnmp - see bug 79068
-	use snmp && export MIBDIRS="${D}/usr/share/snmp/mibs"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	insinto /usr/include/wiretap
-	doins wiretap/wtap.h
-
-	dodoc AUTHORS ChangeLog NEWS README*
-
-	insinto /usr/share/icons/hicolor/16x16/apps
-	newins "${S}"/image/hi16-app-wireshark.png wireshark.png
-	insinto /usr/share/icons/hicolor/32x32/apps
-	newins "${S}"/image/hi32-app-wireshark.png wireshark.png
-	insinto /usr/share/icons/hicolor/48x48/apps
-	newins "${S}"/image/hi48-app-wireshark.png wireshark.png
-	make_desktop_entry wireshark "Wireshark" wireshark
-	dosym tshark /usr/bin/tethereal
-	use gtk && dosym wireshark /usr/bin/ethereal
-}
-
-pkg_postinst() {
-	ewarn "Due to a history of security flaws in this piece of software, it may contain"
-	ewarn "more flaws. To protect yourself against malicious damage due to potential"
-	ewarn "flaws in this product, we recommend that you take the following security"
-	ewarn "precautions when running wireshark in an untrusted environment:"
-	ewarn "do not run any longer than you need to;"
-	ewarn "use in a root jail - preferably one that has been hardened with grsec like
-	rootjail protections;"
-	ewarn "use a hardened operating system;"
-	ewarn "do not listen to addition interfaces;"
-	ewarn "if possible, run behind a firewall;"
-	ewarn "take a capture with tcpdump and analyze running wireshark as a least
-	privileged user;"
-	ewarn "and subscribe to wireshark's announce list to be notified of newly discovered
-	vulnerabilities."
-}
diff --git a/net-analyzer/wireshark/wireshark-0.99.6-r1.ebuild b/net-analyzer/wireshark/wireshark-0.99.7-r1.ebuild
index 89d16f15f214..035759c63820 100644
--- a/net-analyzer/wireshark/wireshark-0.99.6-r1.ebuild
+++ b/net-analyzer/wireshark/wireshark-0.99.7-r1.ebuild
@@ -1,13 +1,18 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-0.99.6-r1.ebuild,v 1.3 2007/08/02 15:48:29 falco Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-0.99.7-r1.ebuild,v 1.1 2008/01/10 18:36:34 pva Exp $
 
 WANT_AUTOMAKE="1.9"
 inherit autotools libtool flag-o-matic eutils toolchain-funcs
 
 DESCRIPTION="A network protocol analyzer formerly known as ethereal"
 HOMEPAGE="http://www.wireshark.org/"
-SRC_URI="mirror://sourceforge/wireshark/${P}.tar.bz2"
+
+# _rc versions has different download location.
+[[ -n ${PV#*_rc} && ${PV#*_rc} != ${PV} ]] && {
+SRC_URI="http://www.wireshark.org/download/prerelease/${PN}-${PV/_rc/pre}.tar.gz";
+S=${WORKDIR}/${PN}-${PV/_rc/pre} ; } || \
+SRC_URI="http://www.wireshark.org/download/src/all-versions/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -25,6 +30,7 @@ RDEPEND="sys-libs/zlib
 	!ssl? (	net-libs/gnutls )
 	net-libs/libpcap
 	dev-libs/libpcre
+	sys-libs/libcap
 	adns? ( net-libs/adns )
 	kerberos? ( virtual/krb5 )
 	portaudio? ( media-libs/portaudio )
@@ -50,30 +56,36 @@ pkg_setup() {
 		ewarn "USE=-gtk will mean no gui called wireshark will be created and"
 		ewarn "only command line utils are available"
 	fi
+
+	# Add group for users allowed to sniff.
+	enewgroup wireshark || die "Failed to create wireshark group"
 }
 
 src_unpack() {
 	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-0.99.7-libgcrypt.patch
+	epatch "${FILESDIR}"/${PN}-0.99.7-asneeded.patch
+
 	cd "${S}"/epan
 	epatch "${FILESDIR}"/wireshark-except-double-free.diff
-	epatch "${FILESDIR}"/wireshark-epan_dissectors_packet-diameter.diff
+
 	cd "${S}"
-	epatch "${FILESDIR}"/${P}-gint64-warnings.patch
-	epatch "${FILESDIR}"/${P}-asneeded-r1.patch
-	epatch "${FILESDIR}"/${P}-libgcrypt.patch
-	epatch "${FILESDIR}"/${P}-lm.patch
-	#elibtoolize
+	# http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2012
+	epatch "${FILESDIR}"/${P}-crash-emem.c.patch
+	# http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2177
+	epatch "${FILESDIR}"/${P}-exit.patch
 	AT_M4DIR="${S}/aclocal-fallback"
 	eautoreconf
 }
 
 src_compile() {
-	# optimization bug, see bug #165340
-	if [[ "$(gcc-version)" == "3.4" ]] ; then
+	# optimization bug, see bug #165340, bug #40660
+	if [[ $(gcc-version) == 3.4 ]] ; then
 		elog "Found gcc 3.4, forcing -O3 into CFLAGS"
 		replace-flags -O? -O3
-	else
-		elog "Forcing -O into CFLAGS"
+	elif [[ $(gcc-version) == 3.3 || $(gcc-version) == 3.2 ]] ; then
+		elog "Found <=gcc-3.3, forcing -O into CFLAGS"
 		replace-flags -O? -O
 	fi
 
@@ -101,6 +113,8 @@ src_compile() {
 		$(use_with portaudio) \
 		$(use_enable gtk gtk2) \
 		$(use_enable threads) \
+		--with-libcap \
+		--enable-setuid-install \
 		--without-ucd-snmp \
 		--enable-dftest \
 		--enable-randpkt \
@@ -119,35 +133,40 @@ src_compile() {
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
 
+	for file in /usr/bin/tshark /usr/bin/dumpcap
+	do
+		fowners 0:wireshark ${file}
+		fperms 6550 ${file}
+	done
+
 	insinto /usr/include/wiretap
 	doins wiretap/wtap.h
 
 	dodoc AUTHORS ChangeLog NEWS README*
 
-	insinto /usr/share/icons/hicolor/16x16/apps
-	newins "${S}"/image/hi16-app-wireshark.png wireshark.png
-	insinto /usr/share/icons/hicolor/32x32/apps
-	newins "${S}"/image/hi32-app-wireshark.png wireshark.png
-	insinto /usr/share/icons/hicolor/48x48/apps
-	newins "${S}"/image/hi48-app-wireshark.png wireshark.png
-	make_desktop_entry wireshark "Wireshark" wireshark
-	dosym tshark /usr/bin/tethereal
-	use gtk && dosym wireshark /usr/bin/ethereal
+	if use gtk ; then
+		insinto /usr/share/icons/hicolor/16x16/apps
+		newins image/hi16-app-wireshark.png wireshark.png
+		insinto /usr/share/icons/hicolor/32x32/apps
+		newins image/hi32-app-wireshark.png wireshark.png
+		insinto /usr/share/icons/hicolor/48x48/apps
+		newins image/hi48-app-wireshark.png wireshark.png
+		insinto /usr/share/applications
+		# Wireshark should not be ran as root in KDE.
+		# Bug: http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2127
+		sed -i '/X-KDE-SubstituteUID/d' wireshark.desktop
+		doins wireshark.desktop
+	fi
 }
 
 pkg_postinst() {
-	ewarn "Due to a history of security flaws in this piece of software, it may contain"
-	ewarn "more flaws. To protect yourself against malicious damage due to potential"
-	ewarn "flaws in this product, we recommend that you take the following security"
-	ewarn "precautions when running wireshark in an untrusted environment:"
-	ewarn "do not run any longer than you need to;"
-	ewarn "use in a root jail - preferably one that has been hardened with grsec like
-	rootjail protections;"
-	ewarn "use a hardened operating system;"
-	ewarn "do not listen to addition interfaces;"
-	ewarn "if possible, run behind a firewall;"
-	ewarn "take a capture with tcpdump and analyze running wireshark as a least
-	privileged user;"
-	ewarn "and subscribe to wireshark's announce list to be notified of newly discovered
-	vulnerabilities."
+	echo
+	ewarn "With version 0.99.7, all function calls that require elevated privileges"
+	ewarn "have been moved out of the GUI to dumpcap. WIRESHARK CONTAINS OVER ONE"
+	ewarn "POINT FIVE MILLION LINES OF SOURCE CODE. DO NOT RUN THEM AS ROOT."
+	ewarn
+	ewarn "NOTE: To run wireshark as normal user you have to add yourself into"
+	ewarn "wireshark group. This security measure ensures that only trusted"
+	ewarn "users allowed to sniff your traffic."
+	echo
 }