From 141d04a4d6b9eb599a1adb73defa54b07817cdbc Mon Sep 17 00:00:00 2001 From: Ivan Pavlov Date: Tue, 27 Jan 2026 17:41:05 +0300 Subject: [PATCH] tcpdump: update to 4.99.6 Various improvements and bug fixes. Changelog: https://github.com/the-tcpdump-group/tcpdump/blob/tcpdump-4.99.6/CHANGES Signed-off-by: Ivan Pavlov Link: https://github.com/openwrt/openwrt/pull/21744 Signed-off-by: Hauke Mehrtens --- package/network/utils/tcpdump/Makefile | 4 +-- .../patches/001-remove_pcap_debug.patch | 2 +- .../tcpdump/patches/100-tcpdump_mini.patch | 26 +++++++++---------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/package/network/utils/tcpdump/Makefile b/package/network/utils/tcpdump/Makefile index 4cfb63d5bb4..c8a14c5d4fa 100644 --- 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.5 +PKG_VERSION:=4.99.6 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://www.tcpdump.org/release/ -PKG_HASH:=8c75856e00addeeadf70dad67c9ff3dd368536b2b8563abf6854d7c764cd3adb +PKG_HASH:=5839921a0f67d7d8fa3dacd9cd41e44c89ccb867e8a6db216d62628c7fd14b09 PKG_MAINTAINER:=Felix Fietkau 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 index 948e3b5f569..dd984fb033b 100644 --- a/package/network/utils/tcpdump/patches/001-remove_pcap_debug.patch +++ b/package/network/utils/tcpdump/patches/001-remove_pcap_debug.patch @@ -1,6 +1,6 @@ --- a/configure +++ b/configure -@@ -7346,97 +7346,6 @@ esac +@@ -7357,97 +7357,6 @@ esac fi diff --git a/package/network/utils/tcpdump/patches/100-tcpdump_mini.patch b/package/network/utils/tcpdump/patches/100-tcpdump_mini.patch index eeaa17c8b2f..3c68e1f614d 100644 --- a/package/network/utils/tcpdump/patches/100-tcpdump_mini.patch +++ b/package/network/utils/tcpdump/patches/100-tcpdump_mini.patch @@ -87,7 +87,7 @@ LIBNETDISSECT_SRC=\ addrtoname.c \ addrtostr.c \ -@@ -254,6 +334,8 @@ LIBNETDISSECT_SRC=\ +@@ -253,6 +333,8 @@ LIBNETDISSECT_SRC=\ strtoaddr.c \ util-print.c @@ -215,7 +215,7 @@ break; --- a/print-icmp6.c +++ b/print-icmp6.c -@@ -1369,7 +1369,7 @@ get_upperlayer(netdissect_options *ndo, +@@ -1383,7 +1383,7 @@ get_upperlayer(netdissect_options *ndo, nh = GET_U_1(fragh->ip6f_nxt); hlen = sizeof(struct ip6_frag); break; @@ -224,7 +224,7 @@ case IPPROTO_AH: ah = (const struct ah *)bp; if (!ND_TTEST_1(ah->ah_len)) -@@ -1377,7 +1377,7 @@ get_upperlayer(netdissect_options *ndo, +@@ -1391,7 +1391,7 @@ get_upperlayer(netdissect_options *ndo, nh = GET_U_1(ah->ah_nxt); hlen = (GET_U_1(ah->ah_len) + 2) << 2; break; @@ -337,7 +337,7 @@ default: /* * AH and ESP are, in the RFCs that describe them, -@@ -371,6 +372,7 @@ ip6_print(netdissect_options *ndo, const +@@ -373,6 +374,7 @@ ip6_print(netdissect_options *ndo, const nh = GET_U_1(cp); break; @@ -345,7 +345,7 @@ case IPPROTO_FRAGMENT: advance = frag6_print(ndo, cp, (const u_char *)ip6); if (advance < 0 || ndo->ndo_snapend <= cp + advance) { -@@ -401,7 +403,7 @@ ip6_print(netdissect_options *ndo, const +@@ -403,7 +405,7 @@ ip6_print(netdissect_options *ndo, const nh = GET_U_1(cp); nd_pop_packet_info(ndo); return; @@ -532,7 +532,7 @@ /* --- a/print-tcp.c +++ b/print-tcp.c -@@ -612,6 +612,7 @@ tcp_print(netdissect_options *ndo, +@@ -629,6 +629,7 @@ tcp_print(netdissect_options *ndo, ND_PRINT(" %u", utoval); break; @@ -540,7 +540,7 @@ case TCPOPT_MPTCP: { const u_char *snapend_save; -@@ -635,7 +636,7 @@ tcp_print(netdissect_options *ndo, +@@ -652,7 +653,7 @@ tcp_print(netdissect_options *ndo, goto bad; break; } @@ -549,7 +549,7 @@ case TCPOPT_FASTOPEN: datalen = len - 2; LENCHECK(datalen); -@@ -720,6 +721,7 @@ tcp_print(netdissect_options *ndo, +@@ -740,6 +741,7 @@ tcp_print(netdissect_options *ndo, return; } @@ -557,7 +557,7 @@ if (ndo->ndo_packettype) { switch (ndo->ndo_packettype) { case PT_ZMTP1: -@@ -735,12 +737,15 @@ tcp_print(netdissect_options *ndo, +@@ -755,12 +757,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)) { -@@ -759,10 +764,12 @@ tcp_print(netdissect_options *ndo, +@@ -779,10 +784,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); -@@ -770,18 +777,22 @@ tcp_print(netdissect_options *ndo, +@@ -790,18 +797,22 @@ tcp_print(netdissect_options *ndo, } else if (IS_SRC_OR_DST_PORT(RTSP_PORT)) { ND_PRINT(": "); rtsp_print(ndo, bp, length); @@ -752,8 +752,8 @@ else if (IS_SRC_OR_DST_PORT(SIP_PORT)) sip_print(ndo, cp, length); +#ifndef TCPDUMP_MINI - else if (IS_SRC_OR_DST_PORT(OTV_PORT)) - otv_print(ndo, cp, length); + else if (IS_SRC_OR_DST_PORT(VXLAN_LINUX_PORT)) + vxlan_print(ndo, cp, length); else if (IS_SRC_OR_DST_PORT(VXLAN_PORT)) @@ -721,6 +748,7 @@ udp_print(netdissect_options *ndo, const someip_print(ndo, cp, length); -- 2.47.3