From 3bf629e8baaf61d89db9832efd95fb5db903e542 Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 6 Jun 2013 10:58:04 +0200
Subject: [PATCH] tcpdump: Update to 4.4.0.

---
 config/rootfiles/packages/tcpdump      |  1 -
 lfs/tcpdump                            | 27 ++++++++++++++------------
 src/patches/tcpdump-4.0.0-noINET.patch | 14 -------------
 3 files changed, 15 insertions(+), 27 deletions(-)
 delete mode 100644 src/patches/tcpdump-4.0.0-noINET.patch

diff --git a/config/rootfiles/packages/tcpdump b/config/rootfiles/packages/tcpdump
index b2d4b66b4..7db74e80d 100644
--- a/config/rootfiles/packages/tcpdump
+++ b/config/rootfiles/packages/tcpdump
@@ -1,3 +1,2 @@
 usr/sbin/tcpdump
-usr/sbin/tcpdump.4.0.0
 #usr/share/man/man1/tcpdump.1
diff --git a/lfs/tcpdump b/lfs/tcpdump
index 4556428b3..934e85178 100644
--- a/lfs/tcpdump
+++ b/lfs/tcpdump
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 4.0.0
+VER        = 4.4.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    = 2
+PAK_VER    = 3
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = b22ca72890df2301d922c9f2d17867f9
+$(DL_FILE)_MD5 = 6f75aabcffd012f73bd7c331bb5d8232
 
 install : $(TARGET)
 
@@ -77,15 +77,18 @@ $(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-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"
+	cd $(DIR_APP) && \
+		./configure \
+			--prefix=/usr \
+			--disable-nls \
+			--with-crypto \
+			--without-smi
+
+	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
+
+	# Remove versioned binary
+	rm -vf /usr/sbin/tcpdump.$(VER)
+
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
diff --git a/src/patches/tcpdump-4.0.0-noINET.patch b/src/patches/tcpdump-4.0.0-noINET.patch
deleted file mode 100644
index 2664134a6..000000000
--- a/src/patches/tcpdump-4.0.0-noINET.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- 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:
-- 
2.39.2