Version bump, fixes security issue #302665. Remove old.

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

4 files changed, 11 insertions, 172 deletions

diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index 50f02d49b361..e19d012c95e3 100644
--- a/net-analyzer/wireshark/ChangeLog
+++ b/net-analyzer/wireshark/ChangeLog
@@ -1,6 +1,12 @@
 # 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.209 2010/01/11 04:19:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.210 2010/01/28 17:59:05 pva Exp $
+
+*wireshark-1.2.6 (28 Jan 2010)
+
+  28 Jan 2010; Peter Volkov <pva@gentoo.org> -wireshark-1.2.3.ebuild,
+  -wireshark-1.2.4.ebuild, +wireshark-1.2.6.ebuild:
+  Version bump, fixes security issue #302665. Remove old.
 
   11 Jan 2010; Mike Frysinger <vapier@gentoo.org> wireshark-1.2.3.ebuild,
   wireshark-1.2.4.ebuild, wireshark-1.2.5.ebuild:
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index ac5912a83bb7..51fbc9416d5b 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,24 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 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
 AUX wireshark-1.0.5-text2pcap-protos.patch 487 RMD160 20e64be01b281c48516969c508c04455111de300 SHA1 432751cd931baefba3bd13cfa07c3d9863b7c82e SHA256 991e12325670c81f4927c6dc2b665eb8c8938d8f3f0cdfab58601dd37a00d8a4
 AUX wireshark-1.1.2--as-needed.patch 830 RMD160 fd192d107147c65ef52625b51b59a2bf4e2f65c3 SHA1 7a743a42542fa59423870a0205e8ed7aa6bde70e SHA256 34aa27c611021c9a515cc4fed9778148395761bf6f4272130d3e83abcc13a499
 AUX wireshark-except-double-free.diff 664 RMD160 2b61f03f5148975f6438351c11de18a500deabc5 SHA1 0239e19ba0ebd2cfb4ab4987a8a4c56646cd9250 SHA256 dc02a5f3e4bdbd128a2ba08f38880358f747661a93ca0b3fe1918c67b255c369
-DIST wireshark-1.2.3.tar.gz 19293381 RMD160 c5c195e022b1ec6b950e12b99b93bd91d3916f0f SHA1 cac65da21cd203bf5a4b51f56296ffe30c4b30a3 SHA256 dfe91d6f897b0e59de695789088ecccee0d77bd748b1d12814cc9b781c575fb7
-DIST wireshark-1.2.4.tar.gz 19296833 RMD160 e4f4bcbc7ce9ba7bea37bf6ea5c7174b3fea4fe6 SHA1 c95ca309a86ef44dbb3547d7a070d664a78f49e2 SHA256 ede4ffefd8c47e8560c2b15ad2b555c30eff1ce52a1a3049deb085fa346377ac
 DIST wireshark-1.2.5.tar.gz 19349507 RMD160 ab0c2db7850eb4c8357756efe34eab9e1addba3f SHA1 525b9062674a2951f790a2621ddf14e5cea5be48 SHA256 cf57e63adbdf6902d6a194a7c8c4c7701f25805bfe7918b9b798fa536f46e1fd
-EBUILD wireshark-1.2.3.ebuild 4538 RMD160 2aaf38a8b7ef2dc7fd9c4cd0b158d3317425e8b4 SHA1 92022f7fa615fc8e2d3bc4e1b6f293d93a243047 SHA256 9528aeec25431b3c0193168f675cbc1af92b6792d6e3bb5be19a5a3e3c4a0726
-EBUILD wireshark-1.2.4.ebuild 4555 RMD160 94e93c6aec27295ea0449cb2614fc0c8b60b654e SHA1 ff08434813c7c8e0ccbe1cb5459bd73da27139d2 SHA256 e06c57d60dda8d3bb9f6fa8e5890281a6c76d2c77c62f1b6799c518cdfd38f4c
+DIST wireshark-1.2.6.tar.gz 19381295 RMD160 271a05afbf1701630a6070ecabeabcb842715b12 SHA1 62f5571e4786d3fa0cfc3d528f69a5c431e42d75 SHA256 0788f3424f056c8cbb94fb0eef49cc92ac63a67b122153e3b920cfce8d6e95ab
 EBUILD wireshark-1.2.5.ebuild 4547 RMD160 e6e6dc9ce6131fc38df90ffd8c8aa08404949e4a SHA1 cf07e045017c7ce25b84a513862e5f48ef94b1e1 SHA256 34283bebdc906b17ea6a43ebb6ef6a3bc43f9e685941bbbd37d3c34eeb777756
-MISC ChangeLog 31095 RMD160 4e977e7fb00e44a06c866124b814906c7ead33e5 SHA1 e097bd5fef263b3dfb798814237782eb48e30c02 SHA256 7e9592771dc8776ab28608095e0499d83bfa6db7d4a5e5ec5a6c4553d9ae4eb2
+EBUILD wireshark-1.2.6.ebuild 4552 RMD160 c2f9b146b8c85d9ee2967dfbd748bd1b2c4d09a9 SHA1 36239c600c839c32a2f1e77bc7676f5f2988fa14 SHA256 d019ade61cdfacd1cb731ec2aeaf795677bfe24e1ad9a09c1d68f0817d0e0bc6
+MISC ChangeLog 31305 RMD160 3291505f39c12fb60a872d37b7631b2aa63382c6 SHA1 7f523f079f7a9f0f7272579a7e7688a4e3961882 SHA256 c389d85b0727a30315481aeeed71dd774b0781df1efefbb19b093a4c059d47e2
 MISC metadata.xml 2154 RMD160 01af8905d25e6c387902d30766daedcd37d94e0e SHA1 d68e79d413654ce72c553d508d7aa96f27fe85b5 SHA256 48c540fcec9cf1e5eebe132d7f90e8330b413f4eb6469761a88720eaa6a2233a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iF4EAREIAAYFAktKpv0ACgkQTwhj9JtAlp4mRQEAl3GG7aVyCvXuYsyT6fae+mJ8
-mwEZ42a//8eQx6MNG5sBAJQDphVy18un/f213W81hO395/byanq6/272QI0ovAv6
-=bKvM
------END PGP SIGNATURE-----
diff --git a/net-analyzer/wireshark/wireshark-1.2.3.ebuild b/net-analyzer/wireshark/wireshark-1.2.3.ebuild
deleted file mode 100644
index a5da369b1a81..000000000000
--- a/net-analyzer/wireshark/wireshark-1.2.3.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# 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.3.ebuild,v 1.9 2010/01/11 04:19:50 vapier Exp $
-
-EAPI=2
-inherit autotools libtool flag-o-matic eutils toolchain-funcs
-
-DESCRIPTION="A network protocol analyzer formerly known as ethereal"
-HOMEPAGE="http://www.wireshark.org/"
-
-# _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/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-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
-	zlib? ( sys-libs/zlib )
-	smi? ( net-libs/libsmi )
-	gtk? ( >=x11-libs/gtk+-2.4.0:2
-		x11-libs/pango
-		dev-libs/atk )
-	gnutls? ( net-libs/gnutls )
-	gcrypt? ( dev-libs/libgcrypt )
-	pcap? ( net-libs/libpcap )
-	pcre? ( dev-libs/libpcre )
-	caps? ( sys-libs/libcap )
-	kerberos? ( virtual/krb5 )
-	portaudio? ( media-libs/portaudio )
-	ares? ( >=net-dns/c-ares-1.5 )
-	!ares? ( adns? ( net-libs/adns ) )
-	geoip? ( dev-libs/geoip )
-	lua? ( >=dev-lang/lua-5.1 )
-	selinux? ( sec-policy/selinux-wireshark )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.15.0
-	dev-lang/perl
-	sys-devel/bison
-	sys-devel/flex"
-
-pkg_setup() {
-	if ! use gtk; then
-		ewarn "USE=-gtk will means 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
-}
-
-src_prepare() {
-	cd "${S}"/epan # our hardened toolchain bug...
-	epatch "${FILESDIR}/wireshark-except-double-free.diff"
-
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-1.1.2--as-needed.patch"
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	# 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
-	elif [[ $(gcc-version) == 3.3 || $(gcc-version) == 3.2 ]] ; then
-		elog "Found <=gcc-3.3, forcing -O into CFLAGS"
-		replace-flags -O? -O
-	fi
-
-	if use ares && use adns; then
-		einfo "You asked for both, ares and adns, but we can use only one of them."
-		einfo "c-ares supersedes adns resolver thus using c-ares (ares USE flag)."
-		myconf="$(use_with ares c-ares) --without-adns"
-	else
-		myconf="$(use_with adns) $(use_with ares c-ares)"
-	fi
-
-	# see bug #133092; bugs.wireshark.org/bugzilla/show_bug.cgi?id=1001
-	# our hardened toolchain bug
-	filter-flags -fstack-protector
-
-	# profile and pie are incompatible #292991
-	if use profile; then
-		ewarn "You've enabled the 'profile' USE flag, building PIE binaries is disabled."
-		append-flags $(test-flags-CC -nopie)
-	fi
-
-	# Workaround bug #213705. If krb5-config --libs has -lcrypto then pass
-	# --with-ssl to ./configure. (Mimics code from acinclude.m4).
-	if use kerberos; then
-		case `krb5-config --libs` in
-			*-lcrypto*) myconf="${myconf} --with-ssl" ;;
-		esac
-	fi
-
-	# dumpcap requires libcap, setuid-install requires dumpcap
-	econf $(use_enable gtk wireshark) \
-		$(use_enable profile profile-build) \
-		$(use_with gnutls) \
-		$(use_with gcrypt) \
-		$(use_enable ipv6) \
-		$(use_enable threads) \
-		$(use_with lua) \
-		$(use_with kerberos krb5) \
-		$(use_with smi libsmi) \
-		$(use_with pcap) \
-		$(use_with zlib) \
-		$(use_with pcre) \
-		$(use_with geoip) \
-		$(use_with portaudio) \
-		$(use_with caps libcap) \
-		$(use_enable pcap setuid-install) \
-		--sysconfdir=/etc/wireshark \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	use pcap && fowners 0:wireshark /usr/bin/dumpcap
-	use pcap && fperms 6550 /usr/bin/dumpcap
-
-	insinto /usr/include/wiretap
-	doins wiretap/wtap.h
-
-	# FAQ is not required as is installed from help/faq.txt
-	dodoc AUTHORS ChangeLog NEWS README{,.bsd,.linux,.macos,.vmware} doc/randpkt.txt
-
-	if use gtk; then
-		for c in hi lo; do
-			for d in 16 32 48; do
-				insinto /usr/share/icons/${c}color/${d}x${d}/apps
-				newins image/${c}${d}-app-wireshark.png wireshark.png
-			done
-		done
-		insinto /usr/share/applications
-		doins wireshark.desktop
-	fi
-}
-
-pkg_postinst() {
-	echo
-	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
-}
diff --git a/net-analyzer/wireshark/wireshark-1.2.4.ebuild b/net-analyzer/wireshark/wireshark-1.2.6.ebuild
index e872866e50b3..c6c9f8565349 100644
--- a/net-analyzer/wireshark/wireshark-1.2.4.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.2.6.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.4.ebuild,v 1.2 2010/01/11 04:19:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.2.6.ebuild,v 1.1 2010/01/28 17:59:05 pva Exp $
 
 EAPI=2
 inherit autotools libtool flag-o-matic eutils toolchain-funcs