Stable for AMD64, wrt security bug #389255

Package-Manager: portage-2.1.10.40/cvs/Linux i686

3 files changed, 16 insertions, 9 deletions

diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index 455892a41d5c..da952b814482 100644
--- a/net-analyzer/wireshark/ChangeLog
+++ b/net-analyzer/wireshark/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/wireshark
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.322 2011/12/13 15:01:55 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.323 2011/12/14 17:21:14 ago Exp $
+
+  14 Dec 2011; Agostino Sarubbo <ago@gentoo.org> wireshark-1.6.4.ebuild:
+  Stable for AMD64, wrt security bug #389255
 
   13 Dec 2011; Jeroen Roovers <jer@gentoo.org> wireshark-1.6.4.ebuild:
   Stable for HPPA (bug #389255).
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 61727434c8a6..d4358440e54d 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX wireshark-1.6.4-build.patch 396 RMD160 fa909e374c80f0c637a459750d305cd636e7e18a SHA1 825cb721d7d30cfdec5f53e0b38fa7ee8891ec20 SHA256 8648c0eda8fd4393d4b0513c4d6673d0568b7341f920e55e7ebe7391d1e3b430
 AUX wireshark-1.6.4-doc-build.patch 501 RMD160 65ea45bc7014c5f0bb556b3c964c45d2b0d2f582 SHA1 ea7c00ed98613581791c7c9e53f009efee5e6c08 SHA256 2ae9ad7ce2ceb1b7a2430ae71d04cdb4f9173d74e0d67667965226d8f43d1945
@@ -8,13 +8,17 @@ DIST wireshark-1.6.2.tar.bz2 21408664 RMD160 e343d9bb5600b236dea708bb68ecad805a9
 DIST wireshark-1.6.4.tar.bz2 21464517 RMD160 9437c416a5963aee1c049c0275bdfd3edd7488e8 SHA1 8abd7681e8c05841b7cf31d5dc83c1092c54e79f SHA256 7f98191f53d375f020312a99a9747ff3b846ac4029af4027fc883f685fabef5d
 EBUILD wireshark-1.4.9.ebuild 6308 RMD160 1cc754917fc9fa2b67dcde05296c031c5b3dbc58 SHA1 40233e735c52457737c555fe196ac92a9b5780de SHA256 d968bdf0343ff49a3809dfc995233ce612662bc0903afa641b3e4fb9bf18d1f5
 EBUILD wireshark-1.6.2.ebuild 6315 RMD160 7bd88e4d7009dee6cc65d2e2a0ccb7411804f49e SHA1 c24b9b04671fb26c508185997ff11ca2a10ac4b4 SHA256 1eee0327c11708795aaac2af165f31bb0ee8039a1698b58ecf07f421f6551a1d
-EBUILD wireshark-1.6.4.ebuild 6486 RMD160 5a95ee3e390dbe00a28353f8a4dde0a7db9698a9 SHA1 7302fab203270fd08e11b2b579b8b1952ac473b4 SHA256 2ad2fb773501bd3075187b7892f0d0a0da057b7d26e431b1e22fae4b9ac519bb
-MISC ChangeLog 47072 RMD160 65d80595e09a6fc757c84630691fac70f00344be SHA1 02aa65a0d9ebebf357b7a72a028363456feb5576 SHA256 b256b4d8f977693b2f3bec14f4c89cecdf99f96e0d14b2a0184321e34ed271c0
+EBUILD wireshark-1.6.4.ebuild 6485 RMD160 7fb660970ff93ccb2460d84709828c0de6224d53 SHA1 be76b600c00e615662880b4cc1567857a120dab5 SHA256 ad3ae578e5b3a623f1d5d126a120024a13a115686ed52201ba75fa4e7c9a6f04
+MISC ChangeLog 47191 RMD160 8ac8e8cc228e848148eb5ed386547970a3ea6051 SHA1 de1ba29c68e7c879bee1b7528382f951ddd630aa SHA256 aafa7343480296585848799823df136de0c1a2f6f5a79b69ae448511c570efd4
 MISC metadata.xml 2242 RMD160 66dbbb758acc194df17217183b60a56f61fced38 SHA1 4498ea4c0f0f04213fd1cba2fd3de44565058f7d SHA256 2dfaef45c385c37c7ae8af96f5d8c58d9bff8f6186d55be8f2d034ebd0c60869
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk7naOkACgkQVWmRsqeSphOmjwCfQY5Dn41j2DIau/KvMZHbCJdS
-8lIAn19xKX8gPeRu0OYgRzf4U8kc++GB
-=Hdvh
+iQEcBAEBCgAGBQJO6NspAAoJEOTDgjZ80txdgN8IAITSgJ51KZ9vmCRz3jlcou3t
+f0afimDXqFgsx2Dx+5RgPjZGD8+pWj9TISKPbIB27OxbB8Q2l9dXelr9w6UhJ8Zt
+k6GVs/cAPQleFMFZFdQdcQncssNj45A7fR9CtBH/u/u3GzEOvD1jY45jG6sf3mS8
+Dappi0PxTHf5Ins9hthWwKkvdbRGGkXJXTKbAvjrDOZeBSRJzt75M5Q2ljk06XkS
+HU5JfMYX9glQkMlDpo6kfYexo49On5iHxoisZ2C9s9ba5+lyAEIU+JXz8Pw96pK/
+QkEgcr6Y9DyBWmsuSc1sle9IDZuyYgCDOvwfgYKFMZ/vwA/fAEnm1JP7SDdosw8=
+=5fqa
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/wireshark/wireshark-1.6.4.ebuild b/net-analyzer/wireshark/wireshark-1.6.4.ebuild
index 0918d221ef35..2b7f6007e399 100644
--- a/net-analyzer/wireshark/wireshark-1.6.4.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.6.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.6.4.ebuild,v 1.3 2011/12/13 15:01:55 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.6.4.ebuild,v 1.4 2011/12/14 17:21:14 ago Exp $
 
 EAPI="3"
 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 ares doc doc-pdf gtk ipv6 lua gcrypt geoip kerberos
 profile +pcap portaudio python +caps selinux smi ssl threads zlib"