summaryrefslogtreecommitdiff
path: root/www-servers
diff options
context:
space:
mode:
Diffstat (limited to 'www-servers')
-rw-r--r--www-servers/Manifest.gzbin5529 -> 5535 bytes
-rw-r--r--www-servers/gunicorn/Manifest4
-rw-r--r--www-servers/gunicorn/gunicorn-19.6.0.ebuild4
-rw-r--r--www-servers/gunicorn/gunicorn-19.8.1.ebuild4
-rw-r--r--www-servers/nginx-unit/Manifest2
-rw-r--r--www-servers/nginx-unit/nginx-unit-1.8.0.ebuild66
-rw-r--r--www-servers/tomcat/Manifest2
-rw-r--r--www-servers/tomcat/files/tomcat-8.0.49-build.xml.patch265
-rw-r--r--www-servers/tomcat/files/tomcat-8.5.27-build.xml.patch256
9 files changed, 74 insertions, 529 deletions
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 81d03639c3f5..c5dad9fb1f2f 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
Binary files differ
diff --git a/www-servers/gunicorn/Manifest b/www-servers/gunicorn/Manifest
index 313a4c10a3fc..afb16e40c18d 100644
--- a/www-servers/gunicorn/Manifest
+++ b/www-servers/gunicorn/Manifest
@@ -6,6 +6,6 @@ DIST gunicorn-19.8.1.tar.gz 415541 BLAKE2B f0eefc4ff24052320b4dfaac3fc2523487f8d
EBUILD gunicorn-19.1.1.ebuild 1152 BLAKE2B dbee01db983b6ca5402a30870570fdf2b60e1923120cb6e14e28b0fad3e33b93f756f100a8acf4c958630045246a9ff4949a899251335f6928db78e23b4f6d85 SHA512 ee87314f83c32f458faf5f642f67879622d3574d3d4d482d512f2941dd1b218193fec6221822946eb4c71d24118dffe315132065c73e824471b6ab02307ff0d3
EBUILD gunicorn-19.3.0.ebuild 1208 BLAKE2B 47c394fdc6f3648e8584eb29fc49ca25447c288aa0cd511d72c5871ff868756d477e310c870abd9977edfaf107e3c1fdff0caa6fcf2971ad10f7cb12720efb3a SHA512 56e7977b28609dd8e419b8db7d392db0ad937a3493727a64d6c66da0ed7845763ef768052d8070442aabc8f285acaea12a75001b4f6bd51501652354ef1093ba
EBUILD gunicorn-19.4.5.ebuild 1106 BLAKE2B c45268926c2b5710c1c2866d00dd526a3642332a05f9e233bf20b623dad8dc5b6aa1d1b6ad981b8dc15659e9fcc38ba3a736d6775a76a5a6b32b523f8aee65a4 SHA512 49812ce39dce295c98f776fce7f4e018792d74a4344f1d0bbf90231746c18adc39c86c5c04d8ea320ee214c469a9f2fdcb72670af0912afc3930330103810050
-EBUILD gunicorn-19.6.0.ebuild 1171 BLAKE2B e2c08c76e91e94cd852a3020a99ab8c0336fe112f049ac8d533d42940c781ba6a448e08bf73031152ac3c7c0c1f1423e93acdc926f2fb5db643f8c58a722e50f SHA512 cc0a4dd46e6d930e950d2b740af6ce05f6d47b42f8572cdbe93e11d434a92f5de00b655ff3a34c608311ff14f3d019fb58e7a34c198ffa3868d703394f2a7387
-EBUILD gunicorn-19.8.1.ebuild 1159 BLAKE2B 2d2d3e085a51632ee2dd2b48a3000d5bf9e1d69bedadf8bedc3f6a655d8d026f70d307f21835267121aaa5867148651e4f3b11d9e091bbc4714b31a142b7066f SHA512 88639a1aa49e6b793de712bffb0b86fa9820219c296a7ef66db292871252874c9c7e61039dd53719a8b97cedfc8fcc44c3064210c560aed14bcde65bb24f395b
+EBUILD gunicorn-19.6.0.ebuild 1173 BLAKE2B 4c6f29f434697976ac7a15856f81fa16c68ac391390d47e87b4aeedaaf2305dc6e43129b7470d69b74e1f9809de0f63364fcc68fa2149f28a1c93085e4e11467 SHA512 37ab860b3447f649350e58d5ad620d61e92d4bb969d275ffe9503be78db221cc7f927f73a4e302e1ba7fbec33b53d45964dce87165d4084b70c2920ca7ea8df8
+EBUILD gunicorn-19.8.1.ebuild 1164 BLAKE2B 92aa1f913f40baa512f8096336294124058f5d793818eb189449fc269ca87cc581c993ba9384e88b88eecd5a9947fcfd5c997874697df328b54c130b1e897169 SHA512 f4908c777bc5d86069638ec8d59d268642583b0e55f39bdd5c58825ffeb7c88b9b3434586ff2e510bc9ab8c1fad072e2b0c47f3c406b4ccb56e3eb820a299692
MISC metadata.xml 707 BLAKE2B baa7ba91610f10f6acc7298c6bbecb030b2d6dcda9a2f0c642f24ee27edbab38baea8bc231d7fbfc9f60459faa13bb05e548a8f7680b735c8c1005d00db2a3ee SHA512 ee74f9e811231c840235bccb318ffd99e7ff765a13efe285dfd870ff343d8e64b5190d5afd6589b6367f0f8cec8e699de8ae19d8da5e9a9f22cb7eb9e3539c0a
diff --git a/www-servers/gunicorn/gunicorn-19.6.0.ebuild b/www-servers/gunicorn/gunicorn-19.6.0.ebuild
index f4dc623cd8fb..895e2e4d9c49 100644
--- a/www-servers/gunicorn/gunicorn-19.6.0.ebuild
+++ b/www-servers/gunicorn/gunicorn-19.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT PSF-2 doc? ( BSD )"
SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
IUSE="doc examples test"
RDEPEND="dev-python/setproctitle[${PYTHON_USEDEP}]"
diff --git a/www-servers/gunicorn/gunicorn-19.8.1.ebuild b/www-servers/gunicorn/gunicorn-19.8.1.ebuild
index 09d6e1d803a2..ba39f37013be 100644
--- a/www-servers/gunicorn/gunicorn-19.8.1.ebuild
+++ b/www-servers/gunicorn/gunicorn-19.8.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT PSF-2 doc? ( BSD )"
SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
IUSE="doc test"
RDEPEND="dev-python/setproctitle[${PYTHON_USEDEP}]"
diff --git a/www-servers/nginx-unit/Manifest b/www-servers/nginx-unit/Manifest
index aa1ce36d8323..e4bca66d923b 100644
--- a/www-servers/nginx-unit/Manifest
+++ b/www-servers/nginx-unit/Manifest
@@ -4,10 +4,12 @@ DIST nginx-unit-1.5.tar.gz 437636 BLAKE2B 9f7b89a800c933cc6d55a444c5a6c6326cf169
DIST nginx-unit-1.6.tar.gz 439244 BLAKE2B 38e5580eed131b92f7fb73f389bd1dcc713a091d16910fd984a95fb77a47586e7a8afe597fb4774c2f27aac3de66297eb3993815569dde3b11e5b755f3ae319e SHA512 d8a84c2c88017b18dfccf082591177564158e4297632664bc06fd8545b798e0d5efaaae9f840ee485a246c3638cdd022363c455f441d52666f39191e88b14ff8
DIST nginx-unit-1.7.1.tar.gz 445348 BLAKE2B ce71948575c1d4c8cd6a918625525a77094c7b9bee335283a131bdf72e863f4a645761074642bf4150b1aeaf61c5d95302e0e2f0547483fc76b7ab3784aeb1d0 SHA512 08073aced61aff6cb9891128d4e5eb96096f113cfbff3418976fb7f896762e6abe2f08202935cf464f7b547daade89e071c616496969447a5aa35e77004d4ffa
DIST nginx-unit-1.7.tar.gz 445144 BLAKE2B 99f985768551bb3d12fa09751c3bad9ffbfd0bb9768914a439bf420e438b468f5baa909866c6f7518c6ab17335ddcb69f312207f8f0a8b25dc28ddb2c5bb75d7 SHA512 68156a8dd69401895d40f2c23d7889f3998f52dd7bfd5c3efb7894e5267aef0075868db857fbbbc34f85ed9d56b9ea4fa7a19f662eb91f68284eb99a55f0380b
+DIST nginx-unit-1.8.0.tar.gz 511226 BLAKE2B e396b27954840a5f1ad3a4cd9501a5e5fe769a754c51043da784a2c4596e6acc33089f495bf412a0db086e5c715a51292c7dece004a6512564421a431b6c339e SHA512 1d0ad05343ff70aff4c6e221a36c20df95fa2e2262ae5c69963a9bcb9ef883151e8a2fa9fef29f43ac5489aa5cbb3e9dfd10cf5e7f6d7a98742b490ebf3a0413
EBUILD nginx-unit-1.3-r1.ebuild 1194 BLAKE2B dd27ff30e4113e9beb716ea2c73f6559fcde29bf1137b0361b73aa56a4c46a293928b6060eb61e2689d6bccb90a8452e7aa83621ea1768f326b7bd1a60202430 SHA512 af28c954708053a62ef0d2e534d05de59f5e05e8f1042488bcd25f6d0e4c0b4144e7b7ccc146c5b97a0d2f0ca1cc21542aff92082dfc38eeb0fbc9137802727c
EBUILD nginx-unit-1.3.ebuild 937 BLAKE2B 09d8c3e3e8e0d0737f94bb1b483479fdce591f3a60a8ac5dab65d94e361e04b6bc1099f6c78432af93469c21c995a0bbde85d916c143ccf92ed0124d3e835913 SHA512 498a05d21d8593c0d640fadabee04245dc7c2c49050c314a1366ae4edd52a268b6a5745aa9d7eecbd0383706cac6c02b7838e0c517206b55b6ddeed849cb9340
EBUILD nginx-unit-1.5.ebuild 1663 BLAKE2B 77860cf8fd796c3fd341cd0a4387663eaa8abfb87203af7520d88579e1d484f2aaa33e32bc5dcc5328850f90b9aaec3cf91fb67f508c92f6b418c81675113f92 SHA512 4ef0abe2086b78cebb0006eb522dc803441693bb1af3db02ee9f604872f34841b6866c25ff0ee560d5681b9b4f6afea76b48baae0d724ae2d09c40c365044455
EBUILD nginx-unit-1.6.ebuild 1663 BLAKE2B 77860cf8fd796c3fd341cd0a4387663eaa8abfb87203af7520d88579e1d484f2aaa33e32bc5dcc5328850f90b9aaec3cf91fb67f508c92f6b418c81675113f92 SHA512 4ef0abe2086b78cebb0006eb522dc803441693bb1af3db02ee9f604872f34841b6866c25ff0ee560d5681b9b4f6afea76b48baae0d724ae2d09c40c365044455
EBUILD nginx-unit-1.7.1.ebuild 1663 BLAKE2B 77860cf8fd796c3fd341cd0a4387663eaa8abfb87203af7520d88579e1d484f2aaa33e32bc5dcc5328850f90b9aaec3cf91fb67f508c92f6b418c81675113f92 SHA512 4ef0abe2086b78cebb0006eb522dc803441693bb1af3db02ee9f604872f34841b6866c25ff0ee560d5681b9b4f6afea76b48baae0d724ae2d09c40c365044455
EBUILD nginx-unit-1.7.ebuild 1663 BLAKE2B 77860cf8fd796c3fd341cd0a4387663eaa8abfb87203af7520d88579e1d484f2aaa33e32bc5dcc5328850f90b9aaec3cf91fb67f508c92f6b418c81675113f92 SHA512 4ef0abe2086b78cebb0006eb522dc803441693bb1af3db02ee9f604872f34841b6866c25ff0ee560d5681b9b4f6afea76b48baae0d724ae2d09c40c365044455
+EBUILD nginx-unit-1.8.0.ebuild 1663 BLAKE2B 77860cf8fd796c3fd341cd0a4387663eaa8abfb87203af7520d88579e1d484f2aaa33e32bc5dcc5328850f90b9aaec3cf91fb67f508c92f6b418c81675113f92 SHA512 4ef0abe2086b78cebb0006eb522dc803441693bb1af3db02ee9f604872f34841b6866c25ff0ee560d5681b9b4f6afea76b48baae0d724ae2d09c40c365044455
MISC metadata.xml 949 BLAKE2B 31fd3223474719c473dac9015906c04fe7ad706575073eaddcb05b362ee421d57aa9e7bc92952ff01e9dae558fc838e0e7c248a5f0b29822248e61f97c72048a SHA512 5176f55f2d57f45bbe1df67336d798dfb5a412d2851706ba8d26dfba65beed787f59fd2419bfbb135c5dd9cdb1b2fa50220bdef3d0aed6c2e5ef00ca4dd23370
diff --git a/www-servers/nginx-unit/nginx-unit-1.8.0.ebuild b/www-servers/nginx-unit/nginx-unit-1.8.0.ebuild
new file mode 100644
index 000000000000..f3124ecc86f3
--- /dev/null
+++ b/www-servers/nginx-unit/nginx-unit-1.8.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=(python2_7 python3_{3,4,5,6,7})
+
+inherit python-single-r1
+
+MY_P="unit-${PV}"
+DESCRIPTION="A dynamic web and application server"
+HOMEPAGE="https://unit.nginx.org"
+SRC_URI="https://unit.nginx.org/download/${MY_P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+MY_USE="perl python ruby"
+MY_USE_PHP="php5-6 php7-1 php7-2"
+IUSE="${MY_USE} ${MY_USE_PHP}"
+REQUIRED_USE="|| ( ${IUSE} ) python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="perl? ( dev-lang/perl:= )
+ php5-6? ( dev-lang/php:5.6[embed] )
+ php7-1? ( dev-lang/php:7.1[embed] )
+ php7-2? ( dev-lang/php:7.2[embed] )
+ python? ( ${PYTHON_DEPS} )
+ ruby? ( dev-lang/ruby:= )"
+RDEPEND="${DEPEND}"
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+ ./configure \
+ --control=unix:/run/${PN}.sock \
+ --ld-opt="${LDFLAGS}" \
+ --log=/var/log/${PN} \
+ --modules=$(get_libdir)/${PN} \
+ --pid=/run/${PN}.pid \
+ --prefix=/usr \
+ --state=/var/lib/${PN} || die "Core configuration failed"
+ for flag in ${MY_USE} ; do
+ if use ${flag} ; then
+ ./configure ${flag} || die "Module configuration failed: ${flag}"
+ fi
+ done
+ for flag in ${MY_USE_PHP} ; do
+ if use ${flag} ; then
+ local php_slot="/usr/$(get_libdir)/${flag/-/.}"
+ ./configure php \
+ --module=${flag} \
+ --config=${php_slot}/bin/php-config \
+ --lib-path=${php_slot}/$(get_libdir) || die "Module configuration failed: ${flag}"
+ fi
+ done
+}
+
+src_install() {
+ default
+ diropts -m 0770
+ keepdir /var/lib/${PN}
+ newinitd "${FILESDIR}/${PN}.initd" ${PN}
+}
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 155fded3c582..c004221832ef 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,7 +1,5 @@
AUX tomcat-7.0.84-build.xml.patch 5771 BLAKE2B fc7ceb5503836f2d2e52611b1fef76390d62668ac030cfc51b51ab20278d80fb4c3561e6ff4eb0fa5f7461b72f73930a69af6c616bc10b6dd6a3c4033d6ad618 SHA512 3583167e6e7b307ab282982779ef58e1f401e0ada8ddf0fc1ac9669147a22d6472ab9ec09aa293f2846be2f406dda63df5fc0351eac67c86742606140293a0c3
-AUX tomcat-8.0.49-build.xml.patch 10779 BLAKE2B db42886b59bd50f8ba4011ce34ce4ab8b44af0cef09bc66704b774914d1421121e4041ee1abc2fef5a907ea72f960f31a87502d40855817110b52cf5c5ad92c7 SHA512 ee8d9e689a4744c93554968c97b717c9102dfa94c6e1740ca44575f7226946e6209199b2845575faec7bf1d1d6b9bad62110bc4551a1ac0d84c564599e3a49e0
AUX tomcat-8.0.53-build.xml.patch 10949 BLAKE2B 2693f3e74a69967ceeb5f4ee41756b840da5bc2ab3c64cb855d52bd099bad8d6115f1d01903bacdcb634c24b9085dbb2ef34027f71325f887f20826721b268aa SHA512 20373a340dcb17595e7ff52608e8d3d3b1eddd5f0104b588c5f91b21eb4510047df61a0dfd9ed8674fb7b0b709945d5014d6e1cad4027414ff9e72c2b5d56cfc
-AUX tomcat-8.5.27-build.xml.patch 10399 BLAKE2B 66df2c023b89d23bad249bf00695b0863b10b2c72b67fe7344104cc2c5f2187656298faa9abca55f3604043cecbdad57c3d7f379f2e23836fd4828dbc5c90051 SHA512 f09527b693d86fae244f3d54ce2f894e9a6e70a80345995e1521847298417ab0737c481ea59bdb243529edf2d717bb8b0d94af5443c4b0827589cb0c8395474a
AUX tomcat-8.5.37-build.xml.patch 9814 BLAKE2B 8f25989b1fa957337686beacc12d9b1fa5427fc26582645c0b9fd7a45fba11100fbd10516ed9bdd510afc25a180986076db00f8b026e9ed8ca00b285404889c9 SHA512 ac1328a6fb755c87cd8804b5538aaec7b09a966e427c0a9c3db408947135087ce5e1e81c9e18243d7b34f1751002afbe538424b975a6772a1d5c7443dab73f8f
AUX tomcat-9.0.14-build.xml.patch 10582 BLAKE2B 01609bf6867784f789ae41cb06acdd9496b0fc62dd65d72420cd01f1d73070ef10d74e038629cb4c983e313a958f810cd8f5f02bb5c464924f8a6b73be084dca SHA512 8bb3d5b58c9c49386a15f3bcb1e13656adfeed0e1d4c3bf76589577cae7fcdd6f107cf02126e69b5864f6077ad2660fb7fc811ea52b5ac89de822e535a36826b
AUX tomcat-9.0.16-build.xml.patch 10623 BLAKE2B ff6b110604628cbf750a75cea2544789cb65357f2f5bd87e8f781fcffade2a538f4a76ed4c8709a34dbb5995006a550e10e13b74487570b0474ca451ea21c209 SHA512 27f5040e2384ad4c212c1e25aaa850c26fec93de73b86a1b3e06e763ff5e13ed491153427d1206eec662eb225ee0890c43f292cbe95dd6521702254632983df1
diff --git a/www-servers/tomcat/files/tomcat-8.0.49-build.xml.patch b/www-servers/tomcat/files/tomcat-8.0.49-build.xml.patch
deleted file mode 100644
index ab6590d5c12c..000000000000
--- a/www-servers/tomcat/files/tomcat-8.0.49-build.xml.patch
+++ /dev/null
@@ -1,265 +0,0 @@
---- a/build.xml
-+++ b/build.xml
-@@ -718,24 +718,29 @@
- manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
-
- <!-- Servlet 3.1 Implementation JAR File -->
-+<!--
- <jarIt jarfile="${servlet-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.servlet-api"
- manifest="${tomcat.manifests}/servlet-api.jar.manifest"
- notice="${tomcat.manifests}/servlet-api.jar.notice"
- license="${tomcat.manifests}/servlet-api.jar.license" />
--
-+-->
- <!-- JSP 2.3 Implementation JAR File -->
-+<!--
- <jarIt jarfile="${jsp-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.jsp-api"
- manifest="${tomcat.manifests}/jsp-api.jar.manifest" />
-+-->
-
- <!-- EL 3.0 Implementation JAR File -->
-+<!--
- <jarIt jarfile="${el-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.el-api"
- manifest="${tomcat.manifests}/el-api.jar.manifest" />
-+-->
-
- <!-- WebSocket 1.1 API JAR File -->
- <jarIt jarfile="${websocket-api.jar}"
-@@ -1005,9 +1010,9 @@
-
- <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples"
- description="Default. Builds a working Tomcat instance">
--
-+<!--
- <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />
--
-+-->
- <!-- Copy scripts -->
- <copy todir="${tomcat.build}/bin">
- <fileset dir="bin">
-@@ -1067,7 +1072,7 @@
- <exclude name="${jdt.jar.filename}"/>
- </fileset>
- </delete>
-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
-+<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
-
- <!-- Add sources for examples -->
- <antcall target="examples-sources" />
-@@ -1101,7 +1106,7 @@
- </javac>
- </target>
-
-- <target name="build-tomcat-jdbc" depends="package">
-+ <target name="build-tomcat-jdbc" depends="package" unless="noget">
- <!-- build the jdbc-pool jar and source jar-->
- <echo message="Building Tomcat JDBC pool libraries"/>
- <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}"
-@@ -1116,7 +1121,7 @@
- <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
- </target>
-
-- <target name="build-tomcat-jdbc-src">
-+ <target name="build-tomcat-jdbc-src" unless="noget">
- <!-- build the jdbc-pool source jar-->
- <echo message="Building Tomcat JDBC pool src JAR"/>
- <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}"
-@@ -1220,9 +1225,11 @@
-
- <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
- <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
-+<!--
- <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}"
- failonerror="false"/>
- <copy file="${jdt.jar}" todir="${tomcat.embed}" />
-+-->
- <copy file="${annotations-api.jar}" todir="${tomcat.embed}" />
-
- <!-- Note the meta-inf below will work as long as there is only one JAR
-@@ -1615,7 +1622,7 @@
-
- <target name="extras-commons-logging-prepare"
- depends="extras-prepare"
-- description="Prepare to build web services extras package">
-+ description="Prepare to build web services extras package" unless="noget">
-
- <antcall target="downloadfile-2">
- <param name="sourcefile.1" value="${commons-logging-src.loc.1}"/>
-@@ -1754,7 +1761,7 @@
-
- <target name="extras-webservices-prepare"
- depends="extras-prepare"
-- description="Prepare to build web services extras package">
-+ description="Prepare to build web services extras package" unless="noget">
-
- <antcall target="downloadfile">
- <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
-@@ -1941,11 +1948,12 @@
- </copy>
-
- <!-- Source bundles for native components -->
-+<!--
- <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.
-@@ -1955,6 +1963,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
-
- <target name="javadoc" depends="dist-source,extras-webservices-prepare"
- description="Create the Tomcat javadoc" >
-+<!--
- <javadoc packagenames="javax.servlet.*"
- excludepackagenames="javax.servlet.jsp.*"
- sourcepath="${tomcat.dist}/src/java"
-@@ -2016,6 +2025,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- <path location="${ant.core.lib}"/>
- </classpath>
- </javadoc>
-+-->
- <javadoc packagenames="javax.websocket.*"
- sourcepath="${tomcat.dist}/src/java"
- destdir="${tomcat.dist}/webapps/docs/websocketapi"
-@@ -2054,9 +2064,11 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- <path refid="tomcat.webservices.classpath"/>
- <path location="${ant.core.lib}"/>
- </classpath>
-+<!--
- <link href="../servletapi"/>
- <link href="../jspapi"/>
- <link href="../elapi"/>
-+-->
- <link href="../websocketapi"/>
- <link href="http://docs.oracle.com/javase/7/docs/api/"/>
- <link href="http://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
-@@ -2791,7 +2803,7 @@ skip.installer property in build.properties" />
- </target>
-
- <target name="download-compile"
-- description="Download (and build) components necessary to compile" >
-+ description="Download (and build) components necessary to compile" unless="noget">
-
- <!-- Download Commons Daemon -->
- <antcall target="downloadgz-2">
-@@ -2811,7 +2823,7 @@ skip.installer property in build.properties" />
- </target>
-
- <target name="download-test-compile"
-- description="Download additional components for the tests" >
-+ description="Download additional components for the tests" unless="noget">
-
- <antcall target="downloadfile">
- <param name="sourcefile" value="${junit.loc}"/>
-@@ -2868,7 +2880,7 @@ skip.installer property in build.properties" />
- </target>
-
- <target name="download-dist"
-- description="Download additional components for a distribution" >
-+ description="Download additional components for a distribution" unless="noget">
-
- <antcall target="downloadfile-2">
- <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
-@@ -2908,18 +2920,18 @@ skip.installer property in build.properties" />
-
- <!-- =============== Utility Targets to support downloads ================ -->
-
-- <target name="setproxy" if="${proxy.use}">
-+ <target name="setproxy" if="${proxy.use}" unless="noget">
- <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
- proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
- <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
- </target>
-
-- <target name="testexist">
-+ <target name="testexist" unless="noget">
- <echo message="Testing for ${destfile}"/>
- <available file="${destfile}" property="exist"/>
- </target>
-
-- <target name="downloadgz" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadgz" unless="noget" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2931,7 +2943,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadgz-2" unless="exist" depends="testexist">
-+ <target name="downloadgz-2" unless="noget" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2950,7 +2962,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadzip" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadzip" unless="noget" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2961,7 +2973,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadzip-2" unless="exist" depends="testexist">
-+ <target name="downloadzip-2" unless="noget" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2979,7 +2991,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadfile" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadfile" unless="noget" depends="testexist,setproxy">
- <!-- Download the file -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2989,7 +3001,7 @@ skip.installer property in build.properties" />
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="downloadfile-2" unless="exist" depends="testexist">
-+ <target name="downloadfile-2" unless="noget" depends="testexist">
- <!-- Download the file from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -3012,7 +3024,7 @@ skip.installer property in build.properties" />
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="trydownload.check" depends="setproxy">
-+ <target name="trydownload.check" depends="setproxy" unless="noget">
- <condition property="trydownload.run">
- <and>
- <not>
-@@ -3023,7 +3035,7 @@ skip.installer property in build.properties" />
- </condition>
- </target>
-
-- <target name="trydownload" if="trydownload.run" depends="trydownload.check">
-+ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
- <!-- Downloads a file if not yet downloaded and the source URL is available -->
- <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
- </target>
-@@ -3034,7 +3046,7 @@ skip.installer property in build.properties" />
-
- <target name="ide-eclipse"
- depends="download-compile, extras-webservices-prepare, download-test-compile"
-- description="Prepares the source tree to be built in Eclipse">
-+ description="Prepares the source tree to be built in Eclipse" unless="noget">
-
- <!-- Copy the sample project files into the root directory -->
- <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
diff --git a/www-servers/tomcat/files/tomcat-8.5.27-build.xml.patch b/www-servers/tomcat/files/tomcat-8.5.27-build.xml.patch
deleted file mode 100644
index c8022bcd5e4b..000000000000
--- a/www-servers/tomcat/files/tomcat-8.5.27-build.xml.patch
+++ /dev/null
@@ -1,256 +0,0 @@
---- a/build.xml
-+++ b/build.xml
-@@ -717,24 +717,29 @@
- manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
-
- <!-- Servlet 3.1 Implementation JAR File -->
-+<!--
- <jarIt jarfile="${servlet-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.servlet-api"
- manifest="${tomcat.manifests}/servlet-api.jar.manifest"
- notice="${tomcat.manifests}/servlet-api.jar.notice"
- license="${tomcat.manifests}/servlet-api.jar.license" />
--
-+-->
- <!-- JSP 2.3 Implementation JAR File -->
-+<!--
- <jarIt jarfile="${jsp-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.jsp-api"
- manifest="${tomcat.manifests}/jsp-api.jar.manifest" />
-+-->
-
- <!-- EL 3.0 Implementation JAR File -->
-+<!--
- <jarIt jarfile="${el-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.el-api"
- manifest="${tomcat.manifests}/el-api.jar.manifest" />
-+-->
-
- <!-- WebSocket 1.1 API JAR File -->
- <jarIt jarfile="${websocket-api.jar}"
-@@ -1010,9 +1015,9 @@
-
- <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples"
- description="Default. Builds a working Tomcat instance">
--
-+<!--
- <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />
--
-+-->
- <!-- Copy scripts -->
- <copy todir="${tomcat.build}/bin">
- <fileset dir="bin">
-@@ -1072,7 +1077,7 @@
- <exclude name="${jdt.jar.filename}"/>
- </fileset>
- </delete>
-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
-+<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
-
- <!-- Add sources for examples -->
- <antcall target="examples-sources" />
-@@ -1106,7 +1111,7 @@
- </javac>
- </target>
-
-- <target name="build-tomcat-jdbc" depends="package">
-+ <target name="build-tomcat-jdbc" depends="package" unless="noget">
- <!-- build the jdbc-pool jar and source jar-->
- <echo message="Building Tomcat JDBC pool libraries"/>
- <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}"
-@@ -1121,7 +1126,7 @@
- <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
- </target>
-
-- <target name="build-tomcat-jdbc-src">
-+ <target name="build-tomcat-jdbc-src" unless="noget">
- <!-- build the jdbc-pool source jar-->
- <echo message="Building Tomcat JDBC pool src JAR"/>
- <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}"
-@@ -1225,9 +1230,11 @@
-
- <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
- <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
-+<!--
- <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}"
- failonerror="false"/>
- <copy file="${jdt.jar}" todir="${tomcat.embed}" />
-+-->
- <copy file="${annotations-api.jar}" todir="${tomcat.embed}" />
-
- <!-- Note the meta-inf below will work as long as there is only one JAR
-@@ -1610,7 +1617,7 @@
-
- <target name="extras-webservices-prepare"
- depends="extras-prepare"
-- description="Prepare to build web services extras package">
-+ description="Prepare to build web services extras package" unless="noget">
-
- <antcall target="downloadfile">
- <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
-@@ -1750,11 +1757,12 @@
- </copy>
-
- <!-- Source bundles for native components -->
-+<!--
- <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.
-@@ -1764,6 +1772,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
-
- <target name="javadoc" depends="dist-source,extras-webservices-prepare"
- description="Create the Tomcat javadoc" >
-+<!--
- <javadoc packagenames="javax.servlet.*"
- excludepackagenames="javax.servlet.jsp.*"
- sourcepath="${tomcat.dist}/src/java"
-@@ -1828,6 +1837,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- <path location="${ant.core.lib}"/>
- </classpath>
- </javadoc>
-+-->
- <javadoc packagenames="javax.websocket.*"
- sourcepath="${tomcat.dist}/src/java"
- destdir="${tomcat.dist}/webapps/docs/websocketapi"
-@@ -1868,9 +1878,11 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- <path refid="tomcat.webservices.classpath"/>
- <path location="${ant.core.lib}"/>
- </classpath>
-+<!--
- <link href="../servletapi"/>
- <link href="../jspapi"/>
- <link href="../elapi"/>
-+-->
- <link href="../websocketapi"/>
- <link href="http://docs.oracle.com/javase/7/docs/api/"/>
- <link href="http://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
-@@ -2617,7 +2629,7 @@ skip.installer property in build.properties" />
- </target>
-
- <target name="download-compile"
-- description="Download (and build) components necessary to compile" >
-+ description="Download (and build) components necessary to compile" unless="noget">
-
- <!-- Download Commons Daemon -->
- <antcall target="downloadgz-2">
-@@ -2637,7 +2649,7 @@ skip.installer property in build.properties" />
- </target>
-
- <target name="download-test-compile"
-- description="Download additional components for the tests" >
-+ description="Download additional components for the tests" unless="noget">
-
- <antcall target="downloadfile">
- <param name="sourcefile" value="${junit.loc}"/>
-@@ -2694,7 +2706,7 @@ skip.installer property in build.properties" />
- </target>
-
- <target name="download-dist"
-- description="Download additional components for a distribution" >
-+ description="Download additional components for a distribution" unless="noget">
-
- <antcall target="downloadfile-2">
- <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
-@@ -2734,18 +2746,18 @@ skip.installer property in build.properties" />
-
- <!-- =============== Utility Targets to support downloads ================ -->
-
-- <target name="setproxy" if="${proxy.use}">
-+ <target name="setproxy" if="${proxy.use}" unless="noget">
- <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
- proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
- <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
- </target>
-
-- <target name="testexist">
-+ <target name="testexist" unless="noget">
- <echo message="Testing for ${destfile}"/>
- <available file="${destfile}" property="exist"/>
- </target>
-
-- <target name="downloadgz" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadgz" unless="noget" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2757,7 +2769,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadgz-2" unless="exist" depends="testexist">
-+ <target name="downloadgz-2" unless="noget" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2776,7 +2788,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadzip" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadzip" unless="noget" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2787,7 +2799,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadzip-2" unless="exist" depends="testexist">
-+ <target name="downloadzip-2" unless="noget" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2805,7 +2817,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadfile" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadfile" unless="noget" depends="testexist,setproxy">
- <!-- Download the file -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2815,7 +2827,7 @@ skip.installer property in build.properties" />
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="downloadfile-2" unless="exist" depends="testexist">
-+ <target name="downloadfile-2" unless="noget" depends="testexist">
- <!-- Download the file from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2838,7 +2850,7 @@ skip.installer property in build.properties" />
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="trydownload.check" depends="setproxy">
-+ <target name="trydownload.check" depends="setproxy" unless="noget">
- <condition property="trydownload.run">
- <and>
- <not>
-@@ -2849,7 +2861,7 @@ skip.installer property in build.properties" />
- </condition>
- </target>
-
-- <target name="trydownload" if="trydownload.run" depends="trydownload.check">
-+ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
- <!-- Downloads a file if not yet downloaded and the source URL is available -->
- <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
- </target>
-@@ -2860,7 +2872,7 @@ skip.installer property in build.properties" />
-
- <target name="ide-eclipse"
- depends="download-compile, extras-webservices-prepare, download-test-compile"
-- description="Prepares the source tree to be built in Eclipse">
-+ description="Prepares the source tree to be built in Eclipse" unless="noget">
-
- <!-- Copy the sample project files into the root directory -->
- <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-28 01:32:59 +0000