gentoo auto-resync : 19:07:2022 - 20:39:44

5 files changed, 27 insertions, 191 deletions

diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 75031ed8cf29..b7c0869119fd 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index 1c03a23bcf61..ff79c2ffebcf 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -1,6 +1,5 @@
 AUX http_brotli-detect-brotli-r3.patch 745 BLAKE2B 1442822f9b16362c04354f29f45ee4e7605e0f74ac09092161b9e69a1c3b42f024d12cb64cc5bb0e417200dc963a531110f82b003d54690138b7df35e019e9e3 SHA512 a287636c07335b48303585d906adb87cf9094133c16c238074826aebb19347428bb15ac4ebc77040142c509f8a87c9fbca9783e2f5c10399ef63341fbc22e881
 AUX http_cache_purge-1.11.6+.patch 615 BLAKE2B 520a437290dbed718f392bedecdb66c9eae3440c2e5977bede5829f8420905e60c74fac3dad7b22c12d2070ce47430795482d270222ba8d4640af415e4974210 SHA512 a3f45d8121d89a5c41783306577e146990404ff0e3691454e99cd6270ab02dfc7fd8718b3781666373ea6784ed2c06cec0b40315486a6a138185ca1548c04b60
-AUX http_headers_more-nginx-1.23.0.patch 5229 BLAKE2B c08ee33042e616166adefd4fd21339594a7dc1580239138649d1ea25dbad33f1b709c606cd95644f7c18d0b4650bd89829ac3d1094f7283f8c4b010e48d0137a SHA512 1876c9f9f8b3f7426d441cb29bfe563a8c512357e20c9bfc3bcf999b853398acdb6138411a6416dcfa64d8c95a1caa74a880a36ce30ebbe4fa22e6823282e87c
 AUX http_sticky-nginx-1.23.0.patch 1101 BLAKE2B 0a5f0bc5fb7987e1da13f39b6c2c7fcbc21452ddea510fb7aeb4933bfe7c94cc10c8b714c8de135b14d212a0532e39beebbad0105e2d140e12ecc608b1996156 SHA512 3066e9aec3a3073acd8ef8e1d3bf9abc33b4f0d9232573bb83417b838a42f04195b82337b569f7f808c7c0b94a6fd53371882aa805576de5989d359b21872396
 AUX http_uploadprogress-issue_50-r1.patch 1098 BLAKE2B f8191fdfa85c7aa016555a636b5c291d6d0ed54fea0714b361ce500deb7431f16c77a2f5675c5dc2f6e8ed278f7c24efd45eba3ddab27a2fa7d4e6d1391cfe8d SHA512 bdc3a129059b1af9c317d1e8b74ec98a14bf1e55b59ae867b963304541457e1676acb775ac2cec730ee2036feedf75d636eeb36700b0913e417045a52a00eec9
 AUX http_uploadprogress-nginx-1.23.0.patch 2680 BLAKE2B 872a386964dd1fa3a8c09d69231b546ba497d85f1b270fbb015ec4835c0c7ca9e7b3018d0a7674b4bd8aa76b558327439cdffc1912c74a8c3d91b2334bb0a61d SHA512 2899636d730583c0eaa21e89d50ccb7a888e7f27fa194102909e42fb28cb8e239416978f55bed0a9115b65d0ac718cb7da8c1fa589eb79e9f66eea41dfc3458b
@@ -13,6 +12,7 @@ AUX nginx.initd-r4 2192 BLAKE2B b482b9cc473a1df06764d60c7ce5c99a3f680778028bf440
 AUX nginx.logrotate-r1 257 BLAKE2B d62c57377efd5259b6c776861d921b6e4ea026387157d618abd9e578f2e432ac0cf653a0f3842a0620d405759216bdc17afd50b33aaec3ad0c6757dfac3e34d8 SHA512 4892fc1700817c9a459a531df0320fe606a51be7f8b4e3ddf5852fe33def70dbff36fcefd2fce247c6846d6315ea92f3421eb21299a162d082b85fa27572cd95
 AUX nginx.service-r1 356 BLAKE2B 05d89efcc73b70a26655f306f1e074e61c81063cb4e949161efbe95dc375e63807233f38c9af6723801e8f653cfad08f62fbec225b061d1179b7d05fe761afc4 SHA512 e51f4e88abe10555afe79d4d029651a4de42a5dc1dddaf951f13c021453da00e0c56a3fa2129d08fcd090909a54564e76887c93fdf72952021f5a2b09f6097eb
 DIST modsecurity-2.9.3.tar.gz 4307670 BLAKE2B 337ea15cc8805af7ab43aed8aecf4c72ccc586d0d7e9d9b91f036a61baa70d1ac8b4ad8045a2bb7a13515912a15fba7d3cdb9670ae6730de43b1e44ee90ded6d SHA512 4e1ea5dd8edadf8f630e4fe92a200d3a8e78963fce3128b5975a1e1ecd0e8bf9ceecd9905c95f8c508932ccd837f1d8ae8bb2ba423307718c3c6a4ae9b783ddd
+DIST modsecurity-nginx-1.0.3.tar.gz 34063 BLAKE2B 859a29eb7f67d53a818578f1008f0d0debbe37c205bb7c6e79594d8b1a6a0d93988880d35f607ef05ef6d73c9aa887baebfd2c54aca894969beeed4bfe576f37 SHA512 20495884c6b3594edf879a19fd7445f2e74a1628789decd146b3c712764b0507e440a84a64aab619461b044f98b8d641913cfad57a6d0002e7061716bdfe84fc
 DIST nginx-1.21.6.tar.gz 1073364 BLAKE2B 815d035df33bd947eec41a2f5c993d1f179aa0bd4d069280916aa089a2f96fd3bada7a7192b4a0ef7b8f43036f3a2def0e93d8c8f720dd7145a5d55ea058652f SHA512 10b0cdd13b26687104bf11e6b850fd851e9d8881bdf67f72c062d956e661da4d70482e6ec3123405b324ad7ed821a8bcc67b742dce9f59e972407fa437ddcad4
 DIST nginx-1.23.0.tar.gz 1102940 BLAKE2B 375e63449dda4bb8df3535cc3f31bede03bf6cdc374c46fe5f5e1107fbf9e829d15f329123bd19d96f8236ca665cde3000366967372193fc023a3212bac562a9 SHA512 c76619e42e7715898cce7e13f5672b36e9d9401f815d912a453aae8364b6f8a4365e3cc6858a333bf68ebea1191f0ad38136f2d1832facc9acbf6c8a883999cd
 DIST nginx-auth-ldap-42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz 18457 BLAKE2B 22225ca9e5299b20ab5a93a001cac48e446bd86b3a24ac49e716bc975b128890bdb4b0dbbf5730fbaaeadfd958160093c7a6af798dd0e6de27062f149a760333 SHA512 ec59637fda5acac053e815cb1d04b545fc6b765e5ec63d8c2c9c301abad87afaa2698145acac08e9e14c91e1423ebff7aff0cca2b940b19ccccbf4cf53973269
@@ -25,6 +25,7 @@ DIST ngx_http_dav_ext-3.0.0.tar.gz 14558 BLAKE2B 0d370bfe34600d43a540dd19a386aa5
 DIST ngx_http_echo-0.62.tar.gz 53329 BLAKE2B 7d92184f7fb878cb5261be1c68de4432d472469028e20c2150925ab3d9a1c472ef557a11b84ee60d7ae6b48d08b35890c50161540668918492f2092dd0272962 SHA512 240896b1c559a71ca6ca87136d8535edd25b1d65ebb80d46080ad41c09ed1cec9737828f9efe260782294d660cea66cf402f4e75bba3fed26f3a94de0ae2f89b
 DIST ngx_http_fancyindex-0.4.4.tar.gz 26292 BLAKE2B a1ed76cb31cd4f7a349bcbe63d75f8e00331d0ba4ee9b7b1df41dac77fe64ebe6c72a6fd5f6ebc9de53e8d3a8a2ad5185fbaa533d8ff008fcf92f6956f267d80 SHA512 bf8ebb188c10fee5e6ebcb338fe20fdf859bb88d9b2b0e3da6f3e2f1847738d30760d2642d0dfe257092bdf2399b561631556a3a8e2fb33dc9cd0c59d371c173
 DIST ngx_http_geoip2_module-3.3.tar.gz 8509 BLAKE2B 4841e1bdd13b9b85f34732d1eb7447638f62bb09e1bd480da0fa8b0085d3b2d90a740732ef534c355feb71d7db613c73f68a4e6e3624b47a0937be046dfa1f8d SHA512 06963b598c54e22d75ce837fb222f5aa6c9494c29e558ff46f1205d7159fc305414bfac4ed3288c836dcbf7628d92f26458e1992d34fc2f4b73275a32847bdc0
+DIST ngx_http_geoip2_module-3.4.tar.gz 8877 BLAKE2B cd59ebbd2ca47f6af0b22b8b91768053d2c991f7adf19941625e3570d81dcb73989101795d641e4efce1eed37d454bca73d603b5d0e4511e3bd63100c7acf750 SHA512 18dea21e5ae2647bea1fc448058a1b773c936917245edef8d861d5e23ed92e9a3b1ec4ef43ffb2ece7b5899d787910adcf4fbd39f84d7e8d7c54759e2fee5b72
 DIST ngx_http_headers_more-0.33.tar.gz 28130 BLAKE2B fe3097a7700ce5da087058f7bb44c95164b75137031187400473f6833bf0e33e5c4920807225a6ff94174fe7dbd6186cca176a33a629ca0911faab6804bdd12a SHA512 13165b1b8d4be281b8bd2404fa48d456013d560bace094c81da08a35dc6a4f025a809a3ae3a42be6bbf67abbcbe41e0730aba06f905220f3baeb01e1192a7d37
 DIST ngx_http_headers_more-d502e41996d24a382bd9c632e3ae3efa0a5fca66.tar.gz 28810 BLAKE2B cb71e6b8a9da6c72bc542e837391e932c5803d52cbf01eab0b70f501b620d7de03009a25d10e9ba9de46a6c9ffca109b50dea47cded687412eb55210ba6e68c8 SHA512 80193f95f9754b1d6fb784cde6b4c4d6f72b5cff406c26329a93ad87a5833cd87ef7a8113d719bbe6913fd8e1fb29f438fa81e6dada8c0fc39bf0f2e47fe08ae
 DIST ngx_http_lua-0.10.15.tar.gz 655110 BLAKE2B 73bf8e2f157c93f3d4e54b5aa63deb266731a10e3e48b2257756efee8d752e86440ca9c27bd27bc1d90075a5ffb58772eecb7c445db44cd055d2b9e0b4bac082 SHA512 1feea538464275e6e571860592628ad639b2259c8aab7f38575b81c0b355f1ade32a91643267bc9ec16519e3bcf3d132511513dc8c949f74a3bff975c85d8ff7
@@ -45,5 +46,5 @@ DIST njs-0.7.2.tar.gz 584483 BLAKE2B 98f28e599f73aaacf2c155dd2a630b8dec9767725e4
 DIST njs-0.7.5.tar.gz 592998 BLAKE2B 7e1178f928320741eb3af4a4b8692b061c9d223e2f905f2fb2b9f604924e7586f0fa4dc7dbdef9965f5f74f9a87bb87fc5550135ffe084aa71b25bebef5387fc SHA512 e33dbb285ff6216acddcd213fdbd73ffadd5730680bcec742b1598fa57b4d100da32c913b1c2648b3e87867fc29bf11075d70fa5655f85c62e42eb0a48d177f1
 EBUILD nginx-1.21.6-r2.ebuild 40087 BLAKE2B 112bb88ef710b36d6f742c4e530a9a7874c62e367cbe37c3cc5821a18871f3a0fd95c4ab341c81a6ca6e7058de487f00248eceb18731cf1d3a9ead827849a086 SHA512 9efb2473b925368ff022cc27a145d3fa9ec637bfc030aca3c765fd8359c92f1ac2a89e6490dcda601cfca5b1c0e5386d4e885c0ddef15b7297a930f200980362
 EBUILD nginx-1.21.6-r3.ebuild 40087 BLAKE2B d9113076a1ce7f0b20e90a11bfe91dc4ab198dc0fef75033602792182a517b3c62463a928063596738cdff6c001cdeedf89b47a458a35431713397c9b230fef4 SHA512 de32f0edf027bad5e95f80d23e04cf3b2c57f3347c7d332056036188648a50ed2c8d15c2b099cc6fd2fe242749b97e2a067ef1d7c3f0837450b867279566f868
-EBUILD nginx-1.23.0.ebuild 38641 BLAKE2B ca43dacc0759a0857e36d62e4070da9cf1e6b9d98c730783c06fbfeaa3dba86746d77b2ee75003b9a6acb1044407cf6b630c41fcb18c8524572f5334930f8fb2 SHA512 d1128f45f716d55c9859e1064bdf092dfaf944778e149808729054301241f3d67d867c0d373f1590fc2a19836bda83848c9b9ec65708fb061dcfe017f9810236
-MISC metadata.xml 957 BLAKE2B 082956c543d3bea969b687777c9aeda28771529c533bef4f1022aba2a7ff028c17fb9f0225838c7dc5469195d4d5f390fa86f729eede9dbca486035c9d76bdc8 SHA512 d2db106dafc55c0853e57616f830fb26fa26622a3b9cc7348a6dfb7c90c92e48bbbe6e4a87becd3b34dec1cfd60ac4ee1f923a828d0a48a8d4f24603f21cb250
+EBUILD nginx-1.23.0-r1.ebuild 39602 BLAKE2B 6bb1b6c4d41df46965774c298e9ed8f9d86445bd1d93bafb386324ee036609789a3c131a3f0386c5c8972ff05d2ff7ae56d2aaf0215b7fbefc4f8c3005fabfd8 SHA512 19b795700f0ebc43c6cd330d3d4cc92d832fd6fbdfe822ec739cd1fb0633032d945b8f7ed1a7c7c4c322ec68ac05f430f5de9dc84f6e993f9fac26b0727c5e6d
+MISC metadata.xml 1012 BLAKE2B 5fe75eb9105a998668cfebf02c6976784f4ef3332edd0b6c21a23a5ffb0838b4ae8bc9e52f5157b43c3c0d060825ac46bccabc94bcf8b59447311e0f9ac94f29 SHA512 0d243d1d5271d05d51a46b5825fe32ac5283211434672e99e7314c57f5d1f1f88f48c189fffcdb12747c8d33c9dafe0c8df12376cbbec2912732da0ed6de0642
diff --git a/www-servers/nginx/files/http_headers_more-nginx-1.23.0.patch b/www-servers/nginx/files/http_headers_more-nginx-1.23.0.patch
deleted file mode 100644
index 4c06315323f3..000000000000
--- a/www-servers/nginx/files/http_headers_more-nginx-1.23.0.patch
+++ /dev/null
@@ -1,187 +0,0 @@
-diff --git a/src/ngx_http_headers_more_headers_in.c b/src/ngx_http_headers_more_headers_in.c
-index c3eb8f7..84c7525 100644
---- a/src/ngx_http_headers_more_headers_in.c
-+++ b/src/ngx_http_headers_more_headers_in.c
-@@ -158,9 +158,15 @@ static ngx_http_headers_more_set_header_t ngx_http_headers_more_set_handlers[]
-                  ngx_http_set_builtin_header },
- #endif
- 
-+#if defined(nginx_version) && nginx_version >= 1023000
-+    { ngx_string("Cookie"),
-+                 offsetof(ngx_http_headers_in_t, cookie),
-+                 ngx_http_set_builtin_multi_header },
-+#else
-     { ngx_string("Cookie"),
-                  offsetof(ngx_http_headers_in_t, cookies),
-                  ngx_http_set_builtin_multi_header },
-+#endif
- 
-     { ngx_null_string, 0, ngx_http_set_header }
- };
-diff --git a/.travis.yml b/.travis.yml
-index 9748a99..bf40b31 100644
---- a/.travis.yml
-+++ b/.travis.yml
-@@ -23,6 +23,7 @@ env:
-   matrix:
-     - NGINX_VERSION=1.19.3
-     - NGINX_VERSION=1.19.9
-+    - NGINX_VERSION=1.23.0
- 
- before_install:
-   - sudo apt-get update -y
-@@ -51,3 +52,4 @@ script:
-   - export NGX_BUILD_CC=$CC
-   - sh util/build.sh $NGINX_VERSION > build.log 2>&1 || (cat build.log && exit 1)
-   - prove -I. -r t
-+
-diff --git a/src/ngx_http_headers_more_headers_in.c b/src/ngx_http_headers_more_headers_in.c
-index 84c7525..11447ce 100644
---- a/src/ngx_http_headers_more_headers_in.c
-+++ b/src/ngx_http_headers_more_headers_in.c
-@@ -758,6 +758,50 @@ static ngx_int_t
- ngx_http_set_builtin_multi_header(ngx_http_request_t *r,
-     ngx_http_headers_more_header_val_t *hv, ngx_str_t *value)
- {
-+#if defined(nginx_version) && nginx_version >= 1023000
-+    ngx_table_elt_t  **headers, **ph, *h;
-+    int                nelts;
-+
-+    if (r->headers_out.status == 400 || r->headers_in.headers.last == NULL) {
-+        /* must be a 400 Bad Request */
-+        return NGX_OK;
-+    }
-+
-+    headers = (ngx_table_elt_t **) ((char *) &r->headers_in + hv->offset);
-+
-+    if (*headers) {
-+        nelts = 0;
-+        for (h = *headers; h; h = h->next) {
-+            nelts++;
-+        }
-+
-+        *headers = NULL;
-+
-+        dd("clear multi-value headers: %d", nelts);
-+    }
-+
-+    if (ngx_http_set_header_helper(r, hv, value, &h) == NGX_ERROR) {
-+        return NGX_ERROR;
-+    }
-+
-+    if (value->len == 0) {
-+        return NGX_OK;
-+    }
-+
-+    dd("new multi-value header: %p", h);
-+
-+    if (*headers) {
-+        for (ph = headers; *ph; ph = &(*ph)->next) { /* void */ }
-+        *ph = h;
-+
-+    } else {
-+        *headers = h;
-+    }
-+
-+    h->next = NULL;
-+
-+    return NGX_OK;
-+#else
-     ngx_array_t       *headers;
-     ngx_table_elt_t  **v, *h;
- 
-@@ -810,6 +854,7 @@ ngx_http_set_builtin_multi_header(ngx_http_request_t *r,
- 
-     *v = h;
-     return NGX_OK;
-+#endif
- }
- 
- 
-@@ -842,6 +887,7 @@ ngx_http_headers_more_validate_host(ngx_str_t *host, ngx_pool_t *pool,
-             if (dot_pos == i - 1) {
-                 return NGX_DECLINED;
-             }
-+
-             dot_pos = i;
-             break;
- 
-diff --git a/src/ngx_http_headers_more_headers_out.c b/src/ngx_http_headers_more_headers_out.c
-index 0f9bc87..9d58ede 100644
---- a/src/ngx_http_headers_more_headers_out.c
-+++ b/src/ngx_http_headers_more_headers_out.c
-@@ -327,6 +327,46 @@ static ngx_int_t
- ngx_http_set_builtin_multi_header(ngx_http_request_t *r,
-     ngx_http_headers_more_header_val_t *hv, ngx_str_t *value)
- {
-+#if defined(nginx_version) && nginx_version >= 1023000
-+    ngx_table_elt_t  **headers, *h, *ho, **ph;
-+
-+    headers = (ngx_table_elt_t **) ((char *) &r->headers_out + hv->offset);
-+
-+    if (*headers) {
-+        for (h = (*headers)->next; h; h = h->next) {
-+            h->hash = 0;
-+            h->value.len = 0;
-+        }
-+
-+        h = *headers;
-+
-+        h->value = *value;
-+
-+        if (value->len == 0) {
-+            h->hash = 0;
-+
-+        } else {
-+            h->hash = hv->hash;
-+        }
-+
-+        return NGX_OK;
-+    }
-+
-+    for (ph = headers; *ph; ph = &(*ph)->next) { /* void */ }
-+
-+    ho = ngx_list_push(&r->headers_out.headers);
-+    if (ho == NULL) {
-+        return NGX_ERROR;
-+    }
-+
-+    ho->value = *value;
-+    ho->hash = hv->hash;
-+    ngx_str_set(&ho->key, "Cache-Control");
-+    ho->next = NULL;
-+    *ph = ho;
-+
-+    return NGX_OK;
-+#else
-     ngx_array_t      *pa;
-     ngx_table_elt_t  *ho, **ph;
-     ngx_uint_t        i;
-@@ -378,6 +418,7 @@ ngx_http_set_builtin_multi_header(ngx_http_request_t *r,
-     *ph = ho;
- 
-     return NGX_OK;
-+#endif
- }
- 
- 
-diff --git a/src/ngx_http_headers_more_util.c b/src/ngx_http_headers_more_util.c
-index caf372e..e1f3636 100644
---- a/src/ngx_http_headers_more_util.c
-+++ b/src/ngx_http_headers_more_util.c
-@@ -295,6 +295,7 @@ ngx_http_headers_more_rm_header_helper(ngx_list_t *l, ngx_list_part_t *cur,
-                         if (part->next == NULL) {
-                             return NGX_ERROR;
-                         }
-+
-                         part = part->next;
-                     }
- 
-@@ -338,6 +339,7 @@ ngx_http_headers_more_rm_header_helper(ngx_list_t *l, ngx_list_part_t *cur,
-                     if (part->next == NULL) {
-                         return NGX_ERROR;
-                     }
-+
-                     part = part->next;
-                 }
- 
diff --git a/www-servers/nginx/metadata.xml b/www-servers/nginx/metadata.xml
index af08e0a80963..c70bffda9b66 100644
--- a/www-servers/nginx/metadata.xml
+++ b/www-servers/nginx/metadata.xml
@@ -9,6 +9,7 @@
     <flag name="http-cache">Enable HTTP cache support</flag>
     <flag name="libatomic">Use libatomic instead of builtin atomic operations</flag>
     <flag name="pcre-jit">Enable JIT for pcre</flag>
+    <flag name="pcre2">Enable support for pcre2</flag>
     <flag name="ssl">Enable HTTPS module for http. Enable SSL/TLS support for POP3/IMAP/SMTP for mail.</flag>
     <flag name="rtmp">NGINX-based Media Streaming Server</flag>
   </use>
diff --git a/www-servers/nginx/nginx-1.23.0.ebuild b/www-servers/nginx/nginx-1.23.0-r1.ebuild
index 97bbe75ac5fc..f207f4c4fc47 100644
--- a/www-servers/nginx/nginx-1.23.0.ebuild
+++ b/www-servers/nginx/nginx-1.23.0-r1.ebuild
@@ -113,6 +113,12 @@ HTTP_ECHO_MODULE_P="ngx_http_echo-${HTTP_ECHO_MODULE_PV}"
 HTTP_ECHO_MODULE_URI="https://github.com/openresty/echo-nginx-module/archive/v${HTTP_ECHO_MODULE_PV}.tar.gz"
 HTTP_ECHO_MODULE_WD="${WORKDIR}/echo-nginx-module-${HTTP_ECHO_MODULE_PV}"
 
+# modsecurity for nginx (https://github.com/SpiderLabs/ModSecurity-nginx, https://github.com/SpiderLabs/ModSecurity, Apache-2.0)
+HTTP_SECURITY_MODULE_PV="1.0.3"
+HTTP_SECURITY_MODULE_P="modsecurity-nginx-${HTTP_SECURITY_MODULE_PV}"
+HTTP_SECURITY_MODULE_URI="https://github.com/SpiderLabs/ModSecurity-nginx/archive/refs/tags/v${HTTP_SECURITY_MODULE_PV}.tar.gz"
+HTTP_SECURITY_MODULE_WD="${WORKDIR}/ModSecurity-nginx-${HTTP_SECURITY_MODULE_PV}"
+
 # push-stream-module (http://www.nginxpushstream.com, https://github.com/wandenberg/nginx-push-stream-module, GPL-3)
 HTTP_PUSH_STREAM_MODULE_PV="8c02220d484d7848bc8e3a6d9b1c616987e86f66"
 HTTP_PUSH_STREAM_MODULE_P="ngx_http_push_stream-${HTTP_PUSH_STREAM_MODULE_PV}"
@@ -144,7 +150,7 @@ HTTP_LDAP_MODULE_URI="https://github.com/kvspb/nginx-auth-ldap/archive/${HTTP_LD
 HTTP_LDAP_MODULE_WD="${WORKDIR}/nginx-auth-ldap-${HTTP_LDAP_MODULE_PV}"
 
 # geoip2 (https://github.com/leev/ngx_http_geoip2_module, BSD-2)
-GEOIP2_MODULE_PV="3.3"
+GEOIP2_MODULE_PV="3.4"
 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}"
@@ -181,6 +187,7 @@ SRC_URI="https://nginx.org/download/${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 )
 	nginx_modules_http_push_stream? ( ${HTTP_PUSH_STREAM_MODULE_URI} -> ${HTTP_PUSH_STREAM_MODULE_P}.tar.gz )
+	nginx_modules_http_security? ( ${HTTP_SECURITY_MODULE_URI} -> ${HTTP_SECURITY_MODULE_P}.tar.gz )
 	nginx_modules_http_slowfs_cache? ( ${HTTP_SLOWFS_CACHE_MODULE_URI} -> ${HTTP_SLOWFS_CACHE_MODULE_P}.tar.gz )
 	nginx_modules_http_sticky? ( ${HTTP_STICKY_MODULE_URI} -> ${HTTP_STICKY_MODULE_P}.tar.bz2 )
 	nginx_modules_http_upload_progress? ( ${HTTP_UPLOAD_PROGRESS_MODULE_URI} -> ${HTTP_UPLOAD_PROGRESS_MODULE_P}.tar.gz )
@@ -191,6 +198,7 @@ SRC_URI="https://nginx.org/download/${P}.tar.gz
 	rtmp? ( ${RTMP_MODULE_URI} -> ${RTMP_MODULE_P}.tar.gz )"
 
 LICENSE="BSD-2 BSD SSLeay MIT GPL-2 GPL-2+
+	nginx_modules_http_security? ( Apache-2.0 )
 	nginx_modules_http_push_stream? ( GPL-3 )"
 
 SLOT="mainline"
@@ -228,6 +236,7 @@ NGINX_MODULES_3RD="
 	http_mogilefs
 	http_naxsi
 	http_push_stream
+	http_security
 	http_slowfs_cache
 	http_sticky
 	http_upload_progress
@@ -299,6 +308,7 @@ CDEPEND="
 	nginx_modules_http_auth_pam? ( sys-libs/pam )
 	nginx_modules_http_metrics? ( dev-libs/yajl:= )
 	nginx_modules_http_dav_ext? ( dev-libs/libxml2 )
+	nginx_modules_http_security? ( dev-libs/modsecurity )
 	nginx_modules_http_auth_ldap? ( net-nds/openldap:=[ssl?] )
 	nginx_modules_stream_geoip? ( dev-libs/geoip )
 	nginx_modules_stream_geoip2? ( dev-libs/libmaxminddb:= )"
@@ -323,6 +333,7 @@ REQUIRED_USE="pcre-jit? ( pcre )
 	nginx_modules_http_naxsi? ( pcre )
 	nginx_modules_http_dav_ext? ( nginx_modules_http_dav nginx_modules_http_xslt )
 	nginx_modules_http_metrics? ( nginx_modules_http_stub_status )
+	nginx_modules_http_security? ( pcre )
 	nginx_modules_http_push_stream? ( ssl )"
 
 pkg_setup() {
@@ -505,6 +516,11 @@ src_configure() {
 		myconf+=( --add-module=${HTTP_ECHO_MODULE_WD} )
 	fi
 
+	if use nginx_modules_http_security ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_SECURITY_MODULE_WD} )
+	fi
+
 	if use nginx_modules_http_push_stream ; then
 		http_enabled=1
 		myconf+=( --add-module=${HTTP_PUSH_STREAM_MODULE_WD} )
@@ -756,6 +772,11 @@ src_install() {
 		dodoc "${HTTP_ECHO_MODULE_WD}"/README.markdown
 	fi
 
+	if use nginx_modules_http_security; then
+		docinto ${HTTP_SECURITY_MODULE_P}
+		dodoc "${HTTP_SECURITY_MODULE_WD}"/{AUTHORS,CHANGES,README.md}
+	fi
+
 	if use nginx_modules_http_push_stream; then
 		docinto ${HTTP_PUSH_STREAM_MODULE_P}
 		dodoc "${HTTP_PUSH_STREAM_MODULE_WD}"/{AUTHORS,CHANGELOG.textile,README.textile}