mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
Merge updates from master
This commit is contained in:
Repository mirror & CI
@@ -8,7 +8,7 @@ DIST openjdk-21.0.9_p10.tar.gz 113806114 BLAKE2B b6511bd023d022bbc21a11acc173257
|
||||
DIST openjdk-25.0.1_p8.tar.gz 119363842 BLAKE2B 24fcb7607cf7847c743cc5f538b1ae11f8fd551e5c75777ae68a58efb7bcba67a02ef0b02b0123c715a5dabe0d68c9dd49e51678b73e3fe232009bc6a834b4b5 SHA512 002ca3cbd9b581bed8c01e2bbda7647845b88d165f638460870aee510feffcc014588b6c5315e77467458682b049e7d2bb1c6be8728f8cf5067539f5d8233352
|
||||
DIST openjdk-25.0.2_p10.tar.gz 119406560 BLAKE2B e3461d09ab68b15aab06645df1cb6dfd1090ed46cbe9c14c2cbc39c06468f483de9d79815817c6c6fc521e37d422e007d4a5e80c7d42ec9d1b6b943ceeb5c807 SHA512 a1435cf8493c9498abfa98ac4ef4c5dc67892b95010c167cbda03b7ceb154f466d84ea3daf4242102f71b74233930e880f422768660a30f48658321255483907
|
||||
DIST openjdk-26_beta32.tar.gz 121566656 BLAKE2B c525aa96a2c7e8c80a7ef201e7296a99f1e7b22149ac292c0ef718b18ad886440a8066b86400a549601191f370d0a83456f2f8b33753730327dfdb444bd288ae SHA512 5cfa3a9dec6d88b3ae1694eeefdcb6e8e047a48cfa9b34c0fa26b95f36cace9ef3995b9cb2a6d6fbad1a5eaeefd56b5cc40f093514d44bbe687bd9b37ceae1e3
|
||||
DIST openjdk-27_alpha3.tar.gz 121599758 BLAKE2B 82c8ea3d5038a9c43e6317f15d747b5c5fe90e72c6c5972d2faeba8bea7a362eb43b425f6672e7554b2f99b85c20d45b935b6e529f39541eaf936575eb35a709 SHA512 9d71a0e70d6e289f8d67e53e4a251b5f71e44e0672e765ba5e8ddc40692a9165054b1fe1471ea00b60bf97fe47530c1ed3f56919e7ef41fc547529cf695bb280
|
||||
DIST openjdk-27_alpha6.tar.gz 121742678 BLAKE2B 67b71b09bacd48ec2856d121f5a49ac0c1ab921f6e13c574c2723839fa2a9f3ce0cca3332bf0c158f08c218dfc83b597c875d6191bc1c90319482d110df897f4 SHA512 a03f22f1a890332b01744e8b4d9eb62e4dda3c7e66c042adff331d52eb578391a04bc4fde05404fd078095b6cc09ee48158c05bedb0954b4fcf428f70f01a6e6
|
||||
DIST openjdk-8.472_p08.tar.gz 92827251 BLAKE2B 5f5c90ef0eeaf934947c943798e2ef035fc2fb6a86c21d5408cf737257e4db63555581278ca688b9dd1cb76913effa22149152986eddaf233b1217f884ca84d1 SHA512 1acebcb878d0da98fe9d66040037ddeb10c307c89402a8e2471f074068589f6bcbcaafffd24d2eb94e1aaf25e953430d94e299465e3222869789f252eacc6446
|
||||
DIST openjdk-8.482_p08.tar.gz 93899386 BLAKE2B df3a5f0def9d673be9f036905d50ac9d924bb3119e9dabbf17d786cf49d7e3f260e848d8c3fb6efa0e966f86a0e13422c9bc22d2bef623bc4a660d9f573de32c SHA512 c9951addcb0cac3f7bb2b1a5643811367b23a889908697c8091322c9551afec720fe31a2ca97ebd97ad0a48661d554fc59388d86a947fade7268bfaeab8b4dd5
|
||||
DIST openjdk-bootstrap-11.0.13_p8-ppc64.tar.xz 108215404 BLAKE2B 5e6c0b905b34b437137922b73a9724da96b8832186fea945f8c73d941db822ca1cc5718f3ecb4607ed98d1f8241c9f365b54caaf978863e8b84680a94f067b5d SHA512 732e2220219d42be10589fcaf2420da87ebc8564b4afc6bd02f61f31cdca9c31b339366e34d374fb814499b92f8aa796435a18f28e10c8cb00d9a0f5953bb60e
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Copyright 1999-2026 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
@@ -1,2 +1,2 @@
|
||||
DIST plantuml-1.2025.10.tar.gz 15949661 BLAKE2B e07811a08f86ae5b03ae0fca001e8a3cddb3d79c092384ba0269f34c0ebfdcfae186f2b6716519866516361814600d8ddd54c3ef316b4ff17a08383aa2589efb SHA512 4467e86b9a99a2e0496c6442e34e871a2a89984fa45afbdd2ed500f2c3824624c600c7f17333df9398e192cb8949b34ffb9c2f59d8c54b44cabdc2d2c7c7468b
|
||||
DIST plantuml-1.2026.0.tar.gz 17480523 BLAKE2B 2cf4b9107c6bc6e6b455b5417ce217faad1c753783a004081e3ae839c24d65bb6cb6ae44d653955154b327cc01eb34a39d8d623b43f0f7abc97428e179e9d5e5 SHA512 efc3fdbecc47cb06b19b3e00bbf17570e1e58164867abbf18881c86589976c54261e9a61cb1846f09b596367397c81c651267c25f5194301bfdd0ed7212225c6
|
||||
DIST plantuml-1.2026.1.tar.gz 17526671 BLAKE2B 68af787dfbea0f7d86fb17f46cfe41789b0f0239d3b6db050079a542c84a301447d34b33bc32b7432d9292c42355e1643daf45783928cb50b296d035dfc08ac9 SHA512 c81819ccd73afbdfc76b3cbee0ffce790f0779dacce087180cba8b074fa7a908f85dff07fea013dda4d760394c4ec8edf2aaeecbc2fbd3410eed6d97bf291845
|
||||
|
||||
@@ -4,3 +4,5 @@ DIST apache-tomcat-11.0.15-src.tar.gz 7201779 BLAKE2B 82dcdd8a2b8dad6131dd6e9bea
|
||||
DIST apache-tomcat-11.0.15-src.tar.gz.asc 849 BLAKE2B d45e5eeb5cdf9c28765433502ecc36e9550153a5e272d35c809d4f6e76f72e062043cc60d668599d6bd2137ba22349f05f4225c2b6d8dda45b6c72ceb5d5a237 SHA512 5a8e3f8314c9f12b1cf56c90f568200e64fc9c4526d9c10d4b9c555c903527548eaca1b0082c37c662b453000028b969bffb5797e324558704356449423d524c
|
||||
DIST apache-tomcat-9.0.113-src.tar.gz 7421723 BLAKE2B e68848e07ea8f57256a8cb062c8472f7f883f805f1b0bdc13aa8c4f41315f30590642f99b4577751ac54aa400bbc4688511a6a967cbd4049734598ff3dedae5c SHA512 93d89a0501d428b3652960d45bd5d7db701d949386bfca05d4fe7ed63d95aa82c62611d25daa1ca959ae562ea82d1717144365a2e0a4770e7a96e9c94b2a7e33
|
||||
DIST apache-tomcat-9.0.113-src.tar.gz.asc 833 BLAKE2B 268ce09c40a008fc6c8512a7031cc06890c75f5616c4d0287cd113867153c3ea0a3f862fcbbfe65b1dea24c4de786b7c319bd12203e82d655f66b333ccf35655 SHA512 f8338631a94739edd2158f6bdca5daf3bf50f4087ee5b5bff034de1a2d83a8ba05d02f06b88a24bbaaad781ed3dc450372fe5c5e02f68905db9bb9672063c6bc
|
||||
DIST apache-tomcat-9.0.115-src.tar.gz 7446619 BLAKE2B 75ea2e298d871661a118d18d1d586f7df7724e0d72ece2e8f8f49e92df892003c0832998b5cfcac044a636b33b7e16b8fd48188bb68d3b7ea5a14b7302b5eab0 SHA512 cd975fbb8ff6187ca4697830bf01675b55e7e326f16ade8fb771d9f4cdab0976d20fea6f305180f93f124ecb6a7d1256a2e2bc3d50bb265d4a5aca5fc7351c48
|
||||
DIST apache-tomcat-9.0.115-src.tar.gz.asc 833 BLAKE2B c2392f66b09677b2ef42a7fa8cdf7b5e2aabc45ee556654360f4ed0d1840667a39dafb0812dde95b3a25da9a2f3325510d76cfebca24aac121223ad2bfd9b3ca SHA512 30e732959750bc5dae08a8ce2eded83ce45760bc8850177103342ed9d8541f44144d5a6c0d100ca1890defd456b1f002e19d6a22a254ba1d8183f82912cb010a
|
||||
|
||||
181
www-servers/tomcat/tomcat-9.0.115.ebuild
Normal file
181
www-servers/tomcat/tomcat-9.0.115.ebuild
Normal file
@@ -0,0 +1,181 @@
|
||||
# Copyright 1999-2026 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 ~arm64"
|
||||
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
|
||||
dev-java/javax-persistence-api:0
|
||||
>=virtual/jre-1.8:*
|
||||
"
|
||||
|
||||
DEPEND="
|
||||
${COMMON_DEP}
|
||||
app-admin/pwgen
|
||||
>=dev-java/ant-1.10.15:0
|
||||
dev-java/bnd: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:21 virtual/jdk:17 )
|
||||
test? (
|
||||
>=dev-java/ant-1.10.15:0[junit]
|
||||
dev-java/easymock:3.2
|
||||
)
|
||||
"
|
||||
|
||||
BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-$(ver_cut 1) )"
|
||||
VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/tomcat-$(ver_cut 1).apache.org.asc"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/tomcat-9.0.104-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
|
||||
use doc && LC_ALL=C eant javadoc
|
||||
}
|
||||
|
||||
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"
|
||||
}
|
||||
Reference in New Issue
Block a user