Version bump, fixes security bug 363895, thank Tim Sammut for report. Upstream fixed bug 358097, thank Agostino Sarubbo for report. Drop old.

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

3 files changed, 16 insertions, 20 deletions

diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index 1b823c74ca03..802b6e485aeb 100644
--- a/net-analyzer/wireshark/ChangeLog
+++ b/net-analyzer/wireshark/ChangeLog
@@ -1,6 +1,13 @@
 # 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.281 2011/03/13 11:23:51 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.282 2011/04/17 13:16:36 pva Exp $
+
+*wireshark-1.4.5 (17 Apr 2011)
+
+  17 Apr 2011; Peter Volkov <pva@gentoo.org> -wireshark-1.4.3.ebuild,
+  +wireshark-1.4.5.ebuild:
+  Version bump, fixes security bug 363895, thank Tim Sammut for report.
+  Upstream fixed bug 358097, thank Agostino Sarubbo for report. Drop old.
 
   13 Mar 2011; Kacper Kowalik <xarthisius@gentoo.org> wireshark-1.4.4.ebuild:
   ppc/ppc64 stable wrt #354197
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 732bc2321a1c..39be9467bfcf 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX wireshark-0.99.7-asneeded.patch 339 RMD160 faa516dd3dfd8bd6218f66d3bedb5490b0896f5b SHA1 ec2b8952f8fe55471e923c086a6e9b48e06ce7a8 SHA256 9fc8b3ec3fcf1cca714c78c28c1883503abfcfce4fe175e43c6d7ec14ddc9478
 AUX wireshark-0.99.8-as-needed.patch 395 RMD160 2e06f641e9789db717544bfd1568e4bf6e85855c SHA1 a18b6fcc85b40c00fc1d30bcdfc81d13dc33e904 SHA256 d2f996a79fa3117296b25c10a1d4a3f0f8027a678de4e37e6c60bfb47a4754b9
 AUX wireshark-1.0-sigpipe.patch 850 RMD160 a240a1317681516d207ca1694b0e44584008530b SHA1 8f127c22daa77ce9f658f3b1d3f897e428ee9dde SHA256 3a5130838a48b65cb21b4e25913347cee05689b4641c1dfb407facf9fa4f9f59
@@ -8,18 +5,9 @@ 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.4.3.tar.bz2 20469021 RMD160 6a63023f165b2e875296340f6a57595427a13fe7 SHA1 776c757e6a6a085232ac843ec28b026bf4ca9c8d SHA256 3ec9b709ea0e2b26c4d5869374a9013a5c7ca4493f2a2a64640824c5a477eda6
 DIST wireshark-1.4.4.tar.bz2 20479081 RMD160 47f9274cd6933684339b4c7c0b7c723d8c9b1512 SHA1 4d1d7e7bf07683723b661eb7b7124b2e90106087 SHA256 6033e627c40ac4eec7e95c03728b497ee2bc5851af8c9e58bb89b7496717dc0d
-EBUILD wireshark-1.4.3.ebuild 6317 RMD160 ce8d4d0f5a63cb998be040f4566339353aa210d2 SHA1 bb4d8497fc259646b28c23755e345b357c66128f SHA256 a3dc149c3c6f866250dd4b4e9553beaa18a8378806daebd05d4dceeba02aeae6
+DIST wireshark-1.4.5.tar.bz2 20501797 RMD160 c6e66948c6a6573c85e0812cbd57845d08cc455d SHA1 3cb627ed61045799e419fbc3735000e1a59a1243 SHA256 d386353162269b12e749496680fdb826bf17cffdd55677e6b7b7fb59fa7f685f
 EBUILD wireshark-1.4.4.ebuild 6421 RMD160 1fbf49245dd450987856071934644cf22ced3920 SHA1 71a83f0e0309cedfd22fbfb8b29a4cac32508bfb SHA256 e0d6357ba32e47652a5b315f955a4e67ae63c2e504d50749804b2d3dd0441ef9
-MISC ChangeLog 40940 RMD160 351b82b0e40a9dbef9fa2fee9dcdf9e5297c39e4 SHA1 9fef12f9ed5627eb57e4954b35946084b167e33e SHA256 06eda36173fa6923737b8f1ba83d3c3652db1c941cda425e699b00064d0e8910
+EBUILD wireshark-1.4.5.ebuild 6422 RMD160 a4a7dfde886aa0f5fcfb4a714c54efa5a71fdb6c SHA1 0218cb27308cb4c2b1567ae85cebb084accbee8d SHA256 37888dc36ec237ddf7f7e478e54c4ff3a30699e3a17c681abf6f4fe81e7cea8e
+MISC ChangeLog 41209 RMD160 13497eda86b0dfa33b3aa08b0d614d2e6c8993be SHA1 9dd79eddb93b3515eb939904f1d3ac780b993186 SHA256 6b4b406879968058da7bcf24338e2861cf84107fd77f29d02b642f05ef37ac36
 MISC metadata.xml 2242 RMD160 66dbbb758acc194df17217183b60a56f61fced38 SHA1 4498ea4c0f0f04213fd1cba2fd3de44565058f7d SHA256 2dfaef45c385c37c7ae8af96f5d8c58d9bff8f6186d55be8f2d034ebd0c60869
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iJwEAQECAAYFAk18qVIACgkQIiMqcbOVdxTVMQP9GnKUtUa6H3+CMnv99Hkdk4Rh
-gPP+owd3VBOvKDMOdCCKiHTwRGXffcwSeRt1p3quN9a/6dtUybZm1W9TPJ35V4YR
-M+f9B+mOvdOi5/mHbzzxWVT3BzCRWs25jXBMnR8bSnqfJefO42YP5pB7cR1xfw3q
-10Htktv3VjVFFxpGg7I=
-=iNQv
------END PGP SIGNATURE-----
diff --git a/net-analyzer/wireshark/wireshark-1.4.3.ebuild b/net-analyzer/wireshark/wireshark-1.4.5.ebuild
index e22997a655a7..59d0842e9822 100644
--- a/net-analyzer/wireshark/wireshark-1.4.3.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.4.5.ebuild
@@ -1,8 +1,8 @@
 # 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.4.3.ebuild,v 1.8 2011/01/29 13:33:36 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.4.5.ebuild,v 1.1 2011/04/17 13:16:36 pva Exp $
 
-EAPI=2
+EAPI="3"
 PYTHON_DEPEND="python? 2"
 inherit libtool flag-o-matic eutils toolchain-funcs python
 
@@ -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 pcre portaudio python +caps selinux smi ssl threads zlib"
 
@@ -41,7 +41,6 @@ RDEPEND=">=dev-libs/glib-2.14.0:2
 DEPEND="${RDEPEND}
 	doc? ( dev-libs/libxslt
 		dev-libs/libxml2
-		www-client/elinks
 		app-doc/doxygen
 		doc-pdf? ( dev-java/fop ) )
 	>=dev-util/pkgconfig-0.15.0
@@ -123,6 +122,7 @@ src_configure() {
 	# profile and pie are incompatible #215806, #292991
 	if use profile; then
 		ewarn "You've enabled the 'profile' USE flag, building PIE binaries is disabled."
+		ewarn "Also ignore \"unrecognized option '-nopie'\" gcc warning #358101."
 		append-flags $(test-flags-CC -nopie)
 	fi
 
@@ -202,6 +202,7 @@ src_install() {
 		done
 		domenu wireshark.desktop || die
 	fi
+	chmod o-x "${ED}"/usr/bin/dumpcap #357237
 }
 
 pkg_postinst() {