tcpdump: update to 4.99.7

Changelog: https://github.com/the-tcpdump-group/tcpdump/blob/tcpdump-4.99/CHANGES

001-remove_pcap_debug.patch - rebased manually

Signed-off-by: Ivan Pavlov <AuthorReflex@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/25385
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
This commit is contained in:
Ivan Pavlov authored and Hauke Mehrtens committed 2026-09-26 21:58:04 +02:00
1 parent b36d01c696
commit b6bb254a85
3 files changed
+15 -13

No files matched your search

+2 -2
View File
@@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=tcpdump
PKG_VERSION:=4.99.6
PKG_VERSION:=4.99.7
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://www.tcpdump.org/release/
PKG_HASH:=5839921a0f67d7d8fa3dacd9cd41e44c89ccb867e8a6db216d62628c7fd14b09
PKG_HASH:=8be364e28d3b745ef1459b385cd2f4bc0e1ebad7a5d2ebdf70071d6c9b5b9a54
PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
PKG_LICENSE:=BSD-3-Clause
@@ -1,6 +1,6 @@
--- a/configure
+++ b/configure
@@ -7357,97 +7357,6 @@ esac
@@ -7697,99 +7697,6 @@ esac
fi
@@ -40,8 +40,9 @@
-if ac_fn_c_try_link "$LINENO"
-then :
- ac_lbl_cv_pcap_debug_defined=yes
-else $as_nop
- ac_lbl_cv_pcap_debug_defined=no
-else case e in #(
- e) ac_lbl_cv_pcap_debug_defined=no ;;
-esac
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
- conftest$ac_exeext conftest.$ac_ext
@@ -78,8 +79,9 @@
-if ac_fn_c_try_link "$LINENO"
-then :
- ac_lbl_cv_yydebug_defined=yes
-else $as_nop
- ac_lbl_cv_yydebug_defined=no
-else case e in #(
- e) ac_lbl_cv_yydebug_defined=no ;;
-esac
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
- conftest$ac_exeext conftest.$ac_ext
@@ -532,7 +532,7 @@
/*
--- a/print-tcp.c
+++ b/print-tcp.c
@@ -629,6 +629,7 @@ tcp_print(netdissect_options *ndo,
@@ -630,6 +630,7 @@ tcp_print(netdissect_options *ndo,
ND_PRINT(" %u", utoval);
break;
@@ -540,7 +540,7 @@
case TCPOPT_MPTCP:
{
const u_char *snapend_save;
@@ -652,7 +653,7 @@ tcp_print(netdissect_options *ndo,
@@ -653,7 +654,7 @@ tcp_print(netdissect_options *ndo,
goto bad;
break;
}
@@ -549,7 +549,7 @@
case TCPOPT_FASTOPEN:
datalen = len - 2;
LENCHECK(datalen);
@@ -740,6 +741,7 @@ tcp_print(netdissect_options *ndo,
@@ -741,6 +742,7 @@ tcp_print(netdissect_options *ndo,
return;
}
@@ -557,7 +557,7 @@
if (ndo->ndo_packettype) {
switch (ndo->ndo_packettype) {
case PT_ZMTP1:
@@ -755,12 +757,15 @@ tcp_print(netdissect_options *ndo,
@@ -756,12 +758,15 @@ tcp_print(netdissect_options *ndo,
}
return;
}
@@ -573,7 +573,7 @@
} else if (IS_SRC_OR_DST_PORT(TELNET_PORT)) {
telnet_print(ndo, bp, length);
} else if (IS_SRC_OR_DST_PORT(SMTP_PORT)) {
@@ -779,10 +784,12 @@ tcp_print(netdissect_options *ndo,
@@ -780,10 +785,12 @@ tcp_print(netdissect_options *ndo,
} else if (IS_SRC_OR_DST_PORT(NETBIOS_SSN_PORT)) {
nbt_tcp_print(ndo, bp, length);
#endif
@@ -587,7 +587,7 @@
#ifdef ENABLE_SMB
} else if (IS_SRC_OR_DST_PORT(SMB_PORT)) {
smb_tcp_print(ndo, bp, length);
@@ -790,18 +797,22 @@ tcp_print(netdissect_options *ndo,
@@ -791,18 +798,22 @@ tcp_print(netdissect_options *ndo,
} else if (IS_SRC_OR_DST_PORT(RTSP_PORT)) {
ND_PRINT(": ");
rtsp_print(ndo, bp, length);