Skip to content

Commit 72e44d4

Browse files
committed
feat: update nginx and redis
Update nginx to 1.24.0, openssl to 3.0.8 Update redis to 6.2.11, openssl to 3.0.8
1 parent 1897d84 commit 72e44d4

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

SPECS/nginx.spec

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

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

8-
%define openssl_version 3.0.7
9-
%define pcre_version 10.40
8+
%define openssl_version 3.0.8
9+
%define pcre_version 10.42
1010
%define zlib_version 1.2.13
1111
%define nginx_more_headers_version 0.34
1212
%define libmaxminddb_version 1.7.1
13+
%define ngx_http_geoip2_module_version 3.4
1314

1415
%define WITH_CC_OPT $(echo %{optflags} $(pcre-config --cflags)) -fPIC
1516
%define WITH_LD_OPT -Wl,-z,relro -Wl,-z,now -pie
@@ -19,6 +20,7 @@ Summary: High performance web server
1920
Name: nginx
2021
Version: %{main_version}
2122
Release: %{main_release}
23+
Epoch: 1
2224
Vendor: Nginx, Inc.
2325
URL: http://nginx.org/
2426

@@ -53,18 +55,18 @@ nginx [engine x] is an HTTP and reverse proxy server
5355
%setup -q
5456
tar xf %{SOURCE90} -C %{_builddir}
5557

56-
git clone https://github.com/vozlt/nginx-module-vts %{_builddir}/nginx-module-vts
58+
git clone --depth 1 https://github.com/vozlt/nginx-module-vts %{_builddir}/nginx-module-vts
5759
cd %{_builddir}/nginx-module-vts && git submodule update --init
5860

59-
git clone https://github.com/google/ngx_brotli %{_builddir}/ngx_brotli
61+
git clone --depth 1 https://github.com/google/ngx_brotli %{_builddir}/ngx_brotli
6062
cd %{_builddir}/ngx_brotli && git submodule update --init
6163

6264
mkdir %{_builddir}/openssl && tar zxf %{SOURCE100} -C %{_builddir}/openssl --strip-components 1
6365
mkdir %{_builddir}/pcre2 && tar zxf %{SOURCE101} -C %{_builddir}/pcre2 --strip-components 1 && cd %{_builddir}/pcre2 && ./configure
6466
mkdir %{_builddir}/zlib && tar zxf %{SOURCE102} -C %{_builddir}/zlib --strip-components 1
6567
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
6668

67-
git clone https://github.com/leev/ngx_http_geoip2_module %{_builddir}/ngx_http_geoip2_module
69+
git clone --depth 1 --single-branch --branch %{ngx_http_geoip2_module_version} https://github.com/leev/ngx_http_geoip2_module %{_builddir}/ngx_http_geoip2_module
6870
#sed -i 's/-lmaxminddb//' %{_builddir}/ngx_http_geoip2_module/config
6971

7072
%build

SPECS/redis.spec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
%define openssl_version 1.1.1k
1+
%define openssl_version 3.0.8
22

33
Name: redis
4-
Version: 6.2.1
4+
Version: 6.2.11
55
Release: 1%{dist}
66
Summary: A persistent key-value database
77
License: BSD

0 commit comments

Comments
 (0)