www-servers/nginx: Bump to version 1.16.1-r1

Package-Manager: Portage-2.3.76, Repoman-2.3.16
Manifest-Sign-Key: B59A336E49FAC0C2F549BA716F4BE7F3199A5BC1

www-servers/nginx/files/http_auth_pam-1.5.1-adjust-loglevel-for-authentication-failures.patch

+https://github.com/sto/ngx_http_auth_pam_module/pull/18
+
+--- a/ngx_http_auth_pam_module.c
++++ b/ngx_http_auth_pam_module.c
+@@ -348,7 +348,7 @@ ngx_http_auth_pam_authenticate(ngx_http_request_t *r,
+     /* try to authenticate user, log error on failure */
+     if ((rc = pam_authenticate(pamh,
+                                PAM_DISALLOW_NULL_AUTHTOK)) != PAM_SUCCESS) {
+-        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
++        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                       "PAM: user '%s' - not authenticated: %s",
+                       ainfo.username.data, pam_strerror(pamh, rc));
+         pam_end(pamh, PAM_SUCCESS);
+@@ -357,7 +357,7 @@ ngx_http_auth_pam_authenticate(ngx_http_request_t *r,
+ 
+     /* check that the account is healthy */
+     if ((rc = pam_acct_mgmt(pamh, PAM_DISALLOW_NULL_AUTHTOK)) != PAM_SUCCESS) {
+-        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
++        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                       "PAM: user '%s'  - invalid account: %s",
+                       ainfo.username.data, pam_strerror(pamh, rc));
+         pam_end(pamh, PAM_SUCCESS);

www-servers/nginx/files/http_brotli-detect-brotli-r2.patch

+--- a/config
++++ b/config
+@@ -59,13 +59,7 @@ have=NGX_HTTP_BROTLI_STATIC_MODULE . auto/have  # deprecated
+ ngx_module_type=HTTP_FILTER
+ ngx_module_name=ngx_http_brotli_filter_module
+ 
+-brotli="/usr/local"
+-
+-if [  -f "/usr/include/brotli/encode.h" ]; then
+-
+-brotli="/usr"
+-
+-fi
++brotli=$(pkg-config --variable=prefix libbrotlienc)
+ 
+ if [ ! -f "$brotli/include/brotli/encode.h" ]; then
+ 
+@@ -75,11 +69,7 @@ if [ ! -f "$brotli/include/brotli/encode.h" ]; then
+ cat << END
+ 
+ $0: error: \
+-Brotli library is missing from the $brotli directory.
+-
+-Please make sure that the git submodule has been checked out:
+-
+-    cd $ngx_addon_dir && git submodule update --init && cd $PWD
++Brotli library not found. Don't you have app-arch/brotli installed?
+ 
+ END
+     exit 1

www-servers/nginx/files/http_echo-nginx-1.11.11+.patch

-From d16babcc09050966f5055df41572429bd84d811a Mon Sep 17 00:00:00 2001
-From: Andrei Belov <defanator@gmail.com>
-Date: Wed, 22 Mar 2017 08:43:30 +0300
-Subject: [PATCH] fixed build with nginx/1.11.11
-
-Closes openresty/echo-nginx-module#64
-
-See also:
-http://hg.nginx.org/nginx/rev/e662cbf1b932
----
- src/ngx_http_echo_request_info.c | 17 +++++++++++++++++
- 1 file changed, 17 insertions(+)
-
-diff --git a/src/ngx_http_echo_request_info.c b/src/ngx_http_echo_request_info.c
-index d28ec4d..27b3c52 100644
---- a/src/ngx_http_echo_request_info.c
-+++ b/src/ngx_http_echo_request_info.c
-@@ -179,6 +179,9 @@ ngx_http_echo_client_request_headers_variable(ngx_http_request_t *r,
-     ngx_int_t                    i, j;
-     ngx_buf_t                   *b, *first = NULL;
-     unsigned                     found;
-+#if defined(nginx_version) && nginx_version >= 1011011
-+    ngx_chain_t                 *cl;
-+#endif
-     ngx_connection_t            *c;
-     ngx_http_request_t          *mr;
-     ngx_http_connection_t       *hc;
-@@ -215,8 +218,15 @@ ngx_http_echo_client_request_headers_variable(ngx_http_request_t *r,
- 
-     if (hc->nbusy) {
-         b = NULL;
-+
-+#if defined(nginx_version) && nginx_version >= 1011011
-+         for (cl = hc->busy; cl; /* void */) {
-+             b = cl->buf;
-+             cl = cl->next;
-+#else
-         for (i = 0; i < hc->nbusy; i++) {
-             b = hc->busy[i];
-+#endif
- 
-             if (first == NULL) {
-                 if (mr->request_line.data >= b->pos
-@@ -280,8 +290,15 @@ ngx_http_echo_client_request_headers_variable(ngx_http_request_t *r,
-     }
- 
-     if (hc->nbusy) {
-+
-+#if defined(nginx_version) && nginx_version >= 1011011
-+         for (cl = hc->busy; cl; /* void */) {
-+             b = cl->buf;
-+             cl = cl->next;
-+#else
-         for (i = 0; i < hc->nbusy; i++) {
-             b = hc->busy[i];
-+#endif
- 
-             if (!found) {
-                 if (b != first) {

www-servers/nginx/files/http_lua_nginx-1.11.11+-r1.patch

-From 0459a285ca0159d45e73da8bd1164edb5c57cde3 Mon Sep 17 00:00:00 2001
-From: Andrei Belov <defanator@gmail.com>
-Date: Wed, 22 Mar 2017 07:50:57 +0300
-Subject: [PATCH] feature: nginx 1.11.11+ can now build with this module.
-
-Note: nginx 1.11.11+ are still not an officially supported target yet.
-More work needed.
-
-Closes openresty/lua-nginx-module#1016
-
-See also:
-http://hg.nginx.org/nginx/rev/e662cbf1b932
----
- src/ngx_http_lua_common.h  |  6 ++++
- src/ngx_http_lua_headers.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++
- src/ngx_http_lua_headers.h |  3 ++
- src/ngx_http_lua_module.c  | 13 ++++++++-
- 4 files changed, 89 insertions(+), 1 deletion(-)
-
-diff --git a/src/ngx_http_lua_common.h b/src/ngx_http_lua_common.h
-index 079a4dc..f37d776 100644
---- a/src/ngx_http_lua_common.h
-+++ b/src/ngx_http_lua_common.h
-@@ -199,6 +199,12 @@ struct ngx_http_lua_main_conf_s {
-                                                 of reqeusts */
-     ngx_uint_t           malloc_trim_req_count;
- 
-+#if nginx_version >= 1011011
-+    /* the following 2 fields are only used by ngx.req.raw_headers() for now */
-+    ngx_buf_t          **busy_buf_ptrs;
-+    ngx_int_t            busy_buf_ptr_count;
-+#endif
-+
-     unsigned             requires_header_filter:1;
-     unsigned             requires_body_filter:1;
-     unsigned             requires_capture_filter:1;
-diff --git a/src/ngx_http_lua_headers.c b/src/ngx_http_lua_headers.c
-index 2392598..6700ce8 100644
---- a/src/ngx_http_lua_headers.c
-+++ b/src/ngx_http_lua_headers.c
-@@ -26,6 +26,9 @@ static int ngx_http_lua_ngx_req_get_headers(lua_State *L);
- static int ngx_http_lua_ngx_req_header_clear(lua_State *L);
- static int ngx_http_lua_ngx_req_header_set(lua_State *L);
- static int ngx_http_lua_ngx_resp_get_headers(lua_State *L);
-+#if nginx_version >= 1011011
-+void ngx_http_lua_ngx_raw_header_cleanup(void *data);
-+#endif
- 
- 
- static int
-@@ -77,6 +80,11 @@ ngx_http_lua_ngx_req_raw_header(lua_State *L)
-     size_t                       size;
-     ngx_buf_t                   *b, *first = NULL;
-     ngx_int_t                    i, j;
-+#if nginx_version >= 1011011
-+    ngx_buf_t                  **bb;
-+    ngx_chain_t                 *cl;
-+    ngx_http_lua_main_conf_t    *lmcf;
-+#endif
-     ngx_connection_t            *c;
-     ngx_http_request_t          *r, *mr;
-     ngx_http_connection_t       *hc;
-@@ -93,6 +101,10 @@ ngx_http_lua_ngx_req_raw_header(lua_State *L)
-         return luaL_error(L, "no request object found");
-     }
- 
-+#if nginx_version >= 1011011
-+    lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
-+#endif
-+
-     ngx_http_lua_check_fake_request(L, r);
- 
-     mr = r->main;
-@@ -109,8 +121,13 @@ ngx_http_lua_ngx_req_raw_header(lua_State *L)
-     dd("hc->nbusy: %d", (int) hc->nbusy);
- 
-     if (hc->nbusy) {
-+#if nginx_version >= 1011011
-+        dd("hc->busy: %p %p %p %p", hc->busy->buf->start, hc->busy->buf->pos,
-+           hc->busy->buf->last, hc->busy->buf->end);
-+#else
-         dd("hc->busy: %p %p %p %p", hc->busy[0]->start, hc->busy[0]->pos,
-            hc->busy[0]->last, hc->busy[0]->end);
-+#endif
-     }
- 
-     dd("request line: %p %p", mr->request_line.data,
-@@ -146,9 +163,37 @@ ngx_http_lua_ngx_req_raw_header(lua_State *L)
-     dd("size: %d", (int) size);
- 
-     if (hc->nbusy) {
-+#if nginx_version >= 1011011
-+        if (hc->nbusy > lmcf->busy_buf_ptr_count) {
-+            if (lmcf->busy_buf_ptrs) {
-+                ngx_free(lmcf->busy_buf_ptrs);
-+            }
-+
-+            lmcf->busy_buf_ptrs = ngx_alloc(hc->nbusy * sizeof(ngx_buf_t *),
-+                                            r->connection->log);
-+
-+            if (lmcf->busy_buf_ptrs == NULL) {
-+                return luaL_error(L, "no memory");
-+            }
-+
-+            lmcf->busy_buf_ptr_count = hc->nbusy;
-+        }
-+
-+        bb = lmcf->busy_buf_ptrs;
-+        for (cl = hc->busy; cl; cl = cl->next) {
-+            *bb++ = cl->buf;
-+        }
-+#endif
-         b = NULL;
-+
-+#if nginx_version >= 1011011
-+        bb = lmcf->busy_buf_ptrs;
-+        for (i = hc->nbusy; i > 0; i--) {
-+            b = bb[i - 1];
-+#else
-         for (i = 0; i < hc->nbusy; i++) {
-             b = hc->busy[i];
-+#endif
- 
-             dd("busy buf: %d: [%.*s]", (int) i, (int) (b->pos - b->start),
-                b->start);
-@@ -223,8 +268,15 @@ ngx_http_lua_ngx_req_raw_header(lua_State *L)
-     }
- 
-     if (hc->nbusy) {
-+
-+#if nginx_version >= 1011011
-+        bb = lmcf->busy_buf_ptrs;
-+        for (i = hc->nbusy - 1; i >= 0; i--) {
-+            b = bb[i];
-+#else
-         for (i = 0; i < hc->nbusy; i++) {
-             b = hc->busy[i];
-+#endif
- 
-             if (!found) {
-                 if (b != first) {
-@@ -1431,4 +1483,20 @@ ngx_http_lua_ffi_get_resp_header(ngx_http_request_t *r,
- #endif /* NGX_LUA_NO_FFI_API */
- 
- 
-+#if nginx_version >= 1011011
-+void
-+ngx_http_lua_ngx_raw_header_cleanup(void *data)
-+{
-+    ngx_http_lua_main_conf_t  *lmcf;
-+
-+    lmcf = (ngx_http_lua_main_conf_t *) data;
-+
-+    if (lmcf->busy_buf_ptrs) {
-+        ngx_free(lmcf->busy_buf_ptrs);
-+        lmcf->busy_buf_ptrs = NULL;
-+    }
-+}
-+#endif
-+
-+
- /* vi:set ft=c ts=4 sw=4 et fdm=marker: */
-diff --git a/src/ngx_http_lua_headers.h b/src/ngx_http_lua_headers.h
-index 39f1114..ee4d21c 100644
---- a/src/ngx_http_lua_headers.h
-+++ b/src/ngx_http_lua_headers.h
-@@ -15,6 +15,9 @@
- void ngx_http_lua_inject_resp_header_api(lua_State *L);
- void ngx_http_lua_inject_req_header_api(lua_State *L);
- void ngx_http_lua_create_headers_metatable(ngx_log_t *log, lua_State *L);
-+#if nginx_version >= 1011011
-+void ngx_http_lua_ngx_raw_header_cleanup(void *data);
-+#endif
- 
- 
- #endif /* _NGX_HTTP_LUA_HEADERS_H_INCLUDED_ */
-diff --git a/src/ngx_http_lua_module.c b/src/ngx_http_lua_module.c
-index 3dc2817..875f933 100644
---- a/src/ngx_http_lua_module.c
-+++ b/src/ngx_http_lua_module.c
-@@ -28,6 +28,7 @@
- #include "ngx_http_lua_ssl_certby.h"
- #include "ngx_http_lua_ssl_session_storeby.h"
- #include "ngx_http_lua_ssl_session_fetchby.h"
-+#include "ngx_http_lua_headers.h"
- 
- 
- static void *ngx_http_lua_create_main_conf(ngx_conf_t *cf);
-@@ -624,7 +625,7 @@ ngx_http_lua_init(ngx_conf_t *cf)
-     volatile ngx_cycle_t       *saved_cycle;
-     ngx_http_core_main_conf_t  *cmcf;
-     ngx_http_lua_main_conf_t   *lmcf;
--#ifndef NGX_LUA_NO_FFI_API
-+#if !defined(NGX_LUA_NO_FFI_API) || nginx_version >= 1011011
-     ngx_pool_cleanup_t         *cln;
- #endif
- 
-@@ -716,6 +717,16 @@ ngx_http_lua_init(ngx_conf_t *cf)
-     cln->handler = ngx_http_lua_sema_mm_cleanup;
- #endif
- 
-+#if nginx_version >= 1011011
-+    cln = ngx_pool_cleanup_add(cf->pool, 0);
-+    if (cln == NULL) {
-+        return NGX_ERROR;
-+    }
-+
-+    cln->data = lmcf;
-+    cln->handler = ngx_http_lua_ngx_raw_header_cleanup;
-+#endif
-+
-     if (lmcf->lua == NULL) {
-         dd("initializing lua vm");
- 

www-servers/nginx/files/http_security-pr_1158.patch

-From 2fa8ffea68498e02005e85c27e61bde30718ae3b Mon Sep 17 00:00:00 2001
-From: Thomas Deutschmann <whissi@whissi.de>
-Date: Sat, 11 Jun 2016 16:18:17 +0200
-Subject: [PATCH 1/2] configure: Fix detection whether libcurl is linked
- against gnutls
-
-The find_curl macro is also checking whether libcurl is linked against
-gnutls. However the check depends on "CURL_LIBS" which wasn't defined
-by the macro.
-
-This commit will define "CURL_LIBS" so that the check works as expected.
----
- build/find_curl.m4 | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/build/find_curl.m4 b/build/find_curl.m4
-index 6b23ad6..3310e40 100644
---- a/build/find_curl.m4
-+++ b/build/find_curl.m4
-@@ -2,6 +2,7 @@ dnl Check for CURL Libraries
- dnl CHECK_CURL(ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND])
- dnl Sets:
- dnl  CURL_CFLAGS
-+dnl  CURL_LDADD
- dnl  CURL_LIBS
- 
- CURL_CONFIG=""
-@@ -57,7 +58,8 @@ if test -n "${curl_path}"; then
-     if test "$verbose_output" -eq 1; then AC_MSG_NOTICE(curl VERSION: $CURL_VERSION); fi
-     CURL_CFLAGS="`${CURL_CONFIG} --cflags`"
-     if test "$verbose_output" -eq 1; then AC_MSG_NOTICE(curl CFLAGS: $CURL_CFLAGS); fi
--    CURL_LDADD="`${CURL_CONFIG} --libs`"
-+    CURL_LIBS="`${CURL_CONFIG} --libs`"
-+    CURL_LDADD="${CURL_LIBS}"
-     if test "$verbose_output" -eq 1; then AC_MSG_NOTICE(curl LDADD: $CURL_LIBS); fi
- 
-     dnl # Check version is ok
-
-From 67f98e7da04251a40a0172e3dfac2c5a6ac6f7dd Mon Sep 17 00:00:00 2001
-From: Thomas Deutschmann <whissi@whissi.de>
-Date: Sat, 11 Jun 2016 16:48:58 +0200
-Subject: [PATCH 2/2] configure: Move verbose_output declaration up to the
- beginning
-
-Macros like "find_curl" are using "verbose_output" variable but because some
-of them are called before we define the variable we are seeing errors like
-
-  ./configure: line 13855: test: : integer expression expected
-
-This commit will fix the problem by moving the "verbose_output" declaration
-up to the beginning so that the variable is available for every macro.
----
- configure.ac | 30 ++++++++++++++++--------------
- 1 file changed, 16 insertions(+), 14 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 7517885..0f32b01 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -70,6 +70,22 @@ AC_SUBST(MSC_REGRESSION_DOCROOT_DIR)
- 
- ### Configure Options
- 
-+# Verbose output
-+AC_ARG_ENABLE(verbose-output,
-+              AS_HELP_STRING([--enable-verbose-output],
-+                             [Enable more verbose configure output.]),
-+[
-+  if test "$enableval" != "no"; then
-+    verbose_output=1
-+  else
-+    verbose_output=0
-+  fi
-+],
-+[
-+  verbose_output=0
-+])
-+
-+
- #OS type
- 
- AC_CANONICAL_HOST
-@@ -410,20 +426,6 @@ AC_ARG_ENABLE(errors,
-   report_errors=1
- ])
- 
--# Verbose output
--AC_ARG_ENABLE(verbose-output,
--              AS_HELP_STRING([--enable-verbose-output],
--                             [Enable more verbose configure output.]),
--[
--  if test "$enableval" != "no"; then
--    verbose_output=1
--  else
--    verbose_output=0
--  fi
--],
--[
--  verbose_output=0
--])
- 
- # Strict Compile
- AC_ARG_ENABLE(strict-compile,

www-servers/nginx/files/http_security-pr_1373.patch

-From d19df159043106a4d6dfd113696900b5b0dae24b Mon Sep 17 00:00:00 2001
-From: Andrei Belov <defanator@gmail.com>
-Date: Mon, 3 Apr 2017 12:52:01 +0300
-Subject: [PATCH] Fix building with nginx >= 1.11.11
-
-Closes SpiderLabs/ModSecurity#1359
-
-See also:
-http://hg.nginx.org/nginx/rev/e662cbf1b932
----
- nginx/modsecurity/ngx_http_modsecurity.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/nginx/modsecurity/ngx_http_modsecurity.c b/nginx/modsecurity/ngx_http_modsecurity.c
-index 7c13953..367b2b8 100644
---- a/nginx/modsecurity/ngx_http_modsecurity.c
-+++ b/nginx/modsecurity/ngx_http_modsecurity.c
-@@ -528,9 +528,15 @@ ngx_http_modsecurity_save_request_body(ngx_http_request_t *r)
- 
-         hc = r->http_connection;
- 
-+#if defined(nginx_version) && nginx_version >= 1011011
-+        if (hc->free && size == cscf->large_client_header_buffers.size) {
-+
-+            buf = hc->free->buf;
-+#else
-         if (hc->nfree && size == cscf->large_client_header_buffers.size) {
- 
-             buf = hc->free[--hc->nfree];
-+#endif
- 
-             ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                            "ModSecurity: use http free large header buffer: %p %uz",

www-servers/nginx/nginx-1.13.8.ebuild → www-servers/nginx/nginx-1.16.1-r1.ebuild

@@ -17,11 +17,17 @@ EAPI="6"
 GENTOO_DEPEND_ON_PERL="no"
 
 # devel_kit (https://github.com/simpl/ngx_devel_kit, BSD license)
-DEVEL_KIT_MODULE_PV="0.3.0"
-DEVEL_KIT_MODULE_P="ngx_devel_kit-${DEVEL_KIT_MODULE_PV}-r1"
+DEVEL_KIT_MODULE_PV="0.3.1"
+DEVEL_KIT_MODULE_P="ngx_devel_kit-${DEVEL_KIT_MODULE_PV}"
 DEVEL_KIT_MODULE_URI="https://github.com/simpl/ngx_devel_kit/archive/v${DEVEL_KIT_MODULE_PV}.tar.gz"
 DEVEL_KIT_MODULE_WD="${WORKDIR}/ngx_devel_kit-${DEVEL_KIT_MODULE_PV}"
 
+# ngx_brotli (https://github.com/eustas/ngx_brotli, BSD-2)
+HTTP_BROTLI_MODULE_PV="8104036af9cff4b1d34f22d00ba857e2a93a243c"
+HTTP_BROTLI_MODULE_P="ngx_brotli-${HTTP_BROTLI_MODULE_PV}"
+HTTP_BROTLI_MODULE_URI="https://github.com/eustas/ngx_brotli/archive/${HTTP_BROTLI_MODULE_PV}.tar.gz"
+HTTP_BROTLI_MODULE_WD="${WORKDIR}/ngx_brotli-${HTTP_BROTLI_MODULE_PV}"
+
 # http_uploadprogress (https://github.com/masterzen/nginx-upload-progress-module, BSD-2 license)
 HTTP_UPLOAD_PROGRESS_MODULE_PV="0.9.2"
 HTTP_UPLOAD_PROGRESS_MODULE_P="ngx_http_upload_progress-${HTTP_UPLOAD_PROGRESS_MODULE_PV}-r1"
@@ -47,13 +53,13 @@ HTTP_SLOWFS_CACHE_MODULE_URI="http://labs.frickle.com/files/ngx_slowfs_cache-${H
 HTTP_SLOWFS_CACHE_MODULE_WD="${WORKDIR}/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
 
 # http_fancyindex (https://github.com/aperezdc/ngx-fancyindex, BSD license)
-HTTP_FANCYINDEX_MODULE_PV="0.4.2"
+HTTP_FANCYINDEX_MODULE_PV="0.4.3"
 HTTP_FANCYINDEX_MODULE_P="ngx_http_fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
 HTTP_FANCYINDEX_MODULE_URI="https://github.com/aperezdc/ngx-fancyindex/archive/v${HTTP_FANCYINDEX_MODULE_PV}.tar.gz"
 HTTP_FANCYINDEX_MODULE_WD="${WORKDIR}/ngx-fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
 
 # http_lua (https://github.com/openresty/lua-nginx-module, BSD license)
-HTTP_LUA_MODULE_PV="0.10.11"
+HTTP_LUA_MODULE_PV="0.10.15"
 HTTP_LUA_MODULE_P="ngx_http_lua-${HTTP_LUA_MODULE_PV}"
 HTTP_LUA_MODULE_URI="https://github.com/openresty/lua-nginx-module/archive/v${HTTP_LUA_MODULE_PV}.tar.gz"
 HTTP_LUA_MODULE_WD="${WORKDIR}/lua-nginx-module-${HTTP_LUA_MODULE_PV}"
@@ -65,7 +71,7 @@ HTTP_AUTH_PAM_MODULE_URI="https://github.com/stogh/ngx_http_auth_pam_module/arch
 HTTP_AUTH_PAM_MODULE_WD="${WORKDIR}/ngx_http_auth_pam_module-${HTTP_AUTH_PAM_MODULE_PV}"
 
 # http_upstream_check (https://github.com/yaoweibin/nginx_upstream_check_module, BSD license)
-HTTP_UPSTREAM_CHECK_MODULE_PV="31b1b42873fa56620d8a873ac13f5f26b52d0cd6"
+HTTP_UPSTREAM_CHECK_MODULE_PV="9aecf15ec379fe98f62355c57b60c0bc83296f04"
 HTTP_UPSTREAM_CHECK_MODULE_P="ngx_http_upstream_check-${HTTP_UPSTREAM_CHECK_MODULE_PV}"
 HTTP_UPSTREAM_CHECK_MODULE_URI="https://github.com/yaoweibin/nginx_upstream_check_module/archive/${HTTP_UPSTREAM_CHECK_MODULE_PV}.tar.gz"
 HTTP_UPSTREAM_CHECK_MODULE_WD="${WORKDIR}/nginx_upstream_check_module-${HTTP_UPSTREAM_CHECK_MODULE_PV}"
@@ -76,8 +82,14 @@ HTTP_METRICS_MODULE_P="ngx_metrics-${HTTP_METRICS_MODULE_PV}"
 HTTP_METRICS_MODULE_URI="https://github.com/madvertise/ngx_metrics/archive/v${HTTP_METRICS_MODULE_PV}.tar.gz"
 HTTP_METRICS_MODULE_WD="${WORKDIR}/ngx_metrics-${HTTP_METRICS_MODULE_PV}"
 
+# http_vhost_traffic_status (https://github.com/vozlt/nginx-module-vts, BSD license)
+HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV="46d85558e344dfe2b078ce757fd36c69a1ec2dd3"
+HTTP_VHOST_TRAFFIC_STATUS_MODULE_P="ngx_http_vhost_traffic_status-${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}"
+HTTP_VHOST_TRAFFIC_STATUS_MODULE_URI="https://github.com/vozlt/nginx-module-vts/archive/${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}.tar.gz"
+HTTP_VHOST_TRAFFIC_STATUS_MODULE_WD="${WORKDIR}/nginx-module-vts-${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}"
+
 # naxsi-core (https://github.com/nbs-system/naxsi, GPLv2+)
-HTTP_NAXSI_MODULE_PV="0.55.3"
+HTTP_NAXSI_MODULE_PV="0.56"
 HTTP_NAXSI_MODULE_P="ngx_http_naxsi-${HTTP_NAXSI_MODULE_PV}"
 HTTP_NAXSI_MODULE_URI="https://github.com/nbs-system/naxsi/archive/${HTTP_NAXSI_MODULE_PV}.tar.gz"
 HTTP_NAXSI_MODULE_WD="${WORKDIR}/naxsi-${HTTP_NAXSI_MODULE_PV}/naxsi_src"
@@ -89,7 +101,7 @@ RTMP_MODULE_URI="https://github.com/arut/nginx-rtmp-module/archive/v${RTMP_MODUL
 RTMP_MODULE_WD="${WORKDIR}/nginx-rtmp-module-${RTMP_MODULE_PV}"
 
 # nginx-dav-ext-module (https://github.com/arut/nginx-dav-ext-module, BSD license)
-HTTP_DAV_EXT_MODULE_PV="0.1.0"
+HTTP_DAV_EXT_MODULE_PV="3.0.0"
 HTTP_DAV_EXT_MODULE_P="ngx_http_dav_ext-${HTTP_DAV_EXT_MODULE_PV}"
 HTTP_DAV_EXT_MODULE_URI="https://github.com/arut/nginx-dav-ext-module/archive/v${HTTP_DAV_EXT_MODULE_PV}.tar.gz"
 HTTP_DAV_EXT_MODULE_WD="${WORKDIR}/nginx-dav-ext-module-${HTTP_DAV_EXT_MODULE_PV}"
@@ -102,7 +114,7 @@ HTTP_ECHO_MODULE_WD="${WORKDIR}/echo-nginx-module-${HTTP_ECHO_MODULE_PV}"
 
 # mod_security for nginx (https://modsecurity.org/, Apache-2.0)
 # keep the MODULE_P here consistent with upstream to avoid tarball duplication
-HTTP_SECURITY_MODULE_PV="2.9.2"
+HTTP_SECURITY_MODULE_PV="2.9.3"
 HTTP_SECURITY_MODULE_P="modsecurity-${HTTP_SECURITY_MODULE_PV}"
 HTTP_SECURITY_MODULE_URI="https://www.modsecurity.org/tarball/${HTTP_SECURITY_MODULE_PV}/${HTTP_SECURITY_MODULE_P}.tar.gz"
 HTTP_SECURITY_MODULE_WD="${WORKDIR}/${HTTP_SECURITY_MODULE_P}"
@@ -126,67 +138,84 @@ HTTP_MOGILEFS_MODULE_URI="https://github.com/vkholodkov/nginx-mogilefs-module/ar
 HTTP_MOGILEFS_MODULE_WD="${WORKDIR}/nginx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}"
 
 # memc-module (https://github.com/openresty/memc-nginx-module, BSD-2)
-HTTP_MEMC_MODULE_PV="0.18"
+HTTP_MEMC_MODULE_PV="0.19"
 HTTP_MEMC_MODULE_P="ngx_memc_module-${HTTP_MEMC_MODULE_PV}"
 HTTP_MEMC_MODULE_URI="https://github.com/openresty/memc-nginx-module/archive/v${HTTP_MEMC_MODULE_PV}.tar.gz"
 HTTP_MEMC_MODULE_WD="${WORKDIR}/memc-nginx-module-${HTTP_MEMC_MODULE_PV}"
 
 # nginx-ldap-auth-module (https://github.com/kvspb/nginx-auth-ldap, BSD-2)
-HTTP_LDAP_MODULE_PV="49a8b4d28fc4a518563c82e0b52821e5f37db1fc"
+HTTP_LDAP_MODULE_PV="42d195d7a7575ebab1c369ad3fc5d78dc2c2669c"
 HTTP_LDAP_MODULE_P="nginx-auth-ldap-${HTTP_LDAP_MODULE_PV}"
 HTTP_LDAP_MODULE_URI="https://github.com/kvspb/nginx-auth-ldap/archive/${HTTP_LDAP_MODULE_PV}.tar.gz"
 HTTP_LDAP_MODULE_WD="${WORKDIR}/nginx-auth-ldap-${HTTP_LDAP_MODULE_PV}"
 
-HTTP_VOD_MODULE_PV="1.22"
+HTTP_VOD_MODULE_PV="1.24"
 HTTP_VOD_MODULE_P="nginx-vod-module-${HTTP_VOD_MODULE_PV}"
 HTTP_VOD_MODULE_URI="https://github.com/kaltura/nginx-vod-module/archive/${HTTP_VOD_MODULE_PV}.tar.gz"
 HTTP_VOD_MODULE_WD="${WORKDIR}/nginx-vod-module-${HTTP_VOD_MODULE_PV}"
 
+# geoip2 (https://github.com/leev/ngx_http_geoip2_module, BSD-2)
+GEOIP2_MODULE_PV="3.2"
+GEOIP2_MODULE_P="ngx_http_geoip2_module-${GEOIP2_MODULE_PV}"
+GEOIP2_MODULE_URI="https://github.com/leev/ngx_http_geoip2_module/archive/${GEOIP2_MODULE_PV}.tar.gz"
+GEOIP2_MODULE_WD="${WORKDIR}/ngx_http_geoip2_module-${GEOIP2_MODULE_PV}"
+
+# njs-module (https://github.com/nginx/njs, as-is)
+NJS_MODULE_PV="0.3.5"
+NJS_MODULE_P="njs-${NJS_MODULE_PV}"
+NJS_MODULE_URI="https://github.com/nginx/njs/archive/${NJS_MODULE_PV}.tar.gz"
+NJS_MODULE_WD="${WORKDIR}/njs-${NJS_MODULE_PV}"
+
 # We handle deps below ourselves
 SSL_DEPS_SKIP=1
 AUTOTOOLS_AUTO_DEPEND="no"
 
-inherit autotools ssl-cert toolchain-funcs perl-module flag-o-matic user systemd versionator multilib
+inherit autotools ssl-cert toolchain-funcs perl-module flag-o-matic user systemd versionator multilib pax-utils
 
 DESCRIPTION="Robust, small and high performance http and reverse proxy server"
 HOMEPAGE="https://nginx.org"
 SRC_URI="https://nginx.org/download/${P}.tar.gz
 	${DEVEL_KIT_MODULE_URI} -> ${DEVEL_KIT_MODULE_P}.tar.gz
-	nginx_modules_http_upload_progress? ( ${HTTP_UPLOAD_PROGRESS_MODULE_URI} -> ${HTTP_UPLOAD_PROGRESS_MODULE_P}.tar.gz )
-	nginx_modules_http_headers_more? ( ${HTTP_HEADERS_MORE_MODULE_URI} -> ${HTTP_HEADERS_MORE_MODULE_P}.tar.gz )
+	nginx_modules_http_auth_ldap? ( ${HTTP_LDAP_MODULE_URI} -> ${HTTP_LDAP_MODULE_P}.tar.gz )
+	nginx_modules_http_auth_pam? ( ${HTTP_AUTH_PAM_MODULE_URI} -> ${HTTP_AUTH_PAM_MODULE_P}.tar.gz )
+	nginx_modules_http_brotli? ( ${HTTP_BROTLI_MODULE_URI} -> ${HTTP_BROTLI_MODULE_P}.tar.gz )
 	nginx_modules_http_cache_purge? ( ${HTTP_CACHE_PURGE_MODULE_URI} -> ${HTTP_CACHE_PURGE_MODULE_P}.tar.gz )
-	nginx_modules_http_slowfs_cache? ( ${HTTP_SLOWFS_CACHE_MODULE_URI} -> ${HTTP_SLOWFS_CACHE_MODULE_P}.tar.gz )
+	nginx_modules_http_dav_ext? ( ${HTTP_DAV_EXT_MODULE_URI} -> ${HTTP_DAV_EXT_MODULE_P}.tar.gz )
+	nginx_modules_http_echo? ( ${HTTP_ECHO_MODULE_URI} -> ${HTTP_ECHO_MODULE_P}.tar.gz )
 	nginx_modules_http_fancyindex? ( ${HTTP_FANCYINDEX_MODULE_URI} -> ${HTTP_FANCYINDEX_MODULE_P}.tar.gz )
+	nginx_modules_http_geoip2? ( ${GEOIP2_MODULE_URI} -> ${GEOIP2_MODULE_P}.tar.gz )
+	nginx_modules_http_headers_more? ( ${HTTP_HEADERS_MORE_MODULE_URI} -> ${HTTP_HEADERS_MORE_MODULE_P}.tar.gz )
+	nginx_modules_http_javascript? ( ${NJS_MODULE_URI} -> ${NJS_MODULE_P}.tar.gz )
 	nginx_modules_http_lua? ( ${HTTP_LUA_MODULE_URI} -> ${HTTP_LUA_MODULE_P}.tar.gz )
-	nginx_modules_http_auth_pam? ( ${HTTP_AUTH_PAM_MODULE_URI} -> ${HTTP_AUTH_PAM_MODULE_P}.tar.gz )
-	nginx_modules_http_upstream_check? ( ${HTTP_UPSTREAM_CHECK_MODULE_URI} -> ${HTTP_UPSTREAM_CHECK_MODULE_P}.tar.gz )
+	nginx_modules_http_memc? ( ${HTTP_MEMC_MODULE_URI} -> ${HTTP_MEMC_MODULE_P}.tar.gz )
 	nginx_modules_http_metrics? ( ${HTTP_METRICS_MODULE_URI} -> ${HTTP_METRICS_MODULE_P}.tar.gz )
+	nginx_modules_http_mogilefs? ( ${HTTP_MOGILEFS_MODULE_URI} -> ${HTTP_MOGILEFS_MODULE_P}.tar.gz )
 	nginx_modules_http_naxsi? ( ${HTTP_NAXSI_MODULE_URI} -> ${HTTP_NAXSI_MODULE_P}.tar.gz )