diff --git a/nginx-1.21.5-sw.patch b/nginx-1.21.5-sw.patch new file mode 100644 index 0000000000000000000000000000000000000000..c09e8d3db44d86198e97d1e2073afeb76ab4b3af --- /dev/null +++ b/nginx-1.21.5-sw.patch @@ -0,0 +1,15 @@ +diff -Nuar nginx-1.21.5/auto/os/conf nginx-1.21.5-sw/auto/os/conf +--- nginx-1.21.5/auto/os/conf 2021-12-28 15:28:38.000000000 +0000 ++++ nginx-1.21.5-sw/auto/os/conf 2022-07-29 06:54:37.192967680 +0000 +@@ -115,6 +115,11 @@ + NGX_MACH_CACHE_LINE=64 + ;; + ++ sw_64 ) ++ have=NGX_ALIGNMENT value=16 . auto/define ++ NGX_MACH_CACHE_LINE=64 ++ ;; ++ + *) + have=NGX_ALIGNMENT value=16 . auto/define + NGX_MACH_CACHE_LINE=32 diff --git a/nginx.spec b/nginx.spec index 477c11cdb5b11ae32aa615e398ed173d59bf8991..0a534e9209012724facbbad018e111e4f34fc3e0 100644 --- a/nginx.spec +++ b/nginx.spec @@ -17,7 +17,7 @@ Name: nginx Epoch: 1 Version: 1.21.5 -Release: 4 +Release: 5 Summary: A HTTP server, reverse proxy and mail proxy server License: BSD URL: http://nginx.org/ @@ -40,6 +40,7 @@ Patch0: nginx-auto-cc-gcc.patch Patch1: nginx-1.12.1-logs-perm.patch Patch2: nginx-fix-pidfile.patch Patch3: backport-CVE-2022-41742_CVE-2022-41741.patch +Patch4: nginx-1.21.5-sw.patch BuildRequires: gcc openssl-devel pcre2-devel zlib-devel systemd gperftools-devel Requires: nginx-filesystem = %{epoch}:%{version}-%{release} openssl @@ -387,6 +388,9 @@ fi %{_mandir}/man8/nginx.8* %changelog +* Wed Dec 21 2022 zhangzhixin - 1:1.21.5-5 +- Add sw64 arch patch + * Thu Nov 24 2022 zhouyihang - 1:1.21.5-4 - add package mod-devel