gentoo auto-resync : 28:06:2024 - 07:59:59

6 files changed, 5 insertions, 126 deletions

diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index e50ca11fc17f..391d9f3890df 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index 5e2749971cfd..d7b5b4d74fd2 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -39,7 +39,7 @@ DIST ngx_memc_module-0.19.tar.gz 34654 BLAKE2B 536384c264d88535179634d459d3a47b1
 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.2.tar.gz 519934 BLAKE2B 8745816b879f506720955d6c7e5e8af036e88b3601a680071ffb255a3ec31d69e132b5cc8b493202fa985eb30b8529428f683b5154a0054c0ee990d3185c7abf SHA512 3f8c803221854c4b1a06aadc6313fbfec74bd7179c0ee51d4365b26ffa8875881a6e1e48f777a9c9efbb9170ab7478a82920d5448a2c2df485503d37bb03ab81
-DIST njs-0.8.4.tar.gz 743910 BLAKE2B cad96f0e7ccac928506bc7822310750921b7ebb1ed87903a6335988b3e42b264179b699455439140c80afd9f93ecb63877cc7327919ebb29d7ad391e9d378367 SHA512 450f6866141f6f370767149c8749e84c4373f401d6d2237ca85365a851ebe7bdbd8a3c25e85a55747673e8bef2238a979dd237d5fc5c641b2f3f2cf7f26dffc8
-EBUILD nginx-1.26.1.ebuild 42406 BLAKE2B d6dbe2f8688ba4b772d6ffff7895402bb2a6d722fc022fd07451e8e7c93472b3f558a7bcacfb3a1b9061ded4a397e11feb8482f6a0c91d24247b902a75015ed7 SHA512 8e1e7192942b701e66a034cfc695be5522cf71ad4d92c4d932aa06d8d55713c20e056eaec65c0c50ab8244d6bb1d37dabd3c8b77e0b0180cfbc863a9d715d0a0
-EBUILD nginx-1.27.0.ebuild 42410 BLAKE2B 7b3e69d14d925a3166a32426e6c8dec53f1c0bf3aa10a0f1288110cce1203792379d8215052e72915cfd8c8f606721d2fb779400c0fcc453ff96b78478bfdbc7 SHA512 dfbc0a4c9076c0c8dff69910c92ab81e48dc05a013ee12583b3e460dc804a9ab5f7295684853dc48b591f5eb0ed33df356e01c3861ec17629b94d4025acc58fc
+DIST njs-0.8.5.tar.gz 844437 BLAKE2B 3f8a601370fbe2bfbe0e1748f71b1793985fd2736f4b94a65ec564d5ac4a653faf28a86469cef36bc312ff53287ea4afd43edda503e36c8797947827a902a10d SHA512 09fb37d609f5cb97b0af5eb097a017233af2eacb2d38071346b49f5e03b5e37280eebb360fc824acba0c600c44d234e2d11fa55f4bc913319491d7789a94171c
+EBUILD nginx-1.26.1-r1.ebuild 42406 BLAKE2B f8f6af452c75f9a0882c781ee7ad74406f78164344fb2fb40e06cb943ac5f5ec5c0c250fe57638d7ff6ee1ecf4a9ad994fa7d2008af5894d4687d8aba9b4e247 SHA512 01a82316508bedace6de234eb8d6cde18deeb42f58c91a380e7c4f84fbbdcafb7885e7817dede485eaab70af8f66e6c1c540e598d57aacc50a4e4fa799838f38
+EBUILD nginx-1.27.0-r1.ebuild 42410 BLAKE2B 9e2c75d0ec90ce7d936cf5a7045b7aac4927f6cef4bb1fc5a9236e3af604399b03de18f309e60d90c9af02dee885543844df2055df7d2c2d7b5813057261a429 SHA512 21c7c3e08bb04c9451f8cf091a061ba630ce8c4ab1e325a929b4ff8c9d726e37dc87dfa9cc9e5f28049376cb500c8cb0215f3169a96cf7195aa349e831517eaa
 MISC metadata.xml 1189 BLAKE2B 9e65f404d2be335d14ffb087be60847a2508de79baae7ee0e3bd7021dbfbbc1f18b93ed758d107ef3a9738ab32889f106a5eb8232f8f4190d57c175eed60ddd5 SHA512 8077d4da43250c5cc783451682047460b093cf1e751e0b0d75a21bb42baf83fd31b1bb3a574ed6e7ab89286afb331c23915c676ed80c7b4cc5fd9f84a40da893
diff --git a/www-servers/nginx/nginx-1.26.1.ebuild b/www-servers/nginx/nginx-1.26.1-r1.ebuild
index c07e31bbad91..14ac4f2e9864 100644
--- a/www-servers/nginx/nginx-1.26.1.ebuild
+++ b/www-servers/nginx/nginx-1.26.1-r1.ebuild
@@ -166,7 +166,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="0.8.4"
+NJS_MODULE_PV="0.8.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}"
diff --git a/www-servers/nginx/nginx-1.27.0.ebuild b/www-servers/nginx/nginx-1.27.0-r1.ebuild
index 631386626414..749ba9ff4572 100644
--- a/www-servers/nginx/nginx-1.27.0.ebuild
+++ b/www-servers/nginx/nginx-1.27.0-r1.ebuild
@@ -166,7 +166,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="0.8.4"
+NJS_MODULE_PV="0.8.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}"
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 7934989b1823..90248417e89a 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,6 +1,5 @@
 AUX tomcat-10.1.20-do-not-copy.patch 1164 BLAKE2B 4df0dc611ab7694d784adfaf132502c8e11b60f91a8dbb5e1385ed44e965f175660e9d5ed29d0e32d1b77a614d1bb41499bcc987e109d41bc1acd5876ace3c0c SHA512 e7a1f058566a44b6b88f3c968cddb7effe9301aadc199d127bf8269c847ecc6a2c4ad8d09b3d489dba49eff79e69e033e3acb729fd7337ec8bb378aa65c0bdfa
 AUX tomcat-10.1.20-offline.patch 562 BLAKE2B 338f3fe3604004ab2920d67c39facb41d506a3a56c5fe7d1c11f4fa11b8391aac7b0088b46be3b4ef5ffef7590b525f09a53985abc8d753999a548ea9a2f31c5 SHA512 0f814adf5a837985b14aca22fd1e41f36eff74c6065577a5fb46df19c67cfd85aac86edbdd12f009014c9a96342baa8db74130d0020c0390e74bdfa5cd7a56e6
-AUX tomcat-10.1.6-build.xml.patch 4856 BLAKE2B ed44d53877c96f06cab6354b034f88ba3382c34eaf504f10c9fcaaaf2b0c812901f3bfca8114f2aab4faa2604800f81f18932ac12065d09846f879edc1eaad96 SHA512 005d0b3fe6e14dca303bc3d5c4ab1fbf35a309be9a8ffcebd24e739301f33f202616e17973dd954bd1bd1ae89978c3147593d42ee2508c56026579d37722470b
 AUX tomcat-9.0.87-build.xml.patch 1240 BLAKE2B 26fbfd5ba353fd3f5a02a1feb984eee7b6e5b9ed1f711e969e135e87761f0b6be5503abf93a53ecdfa7de35e00765f1c3a7e057702fe14d62bfb58cc93356b84 SHA512 b62fc4d3a0d2d1134587fe284956a4961b353c730a4084e50f4cbf1ec096a2261c8c77a58940c808e47e5c0a8cdbffdbbb74de45de0251bddff9e461a5fe450c
 AUX tomcat-9.0.87-gentoo-bnd.patch 1432 BLAKE2B 07964d271be70afe13116c9ce27c956a6812f5da0237b19a1bc915ac3a0abd1e3e1ad89d59049152c1f3f24b84a45a076375f7dc6784c87ebac440b15ec5557d SHA512 210754982a5ac789aecedd9916d45190c8ca92661b9f492d40b6c4f0758c69a2d5b961150cc83573c9b7890a73fc4e8bd130a2837d6de9164fc8a18bee0e7676
 AUX tomcat-instance-manager-r2.bash 6999 BLAKE2B f1c771678bd8b894ecf242d5a8fb22f5b2f0f33445a1ff158c242b5154edc4483a5707ce33a5dcee53a3106e631ad8218243d8b72a32a10cd99e9646fa54085d SHA512 c30c156cbf2b53cf8498288bacaedd48872dce52f461ff32071310b438bdb5015c1cd1d512a2905c4db01e2b22342590e1b8aeadbd44f29062606fabbb2f2fed
diff --git a/www-servers/tomcat/files/tomcat-10.1.6-build.xml.patch b/www-servers/tomcat/files/tomcat-10.1.6-build.xml.patch
deleted file mode 100644
index 41cf58bc908c..000000000000
--- a/www-servers/tomcat/files/tomcat-10.1.6-build.xml.patch
+++ /dev/null
@@ -1,120 +0,0 @@
---- a/build.xml
-+++ b/build.xml
-@@ -1457,9 +1457,9 @@
- 
-   <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples"
-           description="Default. Builds a working Tomcat instance">
--
-+<!-- not needed for us
-     <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />
--
-+-->
-     <!-- Copy scripts -->
-     <copy todir="${tomcat.build}/bin">
-       <fileset dir="bin">
-@@ -1519,8 +1519,9 @@
-         <exclude name="${jdt.jar.filename}"/>
-       </fileset>
-     </delete>
-+<!-- we provide jdt jar externally
-     <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
--
-+-->
-     <!-- Delete all other versions of Tomcat Migration Tool for Jakarta EE and copy the current one -->
-     <local name="migration.jar.filename" />
-     <basename property="migration.jar.filename" file="${migration-lib.jar}"/>
-@@ -1530,8 +1531,9 @@
-         <exclude name="${migration-lib.jar.filename}"/>
-       </fileset>
-     </delete>
-+<!-- we provide migration tool externally
-     <copy file="${migration-lib.jar}" todir="${tomcat.build}/lib"/>
--
-+-->
-     <!-- Delete all other versions of OpenSSL support for Tomcat and copy the current one -->
-     <!-- After module release
-     <local name="openssl-lib.jar.filename" />
-@@ -2213,11 +2215,12 @@
-     </copy>
- 
-     <!-- Source bundles for native components -->
-+<!-- we provide tomcat native as another package and we don't need commons-daemon
-     <copy tofile="${tomcat.dist}/bin/tomcat-native.tar.gz"
-             file="${tomcat-native.tar.gz}" />
-     <copy tofile="${tomcat.dist}/bin/commons-daemon-native.tar.gz"
-             file="${commons-daemon.native.src.tgz}" />
--
-+-->
-     <!-- platform README files -->
-     <echo append="false" file="${tomcat.dist}/bin/x64/README">
- Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
-@@ -2378,8 +2381,10 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
-       <link href="../elapi"/>
-       <link href="../websocketapi"/>
-       <link href="../jaspicapi"/>
-+<!-- net is not accessed from emerge
-       <link href="https://docs.oracle.com/en/java/javase/11/docs/api/"/>
-       <link href="https://jakarta.ee/specifications/platform/10/apidocs/"/>
-+-->
-       <packageset dir="${tomcat.dist}/src/java/">
-         <include name="org/**"/>
-         <exclude name="org/apache/el/parser/**"/>
-@@ -3300,6 +3305,7 @@ asf.ldap.username=${release.asfusername}
-           depends="setup-bnd">
- 
-     <!-- Download Commons Daemon -->
-+<!-- not needed
-     <antcall target="downloadgz-2">
-       <param name="sourcefile.1" value="${commons-daemon.bin.loc.1}"/>
-       <param name="sourcefile.2" value="${commons-daemon.bin.loc.2}"/>
-@@ -3308,8 +3314,9 @@ asf.ldap.username=${release.asfusername}
-       <param name="checksum.algorithm" value="${commons-daemon.bin.checksum.algorithm}"/>
-       <param name="checksum.value" value="${commons-daemon.bin.checksum.value}"/>
-     </antcall>
--
-+-->
-     <!-- Download JDT (Eclipse compiler) -->
-+<!-- we provide JDT
-     <antcall target="downloadfile-2">
-       <param name="sourcefile.1" value="${jdt.loc.1}"/>
-       <param name="sourcefile.2" value="${jdt.loc.2}"/>
-@@ -3319,8 +3326,9 @@ asf.ldap.username=${release.asfusername}
-       <param name="checksum.algorithm" value="${jdt.checksum.algorithm}"/>
-       <param name="checksum.value" value="${jdt.checksum.value}"/>
-     </antcall>
--
-+-->
-     <!-- Download WS API -->
-+<!-- we provide jaxrpc
-     <antcall target="downloadfile">
-       <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
-       <param name="destfile" value="${jaxrpc-lib.jar}"/>
-@@ -3329,6 +3337,8 @@ asf.ldap.username=${release.asfusername}
-       <param name="checksum.algorithm" value="${jaxrpc-lib.checksum.algorithm}"/>
-       <param name="checksum.value" value="${jaxrpc-lib.checksum.value}"/>
-     </antcall>
-+-->
-+<!-- we provide wsdl4j
-     <antcall target="downloadfile">
-       <param name="sourcefile" value="${wsdl4j-lib.loc}"/>
-       <param name="destfile" value="${wsdl4j-lib.jar}"/>
-@@ -3337,8 +3347,9 @@ asf.ldap.username=${release.asfusername}
-       <param name="checksum.algorithm" value="${wsdl4j-lib.checksum.algorithm}"/>
-       <param name="checksum.value" value="${wsdl4j-lib.checksum.value}"/>
-     </antcall>
--
-+-->
-     <!-- Tomcat Migration Tool for Jakarta EE -->
-+<!-- we provide migration tool
-     <antcall target="downloadfile">
-       <param name="sourcefile" value="${migration-lib.loc}"/>
-       <param name="destfile" value="${migration-lib.jar}"/>
-@@ -3347,7 +3358,7 @@ asf.ldap.username=${release.asfusername}
-       <param name="checksum.algorithm" value="${migration-lib.checksum.algorithm}"/>
-       <param name="checksum.value" value="${migration-lib.checksum.value}"/>
-     </antcall>
--
-+-->
-   </target>
- 
-   <target name="download-test-compile"