新增：nginx-1.25.0

README.md

@@ -1,5 +1,5 @@
 # nginx
 
-在[官方源码包](https://nginx.org/packages/mainline/centos/7/SRPMS/)的基础上，保持原编译参数，使用`OpenSSL 1.1.1`重新编译的版本，以支持`TLS 1.3`协议(CentOS 8已使用OpenSSL 1.1.1，故不提供CentOS 8版本)。
+在[官方源码包](https://nginx.org/packages/mainline/centos/9/SRPMS/)的基础上，保持原编译参数，使用[QuicTLS 3.0](https://github.com/quictls/openssl)重新编译的版本，以支持`TLS 1.3`及`HTTP3`。
 
 使用：[https://copr.fedorainfracloud.org/coprs/kuretru/nginx/](https://copr.fedorainfracloud.org/coprs/kuretru/nginx/)

nginx.spec

@@ -20,6 +20,7 @@ Requires(pre): shadow-utils
 Requires: openssl >= 1.0.2
 Requires: procps-ng
 BuildRequires: openssl-devel >= 1.0.2
+BuildRequires: perl-IPC-Cmd
 %define dist .el7
 %endif
 
@@ -47,6 +48,7 @@ Epoch: %{epoch}
 Requires(pre): shadow-utils
 Requires: procps-ng
 BuildRequires: openssl-devel
+BuildRequires: gcc
 %define _debugsource_template %{nil}
 %endif
 
@@ -70,9 +72,9 @@ Requires(pre): shadow-utils
 
 # end of distribution specific definitions
 
-%define openssl_version 1.1.1t
+%define openssl_version 3.0.8-quic1
 
-%define base_version 1.23.4
+%define base_version 1.25.0
 %define base_release 1%{?dist}.ngx
 
 %define bdir %{_builddir}/%{name}-%{base_version}
@@ -80,7 +82,7 @@ Requires(pre): shadow-utils
 %define WITH_CC_OPT $(echo %{optflags} $(pcre2-config --cflags)) -fPIC
 %define WITH_LD_OPT -Wl,-z,relro -Wl,-z,now -pie
 
-%define BASE_CONFIGURE_ARGS $(echo "--prefix=%{_sysconfdir}/nginx --sbin-path=%{_sbindir}/nginx --modules-path=%{_libdir}/nginx/modules --conf-path=%{_sysconfdir}/nginx/nginx.conf --error-log-path=%{_localstatedir}/log/nginx/error.log --http-log-path=%{_localstatedir}/log/nginx/access.log --pid-path=%{_localstatedir}/run/nginx.pid --lock-path=%{_localstatedir}/run/nginx.lock --http-client-body-temp-path=%{_localstatedir}/cache/nginx/client_temp --http-proxy-temp-path=%{_localstatedir}/cache/nginx/proxy_temp --http-fastcgi-temp-path=%{_localstatedir}/cache/nginx/fastcgi_temp --http-uwsgi-temp-path=%{_localstatedir}/cache/nginx/uwsgi_temp --http-scgi-temp-path=%{_localstatedir}/cache/nginx/scgi_temp --user=%{nginx_user} --group=%{nginx_group} --with-compat --with-file-aio --with-threads --with-http_addition_module --with-http_auth_request_module --with-http_dav_module --with-http_flv_module --with-http_gunzip_module --with-http_gzip_static_module --with-http_mp4_module --with-http_random_index_module --with-http_realip_module --with-http_secure_link_module --with-http_slice_module --with-http_ssl_module --with-http_stub_status_module --with-http_sub_module --with-http_v2_module --with-mail --with-mail_ssl_module --with-stream --with-stream_realip_module --with-stream_ssl_module --with-stream_ssl_preread_module")
+%define BASE_CONFIGURE_ARGS $(echo "--prefix=%{_sysconfdir}/nginx --sbin-path=%{_sbindir}/nginx --modules-path=%{_libdir}/nginx/modules --conf-path=%{_sysconfdir}/nginx/nginx.conf --error-log-path=%{_localstatedir}/log/nginx/error.log --http-log-path=%{_localstatedir}/log/nginx/access.log --pid-path=%{_localstatedir}/run/nginx.pid --lock-path=%{_localstatedir}/run/nginx.lock --http-client-body-temp-path=%{_localstatedir}/cache/nginx/client_temp --http-proxy-temp-path=%{_localstatedir}/cache/nginx/proxy_temp --http-fastcgi-temp-path=%{_localstatedir}/cache/nginx/fastcgi_temp --http-uwsgi-temp-path=%{_localstatedir}/cache/nginx/uwsgi_temp --http-scgi-temp-path=%{_localstatedir}/cache/nginx/scgi_temp --user=%{nginx_user} --group=%{nginx_group} --with-compat --with-file-aio --with-threads --with-http_addition_module --with-http_auth_request_module --with-http_dav_module --with-http_flv_module --with-http_gunzip_module --with-http_gzip_static_module --with-http_mp4_module --with-http_random_index_module --with-http_realip_module --with-http_secure_link_module --with-http_slice_module --with-http_ssl_module --with-http_stub_status_module --with-http_sub_module --with-http_v2_module $( if [ 0%{?rhel} -eq 7 ] || [ 0%{?suse_version} -eq 1315 ]; then continue; else echo "--with-http_v3_module"; fi; ) --with-mail --with-mail_ssl_module --with-stream --with-stream_realip_module --with-stream_ssl_module --with-stream_ssl_preread_module")
 
 Summary: High performance web server
 Name: nginx
@@ -100,7 +102,7 @@ Source6: nginx.suse.logrotate
 Source7: nginx-debug.service
 Source8: nginx.copyright
 Source9: nginx.check-reload.sh
-Source10: https://www.openssl.org/source/openssl-%{openssl_version}.tar.gz
+Source10: https://github.com/quictls/openssl/archive/refs/tags/openssl-%{openssl_version}.tar.gz
 
 
 
@@ -109,6 +111,7 @@ License: 2-clause BSD-like license
 BuildRoot: %{_tmppath}/%{name}-%{base_version}-%{base_release}-root
 BuildRequires: zlib-devel
 BuildRequires: pcre2-devel
+BuildRequires: perl
 
 Provides: webserver
 Provides: nginx-r%{base_version}
@@ -127,7 +130,7 @@ tar -zxf %{SOURCE10}
 
 %build
 ./configure %{BASE_CONFIGURE_ARGS} \
-    --with-openssl=./openssl-%{openssl_version}/ \
+    --with-openssl=./openssl-openssl-%{openssl_version}/ \
     --with-cc-opt="%{WITH_CC_OPT}" \
     --with-ld-opt="%{WITH_LD_OPT}" \
     --with-debug
@@ -135,7 +138,7 @@ make %{?_smp_mflags}
 %{__mv} %{bdir}/objs/nginx \
     %{bdir}/objs/nginx-debug
 ./configure %{BASE_CONFIGURE_ARGS} \
-    --with-openssl=./openssl-%{openssl_version}/ \
+    --with-openssl=./openssl-openssl-%{openssl_version}/ \
     --with-cc-opt="%{WITH_CC_OPT}" \
     --with-ld-opt="%{WITH_LD_OPT}"
 make %{?_smp_mflags}
@@ -312,6 +315,9 @@ if [ $1 -ge 1 ]; then
 fi
 
 %changelog
+* Tue May 23 2023 Nginx Packaging <nginx-packaging@f5.com> - 1.25.0-1%{?dist}.ngx
+- 1.25.0-1
+
 * Tue Mar 28 2023 Nginx Packaging <nginx-packaging@f5.com> - 1.23.4-1%{?dist}.ngx
 - 1.23.4-1