!52 Update to 9.2.3

From: @wu-leilei 
Reviewed-by: @caodongxia 
Signed-off-by: @caodongxia
This commit is contained in:
openeuler-ci-bot 2023-10-27 07:32:26 +00:00 committed by Gitee
commit 887e21f278
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 17 additions and 14 deletions

View File

@ -1,25 +1,25 @@
diff -ur trafficserver-9.1.4/build/_aux/config.guess trafficserver-9.1.4/build/_aux/config.guess
--- trafficserver-9.1.4/build/_aux/config.guess 2022-12-15 00:12:58.000000000 +0800
+++ trafficserver-9.1.4/build/_aux/config.guess 2023-06-29 22:17:30.463222251 +0800
@@ -972,6 +972,9 @@
diff -Nur a/build/_aux/config.guess b/build/_aux/config.guess
--- a/build/_aux/config.guess 2023-10-10 04:36:24.000000000 +0800
+++ b/build/_aux/config.guess 2023-10-26 15:56:04.249689094 +0800
@@ -978,6 +978,9 @@
aarch64:Linux:*:*)
GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
;;
+ riscv64:Linux:*:*)
+ riscv64:Linux:*:*)
+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+ ;;
aarch64_be:Linux:*:*)
UNAME_MACHINE=aarch64_be
GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
diff -ur trafficserver-9.1.4/include/tscore/ink_queue.h trafficserver-9.1.4/include/tscore/ink_queue.h
--- trafficserver-9.1.4/include/tscore/ink_queue.h 2022-12-15 00:12:58.000000000 +0800
+++ trafficserver-9.1.4/include/tscore/ink_queue.h 2023-06-29 22:17:33.107226277 +0800
diff -Nur a/include/tscore/ink_queue.h b/include/tscore/ink_queue.h
--- a/include/tscore/ink_queue.h 2023-10-10 04:36:24.000000000 +0800
+++ b/include/tscore/ink_queue.h 2023-10-26 16:00:51.693855882 +0800
@@ -139,7 +139,7 @@
#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(__aarch64__) || defined(__mips64)
+#elif defined(__x86_64__) || defined(__ia64__) || defined(__powerpc64__) || defined(__aarch64__) || defined(__mips64)|| defined(__riscv)
-#elif defined(__x86_64__) || defined(__ia64__) || defined(__powerpc64__) || defined(__mips64)
+#elif defined(__x86_64__) || defined(__ia64__) || defined(__powerpc64__) || defined(__mips64) || defined(__riscv)
/* Layout of FREELIST_POINTER
*
* 0 ~ 47 bits : 48 bits, Virtual Address (47 bits for AMD64 and 48 bits for AArch64)
* 0 ~ 47 bits : 48 bits, Virtual Address

View File

@ -1,7 +1,7 @@
%define _hardened_build 1
Name: trafficserver
Version: 9.1.4
Release: 3
Version: 9.2.3
Release: 1
Summary: Apache Traffic Server, a reverse, forward and transparent HTTP proxy cache
License: Apache-2.0
URL: https://trafficserver.apache.org/
@ -102,7 +102,7 @@ getent passwd ats >/dev/null || useradd -r -u 176 -g ats -d / -s /sbin/nologin -
%defattr(-, root, root, -)
%{!?_licensedir:%global license %%doc}
%license LICENSE
%doc README CHANGELOG* NOTICE STATUS
%doc README.md CHANGELOG* NOTICE STATUS
%config(noreplace) /usr/etc/trafficserver/*
%{_bindir}/traffic_*
%{_bindir}/tspush
@ -132,6 +132,9 @@ getent passwd ats >/dev/null || useradd -r -u 176 -g ats -d / -s /sbin/nologin -
%{_datadir}/pkgconfig/trafficserver.pc
%changelog
* Thu Oct 26 2023 wulei <wu_lei@hoperun.com> - 9.2.3-1
- Update to 9.2.3
* Fri Jun 30 2023 zhangxiang <zhangxiang@iscas.ac.cn> - 9.1.4-3
- add riscv support