[gentoo-commits] repo/gentoo:master commit in: www-servers/nginx/

[Conrad Kostecki]

commit:     9a99e99ef12da84c312b21a35faeef560081a502
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 15 21:01:33 2023 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sat Jul 15 21:14:00 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a99e99e

www-servers/nginx: update njs to 0.8.0

Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 www-servers/nginx/Manifest                                        | 2 +-
 .../nginx/{nginx-1.25.1-r2.ebuild => nginx-1.25.1-r3.ebuild}      | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index 55f54b5918f2..4a1e6b466741 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -26,4 +26,4 @@ DIST ngx_metrics-0.1.1.tar.gz 2964 BLAKE2B 
95d71ea26c949c345b83e353bd66a20df18cc
 DIST ngx_mogilefs_module-1.0.4.tar.gz 11208 BLAKE2B 
e0729b66554c8890727190a624d4c9aef6499dfc2e301541a9bfc15690caf6d3155c8a4b8f7a1555a7655b47aa0cd1b797aeb8ba82efa92ab80808218a0bdcff
 SHA512 
b8cb7eaf6274f4e2247dbcb39db05072d2b2d4361256a325fafab5533d7ce0c4ae9e2905b954dfcfa4789c9cab5cccf2ac1c3a1f02f6a327ed95b562d7773ed1
 DIST ngx_rtmp-1.2.2.tar.gz 519934 BLAKE2B 
8745816b879f506720955d6c7e5e8af036e88b3601a680071ffb255a3ec31d69e132b5cc8b493202fa985eb30b8529428f683b5154a0054c0ee990d3185c7abf
 SHA512 
3f8c803221854c4b1a06aadc6313fbfec74bd7179c0ee51d4365b26ffa8875881a6e1e48f777a9c9efbb9170ab7478a82920d5448a2c2df485503d37bb03ab81
 DIST njs-0.7.12.tar.gz 662554 BLAKE2B 
3e925dbbd5e664fc083b3147b6fa353744ab45b50cb2d3feb3f1cf5a4c024440c24b7af08e8a285db7b8e4b48efc776a8a1cb78c6d7ff79d011e127a61e09f6c
 SHA512 
a65a6c6aa3fbd499536284f8d8610f61b87112156885e6c3b1f73872df22195af897766f266b4569098a70e1680aef66594da17d13519f16687b4e43dce49062
-DIST njs-5b463b8050377216ad4197cd1e35bb69b35b77e9.tar.gz 704472 BLAKE2B 
1e1182fedad45301202f53e7259944cc86651e27798eca170e44f9772842c57d85855ee8e846019a4357ae0d5eacffc5e77cffaecbb9c9a105eb4d731ccdccdb
 SHA512 
2c0b4a2fa3c9b02f47bcbb677b0646c459d6c64b3156be7ed7cb918b6d4948c5bb9f6f68b8b004291bb44e64bfa0dd04fd7c9b6a8083e9fa4b946ada42d284a5
+DIST njs-0.8.0.tar.gz 715391 BLAKE2B 
ecba652e8045c93b3eab19e0765c8bc907b55debb0cfce0491d2824f6f60a80321d710b85a694c06d5249f5809f50532d30a6a401b9919b1dda64e50c876410e
 SHA512 
5e5fd3b0aba9d1a0b47207081e59d577cbd3db41e141cfa529526a778bbcd4fec1cd4dacaa1dc63ee07868ccf35f4d4cc465abff831bb03d128b0b1f1b04bb28

diff --git a/www-servers/nginx/nginx-1.25.1-r2.ebuild 
b/www-servers/nginx/nginx-1.25.1-r3.ebuild
similarity index 99%
rename from www-servers/nginx/nginx-1.25.1-r2.ebuild
rename to www-servers/nginx/nginx-1.25.1-r3.ebuild
index 1093a0399894..ca4b8d5aa204 100644
--- a/www-servers/nginx/nginx-1.25.1-r2.ebuild
+++ b/www-servers/nginx/nginx-1.25.1-r3.ebuild
@@ -159,7 +159,7 @@ 
GEOIP2_MODULE_URI="https://github.com/leev/ngx_http_geoip2_module/archive/${GEOI
 GEOIP2_MODULE_WD="${WORKDIR}/ngx_http_geoip2_module-${GEOIP2_MODULE_PV}"
 
 # njs-module (https://github.com/nginx/njs, as-is)
-NJS_MODULE_PV="5b463b8050377216ad4197cd1e35bb69b35b77e9"
+NJS_MODULE_PV="0.8.0"
 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}"
@@ -387,6 +387,12 @@ src_prepare() {
                cd "${S}" || die
        fi
 
+       if use nginx_modules_http_javascript; then
+               cd "${NJS_MODULE_WD}" || die
+               sed -e 's/-Werror//g' -i auto/cc || die
+               cd "${S}" || die
+       fi
+
        if use nginx_modules_http_sticky; then
                cd "${HTTP_STICKY_MODULE_WD}" || die
                eapply "${FILESDIR}"/http_sticky-nginx-1.23.0.patch