[ptxdist] [PATCH v2] tcpdump: Version bump 4.9.3 -> 4.99.1.

[ptxdist] [PATCH v2] tcpdump: Version bump 4.9.3 -> 4.99.1.

[Christian Melki]

Renamed option for system pcap.
Also, tcpdump moved from sbin to bin.
Licence file changed with whitespace, update hash.

Signed-off-by: Christian Melki <christian.melki@t2data.com>
---
 rules/tcpdump.make | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/rules/tcpdump.make b/rules/tcpdump.make
index ef4c1116c..b618c8749 100644
--- a/rules/tcpdump.make
+++ b/rules/tcpdump.make
@@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_TCPDUMP) += tcpdump
 #
 # Paths and names
 #
-TCPDUMP_VERSION	:= 4.9.3
-TCPDUMP_MD5	:= a4ead41d371f91aa0a2287f589958bae
+TCPDUMP_VERSION	:= 4.99.1
+TCPDUMP_MD5	:= 929a255c71a9933608bd7c31927760f7
 TCPDUMP		:= tcpdump-$(TCPDUMP_VERSION)
 TCPDUMP_SUFFIX	:= tar.gz
 TCPDUMP_URL	:= http://www.tcpdump.org/release/$(TCPDUMP).$(TCPDUMP_SUFFIX)
@@ -24,7 +24,7 @@ TCPDUMP_SOURCE	:= $(SRCDIR)/$(TCPDUMP).$(TCPDUMP_SUFFIX)
 TCPDUMP_DIR	:= $(BUILDDIR)/$(TCPDUMP)
 TCPDUMP_LICENSE	:= BSD-3-Clause
 TCPDUMP_LICENSE_FILES := \
-	file://LICENSE;md5=1d4b0366557951c84a94fabe3529f867
+	file://LICENSE;md5=5eb289217c160e2920d2e35bddc36453
 
 # ----------------------------------------------------------------------------
 # Prepare
@@ -46,7 +46,7 @@ TCPDUMP_CONF_OPT	:= \
 	--with-gcc \
 	--without-smi \
 	--without-sandbox-capsicum \
-	--with-system-libpcap \
+	--disable-local-libpcap \
 	--$(call ptx/wwo,PTXCONF_TCPDUMP_ENABLE_CRYPTO)-crypto \
 	--$(call ptx/wwo,PTXCONF_TCPDUMP_ENABLE_LIBCAP_NG)-cap-ng
 
@@ -67,7 +67,7 @@ $(STATEDIR)/tcpdump.targetinstall:
 	@$(call install_fixup, tcpdump,AUTHOR,"Robert Schwebel <r.schwebel@pengutronix.de>")
 	@$(call install_fixup, tcpdump,DESCRIPTION,"TCP analyze tool")
 
-	@$(call install_copy, tcpdump, 0, 0, 0755, -, /usr/sbin/tcpdump)
+	@$(call install_copy, tcpdump, 0, 0, 0755, -, /usr/bin/tcpdump)
 
 	@$(call install_finish, tcpdump)
 
-- 
2.30.2


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [APPLIED] tcpdump: Version bump 4.9.3 -> 4.99.1.

[Michael Olbrich]

Thanks, applied as 926001317c57fc1eed1c8bb281e9f2961880e9bf.

Michael

[sent from post-receive hook]

On Fri, 21 Jan 2022 08:19:28 +0100, Christian Melki <christian.melki@t2data.com> wrote:
> Renamed option for system pcap.
> Also, tcpdump moved from sbin to bin.
> Licence file changed with whitespace, update hash.
> 
> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> Message-Id: <20220107093457.29709-1-christian.melki@t2data.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/tcpdump.make b/rules/tcpdump.make
> index ef4c1116c36c..b618c8749480 100644
> --- a/rules/tcpdump.make
> +++ b/rules/tcpdump.make
> @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_TCPDUMP) += tcpdump
>  #
>  # Paths and names
>  #
> -TCPDUMP_VERSION	:= 4.9.3
> -TCPDUMP_MD5	:= a4ead41d371f91aa0a2287f589958bae
> +TCPDUMP_VERSION	:= 4.99.1
> +TCPDUMP_MD5	:= 929a255c71a9933608bd7c31927760f7
>  TCPDUMP		:= tcpdump-$(TCPDUMP_VERSION)
>  TCPDUMP_SUFFIX	:= tar.gz
>  TCPDUMP_URL	:= http://www.tcpdump.org/release/$(TCPDUMP).$(TCPDUMP_SUFFIX)
> @@ -24,7 +24,7 @@ TCPDUMP_SOURCE	:= $(SRCDIR)/$(TCPDUMP).$(TCPDUMP_SUFFIX)
>  TCPDUMP_DIR	:= $(BUILDDIR)/$(TCPDUMP)
>  TCPDUMP_LICENSE	:= BSD-3-Clause
>  TCPDUMP_LICENSE_FILES := \
> -	file://LICENSE;md5=1d4b0366557951c84a94fabe3529f867
> +	file://LICENSE;md5=5eb289217c160e2920d2e35bddc36453
>  
>  # ----------------------------------------------------------------------------
>  # Prepare
> @@ -46,7 +46,7 @@ TCPDUMP_CONF_OPT	:= \
>  	--with-gcc \
>  	--without-smi \
>  	--without-sandbox-capsicum \
> -	--with-system-libpcap \
> +	--disable-local-libpcap \
>  	--$(call ptx/wwo,PTXCONF_TCPDUMP_ENABLE_CRYPTO)-crypto \
>  	--$(call ptx/wwo,PTXCONF_TCPDUMP_ENABLE_LIBCAP_NG)-cap-ng
>  
> @@ -67,7 +67,7 @@ $(STATEDIR)/tcpdump.targetinstall:
>  	@$(call install_fixup, tcpdump,AUTHOR,"Robert Schwebel <r.schwebel@pengutronix.de>")
>  	@$(call install_fixup, tcpdump,DESCRIPTION,"TCP analyze tool")
>  
> -	@$(call install_copy, tcpdump, 0, 0, 0755, -, /usr/sbin/tcpdump)
> +	@$(call install_copy, tcpdump, 0, 0, 0755, -, /usr/bin/tcpdump)
>  
>  	@$(call install_finish, tcpdump)
>  

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de