!68 revert "fix CVE-2024-2397"

From: @xinghe_1 
Reviewed-by: @robertxw 
Signed-off-by: @robertxw

backport-0010-Fix-a-not-defined-macro-error.patch

@@ -0,0 +1,25 @@
+From 96e5049f1f890800bcd2e05c2cac26af39331a81 Mon Sep 17 00:00:00 2001
+From: rpm-build <rpm-build>
+Date: Sat, 20 Apr 2024 15:56:15 +0800
+Subject: [PATCH] fix a not defined macro error
+
+---
+ interface.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/interface.h b/interface.h
+index 58e5ab3..c631c14 100644
+--- a/interface.h
++++ b/interface.h
+@@ -63,7 +63,7 @@ struct bpf_program;
+  * With Capsicum bpf_dump() may be not declared even if HAVE_BPF_DUMP is set.
+  */
+ #if !defined(HAVE_BPF_DUMP) || \
+-    (defined(HAVE_BPF_DUMP) && HAVE_CAPSICUM && !defined(bpf_dump))
++    (defined(HAVE_BPF_DUMP) && defined(HAVE_CAPSICUM) && !defined(bpf_dump))
+ extern void bpf_dump(const struct bpf_program *, int);
+ 
+ #endif
+-- 
+2.27.0
+

tcpdump.spec

@@ -2,10 +2,10 @@
 
 Name:           tcpdump
 Epoch:          14
-Version:        4.99.3
-Release:        1
+Version:        4.99.4
+Release:        4
 Summary:        A network traffic monitoring tool
-License:        BSD with advertising
+License:        BSD-2-Clause AND BSD-3-Clause AND BSD-4-Clause AND BSD-4-Clause-UC AND ISC AND NTP
 URL:            http://www.tcpdump.org
 
 Source0:        http://www.tcpdump.org/release/tcpdump-%{version}.tar.gz
@@ -17,6 +17,7 @@ Patch1:         backport-0003-Drop-root-priviledges-before-opening-first-savefil
 Patch2:         backport-0007-Introduce-nn-option.patch
 Patch3:         backport-0009-Change-n-flag-to-nn-in-TESTonce.patch
 Patch4:         tcpdump-Add-sw64-architecture.patch
+Patch5:         backport-0010-Fix-a-not-defined-macro-error.patch
 
 Requires(pre):  shadow-utils
 BuildRequires:  automake openssl-devel libpcap-devel git-core gcc make
@@ -88,6 +89,36 @@ make check
 %{_mandir}/man8/tcpdump.8*
 
 %changelog
+* Sun Apr 28 2024 xinghe <xinghe2@h-partners.com> - 14:4.99.4-4
+- Type:bugfix
+- CVE:NA
+- SUG:NA
+- DESC:revert "fix CVE-2024-2397"
+
+* Sat Apr 20 2024 zhangyaqi <zhangyaqi@kylinos.cn> - 14:4.99.4-3
+- Type:bugfix
+- CVE:NA
+- SUG:NA
+- DESC:fix a not defined macro error
+
+* Mon Apr 08 2024 xinghe <xinghe2@h-partners.com> - 14:4.99.4-2
+- Type:CVE
+- CVE:CVE-2024-2397
+- SUG:NA
+- DESC:fix CVE-2024-2397
+
+* Tue Jul 25 2023 xinghe <xinghe2@h-partners.com> - 14:4.99.4-1
+- Type:requirements
+- ID:NA
+- SUG:NA
+- DESC:update tcpdump to 4.99.4
+
+* Sat Apr 08 2023 gaihuiying <eaglegai@163.com> - 14:4.99.3-2
+- Type:CVE
+- CVE:CVE-2023-1801
+- SUG:NA
+- DESC:fix CVE-2023-1801
+
 * Tue Jan 31 2023 xinghe <xinghe2@h-partners.com> - 14:4.99.3-1
 - Type:requirements
 - ID:NA