Update to 1.11.4

2 files changed, 27 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bdfab2e3b7ac..17338e11148d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = nginx-mainline-addons
 	pkgdesc = Lightweight HTTP server and IMAP/POP3 proxy server, mainline release
-	pkgver = 1.11.3
-	pkgrel = 2
+	pkgver = 1.11.4
+	pkgrel = 1
 	url = http://nginx.org
 	arch = i686
 	arch = x86_64
@@ -15,11 +15,11 @@ pkgbase = nginx-mainline-addons
 	makedepends = leiningen
 	makedepends = java-environment-openjdk>=8
 	makedepends = luajit
-	source = http://nginx.org/download/nginx-1.11.3.tar.gz
+	makedepends = libbrotli
+	source = http://nginx.org/download/nginx-1.11.4.tar.gz
 	source = service
 	source = logrotate
 	source = nginx-addon-fancyindex::git+https://github.com/aperezdc/ngx-fancyindex.git
-	source = nginx-addon-brotli::git+https://github.com/google/ngx_brotli.git
 	source = nginx-addon-headers-more::git+https://github.com/openresty/headers-more-nginx-module.git
 	source = nginx-addon-ct::git+https://github.com/grahamedgecombe/nginx-ct.git
 	source = nginx-addon-auth-pam::git+https://github.com/stogh/ngx_http_auth_pam_module.git
@@ -29,7 +29,7 @@ pkgbase = nginx-mainline-addons
 	source = nginx-addon-lua-http::git+https://github.com/openresty/lua-nginx-module.git
 	source = nginx-addon-nchan::git+https://github.com/slact/nchan.git
 	source = nginx-addon-rtmp::git+https://github.com/sergey-dryabzhinsky/nginx-rtmp-module.git#branch=dev
-	md5sums = 18275c1daa39c5fac12e56c34907d45b
+	md5sums = 92666d60410f429ddbdb10060369a480
 	md5sums = ce9a06bcaf66ec4a3c4eb59b636e0dfd
 	md5sums = 3441ce77cdd1aab6f0ab7e212698a8a7
 	md5sums = SKIP
@@ -42,7 +42,6 @@ pkgbase = nginx-mainline-addons
 	md5sums = SKIP
 	md5sums = SKIP
 	md5sums = SKIP
-	md5sums = SKIP
 
 pkgname = nginx-mainline-addons
 	depends = pcre
@@ -69,56 +68,53 @@ pkgname = nginx-mainline-addons
 pkgname = nginx-mainline-full
 	pkgdesc = Full set of addons for Nginx server
 	depends = nginx-mainline-addons
-	depends = nginx-mainline-addon-rtmp=1.11.3-2
+	depends = nginx-mainline-addon-rtmp=1.11.4-1
 
 pkgname = nginx-mainline-addon-geoip
-	depends = nginx-mainline-addons=1.11.3-2
+	depends = nginx-mainline-addons=1.11.4-1
 
 pkgname = nginx-mainline-addon-image_filter
-	depends = nginx-mainline-addons=1.11.3-2
+	depends = nginx-mainline-addons=1.11.4-1
 
 pkgname = nginx-mainline-addon-perl
-	depends = nginx-mainline-addons=1.11.3-2
+	depends = nginx-mainline-addons=1.11.4-1
 
 pkgname = nginx-mainline-addon-xslt_filter
-	depends = nginx-mainline-addons=1.11.3-2
+	depends = nginx-mainline-addons=1.11.4-1
 
 pkgname = nginx-mainline-addon-stream
-	depends = nginx-mainline-addons=1.11.3-2
+	depends = nginx-mainline-addons=1.11.4-1
 
 pkgname = nginx-mainline-addon-mail
-	depends = nginx-mainline-addons=1.11.3-2
+	depends = nginx-mainline-addons=1.11.4-1
 
 pkgname = nginx-mainline-addon-fancyindex
-	depends = nginx-mainline-addons=1.11.3-2
-
-pkgname = nginx-mainline-addon-brotli
-	depends = nginx-mainline-addons=1.11.3-2
+	depends = nginx-mainline-addons=1.11.4-1
 
 pkgname = nginx-mainline-addon-headers-more
-	depends = nginx-mainline-addons=1.11.3-2
+	depends = nginx-mainline-addons=1.11.4-1
 
 pkgname = nginx-mainline-addon-ct
-	depends = nginx-mainline-addons=1.11.3-2
+	depends = nginx-mainline-addons=1.11.4-1
 
 pkgname = nginx-mainline-addon-auth-pam
-	depends = nginx-mainline-addons=1.11.3-2
+	depends = nginx-mainline-addons=1.11.4-1
 
 pkgname = nginx-mainline-addon-clojure
-	depends = nginx-mainline-addons=1.11.3-2
+	depends = nginx-mainline-addons=1.11.4-1
 
 pkgname = nginx-mainline-addon-ndk
-	depends = nginx-mainline-addons=1.11.3-2
+	depends = nginx-mainline-addons=1.11.4-1
 
 pkgname = nginx-mainline-addon-encrypted-session
-	depends = nginx-mainline-addons=1.11.3-2
+	depends = nginx-mainline-addons=1.11.4-1
 
 pkgname = nginx-mainline-addon-lua-http
-	depends = nginx-mainline-addons=1.11.3-2
+	depends = nginx-mainline-addons=1.11.4-1
 
 pkgname = nginx-mainline-addon-nchan
-	depends = nginx-mainline-addons=1.11.3-2
+	depends = nginx-mainline-addons=1.11.4-1
 
 pkgname = nginx-mainline-addon-rtmp
-	depends = nginx-mainline-addons=1.11.3-2
+	depends = nginx-mainline-addons=1.11.4-1
 
diff --git a/PKGBUILD b/PKGBUILD
index 3976cbc576a6..df94f373e61b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,17 +6,17 @@
 _pkgbase=nginx-mainline
 pkgbase=${_pkgbase}-addons
 pkgname=("${pkgbase}" "${_pkgbase}-full")
-pkgver=1.11.3
-pkgrel=2
+pkgver=1.11.4
+pkgrel=1
 pkgdesc='Lightweight HTTP server and IMAP/POP3 proxy server, mainline release'
 arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h' 'aarch64')
 url='http://nginx.org'
 license=('custom')
-makedepends=('hardening-wrapper' 'geoip' 'leiningen' 'java-environment-openjdk>=8' 'luajit')
+makedepends=('hardening-wrapper' 'geoip' 'leiningen' 'java-environment-openjdk>=8' 'luajit' 'libbrotli')
 source=($url/download/nginx-$pkgver.tar.gz
         service
         logrotate)
-md5sums=('18275c1daa39c5fac12e56c34907d45b'
+md5sums=('92666d60410f429ddbdb10060369a480'
          'ce9a06bcaf66ec4a3c4eb59b636e0dfd'
          '3441ce77cdd1aab6f0ab7e212698a8a7')
 
@@ -28,7 +28,7 @@ addons=(
   'builtin stream - ngx_stream_module.so'
   'builtin mail - ngx_mail_module.so'
   'github fancyindex aperezdc/ngx-fancyindex ngx_http_fancyindex_module.so'
-  'github brotli google/ngx_brotli ngx_http_brotli_static_module.so:ngx_http_brotli_filter_module.so'
+  #'github brotli google/ngx_brotli ngx_http_brotli_static_module.so:ngx_http_brotli_filter_module.so libbrotli'
   'github headers-more openresty/headers-more-nginx-module ngx_http_headers_more_filter_module.so'
   'github ct grahamedgecombe/nginx-ct ngx_http_ssl_ct_module.so:ngx_ssl_ct_module.so'
   'github auth-pam stogh/ngx_http_auth_pam_module ngx_http_auth_pam_module.so'