Version bump, bug #245179, thank Krzysztof Olędzki for report. Removed old.

(Portage version: 2.2_rc14/cvs/Linux 2.6.26-openvz.git-35f41f1 i686)

9 files changed, 78 insertions, 217 deletions

diff --git a/net-analyzer/tcpdump/ChangeLog b/net-analyzer/tcpdump/ChangeLog
index e6b04b585886..1d204c447dba 100644
--- a/net-analyzer/tcpdump/ChangeLog
+++ b/net-analyzer/tcpdump/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for net-analyzer/tcpdump
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/ChangeLog,v 1.132 2008/09/28 13:26:02 cedk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/ChangeLog,v 1.133 2008/11/16 15:18:00 pva Exp $
+
+*tcpdump-4.0.0 (16 Nov 2008)
+
+  16 Nov 2008; Peter Volkov <pva@gentoo.org>
+  -files/tcpdump-3.9.5-print-802_11.c.diff,
+  -files/tcpdump-3.9.6-bgp-integer-overflow.patch,
+  +files/tcpdump-4.0.0-ipv6-build.patch,
+  +files/tcpdump-4.0.0-libsmi-autodep.patch, metadata.xml,
+  -tcpdump-3.9.5-r3.ebuild, -tcpdump-3.9.6-r1.ebuild,
+  -tcpdump-3.9.7-r1.ebuild, +tcpdump-4.0.0.ebuild:
+  Version bump, bug #245179, thank Krzysztof Olędzki for report. Removed
+  old.
 
   28 Sep 2008; Cédric Krier <cedk@gentoo.org> tcpdump-3.9.8-r1.ebuild:
   Call enewuser/enewgroup in both pkg_setup and pkg_preinst for bug #231917
diff --git a/net-analyzer/tcpdump/files/tcpdump-3.9.5-print-802_11.c.diff b/net-analyzer/tcpdump/files/tcpdump-3.9.5-print-802_11.c.diff
deleted file mode 100644
index a1f107dc7c70..000000000000
--- a/net-analyzer/tcpdump/files/tcpdump-3.9.5-print-802_11.c.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- tcpdump/print-802_11.c	2006/06/13 22:25:30	1.42
-+++ tcpdump/print-802_11.c	2007/02/01 02:18:18	1.43
-@@ -264,7 +264,7 @@
- 
- 			if (pbody->tim.length <= 3)
- 				break;
--			if (pbody->rates.length > sizeof pbody->tim.bitmap)
-+			if (pbody->tim.length - 3 > sizeof pbody->tim.bitmap)
- 				return;
- 			if (!TTEST2(*(p + offset), pbody->tim.length - 3))
- 				return;
diff --git a/net-analyzer/tcpdump/files/tcpdump-3.9.6-bgp-integer-overflow.patch b/net-analyzer/tcpdump/files/tcpdump-3.9.6-bgp-integer-overflow.patch
deleted file mode 100644
index 76cd330c0aa3..000000000000
--- a/net-analyzer/tcpdump/files/tcpdump-3.9.6-bgp-integer-overflow.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Nuar tcpdump-3.9.5.orig/print-bgp.c tcpdump-3.9.5/print-bgp.c
---- tcpdump-3.9.5.orig/print-bgp.c	2007-07-10 17:16:02.000000000 +0400
-+++ tcpdump-3.9.5/print-bgp.c	2007-07-10 17:16:45.000000000 +0400
-@@ -669,7 +669,7 @@
-         tlen-=15;
- 
-         /* ok now the variable part - lets read out TLVs*/
--        while (tlen>0) {
-+        while (tlen>0 && strlen <= buflen) {
-             if (tlen < 3)
-                 return -1;
-             TCHECK2(pptr[0], 3);
-@@ -684,7 +684,7 @@
-                                  tlv_type,
-                                  tlv_len);
-                 ttlv_len=ttlv_len/8+1; /* how many bytes do we need to read ? */
--                while (ttlv_len>0) {
-+                while (ttlv_len>0 && strlen <= buflen) {
-                     TCHECK(pptr[0]);
-                     strlen+=snprintf(buf+strlen,buflen-strlen, "%02x",*pptr++);
-                     ttlv_len--;
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
new file mode 100644
index 000000000000..4d4aa575686a
--- /dev/null
+++ b/net-analyzer/tcpdump/files/tcpdump-4.0.0-ipv6-build.patch
@@ -0,0 +1,16 @@
+=== 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
new file mode 100644
index 000000000000..467018d07f12
--- /dev/null
+++ b/net-analyzer/tcpdump/files/tcpdump-4.0.0-libsmi-autodep.patch
@@ -0,0 +1,25 @@
+=== 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/metadata.xml b/net-analyzer/tcpdump/metadata.xml
index 9d16e41b8fe9..1cb7d4fe7580 100644
--- a/net-analyzer/tcpdump/metadata.xml
+++ b/net-analyzer/tcpdump/metadata.xml
@@ -3,5 +3,8 @@
 <pkgmetadata>
 	<herd>netmon</herd>
 	<longdescription>A pcap based tool for network protocol monitoring and data acquisition.</longdescription>
-	<use><flag name='chroot'>Enable chrooting when dropping privileges</flag></use>
+	<use>
+		<flag name='smi'>Build with <pkg>net-libs/libsmi</pkg> to load MIBs on the fly to decode SNMP packets</flag>
+		<flag name='chroot'>Enable chrooting when dropping privileges</flag>
+	</use>
 </pkgmetadata>
diff --git a/net-analyzer/tcpdump/tcpdump-3.9.6-r1.ebuild b/net-analyzer/tcpdump/tcpdump-3.9.6-r1.ebuild
deleted file mode 100644
index 25fe23b80f4c..000000000000
--- a/net-analyzer/tcpdump/tcpdump-3.9.6-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/tcpdump-3.9.6-r1.ebuild,v 1.7 2008/09/10 10:47:13 pva Exp $
-
-inherit flag-o-matic toolchain-funcs eutils
-
-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 )"
-
-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_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# bug 168916 - off-by-one heap overflow in 802.11 printer
-	epatch "${FILESDIR}"/${PN}-3.9.5-print-802_11.c.diff
-
-	# bug #184815 - <= 3.9.6 BGP dissector integer overflow
-	epatch "${FILESDIR}"/${P}-bgp-integer-overflow.patch
-}
-
-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-3.9.7-r1.ebuild b/net-analyzer/tcpdump/tcpdump-3.9.7-r1.ebuild
deleted file mode 100644
index 037b32ae620d..000000000000
--- a/net-analyzer/tcpdump/tcpdump-3.9.7-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/tcpdump-3.9.7-r1.ebuild,v 1.8 2008/09/10 10:47:13 pva Exp $
-
-inherit flag-o-matic toolchain-funcs eutils
-
-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 )"
-
-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-3.9.5-r3.ebuild b/net-analyzer/tcpdump/tcpdump-4.0.0.ebuild
index dd9b6e320662..dfc130692857 100644
--- a/net-analyzer/tcpdump/tcpdump-3.9.5-r3.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-4.0.0.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/tcpdump-3.9.5-r3.ebuild,v 1.10 2008/09/10 10:47:13 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/tcpdump-4.0.0.ebuild,v 1.1 2008/11/16 15:18:00 pva Exp $
 
-inherit flag-o-matic toolchain-funcs eutils
+EAPI="1"
+inherit autotools flag-o-matic toolchain-funcs eutils
 
 DESCRIPTION="A Tool for network monitoring and data acquisition"
 HOMEPAGE="http://www.tcpdump.org/"
@@ -11,10 +12,11 @@ SRC_URI="http://www.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"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="+chroot smi ssl ipv6 samba"
 
 DEPEND="net-libs/libpcap
+	smi? ( net-libs/libsmi )
 	ssl? ( >=dev-libs/openssl-0.9.6m )"
 
 pkg_setup() {
@@ -33,21 +35,22 @@ pkg_setup() {
 		ebeep 5
 		epause 5
 	fi
+	enewgroup tcpdump
+	enewuser tcpdump -1 -1 -1 tcpdump
 }
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	# bug 168916 - off-by-one heap overflow in 802.11 printer
-	epatch "${FILESDIR}"/${P}-print-802_11.c.diff
 
-	# bug #184815 - <= 3.9.6 BGP dissector integer overflow
-	epatch "${FILESDIR}"/tcpdump-3.9.6-bgp-integer-overflow.patch
+	epatch "${FILESDIR}/${P}-libsmi-autodep.patch"
+	epatch "${FILESDIR}/${P}-ipv6-build.patch"
+	eautoreconf
 }
 
 src_compile() {
 	# tcpdump needs some optymalization. see bug #108391
-	( ! is-flag -O? || is-flag -O0 ) && append-flags -O
+	( ! is-flag -O? || is-flag -O0 ) && append-flags -O2
 
 	replace-flags -O[3-9] -O2
 	filter-flags -finline-functions
@@ -60,27 +63,23 @@ src_compile() {
 		append-flags -fno-unit-at-a-time
 	fi
 
-	local myconf
-	if ! use ssl ; then
-		myconf="--without-crypto"
-	fi
-
 	econf --with-user=tcpdump \
+		$(use_with ssl crypto) \
+		$(use_with smi) \
 		$(use_enable ipv6) \
 		$(use_enable samba smb) \
-		${myconf} || die "configure failed"
+		$(use_enable chroot chroot /var/lib/tcpdump)
 
 	make CCOPT="$CFLAGS" || die "make failed"
 }
 
-pkg_preinst() {
-	enewgroup tcpdump
-	enewuser tcpdump -1 -1 -1 tcpdump
-}
-
 src_install() {
 	dosbin tcpdump || die
 	doman tcpdump.1
 	dodoc *.awk
-	dodoc README FILES VERSION CHANGES
+	dodoc CHANGES CREDITS README
+
+	keepdir /var/lib/tcpdump
+	fperms 700 /var/lib/tcpdump
+	fowners tcpdump:tcpdump /var/lib/tcpdump
 }