diff --git a/backport-0090-Set-SA_RESTART-non-lethal-signals-avoid-corrupting-binary-pcap-output.patch b/backport-0090-Set-SA_RESTART-non-lethal-signals-avoid-corrupting-binary-pcap-output.patch deleted file mode 100644 index 98afe43..0000000 --- a/backport-0090-Set-SA_RESTART-non-lethal-signals-avoid-corrupting-binary-pcap-output.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 8a28e07f3bfd2a031491db55173370e10dc074e3 Mon Sep 17 00:00:00 2001 -From: Alexandre Ferrieux -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 - diff --git a/tcpdump-4.99.1.tar.gz b/tcpdump-4.99.1.tar.gz deleted file mode 100644 index b97693b..0000000 Binary files a/tcpdump-4.99.1.tar.gz and /dev/null differ diff --git a/tcpdump-4.99.1.tar.gz.sig b/tcpdump-4.99.1.tar.gz.sig deleted file mode 100644 index 389fe58..0000000 Binary files a/tcpdump-4.99.1.tar.gz.sig and /dev/null differ diff --git a/tcpdump-4.99.3.tar.gz b/tcpdump-4.99.3.tar.gz new file mode 100644 index 0000000..fcdb99b Binary files /dev/null and b/tcpdump-4.99.3.tar.gz differ diff --git a/tcpdump-4.99.3.tar.gz.sig b/tcpdump-4.99.3.tar.gz.sig new file mode 100644 index 0000000..29abbe3 Binary files /dev/null and b/tcpdump-4.99.3.tar.gz.sig differ diff --git a/tcpdump.spec b/tcpdump.spec index 843cb12..5a8b560 100644 --- a/tcpdump.spec +++ b/tcpdump.spec @@ -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 - 14:4.99.3-1 +- Type:requirements +- ID:NA +- SUG:NA +- DESC:update tcpdump to 4.99.3 + * Thu Dec 15 2022 xinghe - 14:4.99.1-5 - Type:feature - CVE:NA diff --git a/tcpslice-1.3.tar.gz b/tcpslice-1.3.tar.gz deleted file mode 100644 index 6bf65ce..0000000 Binary files a/tcpslice-1.3.tar.gz and /dev/null differ diff --git a/tcpslice-1.6.tar.gz b/tcpslice-1.6.tar.gz new file mode 100644 index 0000000..6c8fde6 Binary files /dev/null and b/tcpslice-1.6.tar.gz differ