!41 update tcpdump to 4.99.3

From: @xinghe_1 
Reviewed-by: @seuzw 
Signed-off-by: @seuzw
This commit is contained in:
openeuler-ci-bot 2023-01-31 11:48:58 +00:00 committed by Gitee
commit 312838995d
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
8 changed files with 13 additions and 41 deletions

View File

@ -1,33 +0,0 @@
From 8a28e07f3bfd2a031491db55173370e10dc074e3 Mon Sep 17 00:00:00 2001
From: Alexandre Ferrieux <alexandre.ferrieux@orange.com>
Date: Sat, 16 Jul 2022 21:34:39 +0200
Subject: [PATCH] Set SA_RESTART on non-lethal signals (REQ_INFO, FLUSH_PCAP)
to avoid corrupting binary pcap output
---
tcpdump.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/tcpdump.c b/tcpdump.c
index e028d2e7..515edf5d 100644
--- a/tcpdump.c
+++ b/tcpdump.c
@@ -2743,7 +2743,14 @@ static void
memset(&new, 0, sizeof(new));
new.sa_handler = func;
- if (sig == SIGCHLD)
+ if ((sig == SIGCHLD)
+# ifdef SIGNAL_REQ_INFO
+ || (sig == SIGNAL_REQ_INFO)
+# endif
+# ifdef SIGNAL_FLUSH_PCAP
+ || (sig == SIGNAL_FLUSH_PCAP)
+# endif
+ )
new.sa_flags = SA_RESTART;
if (sigaction(sig, &new, &old) < 0)
return (SIG_ERR);
--
2.25.1

Binary file not shown.

Binary file not shown.

BIN
tcpdump-4.99.3.tar.gz Normal file

Binary file not shown.

BIN
tcpdump-4.99.3.tar.gz.sig Normal file

Binary file not shown.

View File

@ -1,26 +1,25 @@
%define tcpslice_dir tcpslice-1.6
Name: tcpdump
Epoch: 14
Version: 4.99.1
Release: 5
Version: 4.99.3
Release: 1
Summary: A network traffic monitoring tool
License: BSD with advertising
URL: http://www.tcpdump.org
Source0: http://www.tcpdump.org/release/tcpdump-%{version}.tar.gz
Source1: ftp://ftp.ee.lbl.gov/tcpslice-1.3.tar.gz
Source1: https://www.tcpdump.org/release/%{tcpslice_dir}.tar.gz
Source2: http://www.tcpdump.org/release/tcpdump-%{version}.tar.gz.sig
Patch0: backport-0002-Use-getnameinfo-instead-of-gethostbyaddr.patch
Patch1: backport-0003-Drop-root-priviledges-before-opening-first-savefile-.patch
Patch2: backport-0007-Introduce-nn-option.patch
Patch3: backport-0009-Change-n-flag-to-nn-in-TESTonce.patch
Patch4: backport-0090-Set-SA_RESTART-non-lethal-signals-avoid-corrupting-binary-pcap-output.patch
Patch5: tcpdump-Add-sw64-architecture.patch
Patch4: tcpdump-Add-sw64-architecture.patch
Requires(pre): shadow-utils
BuildRequires: automake openssl-devel libpcap-devel git-core gcc
%define tcpslice_dir tcpslice-1.3
BuildRequires: automake openssl-devel libpcap-devel git-core gcc make
%description
Tcpdump is a command-line tool for monitoring network traffic.
@ -89,6 +88,12 @@ make check
%{_mandir}/man8/tcpdump.8*
%changelog
* Tue Jan 31 2023 xinghe <xinghe2@h-partners.com> - 14:4.99.3-1
- Type:requirements
- ID:NA
- SUG:NA
- DESC:update tcpdump to 4.99.3
* Thu Dec 15 2022 xinghe <xinghe2@h-partners.com> - 14:4.99.1-5
- Type:feature
- CVE:NA

Binary file not shown.

BIN
tcpslice-1.6.tar.gz Normal file

Binary file not shown.