3.9.4 version bump, marking 3.9.3 x86 stable.

(Portage version: 2.0.53)

5 files changed, 73 insertions, 9 deletions

diff --git a/net-analyzer/tcpdump/ChangeLog b/net-analyzer/tcpdump/ChangeLog
index 8f433c8bb72c..ee714270418a 100644
--- a/net-analyzer/tcpdump/ChangeLog
+++ b/net-analyzer/tcpdump/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/tcpdump
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/ChangeLog,v 1.56 2005/10/09 10:02:46 mkay Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/ChangeLog,v 1.57 2006/01/08 22:55:00 vanquirius Exp $
+
+*tcpdump-3.9.4 (08 Jan 2006)
+
+  08 Jan 2006; Marcelo Goes <vanquirius@gentoo.org> tcpdump-3.9.3.ebuild,
+  +tcpdump-3.9.4.ebuild:
+  3.9.4 version bump, marking 3.9.3 x86 stable.
 
   09 Oct 2005; <mkay@gentoo.org> tcpdump-3.9.3.ebuild:
   Forcing at least -O optymalization. This close bug #108391
diff --git a/net-analyzer/tcpdump/Manifest b/net-analyzer/tcpdump/Manifest
index 798a38656e3c..58a7a06c819c 100644
--- a/net-analyzer/tcpdump/Manifest
+++ b/net-analyzer/tcpdump/Manifest
@@ -1,9 +1,11 @@
 MD5 db2c2afd246668438eeee959996a2d06 ChangeLog 7598
-MD5 1465cdeb961745379a8ae1402b3e51ab metadata.xml 268
-MD5 7a2060950c186c05933e76d09893a89f tcpdump-3.8.3-r4.ebuild 1476
-MD5 cf2353e1efd18b1d25aeaeb1da182a11 tcpdump-3.9.3.ebuild 1456
-MD5 ede90d270bda1c6dcdf701ea18c6dbdc files/digest-tcpdump-3.9.3 65
 MD5 d285bb203f9e48fc23492e4c72d61a94 files/digest-tcpdump-3.8.3-r4 65
+MD5 ede90d270bda1c6dcdf701ea18c6dbdc files/digest-tcpdump-3.9.3 65
+MD5 68ea0a2e59c47f06c9961da92b9d40a8 files/digest-tcpdump-3.9.4 65
 MD5 f02e63da753d8b83de7f47d3de976e95 files/tcpdump-3.8.3-bgp-infinite-loop2.patch 556
 MD5 373e9bba235a67d1de8eb1356151f32c files/tcpdump-3.8.3-gcc4.patch 3162
 MD5 4d0df7aa1535098ccef25ba7e86e5e95 files/tcpdump-3.8.3-gentoo.patch 4002
+MD5 1465cdeb961745379a8ae1402b3e51ab metadata.xml 268
+MD5 7a2060950c186c05933e76d09893a89f tcpdump-3.8.3-r4.ebuild 1476
+MD5 62ed994aa0e2513c4ef88a99f18809a4 tcpdump-3.9.3.ebuild 1455
+MD5 cf2353e1efd18b1d25aeaeb1da182a11 tcpdump-3.9.4.ebuild 1456
diff --git a/net-analyzer/tcpdump/files/digest-tcpdump-3.9.4 b/net-analyzer/tcpdump/files/digest-tcpdump-3.9.4
new file mode 100644
index 000000000000..6baeac72564c
--- /dev/null
+++ b/net-analyzer/tcpdump/files/digest-tcpdump-3.9.4
@@ -0,0 +1 @@
+MD5 4b64755bbc8ba1af49c747271a6df5b8 tcpdump-3.9.4.tar.gz 716862
diff --git a/net-analyzer/tcpdump/tcpdump-3.9.3.ebuild b/net-analyzer/tcpdump/tcpdump-3.9.3.ebuild
index 54768dc9cfa1..7dda589fc8c3 100644
--- a/net-analyzer/tcpdump/tcpdump-3.9.3.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-3.9.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/tcpdump-3.9.3.ebuild,v 1.2 2005/10/09 10:02:46 mkay Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/tcpdump-3.9.3.ebuild,v 1.3 2006/01/08 22:55:01 vanquirius Exp $
 
 inherit flag-o-matic toolchain-funcs eutils
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.tcpdump.org/release/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE="ssl ipv6"
 
 DEPEND="virtual/libpcap
diff --git a/net-analyzer/tcpdump/tcpdump-3.9.4.ebuild b/net-analyzer/tcpdump/tcpdump-3.9.4.ebuild
new file mode 100644
index 000000000000..8ff2edb760d5
--- /dev/null
+++ b/net-analyzer/tcpdump/tcpdump-3.9.4.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/tcpdump-3.9.4.ebuild,v 1.1 2006/01/08 22:55:01 vanquirius 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"
+	#mirror://sourceforge/tcpdump/${P}.tar.gz
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="ssl ipv6"
+
+DEPEND="virtual/libpcap
+	ssl? ( >=dev-libs/openssl-0.9.6m )"
+
+src_unpack() {
+	unpack ${A}
+
+	if use ssl ; then
+		sed -i -e 's|des\(_cbc_encrypt\)|DES\1|' "${S}"/configure || \
+			die "sed configure failed"
+	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
+
+	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 #48747
+	fi
+
+	local myconf
+	use ssl || myconf="${myconf} --without-crypto"
+	econf $(use_enable ipv6) ${myconf} || die
+	make CCOPT="$CFLAGS" || die
+}
+
+src_install() {
+	dosbin tcpdump || die
+	doman tcpdump.1
+	dodoc *.awk
+	dodoc README FILES VERSION CHANGES
+}