Skip to content

Commit 1897d84

Browse files
committed
feat: update nginx
Update nginx to 1.22.1, openssl to 3.0.7 Switch to pcre2
1 parent abdfd12 commit 1897d84

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

SPECS/nginx.spec

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
%define nginx_user nginx
33
%define nginx_group nginx
44

5-
%define main_version 1.22.0
5+
%define main_version 1.22.1
66
%define main_release 1%{?dist}.levenlabs
77

8-
%define openssl_version 3.0.5
9-
%define pcre_version 8.45
10-
%define zlib_version 1.2.11
11-
%define nginx_more_headers_version 0.33
12-
%define libmaxminddb_version 1.6.0
8+
%define openssl_version 3.0.7
9+
%define pcre_version 10.40
10+
%define zlib_version 1.2.13
11+
%define nginx_more_headers_version 0.34
12+
%define libmaxminddb_version 1.7.1
1313

1414
%define WITH_CC_OPT $(echo %{optflags} $(pcre-config --cflags)) -fPIC
1515
%define WITH_LD_OPT -Wl,-z,relro -Wl,-z,now -pie
@@ -30,7 +30,7 @@ Source5: nginx-default.conf
3030
Source8: nginx.service
3131
Source90: https://github.com/openresty/headers-more-nginx-module/archive/v%{nginx_more_headers_version}/headers-more-nginx-module-%{nginx_more_headers_version}.tar.gz
3232
Source100: https://www.openssl.org/source/openssl-%{openssl_version}.tar.gz
33-
Source101: https://ftp.pcre.org/pub/pcre/pcre-%{pcre_version}.tar.gz
33+
Source101: https://github.com/PCRE2Project/pcre2/releases/download/pcre2-%{pcre_version}/pcre2-%{pcre_version}.tar.gz
3434
Source102: https://www.zlib.net/zlib-%{zlib_version}.tar.gz
3535
Source103: https://github.com/maxmind/libmaxminddb/releases/download/%{libmaxminddb_version}/libmaxminddb-%{libmaxminddb_version}.tar.gz
3636

@@ -60,7 +60,7 @@ git clone https://github.com/google/ngx_brotli %{_builddir}/ngx_brotli
6060
cd %{_builddir}/ngx_brotli && git submodule update --init
6161

6262
mkdir %{_builddir}/openssl && tar zxf %{SOURCE100} -C %{_builddir}/openssl --strip-components 1
63-
mkdir %{_builddir}/pcre && tar zxf %{SOURCE101} -C %{_builddir}/pcre --strip-components 1
63+
mkdir %{_builddir}/pcre2 && tar zxf %{SOURCE101} -C %{_builddir}/pcre2 --strip-components 1 && cd %{_builddir}/pcre2 && ./configure
6464
mkdir %{_builddir}/zlib && tar zxf %{SOURCE102} -C %{_builddir}/zlib --strip-components 1
6565
mkdir %{_builddir}/maxminddb && tar zxf %{SOURCE103} -C %{_builddir}/maxminddb --strip-components 1 && cd %{_builddir}/maxminddb && ./configure --prefix %{_builddir}/maxminddb/install --enable-shared=no --with-pic --enable-binaries=no --enable-tests=no && make install
6666

@@ -103,7 +103,7 @@ git clone https://github.com/leev/ngx_http_geoip2_module %{_builddir}/ngx_http_g
103103
--with-http_stub_status_module \
104104
--with-http_sub_module \
105105
--with-http_v2_module \
106-
--with-pcre=%{_builddir}/pcre \
106+
--with-pcre=%{_builddir}/pcre2 \
107107
--with-pcre-opt='-g -Ofast -fPIC -m64 -march=native -fstack-protector-strong -D_FORTIFY_SOURCE=2' \
108108
--with-pcre-jit \
109109
--with-stream \

0 commit comments

Comments
 (0)