|
|
@@ -56,14 +56,14 @@ Requires(pre): shadow-utils
|
|
|
|
|
|
# end of distribution specific definitions
|
|
|
|
|
|
-%define openssl_version 1.1.1l
|
|
|
+%define openssl_version 1.1.1m
|
|
|
|
|
|
-%define base_version 1.21.4
|
|
|
+%define base_version 1.21.5
|
|
|
%define base_release 1%{?dist}.ngx
|
|
|
|
|
|
%define bdir %{_builddir}/%{name}-%{base_version}
|
|
|
|
|
|
-%define WITH_CC_OPT $(echo %{optflags} $(pcre-config --cflags)) -fPIC
|
|
|
+%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")
|
|
|
@@ -94,7 +94,7 @@ License: 2-clause BSD-like license
|
|
|
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{base_version}-%{base_release}-root
|
|
|
BuildRequires: zlib-devel
|
|
|
-BuildRequires: pcre-devel
|
|
|
+BuildRequires: pcre2-devel
|
|
|
|
|
|
Provides: webserver
|
|
|
Provides: nginx-r%{base_version}
|
|
|
@@ -298,6 +298,10 @@ if [ $1 -ge 1 ]; then
|
|
|
fi
|
|
|
|
|
|
%changelog
|
|
|
+* Tue Dec 28 2021 Konstantin Pavlov <thresh@nginx.com> - 1.21.5-1%{?dist}.ngx
|
|
|
+- 1.21.5-1
|
|
|
+- built with PCRE2
|
|
|
+
|
|
|
* Tue Nov 2 2021 Konstantin Pavlov <thresh@nginx.com> - 1.21.4-1%{?dist}.ngx
|
|
|
- 1.21.4-1
|
|
|
|
呉真