diff options
Diffstat (limited to 'www-servers')
38 files changed, 77 insertions, 814 deletions
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz Binary files differindex 939429d79309..d8f6a3ecd297 100644 --- a/www-servers/Manifest.gz +++ b/www-servers/Manifest.gz diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest index 3f8989fd8a4f..6cd97bd04698 100644 --- a/www-servers/apache/Manifest +++ b/www-servers/apache/Manifest @@ -9,8 +9,8 @@ DIST gentoo-apache-2.4.62-20240719.tar.bz2 26207 BLAKE2B 0c0b52620d27f9f96643f8f DIST httpd-2.4.59.tar.bz2 7503198 BLAKE2B 836e3538a120d71c016149397a4efd61ae6acd8a8fb9d2ce117c7d86209c4b40c0be3c464007891f28c58182e9d40a8793abe9e94e642354492954af91d9878c SHA512 209da0bbac5e2564d4590302515b35495be6402273ff4024aa93e85e44554c95e053201d606383936425a41e1b5b97e6b40055dcbb385eb691a5029a6f3158c2 DIST httpd-2.4.61.tar.bz2 7512908 BLAKE2B 9299ef5843888829143732b3a60d1713aff688ed2f6c2b7f154be16bc075ec747a5b116716f188491ebc9947ff2dfe09dfc71f5245d98a4be3ba27ada28ec8a5 SHA512 00656220ecc2b80788f539536553f0a3a57602fb981be22e63af87d0f98ffe5da3056e722ce52ae8cf9c2111ad1922b3aaea1fd7d69d0ed76795199203d593ff DIST httpd-2.4.62.tar.bz2 7521661 BLAKE2B 0e5c3b05819771e6ff72933ad715695199a32c384f63de6598e179ff5803580f04639437829305150305c9a2b7d309178552d8c9a2d7248a034c98f445193b95 SHA512 7db1876805d5c0f60f49bcb51f75cdf567120f2ff6349e68f084e9a86ae38265d9f1c67e7fca0082c9db136f3c408a88501ee11f26b1b68724ba240867171d77 -EBUILD apache-2.4.59-r1.ebuild 7910 BLAKE2B 51fb61174be88f22b8846c61b0a0215e74023e26e3f52547eedc8addfbe8ae9b9a7505dd06e11584b444c8f75b09a82fdae914666b185f5bc14944a03c50696c SHA512 c77496408a2a0ed322ee0de7d5e6181049c9822ed30171bc9fd334fa04be63ede5b8e0035ab04182c09d77e1d2a3ce80690f1426a075158a44736517b0639f48 -EBUILD apache-2.4.59-r3.ebuild 7845 BLAKE2B b8b5bc4af5ca53ced9b0cde392e74ef9b76c508a5a864742289ab3c4703257ff2683914fdf75468ab6f4ed210f2411a20c0df97083e6a1e34fa5f6c3b2b99e12 SHA512 4d4d5f995782b0a03b3a19d3930a692bb11c13f1efce5b36a04aa50ef0da196402821d1f262f237f8c3e4f1b1db1aecbbaa26b3b193ade94cb90f5289a0cd844 -EBUILD apache-2.4.61.ebuild 7842 BLAKE2B f5e43adcb71b95896082b30b5615f4c03f9a4642f621bbb11181487f6fee5a3fe2a2701611d33b02f02b9cb337d1af2c4c881a75f9d96cf23ee6e97093e2530b SHA512 e5b1ee6f6851294303dc1828092d057d0a11067e9f7a2c23f123470cfb7126606f429c6b4a9e30150c238c8ce65358c9091fd0413f4f247784a4767bec546422 -EBUILD apache-2.4.62.ebuild 7835 BLAKE2B d4519eedc7bd117be98c326a94914a57042a203f12ff8e1b25c7e929ac6ac694244df46ff28e0839ab249fdac51bc0422bce17f20bdde52ff47f657bfd70d254 SHA512 14d6845da1b4878abe0755f07426ef72fd4482e451a3cf367707e5c32f3227eaf86e2c5c6ea6cab05986b686cf9d43bb278b7a1768248a569d5d2302fde7a259 +EBUILD apache-2.4.59-r1.ebuild 7904 BLAKE2B 658b9329e935eebf4ddd07dd8d3f75982e0de26116ae82459c46cebeed9d5321d096e4e36f545056507f61cf208adb1d83f0955dea07b3d0ba676e07263aa9f9 SHA512 644d9ccc1738f39b6bc8ec4fe98d6b77b27a8611591f99f8e6f0a577fa789f0168e2e243cd8618f53d268357f40135c1e9b1e21b89c75467ce4457ad749da84d +EBUILD apache-2.4.59-r3.ebuild 7839 BLAKE2B 6e0cb6bb7df1793bd266cce8f2614e62c43804022968c950e4cc21ca01f781dfc7468dc339a2564cba0a7a37659c6b7fd98c71e679110d1d637ce006fa5a9da2 SHA512 303c26871b6d437c7f8dc36800c2ce280c1ec8995de3d53404c54f4c103d954b399be29f204bc1fdd78d189a9368766cf7f11903e73ffa9ee79a9a3c0d86d773 +EBUILD apache-2.4.61.ebuild 7836 BLAKE2B ae2250db6965dfd58520af3aae89740513ccded8b7c0521044607594448e67e9b8a5c4db1ca7409ae8008ef11566e37118707680dad413bff449cdf7641a5293 SHA512 8b098e900b72bbf4390a69e1b55ef707467eaef8adc4eb60cfb9650a1d906450edc7527892c16cc430583ccfa85d936d9f36c9e9bb10c1e54a77227a8ead48ec +EBUILD apache-2.4.62.ebuild 7829 BLAKE2B aba6aa3e29cb0808774ea6dd0eeda80e54ac8d0485988718386fb8374935296f516cbfff0f0460d968aa03d0c99aa0217f6459dd1612bd5bc8d03021a4e7a4fe SHA512 50e0a390b585a0ea8963cc572dfb2363203b86d90b112f450c469bacb640d5781140d02b3592a4636a7e881ae9ada83dd6c2bf3d011a06bf1de3aa7c5fcb6dcb MISC metadata.xml 978 BLAKE2B 2b2b82339fb2419da3d4e9d77f2c4495235b04a8f5006e61316bf638f307227ea26e2f9eaa26fca5d10118ebdd0bff9fac7319687ae62e2440b49e509e7080e0 SHA512 4a1842f1754473f7168fd38ef4ac2720fddf0f4ad8bfc5df3215b7a50f454cb3fc372e5a84d030a2b84e9744d599f8a38caf3ad5688a93cee7d52bac3d89b43b diff --git a/www-servers/apache/apache-2.4.59-r1.ebuild b/www-servers/apache/apache-2.4.59-r1.ebuild index 874db4b33904..f53d61e85a3a 100644 --- a/www-servers/apache/apache-2.4.59-r1.ebuild +++ b/www-servers/apache/apache-2.4.59-r1.ebuild @@ -146,7 +146,7 @@ HOMEPAGE="https://httpd.apache.org/" # some helper scripts are Apache-1.1, thus both are here LICENSE="Apache-2.0 Apache-1.1" SLOT="2" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x64-macos ~x64-solaris" RDEPEND=" apache2_modules_tls? ( >=net-libs/rustls-ffi-0.9.2:= <net-libs/rustls-ffi-11 ) diff --git a/www-servers/apache/apache-2.4.59-r3.ebuild b/www-servers/apache/apache-2.4.59-r3.ebuild index 590f7ca57801..36279a6e33d6 100644 --- a/www-servers/apache/apache-2.4.59-r3.ebuild +++ b/www-servers/apache/apache-2.4.59-r3.ebuild @@ -146,7 +146,7 @@ HOMEPAGE="https://httpd.apache.org/" # some helper scripts are Apache-1.1, thus both are here LICENSE="Apache-2.0 Apache-1.1" SLOT="2" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x64-macos ~x64-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x64-macos ~x64-solaris" RDEPEND=" apache2_modules_tls? ( >=net-libs/rustls-ffi-0.13.0:= ) diff --git a/www-servers/apache/apache-2.4.61.ebuild b/www-servers/apache/apache-2.4.61.ebuild index dea72bd95471..b91d0957110e 100644 --- a/www-servers/apache/apache-2.4.61.ebuild +++ b/www-servers/apache/apache-2.4.61.ebuild @@ -146,7 +146,7 @@ HOMEPAGE="https://httpd.apache.org/" # some helper scripts are Apache-1.1, thus both are here LICENSE="Apache-2.0 Apache-1.1" SLOT="2" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x64-macos ~x64-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x64-macos ~x64-solaris" RDEPEND=" apache2_modules_tls? ( >=net-libs/rustls-ffi-0.13.0:= ) diff --git a/www-servers/apache/apache-2.4.62.ebuild b/www-servers/apache/apache-2.4.62.ebuild index 2beabccc8a51..8779084369f0 100644 --- a/www-servers/apache/apache-2.4.62.ebuild +++ b/www-servers/apache/apache-2.4.62.ebuild @@ -146,7 +146,7 @@ HOMEPAGE="https://httpd.apache.org/" # some helper scripts are Apache-1.1, thus both are here LICENSE="Apache-2.0 Apache-1.1" SLOT="2" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x64-macos ~x64-solaris" RDEPEND=" apache2_modules_tls? ( >=net-libs/rustls-ffi-0.13.0:= ) diff --git a/www-servers/gunicorn/Manifest b/www-servers/gunicorn/Manifest index 571dd1ed7861..f881c3dd429b 100644 --- a/www-servers/gunicorn/Manifest +++ b/www-servers/gunicorn/Manifest @@ -1,5 +1,3 @@ -DIST gunicorn-22.0.0.gh.tar.gz 368152 BLAKE2B 9d3e2955140d299af86b9370c352d0d7ae2b631a5cdf72200550d3ac8b2e5f51edbc686475d3507f8dfb5f4249ef261e29a6d5fa172e5356777297f5497c7c20 SHA512 cb366cfc2875a32e1e6ddd3bd521650cb87a51c29b036b2cfbd9f8371307d1ffefafbcc85d45753c29186a92def77112e2ddd49fdc2116d2d32702635e88ba53 DIST gunicorn-23.0.0.gh.tar.gz 373550 BLAKE2B 5f7e74e3554e68863ac32225a95e2e83b69902013bb39f72dbcd150cb30b0698d4fbd2109d1b6e8858fe93b32f4a8aa52fa79cc7346ece769db5426c9caae840 SHA512 1304f348270134a5d9da0d6598f4878a25b3dd7ff96dc9eee1c07ec1031c03cd8bb3de42b6dedf63702588c7e482b18f88a3115e73005bbc4eaaad147d9674ba -EBUILD gunicorn-22.0.0.ebuild 1101 BLAKE2B 252d1bf5fb84872ac4d4c94ee828f4de437be57ba2326912b84b2763baa61aaf18e722a44f17635cc1f576fd572911dc2e3266c1f3879b17e6c45a7a7e06405d SHA512 162868a7cc6ba409c682519077bf129f392b28eccb05f67dbfe0399c3334d5a913f37d796e463a182d53381b250b9292358187f6fc0f6373f1f0e94630f9a38f -EBUILD gunicorn-23.0.0.ebuild 1109 BLAKE2B 8c3b1b7a1b5b3a2fb24fb8ab8075701b20451173bc0f16aba95bec5dd67a5d188fddb2739d2cdf79fc1ef05c16c4a1e591378a5e0f679de93065a9fd14c30519 SHA512 2b890fb182148a32917f4e8cdab76005ee503e02e74afcd4a07830b281b058e771ea02b6285b18efe9ae492a543e0a7e1615b3eb57ffc0752abf8bbb2e86438a +EBUILD gunicorn-23.0.0.ebuild 1101 BLAKE2B ee7ef3bdab1ec3582a3708c35af1307d6561201930bc8a25f0370f91d4204f6205505d1b7446b7505e3060953551fec23a8acd060a5ea162ecf69c4e03fe7c97 SHA512 045a37710ffa0965a8d9d44a18ab59ab18ee445b962a9dd70272e5a8cc57ce055d1eec207a2ec4b16f7f047d15807db4dea41ddc51d56d92148d2b4709f5f65a MISC metadata.xml 715 BLAKE2B 4d0e3c4d2940ee439c3e65bd475421afe9e1eaecc0c3fcb8c543418e78af1c0ab6b0064aff27c95b1006e587a17a40bec6f5314f598cd271a9f456dbcf791b61 SHA512 6bb8ba00899f478cfbda4862f8c86edf272f68f4ce9a48c59297722068e53535805c18b5f5b839e3538e83fb6549ad835f5f900eb5ee4dd06612504a9831c0f9 diff --git a/www-servers/gunicorn/gunicorn-22.0.0.ebuild b/www-servers/gunicorn/gunicorn-22.0.0.ebuild deleted file mode 100644 index 6baafbdd6c42..000000000000 --- a/www-servers/gunicorn/gunicorn-22.0.0.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( pypy3 python3_{10..13} ) - -inherit distutils-r1 - -DESCRIPTION="A WSGI HTTP Server for UNIX" -HOMEPAGE=" - https://gunicorn.org/ - https://github.com/benoitc/gunicorn/ - https://pypi.org/project/gunicorn/ -" -SRC_URI=" - https://github.com/benoitc/gunicorn/archive/${PV}.tar.gz - -> ${P}.gh.tar.gz -" - -LICENSE="MIT PSF-2 doc? ( BSD )" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos" - -RDEPEND=" - dev-python/packaging[${PYTHON_USEDEP}] - dev-python/setproctitle[${PYTHON_USEDEP}] -" - -DOCS=( README.rst ) - -distutils_enable_sphinx 'docs/source' --no-autodoc -distutils_enable_tests pytest - -python_test() { - local EPYTEST_IGNORE=( - # removed deps - tests/workers/test_geventlet.py - tests/workers/test_ggevent.py - ) - - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - epytest -o addopts= -} - -python_install_all() { - use doc && local HTML_DOCS=( docs/source/_build/html/. ) - - distutils-r1_python_install_all -} diff --git a/www-servers/gunicorn/gunicorn-23.0.0.ebuild b/www-servers/gunicorn/gunicorn-23.0.0.ebuild index a19a8dcda301..981f6a578c70 100644 --- a/www-servers/gunicorn/gunicorn-23.0.0.ebuild +++ b/www-servers/gunicorn/gunicorn-23.0.0.ebuild @@ -21,7 +21,7 @@ SRC_URI=" LICENSE="MIT PSF-2 doc? ( BSD )" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos" RDEPEND=" dev-python/packaging[${PYTHON_USEDEP}] diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest index 21433ce6719a..3b5db0171981 100644 --- a/www-servers/lighttpd/Manifest +++ b/www-servers/lighttpd/Manifest @@ -17,9 +17,9 @@ DIST lighttpd-1.4.75.tar.xz 1102080 BLAKE2B 3cf89678922e319fa140beb56a95b11eb85c DIST lighttpd-1.4.75.tar.xz.asc 833 BLAKE2B c632a3ab7e97c981c0930129a430ee4b3776f34611831c7a8f484de4f2915be31f24df15ee517bcb0271c96c6217429333cbd67bc6f1a4c71936736246d8357c SHA512 791aab9bfb21c3c54b157e4348adbca83fae9186cc3ba27b9f0badc0af6bd74d2e70d6bb565317393b6dafb0e0b5da6e4442c77eac8d9ce597ccdb8b9176f3f9 DIST lighttpd-1.4.76.tar.xz 847132 BLAKE2B 497e2dd802718dac10fdcd49bc917f44ddc1eebd4fa244a047ffba2a0ac92d89900e6285f385126a29100a5fd024868908fd5028ac1b947ca648305199661976 SHA512 940f00f2d84e3424c389108d09756a0af41db3559474135b6c502deccd08ad051b5184f3f7907436384964d2b05045e27dca463af98c889cee69b0ae6e202782 DIST lighttpd-1.4.76.tar.xz.asc 833 BLAKE2B b46b3543e694c132d6e49ee239ef2d71718b5257cfc33506208b0b28bb318ffaf04fcf6282e3b54b08eedf4a3ef6da2ef2c4fd84da89316ce02d70b8f9f26faf SHA512 5a9bc460584479212ac2adddbc4dd5d4374cb08f703fdebd60471cee9c93f6cf4c7bf431a183d615aa9d1a25e237b8dd0f4f06e7249d6bb61a341565a29e2bb9 -EBUILD lighttpd-1.4.75-r1.ebuild 5331 BLAKE2B 9bbaf77c6ca099309104e54d3259d24e4c257bec824cea7130f9f928102b4b11cc19bbfb6545153d90fbd228281ec2966a0e0b9f8cfa32de1cd3ae39b7c7999c SHA512 f92527e7d305fa6c078df7ba90246e4a0c5abf83a23ad738d60aae39b6581a6339a301d2e47c6ef2ea0421907765dcdfaf939d7e920e196240a3d45d1a532555 -EBUILD lighttpd-1.4.75.ebuild 5687 BLAKE2B 64288bb588482ae52ee638ec3ef6518d95aeca22b72e0b47340195ff86690c8aedd54d1cff23dc6ce252a9b35f717219f8c192c4d0b499eef11be81eec788e6a SHA512 b05ba9c875e606b1941f47b7b153f6e22064351589ae5ea593b4e6d7d9b9f936da7c8cee9dc93472d2b0d0100b31eb1e08f195ca7309fc9c9cabb0f00cc4658c -EBUILD lighttpd-1.4.76-r1.ebuild 5644 BLAKE2B da13815c219e8b7dd45e68a9d4b0a298e703304a20ca09cdc90cb988458817bbeedab5c305d06c0e55c937646ef09c4e660da8390d101dd705b91c4133403a57 SHA512 a9d0e93c5b2ccf541a7ce6fa828b8f6a02c8d74ef221ae5e134a2e0bcd150469b5c6ba9dac66b952693c81b1a704fcce2fbceeb1658d77df74b896369dc72cf9 -EBUILD lighttpd-1.4.76.ebuild 5318 BLAKE2B 805189a9ca127c84cde20395d6313e99fd8c3866a27840d6aca9fecea9782069660e6570f460e13c5a4820a744b0accb143d30d370f557f7960d45c1b9199923 SHA512 3b31f769bfb03d15dac67dab0f1157cec52549471059c25ed646f5dc0ce916bb707ef36d668f2e042b6255097b0b1a33218f31fb6d25cb3068701be333b60132 -EBUILD lighttpd-9999.ebuild 5593 BLAKE2B 696097729f6dc5bb471d4a1bc82ed2fffdf179b7eb60784153ebc1664974896f2854d815822f9bd4e44751973a92b94697dfac5952971d84c2a445264fe2640e SHA512 72e7ed36ca5e68cdb9e516fe246f00c1d83122573ce81564ed11ddfd987b30f54363b5512d5561739a01b202e3357d0d2b66b40c919ed88ae685dd96574a0b7f +EBUILD lighttpd-1.4.75-r1.ebuild 5325 BLAKE2B 9167446b02e72498c194d3853ce4576566bc40d541ff0acba490326b76993dbfa136e26e77592e7bf7a40e08a8698e783b58322fe43098f8769901c4fa177f66 SHA512 d6acb2de3212874fa5a1f2a4fd7c87c2d6c984f868c6394bd83969d99bd5425adf370975cb67fc98403f9bc9ec0666398803167b6c7f8bc7b49a4afc708fc9a0 +EBUILD lighttpd-1.4.75.ebuild 5681 BLAKE2B 359928156aabf9c9d6e9a4523c8ceffd74e42e21c665de765ff874fb731d7d3291ef620f95f24c2e0568259e998a9c71a2f953a28c3cbfafbd414c2ae1da627f SHA512 62237f0b86407fbca48a3dca7ef7233b7f705cf95f9c96489b19dda884b654960f8ab07fa2710896dd50ba00b95695449fe01cbf7167d84558e9c57b6ccc744c +EBUILD lighttpd-1.4.76-r1.ebuild 5632 BLAKE2B 09d2812049702e3f5922ec03d75f7f3f8adf42650f86041e5ae0badc99bd8b10fb03b298699bd106ba1e4cfb271822f66395732f986a89bc224b5ba41ac1b909 SHA512 94eb9469e3799d799858fbbdaa3d1f2f0dcc9f353c848a71689ab9c990e6df083a390f9f9e1451308d535e128a0e21d3fae103b376b74089b98a2784926a73e9 +EBUILD lighttpd-1.4.76.ebuild 5312 BLAKE2B 9ab3d6b85ceae08d62e60d83bea178fffba0a78fd30b7643c7c4c54f55df9dbd6b9302f137e7ba926942471f8e005b24e958b542e90622716c04ca7f3fcb3e3d SHA512 86b5e7270758807c77804f9477c0ed5c1346bed7e260bcb5881903f34316e8dec95db07f2d51c84bbd71d0fbe61c6878cc6e3bf3aac8e39dcec03f797b026f87 +EBUILD lighttpd-9999.ebuild 5587 BLAKE2B 3f6720715f7ff53a51c06819ac9edc0b752deab5f46708c1f2ba093d47534d58c5c9e1f32941cb7d3e6ebe15766c02894ad5a66bf98d0cb72652b70a9a96846a SHA512 f78017ca399202c04fc4e4edbcca7bdc70ab5d8b9ef46f4b0d6182867b70af7051fa82cb93e2f76c65e10ac9cb31975ee2122ed8d24b0639d9550c2124a39ca2 MISC metadata.xml 1839 BLAKE2B 1d3bb5474c1bf9f16d84013bec3c0b43d2e2c5d44535e80b2a225bc64345155ba812d0ed9826f8f4072b9a9a113ede7ab5de05b0442bd8968fcad0916edba9fb SHA512 bb491fac80fd3e92b38f35fdd75e09ca6574819eba0d9fd8bed7256be603a113a3127d2ca32c42b9dc4e3a3359f55f62d44650768844cae374d7aa81432a7983 diff --git a/www-servers/lighttpd/lighttpd-1.4.75-r1.ebuild b/www-servers/lighttpd/lighttpd-1.4.75-r1.ebuild index 4ff76649b004..5026b7a768e0 100644 --- a/www-servers/lighttpd/lighttpd-1.4.75-r1.ebuild +++ b/www-servers/lighttpd/lighttpd-1.4.75-r1.ebuild @@ -16,7 +16,7 @@ SRC_URI=" LICENSE="BSD GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" IUSE="+brotli dbi gnutls kerberos ldap +lua maxminddb mbedtls +nettle nss +pcre php sasl selinux ssl test unwind webdav xattr +zlib zstd" RESTRICT="!test? ( test )" diff --git a/www-servers/lighttpd/lighttpd-1.4.75.ebuild b/www-servers/lighttpd/lighttpd-1.4.75.ebuild index 915cc143c8f8..0d53fc5ba126 100644 --- a/www-servers/lighttpd/lighttpd-1.4.75.ebuild +++ b/www-servers/lighttpd/lighttpd-1.4.75.ebuild @@ -16,7 +16,7 @@ SRC_URI=" LICENSE="BSD GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" IUSE="+brotli dbi gnutls kerberos ldap +lua maxminddb mbedtls +nettle nss +pcre php sasl selinux ssl test unwind webdav xattr +zlib zstd" RESTRICT="!test? ( test )" diff --git a/www-servers/lighttpd/lighttpd-1.4.76-r1.ebuild b/www-servers/lighttpd/lighttpd-1.4.76-r1.ebuild index c61fbf73771c..0b9a59cceedd 100644 --- a/www-servers/lighttpd/lighttpd-1.4.76-r1.ebuild +++ b/www-servers/lighttpd/lighttpd-1.4.76-r1.ebuild @@ -17,7 +17,7 @@ else https://download.lighttpd.net/lighttpd/releases-1.4.x/${P}.tar.xz verify-sig? ( https://download.lighttpd.net/lighttpd/releases-$(ver_cut 1-2).x/${P}.tar.xz.asc ) " - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" fi LICENSE="BSD GPL-2" diff --git a/www-servers/lighttpd/lighttpd-1.4.76.ebuild b/www-servers/lighttpd/lighttpd-1.4.76.ebuild index f34148cf6d04..6f7d22c3d234 100644 --- a/www-servers/lighttpd/lighttpd-1.4.76.ebuild +++ b/www-servers/lighttpd/lighttpd-1.4.76.ebuild @@ -16,7 +16,7 @@ SRC_URI=" LICENSE="BSD GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86" IUSE="+brotli dbi gnutls kerberos ldap +lua maxminddb mbedtls +nettle nss +pcre php sasl selinux ssl test unwind webdav xattr +zlib zstd" RESTRICT="!test? ( test )" diff --git a/www-servers/lighttpd/lighttpd-9999.ebuild b/www-servers/lighttpd/lighttpd-9999.ebuild index 5ee62d4b151a..6d7428614b30 100644 --- a/www-servers/lighttpd/lighttpd-9999.ebuild +++ b/www-servers/lighttpd/lighttpd-9999.ebuild @@ -17,7 +17,7 @@ else https://download.lighttpd.net/lighttpd/releases-1.4.x/${P}.tar.xz verify-sig? ( https://download.lighttpd.net/lighttpd/releases-$(ver_cut 1-2).x/${P}.tar.xz.asc ) " - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" fi LICENSE="BSD GPL-2" diff --git a/www-servers/monkeyd/Manifest b/www-servers/monkeyd/Manifest deleted file mode 100644 index e811311ee61e..000000000000 --- a/www-servers/monkeyd/Manifest +++ /dev/null @@ -1,9 +0,0 @@ -AUX monkeyd-1.6.8-system-mbedtls.patch 672 BLAKE2B e16fc9540e179e36381925905a9d45666289797d2d230a4387d531f730659248dd24dc8e778237bad82fa3636e11b027a047bd13e98f47bec5efc48ec44650b0 SHA512 e5eed5eb1d5810b56c94280419859bcb8f8d5d2277965ffc17e00c9074da282c2197ac4ed7e029a57264722f8e1df43cdc5aae4cbf7900e537c60802ad397647 -AUX monkeyd-1.6.9-fix-pidfile.patch 526 BLAKE2B 179782b8a81ad6881a6ef6616a33b922ebe4e699ac98a434ad6cdab5077c215df7322200af3580326d495dbec616e9eb4d07e4b17a23ae1a92efa03b663044a1 SHA512 73026d23723b95316f83ec7c9c49be014c3a52b86bf76cc5b4273ac4393f968d6123bff48afda6478b5d5409eb154d25eeb5f51fc20db53f4d679fdf3cbb35a2 -AUX monkeyd.confd 172 BLAKE2B 12259f30705d5f9e20971a4966056481636b5134951a850c1a468a0bfeb6cc2b874940ecb2617cbd1ab773234ed4138c93ee3f4ee6518a427648f5a21a5527a6 SHA512 8ca7312a80440e908ef8c6297870411f4978c56fe8ad09589d1bb56e9d545d086a53f07120d5cc14c6042a83755730ac6fc4839020a5159eb054eb34d3f264e7 -AUX monkeyd.initd 601 BLAKE2B 178c97cb2d8281a971c43ec78d5904238b180ad43ea47a7aaf272010fcceb9942a3b6b2089ea7b8244d265a1f4d241fb82b483073f75204356fd775769992625 SHA512 e356742c537b5bbc8d9696e5fdad0c08d93ace5085f8939fa50d97498ebe0d85712af5da675e76c642296856768081ee14d6f0d3d73a17ce4642cf46e9056a79 -AUX monkeyd.initd-r1 608 BLAKE2B c6ce981294e6e852d346166ba71493470f8ac3604cf597a35a8d38a0ab1fe4c808de018a94149832d0f647257cff42c189dbfc6ef9876a06a338c4cfdeb1c3ba SHA512 d1a30f0033d9f2a0957028a6873b71903d8051340ac272ccbaf12daba9a89bf0c2e476b8aa22a0e60697ffd10ab5c1d6a4aa0ff7b204f8b4adc76ebe91b8abaa -DIST monkey-1.6.9.tar.gz 1972040 BLAKE2B f1fe4791bfdba14905797e36563d76a7b551fb3f8bf4d387c598f6c19f58e7759044e4ad2664ac29a546ce76b210fa61285198c711751c7a47c124be507898a7 SHA512 3540a17fffe57a9d4b88b6243c634dcf6a27ed894ae2a0d5d42a4881221a9d59ae67d4c7fcf087535360d20ccdadab16947cf3a7dc6d4e864d487f598eb0ba62 -EBUILD monkeyd-1.6.9-r2.ebuild 3499 BLAKE2B 9e96f877fc3eba717af1ff1e42b7b195b6034d448a930729188a92e15438b4dcb6e0970edcac8df73a492bd92d9b1a6d2d1a9934f4ca1e7e72dfec94a704a57d SHA512 b7564de8bba31b45ff57995835242273145f31e78e7ab0b928d8daac94ec6fc8fdfa24715a95e913a970832e07dd393a41d600a60a1671f4b18065f650c3be69 -EBUILD monkeyd-9999.ebuild 3504 BLAKE2B 505d0e50077404895ba3c6d513e4758af78a4750a1d0c5e63f9947dde6fad423b45b376030358a51b1f41ee02a153939d399e869f253a0b8d75600d3d16bf2b8 SHA512 287bc45b353521beafe6b26ad3096c5e427c2354b5c268b8f0b70158ed836b3512af2f710b04c7f7ee0949e74c580b9f175f54db11a0b27139ba1be6c36820eb -MISC metadata.xml 310 BLAKE2B 29ddccb5f2c0d85d2af642d46b412432874ee65c5c4b1ab8b158cb1d7c0fd03e129a28559c8473be2c3a6e9c28d3eea296b0fc08390a26ba1276cc6350700e11 SHA512 7456de803c42949c9d4c95b8594aed57714a38f257154a32005304bb2939291a8fecc4fca8396392a63daeb892361bc033bd0afb8a97cc0ba96356cac17252d7 diff --git a/www-servers/monkeyd/files/monkeyd-1.6.8-system-mbedtls.patch b/www-servers/monkeyd/files/monkeyd-1.6.8-system-mbedtls.patch deleted file mode 100644 index 6b7ca5473ee0..000000000000 --- a/www-servers/monkeyd/files/monkeyd-1.6.8-system-mbedtls.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -Naur monkey-1.6.3.orig/plugins/tls/CMakeLists.txt monkey-1.6.3/plugins/tls/CMakeLists.txt ---- monkey-1.6.3.orig/plugins/tls/CMakeLists.txt 2015-10-13 13:23:34.000000000 -0400 -+++ monkey-1.6.3/plugins/tls/CMakeLists.txt 2015-10-14 21:28:27.941930485 -0400 -@@ -2,15 +2,6 @@ - tls.c - ) - --if(NOT WITH_MBEDTLS_SHARED) -- option(ENABLE_TESTING OFF) -- option(ENABLE_PROGRAMS OFF) -- option(INSTALL_MBEDTLS_HEADERS OFF) -- set(MK_MBEDTLS_SRC ../../deps/mbedtls-2.2.1) -- add_subdirectory(${MK_MBEDTLS_SRC} ${CMAKE_BINARY_DIR}/mbedtls-2.2.1) -- include_directories(${MK_MBEDTLS_SRC}/include) --endif() -- - MONKEY_PLUGIN(tls "${src}") - - MONKEY_PLUGIN_LINK_LIB(tls mbedtls) diff --git a/www-servers/monkeyd/files/monkeyd-1.6.9-fix-pidfile.patch b/www-servers/monkeyd/files/monkeyd-1.6.9-fix-pidfile.patch deleted file mode 100644 index 82550aef4d09..000000000000 --- a/www-servers/monkeyd/files/monkeyd-1.6.9-fix-pidfile.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur monkey-1.6.9.orig/CMakeLists.txt monkey-1.6.9/CMakeLists.txt ---- monkey-1.6.9.orig/CMakeLists.txt 2016-06-04 19:16:47.000000000 -0400 -+++ monkey-1.6.9/CMakeLists.txt 2016-07-01 13:08:51.237213196 -0400 -@@ -285,7 +285,7 @@ - - # Custom PIDPATH - if(NOT PID_PATH) -- set(MK_PATH_PIDPATH ${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/run/ CACHE STRING "Server PID path") -+ set(MK_PATH_PIDPATH /run/ CACHE STRING "Server PID path") - else() - set(MK_PATH_PIDPATH ${PID_PATH} CACHE STRING "Server PID path") - endif() diff --git a/www-servers/monkeyd/files/monkeyd.confd b/www-servers/monkeyd/files/monkeyd.confd deleted file mode 100644 index 818957c9792c..000000000000 --- a/www-servers/monkeyd/files/monkeyd.confd +++ /dev/null @@ -1,5 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# Add any additional command line arguments here -MONKEY_ARGS="" diff --git a/www-servers/monkeyd/files/monkeyd.initd b/www-servers/monkeyd/files/monkeyd.initd deleted file mode 100644 index c44975ddda24..000000000000 --- a/www-servers/monkeyd/files/monkeyd.initd +++ /dev/null @@ -1,25 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -DAEMON="/usr/bin/monkey" -CONFFILE="/etc/monkeyd/monkey.conf" - -depend() { - use net -} - -start() { - ebegin "Starting monkeyd" - start-stop-daemon --start --exec "${DAEMON}" -- "-D" "${MONKEY_ARGS}" >/dev/null - eend $? -} - -stop() { - ebegin "Stopping monkeyd" - local PORT=$(awk '/^ *Port/ { print $2 }' "${CONFFILE}") - local PIDFILE=$(awk '/^ *PidFile/ { print $2 }' "${CONFFILE}") - PIDFILE="${PIDFILE}"."${PORT}" - start-stop-daemon --stop --quiet --pidfile "${PIDFILE}" - eend $? -} diff --git a/www-servers/monkeyd/files/monkeyd.initd-r1 b/www-servers/monkeyd/files/monkeyd.initd-r1 deleted file mode 100644 index 6ec67e11435c..000000000000 --- a/www-servers/monkeyd/files/monkeyd.initd-r1 +++ /dev/null @@ -1,25 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -DAEMON="/usr/sbin/monkey" -CONFFILE="/etc/monkeyd/monkey.conf" - -depend() { - use net -} - -start() { - ebegin "Starting monkeyd" - local PIDFILE=$(awk '/^ *PidFile/ { print $2 }' "${CONFFILE}") - mkdir -p $(dirname ${PIDFILE}) - start-stop-daemon --start --exec "${DAEMON}" -- "-D" "${MONKEY_ARGS}" >/dev/null - eend $? -} - -stop() { - ebegin "Stopping monkeyd" - local PIDFILE=$(awk '/^ *PidFile/ { print $2 }' "${CONFFILE}") - start-stop-daemon --stop --quiet --pidfile "${PIDFILE}" - eend $? -} diff --git a/www-servers/monkeyd/metadata.xml b/www-servers/monkeyd/metadata.xml deleted file mode 100644 index 56d90feb80b4..000000000000 --- a/www-servers/monkeyd/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!-- maintainer-needed --> - <use> - <flag name="debug">Enable lots of debugging info</flag> - <flag name="static-plugins">Build statically linked plugins</flag> - </use> -</pkgmetadata> diff --git a/www-servers/monkeyd/monkeyd-1.6.9-r2.ebuild b/www-servers/monkeyd/monkeyd-1.6.9-r2.ebuild deleted file mode 100644 index 1d194afb20c4..000000000000 --- a/www-servers/monkeyd/monkeyd-1.6.9-r2.ebuild +++ /dev/null @@ -1,136 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic multilib toolchain-funcs - -DESCRIPTION="A small, fast, and scalable web server" -HOMEPAGE="http://www.monkey-project.com/" -MY_P="${PN/d}-${PV}" -if [[ ${PV} == *9999* ]] ; then - EGIT_REPO_URI="https://github.com/monkey/monkey.git" - inherit git-r3 -else - SRC_URI="http://monkey-project.com/releases/${PV:0:3}/${MY_P}.tar.gz" - KEYWORDS="amd64 arm ~mips ppc ppc64 x86" -fi - -LICENSE="GPL-2" -SLOT="0" - -# jemalloc is also off until we figure out how to work CMakeLists.txt magic. -#IUSE="cgi debug fastcgi jemalloc php static-plugins ${PLUGINS}" - -PLUGINS="monkeyd_plugins_auth monkeyd_plugins_cheetah monkeyd_plugins_dirlisting +monkeyd_plugins_liana monkeyd_plugins_logger monkeyd_plugins_mandril monkeyd_plugins_tls" -IUSE="cgi debug fastcgi php static-plugins ${PLUGINS}" - -REQUIRED_USE=" - monkeyd_plugins_tls? ( !static-plugins ) - cgi? ( php )" - -#DEPEND="jemalloc? ( >=dev-libs/jemalloc-3.3.1 )" -DEPEND=" - dev-build/cmake - monkeyd_plugins_tls? ( net-libs/mbedtls:= )" -RDEPEND=" - acct-group/monkeyd - acct-user/monkeyd - php? ( dev-lang/php ) - cgi? ( dev-lang/php[cgi] )" - -S="${WORKDIR}/${MY_P}" - -WEBROOT="/var/www/localhost" - -pkg_setup() { - if use debug; then - ewarn - ewarn "\033[1;33m**************************************************\033[00m" - ewarn "Do not use debug in production!" - ewarn "\033[1;33m**************************************************\033[00m" - ewarn - fi -} - -src_prepare() { - # Unconditionally get rid of the bundled jemalloc - rm -rf "${S}"/deps - eapply "${FILESDIR}"/${PN}-1.6.9-fix-pidfile.patch - eapply "${FILESDIR}"/${PN}-1.6.8-system-mbedtls.patch - eapply_user -} - -src_configure() { - append-cflags -fcommon - local myconf="" - - use elibc_musl && myconf+=" --musl-mode" - - #use jemalloc || myconf+=" --malloc-libc" - myconf+=" --malloc-libc" - - if use debug; then - myconf+=" --debug --trace" - else - myconf+=" --no-backtrace" - fi - - local enable_plugins="" - local disable_plugins="" - # We use 'cgi' and 'fastcgi' because they are global flags - # instead of the corresponding monkeyd_plugins_* - use cgi && enable_plugins+="cgi," || disable_plugins+="cgi," - use fastcgi && enable_plugins+="fastcgi," || disable_plugins+="fastcgi," - # For the rest, we scan the monkeyd_plugins_* and parse out the plugin name. - local p - for p in ${PLUGINS}; do - pp=${p/+/} - cp=${pp/monkeyd_plugins_/} - use $pp && enable_plugins+="${cp}," || disable_plugins+="${cp}," - done - myconf+=" --enable-plugins=${enable_plugins%,} --disable-plugins=${disable_plugins%,}" - if use static-plugins; then - myconf+=" --static-plugins=${enable_plugins%,}" - fi - - # Non-autotools configure - ./configure \ - --pthread-tls \ - --prefix=/usr \ - --default-user=monkeyd \ - --sbindir=/usr/sbin \ - --webroot=${WEBROOT}/htdocs \ - --logdir=/var/log/monkeyd \ - --mandir=/usr/share/man \ - --libdir=/usr/$(get_libdir) \ - --sysconfdir=/etc/monkeyd \ - ${myconf} \ - || die -} - -src_compile() { - emake VERBOSE=1 -} - -src_install() { - default - - newinitd "${FILESDIR}"/monkeyd.initd-r1 monkeyd - newconfd "${FILESDIR}"/monkeyd.confd monkeyd - - # Move htdocs to docdir, bug #429632 - docompress -x /usr/share/doc/"${PF}"/htdocs.dist - mv "${D}"${WEBROOT}/htdocs \ - "${D}"/usr/share/doc/"${PF}"/htdocs.dist || die - - keepdir /var/log/monkeyd ${WEBROOT}/htdocs - - # This needs to be created at runtime - rm -rf "${D}"/run -} - -pkg_postinst() { - chown monkeyd:monkeyd /var/log/monkeyd - chmod 770 /var/log/monkeyd -} diff --git a/www-servers/monkeyd/monkeyd-9999.ebuild b/www-servers/monkeyd/monkeyd-9999.ebuild deleted file mode 100644 index 09c054059b22..000000000000 --- a/www-servers/monkeyd/monkeyd-9999.ebuild +++ /dev/null @@ -1,136 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic multilib toolchain-funcs - -DESCRIPTION="A small, fast, and scalable web server" -HOMEPAGE="http://www.monkey-project.com/" -MY_P="${PN/d}-${PV}" -if [[ ${PV} == *9999* ]] ; then - EGIT_REPO_URI="https://github.com/monkey/monkey.git" - inherit git-r3 -else - SRC_URI="http://monkey-project.com/releases/${PV:0:3}/${MY_P}.tar.gz" - KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86" -fi - -LICENSE="GPL-2" -SLOT="0" - -# jemalloc is also off until we figure out how to work CMakeLists.txt magic. -#IUSE="cgi debug fastcgi jemalloc php static-plugins ${PLUGINS}" - -PLUGINS="monkeyd_plugins_auth monkeyd_plugins_cheetah monkeyd_plugins_dirlisting +monkeyd_plugins_liana monkeyd_plugins_logger monkeyd_plugins_mandril monkeyd_plugins_tls" -IUSE="cgi debug fastcgi php static-plugins ${PLUGINS}" - -REQUIRED_USE=" - monkeyd_plugins_tls? ( !static-plugins ) - cgi? ( php )" - -#DEPEND="jemalloc? ( >=dev-libs/jemalloc-3.3.1 )" -DEPEND=" - dev-build/cmake - monkeyd_plugins_tls? ( net-libs/mbedtls:= )" -RDEPEND=" - acct-group/monkeyd - acct-user/monkeyd - php? ( dev-lang/php ) - cgi? ( dev-lang/php[cgi] )" - -S="${WORKDIR}/${MY_P}" - -WEBROOT="/var/www/localhost" - -pkg_setup() { - if use debug; then - ewarn - ewarn "\033[1;33m**************************************************\033[00m" - ewarn "Do not use debug in production!" - ewarn "\033[1;33m**************************************************\033[00m" - ewarn - fi -} - -src_prepare() { - # Unconditionally get rid of the bundled jemalloc - rm -rf "${S}"/deps - eapply "${FILESDIR}"/${PN}-1.6.9-fix-pidfile.patch - eapply "${FILESDIR}"/${PN}-1.6.8-system-mbedtls.patch - eapply_user -} - -src_configure() { - append-cflags -fcommon - local myconf="" - - use elibc_musl && myconf+=" --musl-mode" - - #use jemalloc || myconf+=" --malloc-libc" - myconf+=" --malloc-libc" - - if use debug; then - myconf+=" --debug --trace" - else - myconf+=" --no-backtrace" - fi - - local enable_plugins="" - local disable_plugins="" - # We use 'cgi' and 'fastcgi' because they are global flags - # instead of the corresponding monkeyd_plugins_* - use cgi && enable_plugins+="cgi," || disable_plugins+="cgi," - use fastcgi && enable_plugins+="fastcgi," || disable_plugins+="fastcgi," - # For the rest, we scan the monkeyd_plugins_* and parse out the plugin name. - local p - for p in ${PLUGINS}; do - pp=${p/+/} - cp=${pp/monkeyd_plugins_/} - use $pp && enable_plugins+="${cp}," || disable_plugins+="${cp}," - done - myconf+=" --enable-plugins=${enable_plugins%,} --disable-plugins=${disable_plugins%,}" - if use static-plugins; then - myconf+=" --static-plugins=${enable_plugins%,}" - fi - - # Non-autotools configure - ./configure \ - --pthread-tls \ - --prefix=/usr \ - --default-user=monkeyd \ - --sbindir=/usr/sbin \ - --webroot=${WEBROOT}/htdocs \ - --logdir=/var/log/monkeyd \ - --mandir=/usr/share/man \ - --libdir=/usr/$(get_libdir) \ - --sysconfdir=/etc/monkeyd \ - ${myconf} \ - || die -} - -src_compile() { - emake VERBOSE=1 -} - -src_install() { - default - - newinitd "${FILESDIR}"/monkeyd.initd-r1 monkeyd - newconfd "${FILESDIR}"/monkeyd.confd monkeyd - - # Move htdocs to docdir, bug #429632 - docompress -x /usr/share/doc/"${PF}"/htdocs.dist - mv "${D}"${WEBROOT}/htdocs \ - "${D}"/usr/share/doc/"${PF}"/htdocs.dist || die - - keepdir /var/log/monkeyd ${WEBROOT}/htdocs - - # This needs to be created at runtime - rm -rf "${D}"/run -} - -pkg_postinst() { - chown monkeyd:monkeyd /var/log/monkeyd - chmod 770 /var/log/monkeyd -} diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest index 6152a5178403..e24739bdbb0e 100644 --- a/www-servers/nginx/Manifest +++ b/www-servers/nginx/Manifest @@ -1,5 +1,6 @@ AUX http_brotli-detect-brotli-r3.patch 745 BLAKE2B 1442822f9b16362c04354f29f45ee4e7605e0f74ac09092161b9e69a1c3b42f024d12cb64cc5bb0e417200dc963a531110f82b003d54690138b7df35e019e9e3 SHA512 a287636c07335b48303585d906adb87cf9094133c16c238074826aebb19347428bb15ac4ebc77040142c509f8a87c9fbca9783e2f5c10399ef63341fbc22e881 AUX http_cache_purge-1.11.6+.patch 615 BLAKE2B 520a437290dbed718f392bedecdb66c9eae3440c2e5977bede5829f8420905e60c74fac3dad7b22c12d2070ce47430795482d270222ba8d4640af415e4974210 SHA512 a3f45d8121d89a5c41783306577e146990404ff0e3691454e99cd6270ab02dfc7fd8718b3781666373ea6784ed2c06cec0b40315486a6a138185ca1548c04b60 +AUX http_security-nginx-1.26.2.patch 660 BLAKE2B 9982cea97e9e8f387fe3336bdf115a4ffddd94a56ec0687bc5dff07dbccdbed8e1fb5846976b17258a62d03c6c211647c99f20fa7c0920f4d9573e07bc3c21db SHA512 3fe0e84182709adf458e556a2b063c147e2f9722e8b0795dd680693bcb3e393ca4e23eb306517e152b4cd48473d01254fff3b2bb86061c96fdd4526643c29da7 AUX http_sticky-nginx-1.23.0.patch 1101 BLAKE2B 0a5f0bc5fb7987e1da13f39b6c2c7fcbc21452ddea510fb7aeb4933bfe7c94cc10c8b714c8de135b14d212a0532e39beebbad0105e2d140e12ecc608b1996156 SHA512 3066e9aec3a3073acd8ef8e1d3bf9abc33b4f0d9232573bb83417b838a42f04195b82337b569f7f808c7c0b94a6fd53371882aa805576de5989d359b21872396 AUX http_uploadprogress-nginx-1.23.0.patch 2680 BLAKE2B 872a386964dd1fa3a8c09d69231b546ba497d85f1b270fbb015ec4835c0c7ca9e7b3018d0a7674b4bd8aa76b558327439cdffc1912c74a8c3d91b2334bb0a61d SHA512 2899636d730583c0eaa21e89d50ccb7a888e7f27fa194102909e42fb28cb8e239416978f55bed0a9115b65d0ac718cb7da8c1fa589eb79e9f66eea41dfc3458b AUX http_upstream_check-nginx-1.11.5+.patch 8557 BLAKE2B b1f21fa56e94d92b30d4b84353066039728b0935e2a243367e4e883afead2d4c728c9b7e7b5b5e8714b80a3af72059a36f8207af3641c22a43324c0e7f2b2f9b SHA512 9b377defaa9ddb78fee3f37e054c7b16258fd380b4093d6d61bc45fdc42cb45ee5246901cddd230dc1765838fabbd71d558b5b1d12d9829615b3501da4f3824a @@ -40,6 +41,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.5.tar.gz 844437 BLAKE2B 3f8a601370fbe2bfbe0e1748f71b1793985fd2736f4b94a65ec564d5ac4a653faf28a86469cef36bc312ff53287ea4afd43edda503e36c8797947827a902a10d SHA512 09fb37d609f5cb97b0af5eb097a017233af2eacb2d38071346b49f5e03b5e37280eebb360fc824acba0c600c44d234e2d11fa55f4bc913319491d7789a94171c -EBUILD nginx-1.26.2.ebuild 42406 BLAKE2B f8f6af452c75f9a0882c781ee7ad74406f78164344fb2fb40e06cb943ac5f5ec5c0c250fe57638d7ff6ee1ecf4a9ad994fa7d2008af5894d4687d8aba9b4e247 SHA512 01a82316508bedace6de234eb8d6cde18deeb42f58c91a380e7c4f84fbbdcafb7885e7817dede485eaab70af8f66e6c1c540e598d57aacc50a4e4fa799838f38 -EBUILD nginx-1.27.1.ebuild 42410 BLAKE2B 9e2c75d0ec90ce7d936cf5a7045b7aac4927f6cef4bb1fc5a9236e3af604399b03de18f309e60d90c9af02dee885543844df2055df7d2c2d7b5813057261a429 SHA512 21c7c3e08bb04c9451f8cf091a061ba630ce8c4ab1e325a929b4ff8c9d726e37dc87dfa9cc9e5f28049376cb500c8cb0215f3169a96cf7195aa349e831517eaa +EBUILD nginx-1.26.2-r2.ebuild 42544 BLAKE2B d6a7d6b9c6a00e57a18d62fcad5d21887a4a1c6fe56d845810d7b70e0b8ff9d9a3dd6347fd6d8d28c11dde9a70c90e0c9cde8704ce1f0cdfbaddf7599abf0438 SHA512 adbf1dc5d6692b4209e3f93bcc35e359e0dae177e2070d132c999861420b1fd311ed49d4476ba0afb9c44e6f2d07bb1810ad8555e8b7a6ead4d13acb26f88e16 +EBUILD nginx-1.27.1-r2.ebuild 42548 BLAKE2B 4ddd13f53de8331ca6da4ade4f135401db96a958b586d652d3b2a5d62a7748e0ba50347f77fab1b6480f6bc536337edb5ec687a7ca1cace1697e5d48fee0cf4d SHA512 c6a8553605b2de08c45bde8b2096fcf43786f1312d42fff6159d9eb2c184ed2ddc1a89b7da060d4b853d69aac041d71f4838c5db62a2b5649b7499e686109c06 MISC metadata.xml 1189 BLAKE2B 9e65f404d2be335d14ffb087be60847a2508de79baae7ee0e3bd7021dbfbbc1f18b93ed758d107ef3a9738ab32889f106a5eb8232f8f4190d57c175eed60ddd5 SHA512 8077d4da43250c5cc783451682047460b093cf1e751e0b0d75a21bb42baf83fd31b1bb3a574ed6e7ab89286afb331c23915c676ed80c7b4cc5fd9f84a40da893 diff --git a/www-servers/nginx/files/http_security-nginx-1.26.2.patch b/www-servers/nginx/files/http_security-nginx-1.26.2.patch new file mode 100644 index 000000000000..26e3ea6046f0 --- /dev/null +++ b/www-servers/nginx/files/http_security-nginx-1.26.2.patch @@ -0,0 +1,26 @@ +From 7d37ace7431ea9704faa98f29876bcd72ef4b1ff Mon Sep 17 00:00:00 2001 +From: Ervin Hegedus <airween@gmail.com> +Date: Tue, 23 Apr 2024 21:42:02 +0200 +Subject: [PATCH] fix: Added missing header for conftest + +--- + config | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/config b/config +index c6e7467..3bf06a8 100644 +--- a/config ++++ b/config +@@ -10,7 +10,8 @@ + + ngx_feature_name= + ngx_feature_run=no +-ngx_feature_incs="#include <modsecurity/modsecurity.h>" ++ngx_feature_incs="#include <modsecurity/modsecurity.h> ++#include <stdio.h>" + ngx_feature_libs="-lmodsecurity" + ngx_feature_test='printf("hello");' + ngx_modsecurity_opt_I= +-- +2.26.2 + diff --git a/www-servers/nginx/nginx-1.26.2.ebuild b/www-servers/nginx/nginx-1.26.2-r2.ebuild index 14ac4f2e9864..fe6db3b44206 100644 --- a/www-servers/nginx/nginx-1.26.2.ebuild +++ b/www-servers/nginx/nginx-1.26.2-r2.ebuild @@ -459,6 +459,12 @@ src_prepare() { cd "${S}" || die fi + if use nginx_modules_http_security ; then + cd "${HTTP_SECURITY_MODULE_WD}" || die + eapply "${FILESDIR}/http_security-nginx-1.26.2.patch" + cd "${S}" || die + fi + find auto/ -type f -print0 | xargs -0 sed -i 's:\&\& make:\&\& \\$(MAKE):' || die # We have config protection, don't rename etc files sed -i 's:.default::' auto/install || die @@ -632,7 +638,6 @@ src_configure() { if use nginx_modules_http_vod; then http_enabled=1 - export HTTP_POSTPONE=no myconf+=( --add-module=${HTTP_VOD_MODULE_WD} ) fi diff --git a/www-servers/nginx/nginx-1.27.1.ebuild b/www-servers/nginx/nginx-1.27.1-r2.ebuild index 749ba9ff4572..bfc1a4a791b6 100644 --- a/www-servers/nginx/nginx-1.27.1.ebuild +++ b/www-servers/nginx/nginx-1.27.1-r2.ebuild @@ -459,6 +459,12 @@ src_prepare() { cd "${S}" || die fi + if use nginx_modules_http_security ; then + cd "${HTTP_SECURITY_MODULE_WD}" || die + eapply "${FILESDIR}/http_security-nginx-1.26.2.patch" + cd "${S}" || die + fi + find auto/ -type f -print0 | xargs -0 sed -i 's:\&\& make:\&\& \\$(MAKE):' || die # We have config protection, don't rename etc files sed -i 's:.default::' auto/install || die @@ -632,7 +638,6 @@ src_configure() { if use nginx_modules_http_vod; then http_enabled=1 - export HTTP_POSTPONE=no myconf+=( --add-module=${HTTP_VOD_MODULE_WD} ) fi diff --git a/www-servers/spawn-fcgi/Manifest b/www-servers/spawn-fcgi/Manifest index eda70e106d52..813c1d2fe095 100644 --- a/www-servers/spawn-fcgi/Manifest +++ b/www-servers/spawn-fcgi/Manifest @@ -2,6 +2,6 @@ AUX spawn-fcgi.confd 2238 BLAKE2B 0364383f12b79728830556244485b991f5bf5f7f4595e5 AUX spawn-fcgi.initd-r3 3048 BLAKE2B 5b501069acfe3a535f1d73cbb706d05de50ea8562e09a49209da551dc5ba9626ddc0093b76139d4291ce8ac4c3e329be0bbf494c41c6ec137a182b8b35c3c891 SHA512 6c983f9d741f508d12b728d24dc5b57396cbd2272ae71c7127ba95aef70bd1a90b68d2b15e3481dfdbcfa723ca73a92deea61baae64051a83cec0b583c7da1e1 DIST spawn-fcgi-1.6.4.tar.xz 79944 BLAKE2B 06fb92261042fe6bccda1a472a712a7c9bc7f56ee04b72f31ee133079f6c1d07ca07ef6c1b7c878db2e32861ea20914998411a3f6b596e4ba950f8767a899346 SHA512 e2b317997b56f852ad644b80fe36fa08376ae81f93566e181c31a3b6764de2eeb32a2e10e420136d8536487c575678ca52a33f7cb3488aadf7185fbd0196bee0 DIST spawn-fcgi-1.6.5.tar.xz 79968 BLAKE2B 04e8d94e1b8428f4482c4b557c3ba455ff2649ba46e37c55812dba7dccd99a8aa94f04060ba6ea249aa10fe5ca0a3c1b1f995828750cd9a1b0ec0d1f669c5312 SHA512 a6dc2a977953e1092c0b6808b134dfda77869a5c86801d04cfe9e00ee1dcd528d4e2c3adc906f6b6130d6f2cdafd436ba550197701c8b27bbc5a8419e02d269c -EBUILD spawn-fcgi-1.6.4-r1.ebuild 745 BLAKE2B a197ac01cf74e0e4e0bdfba3290b2cecca983500f14f3a54fa390c0f85e43ed7289c28966ffa9b02249991055eab263a40e2de5dd0f368604e2e38c05582d98b SHA512 3f8905a4c12abbdae8850d78f33847849122007244f5e4b60af91181449cef64ff7d0b629baf3442ecf12adfa3738f778c25bf444f9be039bc1c4d15f478ce9c -EBUILD spawn-fcgi-1.6.5.ebuild 632 BLAKE2B bf979d3b05f41e9ee86d8850997ef9abda655d2adb9228d3d1e1b847d2823ce217ec445cb42fbf57d3dcfe1d67b78d4fb6d0939c201407af866642ce62ad8de3 SHA512 d5fd50df976578899760b5ff0a8c1062355bec127cc07165b9d7746753aafd5161827c9dc482de877d580d28f93df17493b8d8791d719e9e700f8a08a72ddf08 +EBUILD spawn-fcgi-1.6.4-r1.ebuild 739 BLAKE2B 0d4100feb0c197ebfcb5162fc581f52b358bf910a7c3e5d707197d9e64a2457566e42a62eb984eae55eea145c6fe906631a37dab165184c59b32b766763075bf SHA512 198c2e978ce82df448ab5216527e5c09ab6f3d69814ced9ebbd74badae33833cfbd59fedbe88a8794e85caf196ca304f72527e424d97485b8618bd85eede535c +EBUILD spawn-fcgi-1.6.5.ebuild 626 BLAKE2B 5d8362d3de8ec6ad9b798aa664a20761bcaea2a6f39ebd4e27bfbff439ca837c467cd562b99fc5f2d3cacdfdcdda8c46736fcf38d7e607be9f90efb6d70d3c6e SHA512 aea1005fe618531a37f04ba8dabe08a73d009f31f7c9d7f52ee2862a15efb9e1a1d8c87f883112330a2d14a293ef6b08678bd1a4cfcf17c96681fd34cdc11423 MISC metadata.xml 776 BLAKE2B 4ae0db2a037887c0602ad07f1bae922f124c7f094759e08c13ad253b11fd99162e32dc4907eb943a8f980e2c435682c244e718c1d12b9830b8a4a7d3b773d8d3 SHA512 8d27ea3e0e8a6a4cc6f0e9b4339f0af5e2868158f516055f49320a1fd839e95c110802c93f2821f935246368c30241d9287a8167fe19696e9cf9089650552f9c diff --git a/www-servers/spawn-fcgi/spawn-fcgi-1.6.4-r1.ebuild b/www-servers/spawn-fcgi/spawn-fcgi-1.6.4-r1.ebuild index 5f3d809ddd91..61a741b629db 100644 --- a/www-servers/spawn-fcgi/spawn-fcgi-1.6.4-r1.ebuild +++ b/www-servers/spawn-fcgi/spawn-fcgi-1.6.4-r1.ebuild @@ -9,7 +9,7 @@ SRC_URI="https://www.lighttpd.net/download/${P}.tar.xz" LICENSE="BSD GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86" +KEYWORDS="~alpha amd64 arm ~hppa ppc ppc64 sparc x86" IUSE="ipv6" DEPEND="" diff --git a/www-servers/spawn-fcgi/spawn-fcgi-1.6.5.ebuild b/www-servers/spawn-fcgi/spawn-fcgi-1.6.5.ebuild index d06983b62dd2..ab0022ce1c16 100644 --- a/www-servers/spawn-fcgi/spawn-fcgi-1.6.5.ebuild +++ b/www-servers/spawn-fcgi/spawn-fcgi-1.6.5.ebuild @@ -9,7 +9,7 @@ SRC_URI="https://download.lighttpd.net/spawn-fcgi/releases-1.6.x/${P}.tar.xz" LICENSE="BSD GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86" src_install() { default diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest index ba5fade7508a..2c267eb6c290 100644 --- a/www-servers/tomcat/Manifest +++ b/www-servers/tomcat/Manifest @@ -5,22 +5,16 @@ AUX tomcat-9.0.87-gentoo-bnd.patch 1432 BLAKE2B 07964d271be70afe13116c9ce27c956a AUX tomcat-instance-manager-r2.bash 6999 BLAKE2B f1c771678bd8b894ecf242d5a8fb22f5b2f0f33445a1ff158c242b5154edc4483a5707ce33a5dcee53a3106e631ad8218243d8b72a32a10cd99e9646fa54085d SHA512 c30c156cbf2b53cf8498288bacaedd48872dce52f461ff32071310b438bdb5015c1cd1d512a2905c4db01e2b22342590e1b8aeadbd44f29062606fabbb2f2fed AUX tomcat-r1.init 3200 BLAKE2B eb913d32bb8c1883e58551a25ff9516337d947c6fd2c7b449601a89a4518286d61dbca76417265289782a7a08540d8e78a3ea1cd1427d43d87e24813261c0fee SHA512 3d32e2ad998adfbaea5fe0ffcbbe6659dcb530a110faed5f2712ae2fd767353b1fc3f1ac83a24d43138c1bfc55949e645833a428ab982be14415887fc46d9fab AUX tomcat.conf 1811 BLAKE2B a92606e113172c6f0f73e18ab8ad8796f38bd8c741bb2fd1f6c43d7682728729d0198d4150e42282c7e732750231b7cdbfb51de9b24f2ba780a22700965113c5 SHA512 0747dd2fdad6c68123425adce39f625d34924ae3e7c9d5a00361565a593047d7a4d01dee64c1ef831e5ad79b51750babaf642b0588d4b5948bbed441d53d654d -DIST apache-tomcat-10.1.25-src.tar.gz 6231246 BLAKE2B bcd216e7c19e521f1514206a0a288a3beb425399c6e0711ba33a20170610d7d743ac106e5cf5c761e921b1acdccf12a32f1a2ec42601818a32087d027a243c6f SHA512 404d1d4906f458d7de0af57283cbd4cdb4be8ffc65176df5b954f946fecacb3b7f714d4e62bb644028ca6160334a43448c665c46a60c8eb585e64c5d6e4195a8 -DIST apache-tomcat-10.1.25-src.tar.gz.asc 873 BLAKE2B 630f45765ce32281e1ee856c7bb6db6d108d1581ac996e1106b3ef6cff51b118869b816b2ea7d3f3de67de451a4bb755fb4c3571dcef4b5380b6ab6378e6595b SHA512 df98514e8da6a215b40785e6398548f8f7b992a36fae66e6a5a1f8563060c9d143436178e98a0c6ab8aed7cfb19ebce5ffa72af8508db1154d24ae290d2b156d -DIST apache-tomcat-10.1.26-src.tar.gz 6321715 BLAKE2B 80dcb58c5cd917653551779d82cd86a976a9817658aa4627b55f9af0d2ff39a2ec4a99f991c72c53bf4108ae4d692dc300b1f4ddf83713d8f7704099950defed SHA512 c5f5ee1bc5132f24118c3435edb1e2bf4fe01e77c891f599c10022e085ba0e0762b410ac268959c7cf8a72e21396cda8f33e914462253396ed3bb70ce45cbc33 -DIST apache-tomcat-10.1.26-src.tar.gz.asc 833 BLAKE2B f95270ad58918c859281613f8544afaf7566e8bbf1ebde669385b32223a41ca4858114da156fbadfe34cbfb02698f2e8171ca562f9e356cb50a1002059cb5da2 SHA512 cea31b0e9fe996044a7a41a327d22f75cf7ea02b94d390fc319fc6d7f61dbb9baab050b370e092fa13e339522c78a9064f25d5b9d805c5a15ef9b7aa2053b6fc DIST apache-tomcat-10.1.28-src.tar.gz 6330343 BLAKE2B 0472035a9577683c7efa6a2ada4cf97c031a4df7c1678185b56da4dcb66d50516b72769aaeac6cfa8831097044b408b9fcab9c4b47fc7a21a86acf5c5cd83568 SHA512 fd69a7068fdfb89ceb2e71f64c7a9c17c54a4ebe65d7ea9936df266630073c6fb7412903a028fce4c465b1f46abb15d13c46fb408668dd937fa7f6bba4a75df6 DIST apache-tomcat-10.1.28-src.tar.gz.asc 833 BLAKE2B ae94b9f7d3b413e6209215edbf5453e5f90acd975d30a036797a628981560363af2d5da88f82af7114f2032157177151bb25d8cc046c032129bb22ae95e716c2 SHA512 a7ed73b51f78b2bb1461f28ed4b12516b77a5c65c3484269a8c889f111df14e81901cfda17831ba1b964b1d0acf717ae48386eea733255ad12df9e2b46ae2806 -DIST apache-tomcat-9.0.90-src.tar.gz 6311070 BLAKE2B 0e585a798f3bc476e826296a4fb77fde479dd88be7ea4c7f94982714a16ffca7b57ffa4cb527322192631a4eb617c6a3a19d338e592e9642c7e771cc77f7d9a7 SHA512 ade9eda20fe137080eb4fb43a36e510025822acabaf5564a950d24eded491e3f8846dff6ab6382716cd2f3aa676e4f134d28d7c1fa5f9d89230aa600d18071cb -DIST apache-tomcat-9.0.90-src.tar.gz.asc 833 BLAKE2B d8c145bc9d13f79dfe3515a0dad0d389803a1e4353a0d4a164d8837fc037319b04d632db7b4c3aca55e493b9e0e1e0267d5d34f22c3bede143937c0702721d08 SHA512 74ed315b748be390e7a74705a209316625a811d163d0ed1149d58f93c02558953023836422fffbfe9b9bb68036563ad7e764d07dd65fe531fd361dda5ce8192c -DIST apache-tomcat-9.0.91-src.tar.gz 6325998 BLAKE2B 2ef19aec14df363904a302ff4d8e6a2de17caa056d25bf418031fc018e75b71ad9cf5694706d0152a9147a30a9376f89f776fdc90a67452f03da78814f3e2ea3 SHA512 43e09871b76f63416d8ac9d4594752dba5f8335e34bceb0ef0b210f47314e922e95e0e6a2939ac4807d60d2fb5b81f03079590644fc2a9fa5d51cccfd3813ab4 -DIST apache-tomcat-9.0.91-src.tar.gz.asc 833 BLAKE2B a6d0fbb5fe929ce9badd9d4322a9018f844909bc3707593c496a6412b9240e0b034d638b555ac0e52a73504a4911477d2d4b1eda1f9ca3ffe2f201e52015e9f5 SHA512 88c294cce8168e444bc15c8b995a1c56458a952c73f94ceaeb66445b23e5b8116423f187ab65e358d0cc939b3575cd2a444adf9d59dc704b62f4a85e9970303b +DIST apache-tomcat-10.1.29-src.tar.gz 6321636 BLAKE2B 5d3bee8eeb8748edfaebd51f70025de85abeb42bcc1748f7b3cbef5bed4e6fde20f49439ff573f36e605ef307e4062a1d9243e7b1cb375ad8f67bfb947b99c30 SHA512 11dbbc2420043a71cf1a174e0066bf3fb6d0df07e87fa5a76769b899af357ed1065b379986e122a6c63d1cdd9890e793a18c6a31793b6f2707950398d0ebada2 +DIST apache-tomcat-10.1.29-src.tar.gz.asc 833 BLAKE2B 638afbd5cbf35040388a712e5369e546da361e4b43983204a4b5e1341e6665b558d288c067bdd916411d42724482078340eeef03a1ebf35115d3e998ebb59aa1 SHA512 108bd120997f407a776ad3ac7b6b2aeb4e17c4c44ca5cf75f3505f6ef8a3141203210099d2c01ad2387ebbed95f0f81865c687e6746161a508de8a0b1745b322 DIST apache-tomcat-9.0.93-src.tar.gz 6472760 BLAKE2B 85e7da7eca0ac2a6d73b92b7eec73808309399513f326809e5f9343177cca6c8cf321489f6f1bae86426d626f5afda10f844bc77792d05cfdc8ccefb60d51d2a SHA512 015be491867f05ab39d1d39899fc5434516bd613b0a45e87a066fb4a6a1b5d9e2973ed370bfca86acacd55a45d6acd6354523a199a422bf506d864d43f6ddeac DIST apache-tomcat-9.0.93-src.tar.gz.asc 833 BLAKE2B 93f12701716013d17c4b3dc9b18713274fd1ad0f4455c3ef1bd9469920fc337f8f75784b961a8b83de90da28aff5b9e6e6a12cfc9aa217f9af4826fc6ee51871 SHA512 90977bc66413f1962cc1a00e645718e0f9cec93295110c29685df6cd62602994d142b6909087d7eece05b28fae5194d2c9a42c12027e6cb6e82c177d1fcd4f51 -EBUILD tomcat-10.1.25.ebuild 5432 BLAKE2B 2e9055517a60dc7fecabd030a009f793bcc8e641f1b83ce7062a0cf210d96ddfed230ed148756b88ae833bf5494af23c25a2055a4a3a512ecb8077683e1c9303 SHA512 fcafe813db6e2923369122830bde914702862e730ab23a38582df0964a703a97699c84b41e8aab06b678702fc1b94dc6a1cde5b4f2a826ceb1d09439ab56d13a -EBUILD tomcat-10.1.26.ebuild 5423 BLAKE2B 05c8d6dcc8299ef118334469ef12222d94082e8dd096f53338450fc2f4ccc68d0a00ed0d2c8f374c67d6b39dbe4ffdf7789fdf1b884612f4f2a82a69c8cb9ae0 SHA512 7a6a969d912f244397b869271191de6db37b821584da790233c61382b693894623aff264f4ccbfd0f83c26993dba0357ea8d12f23053e80dd9fda3da2b2e2b6d -EBUILD tomcat-10.1.28.ebuild 5424 BLAKE2B f5d5771112a10f6055249d852aafcd92f99e426993920d732b7582126499d07e0275b3b8546db8f42101dbb27f3872d9250a4a1874d3b0ccc551025ec3deee40 SHA512 7ed1a1b28fda88d90373cad86f76b696125a7d72a2c864cd791d946504e4d2677c7de96ed419cf761b33eecc065eddde9a5055dbf02303e01d679f54838f3599 -EBUILD tomcat-9.0.90.ebuild 5017 BLAKE2B ae1262dfd897258a71616cbf732c9ebf609380fbb674e10ae53aef3d71174f0655578be5f2c985367df6ccf0eeb96b8907e0e7f3025b0a4db8f55f899ab33152 SHA512 443117958bc417f019b4e32a300b528a86abd77c32b1abba305ca4940fb159eaa31b80ae4c6862baf827948b7c761ca554e6070a4b495abac00660a0ab8d9eb8 -EBUILD tomcat-9.0.91.ebuild 5008 BLAKE2B 9a0d1aba9b8206c1c2717f0777ed96f73e40a70dbf5eef0df687cca6132ac11dd76f01503a7d2aba2fe3ad91418ebcc2472e9188ec741fb982d663f3fd87ba6b SHA512 bbfd430440623ac2fd23b2ec474d200a45fa9112177e819ba3b6868c6483d5b3b33ad554f099bf3776da254eb9543601d0d4dc8079c490a494a030e31edfb105 -EBUILD tomcat-9.0.93.ebuild 5009 BLAKE2B 397242a00cff5d7b5f18a53670987836740edea2f75e68771b40b1d9b744f298da1ad0885560a50786bf8152bffce4294b6b34f0af7c7aa054274481d2ec921c SHA512 b74b34acf0e4374b230fc32293c97877dd632cc5e9bb438e2235afa97ca789d5f4bae9736aa6bac6fe87354422369a2035e938590eb42ab96ecb44b5cfecc2ff +DIST apache-tomcat-9.0.94-src.tar.gz 6463031 BLAKE2B 4c2e43418c073ab41fc566157b7d8a4dd6134c58f4dfc247b6ccf09c165d350b3741c43cfc619d60b5d8d0837d7774d886ae223f7208663354098bba1bec0bb8 SHA512 d731f4e8693326d5d9641a06ae77de9ef94088ffa0ddfdf52bcec3f5bc22c3139008750cefb156a078de0bb60d84131c3953305499a3bd912763b9a1c49504f6 +DIST apache-tomcat-9.0.94-src.tar.gz.asc 833 BLAKE2B bf413914af1deec7bddb2544d857674509abd5d09f0c2a66e28cbe1d81440ccf3676635b837b3035c77a516480da00ea85ef9de38edd18c0bf5c48e5906c86b7 SHA512 a46770cca1fc5d5d9af59f4dfc772a3b97c5908698f3d44590fce7811ec37d57ddcf251c2c96b1144583c94e2ca0a517c28bdd46800c804689740d9840063a36 +EBUILD tomcat-10.1.28-r1.ebuild 5439 BLAKE2B 17a5783bbae43b82b7062ebf0c3ee13071cd15dd0f82b1333a97f9fe1674ac094d657c4dff11002447deda862c97f2aedeeb3deeaf2a3e2c75bbb61f54f98a78 SHA512 ef59f82555de4f6341ed7ad088bc5c28f18b5b62c266e06dfac791179c81104d49b59f787e0dcaa2e06877f7a7f5fcf5636b746c5bd6d17c8fbc21e9cd615718 +EBUILD tomcat-10.1.29.ebuild 5440 BLAKE2B c0752dce05c3110479456e462bf0a84935fb9776507bd1483b90d492b1a305fd777b5bbaf08392780d9a5bd9affcfcbe0743dc7c0ddc0d12af64869e43d28970 SHA512 784db46a715805c025a16ab96ffe2171b74b43b3f1373a474f28a10c4136cc7bb2da347d4c3a7f7f508d7839c9e7104c6f549da706feeaa783203ce00e6cffbe +EBUILD tomcat-9.0.93-r1.ebuild 5024 BLAKE2B 991d775e579c0edaaa0f2af4fcb6860208e3907ddd934e5c13f9e646092c0d43284d6d18e6ed0a5d22a02766ae9a53143a7ef7bc17917810e7d6098383b29c0c SHA512 acc0aadafb8f56b4e7545202e3a7c9af545592a9ed17b445df86207e89f78bba81e5b8838bdc852d19127501e1ffa5c89efafc7ea37943fb2934dc30ee80fa1a +EBUILD tomcat-9.0.94.ebuild 5025 BLAKE2B e2ffa52dbce4ce65ccfcb8c9f266f655227482b0f93ca6974e590e76fe2af617441a00b4f701a65b29850d8b8a2ad31f10ab560d7ea2df52cca6eb8c3602c11c SHA512 197a6fa5f8877cd1391e935ea7d09c7f7157197ba16c221382ffeab88e1a1e8264a5c64198e7dd9067cc1c7ea0dedf0ae2cf29050884087c2f6ab3a50349b860 MISC metadata.xml 699 BLAKE2B 66aff1137e5d4ad92749176a5375c1c27c1e6cde936e05ce904d965eb71a985c421235917742d4065765e1ebf9f9e3faa51c3de109a9e5a169000b4263c3cd97 SHA512 b50874d1e741835bf8cb839517241465018254eba1ddb0e691f2b5b188eca97dd27394c29d2082654049d9ee0898c1e5e4e625666cf8abe029b8e6085122d9a0 diff --git a/www-servers/tomcat/tomcat-10.1.25.ebuild b/www-servers/tomcat/tomcat-10.1.25.ebuild deleted file mode 100644 index 57b3f7e59503..000000000000 --- a/www-servers/tomcat/tomcat-10.1.25.ebuild +++ /dev/null @@ -1,175 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc source test" - -inherit java-pkg-2 java-ant-2 prefix verify-sig - -MY_P="apache-${P}-src" - -DESCRIPTION="Tomcat Servlet-6.0/JSP-3.1/EL-5.0/WebSocket-2.1/JASPIC-3.0 Container" -HOMEPAGE="https://tomcat.apache.org/" -SRC_URI="mirror://apache/${PN}/tomcat-10/v${PV}/src/${MY_P}.tar.gz - verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/${MY_P}.tar.gz.asc )" -S=${WORKDIR}/${MY_P} - -LICENSE="Apache-2.0" -SLOT="10.1" -KEYWORDS="amd64 ~arm ~arm64 ~amd64-linux" -IUSE="extra-webapps" - -RESTRICT="test" # can we run them on a production system? - -ECJ_SLOT="4.26" - -COMMON_DEP="dev-java/bnd-annotation:0 - dev-java/eclipse-ecj:${ECJ_SLOT} - dev-java/jax-rpc-api:0 - >=dev-java/jakartaee-migration-1.0.7-r2:0 - dev-java/wsdl4j:0" -RDEPEND="${COMMON_DEP} - acct-group/tomcat - acct-user/tomcat - >=virtual/jre-11:*" -DEPEND="${COMMON_DEP} - app-admin/pwgen - >=dev-java/ant-1.10.14-r3:0 - dev-java/bnd-ant:0 - dev-java/bnd-util:0 - dev-java/bndlib:0 - dev-java/libg:0 - dev-java/osgi-cmpn:8 - dev-java/osgi-core:0 - dev-java/slf4j-api:0 - >=virtual/jdk-17:* - test? ( - >=dev-java/ant-1.10.14-r3:0[junit] - dev-java/easymock:3.2 - )" - -BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )" -VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc" - -PATCHES=( - "${FILESDIR}/tomcat-10.1.20-do-not-copy.patch" - "${FILESDIR}/tomcat-10.1.20-offline.patch" - "${FILESDIR}/tomcat-9.0.87-gentoo-bnd.patch" -) - -src_prepare() { - default #780585 - java-pkg-2_src_prepare - java-pkg_clean - - cat > build.properties <<-EOF || die - execute.download=false - exist=true # skip target="downloadfile-2" - ant.jar=$(java-pkg_getjar --build-only ant ant.jar) - bnd-annotation.jar=$(java-pkg_getjars bnd-annotation) - bnd-ant.jar=$(java-pkg_getjars --build-only bnd-ant) - bnd-util.jar=$(java-pkg_getjars --build-only bnd-util) - bnd.jar=$(java-pkg_getjars --build-only bnd) - bndlib.jar=$(java-pkg_getjars --build-only bndlib) - jaxrpc-lib.jar=$(java-pkg_getjars jax-rpc-api) - jdt.jar=$(java-pkg_getjars eclipse-ecj-${ECJ_SLOT}) - libg.jar=$(java-pkg_getjars --build-only libg) - migration-lib.jar=$(java-pkg_getjars jakartaee-migration) - osgi-cmpn.jar=$(java-pkg_getjars --build-only osgi-cmpn-8) - osgi-core.jar=$(java-pkg_getjars --build-only osgi-core) - slf4j-api.jar=$(java-pkg_getjars --build-only slf4j-api) - wsdl4j-lib.jar=$(java-pkg_getjars wsdl4j) - EOF - - # For use of catalina.sh in netbeans - sed -i -e "/^# ----- Execute The Requested Command/ a\ - CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \ - bin/catalina.sh || die -} - -EANT_BUILD_TARGET="deploy" -EANT_TEST_GENTOO_CLASSPATH="easymock-3.2" -EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes" -EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false" - -# revisions of the scripts -IM_REV="-r2" -INIT_REV="-r1" - -src_compile() { - LC_ALL=C java-pkg-2_src_compile -} - -src_test() { - java-pkg-2_src_test -} - -src_install() { - local dest="/usr/share/${PN}-${SLOT}" - - java-pkg_jarinto "${dest}"/bin - java-pkg_dojar output/build/bin/*.jar - exeinto "${dest}"/bin - doexe output/build/bin/*.sh - - java-pkg_jarinto "${dest}"/lib - java-pkg_dojar output/build/lib/*.jar - - dodoc RELEASE-NOTES RUNNING.txt - use doc && java-pkg_dojavadoc output/dist/webapps/docs/api - use source && java-pkg_dosrc java/* - - ### Webapps ### - - # add missing docBase - local apps="host-manager manager" - for app in ${apps}; do - sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \ - output/build/webapps/${app}/META-INF/context.xml || die - done - - insinto "${dest}"/webapps - doins -r output/build/webapps/{host-manager,manager,ROOT} - use extra-webapps && doins -r output/build/webapps/{docs,examples} - - ### Config ### - - # create "logs" directory in $CATALINA_BASE - # and set correct perms, see #458890 - dodir "${dest}"/logs - fperms 0750 "${dest}"/logs - - # replace the default pw with a random one, see #92281 - local randpw="$(pwgen -s -B 15 1)" - sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die - - # prepend gentoo.classpath to common.loader, see #453212 - sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die - - insinto "${dest}" - doins -r output/build/conf - - ### rc ### - - cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die - eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} - sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die - - insinto "${dest}"/gentoo - doins "${T}"/tomcat.conf - exeinto "${dest}"/gentoo - newexe "${T}"/tomcat${INIT_REV}.init tomcat.init - newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash -} - -pkg_postinst() { - einfo "Ebuilds of Tomcat support running multiple instances. To manage Tomcat instances, run:" - einfo " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help" - - ewarn "Please note that since version 10 the primary package for all implemented APIs" - ewarn "has changed from javax.* to jakarta.*. This will almost certainly require code" - ewarn "changes to enable applications to migrate from Tomcat 9 and earlier to Tomcat 10 and later." - - einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat" -} diff --git a/www-servers/tomcat/tomcat-10.1.26.ebuild b/www-servers/tomcat/tomcat-10.1.28-r1.ebuild index 988d2777d534..46f330d5f41c 100644 --- a/www-servers/tomcat/tomcat-10.1.26.ebuild +++ b/www-servers/tomcat/tomcat-10.1.28-r1.ebuild @@ -36,6 +36,7 @@ RDEPEND="${COMMON_DEP} DEPEND="${COMMON_DEP} app-admin/pwgen >=dev-java/ant-1.10.14-r3:0 + dev-java/bnd:0 dev-java/bnd-ant:0 dev-java/bnd-util:0 dev-java/bndlib:0 diff --git a/www-servers/tomcat/tomcat-10.1.28.ebuild b/www-servers/tomcat/tomcat-10.1.29.ebuild index 5a265187a6e3..1c4d65ce7969 100644 --- a/www-servers/tomcat/tomcat-10.1.28.ebuild +++ b/www-servers/tomcat/tomcat-10.1.29.ebuild @@ -36,6 +36,7 @@ RDEPEND="${COMMON_DEP} DEPEND="${COMMON_DEP} app-admin/pwgen >=dev-java/ant-1.10.14-r3:0 + dev-java/bnd:0 dev-java/bnd-ant:0 dev-java/bnd-util:0 dev-java/bndlib:0 diff --git a/www-servers/tomcat/tomcat-9.0.90.ebuild b/www-servers/tomcat/tomcat-9.0.90.ebuild deleted file mode 100644 index 416b71be8c5d..000000000000 --- a/www-servers/tomcat/tomcat-9.0.90.ebuild +++ /dev/null @@ -1,168 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc source test" - -inherit java-pkg-2 java-ant-2 prefix verify-sig - -MY_P="apache-${P}-src" - -DESCRIPTION="Tomcat Servlet-4.0/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container" -HOMEPAGE="https://tomcat.apache.org/" -SRC_URI="mirror://apache/${PN}/tomcat-9/v${PV}/src/${MY_P}.tar.gz - verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/${MY_P}.tar.gz.asc )" -S=${WORKDIR}/${MY_P} - -LICENSE="Apache-2.0" -SLOT="9" -KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux" -IUSE="extra-webapps" - -RESTRICT="test" # can we run them on a production system? - -ECJ_SLOT="4.20" - -COMMON_DEP="dev-java/bnd-annotation:0 - dev-java/eclipse-ecj:${ECJ_SLOT} - dev-java/jax-rpc-api:0 - dev-java/wsdl4j:0" -RDEPEND="${COMMON_DEP} - acct-group/tomcat - acct-user/tomcat - >=virtual/jre-1.8:*" -DEPEND="${COMMON_DEP} - app-admin/pwgen - >=dev-java/ant-1.10.14-r3:0 - dev-java/bnd-ant:0 - dev-java/bnd-util:0 - dev-java/bndlib:0 - dev-java/libg:0 - dev-java/osgi-cmpn:8 - dev-java/osgi-core:0 - dev-java/slf4j-api:0 - >=virtual/jdk-17:* - test? ( - >=dev-java/ant-1.10.14-r3:0[junit] - dev-java/easymock:3.2 - )" - -BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )" -VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc" - -PATCHES=( - "${FILESDIR}/tomcat-9.0.87-build.xml.patch" - "${FILESDIR}/tomcat-9.0.87-gentoo-bnd.patch" -) - -src_prepare() { - default #780585 - java-pkg-2_src_prepare - java-pkg_clean - - cat > build.properties <<-EOF || die - execute.download=false - exist=true # skip target="downloadfile-2" - ant.jar=$(java-pkg_getjar --build-only ant ant.jar) - bnd-annotation.jar=$(java-pkg_getjars bnd-annotation) - bnd-ant.jar=$(java-pkg_getjars --build-only bnd-ant) - bnd-util.jar=$(java-pkg_getjars --build-only bnd-util) - bnd.jar=$(java-pkg_getjars --build-only bnd) - bndlib.jar=$(java-pkg_getjars --build-only bndlib) - jaxrpc-lib.jar=$(java-pkg_getjars jax-rpc-api) - jdt.jar=$(java-pkg_getjars eclipse-ecj-${ECJ_SLOT}) - libg.jar=$(java-pkg_getjars --build-only libg) - osgi-cmpn.jar=$(java-pkg_getjars --build-only osgi-cmpn-8) - osgi-core.jar=$(java-pkg_getjars --build-only osgi-core) - slf4j-api.jar=$(java-pkg_getjars --build-only slf4j-api) - wsdl4j-lib.jar=$(java-pkg_getjars wsdl4j) - EOF - - # For use of catalina.sh in netbeans - sed -i -e "/^# ----- Execute The Requested Command/ a\ - CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \ - bin/catalina.sh || die -} - -EANT_BUILD_TARGET="deploy" -EANT_TEST_GENTOO_CLASSPATH="easymock-3.2" -EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes" -EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false" - -# revisions of the scripts -IM_REV="-r2" -INIT_REV="-r1" - -src_compile() { - LC_ALL=C java-pkg-2_src_compile -} - -src_test() { - java-pkg-2_src_test -} - -src_install() { - local dest="/usr/share/${PN}-${SLOT}" - - java-pkg_jarinto "${dest}"/bin - java-pkg_dojar output/build/bin/*.jar - exeinto "${dest}"/bin - doexe output/build/bin/*.sh - - java-pkg_jarinto "${dest}"/lib - java-pkg_dojar output/build/lib/*.jar - - dodoc RELEASE-NOTES RUNNING.txt - use doc && java-pkg_dojavadoc output/dist/webapps/docs/api - use source && java-pkg_dosrc java/* - - ### Webapps ### - - # add missing docBase - local apps="host-manager manager" - for app in ${apps}; do - sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \ - output/build/webapps/${app}/META-INF/context.xml || die - done - - insinto "${dest}"/webapps - doins -r output/build/webapps/{host-manager,manager,ROOT} - use extra-webapps && doins -r output/build/webapps/{docs,examples} - - ### Config ### - - # create "logs" directory in $CATALINA_BASE - # and set correct perms, see #458890 - dodir "${dest}"/logs - fperms 0750 "${dest}"/logs - - # replace the default pw with a random one, see #92281 - local randpw="$(pwgen -s -B 15 1)" - sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die - - # prepend gentoo.classpath to common.loader, see #453212 - sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die - - insinto "${dest}" - doins -r output/build/conf - - ### rc ### - - cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die - eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} - sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die - - insinto "${dest}"/gentoo - doins "${T}"/tomcat.conf - exeinto "${dest}"/gentoo - newexe "${T}"/tomcat${INIT_REV}.init tomcat.init - newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash -} - -pkg_postinst() { - einfo "Ebuilds of Tomcat support running multiple instances. To manage Tomcat instances, run:" - einfo " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help" - - einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat" -} diff --git a/www-servers/tomcat/tomcat-9.0.91.ebuild b/www-servers/tomcat/tomcat-9.0.93-r1.ebuild index b2ce7130baf1..122626117fab 100644 --- a/www-servers/tomcat/tomcat-9.0.91.ebuild +++ b/www-servers/tomcat/tomcat-9.0.93-r1.ebuild @@ -35,6 +35,7 @@ RDEPEND="${COMMON_DEP} DEPEND="${COMMON_DEP} app-admin/pwgen >=dev-java/ant-1.10.14-r3:0 + dev-java/bnd:0 dev-java/bnd-ant:0 dev-java/bnd-util:0 dev-java/bndlib:0 diff --git a/www-servers/tomcat/tomcat-9.0.93.ebuild b/www-servers/tomcat/tomcat-9.0.94.ebuild index e765f1d0ba75..14e23d60b567 100644 --- a/www-servers/tomcat/tomcat-9.0.93.ebuild +++ b/www-servers/tomcat/tomcat-9.0.94.ebuild @@ -35,6 +35,7 @@ RDEPEND="${COMMON_DEP} DEPEND="${COMMON_DEP} app-admin/pwgen >=dev-java/ant-1.10.14-r3:0 + dev-java/bnd:0 dev-java/bnd-ant:0 dev-java/bnd-util:0 dev-java/bndlib:0 |