From 16a90ea185424b5eeb3f9d627a161d910712ebc2 Mon Sep 17 00:00:00 2001 From: Peter Volkov Date: Thu, 8 Apr 2010 05:55:08 +0000 Subject: Version bump. (Portage version: 2.1.8.3/cvs/Linux x86_64) --- net-analyzer/tcpdump/ChangeLog | 9 ++- .../files/tcpdump-4.1.0-without-chroot.patch | 27 ------- net-analyzer/tcpdump/tcpdump-4.1.0-r1.ebuild | 92 ---------------------- net-analyzer/tcpdump/tcpdump-4.1.0.ebuild | 84 -------------------- net-analyzer/tcpdump/tcpdump-4.1.1.ebuild | 84 ++++++++++++++++++++ 5 files changed, 92 insertions(+), 204 deletions(-) delete mode 100644 net-analyzer/tcpdump/files/tcpdump-4.1.0-without-chroot.patch delete mode 100644 net-analyzer/tcpdump/tcpdump-4.1.0-r1.ebuild delete mode 100644 net-analyzer/tcpdump/tcpdump-4.1.0.ebuild create mode 100644 net-analyzer/tcpdump/tcpdump-4.1.1.ebuild (limited to 'net-analyzer/tcpdump') diff --git a/net-analyzer/tcpdump/ChangeLog b/net-analyzer/tcpdump/ChangeLog index b9ec9560ea3f..2279b7154975 100644 --- a/net-analyzer/tcpdump/ChangeLog +++ b/net-analyzer/tcpdump/ChangeLog @@ -1,6 +1,13 @@ # 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.142 2010/04/07 17:24:01 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/ChangeLog,v 1.143 2010/04/08 05:55:08 pva Exp $ + +*tcpdump-4.1.1 (08 Apr 2010) + + 08 Apr 2010; Peter Volkov -tcpdump-4.1.0.ebuild, + -tcpdump-4.1.0-r1.ebuild, -files/tcpdump-4.1.0-without-chroot.patch, + +tcpdump-4.1.1.ebuild: + Version bump. 07 Apr 2010; Peter Volkov tcpdump-4.1.0-r1.ebuild: Print elog only if USE=suid, bug #312841, thank Martin von Gagern for 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 deleted file mode 100644 index d81af4ca776c..000000000000 --- a/net-analyzer/tcpdump/files/tcpdump-4.1.0-without-chroot.patch +++ /dev/null @@ -1,27 +0,0 @@ -commit 7ec07e4815965dd31b85e56ac823249bfb9afc28 -Author: Peter Volkov -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-r1.ebuild b/net-analyzer/tcpdump/tcpdump-4.1.0-r1.ebuild deleted file mode 100644 index 486415a54114..000000000000 --- a/net-analyzer/tcpdump/tcpdump-4.1.0-r1.ebuild +++ /dev/null @@ -1,92 +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/tcpdump/tcpdump-4.1.0-r1.ebuild,v 1.2 2010/04/07 17:24:02 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() { - use suid && elog "To let normal users run tcpdump add them into tcpdump group." -} diff --git a/net-analyzer/tcpdump/tcpdump-4.1.0.ebuild b/net-analyzer/tcpdump/tcpdump-4.1.0.ebuild deleted file mode 100644 index 961840535cfb..000000000000 --- a/net-analyzer/tcpdump/tcpdump-4.1.0.ebuild +++ /dev/null @@ -1,84 +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/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 -} diff --git a/net-analyzer/tcpdump/tcpdump-4.1.1.ebuild b/net-analyzer/tcpdump/tcpdump-4.1.1.ebuild new file mode 100644 index 000000000000..b8270aee4c5a --- /dev/null +++ b/net-analyzer/tcpdump/tcpdump-4.1.1.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.1.ebuild,v 1.1 2010/04/08 05:55:08 pva Exp $ + +EAPI="2" +inherit flag-o-matic toolchain-funcs eutils 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 )" + +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_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 '/^\(espudp1\|eapon1\)/d;' -i tests/TESTLIST + make check || die "tests failed" +} + +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." +} -- cgit v1.2.3-65-gdbad