From 89fa939cba345a0acea104e7f33052bac373932f Mon Sep 17 00:00:00 2001
From: webbuilder_pel7ppc64bebuilder0 <webbuilder@powerel.org>
Date: Sat, 25 Aug 2018 16:59:51 +0200
Subject: [PATCH] nginx package update

Signed-off-by: webbuilder_pel7ppc64bebuilder0 <webbuilder@powerel.org>
---
 SPECS/nginx.spec | 34 +++++++++++++++++++++++-----------
 1 file changed, 23 insertions(+), 11 deletions(-)

diff --git a/SPECS/nginx.spec b/SPECS/nginx.spec
index 844a875..9b5032e 100755
--- a/SPECS/nginx.spec
+++ b/SPECS/nginx.spec
@@ -9,7 +9,7 @@
 %define nginx_webroot        %{nginx_datadir}/html
 
 Name:              nginx
-Version:           1.13.10
+Version:           1.15.2
 Release:           1%{?dist}
 Epoch:             1
 Summary:           A high performance web server and reverse proxy server
@@ -33,12 +33,11 @@ Source102:         nginx-logo.png
 Source103:         404.html
 Source104:         50x.html
 ### addons to be compiled with nginx
-# https://github.com/Martchus/nginx-accesskey/
-Source201:         nginx-accesskey-2.0.4.tar.gz
-# https://github.com/atomx/nginx-http-auth-digest
-Source202:         nginx-http-auth-digest-4edfb18.tar.xz
-Source203:         ngx_slowfs_cache-1.10.tar.gz
-Source204:         nginx-http-user-agent-785e76d.tar.xz
+Source201:         https://github.com/Martchus/nginx-accesskey/archive/v2.0.5.tar.gz
+Source202:         https://github.com/FRiCKLE/ngx_slowfs_cache/archive/1.10.tar.gz
+Source203:         https://github.com/nginx-modules/ngx_cache_purge/archive/2.5.tar.gz
+Source204:         https://github.com/eustas/ngx_brotli/archive/v0.1.2.tar.gz
+#Source204:         nginx-http-user-agent-785e76d.tar.xz
 # removes -Werror in upstream build scripts.  -Werror conflicts with
 # -D_FORTIFY_SOURCE=2 causing warnings to turn into errors.
 Patch0:            nginx-auto-cc-gcc.patch
@@ -74,6 +73,15 @@ memory usage.
 %prep
 %setup -q -a 201 -a 202 -a 203 -a 204
 %patch0 -p0
+### add some more modules directly from upstream
+git clone https://github.com/atomx/nginx-http-auth-digest nginx-http-auth-digest
+git clone https://github.com/cybozu/nginx-maxconn-module nginx-maxconn-module
+git clone https://github.com/nginx-modules/nginx-http-metric-module nginx-http-metric-module
+git clone https://github.com/alibaba/nginx-http-user-agent nginx-http-user-agent
+git clone https://github.com/eustas/ngx_brotli/ ngx_brotli
+pushd ngx_brotli
+    git submodule update --init --recursive
+popd
 
 
 %build
@@ -116,22 +124,26 @@ export DESTDIR=%{buildroot}
     --with-http_perl_module \
     --with-mail \
     --with-mail_ssl_module \
+    --with-pcre \
     --with-pcre-jit \
     --with-google_perftools_module \
     --with-stream \
     --with-stream_realip_module \
     --with-stream_ssl_module \
     --with-stream_ssl_preread_module \
-    --add-module=nginx-http-auth-digest-4edfb18 \
+    --add-module=nginx-accesskey-2.0.5 \
     --add-module=ngx_slowfs_cache-1.10 \
-    --add-module=nginx-http-user-agent-785e76d \
+    --add-module=ngx_cache_purge-2.5 \
+    --add-module=nginx-http-auth-digest \
+    --add-module=nginx-maxconn-module \
+    --add-module=nginx-http-metric-module \
+    --add-module=nginx-http-user-agent \
+    --add-module=ngx_brotli \
     --with-debug \
     --with-cc-opt="%{optflags} $(pcre-config --cflags)" \
     --with-ld-opt="$RPM_LD_FLAGS -Wl,-E"
 make %{?_smp_mflags}
 
-    #--add-module=nginx-accesskey-2.0.3 \
-
 
 %install
 make install DESTDIR=%{buildroot} INSTALLDIRS=vendor