From 72e44d4e14a98f1fd21cd7dcdb773133016e1538 Mon Sep 17 00:00:00 2001
From: James Hartig <me@jameshartig.com>
Date: Thu, 13 Apr 2023 22:24:59 -0400
Subject: [PATCH] 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
---
 SPECS/nginx.spec | 14 ++++++++------
 SPECS/redis.spec |  4 ++--
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/SPECS/nginx.spec b/SPECS/nginx.spec
index dfaa9f5..6f85916 100644
--- a/SPECS/nginx.spec
+++ b/SPECS/nginx.spec
@@ -2,14 +2,15 @@
 %define nginx_user nginx
 %define nginx_group nginx
 
-%define main_version 1.22.1
+%define main_version 1.24.0
 %define main_release 1%{?dist}.levenlabs
 
-%define openssl_version 3.0.7
-%define pcre_version 10.40
+%define openssl_version 3.0.8
+%define pcre_version 10.42
 %define zlib_version 1.2.13
 %define nginx_more_headers_version 0.34
 %define libmaxminddb_version 1.7.1
+%define ngx_http_geoip2_module_version 3.4
 
 %define WITH_CC_OPT $(echo %{optflags} $(pcre-config --cflags)) -fPIC
 %define WITH_LD_OPT -Wl,-z,relro -Wl,-z,now -pie
@@ -19,6 +20,7 @@ Summary: High performance web server
 Name: nginx
 Version: %{main_version}
 Release: %{main_release}
+Epoch: 1
 Vendor: Nginx, Inc.
 URL: http://nginx.org/
 
@@ -53,10 +55,10 @@ nginx [engine x] is an HTTP and reverse proxy server
 %setup -q
 tar xf %{SOURCE90} -C %{_builddir}
 
-git clone https://github.com/vozlt/nginx-module-vts %{_builddir}/nginx-module-vts
+git clone --depth 1 https://github.com/vozlt/nginx-module-vts %{_builddir}/nginx-module-vts
 cd %{_builddir}/nginx-module-vts && git submodule update --init
 
-git clone https://github.com/google/ngx_brotli %{_builddir}/ngx_brotli
+git clone --depth 1 https://github.com/google/ngx_brotli %{_builddir}/ngx_brotli
 cd %{_builddir}/ngx_brotli && git submodule update --init
 
 mkdir %{_builddir}/openssl && tar zxf %{SOURCE100} -C %{_builddir}/openssl --strip-components 1
@@ -64,7 +66,7 @@ mkdir %{_builddir}/pcre2 && tar zxf %{SOURCE101} -C %{_builddir}/pcre2 --strip-c
 mkdir %{_builddir}/zlib && tar zxf %{SOURCE102} -C %{_builddir}/zlib --strip-components 1
 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
 
-git clone https://github.com/leev/ngx_http_geoip2_module %{_builddir}/ngx_http_geoip2_module
+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
 #sed -i 's/-lmaxminddb//' %{_builddir}/ngx_http_geoip2_module/config
 
 %build
diff --git a/SPECS/redis.spec b/SPECS/redis.spec
index 91983df..dd622f3 100644
--- a/SPECS/redis.spec
+++ b/SPECS/redis.spec
@@ -1,7 +1,7 @@
-%define openssl_version 1.1.1k
+%define openssl_version 3.0.8
 
 Name: redis
-Version: 6.2.1
+Version: 6.2.11
 Release: 1%{dist}
 Summary: A persistent key-value database
 License: BSD