Version bump, fixes security bug #264571, thank Robert Buchholz for report.

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

4 files changed, 13 insertions, 169 deletions

diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index d94122d03295..fb57f551091f 100644
--- a/net-analyzer/wireshark/ChangeLog
+++ b/net-analyzer/wireshark/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/wireshark
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.160 2009/04/02 17:19:33 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.161 2009/04/09 12:19:30 pva Exp $
+
+*wireshark-1.0.7 (09 Apr 2009)
+
+  09 Apr 2009; Peter Volkov <pva@gentoo.org> -wireshark-1.0.6.ebuild,
+  +wireshark-1.0.7.ebuild, -wireshark-1.1.2.ebuild:
+  Version bump, fixes security bug #264571, thank Robert Buchholz for report.
 
   02 Apr 2009; Raúl Porcel <armin76@gentoo.org> wireshark-1.0.6-r1.ebuild:
   alpha/ia64 stable wrt #263443
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 543c17c8e712..dbed76edb1e0 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -7,11 +7,10 @@ AUX wireshark-1.1.2-misc-warnings.patch 823 RMD160 20a13891425581b1799c38d946128
 AUX wireshark-1.1.3-misc-warnings.patch 390 RMD160 a3128e2d7a34478999611e6b30d38732e95ffdc8 SHA1 c539da3e579e67eeb2721251efa26412d1d4d091 SHA256 c97cb7ab34552ceb077bb77c1772a7931201728c984ab60d2f1488ef87fb90fe
 AUX wireshark-except-double-free.diff 664 RMD160 2b61f03f5148975f6438351c11de18a500deabc5 SHA1 0239e19ba0ebd2cfb4ab4987a8a4c56646cd9250 SHA256 dc02a5f3e4bdbd128a2ba08f38880358f747661a93ca0b3fe1918c67b255c369
 DIST wireshark-1.0.6.tar.bz2 13161721 RMD160 5037c3c5f38c914233f064efb3dbe409896b3e0b SHA1 1aa726e32905a2815d01a9f33df84a873b11c7ef SHA256 7b4adacd86ba9f1c6a3a0dc74303d03635cd361c23c312ff9698e0c2a44b9f0d
-DIST wireshark-1.1.2.tar.gz 18365823 RMD160 19898543f9d7d7544a5547f823b7d8bdd6d01b48 SHA1 e02a4344a14ad508d99add35ab2cdca5786e7fa2 SHA256 a4f91012c8e2aff275dc6463389d118aa29898e8b488e2fc7de0f5ff19414e3b
+DIST wireshark-1.0.7.tar.bz2 13289668 RMD160 cd52704cde4afe57cccb09733c7f0ddfef2363e9 SHA1 ac7253ed010ffe8075de21fde362bb162b59f279 SHA256 dc6d7ce1d9fd576fc75f79c2e541786f33706c03996ab93e5c0056b74bca0021
 DIST wireshark-1.1.3.tar.gz 18464158 RMD160 9964a6c45569335677b37a4c70637cb3fa93e91e SHA1 38653f4412a948d967eddad33dbba3751290a30a SHA256 410f19fbe262a49174f582934617adb3dfc82a25875780ba929e82d8087a5648
 EBUILD wireshark-1.0.6-r1.ebuild 4972 RMD160 729e2107969c5c547a07d1061b51a7754269e1d5 SHA1 92a7b30e60956b1b749a1c4f881a287a70f4123c SHA256 7ca3a42dac293a8f3814f3e9704b1204f45a2df635ff92a5ee8bcc49c9227135
-EBUILD wireshark-1.0.6.ebuild 4914 RMD160 e29be00f32294c15955363b9c461fba4a93fd7d3 SHA1 4d9ab33ff92381fac491ee5f7c3995a4960c017c SHA256 acd29f468048d786c9333d0d9e3bcdb724b0b9c333863d6d14c06a0e1a527d38
-EBUILD wireshark-1.1.2.ebuild 4851 RMD160 712a966e02e961b9f0f887f8d73c9caf6cf46765 SHA1 fe373fdabb30d0e5123cdc2cbffb33709dc99886 SHA256 91db019b685ec0e6b177f775728f79de28017145d4bcc2d1c4df222b21aa5077
+EBUILD wireshark-1.0.7.ebuild 4973 RMD160 17d076c01188634473b7f15dba947fe46c9c3e60 SHA1 3e358347951aad72028ff2375294d8e0184b32d1 SHA256 b74305aa3e1e063298c506eb2b570303c64fbbbe5bbd7a8a98e91059bddc78c5
 EBUILD wireshark-1.1.3.ebuild 4831 RMD160 7d69b0eadc2ff12764ca2340ecbfb27c9f36d6cc SHA1 ab2f14430ca086310a9c20755d3f786d773e6f83 SHA256 ce0a3bbb57e2e4ad84bef57ca6e28e2f4747564d5462926ef64202af8dc841e5
-MISC ChangeLog 24520 RMD160 393dd0315f24bcb7106844e342994791331f003e SHA1 d14f1f4a3aef1335d121bf1c62a2d3b8b232ba20 SHA256 42701175c7ac0a58fbf398857fe038570c31ee0c66aa8af0c51e25d6252b886c
+MISC ChangeLog 24749 RMD160 9dd8396775f76804b4d91dc277d844259e824831 SHA1 af7798d291f85a90052d0ef387ed4582fed5234b SHA256 05492561ca1fd33d9dce05808ded744b888080f1d41c20708fe06ab416876dbc
 MISC metadata.xml 2154 RMD160 01af8905d25e6c387902d30766daedcd37d94e0e SHA1 d68e79d413654ce72c553d508d7aa96f27fe85b5 SHA256 48c540fcec9cf1e5eebe132d7f90e8330b413f4eb6469761a88720eaa6a2233a
diff --git a/net-analyzer/wireshark/wireshark-1.0.6.ebuild b/net-analyzer/wireshark/wireshark-1.0.7.ebuild
index 652de7819b03..2ea2d53f2767 100644
--- a/net-analyzer/wireshark/wireshark-1.0.6.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.0.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.0.6.ebuild,v 1.7 2009/02/11 17:14:37 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.0.7.ebuild,v 1.1 2009/04/09 12:19:30 pva Exp $
 
 EAPI=1
 WANT_AUTOMAKE="1.9"
@@ -17,7 +17,7 @@ SRC_URI="http://www.wireshark.org/download/src/all-versions/${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 gtk ipv6 lua portaudio gnutls gcrypt zlib kerberos threads profile smi +pcap pcre +caps selinux"
 
 RDEPEND="zlib? ( sys-libs/zlib )
@@ -61,6 +61,7 @@ src_unpack() {
 	epatch "${FILESDIR}/${PN}-0.99.7-asneeded.patch"
 	epatch "${FILESDIR}/${PN}-0.99.8-as-needed.patch"
 	epatch "${FILESDIR}/${PN}-1.0.5-text2pcap-protos.patch"
+	epatch "${FILESDIR}/wireshark-1.0-sigpipe.patch" #260457
 
 	cd "${S}/epan"
 	epatch "${FILESDIR}/wireshark-except-double-free.diff"
diff --git a/net-analyzer/wireshark/wireshark-1.1.2.ebuild b/net-analyzer/wireshark/wireshark-1.1.2.ebuild
deleted file mode 100644
index 12a7a0632a82..000000000000
--- a/net-analyzer/wireshark/wireshark-1.1.2.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.1.2.ebuild,v 1.2 2009/03/08 11:54:00 pva Exp $
-
-EAPI=1
-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
-
-	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
-
-	# Add group for users allowed to sniff.
-	enewgroup wireshark
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# our hardened toolchain bug...
-	cd "${S}"/epan
-	epatch "${FILESDIR}/wireshark-except-double-free.diff"
-
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-1.1.2--as-needed.patch"
-	epatch "${FILESDIR}/${P}-misc-warnings.patch"
-	eautoreconf
-}
-
-src_compile() {
-	# 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
-
-	# see bug #133092; bugs.wireshark.org/bugzilla/show_bug.cgi?id=1001
-	# our hardened toolchain bug
-	filter-flags -fstack-protector
-
-	# profile and -fomit-frame-pointer are incompatible, bug #215806
-	use profile && filter-flags -fomit-frame-pointer
-
-	# 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}
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	fowners 0:wireshark /usr/bin/tshark
-	fperms 6550 /usr/bin/tshark
-	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 "With version 0.99.7, all function calls that require elevated privileges"
-	ewarn "have been moved out of the GUI to dumpcap. WIRESHARK CONTAINS OVER ONE"
-	ewarn "POINT FIVE MILLION LINES OF SOURCE CODE. DO NOT RUN THEM AS ROOT."
-	ewarn
-	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
-}