www-servers/nginx: Rev bump of "mainline" slot to add/update modules

Ebuild changes:
===============
- LDAP auth module bumped to commit 42d195d7a7575ebab1c369ad3fc5d78dc2c2669c
  to add OpenSSL 1.1.x support and other bugfixes.

- HTTP upstream check module bumped to commit 9aecf15ec379fe98f62355c57b60c0bc83296f04
  to fix possible segfault when reloading configuration.

- Virtual host traffic status module added.

- nginScript module added. [PR 3200]

- Brotli module added. [Bug 628898]

See: https://github.com/gentoo/gentoo/pull/3200
Closes: https://bugs.gentoo.org/628898
Package-Manager: Portage-2.3.24, Repoman-2.3.6

profiles/desc/nginx_modules_http.desc

@@ -11,6 +11,7 @@ auth_ldap - LDAP module for nginx which supports authentication against multiple
 auth_pam - This module provides authentication via PAM.
 auth_request - Module implementing client authorization based on the result of a subrequest.
 autoindex - This module provides automatic directory listings.
+brotli - This module allows for on-the-fly Brotli compression.
 browser - This module creates variables, the values of which depend on the request header "User-agent".
 cache_purge - External module adding ability to purge content from nginx's FastCGI and proxy caches.
 charset - This module can reencode data of one encoding into another.
@@ -29,6 +30,7 @@ gzip - This module allows for on-the-fly gzip compression.
 gzip_static - Before serving a file from disk to a gzip-enabled client, this module will look for a precompressed file in the same location.
 headers_more - Set and clear input and output headers
 image_filter - This module is a filter for transforming JPEG, GIF and PNG images.
+javascript - This module implements location and variable handlers in nginScript.
 limit_conn - This module makes it possible to limit the number of simultaneous connections for the assigned session
 limit_req - This module allows you to limit the number of requests for a given session.
 limit_conn - This module makes it possible to limit the number of simultaneous connections for the assigned session
@@ -68,4 +70,5 @@ upstream_least_conn - This module provides the ability to distribute upstream re
 upstream_zone - This module makes it possible to define a shared memory zone that keeps the group's configuration and run-time state that are shared between worker processes.
 userid - This module gives out cookies for identification of clients.
 uwsgi - External module for the uWSGI protocol for python web apps.
+vhost_traffic_status - This module provides access to virtual host status information.
 xslt - This module is a filter which converts an XML response with the aid of one or more XSLT templates.

profiles/desc/nginx_modules_stream.desc

@@ -7,6 +7,7 @@
 access - This module allows limiting access to certain client addresses.
 geo - This module creates variables, whose values depend on the IP-address of the client.
 geoip - This module creates variables based on the IP-address of the client matched against the MaxMind GeoIP binary files.
+javascript - This module implements location and variable handlers in nginScript.
 limit_conn - This module is used to limit the number of connections per the defined key.
 map - This module allows you to classify, or map a set of values into a different set of values and store the result in a variable.
 realip - This module allows to change the client's IP address to value from request header (e. g. X-Real-IP or X-Forwarded-For).

www-servers/nginx/Manifest

@@ -1,8 +1,10 @@
 DIST modsecurity-2.9.2.tar.gz 4298993 BLAKE2B 32a92148f0e1a1166cf888b8172fc55340c5712c9b770583703c74db450e77226629640c9db03f32e9f28397e6488669d06a89e4d31cb5ab5fff26b30ad843e0 SHA512 69c87ef6f7b6411f4803eb25af32969a1da59722121257c2edf345a3f5a4ab9ae8a49c886cbbfc722c5bda91c6d6ea55232f968c0a0407d7d7b3af53dc862c21
 DIST nginx-1.12.2.tar.gz 981687 BLAKE2B cca2d2b2267fee6feac7e91a5aaec229251e829203b02c207a6a89644fd6b1f2003d75225fadde9fdfc8dda444dc53c7ff0033a1e15a0f25019c878fc716d83f SHA512 3faa2043e237a7e1d15cc5661ac9d002a965220a78c25a863be9f19e01007347e53f776b61c229f6bd3d916cc1ccf92de260811f7b8092ec1b747fba7c0061f7
 DIST nginx-1.13.8.tar.gz 992237 BLAKE2B 268eebb98a1ae1acbc9fb3ae4e445b26cfff68d8833285527b86f73d5a076f43fb6840b2aad6ff0e8458b47abbe8a9883c43c8a6b40c65d040b3bff88c6910eb SHA512 f2a4d41941ec223afcb57a6deb6523e0d4f54f96c7362835d366fa04a4b4578f6c4f27aa7774c1ecd40a42087df83e5c03d024e72caba83c558ec7e580c756a1
+DIST nginx-auth-ldap-42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz 18457 BLAKE2B 22225ca9e5299b20ab5a93a001cac48e446bd86b3a24ac49e716bc975b128890bdb4b0dbbf5730fbaaeadfd958160093c7a6af798dd0e6de27062f149a760333 SHA512 ec59637fda5acac053e815cb1d04b545fc6b765e5ec63d8c2c9c301abad87afaa2698145acac08e9e14c91e1423ebff7aff0cca2b940b19ccccbf4cf53973269
 DIST nginx-auth-ldap-49a8b4d28fc4a518563c82e0b52821e5f37db1fc.tar.gz 17159 BLAKE2B f2209c8b5eb5616a362f2b532245167a5940faad6d66d98a94b3bf2d1e33a73492d42c60a9ddad347a592362a002ff38273a5d1f61f663984a09e14a3fe35e0f SHA512 323abd0ca8e90f5afcaf81a8ff1a8abe3dfcbff3d69f0dd4a1c005fe6436acbf3076c4c57a4df877b3d8e388cbea085d46301bb2df9c0752e2567817ff7cca92
 DIST nginx_http_sticky_module_ng-1.2.6-10-g08a395c66e42.tar.bz2 124047 BLAKE2B d37ef9a15c91abe3c6258e420d1f99fa452f9d9966a0e13102174973314a3bac5413957a5fe632a9dcb1163b3be5df8116e05cc053ee061e19319ec25f341570 SHA512 6c1bfdcf89884b2855d51ae7da0f6e53a4ca3629e1aaf58433b70c07dcb2af797ba6e87d9b3eb4fe2fb6d4d697e862f2b4c2f8d8b3fdaea201740c97ec936529
+DIST ngx_brotli-8cd9dd5fc232d3a01644584921e52dae99034779.tar.gz 10585 BLAKE2B d65f068300852b5dbd77184cbcdbd31b14cb30484c5eb8c0d2b757d1d59e97d291b4b06fc11bc861d8796579964c91da2cb359e8fdf75199c655488701619516 SHA512 fa97bea2041d08d3ba07ae1cf6d84c225673b49c9ac8930923997c3ce501358a8bec63e4f3c075e22041f7997b8371a0d1887d73e989b8f27d55a0f72b3ea0f9
 DIST ngx_devel_kit-0.3.0-r1.tar.gz 66455 BLAKE2B e4e987a85b2283ba540b4b894382e65dac7fbca23e233b1031b38828908088370cdb1a9bded4d4ee1ceb1c2e1d506dc2b6f4ba5f6ee94248e863def5a1c8dd1a SHA512 558764c9be913a4f61d0e277d07bf3c272e1ce086b3fadb85b693a7e92805cd9fca4da7a8d29c96e53fc0d23b331327d3b2561ff61f19d2330e7d5d35ac7d614
 DIST ngx_http_auth_pam-1.5.1.tar.gz 6863 BLAKE2B 00807cc3db8f6c007c968b8a30d7f6094b7d9db4eaa60d211fcb3ac60aeb28c5f8193578a7e1ca67acbbf57a319c8442fe44efc1e193927c3bce5961539f9c16 SHA512 973b94874d8a58c0df0ac2d31571eafc1e80b11179cba33ec88421a826207fbf7e99b0387e135a1ca48d82daacb78f19a4c21d3a27b49b16dc86b4748bb72261
 DIST ngx_http_cache_purge-2.3.tar.gz 12248 BLAKE2B f83b267f4c19a9d4af5964522695814c164d200ecd4108bf8f6b5c21388eba8af989bdda646dee18a03174211e8c090a04736bbeb44043cb0e19fbccdc66278e SHA512 50a31dbf2216a6fae74a186af56dec4600cf55777e76a10ac0075f609e7737135aab063a64f2590dddcd0369ebebd4a523027f3d9ebcca74f7b4355be1c5dcc0
@@ -19,8 +21,11 @@ DIST ngx_http_push_stream-0.5.4.tar.gz 183493 BLAKE2B ccae3113071cee38fa6a7accd5
 DIST ngx_http_slowfs_cache-1.10.tar.gz 11809 BLAKE2B 54ec1bd0d1cc43cdaafc93ebd46b33374c57351c7f022eae0351d6961680abb03d896e7f058e67c43c4fee300253354feccb92d00e62bf91250e251e1860ec03 SHA512 fbc9609a8d6913aeefe535f206b9e53477503f131934ead2ae5a6169e395af2f5fb54778704824d5eeb22a4ef40a11ebbcde580db62a631f70edcc2cfc06b15d
 DIST ngx_http_upload_progress-0.9.2-r1.tar.gz 17268 BLAKE2B 7bbbf52e326c64a008339d2f80f123630fd314f705224c8f1c7d0c90bb4d31a24aaa95df55c9022838179114a031731a894992960aecc727635e0e2a0761d2c4 SHA512 c31c46344d49704389722325a041b9cd170fa290acefe92cfc572c07f711cd3039de78f28df48ca7dcb79b2e4bbe442580aaaf4d92883fd3a14bf41d66dd9d8c
 DIST ngx_http_upstream_check-31b1b42873fa56620d8a873ac13f5f26b52d0cd6.tar.gz 130052 BLAKE2B 0ff95fc9780193b514fc7b28f6c5c1a58942cd54472a495a1812a48ef4039390241c20c8a3e8dfd6168e87df3a9e3b37e9c33f11d13bdf5fb0d1f37041fe4ee8 SHA512 e7ea6712c27fd2610e8681b7f687e24c94cd7558d6f19f87568d4c2169115678a61c58b1cd3686a927173b566ff1e10cb1fb767fe63db61f860a77bac9792f9b
+DIST ngx_http_upstream_check-9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz 130073 BLAKE2B 3c93cef79425a46e22ae39adf13d5ebb0e5d36f5d6be8555ec068dd0017918f5355d82fbbe90ba934e58c52e89c2096e24012f75390c7159d1ebacfaaa112308 SHA512 fad2a0d3ac332b6e67c52e3525f6df8a432df3e92bc173190b8107fba7f24476ab9dae4824630299af68c15e856409bd47a3a79fb5b65e03a5133eb90142b8fc
+DIST ngx_http_vhost_traffic_status-0.1.15-gentoo.tar.gz 371234 BLAKE2B 6c164d8c5ee4f3a6729989d9ab2ba874dd5dc285f5c52baf50b05880f184d1ef779f320efa36db8228ab15a8885e972664aee2b1d367279edbf840e41a4c8108 SHA512 63bb0d576fb896526e13fd624eb61b0562756d9aef9124be3d4e845312885838b96d93a4233b15e1b0449714c9689ef1e88b680f23f5d9c909b31026d8c13d08
 DIST ngx_memc_module-0.18.tar.gz 37113 BLAKE2B e5b89c7c7a3e6f8ee7c1b2623fbec78851a9d7c1c37c1924e8c010b45a4e034afe504a5e228361ad88cf57e83ce06f5f6d635301f8201f1ebd7e99f30447d524 SHA512 8087bd361fb4e522493e66f93d59c9b13245d6eef0fe4a53f619d1826feb02af60769c0a04f87f2faf5308a44b794ef146a445bdbe7cbc7f21c0edaaba08c706
 DIST ngx_metrics-0.1.1.tar.gz 2964 BLAKE2B 95d71ea26c949c345b83e353bd66a20df18cc8b2b93f692615a1b39c1f327393647f80e7a27e6929799a6e7e3469b61e1cd72f7821f7a820da4dd7cd9a96d85c SHA512 d36a8fb0104c83b6b564e03b351aa750cab08650264c74d6f786af357bfb7006b531a93270dd961896ea8dafe27e5db8548ede714c5f52c4742876bc73af4b5e
 DIST ngx_mogilefs_module-1.0.4.tar.gz 11208 BLAKE2B e0729b66554c8890727190a624d4c9aef6499dfc2e301541a9bfc15690caf6d3155c8a4b8f7a1555a7655b47aa0cd1b797aeb8ba82efa92ab80808218a0bdcff SHA512 b8cb7eaf6274f4e2247dbcb39db05072d2b2d4361256a325fafab5533d7ce0c4ae9e2905b954dfcfa4789c9cab5cccf2ac1c3a1f02f6a327ed95b562d7773ed1
 DIST ngx_rtmp-1.2.0.tar.gz 519895 BLAKE2B a5a888473dd2ba2320ff74017e8445d96fa3e361acc559edb270ad075c937ab5630e537a67ad8ed134a7ec5809ae63e38791ac25ceab3e26160469be8cc2e82c SHA512 8965d9bee91a46375516ccd012d1c43cd23f15c0630d11ed01472b9a84504574b476f22c5584f43c972a8f923e9ae025b9b60c64aace0ed159c7279bcbd376c8
 DIST ngx_rtmp-1.2.1.tar.gz 519919 BLAKE2B 744ccb8031eb9653f158f9eceba64fc9c8af7b9a42e64ef996ab3bbbe1402e5ffd3efcc8e4aaca437eb5e208e4b6f2d8643fcca953b32f32543eaa1ae4d9505c SHA512 4a0af5e9afa4deb0b53de8de7ddb2cfa6430d372e1ef9e421f01b509548bd134d427345442ac1ce667338cc2a1484dc2ab732e316e878ac7d3537dc527d5f922
+DIST njs-0.1.15.tar.gz 228982 BLAKE2B c880c911c32c7ce7495fcbdc8b003340cd7d4020d7b820275d023729c4367ddea93539978b724d45b965cde44e9c35a4d4dd66138a0765be3b1697fc69abaeb2 SHA512 dd1ff7c95f6a5dd8df2c4b8abc13fc32462d4403d4d4f0e0cf8d4cc16fdd4b97ee563aeee593fcf9e83a463b3131772e8789f015c8ec74b61d90fd4d8699cf2e

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

@@ -0,0 +1,111 @@
+We aren't interested in bundled Brotli.
+
+Use pkg-config to detect Brotli's install path.
+
+--- a/config
++++ b/config
+@@ -59,93 +59,19 @@ 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"
++brotli=$(pkg-config --variable=prefix libbrotlienc)
+ 
+ if [ ! -f "$brotli/include/brotli/encode.h" ]; then
+ 
+-brotli="$ngx_addon_dir/deps/brotli/c"
+-
+-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
+ fi
+ 
+-ngx_module_incs="$brotli/include"
+-ngx_module_deps="$brotli/common/constants.h \
+-                 $brotli/common/dictionary.h \
+-                 $brotli/common/version.h \
+-                 $brotli/enc/backward_references.h \
+-                 $brotli/enc/backward_references_hq.h \
+-                 $brotli/enc/backward_references_inc.h \
+-                 $brotli/enc/bit_cost.h \
+-                 $brotli/enc/bit_cost_inc.h \
+-                 $brotli/enc/block_encoder_inc.h \
+-                 $brotli/enc/block_splitter.h \
+-                 $brotli/enc/block_splitter_inc.h \
+-                 $brotli/enc/brotli_bit_stream.h \
+-                 $brotli/enc/cluster.h \
+-                 $brotli/enc/cluster_inc.h \
+-                 $brotli/enc/command.h \
+-                 $brotli/enc/compress_fragment.h \
+-                 $brotli/enc/compress_fragment_two_pass.h \
+-                 $brotli/enc/context.h \
+-                 $brotli/enc/dictionary_hash.h \
+-                 $brotli/enc/entropy_encode.h \
+-                 $brotli/enc/entropy_encode_static.h \
+-                 $brotli/enc/fast_log.h \
+-                 $brotli/enc/find_match_length.h \
+-                 $brotli/enc/hash.h \
+-                 $brotli/enc/hash_forgetful_chain_inc.h \
+-                 $brotli/enc/hash_longest_match64_inc.h \
+-                 $brotli/enc/hash_longest_match_inc.h \
+-                 $brotli/enc/hash_longest_match_quickly_inc.h \
+-                 $brotli/enc/hash_to_binary_tree_inc.h \
+-                 $brotli/enc/histogram.h \
+-                 $brotli/enc/histogram_inc.h \
+-                 $brotli/enc/literal_cost.h \
+-                 $brotli/enc/memory.h \
+-                 $brotli/enc/metablock.h \
+-                 $brotli/enc/metablock_inc.h \
+-                 $brotli/enc/port.h \
+-                 $brotli/enc/prefix.h \
+-                 $brotli/enc/quality.h \
+-                 $brotli/enc/ringbuffer.h \
+-                 $brotli/enc/static_dict.h \
+-                 $brotli/enc/static_dict_lut.h \
+-                 $brotli/enc/utf8_util.h \
+-                 $brotli/enc/write_bits.h"
+-ngx_module_srcs="$brotli/common/dictionary.c \
+-                 $brotli/enc/backward_references.c \
+-                 $brotli/enc/backward_references_hq.c \
+-                 $brotli/enc/bit_cost.c \
+-                 $brotli/enc/block_splitter.c \
+-                 $brotli/enc/brotli_bit_stream.c \
+-                 $brotli/enc/cluster.c \
+-                 $brotli/enc/compress_fragment.c \
+-                 $brotli/enc/compress_fragment_two_pass.c \
+-                 $brotli/enc/dictionary_hash.c \
+-                 $brotli/enc/encode.c \
+-                 $brotli/enc/entropy_encode.c \
+-                 $brotli/enc/histogram.c \
+-                 $brotli/enc/literal_cost.c \
+-                 $brotli/enc/memory.c \
+-                 $brotli/enc/metablock.c \
+-                 $brotli/enc/static_dict.c \
+-                 $brotli/enc/utf8_util.c \
+-                 $ngx_addon_dir/src/ngx_http_brotli_filter_module.c"
+-ngx_module_libs="-lm"
+-
+-else # encode.h in /usr/local
+-
+ ngx_module_incs="$brotli/include"
+ ngx_module_deps="$brotli/include/brotli/encode.h \
+                  $brotli/include/brotli/port.h \
+@@ -153,8 +79,6 @@ ngx_module_deps="$brotli/include/brotli/encode.h \
+ ngx_module_srcs="$ngx_addon_dir/src/ngx_http_brotli_filter_module.c"
+ ngx_module_libs="-lbrotlienc -lm"
+ 
+-fi # encode.h in /usr/local
+-
+ ngx_module_order="$ngx_module_name \
+                   ngx_pagespeed \
+                   ngx_http_postpone_filter_module \