[ptxdist] [PATCH 3/4] tcpdump: version bump 4.5.1 -> 4.7.1

[Juergen Borleis <jbe@pengutronix.de>]

Signed-off-by: Juergen Borleis <jbe@pengutronix.de>
---
 rules/tcpdump.in   |  7 +++++++
 rules/tcpdump.make | 11 +++++++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/rules/tcpdump.in b/rules/tcpdump.in
index d9328be..74d6072 100644
--- a/rules/tcpdump.in
+++ b/rules/tcpdump.in
@@ -3,6 +3,7 @@ menuconfig TCPDUMP
 	tristate
 	prompt "tcpdump                       "
 	select LIBPCAP
+	select LIBCAP_NG if TCPDUMP_ENABLE_LIBCAP_NG
 	select OPENSSL if TCPDUMP_ENABLE_CRYPTO
 	help
 	  Tcpdump  prints out the headers of packets on a network interface
@@ -15,6 +16,12 @@ menuconfig TCPDUMP
 
 if TCPDUMP
 
+config TCPDUMP_ENABLE_LIBCAP_NG
+	bool
+	prompt "use libcap-ng as well"
+	help
+	  Use libpcap and libcap-ng
+
 config TCPDUMP_ENABLE_CRYPTO
 	bool
 	prompt "enable crypto support"
diff --git a/rules/tcpdump.make b/rules/tcpdump.make
index 897e6da..afdbc31 100644
--- a/rules/tcpdump.make
+++ b/rules/tcpdump.make
@@ -1,6 +1,7 @@
 # -*-makefile-*-
 #
 # Copyright (C) 2004-2009 by Robert Schwebel
+# Copyright (C) 2016 Juergen Borleis
 #
 # See CREDITS for details about who has contributed to this project.
 #
@@ -16,8 +17,8 @@ PACKAGES-$(PTXCONF_TCPDUMP) += tcpdump
 #
 # Paths and names
 #
-TCPDUMP_VERSION	:= 4.5.1
-TCPDUMP_MD5	:= 973a2513d0076e34aa9da7e15ed98e1b
+TCPDUMP_VERSION	:= 4.7.4
+TCPDUMP_MD5	:= 58af728de36f499341918fc4b8e827c3
 TCPDUMP		:= tcpdump-$(TCPDUMP_VERSION)
 TCPDUMP_SUFFIX	:= tar.gz
 TCPDUMP_URL	:= http://www.tcpdump.org/release/$(TCPDUMP).$(TCPDUMP_SUFFIX)
@@ -43,7 +44,9 @@ TCPDUMP_CONF_OPT	:= \
 	--$(call ptx/endis,PTXCONF_TCPDUMP_SMB)-smb \
 	$(GLOBAL_IPV6_OPTION) \
 	--without-smi \
-	--$(call ptx/wwo,PTXCONF_TCPDUMP_ENABLE_CRYPTO)-crypto
+	--with-system-libpcap \
+	--$(call ptx/wwo,PTXCONF_TCPDUMP_ENABLE_CRYPTO)-crypto \
+	--$(call ptx/wwo,PTXCONF_TCPDUMP_ENABLE_LIBCAP_NG)-cap-ng
 
 # FIXME: Unsupported switches yet
 #  --with-user=USERNAME    drop privileges by default to USERNAME
@@ -60,7 +63,7 @@ $(STATEDIR)/tcpdump.targetinstall:
 	@$(call install_fixup, tcpdump,PRIORITY,optional)
 	@$(call install_fixup, tcpdump,SECTION,base)
 	@$(call install_fixup, tcpdump,AUTHOR,"Robert Schwebel <r.schwebel@pengutronix.de>")
-	@$(call install_fixup, tcpdump,DESCRIPTION,missing)
+	@$(call install_fixup, tcpdump,DESCRIPTION,"TCP analyze tool")
 
 	@$(call install_copy, tcpdump, 0, 0, 0755, -, /usr/sbin/tcpdump)
 
-- 
2.8.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de