diff --git a/add-sw_64-support.patch b/add-sw_64-support.patch new file mode 100644 index 0000000000000000000000000000000000000000..ccdb599360ddf0c00684eea2a5f94abdff6c4170 --- /dev/null +++ b/add-sw_64-support.patch @@ -0,0 +1,67 @@ +From eceb494ef5f94152fe45d1ac401aa5b73bf4aa05 Mon Sep 17 00:00:00 2001 +From: maqi +Date: Fri, 28 Feb 2025 14:17:57 +0800 +Subject: [PATCH] add sw_64 support + +--- + build/_aux/config.guess | 3 +++ + build/_aux/config.sub | 1 + + include/tscore/ink_queue.h | 2 +- + iocore/eventsystem/UnixEventProcessor.cc | 2 +- + 4 files changed, 6 insertions(+), 2 deletions(-) + +diff --git a/build/_aux/config.guess b/build/_aux/config.guess +index ce201f8..84aa38a 100755 +--- a/build/_aux/config.guess ++++ b/build/_aux/config.guess +@@ -1048,6 +1048,9 @@ EOF + loongarch32:Linux:*:* | loongarch64:Linux:*:*) + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; ++ sw_64:Linux:*:*) ++ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC ++ ;; + m32r*:Linux:*:*) + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; +diff --git a/build/_aux/config.sub b/build/_aux/config.sub +index a6d99a0..1e177fc 100755 +--- a/build/_aux/config.sub ++++ b/build/_aux/config.sub +@@ -1208,6 +1208,7 @@ case $cpu-$vendor in + | le32 | le64 \ + | lm32 \ + | loongarch32 | loongarch64 \ ++ | sw_64 \ + | m32c | m32r | m32rle \ + | m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k \ + | m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x \ +diff --git a/include/tscore/ink_queue.h b/include/tscore/ink_queue.h +index a9fb1b5..d181b3d 100644 +--- a/include/tscore/ink_queue.h ++++ b/include/tscore/ink_queue.h +@@ -139,7 +139,7 @@ union head_p { + #define SET_FREELIST_POINTER_VERSION(_x, _p, _v) \ + (_x).s.pointer = _p; \ + (_x).s.version = _v +-#elif defined(__x86_64__) || defined(__ia64__) || defined(__powerpc64__) || defined(__mips64) || defined(__riscv) || defined(__loongarch64) ++#elif defined(__x86_64__) || defined(__ia64__) || defined(__powerpc64__) || defined(__mips64) || defined(__riscv) || defined(__loongarch64) || defined(__sw_64__) + /* Layout of FREELIST_POINTER + * + * 0 ~ 47 bits : 48 bits, Virtual Address +diff --git a/iocore/eventsystem/UnixEventProcessor.cc b/iocore/eventsystem/UnixEventProcessor.cc +index 3fb27cb..f3cd5e6 100644 +--- a/iocore/eventsystem/UnixEventProcessor.cc ++++ b/iocore/eventsystem/UnixEventProcessor.cc +@@ -141,7 +141,7 @@ void + ThreadAffinityInitializer::setup_stack_guard(void *stack, int stackguard_pages) + { + #if !(defined(__i386__) || defined(__x86_64__) || defined(__arm__) || defined(__arm64__) || defined(__aarch64__) || \ +- defined(__mips__) || defined(__powerpc64__) || defined(__riscv) || defined(__loongarch64)) ++ defined(__mips__) || defined(__powerpc64__) || defined(__riscv) || defined(__loongarch64) || defined(__sw_64__)) + #error Unknown stack growth direction. Determine the stack growth direction of your platform. + // If your stack grows upwards, you need to change this function and the calculation of stack_begin in do_alloc_stack. + #endif +-- +2.39.3 + diff --git a/trafficserver.spec b/trafficserver.spec index ef7f3fad7e1d87da0464b147cd0f238f89f0fe8e..af241a29b036c53c6f2e8d416ae13d196d2150ec 100644 --- a/trafficserver.spec +++ b/trafficserver.spec @@ -2,7 +2,7 @@ %global vendor %{?_vendor:%{_vendor}}%{!?_vendor:openEuler} Name: trafficserver Version: 9.2.5 -Release: 3 +Release: 4 Summary: Apache Traffic Server, a reverse, forward and transparent HTTP proxy cache License: Apache-2.0 URL: https://trafficserver.apache.org/ @@ -18,6 +18,7 @@ Patch0007: CVE-2024-38479.patch Patch0008: CVE-2024-50305.patch Patch0009: CVE-2024-50306.patch Patch0010: Invoke-initgroups-iff-we-got-enough-privileges.patch +Patch0011: add-sw_64-support.patch BuildRequires: expat-devel hwloc-devel openssl-devel pcre-devel zlib-devel xz-devel BuildRequires: libcurl-devel ncurses-devel gcc gcc-c++ perl-ExtUtils-MakeMaker BuildRequires: libcap-devel cmake libunwind-devel automake chrpath @@ -138,6 +139,9 @@ getent passwd ats >/dev/null || useradd -r -u 176 -g ats -d / -s /sbin/nologin - %{_datadir}/pkgconfig/trafficserver.pc %changelog +* Fri Feb 28 2025 maqi - 9.2.5-4 +- Add sw_64 support + * Tue Dec 03 2024 yaoxin - 9.2.5-3 - Fix trafficserver service error