!63 fix a not defined macro error
From: @jamesblunt Reviewed-by: @zengwefeng Signed-off-by: @zengwefeng
This commit is contained in:
commit
4b7647de2f
25
backport-0010-Fix-a-not-defined-macro-error.patch
Normal file
25
backport-0010-Fix-a-not-defined-macro-error.patch
Normal file
@ -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
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
Name: tcpdump
|
||||
Epoch: 14
|
||||
Version: 4.99.4
|
||||
Release: 2
|
||||
Release: 3
|
||||
Summary: A network traffic monitoring tool
|
||||
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
|
||||
@ -18,6 +18,7 @@ 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-CVE-2024-2397.patch
|
||||
Patch6: backport-0010-Fix-a-not-defined-macro-error.patch
|
||||
|
||||
Requires(pre): shadow-utils
|
||||
BuildRequires: automake openssl-devel libpcap-devel git-core gcc make
|
||||
@ -89,6 +90,12 @@ make check
|
||||
%{_mandir}/man8/tcpdump.8*
|
||||
|
||||
%changelog
|
||||
* 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
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user