Old.

(Portage version: 2.2.0_alpha174/cvs/Linux x86_64, signed Manifest commit with key A792A613)

10 files changed, 8 insertions, 519 deletions

diff --git a/net-analyzer/tcpdump/ChangeLog b/net-analyzer/tcpdump/ChangeLog
index de1410659657..0ff3cb99555b 100644
--- a/net-analyzer/tcpdump/ChangeLog
+++ b/net-analyzer/tcpdump/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/tcpdump
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/ChangeLog,v 1.164 2013/05/09 03:19:04 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/ChangeLog,v 1.165 2013/05/09 03:27:21 jer Exp $
+
+  09 May 2013; Jeroen Roovers <jer@gentoo.org>
+  -files/tcpdump-4.0.0-ipv6-build.patch,
+  -files/tcpdump-4.0.0-libsmi-autodep.patch, -files/tcpdump-4.2.0-ipv6.patch,
+  -files/tcpdump-4.2.0-ppi.h, -tcpdump-3.9.8-r1.ebuild, -tcpdump-3.9.8.ebuild,
+  -tcpdump-4.1.1.ebuild, -tcpdump-4.2.0.ebuild, -tcpdump-4.2.1.ebuild:
+  Old.
 
 *tcpdump-4.4.0 (09 May 2013)
 
diff --git a/net-analyzer/tcpdump/files/tcpdump-4.0.0-ipv6-build.patch b/net-analyzer/tcpdump/files/tcpdump-4.0.0-ipv6-build.patch
deleted file mode 100644
index 4d4aa575686a..000000000000
--- a/net-analyzer/tcpdump/files/tcpdump-4.0.0-ipv6-build.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-=== modified file 'print-enc.c'
---- print-enc.c	2008-11-04 16:24:30 +0000
-+++ print-enc.c	2008-11-04 16:45:04 +0000
-@@ -77,9 +77,11 @@
- 	case AF_INET:
- 		ip_print(gndo, p, length);
- 		break;
-+#ifdef INET6
- 	case AF_INET6:
- 		ip6_print(p, length);
- 		break;
-+#endif /*INET6*/
- 	}
- 
- out:
-
diff --git a/net-analyzer/tcpdump/files/tcpdump-4.0.0-libsmi-autodep.patch b/net-analyzer/tcpdump/files/tcpdump-4.0.0-libsmi-autodep.patch
deleted file mode 100644
index 467018d07f12..000000000000
--- a/net-analyzer/tcpdump/files/tcpdump-4.0.0-libsmi-autodep.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-=== modified file 'configure.in'
---- configure.in	2008-11-04 16:24:30 +0000
-+++ configure.in	2008-11-04 17:16:11 +0000
-@@ -70,6 +70,12 @@
- esac
- 
- 
-+AC_ARG_WITH(smi,
-+[  --with-smi              link with libsmi (allows to load MIBs on the fly to decode SNMP packets. [default=yes]
-+  --without-smi           don't link with libsmi],,
-+   with_smi=yes)
-+
-+if test "x$with_smi" != "xno" ; then
- AC_CHECK_HEADERS(smi.h)
- AC_CHECK_LIB(smi, smiInit)
- if test "$ac_cv_header_smi_h" = yes -a "$ac_cv_lib_smi_smiInit" = yes
-@@ -111,6 +117,7 @@
-   libsmi=no]
- )
- fi
-+fi
- 
- AC_MSG_CHECKING([whether to enable the possibly-buggy SMB printer])
- AC_ARG_ENABLE(smb,
-
diff --git a/net-analyzer/tcpdump/files/tcpdump-4.2.0-ipv6.patch b/net-analyzer/tcpdump/files/tcpdump-4.2.0-ipv6.patch
deleted file mode 100644
index ba47b5daec1f..000000000000
--- a/net-analyzer/tcpdump/files/tcpdump-4.2.0-ipv6.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Fix compiling with USE=-ipv6 (bug #395031).
-https://bugs.gentoo.org/395031
-
---- a/tcpdump-4.2.0/print-babel.c
-+++ b/tcpdump-4.2.0/print-babel.c
-@@ -115,10 +115,14 @@
- format_prefix(const u_char *prefix, unsigned char plen)
- {
-     static char buf[50];
-+#ifdef INET6
-     if(plen >= 96 && memcmp(prefix, v4prefix, 12) == 0)
-+#endif
-         snprintf(buf, 50, "%s/%u", ipaddr_string(prefix + 12), plen - 96);
-+#ifdef INET6
-     else
-         snprintf(buf, 50, "%s/%u", ip6addr_string(prefix), plen);
-+#endif
-     buf[49] = '\0';
-     return buf;
- }
-@@ -126,10 +130,14 @@
- static const char *
- format_address(const u_char *prefix)
- {
-+#ifdef INET6
-     if(memcmp(prefix, v4prefix, 12) == 0)
-+#endif
-         return ipaddr_string(prefix + 12);
-+#ifdef INET6
-     else
-         return ip6addr_string(prefix);
-+#endif
- }
- 
- static int
diff --git a/net-analyzer/tcpdump/files/tcpdump-4.2.0-ppi.h b/net-analyzer/tcpdump/files/tcpdump-4.2.0-ppi.h
deleted file mode 100644
index 733eb950f0de..000000000000
--- a/net-analyzer/tcpdump/files/tcpdump-4.2.0-ppi.h
+++ /dev/null
@@ -1,9 +0,0 @@
-typedef struct ppi_header {
-	uint8_t		ppi_ver;
-	uint8_t		ppi_flags;
-	uint16_t	ppi_len;
-	uint32_t	ppi_dlt;
-} ppi_header_t;
-
-#define	PPI_HDRLEN	8
-
diff --git a/net-analyzer/tcpdump/tcpdump-3.9.8-r1.ebuild b/net-analyzer/tcpdump/tcpdump-3.9.8-r1.ebuild
deleted file mode 100644
index 2083b125e04f..000000000000
--- a/net-analyzer/tcpdump/tcpdump-3.9.8-r1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/tcpdump-3.9.8-r1.ebuild,v 1.9 2012/06/12 03:32:07 zmedico Exp $
-
-inherit flag-o-matic toolchain-funcs eutils user
-
-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 ~mips ~ppc ~ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="chroot ssl ipv6 samba"
-
-DEPEND="net-libs/libpcap
-	ssl? ( >=dev-libs/openssl-0.9.6m )"
-RDEPEND="${DEPEND}"
-
-group_user_check() {
-	einfo "Checking for tcpdump group ..."
-	enewgroup tcpdump
-	einfo "Checking for tcpdump user ..."
-	enewuser tcpdump -1 -1 -1 tcpdump
-}
-
-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
-		ewarn "(Giving you 10 secs to think about it)"
-		ewarn
-		ebeep 5
-		epause 5
-	fi
-	group_user_check
-}
-
-src_compile() {
-	# tcpdump needs some optymalization. see bug #108391
-	( ! is-flag -O? || is-flag -O0 ) && append-flags -O
-
-	replace-flags -O[3-9] -O2
-	filter-flags -finline-functions
-
-	# Fix wrt bug #48747
-	if [[ $(gcc-major-version) -gt 3 ]] || \
-		[[ $(gcc-major-version) -eq 3 && $(gcc-minor-version) -ge 4 ]]
-	then
-		filter-flags -funit-at-a-time
-		append-flags -fno-unit-at-a-time
-	fi
-
-	local myconf
-	if ! use ssl ; then
-		myconf="--without-crypto"
-	fi
-
-	if use chroot; then
-		myconf="${myconf} --with-chroot=/var/lib/tcpdump"
-	fi
-
-	econf --with-user=tcpdump \
-		$(use_enable ipv6) \
-		$(use_enable samba smb) \
-		${myconf} || die "configure failed"
-
-	make CCOPT="$CFLAGS" || die "make failed"
-}
-
-pkg_preinst() {
-	group_user_check
-}
-
-src_install() {
-	dosbin tcpdump
-	doman tcpdump.1
-	dodoc *.awk
-	dodoc README FILES VERSION CHANGES CREDITS TODO
-
-	keepdir /var/lib/tcpdump
-	fperms 700 /var/lib/tcpdump
-	fowners tcpdump:tcpdump /var/lib/tcpdump
-}
diff --git a/net-analyzer/tcpdump/tcpdump-3.9.8.ebuild b/net-analyzer/tcpdump/tcpdump-3.9.8.ebuild
deleted file mode 100644
index 153a4cfa3d17..000000000000
--- a/net-analyzer/tcpdump/tcpdump-3.9.8.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/tcpdump-3.9.8.ebuild,v 1.10 2012/06/12 03:32:07 zmedico Exp $
-
-inherit flag-o-matic toolchain-funcs eutils user
-
-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 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="ssl ipv6 samba"
-
-DEPEND="net-libs/libpcap
-	ssl? ( >=dev-libs/openssl-0.9.6m )"
-RDEPEND="${DEPEND}"
-
-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
-		ewarn "(Giving you 10 secs to think about it)"
-		ewarn
-		ebeep 5
-		epause 5
-	fi
-}
-
-src_compile() {
-	# tcpdump needs some optymalization. see bug #108391
-	( ! is-flag -O? || is-flag -O0 ) && append-flags -O
-
-	replace-flags -O[3-9] -O2
-	filter-flags -finline-functions
-
-	# Fix wrt bug #48747
-	if [[ $(gcc-major-version) -gt 3 ]] || \
-		[[ $(gcc-major-version) -eq 3 && $(gcc-minor-version) -ge 4 ]]
-	then
-		filter-flags -funit-at-a-time
-		append-flags -fno-unit-at-a-time
-	fi
-
-	local myconf
-	if ! use ssl ; then
-		myconf="--without-crypto"
-	fi
-
-	econf --with-user=tcpdump \
-		$(use_enable ipv6) \
-		$(use_enable samba smb) \
-		${myconf} || die "configure failed"
-
-	make CCOPT="$CFLAGS" || die "make failed"
-}
-
-pkg_preinst() {
-	enewgroup tcpdump
-	enewuser tcpdump -1 -1 -1 tcpdump
-}
-
-src_install() {
-	dosbin tcpdump
-	doman tcpdump.1
-	dodoc *.awk
-	dodoc README FILES VERSION CHANGES CREDITS TODO
-}
diff --git a/net-analyzer/tcpdump/tcpdump-4.1.1.ebuild b/net-analyzer/tcpdump/tcpdump-4.1.1.ebuild
deleted file mode 100644
index 0f4306fc4a62..000000000000
--- a/net-analyzer/tcpdump/tcpdump-4.1.1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2012 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.6 2012/06/12 03:32:07 zmedico Exp $
-
-EAPI="2"
-inherit flag-o-matic user
-
-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 ~mips ~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 sys-freebsd/freebsd-ubin )
-		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() {
-	use suid && elog "To let normal users run tcpdump add them into tcpdump group."
-}
diff --git a/net-analyzer/tcpdump/tcpdump-4.2.0.ebuild b/net-analyzer/tcpdump/tcpdump-4.2.0.ebuild
deleted file mode 100644
index caa4553494d3..000000000000
--- a/net-analyzer/tcpdump/tcpdump-4.2.0.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/tcpdump-4.2.0.ebuild,v 1.3 2012/06/12 03:32:07 zmedico Exp $
-
-EAPI="4"
-inherit eutils flag-o-matic user
-
-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 ~mips ~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 sys-freebsd/freebsd-ubin )
-		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_prepare() {
-	# http://sourceforge.net/tracker/?func=detail&aid=3444149&group_id=53066&atid=469573
-	# bug #393085
-	cp "${FILESDIR}"/${P}-ppi.h "${S}/ppi.h" || die
-	epatch "${FILESDIR}"/${P}-ipv6.patch
-}
-
-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_test() {
-	sed '/^\(espudp1\|eapon1\)/d;' -i tests/TESTLIST
-	emake check
-}
-
-src_install() {
-	dosbin tcpdump
-	doman tcpdump.1
-	dodoc *.awk
-	dodoc CHANGES CREDITS README
-
-	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.2.1.ebuild b/net-analyzer/tcpdump/tcpdump-4.2.1.ebuild
deleted file mode 100644
index 3c493b5442e9..000000000000
--- a/net-analyzer/tcpdump/tcpdump-4.2.1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/tcpdump-4.2.1.ebuild,v 1.3 2012/06/12 03:32:07 zmedico Exp $
-
-EAPI="4"
-inherit flag-o-matic user
-
-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 ~mips ~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 sys-freebsd/freebsd-ubin )
-		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 "${EPREFIX}/usr") \
-		$(use_with smi) \
-		$(use_enable ipv6) \
-		$(use_enable samba smb) \
-		$(use_with chroot chroot "${EPREFIX}/var/lib/tcpdump")
-}
-
-src_test() {
-	sed '/^\(espudp1\|eapon1\)/d;' -i tests/TESTLIST
-	emake check
-}
-
-src_install() {
-	dosbin tcpdump
-	doman tcpdump.1
-	dodoc *.awk
-	dodoc CHANGES CREDITS README
-
-	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."
-}