Stable for x86, wrt bug #445138

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64

4 files changed, 12 insertions, 18 deletions

diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index 70fb2ad0839e..e1589d7a7479 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.417 2012/11/30 16:36:32 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.418 2012/12/03 20:56:38 ago Exp $
+
+  03 Dec 2012;  <ago@gentoo.org> wireshark-1.6.12.ebuild,
+  wireshark-1.8.4.ebuild:
+  Stable for x86, wrt bug #445138
 
   30 Nov 2012; Jeroen Roovers <jer@gentoo.org> wireshark-1.6.12.ebuild,
   wireshark-1.8.4.ebuild:
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index f258a82c874d..e0ed54d9eb49 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX wireshark-1.6.10-CVE-2012-3548.patch 665 SHA256 1eff10af3f07c4342c3fcd20a2f2ba3edd852c93caf7dd85a1588a5cf892667c SHA512 9ce4a836da7369558a3b5e39154ce80b8390b07cd47bd9414df19f1604f82aa91866764e02e16ec6b0f8d5043a43a5b350ab1fea11614ca1da7dfb25fc29f67b WHIRLPOOL 03c35a70b6cc7ffd8cf2a8ddb2f97f42bf56dff69956a3b7bf3166667b4db711704c4e70e766849bed9a355b6a6e5e2eb88f505b0d82f64e59cd1c9c149303df
 AUX wireshark-1.6.6-gtk-pcap.patch 841 SHA256 862c301f450fcb775e3bd907e5a6ca667b5a11b819768b66a7c848c2c3c90d8a SHA512 0ed1bce8b57942de72ee0a8d78ef7cc345ffea512248fa65acd4e8386a5aa61dde14663090578c78f3eee88c7966e8d40aa6d3dce13146c2adf5ed8ded019253 WHIRLPOOL a45a3d04c9823eb149174fbbaaeb5437e525d77da962aa627509941da3119e87d4eef26cb06b1d3534356c4fd1d4bf31bc102dbf8b3f69994a19dba8d730d05f
 AUX wireshark-1.8.1-ldflags.patch 312 SHA256 b4cf259892774b4a72ab90b7ea28fbf3c923993f8f68831627d79a45637f5948 SHA512 a6cae46b7bf1f82977f8c905f109efeb72b1bf7bf9413639dd0c783147070be04efac7ec5ac92c9eda682500c5596cfcb2ade424d7bd85278c7842f5aff2ad98 WHIRLPOOL 0aa07f0d26318d203ea2bfb0369eb4fe57f80958e24f20f8579e218d8c3967effb64461112cf30cd15322cc6ed76c75dac0091781ed4526c091f4cddb40daf29
@@ -15,16 +12,9 @@ DIST wireshark-1.8.3.tar.bz2 24123989 SHA256 83a85ff506b5e2a70f03c49de7af2918024
 DIST wireshark-1.8.4.tar.bz2 24164286 SHA256 cae9ec0cb9fa0b732a76c0f72f8c15d763f8cdc2e389cda2da6c48c24559faac SHA512 4f0b7fd181eb74c5eb03e4b5e74546f9f02aa3d481faed2b08a84d98f4a61d808a86e5348046d66f8333ba8f8921db344c2187a1590117ae4bdc2ff85a96d305 WHIRLPOOL e2d1b7de34cc57342e645fbfa0175edcfc690d52f4ca579a931c4614ce97735ea190fa5e72ad6c9fb766f92ee701d6cf7cbd3c1f63ff8bba1f8b5d9265f2c31e
 EBUILD wireshark-1.6.10-r2.ebuild 6466 SHA256 fa0a4d2f19852240721045b58abe661eaf37c8c9628c6b3a5922771cb440969a SHA512 23a182b2576934ea2a51e0a0db46eff805a0db9b1863f8ad2710e76aa8fed276a22e7742c8985a955a49a8aee4d1db66e2e8f5a199d3a706698f6b41240c2349 WHIRLPOOL 25d142b6f0664d45dbb32b45409eb33b883707d15c083f33eb266558f0f9f712ee8d17dcf4456816aaa58ce977ff151da0ea26369437bb8832042601f3856e46
 EBUILD wireshark-1.6.11.ebuild 6415 SHA256 f2eca4384db45bdeda0c18d3340b8054ee9372af7a86f831dc7c65307303ad26 SHA512 80f52bb4cdfcd783180e94e7bf8d1387efb59ce1b22b1c59f72367ac25136f7bcdf4d85830d24a5c020ef3a3cc4475c308b078da7336b7f7efa178c7dfed01cc WHIRLPOOL d33784df6404f78c1d45f380fef6b2ac880fc1f2eedbedbb26e13c342a2093042257672cdc4d2f05281b7c4cc5805d080dccda052f47e420ff2e3cb734ee4ff4
-EBUILD wireshark-1.6.12.ebuild 6413 SHA256 1d36ba09a9f4c3a605f06caf339c7b9ab113da78669c6addb72e040a139fcb91 SHA512 d3d6a1855734e9eb1e102de69dbfadb841e8e48d3254937d02157defcace6c503fdc281ca6a9e6b901c31a384ca6ede8480fcb2273620cd93fbcefa881f37a0d WHIRLPOOL 250f57ca23273cf34faca700f8030904644cb6bbbdb1ea18b4b3c521e8f99dddb85f68f3edec205c0705ffbb71f2530d256e114b188ec2abb825df4cb61369b4
+EBUILD wireshark-1.6.12.ebuild 6412 SHA256 7a3c4c7cdfdeb09de875cf095be6487a2d1f668bf03b49f408576729bcad09f3 SHA512 5426686a330e26a812750fe3670024b8f72c7f7dc9f5f3706533a343e4458bfda0039ebf2aca6c7717be07874de8078730f65f26ce4af3033aff03efda94b447 WHIRLPOOL ef211646972e5fbe350b37b552e7db81f071820686d948a7567d5f10edc92fceb0d2e7b29562f004bba9ae9d10d89c5539c28a48cec5c30e999e4c435c9f1889
 EBUILD wireshark-1.8.3-r2.ebuild 6855 SHA256 7a3efd9769a0e7c57b688de8f1c33578016e709b49fe07b7d04a09f1eeb61552 SHA512 f628d7ca54621cc81d87b6d3627984d9d28e7185ad28c0f56c1b8a3f02b8d7dcf3a75a918a4cae7c32ea88f285ea7b0488161bd555cd77400c40be689f14b495 WHIRLPOOL 44725173df78c0b5ecce675d1cf524e12e51427ddd153d42f597090f53713629ce153fc91c11a017d27190038f739737d335102fc2205ccace604814bf0930de
 EBUILD wireshark-1.8.3.ebuild 6466 SHA256 71a3227fed20ce9c10f9eb246d9078c3b6886f95f69328a1379df452393ac46c SHA512 3c9df6e2c4d3bdd3f4f1260c8af86f89dcfaa8f440c62d7f1cca34a0d37c0a4bdb86b0c8cec5d64d6c8f863ce3bacf963c02581eeac7f7baf1eb563ba982c183 WHIRLPOOL 49caf5d25fec165e13835e276f1db56504f99edf9b0c7ca2e75fd49066ad7dae224966810f197781d321676188aa6745240fb47784bdad99775da5a305221447
-EBUILD wireshark-1.8.4.ebuild 6804 SHA256 f9db452597ef4c8bbb663f295b66393cd19087b5cf32b83b26eb371fa7308cbe SHA512 68548fa2a84abb6adbdd532986dd37b731e8f4d733e5992c4e95d1762100ad5fdc830972f706723cde5146a7c3394834a8dcefd57404b9cb19a1bfedd4e80bcd WHIRLPOOL e262a8ec0bde285911bdccf18a49c8dfdb65beea71950a86999cb573f5edaecba90eacc969b17c02c8605bc43aa569940156affe572af80326c473abf337041c
-MISC ChangeLog 60760 SHA256 5057e73f5d7b531638c675f4300f0d1d185a887bb7f9fd0d2949f52b0b08bab0 SHA512 8ac65a5507324088a248a65ec375e74b3c1bfbec8a2395975efc4dda758f4ad15ab0de7342b9b0766d0553dbb2d914dfeb607e7f08e3cf2b393844aeeca7b5a9 WHIRLPOOL bbae0076afe9258faf9098f2cea56308e9d88405bfa81927201c5cfe40da8bb7f1e35f1f0f1734df10d1aec7e3f37d598c390052dea1a76ae4802d6f7f3edff0
+EBUILD wireshark-1.8.4.ebuild 6803 SHA256 5b68e826901dcfa87caf8b4cc4266a76f4d05c06e9543f96b3878f1a47d192a8 SHA512 3a557a0c41c9cf85d3649cb393247d494b518894122b780d13a05e3ee662d696895f0ca0abb22b6b8477d9f95764e073dde6d0b3539db28544f6e50b6254522e WHIRLPOOL c99d5e82bf43471d57c4640eb8c646fce03e72e1c43ebe7b3b0755942cb49d64edfb2370b2142c3d8161fab38fb8138daa3b665958934153431d09492533c3e8
+MISC ChangeLog 60879 SHA256 bbbb20894252e3a2b21b8cde11686d03e92169c25e489a478f7f447ce4fe2818 SHA512 9a520b73261b05831f950f0ac4df7e72a7a2b836a60e8826c02cff92f1f6ee8839e4788bb3111113405e5d3f2fb48660482787adae19a6cbe53f974ebc4e46eb WHIRLPOOL c3ec43a88b6d16633758f838ebdf8a094f60ade306d1ecb626f723dee5c6cdafd69378d61f890800068ce9e03c2be91f37fb50c3dc775a20fad312924d37d98e
 MISC metadata.xml 2589 SHA256 5a4eeb9572df6946a2b3ffbb5f5f4955cfd709ccb79cd23ec6aed41f49b60dab SHA512 bc027bd22193d1a613f26fe30265f5fac0f22cac0c1ed8cfa148fa6bf7c4a4777c76cbaeea5f5f19591d8c78695d13eb29cc00f225c2b44ad1d8a63a8881bafe WHIRLPOOL 5596bd3eb91bdbb1fd9ac2386d72e6a038c3966ad53a81889fc6d4bf32b2ffe75b8f55fdf84a7a84ff2b7b2dcddcaf0dc889ea6595537796ca30e7e5e11494bd
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iEYEAREIAAYFAlC44JEACgkQVWmRsqeSphMQDwCfQe3hYVZxg1KWi2n2IfcXFF4V
-3ZYAni2uFTCI0mZTodEFFDKj2UjFGQSy
-=Fd0Y
------END PGP SIGNATURE-----
diff --git a/net-analyzer/wireshark/wireshark-1.6.12.ebuild b/net-analyzer/wireshark/wireshark-1.6.12.ebuild
index 64939fd9e782..0a5bd6f42b97 100644
--- a/net-analyzer/wireshark/wireshark-1.6.12.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.6.12.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.6.12.ebuild,v 1.3 2012/11/30 16:36:32 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.6.12.ebuild,v 1.4 2012/12/03 20:56:38 ago Exp $
 
 EAPI=4
 PYTHON_DEPEND="python? 2"
@@ -13,7 +13,7 @@ SRC_URI="http://www.wireshark.org/download/src/all-versions/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="
 	adns doc doc-pdf gtk ipv6 libadns lua gcrypt geoip kerberos profile
 	+pcap portaudio python +caps selinux smi ssl threads zlib
diff --git a/net-analyzer/wireshark/wireshark-1.8.4.ebuild b/net-analyzer/wireshark/wireshark-1.8.4.ebuild
index f175a2067e45..bbca5d705d16 100644
--- a/net-analyzer/wireshark/wireshark-1.8.4.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.8.4.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.4.ebuild,v 1.3 2012/11/30 16:36:32 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.8.4.ebuild,v 1.4 2012/12/03 20:56:38 ago Exp $
 
 EAPI="4"
 PYTHON_DEPEND="python? 2"
@@ -13,7 +13,7 @@ SRC_URI="http://www.wireshark.org/download/src/all-versions/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="
 	adns +caps doc doc-pdf geoip gtk crypt ipv6 kerberos libadns lua +pcap
 	portaudio profile python selinux smi ssl zlib