tcpdump: update to 4.99.5

Changes: https://git.tcpdump.org/tcpdump/blob/4a789712f187e3ac7b2c0044c3a3f8c71b83646e:/CHANGES Signed-off-by: Ivan Pavlov <[email protected]> Link: openwrt#16402 Signed-off-by: Hauke Mehrtens <[email protected]>
plappermaul · Sep 22, 2024 · 6b9e008 · 6b9e008
1 parent c7671a2
commit 6b9e008
Show file tree

Hide file tree

Showing 3 changed files with 188 additions and 188 deletions.
diff --git a/package/network/utils/tcpdump/Makefile b/package/network/utils/tcpdump/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=tcpdump
-PKG_VERSION:=4.99.4
+PKG_VERSION:=4.99.5
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://www.tcpdump.org/release/
-PKG_HASH:=0232231bb2f29d6bf2426e70a08a7e0c63a0d59a9b44863b7f5e2357a6e49fea
+PKG_HASH:=8c75856e00addeeadf70dad67c9ff3dd368536b2b8563abf6854d7c764cd3adb
 
 PKG_MAINTAINER:=Felix Fietkau <[email protected]>
 PKG_LICENSE:=BSD-3-Clause

diff --git a/package/network/utils/tcpdump/patches/001-remove_pcap_debug.patch b/package/network/utils/tcpdump/patches/001-remove_pcap_debug.patch
@@ -1,35 +1,31 @@
 --- a/configure
 +++ b/configure
-@@ -6568,97 +6568,6 @@ fi
-
+@@ -7346,97 +7346,6 @@ esac
+ fi
 
 
 -#
 -# Check for special debugging functions
 -#
--for ac_func in pcap_set_parser_debug
--do :
--  ac_fn_c_check_func "$LINENO" "pcap_set_parser_debug" "ac_cv_func_pcap_set_parser_debug"
--if test "x$ac_cv_func_pcap_set_parser_debug" = xyes; then :
--  cat >>confdefs.h <<_ACEOF
--#define HAVE_PCAP_SET_PARSER_DEBUG 1
--_ACEOF
+-ac_fn_c_check_func "$LINENO" "pcap_set_parser_debug" "ac_cv_func_pcap_set_parser_debug"
+-if test "x$ac_cv_func_pcap_set_parser_debug" = xyes
+-then :
+-  printf "%s\n" "#define HAVE_PCAP_SET_PARSER_DEBUG 1" >>confdefs.h
 -
 -fi
--done
 -
 -if test "$ac_cv_func_pcap_set_parser_debug" = "no" ; then
 -	#
 -	# OK, we don't have pcap_set_parser_debug() to set the libpcap
 -	# filter expression parser debug flag; can we directly set the
 -	# flag?
--	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pcap_debug is defined by libpcap" >&5
--$as_echo_n "checking whether pcap_debug is defined by libpcap... " >&6; }
+-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether pcap_debug is defined by libpcap" >&5
+-printf %s "checking whether pcap_debug is defined by libpcap... " >&6; }
 -	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 -/* end confdefs.h.  */
 -
 -int
--main ()
+-main (void)
 -{
 -
 -		extern int pcap_debug;
@@ -39,33 +35,35 @@
 -  ;
 -  return 0;
 -}
+-
 -_ACEOF
--if ac_fn_c_try_link "$LINENO"; then :
+-if ac_fn_c_try_link "$LINENO"
+-then :
 -  ac_lbl_cv_pcap_debug_defined=yes
--else
+-else $as_nop
 -  ac_lbl_cv_pcap_debug_defined=no
 -fi
--rm -f core conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext conftest.beam \
 -    conftest$ac_exeext conftest.$ac_ext
 -	if test "$ac_lbl_cv_pcap_debug_defined" = yes ; then
--		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
--$as_echo "yes" >&6; }
+-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-printf "%s\n" "yes" >&6; }
 -
--$as_echo "#define HAVE_PCAP_DEBUG 1" >>confdefs.h
+-printf "%s\n" "#define HAVE_PCAP_DEBUG 1" >>confdefs.h
 -
 -	else
--		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
+-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-printf "%s\n" "no" >&6; }
 -		#
 -		# OK, what about "yydebug"?
 -		#
--		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether yydebug is defined by libpcap" >&5
--$as_echo_n "checking whether yydebug is defined by libpcap... " >&6; }
+-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether yydebug is defined by libpcap" >&5
+-printf %s "checking whether yydebug is defined by libpcap... " >&6; }
 -		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 -/* end confdefs.h.  */
 -
 -int
--main ()
+-main (void)
 -{
 -
 -			extern int yydebug;
@@ -75,26 +73,28 @@
 -  ;
 -  return 0;
 -}
+-
 -_ACEOF
--if ac_fn_c_try_link "$LINENO"; then :
+-if ac_fn_c_try_link "$LINENO"
+-then :
 -  ac_lbl_cv_yydebug_defined=yes
--else
+-else $as_nop
 -  ac_lbl_cv_yydebug_defined=no
 -fi
--rm -f core conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext conftest.beam \
 -    conftest$ac_exeext conftest.$ac_ext
 -		if test "$ac_lbl_cv_yydebug_defined" = yes ; then
--			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
--$as_echo "yes" >&6; }
+-			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-printf "%s\n" "yes" >&6; }
 -
--$as_echo "#define HAVE_YYDEBUG 1" >>confdefs.h
+-printf "%s\n" "#define HAVE_YYDEBUG 1" >>confdefs.h
 -
 -		else
--			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
+-			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-printf "%s\n" "no" >&6; }
 -		fi
 -	fi
 -fi
- for ac_func in pcap_set_optimizer_debug
- do :
-   ac_fn_c_check_func "$LINENO" "pcap_set_optimizer_debug" "ac_cv_func_pcap_set_optimizer_debug"
+ ac_fn_c_check_func "$LINENO" "pcap_set_optimizer_debug" "ac_cv_func_pcap_set_optimizer_debug"
+ if test "x$ac_cv_func_pcap_set_optimizer_debug" = xyes
+ then :