Version bump, bug #312337, thank Richard Hartmann for report. Fixes inability to...

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

diff --git a/net-analyzer/tcpdump/ChangeLog b/net-analyzer/tcpdump/ChangeLog
index c2a5284fdd85b20d3ed27c38a1b6f9e30a236762..eed6c4dbe272a1147f7ae1ccb713c39b57f323e7 100644 (file)
--- a/net-analyzer/tcpdump/ChangeLog
+++ b/net-analyzer/tcpdump/ChangeLog
@@ -1,6 +1,14 @@
 # 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.139 2010/02/12 14:34:14 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/ChangeLog,v 1.140 2010/04/02 06:02:17 pva Exp $
+
+*tcpdump-4.1.0 (02 Apr 2010)
+
+  02 Apr 2010; Peter Volkov <pva@gentoo.org> +tcpdump-4.1.0.ebuild,
+  +files/tcpdump-4.1.0-without-chroot.patch:
+  Version bump, bug #312337, thank Richard Hartmann for report. Fixes
+  inability to run tcpdump if built with USE=-chroot, bug 281936, thank
+  Travis Schack for report. Tests are broken in the release.
 
   12 Feb 2010; Jeroen Roovers <jer@gentoo.org> tcpdump-3.9.8-r1.ebuild:
   Stable for HPPA too.

diff --git a/net-analyzer/tcpdump/Manifest b/net-analyzer/tcpdump/Manifest
index 4057c0298bbdc0c8c0e4b55c353a769b066fcc66..8fc563fcc8ddf70311e8ed11055985d8c1911402 100644 (file)
--- a/net-analyzer/tcpdump/Manifest
+++ b/net-analyzer/tcpdump/Manifest
@@ -1,9 +1,12 @@
 AUX tcpdump-4.0.0-ipv6-build.patch 288 RMD160 8e14d69d20dc2e431c6d10fc9ae694ab8976ebfb SHA1 a2e791b9612a7be04f882488e9d77e1f5c812a7e SHA256 c61cf785e854b44bfc015e4de6223051912547b0564bf61dbbfa97d1ddc4a63a
 AUX tcpdump-4.0.0-libsmi-autodep.patch 653 RMD160 5ac1093c524f83b4aaf21271d302e3acde2d8220 SHA1 e5cd061e6e5a918fa648b39aa0110f8ed043d8f1 SHA256 bdbd422f50b93f0c4232ae9cea0f4497976ab15559079575ec5ef1bca9dca72d
+AUX tcpdump-4.1.0-without-chroot.patch 952 RMD160 2fb9ef4553225889bd8c1d12a0bbedb248b2cdcd SHA1 24b85b8c98acf4a281c9b419656da89fc6098fbf SHA256 de6b29c46bd69c655391ab45cdad4e33be1d9764924e535749d2f598768b895b
 DIST tcpdump-3.9.8.tar.gz 938054 RMD160 76b17d131f4d89342c2bcdc27c40d23d29ecb1f1 SHA1 98be9acb1e9154656838fcb89c4a36417cf56042 SHA256 2309c8eb1dc87436a410f4a8d041b0453ade5753c35ce7a2c5bc9a0263a8d299
 DIST tcpdump-4.0.1-20090709.tar.gz 1553485 RMD160 5f56cad6a6e25ac3d320a58912b513bbae29f635 SHA1 b6ed8d5e9a57863c87bb77eabc2d8f319645f1b1 SHA256 e662e3c101fc105831b5e15d708cb95be6e80399c050a4e28a9b474436c7d8ae
+DIST tcpdump-4.1.0.tar.gz 745115 RMD160 2907475c4545aecb491fc959d7f41001204b61a1 SHA1 ee6e147853e201e362036b91dd2a90e012da9343 SHA256 360656e76d1889b3c9e89430f6291051616bcf16d357cbad091d83c586f815fa
 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
-MISC ChangeLog 18754 RMD160 53a878ee4a0c0dfedc72e451a0d61efcbf82bd5b SHA1 26ed11524de7896a6b23e1297d8043cf7b2a643b SHA256 74a150fa1cd72fa40c552687fb4ddfcfb80b55560fab30e371afabe74544ec41
+EBUILD tcpdump-4.1.0.ebuild 2254 RMD160 5c155d5a14daa07deb2ff86fd402061cb7a983ff SHA1 884aea9d2a721012157305b6c2ffc7c6db72c192 SHA256 153a88014b699503dd91a0dc879666568a755fa48db07aa3733918d83af0c0bb
+MISC ChangeLog 19101 RMD160 560773559347f6c423a03e76e6e453918a4c7a08 SHA1 3b4c449ceb367fcb6dacd5973b6d085d37876aee SHA256 9b5730938ad1bbb2b834c0adb29f005f7205e70e1a5a224ce10a406be2962e01
 MISC metadata.xml 465 RMD160 f9751964faf36897dbf01df6258c8af50791b1e5 SHA1 e4ed0caa1ba72d0827449bee5ce0e792940f3bfe SHA256 e8f218a9ee2e142e9b19c54bdc0e2b336cdccabaed8347a30956b663e6b9f51c

diff --git a/net-analyzer/tcpdump/files/tcpdump-4.1.0-without-chroot.patch b/net-analyzer/tcpdump/files/tcpdump-4.1.0-without-chroot.patch
new file mode 100644 (file)
index 0000000..d81af4c
--- /dev/null
+++ b/net-analyzer/tcpdump/files/tcpdump-4.1.0-without-chroot.patch
@@ -0,0 +1,27 @@
+commit 7ec07e4815965dd31b85e56ac823249bfb9afc28
+Author: Peter Volkov <pva@gentoo.org>
+Date:   Fri Apr 2 09:33:30 2010 +0400
+
+    Respect --without-chroot correctly
+    
+    ./configure --without-chroot will configure tcpdump with "no" as the
+    value of chroot directory and cause tcpdump to fail with:
+    
+    tcpdump: Couldn't chroot/chdir to 'no': No such file or directory
+    
+    This patch makes ./configure to avoid chroot directory when called with
+    --without-chroot.
+
+diff --git a/configure.in b/configure.in
+index 1c1b63a..eb3e5e8 100644
+--- a/configure.in
++++ b/configure.in
+@@ -159,7 +159,7 @@ fi
+ 
+ AC_ARG_WITH(chroot, [  --with-chroot=DIRECTORY when dropping privileges, chroot to DIRECTORY])
+ AC_MSG_CHECKING([whether to chroot])
+-if test ! -z "$with_chroot" ; then
++if test ! -z "$with_chroot" && test "$with_chroot" != "no" ; then
+         AC_DEFINE_UNQUOTED(WITH_CHROOT, "$withval")
+        AC_MSG_RESULT(to \"$withval\")
+ else

diff --git a/net-analyzer/tcpdump/tcpdump-4.1.0.ebuild b/net-analyzer/tcpdump/tcpdump-4.1.0.ebuild
new file mode 100644 (file)
index 0000000..9618405
--- /dev/null
+++ b/net-analyzer/tcpdump/tcpdump-4.1.0.ebuild
@@ -0,0 +1,84 @@
+# 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.ebuild,v 1.1 2010/04/02 06:02:17 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 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
+}