From: Stefan Schantl <Stevee@ipfire.org>
Date: Mon, 6 Apr 2009 16:14:00 +0000 (+0200)
Subject: Updated tcpdump to Verion 4.0.0
X-Git-Tag: v2.5-beta1~49
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=08a65f335af466c9534aeb6036657115519b2781

Updated tcpdump to Verion 4.0.0
---

diff --git a/config/rootfiles/packages/tcpdump b/config/rootfiles/packages/tcpdump
index 8a87a59eb7..d951b87f74 100644
--- a/config/rootfiles/packages/tcpdump
+++ b/config/rootfiles/packages/tcpdump
@@ -1,2 +1,3 @@
-#usr/man/man1/tcpdump.1
-usr/sbin/tcpdump
++usr/sbin/tcpdump
++usr/sbin/tcpdump.4.0.0
+#usr/share/man/man1/tcpdump.1
diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index cdb1d69aec..000bea7b57 100644
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -289,7 +289,7 @@
 * taglib-1.5
 * tar-1.22
 * tcp_wrappers_7.6
-* tcpdump-3.8.3
+* tcpdump-4.0.0
 * tcptrack-1.3.0
 * teamspeak-2.0.24.1
 * texinfo-4.8
diff --git a/lfs/tcpdump b/lfs/tcpdump
index 6b0f9ef20a..4556428b3e 100644
--- a/lfs/tcpdump
+++ b/lfs/tcpdump
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 3.8.3
+VER        = 4.0.0
 
 THISAPP    = tcpdump-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = tcpdump
-PAK_VER    = 1
+PAK_VER    = 2
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 30645001f4b97019677cad88d3811904
+$(DL_FILE)_MD5 = b22ca72890df2301d922c9f2d17867f9
 
 install : $(TARGET)
 
@@ -77,11 +77,12 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/tcpdump-3.8.2-rsvp-dos.patch	#CAN 2005-1280
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/tcpdump-3.8.2-bgp-dos.patch	#CAN 2005-1267
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/tcpdump-3.8.2-bgp-dos-2.patch	#CAN 2005-1279
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/tcpdump-3.8.2-isis-dos.patch	#CAN 2005-1278
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/tcpdump-3.8.2-ldp-dos.patch	#CAN 2005-1279
+#	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/tcpdump-3.8.2-rsvp-dos.patch	#CAN 2005-1280
+#	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/tcpdump-3.8.2-bgp-dos.patch	#CAN 2005-1267
+#	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/tcpdump-3.8.2-bgp-dos-2.patch	#CAN 2005-1279
+#	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/tcpdump-3.8.2-isis-dos.patch	#CAN 2005-1278
+#	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/tcpdump-3.8.2-ldp-dos.patch	#CAN 2005-1279
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/tcpdump-4.0.0-noINET.patch
 	cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls --disable-ipv6
 	cd $(DIR_APP) && sed -i -e 's/#define\ HAVE_PCAP_DEBUG\ 1/#undef\ HAVE_PCAP_DEBUG/' config.h
 	cd $(DIR_APP) && make $(MAKETUNING) DEFS="-D_U_=\"\" -DHAVE_CONFIG_H"
diff --git a/src/patches/tcpdump-4.0.0-noINET.patch b/src/patches/tcpdump-4.0.0-noINET.patch
new file mode 100644
index 0000000000..2664134a6c
--- /dev/null
+++ b/src/patches/tcpdump-4.0.0-noINET.patch
@@ -0,0 +1,14 @@
+--- tcpdump-4.0.0.orig/print-enc.c	2008-09-01 09:44:22.000000000 +0700
++++ tcpdump-4.0.0/print-enc.c	2008-11-10 21:40:52.000000000 +0700
+@@ -77,9 +77,11 @@
+ 	case AF_INET:
+ 		ip_print(gndo, p, length);
+ 		break;
++#ifdef INTE6
+ 	case AF_INET6:
+ 		ip6_print(p, length);
+ 		break;
++#endif
+ 	}
+ 
+ out: