From: Peter Volkov <pva@gentoo.org>
Date: Fri, 2 Apr 2010 07:07:51 +0000 (+0000)
Subject: Added suid USE flag to allow users in tcpdump group to sniff traffic, bug #283527... 
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5cce0dcb8f0b9357003cda4b69a15979c4ed5716;p=gentoo.git

Added suid USE flag to allow users in tcpdump group to sniff traffic, bug #283527, thank Hank Leininger for report.
Package-Manager: portage-2.1.8.3/cvs/Linux x86_64
---

diff --git a/net-analyzer/tcpdump/ChangeLog b/net-analyzer/tcpdump/ChangeLog
index eed6c4dbe272..dbc1cb92ca49 100644
--- a/net-analyzer/tcpdump/ChangeLog
+++ b/net-analyzer/tcpdump/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/tcpdump
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/ChangeLog,v 1.140 2010/04/02 06:02:17 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/ChangeLog,v 1.141 2010/04/02 07:07:51 pva Exp $
+
+*tcpdump-4.1.0-r1 (02 Apr 2010)
+
+  02 Apr 2010; Peter Volkov <pva@gentoo.org> +tcpdump-4.1.0-r1.ebuild:
+  Added suid USE flag to allow users in tcpdump group to sniff traffic, bug
+  #283527, thank Hank Leininger for report.
 
 *tcpdump-4.1.0 (02 Apr 2010)
 
diff --git a/net-analyzer/tcpdump/Manifest b/net-analyzer/tcpdump/Manifest
index 8fc563fcc8dd..c8bfcfc90af2 100644
--- a/net-analyzer/tcpdump/Manifest
+++ b/net-analyzer/tcpdump/Manifest
@@ -7,6 +7,7 @@ DIST tcpdump-4.1.0.tar.gz 745115 RMD160 2907475c4545aecb491fc959d7f41001204b61a1
 EBUILD tcpdump-3.9.8-r1.ebuild 2235 RMD160 b1a1a5589297b50d9a0ed6319f8726c06fda651d SHA1 4a725909b6c2a884ec5c9390f98d3e63f98c7e97 SHA256 f75d0415b2c7a4175d66dca2da4b9442791cd68e391a5edeb54c5082bbe42785
 EBUILD tcpdump-3.9.8.ebuild 1908 RMD160 e1842d7bdfa207f74f2c164fcda84283780b3b42 SHA1 64b8be1fc9b2e1786836ebe42c343bdc7041fc3e SHA256 b5f1450e23d5cff9d9d3c57caf1dbaf8861e8867f97954c78a54d43f6bc78b56
 EBUILD tcpdump-4.0.1_pre20090709.ebuild 2377 RMD160 b23ee67a27df295da1855ba9b93d35b5880d25b4 SHA1 c54533a920c5a0a3f313d98da28bbb2fbf01e8fd SHA256 1155b3d9f6b18d027bc92a19a208f92e5dcfbe377a7a63fb74aaf20c7923646b
+EBUILD tcpdump-4.1.0-r1.ebuild 2447 RMD160 9134370348546f47e339656e9579b6f3cba4ec0f SHA1 d87dacadba245c77026a71a93f2086d49503b17a SHA256 62578f6d4f12a3d61e6bf19d477c4f0435a2e19a04ab283826f05ecc92d237b8
 EBUILD tcpdump-4.1.0.ebuild 2254 RMD160 5c155d5a14daa07deb2ff86fd402061cb7a983ff SHA1 884aea9d2a721012157305b6c2ffc7c6db72c192 SHA256 153a88014b699503dd91a0dc879666568a755fa48db07aa3733918d83af0c0bb
-MISC ChangeLog 19101 RMD160 560773559347f6c423a03e76e6e453918a4c7a08 SHA1 3b4c449ceb367fcb6dacd5973b6d085d37876aee SHA256 9b5730938ad1bbb2b834c0adb29f005f7205e70e1a5a224ce10a406be2962e01
+MISC ChangeLog 19326 RMD160 69ca79bd171ae64413fd10d69032325fd574139d SHA1 ec273510af6a07ebbb83851db60083a0de059284 SHA256 6b5b6ca736d8f5df835b0735eb0f47800952acd8c98486d8db896a05ddced55b
 MISC metadata.xml 465 RMD160 f9751964faf36897dbf01df6258c8af50791b1e5 SHA1 e4ed0caa1ba72d0827449bee5ce0e792940f3bfe SHA256 e8f218a9ee2e142e9b19c54bdc0e2b336cdccabaed8347a30956b663e6b9f51c
diff --git a/net-analyzer/tcpdump/tcpdump-4.1.0-r1.ebuild b/net-analyzer/tcpdump/tcpdump-4.1.0-r1.ebuild
new file mode 100644
index 000000000000..ec3b5862fcc3
--- /dev/null
+++ b/net-analyzer/tcpdump/tcpdump-4.1.0-r1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/tcpdump-4.1.0-r1.ebuild,v 1.1 2010/04/02 07:07:51 pva Exp $
+
+EAPI="2"
+inherit flag-o-matic toolchain-funcs eutils versionator autotools
+
+DESCRIPTION="A Tool for network monitoring and data acquisition"
+HOMEPAGE="http://www.tcpdump.org/"
+SRC_URI="http://www.tcpdump.org/release/${P}.tar.gz
+		http://www.jp.tcpdump.org/release/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
+IUSE="+chroot smi ssl ipv6 -samba suid test"
+
+RDEPEND="net-libs/libpcap
+	smi? ( net-libs/libsmi )
+	ssl? ( >=dev-libs/openssl-0.9.6m )"
+DEPEND="${RDEPEND}
+	test? ( app-arch/sharutils
+		dev-lang/perl )"
+
+S=${WORKDIR}/${PN}-$(get_version_component_range 1-2)
+
+pkg_setup() {
+	if use samba ; then
+		ewarn
+		ewarn "CAUTION !!! CAUTION !!! CAUTION"
+		ewarn
+		ewarn "You're about to compile tcpdump with samba printing support"
+		ewarn "Upstream tags it as 'possibly-buggy SMB printer'"
+		ewarn "So think twice whether this is fine with you"
+		ewarn
+		ewarn "CAUTION !!! CAUTION !!! CAUTION"
+		ewarn
+	fi
+	enewgroup tcpdump
+	enewuser tcpdump -1 -1 -1 tcpdump
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-without-chroot.patch"
+	eautoconf
+}
+
+src_configure() {
+	# tcpdump needs some optymalization. see bug #108391
+	( ! is-flag -O? || is-flag -O0 ) && append-flags -O2
+
+	replace-flags -O[3-9] -O2
+	filter-flags -finline-functions
+
+	econf --with-user=tcpdump \
+		$(use_with ssl crypto) \
+		$(use_with smi) \
+		$(use_enable ipv6) \
+		$(use_enable samba smb) \
+		$(use_with chroot chroot /var/lib/tcpdump)
+}
+
+src_compile() {
+	make CCOPT="$CFLAGS" || die "make failed"
+}
+
+src_test() {
+	#sed '/^\(bgp_vpn_attrset\|ikev2four\|espudp1\|eapon1\)/d;' -i tests/TESTLIST
+	#make check || die "tests failed"
+	ewarn "tests are broken in the release... (tests directory missed in tarball)"
+}
+
+src_install() {
+	dosbin tcpdump || die
+	doman tcpdump.1 || die
+	dodoc *.awk || die
+	dodoc CHANGES CREDITS README || die
+
+	if use chroot; then
+		keepdir /var/lib/tcpdump
+		fperms 700 /var/lib/tcpdump
+		fowners tcpdump:tcpdump /var/lib/tcpdump
+	fi
+	if use suid; then
+		fowners root:tcpdump /usr/sbin/tcpdump
+		fperms 4110 /usr/sbin/tcpdump
+	fi
+}
+
+pkg_postinst() {
+	elog "To let normal users run tcpdump add them into tcpdump group."
+}