diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2014-01-31 09:07:43 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2014-01-31 09:21:41 +0100 |
| commit | 4408a6789259d8c5faf87b0cb3283515df4d8586 (patch) | |
| tree | 572e8ec6d05c6ba41c34968aa5488aaf4a5cc94d | |
| parent | f8d93ee37a7d353cd426185c3ef39fb9e2a13ca4 (diff) | |
| download | ptxdist-4408a6789259d8c5faf87b0cb3283515df4d8586.tar.gz ptxdist-4408a6789259d8c5faf87b0cb3283515df4d8586.tar.xz | |
tcpdump: version bump 4.1.1 -> 4.5.1
Just an update to the latest version. Cleanup configure options while at it and
enable crypto support again. It seems that's no longer broken.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | rules/tcpdump.in | 1 | ||||
| -rw-r--r-- | rules/tcpdump.make | 28 |
2 files changed, 11 insertions, 18 deletions
diff --git a/rules/tcpdump.in b/rules/tcpdump.in index debde63b8..d9328be7c 100644 --- a/rules/tcpdump.in +++ b/rules/tcpdump.in @@ -18,7 +18,6 @@ if TCPDUMP config TCPDUMP_ENABLE_CRYPTO bool prompt "enable crypto support" - depends on BROKEN help Select this, if you don't need support for encryption (e.g. IPsec ESP packets) diff --git a/rules/tcpdump.make b/rules/tcpdump.make index 5d3595fb0..1133887b4 100644 --- a/rules/tcpdump.make +++ b/rules/tcpdump.make @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_TCPDUMP) += tcpdump # # Paths and names # -TCPDUMP_VERSION := 4.1.1 -TCPDUMP_MD5 := d0dd58bbd6cd36795e05c6f1f74420b0 +TCPDUMP_VERSION := 4.5.1 +TCPDUMP_MD5 := 973a2513d0076e34aa9da7e15ed98e1b TCPDUMP := tcpdump-$(TCPDUMP_VERSION) TCPDUMP_SUFFIX := tar.gz TCPDUMP_URL := http://www.tcpdump.org/release/$(TCPDUMP).$(TCPDUMP_SUFFIX) @@ -28,32 +28,26 @@ TCPDUMP_DIR := $(BUILDDIR)/$(TCPDUMP) # Prepare # ---------------------------------------------------------------------------- -TCPDUMP_PATH := PATH=$(CROSS_PATH) -TCPDUMP_ENV := $(CROSS_ENV) +TCPDUMP_CONF_ENV = \ + $(CROSS_ENV) \ + ac_cv_linux_vers=$(KERNEL_HEADER_VERSION_MAJOR) \ + td_cv_buggygetaddrinfo=no # # autoconf # -TCPDUMP_AUTOCONF = \ +TCPDUMP_CONF_TOOL := autoconf +TCPDUMP_CONF_OPT := \ $(CROSS_AUTOCONF_USR) \ + --$(call ptx/endis,PTXCONF_TCPDUMP_SMB)-smb \ $(GLOBAL_IPV6_OPTION) \ - ac_cv_linux_vers=$(KERNEL_HEADER_VERSION_MAJOR) \ - td_cv_buggygetaddrinfo=no + --without-smi \ + --$(call ptx/wwo,PTXCONF_TCPDUMP_ENABLE_CRYPTO)-crypto # FIXME: Unsupported switches yet # --with-user=USERNAME drop privileges by default to USERNAME # --with-chroot=DIRECTORY when dropping privileges, chroot to DIRECTORY -ifndef PTXCONF_TCPDUMP_ENABLE_CRYPTO -TCPDUMP_AUTOCONF += --without-crypto -endif - -ifdef PTXCONF_TCPDUMP_SMB -TCPDUMP_AUTOCONF += --enable-smb -else -TCPDUMP_AUTOCONF += --disable-smb -endif - # ---------------------------------------------------------------------------- # Target-Install # ---------------------------------------------------------------------------- |