packages/nginx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!53 switch pcre to pcre2

Browse Source 
From: @eaglegai 
Reviewed-by: @licihua 
Signed-off-by: @licihua
This commit is contained in:
openeuler-ci-bot 2022-07-19 07:11:16 +00:00 committed by Gitee
commit acb7629750
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
nginx.spec
View File

@ -14,7 +14,7 @@
Name: nginx Name: nginx
Epoch: 1 Epoch: 1
Version: 1.21.5 Version: 1.21.5
Release: 1 Release: 2
Summary: A HTTP server, reverse proxy and mail proxy server Summary: A HTTP server, reverse proxy and mail proxy server
License: BSD License: BSD
URL: http://nginx.org/ URL: http://nginx.org/
@ -34,8 +34,8 @@ Source210: UPGRADE-NOTES-1.6-to-1.10
Patch0: nginx-auto-cc-gcc.patch Patch0: nginx-auto-cc-gcc.patch
Patch1: nginx-1.12.1-logs-perm.patch Patch1: nginx-1.12.1-logs-perm.patch
Patch2: nginx-fix-pidfile.patch Patch2: nginx-fix-pidfile.patch
BuildRequires: gcc openssl-devel pcre-devel zlib-devel systemd gperftools-devel BuildRequires: gcc openssl-devel pcre2-devel zlib-devel systemd gperftools-devel
Requires: nginx-filesystem = %{epoch}:%{version}-%{release} openssl pcre Requires: nginx-filesystem = %{epoch}:%{version}-%{release} openssl
Requires: nginx-all-modules = %{epoch}:%{version}-%{release} Requires: nginx-all-modules = %{epoch}:%{version}-%{release}
%if 0%{?with_mailcap_mimetypes} %if 0%{?with_mailcap_mimetypes}
Requires: nginx-mimetypes Requires: nginx-mimetypes
@ -162,7 +162,7 @@ if ! ./configure \
--with-http_perl_module=dynamic --with-http_auth_request_module \ --with-http_perl_module=dynamic --with-http_auth_request_module \
--with-mail=dynamic --with-mail_ssl_module --with-pcre --with-pcre-jit --with-stream=dynamic \ --with-mail=dynamic --with-mail_ssl_module --with-pcre --with-pcre-jit --with-stream=dynamic \
--with-stream_ssl_module --with-google_perftools_module --with-debug \ --with-stream_ssl_module --with-google_perftools_module --with-debug \
--with-cc-opt="%{optflags} $(pcre-config --cflags)" --with-ld-opt="$nginx_ldopts"; then --with-cc-opt="%{optflags} $(pcre2-config --cflags)" --with-ld-opt="$nginx_ldopts"; then
: configure failed : configure failed
cat objs/autoconf.err cat objs/autoconf.err
exit 1 exit 1
@ -345,6 +345,9 @@ fi
%{_mandir}/man8/nginx.8* %{_mandir}/man8/nginx.8*
%changelog %changelog
* Tue Jul 19 2022 gaihuiying <eaglegai@163.com> - 1:1.21.5-2
- switch pcre to pcre2
* Sat Jan 15 2022 yaoxin <yaoxin30@huawei.com> - 1:1.21.5-1 * Sat Jan 15 2022 yaoxin <yaoxin30@huawei.com> - 1:1.21.5-1
- Upgrade nginx to 1.21.5 - Upgrade nginx to 1.21.5