Version bump. Fixes security vulnerabilities, bug #330479.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 17 insertions, 10 deletions

diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index 007e3a2cdd0b..83f809abee47 100644
--- a/net-analyzer/wireshark/ChangeLog
+++ b/net-analyzer/wireshark/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-analyzer/wireshark
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.238 2010/07/08 20:37:28 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.239 2010/07/30 10:27:15 pva Exp $
+
+*wireshark-1.4.0_rc2 (30 Jul 2010)
+*wireshark-1.2.10 (30 Jul 2010)
+
+  30 Jul 2010; Peter Volkov <pva@gentoo.org> -wireshark-1.2.8-r1.ebuild,
+  +wireshark-1.2.10.ebuild, -wireshark-1.4.0_rc1.ebuild,
+  +wireshark-1.4.0_rc2.ebuild:
+  Version bump. Fixes security vulnerabilities, bug #330479.
 
   08 Jul 2010; Jeroen Roovers <jer@gentoo.org> wireshark-1.2.9.ebuild:
   Stable for PPC (bug #323859).
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 9389e7ebcbba..44ff6ddf8c84 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -5,11 +5,11 @@ AUX wireshark-1.0.5-text2pcap-protos.patch 487 RMD160 20e64be01b281c48516969c508
 AUX wireshark-1.1.2--as-needed.patch 830 RMD160 fd192d107147c65ef52625b51b59a2bf4e2f65c3 SHA1 7a743a42542fa59423870a0205e8ed7aa6bde70e SHA256 34aa27c611021c9a515cc4fed9778148395761bf6f4272130d3e83abcc13a499
 AUX wireshark-1.2.8-zlib-1.2.5-capture.patch 779 RMD160 7440a7d8a04a1b43057fc7c1e29540a49a77ac0f SHA1 01ab94564003bb230f15a637b355fca31774e27e SHA256 936be11853d8eaf846a28be1dce7e098d386fc58d84ed521bc4f6965e387c69d
 AUX wireshark-except-double-free.diff 664 RMD160 2b61f03f5148975f6438351c11de18a500deabc5 SHA1 0239e19ba0ebd2cfb4ab4987a8a4c56646cd9250 SHA256 dc02a5f3e4bdbd128a2ba08f38880358f747661a93ca0b3fe1918c67b255c369
-DIST wireshark-1.2.8.tar.gz 19434341 RMD160 1affc20a741c1a452dac8fcf26ff337bff05e50f SHA1 709e4d272de3f92914e17a65ee58d1a0e19852e9 SHA256 d83158be1cdad86f95fc6ddf513f673ea928de5cc796fa21306b99778a6dfb97
+DIST wireshark-1.2.10.tar.gz 19455912 RMD160 73cd4ecf1b7a6b2b05871b6ab925d24a5fef9912 SHA1 24d0be340a3506db893a21d1d996a65c33619b05 SHA256 4848a48f535f5137c93d47ce33d3ce73d2b0718b3f1f36e5cd4155728800be33
 DIST wireshark-1.2.9.tar.gz 19444904 RMD160 f4c149a9160f9e9dffd74c0d143afd94d1bc784c SHA1 e8a09c1cf432e88ec444afe7886bd2bfd56cfaa6 SHA256 24c1821dcc582bf455f1996c8dfe7ce9f8d4dd0dca0f1f8f61e6a4bc6ecf3b32
-DIST wireshark-1.4.0rc1.tar.bz2 20400088 RMD160 0518fe9acf84867360086acb3dde930f0862dae7 SHA1 35978e507966d18fefcf63f8746dbd31d2cb94ac SHA256 924afcfa5a0309b90e41fb521f55c22407cbe17c0b3e79b890aaa263dba9f8fb
-EBUILD wireshark-1.2.8-r1.ebuild 4627 RMD160 6ffdf01d5bcd52aef81e692ca39fa5931ed38b24 SHA1 78cb79f73d8c1804cbf34e87b7208f24b3101895 SHA256 6871fd79e3678c841e8894c1ec0a7d76f41cac07dee42c23f0bcd3c019935993
+DIST wireshark-1.4.0rc2.tar.bz2 20419902 RMD160 cb20ccd71f5c8bf0abb4edd662306f82932efab7 SHA1 592580662e0c868999d6643a24fc3b9841e05321 SHA256 16fd00e1e120c7f57a8c5c8532f26d77a14ca254c2cb2c4816ec9a0499744f79
+EBUILD wireshark-1.2.10.ebuild 4577 RMD160 093c6c0bbb33fc05f9a8dd9354cf62f3b2990c14 SHA1 a401fd7762db8f319ae4f0506bb8d4652812c867 SHA256 3177a776e41a19e0d04239c064d8bd05c4ae8043da915d1cbc5af508055e801b
 EBUILD wireshark-1.2.9.ebuild 4568 RMD160 b17adf31f9ad2418d1d80ad82b6b36624b597dc8 SHA1 14cb2ce6ff303ea18ddd3cfa35d70a6bc79be1ae SHA256 e24b444c277ec7ac6cdc66fb5ef28761daf71288c86751cbfff17e2bf5382056
-EBUILD wireshark-1.4.0_rc1.ebuild 5722 RMD160 62034e46a80ee732b41e3c655075342aee37dcff SHA1 d8eaf508164d3677a1ca6e8ae90d368271c67c7e SHA256 68f947d07240e3dc45829cc2c6015b73eeecef313f076a35aa5229a19d77452f
-MISC ChangeLog 35021 RMD160 f668faa5fc3a65c4e2b44b549c8c50583cfa1494 SHA1 0f7c96f466b0fdde9271372cd1ead0d10eddcd06 SHA256 c8882600c329b39894a2420a92276446dec574f77775ef4d03034c4101411539
+EBUILD wireshark-1.4.0_rc2.ebuild 5718 RMD160 a483a5a9358833a22c2fa4f70ee50c8d24711788 SHA1 d2ace392ce7d62b358c3be3e441c018ad27ebb19 SHA256 f3511919b978115a8cd41f276d23ed01f9b063bef2074ec3a68107d7358cac04
+MISC ChangeLog 35312 RMD160 35411b0a439993e6f222fbf965c58886da49ae48 SHA1 15d09c0b0e17cb93f00081c386f9b7f6150063c3 SHA256 5edca5fbbf5adb4428447197edc690a01bb04d4a01808f0d8b4363203dffb113
 MISC metadata.xml 2242 RMD160 66dbbb758acc194df17217183b60a56f61fced38 SHA1 4498ea4c0f0f04213fd1cba2fd3de44565058f7d SHA256 2dfaef45c385c37c7ae8af96f5d8c58d9bff8f6186d55be8f2d034ebd0c60869
diff --git a/net-analyzer/wireshark/wireshark-1.2.8-r1.ebuild b/net-analyzer/wireshark/wireshark-1.2.10.ebuild
index f8ce256cc4b6..35b50f427cf5 100644
--- a/net-analyzer/wireshark/wireshark-1.2.8-r1.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.2.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.2.8-r1.ebuild,v 1.6 2010/05/15 16:28:51 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.2.10.ebuild,v 1.1 2010/07/30 10:27:15 pva Exp $
 
 EAPI=2
 inherit autotools libtool flag-o-matic eutils toolchain-funcs
@@ -16,7 +16,7 @@ SRC_URI="http://www.wireshark.org/download/src/${P}.tar.gz"
 
 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 gtk ipv6 lua portaudio gnutls gcrypt geoip zlib kerberos threads profile smi +pcap pcre +caps selinux"
 
 RDEPEND=">=dev-libs/glib-2.4.0:2
@@ -61,7 +61,6 @@ src_prepare() {
 
 	cd "${S}"
 	epatch "${FILESDIR}/${PN}-1.1.2--as-needed.patch"
-	epatch "${FILESDIR}/${P}-zlib-1.2.5-capture.patch"
 	eautoreconf
 }
 
diff --git a/net-analyzer/wireshark/wireshark-1.4.0_rc1.ebuild b/net-analyzer/wireshark/wireshark-1.4.0_rc2.ebuild
index 2813f1e8ee31..fc8b222d18da 100644
--- a/net-analyzer/wireshark/wireshark-1.4.0_rc1.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.4.0_rc2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.4.0_rc1.ebuild,v 1.3 2010/07/03 17:07:55 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.4.0_rc2.ebuild,v 1.1 2010/07/30 10:27:15 pva Exp $
 
 EAPI=2
 PYTHON_DEPEND="python? 2"