gentoo auto-resync : 24:12:2024 - 06:30:57

3 files changed, 10 insertions, 2 deletions

diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index 55e7b5431a1b..0a58d9044a83 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -7,7 +7,7 @@ AUX http_upstream_check-nginx-1.11.5+.patch 8557 BLAKE2B b1f21fa56e94d92b30d4b84
 AUX nginx-1.23.2-mod_auth_ldap-fix.patch 887 BLAKE2B 3834c6af746b5218589b97e040c0a087f535558412316fda5e84a90055d4baa9d9797274297c20ace2807531171ca39721392bb0b27a35c35832bc5bb2ec5cc7 SHA512 b6e5d47ee33ebac4828b2dbcd914e860994d3cff98c4612b37b52f4ca2f83a2040a9e1b66849a5ecb38e0392ed8f0ce77081050d8be946de0c5f0af5d4861c93
 AUX nginx-1.4.1-fix-perl-install-path.patch 403 BLAKE2B af7c0d3845f4e971ff6470cac11722a54339832518a1f48eef6343908676e352d869df7e65e1072e41dc67dbac4e0f006694bba2ba66ab06ae500c7e00664023 SHA512 b8f6876831e1149b1421fff4919f8d4893e5fc46aad8a91d4cf2e0b21767b59820b8e227e3b722b80060832844ef191f30aa5dc056daeb49e55a05702d72858f
 AUX nginx-httpoxy-mitigation-r1.patch 2023 BLAKE2B 82e6cb6c1d38b9e4cd619abfe60eeaa968ded8975277e60afb94456b59e311817eef04db2b207e85308ef480c442e8acd68cba8f455b4cfc872829e522cb1ea4 SHA512 bfc480c34cea525b0eb3753622eb371198e2252aba3299fca4f1c7b29848da162b93757b05eb11a3839618ed895f7b73534dcd7861f4b924997ec422939222a3
-AUX nginx.conf-r3 1325 BLAKE2B 3aef6116b366ef325fea9c99e6c1f5a8ea4b6d12aced541e3ad89e20bff76f58f146b7cb6339b4ad99789ea64157864552ed099d47f9e534c893265f998c2db3 SHA512 4a185f6bb09576667e98afdd88a6bbf4909e0db251b04e7889c6e17baacb950986c8ac7a79ac4031746f848433c5d3653a73134690cf68f6c37844ad11fe0077
+AUX nginx.conf-r3 1360 BLAKE2B 3b31ebe10950d8f3f0ed2b4826096d001e0d41527233e42dd50523f8c63319d6ac93a2dbb7c9fb7f299364f05050dfac84d2bdc84515aba42fed773866789947 SHA512 37eeddceb7fe92bdf350c1d562e1d1dae55e45c41ac5df736d5182128a54d1ac381ae420d45a549ed694ec94466987af826256bf7ea6f5bc3e31546b79b28bd8
 AUX nginx.confd 1241 BLAKE2B 1b70d46440825dbaef34370e5c88ed5f3a5780a645fd7440d22b78451ed082d9c5dff3689576750cc7806515e8caf939f9a6be2fafa1516e2c519932881f746f SHA512 53d2946ab9f2b5e2c2ccb3a946fc8f26a5320be3d5f90892da86cb6188a147b95758d056f93805f493f1c33b139e534e905fef9c391ed3a7de07a5894d144752
 AUX nginx.initd-r4 2271 BLAKE2B 4cf3f3f25c3fe68c842aa75bf833005e927dd614455b837b3e8e5dc978f693365772b68b5b8630c966d3d3ddf2b6d820055521a0aea9d046ae0796a858f3c0e5 SHA512 79b5608b210ec160f4d6a46781608f07b59db4ec039aa1be7947ae36e5e13d195a9ec8389edf592834ea9953b235961b0c55d63d7bad07840fbeec64a110313b
 AUX nginx.logrotate-r1 269 BLAKE2B 54cf4de47ea51934ae5a9e816f558305b9a276a5746e5e43781eb88bb0e487da1da111bd5479f710302ec8083f5a32255e55ac83019cda4418cf47d6550774ad SHA512 e05713f15063ad6352c668c3de43ad925469e4f0697dee2714982a7568770eaff6e9b0df1218f1c0e805e852d39b26f831b6f866e3d0d7bc1ff82fa56f4179b9
@@ -42,6 +42,6 @@ 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.8.8.tar.gz 887735 BLAKE2B 6ecf204af479883b2d388af9db7f6489f3750fea1df42fef04f5d453dec4dc7468acc48f2c5dd1764979f8e18cc783d182f1e6ecb266202c19df25d72279afd7 SHA512 2929bde53863ec5099badf17fc125894bd6fbff9b3b5e5088b51d8af40895d584d0f014aae98902c7db0d5e0e48fa090ebc361fdc9dc6a6da9c2714c1d48a3ac
-EBUILD nginx-1.26.2-r7.ebuild 42552 BLAKE2B 08be9bcdc5df4a1b78d4112cc9d3c98bde6ce9a4971b220ea7a4c0f55a26276f61cabe6157cb395eeb3eab80ad1762d41bfac35f54b121d85f19ec30784e83f5 SHA512 3b18dcd9f7c4fbe15c5acd9bc2da8dc1ac6565fcd3d24a6eed191c555e26e3bcf622ddd83da31c5f35e6cc8252ff4f3e018e14089c97a8b3936d4af015bc058b
+EBUILD nginx-1.26.2-r8.ebuild 42732 BLAKE2B ccfd1a09b6c02a95b4ce1fd3b667531ff13525e5bd83b8cc24137eeb608cf0f02737ba0aa530ec68ad943e1476d3eea3e2919cf99a3a8bf469ce30faf4e36a28 SHA512 6640f5b00ace0cf04287e1a052360093a9bdcc69876b66a617c7dcd83cb7a0b1c748e43a2caa03f528bdc31ab0aab385ed1e20026332f186505b1fc9cdddcc0f
 EBUILD nginx-1.27.3-r1.ebuild 42365 BLAKE2B c89f8a2cf252f7215621767840f32c4afbf1ce30e42d71da3d23071da423f7c64a34b551f47de3d4de4b892645efb577c45eae066fe67e61e851c799cbba2de3 SHA512 f2657b3c74b4f5738a3de3db29a4e0f518d1a2fba61b6a090b9506c0beea46181dea085e59a5825a86f42af4dc31ab3ec22ef02a46138917a8bd90d6be82d10a
 MISC metadata.xml 1189 BLAKE2B 9e65f404d2be335d14ffb087be60847a2508de79baae7ee0e3bd7021dbfbbc1f18b93ed758d107ef3a9738ab32889f106a5eb8232f8f4190d57c175eed60ddd5 SHA512 8077d4da43250c5cc783451682047460b093cf1e751e0b0d75a21bb42baf83fd31b1bb3a574ed6e7ab89286afb331c23915c676ed80c7b4cc5fd9f84a40da893
diff --git a/www-servers/nginx/files/nginx.conf-r3 b/www-servers/nginx/files/nginx.conf-r3
index aedaad4f64ef..f851bbf8934e 100644
--- a/www-servers/nginx/files/nginx.conf-r3
+++ b/www-servers/nginx/files/nginx.conf-r3
@@ -67,4 +67,6 @@ http {
 
 	#	root /var/www/localhost/htdocs;
 	#}
+
+	include /etc/nginx/*_vhost.conf;
 }
diff --git a/www-servers/nginx/nginx-1.26.2-r7.ebuild b/www-servers/nginx/nginx-1.26.2-r8.ebuild
index cfc77b65badc..043eba9050b0 100644
--- a/www-servers/nginx/nginx-1.26.2-r7.ebuild
+++ b/www-servers/nginx/nginx-1.26.2-r8.ebuild
@@ -808,6 +808,12 @@ src_install() {
 	if use nginx_modules_http_lua; then
 		docinto ${HTTP_LUA_MODULE_P}
 		dodoc "${HTTP_LUA_MODULE_WD}"/README.markdown
+		insinto /etc/nginx
+		newins - 00-config.lua_vhost.conf <<-EOF
+			lua_package_path "/etc/nginx/?.lua;;";
+		EOF
+		insinto /etc/nginx/resty
+		touch "${ED}"/etc/nginx/resty/core.lua
 	fi
 
 	if use nginx_modules_http_auth_pam; then