tshark should not be suid, bug #268324, thank Wolfgang Goetz for report. Remove old.

Package-Manager: portage-2.2_rc33/cvs/Linux i686

5 files changed, 11 insertions, 178 deletions

diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index 435bf2ff0a08..b8928f95c03c 100644
--- a/net-analyzer/wireshark/ChangeLog
+++ b/net-analyzer/wireshark/ChangeLog
@@ -1,6 +1,11 @@
 # 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.165 2009/04/11 04:57:38 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.166 2009/05/04 16:24:10 pva Exp $
+
+  04 May 2009; Peter Volkov <pva@gentoo.org> -wireshark-1.0.6-r1.ebuild,
+  wireshark-1.0.7, wireshark-1.1.3:
+  tshark should not be suid, bug #268324, thank Wolfgang Goetz for report.
+  Remove old.
 
   11 Apr 2009; Jeroen Roovers <jer@gentoo.org> wireshark-1.0.7.ebuild:
   Stable for HPPA (bug #264571).
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 4d11862422b8..56e6f54c7744 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -6,11 +6,9 @@ AUX wireshark-1.1.2--as-needed.patch 830 RMD160 fd192d107147c65ef52625b51b59a2bf
 AUX wireshark-1.1.2-misc-warnings.patch 823 RMD160 20a13891425581b1799c38d946128fd4f5293358 SHA1 19b70ea3eb86085d8292a461e4f50506a2b9c01e SHA256 3dd5bda276b072ebe44f4e4973e517149149e2b7efadcca2a0eb6c03f9a0fb4c
 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.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.7.ebuild 4965 RMD160 23865f7bd90a55293aac874dda7ec7418f97e46c SHA1 cb7aec046e08fbabc54297ba942e1ca7abe589b4 SHA256 cb47dda58ec76aa98ec04d43f43d1ed010f5cb4307219ddc0635c6f7da495f4d
-EBUILD wireshark-1.1.3.ebuild 4831 RMD160 7d69b0eadc2ff12764ca2340ecbfb27c9f36d6cc SHA1 ab2f14430ca086310a9c20755d3f786d773e6f83 SHA256 ce0a3bbb57e2e4ad84bef57ca6e28e2f4747564d5462926ef64202af8dc841e5
-MISC ChangeLog 25219 RMD160 cfebfdc20f3ab652576c4e53be878cff1d231b4b SHA1 9a0bfc5bed9079892b30ef181d5e81b3a1215efc SHA256 4243221935f9b66e8ecc4a36e963d13d1a2692a9cd6e851755c255a957e64daf
+EBUILD wireshark-1.0.7.ebuild 4899 RMD160 88ab930995e3b4f4137a4bcb56f54aabd55d257d SHA1 90cbd620caae933683f28dedacb124b7b11b9b5b SHA256 5836fa8133ce4014c883bacc99a31d69063bff3a0664cc8487bdd5dbc32a46d8
+EBUILD wireshark-1.1.3.ebuild 4765 RMD160 755db1e745be419ffb2010c66290182f326a6f41 SHA1 2c00231fafafc2d0949b06a2982803f4f156c5e7 SHA256 5a542eb77700a24b48a16a8c18af3e2a3bd8519b371789b005359bfa10391714
+MISC ChangeLog 25418 RMD160 6e110d3b72f298e887d863e86886f1b63354a9aa SHA1 d0c8dd86de2bd66564e9d0df101b1fcc8039980c SHA256 37b44371e9ac1200014c1d83d94c5dd7112488ae9d37f98a6ef05f917d53bfb2
 MISC metadata.xml 2154 RMD160 01af8905d25e6c387902d30766daedcd37d94e0e SHA1 d68e79d413654ce72c553d508d7aa96f27fe85b5 SHA256 48c540fcec9cf1e5eebe132d7f90e8330b413f4eb6469761a88720eaa6a2233a
diff --git a/net-analyzer/wireshark/wireshark-1.0.6-r1.ebuild b/net-analyzer/wireshark/wireshark-1.0.6-r1.ebuild
deleted file mode 100644
index 2eee7cf27a1c..000000000000
--- a/net-analyzer/wireshark/wireshark-1.0.6-r1.ebuild
+++ /dev/null
@@ -1,166 +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.0.6-r1.ebuild,v 1.6 2009/04/02 17:19:33 armin76 Exp $
-
-EAPI=1
-WANT_AUTOMAKE="1.9"
-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/all-versions/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-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 )
-	smi? ( net-libs/libsmi )
-	gtk? ( >=dev-libs/glib-2.0.4
-		=x11-libs/gtk+-2*
-		x11-libs/pango
-		dev-libs/atk )
-	!gtk? ( =dev-libs/glib-1.2* )
-	gnutls? ( net-libs/gnutls )
-	gcrypt? ( dev-libs/libgcrypt )
-	pcap? ( net-libs/libpcap )
-	pcre? ( dev-libs/libpcre )
-	caps? ( sys-libs/libcap )
-	adns? ( net-libs/adns )
-	kerberos? ( virtual/krb5 )
-	portaudio? ( media-libs/portaudio )
-	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 mean 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 || die "Failed to create wireshark group"
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	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"
-
-	cd "${S}"
-	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
-
-	local myconf
-	if use gtk; then
-		einfo "Building with gtk support"
-	else
-		einfo "Building without gtk support"
-		myconf="${myconf} --disable-wireshark"
-	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 gtk2) \
-		$(use_enable profile profile-build) \
-		$(use_with gnutls) \
-		$(use_with gcrypt) \
-		$(use_enable gtk wireshark) \
-		$(use_enable ipv6) \
-		$(use_enable threads) \
-		$(use_with lua) \
-		$(use_with adns) \
-		$(use_with kerberos krb5) \
-		$(use_with smi libsmi) \
-		$(use_with pcap) \
-		$(use_with zlib) \
-		$(use_with pcre) \
-		$(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
-		insinto /usr/share/icons/hicolor/16x16/apps
-		newins image/hi16-app-wireshark.png wireshark.png
-		insinto /usr/share/icons/hicolor/32x32/apps
-		newins image/hi32-app-wireshark.png wireshark.png
-		insinto /usr/share/icons/hicolor/48x48/apps
-		newins image/hi48-app-wireshark.png wireshark.png
-		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
-}
diff --git a/net-analyzer/wireshark/wireshark-1.0.7.ebuild b/net-analyzer/wireshark/wireshark-1.0.7.ebuild
index f60be370be1b..39638ec29f46 100644
--- a/net-analyzer/wireshark/wireshark-1.0.7.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.7.ebuild,v 1.5 2009/04/11 04:57:38 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.0.7.ebuild,v 1.6 2009/05/04 16:24:10 pva Exp $
 
 EAPI=1
 WANT_AUTOMAKE="1.9"
@@ -130,8 +130,6 @@ src_compile() {
 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
 
diff --git a/net-analyzer/wireshark/wireshark-1.1.3.ebuild b/net-analyzer/wireshark/wireshark-1.1.3.ebuild
index c9bd12b15ebe..40ed87ad831a 100644
--- a/net-analyzer/wireshark/wireshark-1.1.3.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.1.3.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.1.3.ebuild,v 1.1 2009/03/24 08:39:35 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.1.3.ebuild,v 1.2 2009/05/04 16:24:10 pva Exp $
 
 EAPI=2
 inherit autotools libtool flag-o-matic eutils toolchain-funcs
@@ -123,8 +123,6 @@ src_configure() {
 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