diff --git a/tcpdump-Add-sw64-architecture.patch b/tcpdump-Add-sw64-architecture.patch new file mode 100644 index 0000000000000000000000000000000000000000..c97f7040c7bcdc1b7c6d0cb8915eecab2b8cde01 --- /dev/null +++ b/tcpdump-Add-sw64-architecture.patch @@ -0,0 +1,40 @@ +From 688338ba061ec66d9a852e328e9cd8865f774f3a Mon Sep 17 00:00:00 2001 +From: rpm-build +Date: Tue, 25 Oct 2022 19:40:41 +0800 +Subject: [PATCH] tcpdump Add sw64 architecture + +Signed-off-by: rpm-build +--- + extract.h | 2 +- + print-fddi.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/extract.h b/extract.h +index 2ea7763..8ff8e92 100644 +--- a/extract.h ++++ b/extract.h +@@ -134,7 +134,7 @@ EXTRACT_IPV4_TO_HOST_ORDER(const void *p) + return ((uint32_t)ntohl(*(const uint32_t *)(p))); + } + #elif ND_IS_AT_LEAST_GNUC_VERSION(2,0) && \ +- (defined(__alpha) || defined(__alpha__) || \ ++ (defined(__alpha) || defined(__alpha__) || defined(__sw_64) || defined(__sw_64__) || \ + defined(__mips) || defined(__mips__)) + /* + * This is MIPS or Alpha, which don't natively handle unaligned loads, +diff --git a/print-fddi.c b/print-fddi.c +index fb8d3ed..25368bf 100644 +--- a/print-fddi.c ++++ b/print-fddi.c +@@ -84,7 +84,7 @@ struct fddi_header { + /* + * Some FDDI interfaces use bit-swapped addresses. + */ +-#if defined(ultrix) || defined(__alpha) || defined(__bsdi) || defined(__NetBSD__) || defined(__linux__) ++#if defined(ultrix) || defined(__alpha) || defined(__sw_64) || defined(__bsdi) || defined(__NetBSD__) || defined(__linux__) + static int fddi_bitswap = 0; + #else + static int fddi_bitswap = 1; +-- +2.33.0 + diff --git a/tcpdump.spec b/tcpdump.spec index 336614910bd740e0c74b12ac5aa9c9e149af7ef0..869656897061756332181897b03ddd71874b70a2 100644 --- a/tcpdump.spec +++ b/tcpdump.spec @@ -1,7 +1,7 @@ Name: tcpdump Epoch: 14 Version: 4.99.1 -Release: 4 +Release: 5 Summary: A network traffic monitoring tool License: BSD with advertising URL: http://www.tcpdump.org @@ -15,6 +15,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: backport-Set-SA_RESTART-non-lethal-signals-avoid-corrupting-binary-pcap-output.patch +Patch5: tcpdump-Add-sw64-architecture.patch Requires(pre): shadow-utils BuildRequires: automake openssl-devel libpcap-devel git-core gcc @@ -88,6 +89,12 @@ make check %{_mandir}/man8/tcpdump.8* %changelog +* Tue Oct 25 2022 wuzx - 14:4.99.1-5 +- Type:feature +- CVE:NA +- SUG:NA +- DESC:Add sw64 architecture + * Wed Aug 31 2022 gaihuiying - 14:4.99.1-4 - Type:bugfix - CVE:NA