diff options
Diffstat (limited to 'www-servers')
31 files changed, 92 insertions, 1456 deletions
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest index a3a8df79600a..ce2186981c67 100644 --- a/www-servers/apache/Manifest +++ b/www-servers/apache/Manifest @@ -1,7 +1,7 @@ -DIST gentoo-apache-2.4.58-20231019.tar.bz2 26224 BLAKE2B 370f36dcbe9d10ed0dd415c2e28016c7897246b5c3f830e849e765c18a08be145c8a363f122dff2c4b8d5b1e53ff504a79d7512a58135899a539136b580524ed SHA512 60f68eb4168a86ee33525e7c90cf5af8da586ed31d12cc294ea6bf3bcb9f254ea7e1a4ca5db4846a0e92b97c1326f095aa3a9d5fdb9ed92c1c4726c5a825ab36 DIST gentoo-apache-2.4.59-20240405.tar.bz2 26196 BLAKE2B 370b0264756c950ed36a0b9abe144742f0638ca616b347ce252fcc8c8cbf326422883771f33f822e03792cf37cb4cea8f95180c989e9a7ed868e2f235c642dca SHA512 cb312c632026d06cdce4e4fc2eb3a51366a8b63782878673781840774b46a72c7e756f9fa3d49aecbfcdbaf939a23a65146358f8523edb5a89ed97fd8b3a79c1 DIST gentoo-apache-2.4.59-r3-20240511.tar.bz2 31426 BLAKE2B 741b9b76c8fc9a3ae31a5054123e78a47414c5308aefc014ce6ec1ec2cbcf9dea50c5ea0d3b0291132c0b2bd40450ba9480feee279c9f162ef3d8ef75f5025e4 SHA512 b1d4099c2288099493a6baff58127a8b2605bdacf62a66dc5d2ee27368dea81bf8fea2fe878d26c073610ef6bda1c7c0783c1a4af01c0208957abed908cb1df6 DIST gentoo-apache-2.4.61-20240703.tar.bz2 26189 BLAKE2B 0acfe0c6be0df31f24719b46bd18e2407971b221c654d27120228215cb342f7b69f6912d6f3894fa1cad2b4d7ee657e7fe35064d7c9dc60899bd829b8a7fdd36 SHA512 d6d8ce711a4bdb9017e1e0d6e45c6411f2bf5fd2d72e4ad5e55b23cb8e7216a31273cfd9d9c2cda7fb2bfeee1e9b7ba271ce4344be078af5b01d5e9481be643f -DIST httpd-2.4.58.tar.bz2 7485817 BLAKE2B 2105b8fada99f1dda55201ed89ed5326f0edb078d352cbff44f02cde80d129b65b63e07366a9a744ba474be5687fa8d3d2d8ddc64ac914b47166607f3f4a9de2 SHA512 d6e73bf413a507ec16b621ff635e178206207a9e9810ce3944b3dc98d39cde8f225307110167fc9da5822175796c8cb66f98be5b9f0d8b76dcd83a401d39b2c1 +DIST gentoo-apache-2.4.62-20240719.tar.bz2 26207 BLAKE2B 0c0b52620d27f9f96643f8f18221e04c97a80849470f21695359f569be4cebcea0e1588bfce0744ffb86267185fe7a235c3f7b4976a6b68cd8c30c1ac0cb966a SHA512 689362c5171e72afb439dae57c73750ac1cd559a15d2b6fe57a08cc7b489f6921d0265f90e3d4551b75269f60b7222fe20c792c0c14ff5ff3303c9fc974d43f8 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 diff --git a/www-servers/apache/apache-2.4.58-r2.ebuild b/www-servers/apache/apache-2.4.62.ebuild index d41733f53db2..2beabccc8a51 100644 --- a/www-servers/apache/apache-2.4.58-r2.ebuild +++ b/www-servers/apache/apache-2.4.62.ebuild @@ -4,9 +4,9 @@ EAPI=7 # latest gentoo apache files -GENTOO_PATCHSTAMP="20231019" +GENTOO_PATCHSTAMP="20240719" GENTOO_DEVELOPER="graaff" -GENTOO_PATCHNAME="gentoo-apache-2.4.58" +GENTOO_PATCHNAME="gentoo-apache-2.4.62" # IUSE/USE_EXPAND magic IUSE_MPMS_FORK="prefork" @@ -149,14 +149,10 @@ SLOT="2" KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~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 ) + apache2_modules_tls? ( >=net-libs/rustls-ffi-0.13.0:= ) " DEPEND="${RDEPEND}" -PATCHES=( - "${FILESDIR}"/libxmlv212.patch -) - pkg_setup() { # dependent critical modules which are not allowed in global scope due # to USE flag conditionals (bug #499260) diff --git a/www-servers/apache/files/libxmlv212.patch b/www-servers/apache/files/libxmlv212.patch deleted file mode 100644 index 281633b27ca7..000000000000 --- a/www-servers/apache/files/libxmlv212.patch +++ /dev/null @@ -1,24 +0,0 @@ -https://github.com/apache/httpd/pull/393 - -From bd2c4e466e0949f6f770bbb2569ce5ae9b3965c0 Mon Sep 17 00:00:00 2001 -From: ttachi <tachihara@hotmail.com> -Date: Fri, 17 Nov 2023 22:24:45 +0900 -Subject: [PATCH] mod_xml2enc: remove dependency on xmlstring header - ---- - modules/filters/mod_xml2enc.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/modules/filters/mod_xml2enc.c b/modules/filters/mod_xml2enc.c -index 34f8e8ee090..0d3d13c1239 100644 ---- a/modules/filters/mod_xml2enc.c -+++ b/modules/filters/mod_xml2enc.c -@@ -209,7 +209,7 @@ static void sniff_encoding(request_rec* r, xml2ctx* ctx) - - /* to sniff, first we look for BOM */ - if (ctx->xml2enc == XML_CHAR_ENCODING_NONE) { -- ctx->xml2enc = xmlDetectCharEncoding((const xmlChar*)ctx->buf, -+ ctx->xml2enc = xmlDetectCharEncoding((const unsigned char*)ctx->buf, - ctx->bytes); - if (HAVE_ENCODING(ctx->xml2enc)) { - ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, APLOGNO(01432) diff --git a/www-servers/gunicorn/Manifest b/www-servers/gunicorn/Manifest index 2165a7251fe2..d5973a0c3081 100644 --- a/www-servers/gunicorn/Manifest +++ b/www-servers/gunicorn/Manifest @@ -1 +1 @@ -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 diff --git a/www-servers/gunicorn/gunicorn-22.0.0.ebuild b/www-servers/gunicorn/gunicorn-23.0.0.ebuild index 6baafbdd6c42..808ba45e4e9c 100644 --- a/www-servers/gunicorn/gunicorn-22.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 ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos" RDEPEND=" dev-python/packaging[${PYTHON_USEDEP}] diff --git a/www-servers/lighttpd/lighttpd-1.4.76-r1.ebuild b/www-servers/lighttpd/lighttpd-1.4.76-r1.ebuild index c61fbf73771c..91cceae8bcc1 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 ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" fi LICENSE="BSD GPL-2" diff --git a/www-servers/monkeyd/Manifest b/www-servers/monkeyd/Manifest deleted file mode 100644 index c767551ade4e..000000000000 --- a/www-servers/monkeyd/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST monkey-1.6.9.tar.gz 1972040 BLAKE2B f1fe4791bfdba14905797e36563d76a7b551fb3f8bf4d387c598f6c19f58e7759044e4ad2664ac29a546ce76b210fa61285198c711751c7a47c124be507898a7 SHA512 3540a17fffe57a9d4b88b6243c634dcf6a27ed894ae2a0d5d42a4881221a9d59ae67d4c7fcf087535360d20ccdadab16947cf3a7dc6d4e864d487f598eb0ba62 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 46b2b1a44166..8be6d80e4a9a 100644 --- a/www-servers/nginx/Manifest +++ b/www-servers/nginx/Manifest @@ -1,6 +1,6 @@ DIST modsecurity-nginx-1.0.3.tar.gz 34063 BLAKE2B 859a29eb7f67d53a818578f1008f0d0debbe37c205bb7c6e79594d8b1a6a0d93988880d35f607ef05ef6d73c9aa887baebfd2c54aca894969beeed4bfe576f37 SHA512 20495884c6b3594edf879a19fd7445f2e74a1628789decd146b3c712764b0507e440a84a64aab619461b044f98b8d641913cfad57a6d0002e7061716bdfe84fc -DIST nginx-1.26.1.tar.gz 1244738 BLAKE2B 5df95f6771a93009f5bd1a4038857c29af580d18af841e8cffe073339578b3ae0492d3a4cc797cac03a1039096ac5206ed1fa01da11c98591bce2cc4b2d18679 SHA512 dfaadde78eb5cf8c8c3a43ead9ac49fc852c8de3e70e69754e3ffafc88c50c8bc08cdac0cc0ba8a9d8c155bdb334865e2e6c7dc1144c79959c426a9e087b3e37 -DIST nginx-1.27.0.tar.gz 1244887 BLAKE2B 035ec8d44f7f7df9b0c77e97e353a579642b75f905c1a6be5caf5ff952be9cae7ccc14c0bfce5ab148a11799d308225e9b7155458905b624c12acd09c03dfa44 SHA512 251bfe65c717a8027ef05caae2ab2ea73b9b544577f539a1d419fe6adf0bcc846b73b58f54ea3f102df79aaf340e4fa56793ddadea3cd61bcbbe2364ef94bacb +DIST nginx-1.26.2.tar.gz 1244789 BLAKE2B f054deb47bf21bf963fedc8f980d29c92325bbfcb39c5a2cc67cce15add32036f0b771c7abac018ded6354a0df0850ed5843d26e0cf5d9577b70ca3fa89a206c SHA512 470efe9ae5d6150ecbf133979c6c36415679a2156499a3b6820a85eb8f3038a8aa06f7b28ddd834cffb0e982f3ddc89e4b1649d536eba4f84019a72d4cfa3539 +DIST nginx-1.27.1.tar.gz 1245244 BLAKE2B d31dac0ced22604a3e8d3b054b3fe560aef4e29b56346466e09e39316ce21ff4b107233a50e58d20419551fd8b9cc530f855445efd88b8497b492676e10de3d8 SHA512 9bbdfcd7b9524f48e96b2ce6cc74bab20242885f208d1ad4117336a24642f3355d1c379e6041a4c341e31fb15faea39fc4410b6523164e3179594bbfb5fc35f5 DIST nginx-auth-ldap-42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz 18457 BLAKE2B 22225ca9e5299b20ab5a93a001cac48e446bd86b3a24ac49e716bc975b128890bdb4b0dbbf5730fbaaeadfd958160093c7a6af798dd0e6de27062f149a760333 SHA512 ec59637fda5acac053e815cb1d04b545fc6b765e5ec63d8c2c9c301abad87afaa2698145acac08e9e14c91e1423ebff7aff0cca2b940b19ccccbf4cf53973269 DIST nginx-tests-0b5ec15c62ed.tar.gz 282652 BLAKE2B af41397f88f7aa969749c6dd9a77c58d1835bca24fe764dd0af328d621817f5fb89b3f5b5c0fbd1e7db53d51365e9098b020005e27a531649bd8a51a05b3cbb0 SHA512 c376d23c7001c5203428b664c388e97956cdda8365eb7df57db0da5146d0806f5c35cd1352260d6803d55542f46a90da4a604ebf971055caa77dd6106930558e DIST nginx-vod-module-1.33.tar.gz 471858 BLAKE2B fa5cb9fd185b30c5c53b25a6f103213b3d04dac5d2d81db72f9749a51548e09e3e17dccc636d748aff8d21c6623484c77fdeb10d70854480759665d140d42e0e SHA512 29ef77f1bbdb2410ff317ebdd7434f31b8ec370ae6b617b92e745e87c11bc820b451181d1d2b57156b414348da14ac448b689b32b17ab418144292eda094512d 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.1-r1.ebuild b/www-servers/nginx/nginx-1.26.2-r2.ebuild index 14ac4f2e9864..fe6db3b44206 100644 --- a/www-servers/nginx/nginx-1.26.1-r1.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.0-r1.ebuild b/www-servers/nginx/nginx-1.27.1-r2.ebuild index 749ba9ff4572..bfc1a4a791b6 100644 --- a/www-servers/nginx/nginx-1.27.0-r1.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 65f84201c4e4..8a9d991bb2c6 100644 --- a/www-servers/spawn-fcgi/Manifest +++ b/www-servers/spawn-fcgi/Manifest @@ -1 +1,2 @@ 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 diff --git a/www-servers/spawn-fcgi/metadata.xml b/www-servers/spawn-fcgi/metadata.xml index f772cde61617..be4521a08640 100644 --- a/www-servers/spawn-fcgi/metadata.xml +++ b/www-servers/spawn-fcgi/metadata.xml @@ -1,7 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> + <maintainer type="person" proxied="yes"> + <email>andcycle-gentoo@andcycle.idv.tw</email> + <name>Hsu, Chih-Hsiang</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <upstream> + <remote-id type="github">lighttpd/spawn-fcgi</remote-id> + </upstream> <longdescription lang="en"> spawn-fcgi is used to spawn FastCGI applications diff --git a/www-servers/spawn-fcgi/spawn-fcgi-1.6.5.ebuild b/www-servers/spawn-fcgi/spawn-fcgi-1.6.5.ebuild new file mode 100644 index 000000000000..d06983b62dd2 --- /dev/null +++ b/www-servers/spawn-fcgi/spawn-fcgi-1.6.5.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="A FCGI spawner for lighttpd and cherokee and other webservers" +HOMEPAGE="https://redmine.lighttpd.net/projects/spawn-fcgi/wiki" +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" + +src_install() { + default + + newconfd "${FILESDIR}"/spawn-fcgi.confd spawn-fcgi + newinitd "${FILESDIR}"/spawn-fcgi.initd-r3 spawn-fcgi + + docinto examples + dodoc doc/run-generic doc/run-php doc/run-rails +} diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest index 8aa45f3454fb..9aeb92849980 100644 --- a/www-servers/tomcat/Manifest +++ b/www-servers/tomcat/Manifest @@ -1,12 +1,4 @@ -DIST apache-tomcat-10.1.24-src.tar.gz 6230916 BLAKE2B ac2329499d9afa37a62ad00b5ca4954e4221d72623fd821ffd3ca0037209723acba38d03f52033f0ea7e2951c9803f3ab94cd0910ed520424693f03fd2efe5c8 SHA512 cd3113dfaf2dd14aacf8d3c2bf39fb7142665421f981ad668edd228bb0a8fe8c35ea8921930e6fe06d10c9c078f774641901efc1e5312d3b7ef52a3006bacd5f -DIST apache-tomcat-10.1.24-src.tar.gz.asc 833 BLAKE2B aa1a6b3698b80f16ed567153d42655b425597bacc2cc1aee7a73e8cb20db22c57d827d2400df045a828d1cca017ffc5af1c941b9c0f94369fcf7d52458061b01 SHA512 cedc2128b2877bb4470d06df9618c403c49f488eb5006b3561f39b98b2ff7539819b931813c9af484f62a57a582e36730ed25e8f30a8743631b4d72bca4be386 -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-9.0.89-src.tar.gz 6319184 BLAKE2B a3c9539fe25a5ca87820214a7b7b8376c05383d940bfa19f7811f3fb5e90e2bd392f46c3f1a08a8949256bde5855bd479ac3754245dc953aa78e5f73e23f8849 SHA512 c2e8e45a98cd30764b507bb997c7cf1b8e337be9c6d1833bb5f916a5d86d96cb095f430884d0a248cdc3b510beb11e227cc160f8402ba5b2e3952399a44461d1 -DIST apache-tomcat-9.0.89-src.tar.gz.asc 833 BLAKE2B 7629f94f4d036a6fc307bc6d157758eb5291a0b854bed20f0341ef0dffda8cff4722d4e47c2ad5f7e8d331ab0563532d53596859dcd990a75809f0432862f63a SHA512 5cf7dc5890f928acb43d2401e196166cfbd473236a27afde9fed621e0eefd3b9b59abe3ad8ac4e77086752e67afd0d60af9003e84f5cb2e66a58e6dee89b7366 -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.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.93-src.tar.gz 6472760 BLAKE2B 85e7da7eca0ac2a6d73b92b7eec73808309399513f326809e5f9343177cca6c8cf321489f6f1bae86426d626f5afda10f844bc77792d05cfdc8ccefb60d51d2a SHA512 015be491867f05ab39d1d39899fc5434516bd613b0a45e87a066fb4a6a1b5d9e2973ed370bfca86acacd55a45d6acd6354523a199a422bf506d864d43f6ddeac +DIST apache-tomcat-9.0.93-src.tar.gz.asc 833 BLAKE2B 93f12701716013d17c4b3dc9b18713274fd1ad0f4455c3ef1bd9469920fc337f8f75784b961a8b83de90da28aff5b9e6e6a12cfc9aa217f9af4826fc6ee51871 SHA512 90977bc66413f1962cc1a00e645718e0f9cec93295110c29685df6cd62602994d142b6909087d7eece05b28fae5194d2c9a42c12027e6cb6e82c177d1fcd4f51 diff --git a/www-servers/tomcat/tomcat-10.1.24-r1.ebuild b/www-servers/tomcat/tomcat-10.1.24-r1.ebuild deleted file mode 100644 index 57b3f7e59503..000000000000 --- a/www-servers/tomcat/tomcat-10.1.24-r1.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.25.ebuild b/www-servers/tomcat/tomcat-10.1.25.ebuild deleted file mode 100644 index bd5eec566c82..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.26.ebuild deleted file mode 100644 index 0cf5d3b43e3e..000000000000 --- a/www-servers/tomcat/tomcat-10.1.26.ebuild +++ /dev/null @@ -1,177 +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 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 - compile.debug=false - execute.download=false - exist=true # skip target="downloadfile-2" - version=${PV}-gentoo - version.number=${PV} - 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 - if use test; then - echo "easymock.jar=$(java-pkg_getjars --build-only easymock-3.2)" \ - >> build.properties || die "easymock" - fi - - # 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 -} - -# revisions of the scripts -IM_REV="-r2" -INIT_REV="-r1" - -src_compile() { - LC_ALL=C eant -} - -src_test() { - eant 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.25-r1.ebuild b/www-servers/tomcat/tomcat-10.1.28-r1.ebuild index 0cf5d3b43e3e..46f330d5f41c 100644 --- a/www-servers/tomcat/tomcat-10.1.25-r1.ebuild +++ b/www-servers/tomcat/tomcat-10.1.28-r1.ebuild @@ -17,7 +17,7 @@ S=${WORKDIR}/${MY_P} LICENSE="Apache-2.0" SLOT="10.1" -KEYWORDS="~amd64 ~arm ~arm64 ~amd64-linux" +KEYWORDS="amd64 ~arm ~arm64 ~amd64-linux" IUSE="extra-webapps" RESTRICT="test" # can we run them on a production system? @@ -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 @@ -101,6 +102,7 @@ INIT_REV="-r1" src_compile() { LC_ALL=C eant + use doc && LC_ALL=C eant javadoc } src_test() { diff --git a/www-servers/tomcat/tomcat-9.0.89.ebuild b/www-servers/tomcat/tomcat-9.0.89.ebuild deleted file mode 100644 index 416b71be8c5d..000000000000 --- a/www-servers/tomcat/tomcat-9.0.89.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.90-r1.ebuild b/www-servers/tomcat/tomcat-9.0.90-r1.ebuild deleted file mode 100644 index 7b448f073a63..000000000000 --- a/www-servers/tomcat/tomcat-9.0.90-r1.ebuild +++ /dev/null @@ -1,170 +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 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 - compile.debug=false - execute.download=false - exist=true # skip target="downloadfile-2" - version=${PV}-gentoo - version.number=${PV} - 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 - if use test; then - echo "easymock.jar=$(java-pkg_getjars --build-only easymock-3.2)" \ - >> build.properties || die "easymock" - fi - - # 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 -} - -# revisions of the scripts -IM_REV="-r2" -INIT_REV="-r1" - -src_compile() { - LC_ALL=C eant -} - -src_test() { - eant 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.90.ebuild b/www-servers/tomcat/tomcat-9.0.90.ebuild deleted file mode 100644 index ca10cc20e118..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 7b448f073a63..122626117fab 100644 --- a/www-servers/tomcat/tomcat-9.0.91.ebuild +++ b/www-servers/tomcat/tomcat-9.0.93-r1.ebuild @@ -17,7 +17,7 @@ S=${WORKDIR}/${MY_P} LICENSE="Apache-2.0" SLOT="9" -KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux" IUSE="extra-webapps" RESTRICT="test" # can we run them on a production system? @@ -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 @@ -98,6 +99,7 @@ INIT_REV="-r1" src_compile() { LC_ALL=C eant + use doc && LC_ALL=C eant javadoc } src_test() { |