bug 95349

Package-Manager: portage-2.0.51.19

5 files changed, 79 insertions, 5 deletions

diff --git a/net-analyzer/tcpdump/ChangeLog b/net-analyzer/tcpdump/ChangeLog
index 60202fb60782..55ad3adb49be 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.44 2005/05/16 01:08:22 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/ChangeLog,v 1.45 2005/06/09 21:43:25 vanquirius Exp $
+
+*tcpdump-3.8.3-r3 (09 Jun 2005)
+
+  09 Jun 2005; Marcelo Goes <vanquirius@gentoo.org>
+  +files/tcpdump-3.8.3-bgp-infinite-loop2.patch, +tcpdump-3.8.3-r3.ebuild:
+  Adding patch for security bug 95349.
 
   15 May 2005; Marcelo Goes <vanquirius@gentoo.org> tcpdump-3.8.3-r1.ebuild:
   Use toolchain-funcs.eclass instead of gcc.eclass. See bug 92745.
diff --git a/net-analyzer/tcpdump/Manifest b/net-analyzer/tcpdump/Manifest
index 32745cf5c4e5..3ba3905524d9 100644
--- a/net-analyzer/tcpdump/Manifest
+++ b/net-analyzer/tcpdump/Manifest
@@ -1,8 +1,11 @@
+MD5 af669d9e6e0070e8ba421ce299c25af1 tcpdump-3.8.3-r1.ebuild 1103
+MD5 1686a2312f4c4053809ef31229504121 tcpdump-3.8.3-r3.ebuild 1301
 MD5 9190cb48f1436624b83ce814ff0b37eb ChangeLog 6049
-MD5 8dc0b8f2b666a8fdad1d4a12b882ac1b tcpdump-3.8.3-r2.ebuild 1243
 MD5 1465cdeb961745379a8ae1402b3e51ab metadata.xml 268
-MD5 af669d9e6e0070e8ba421ce299c25af1 tcpdump-3.8.3-r1.ebuild 1103
-MD5 d285bb203f9e48fc23492e4c72d61a94 files/digest-tcpdump-3.8.3-r2 65
-MD5 4d0df7aa1535098ccef25ba7e86e5e95 files/tcpdump-3.8.3-gentoo.patch 4002
+MD5 8dc0b8f2b666a8fdad1d4a12b882ac1b tcpdump-3.8.3-r2.ebuild 1243
 MD5 373e9bba235a67d1de8eb1356151f32c files/tcpdump-3.8.3-gcc4.patch 3162
 MD5 d285bb203f9e48fc23492e4c72d61a94 files/digest-tcpdump-3.8.3-r1 65
+MD5 d285bb203f9e48fc23492e4c72d61a94 files/digest-tcpdump-3.8.3-r2 65
+MD5 d285bb203f9e48fc23492e4c72d61a94 files/digest-tcpdump-3.8.3-r3 65
+MD5 f02e63da753d8b83de7f47d3de976e95 files/tcpdump-3.8.3-bgp-infinite-loop2.patch 556
+MD5 4d0df7aa1535098ccef25ba7e86e5e95 files/tcpdump-3.8.3-gentoo.patch 4002
diff --git a/net-analyzer/tcpdump/files/digest-tcpdump-3.8.3-r3 b/net-analyzer/tcpdump/files/digest-tcpdump-3.8.3-r3
new file mode 100644
index 000000000000..3fe68092ba2f
--- /dev/null
+++ b/net-analyzer/tcpdump/files/digest-tcpdump-3.8.3-r3
@@ -0,0 +1 @@
+MD5 30645001f4b97019677cad88d3811904 tcpdump-3.8.3.tar.gz 567116
diff --git a/net-analyzer/tcpdump/files/tcpdump-3.8.3-bgp-infinite-loop2.patch b/net-analyzer/tcpdump/files/tcpdump-3.8.3-bgp-infinite-loop2.patch
new file mode 100644
index 000000000000..5eb66f29dd70
--- /dev/null
+++ b/net-analyzer/tcpdump/files/tcpdump-3.8.3-bgp-infinite-loop2.patch
@@ -0,0 +1,16 @@
+diff --exclude='*~' -Naur tcpdump-3.8.3.orig/print-bgp.c tcpdump-3.8.3/print-bgp.c
+--- tcpdump-3.8.3.orig/print-bgp.c	2005-06-09 18:24:31.000000000 -0300
++++ tcpdump-3.8.3/print-bgp.c	2005-06-09 18:26:18.000000000 -0300
+@@ -1648,9 +1648,10 @@
+ 		while (dat + length > p) {
+ 			char buf[MAXHOSTNAMELEN + 100];
+ 			i = decode_prefix4(p, buf, sizeof(buf));
+-			if (i == -1)
++			if (i == -1) {
+ 				printf("\n\t    (illegal prefix length)");
+-			else if (i == -2)
++				break;
++			} else if (i == -2)
+ 				goto trunc;
+ 			else {
+ 				printf("\n\t    %s", buf);
diff --git a/net-analyzer/tcpdump/tcpdump-3.8.3-r3.ebuild b/net-analyzer/tcpdump/tcpdump-3.8.3-r3.ebuild
new file mode 100644
index 000000000000..1cf211f41236
--- /dev/null
+++ b/net-analyzer/tcpdump/tcpdump-3.8.3-r3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/tcpdump-3.8.3-r3.ebuild,v 1.1 2005/06/09 21:43:25 vanquirius Exp $
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="A Tool for network monitoring and data acquisition"
+HOMEPAGE="http://www.tcpdump.org/"
+SRC_URI="mirror://sourceforge/tcpdump/${P}.tar.gz
+	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 ~sparc x86"
+IUSE="ssl ipv6"
+
+DEPEND="virtual/libpcap
+	ssl? ( >=dev-libs/openssl-0.9.6m )"
+
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${P}-gentoo.patch
+	epatch ${FILESDIR}/${P}-gcc4.patch
+	epatch ${FILESDIR}/${P}-bgp-infinite-loop2.patch
+}
+
+src_compile() {
+	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
+
+	econf $(use_with ssl crypto) $(use_enable ipv6) || die
+	make CCOPT="$CFLAGS" || die
+}
+
+src_install() {
+	dosbin tcpdump || die
+	doman tcpdump.1
+	dodoc *.awk
+	dodoc README FILES VERSION CHANGES
+}