mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-17 14:49:30 -07:00
Merge updates from master
This commit is contained in:
Repository mirror & CI
@@ -1,4 +1,2 @@
|
||||
DIST commons-codec-1.16.1-src.tar.gz 450009 BLAKE2B da06c823fae5e106c27b10274fb159e3de62827fe1bb1ace8d65377da26d012534636a8ac58a558b653ba3a7e868bb2f7d94b2ea820b5ddc6400fd4d288c6ba9 SHA512 8e2d40ae625c04e61b0dd7473dea0b32fdd13a6d3aad47b8b052952ca46f57d3df4917133f523ea147305a1c7ed9267cce7c4fa34d901496e36e9d5de9856e61
|
||||
DIST commons-codec-1.16.1-src.tar.gz.asc 488 BLAKE2B d3f193b602339714728875189ae90a49f70f9efb70076e73bdc460ccca99aea832a7cf0b18ecd212b016787f8cc96a1e30f9cb0af7b83f05db2dfba00d71c144 SHA512 a0716601374f17add25698eb5abd111c560c258f4ab18278b6bd857b2bf32916b5e4e590ce8c39a0bdef3b83e16e9330ce84268dec810db7dfab1679cace85af
|
||||
DIST commons-codec-1.17.1-src.tar.gz 456746 BLAKE2B 9bf33c183d4344bdccdffa1c573f9b2cfe34db227cbcffa66a7baed85778a516339a736ddade637859989055e2ab86abb5464ab9bc57782e3c972cc8ed2c4dbd SHA512 c98456664396d4d9cb794c185a479e6bb4a5055ed1f526a8e358fe3a59409c057dbb16f59c251bb52976995dbca14d8f15857074c9d19fbc7bdfed625a13abf0
|
||||
DIST commons-codec-1.17.1-src.tar.gz.asc 488 BLAKE2B 63bd00bcf69ab41e58e1eb2b2e56749211aa044e769a16fe2eea6acdeeac85d59c7465597aaec671b6efe22c68b05cd64c2e7a4bd2dc2f7f2b235dd27a125153 SHA512 6e9475773162193ce005635a5af926e0c7bfbaaca4c801a66bdabe73de0a2d17ec489a77d904d7d69e5749bc2af07d5b0b97d5aef2a319c614a3f1db632d424c
|
||||
|
||||
@@ -1,46 +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"
|
||||
MAVEN_ID="commons-codec:commons-codec:${PV}"
|
||||
JAVA_TESTING_FRAMEWORKS="junit-4"
|
||||
|
||||
inherit java-pkg-2 java-pkg-simple verify-sig
|
||||
|
||||
DESCRIPTION="Implementations of common encoders and decoders in Java"
|
||||
HOMEPAGE="https://commons.apache.org/proper/commons-codec/"
|
||||
SRC_URI="mirror://apache/commons/codec/source/${P}-src.tar.gz
|
||||
verify-sig? ( https://downloads.apache.org/commons/codec/source/${P}-src.tar.gz.asc )"
|
||||
S="${WORKDIR}/${P}-src"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux"
|
||||
RESTRICT="test" #839681
|
||||
|
||||
VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc"
|
||||
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )"
|
||||
DEPEND="
|
||||
>=virtual/jdk-1.8:*
|
||||
test? (
|
||||
dev-java/commons-lang:3.6
|
||||
dev-java/hamcrest:0
|
||||
dev-java/junit:5[migration-support]
|
||||
)
|
||||
"
|
||||
RDEPEND=">=virtual/jre-1.8:*"
|
||||
|
||||
JAVA_AUTOMATIC_MODULE_NAME="org.apache.commons.codec"
|
||||
JAVA_RESOURCE_DIRS="src/main/resources"
|
||||
JAVA_SRC_DIR="src/main/java"
|
||||
|
||||
JAVA_TEST_GENTOO_CLASSPATH="
|
||||
junit-4
|
||||
junit-5
|
||||
commons-lang-3.6
|
||||
hamcrest
|
||||
"
|
||||
JAVA_TEST_RESOURCE_DIRS="src/test/resources"
|
||||
JAVA_TEST_SRC_DIR="src/test/java"
|
||||
@@ -1,4 +1,3 @@
|
||||
DIST jansi-1.13.tar.gz 253219 BLAKE2B 89fc81710bc0860c717241c97fe2e7a148ccbaa5fb1e7db30b978aa69cddccbc9ea45a0e30ef384c42a741d707f5eab73ce8b2a76e1095c66a2c95f9088f28f0 SHA512 9c4bb0b7435c102068718e039900828994f1ba60ed44307eb726eb91a2884bc406688c2747635b9353f3bd68a6bf0e7c082a4069343b59efffc900f59c563fde
|
||||
DIST jansi-1.18.tar.gz 273545 BLAKE2B 9bb18ac181551008316ecf2735a4e573a64e9869d1d5f2f79dc25072c40c088798d0388fe0c65f860617f1afcaf97af1be6c2539a6e19541e4ed40863aaed52c SHA512 d34f271853250d4b23987c0b4d2eeadd9fdb1211b2f5187258bb43e2741d8263312ee04c9a39812550eb658853668a5e941ff3978682cea47c059c6ba85d3e9d
|
||||
DIST jansi-2.4.1-jni.h 74987 BLAKE2B 23ecaf1e83f043492d774420bb20b4a890fd37bc7469fe8710dcddc72ddbded4aaa7f17589f7b886f26bf9a95cac50c3afd6480fee25d6cf1b01660f98a55f3f SHA512 2c9be8438b8c93f3d00abb8cd3f4b14e57fbaa8de562c12b982db5d32c250a436210e4d44aba22585b489dcb47ea1504cd1a7695a6d1fc60808ecd2140f400b2
|
||||
DIST jansi-2.4.1-jni_md.h 2002 BLAKE2B 2112e87963902727e1755b6fa3bc4301b5181787a6f4003674db095896b78f9f745cabe3278b1df06b5cde13dffaf77938668f389f388e410b97cadd42851d75 SHA512 c3c7dffd9518accbcbab60c904af7acadb999048881c571acada162fd39f18de9aa024b09abe10a2138c1398b281890e4473fbaef6e27541e50370119eed5dff
|
||||
|
||||
@@ -1,38 +0,0 @@
|
||||
# Copyright 1999-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
JAVA_PKG_IUSE="doc source test"
|
||||
MAVEN_ID="org.fusesource.jansi:jansi:1.13"
|
||||
JAVA_TESTING_FRAMEWORKS="junit-4"
|
||||
|
||||
inherit java-pkg-2 java-pkg-simple
|
||||
|
||||
DESCRIPTION="A library that allows you to use ANSI escape sequences in your console output"
|
||||
HOMEPAGE="https://fusesource.github.io/jansi/"
|
||||
SRC_URI="https://github.com/fusesource/${PN}/archive/${PN}-project-${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 arm64 ppc64"
|
||||
|
||||
CDEPEND="dev-java/jansi-native:0"
|
||||
|
||||
DEPEND="${CDEPEND}
|
||||
test? (
|
||||
dev-java/junit:4
|
||||
)
|
||||
>=virtual/jdk-1.8:*"
|
||||
|
||||
RDEPEND="${CDEPEND}
|
||||
>=virtual/jre-1.8:*"
|
||||
|
||||
S="${WORKDIR}/jansi-jansi-project-${PV}/jansi"
|
||||
|
||||
JAVA_GENTOO_CLASSPATH="jansi-native"
|
||||
JAVA_SRC_DIR="src/main/java"
|
||||
|
||||
JAVA_TEST_GENTOO_CLASSPATH="junit-4"
|
||||
JAVA_TEST_SRC_DIR="src/test/java"
|
||||
JAVA_TEST_RESOURCE_DIRS="src/test/resources"
|
||||
@@ -1,3 +1,2 @@
|
||||
DIST hadoop-common-3.3.5.jar 4535144 BLAKE2B 66582661a1832cc54493fc9dcea9076eb0e3f4e974a7d24d593e8fff2b9e2a3a82ed6eb4587f23523473aecc35d2a15de2ad81b2617c1bdac50847149cdeb6a8 SHA512 f1fb439a5853b04e9e771ec4e80e1ed078494ecfaa741abe065936fc1c26b5369fdd4e8082f4da59c1a3a7a5c025beaa14a68c38dc772e81499f83a3cb91717b
|
||||
DIST snappy-java-1.1.10.5.tar.gz 3917442 BLAKE2B 0632fa7ba4d0a863801e88ced22098c3bc228c1f3e188c67cb9ff62807f9454b580b49fff15c7deee1e790db51f4664c50a6546259439eda18597097a5128329 SHA512 f84778f59635eb97c0072489766904a16208be4f41b28151b14eecd0fe84f3f04a44c18d452b9d79e752b22d5e5b9ab5b36064cc8aeec8de655d7635132093ea
|
||||
DIST snappy-java-1.1.10.7.tar.gz 3953515 BLAKE2B 40657085a25186b7c78024196406002a39afe26e97145f57a438d783fb512c0168b48ef3f38d9d123954458c56e593f8490a5069a1712bb7d4ec86cf425a828c SHA512 1d7f484202f6bfd59454d56a9f57b0795f0919ae607e0bfd4da0b58c0caae437ae3c3f8638699a94b0b4794197a03058c3b5e258c5cf87b95683587a3e8396fe
|
||||
|
||||
@@ -1,11 +0,0 @@
|
||||
--- a/src/test/java/org/xerial/snappy/SnappyHadoopCompatibleOutputStreamTest.java
|
||||
+++ b/src/test/java/org/xerial/snappy/SnappyHadoopCompatibleOutputStreamTest.java
|
||||
@@ -2,7 +2,7 @@ package org.xerial.snappy;
|
||||
|
||||
import org.apache.commons.io.FileUtils;
|
||||
import org.apache.commons.io.IOUtils;
|
||||
-import org.apache.commons.lang.SystemUtils;
|
||||
+import org.apache.commons.lang3.SystemUtils;
|
||||
import org.apache.hadoop.conf.Configuration;
|
||||
import org.apache.hadoop.io.compress.SnappyCodec;
|
||||
import org.junit.AfterClass;
|
||||
@@ -1,125 +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"
|
||||
MAVEN_ID="org.xerial.snappy:snappy-java:${PV}"
|
||||
JAVA_TESTING_FRAMEWORKS="junit-4"
|
||||
|
||||
inherit java-pkg-2 java-pkg-simple toolchain-funcs check-reqs
|
||||
|
||||
DESCRIPTION="Snappy compressor/decompressor for Java"
|
||||
HOMEPAGE="https://github.com/xerial/snappy-java/"
|
||||
# ::gentoo does not have hadoop-common packaged. Currently we bundle the binary version.
|
||||
# It's used for testing only and does not get installed.
|
||||
HCV="3.3.5"
|
||||
SRC_URI="https://github.com/xerial/snappy-java/archive/v${PV}.tar.gz -> ${P}.tar.gz
|
||||
test? ( https://repo1.maven.org/maven2/org/apache/hadoop/hadoop-common/${HCV}/hadoop-common-${HCV}.jar )"
|
||||
S="${WORKDIR}/${P}"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 arm64 ppc64"
|
||||
|
||||
CP_DEPEND="dev-java/osgi-core:0"
|
||||
|
||||
CDEPEND="
|
||||
app-arch/snappy
|
||||
>=dev-libs/bitshuffle-0.3.5-r1
|
||||
"
|
||||
|
||||
DEPEND=">=virtual/jdk-1.8:*
|
||||
${CP_DEPEND}
|
||||
${CDEPEND}
|
||||
test? (
|
||||
>=dev-java/ant-1.10.14:0[junit4]
|
||||
dev-java/commons-io:1
|
||||
dev-java/commons-lang:3.6
|
||||
dev-java/plexus-classworlds:0
|
||||
dev-java/xerial-core:0
|
||||
)"
|
||||
|
||||
RDEPEND=">=virtual/jre-1.8:*
|
||||
${CP_DEPEND}
|
||||
${CDEPEND}"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/1.1.7.8-java-version-target.patch"
|
||||
"${FILESDIR}/snappy-1.1.10.1-unbundle-snappy.patch"
|
||||
"${FILESDIR}/1.1.7.8-unbundle-bitshuffle.patch"
|
||||
"${FILESDIR}/1.1.7.8-gentoo.patch"
|
||||
"${FILESDIR}/snappy-1.1.10.5-SnappyOutputStreamTest.patch"
|
||||
"${FILESDIR}/snappy-1.1.10.1-commons-lang3.patch"
|
||||
)
|
||||
|
||||
JAVA_RESOURCE_DIRS="src/main/resources"
|
||||
JAVA_SRC_DIR="src/main/java"
|
||||
|
||||
JAVA_TEST_GENTOO_CLASSPATH="
|
||||
commons-io-1
|
||||
commons-lang-3.6
|
||||
junit-4
|
||||
plexus-classworlds
|
||||
xerial-core
|
||||
"
|
||||
JAVA_TEST_RESOURCE_DIRS="src/test/resources"
|
||||
JAVA_TEST_SRC_DIR="src/test/java"
|
||||
|
||||
check_env() {
|
||||
if use test; then
|
||||
# this is needed only for tests
|
||||
CHECKREQS_MEMORY="2560M"
|
||||
check-reqs_pkg_pretend
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_pretend() {
|
||||
check_env
|
||||
}
|
||||
|
||||
pkg_setup() {
|
||||
check_env
|
||||
java-pkg-2_pkg_setup
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
java-pkg-2_src_prepare
|
||||
# remove pre-compiled sofiles
|
||||
rm -r src/main/resources/org/xerial/snappy/native || die
|
||||
rm -r src/test/resources/lib || die
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake \
|
||||
CXX="$(tc-getCXX)" \
|
||||
JAVA_SOURCE="$(java-pkg_get-source)" \
|
||||
JAVA_TARGET="$(java-pkg_get-target)"
|
||||
|
||||
java-pkg-simple_src_compile
|
||||
}
|
||||
|
||||
src_test() {
|
||||
JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/hadoop-common-${HCV}.jar"
|
||||
JAVA_TEST_EXTRA_ARGS=( -Xmx${CHECKREQS_MEMORY} )
|
||||
local vm_version="$(java-config -g PROVIDES_VERSION)"
|
||||
if ver_test "${vm_version}" -ge 17; then
|
||||
java-pkg-simple_src_test
|
||||
else
|
||||
einfo "Tests need jdk-17 to pass."
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
java-pkg-simple_src_install
|
||||
|
||||
local jniext=.so
|
||||
if [[ ${CHOST} == *-darwin* ]] ; then
|
||||
jniext=.jnilib
|
||||
# avoid install_name check failure
|
||||
install_name_tool -id "@loader_path/libsnappyjava${jniext}" \
|
||||
"target/libsnappyjava${jniext}"
|
||||
fi
|
||||
java-pkg_doso "target/libsnappyjava${jniext}"
|
||||
}
|
||||
@@ -1,8 +1,8 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>tupone@gentoo.org</email>
|
||||
<maintainer type="project">
|
||||
<email>ada@gentoo.org</email>
|
||||
<name>Tupone Alfredo</name>
|
||||
</maintainer>
|
||||
<longdescription lang="en">
|
||||
|
||||
@@ -1,8 +1,5 @@
|
||||
DIST openpgp-keys-apache-tomcat-10.1.31-KEYS.asc 35385 BLAKE2B 1c2bba42759f901fef1cda1871c706cd5f960de4120de62361853b7e6cade3c205852215e8562e066ca675506bf1a8d424fb588dfd856cdc99bca5bcc575be06 SHA512 43d3c06e6eb776b939864a092161f70759e6f095b9b2bb7f00172cb6dca890fb88dff6f646863b882226ac490ad8082c03a84f93dfe917e7b9aab378f54612ce
|
||||
DIST openpgp-keys-apache-tomcat-10.1.33-KEYS.asc 35385 BLAKE2B 1c2bba42759f901fef1cda1871c706cd5f960de4120de62361853b7e6cade3c205852215e8562e066ca675506bf1a8d424fb588dfd856cdc99bca5bcc575be06 SHA512 43d3c06e6eb776b939864a092161f70759e6f095b9b2bb7f00172cb6dca890fb88dff6f646863b882226ac490ad8082c03a84f93dfe917e7b9aab378f54612ce
|
||||
DIST openpgp-keys-apache-tomcat-10.1.34-KEYS.asc 35385 BLAKE2B 1c2bba42759f901fef1cda1871c706cd5f960de4120de62361853b7e6cade3c205852215e8562e066ca675506bf1a8d424fb588dfd856cdc99bca5bcc575be06 SHA512 43d3c06e6eb776b939864a092161f70759e6f095b9b2bb7f00172cb6dca890fb88dff6f646863b882226ac490ad8082c03a84f93dfe917e7b9aab378f54612ce
|
||||
DIST openpgp-keys-apache-tomcat-11.0.1-KEYS.asc 36169 BLAKE2B 6e29022080dc7cc4e3c9af841ab9274ba8cc983f5cd663699d1c7b29c0d12b6c8e778bac6aa59a1ba9b90d9ff00781e3f715741e27f5b37b1b1e9c87fe4c20fb SHA512 f953bea7820e203608dbe2483d3cee0c082352c7ef86627acc37db3bbef3699b72c5709ce5cbe4ec24379fc7a9b648aa3f31bb7c98847105acb56a283b331239
|
||||
DIST openpgp-keys-apache-tomcat-11.0.2-KEYS.asc 36169 BLAKE2B 6e29022080dc7cc4e3c9af841ab9274ba8cc983f5cd663699d1c7b29c0d12b6c8e778bac6aa59a1ba9b90d9ff00781e3f715741e27f5b37b1b1e9c87fe4c20fb SHA512 f953bea7820e203608dbe2483d3cee0c082352c7ef86627acc37db3bbef3699b72c5709ce5cbe4ec24379fc7a9b648aa3f31bb7c98847105acb56a283b331239
|
||||
DIST openpgp-keys-apache-tomcat-9.0.96-KEYS.asc 14008 BLAKE2B 62f0f6bf0d89a3930df668c039c69c4b2648128079a4d420f4f0c8a1b4c228ca5c631f3d2f66745a7c4d8c85e98609dc4119bc224306d972f65ab432385a1231 SHA512 51ad85d42824d22ace66ce2eeee62df598d55efe11caad7f6e5c9d09377a80431013711a0243fb0dc1f7a4bf3aa24ed77024a311aa77277743b784e3ef6a946e
|
||||
DIST openpgp-keys-apache-tomcat-9.0.97-KEYS.asc 14008 BLAKE2B 62f0f6bf0d89a3930df668c039c69c4b2648128079a4d420f4f0c8a1b4c228ca5c631f3d2f66745a7c4d8c85e98609dc4119bc224306d972f65ab432385a1231 SHA512 51ad85d42824d22ace66ce2eeee62df598d55efe11caad7f6e5c9d09377a80431013711a0243fb0dc1f7a4bf3aa24ed77024a311aa77277743b784e3ef6a946e
|
||||
DIST openpgp-keys-apache-tomcat-9.0.98-KEYS.asc 14008 BLAKE2B 62f0f6bf0d89a3930df668c039c69c4b2648128079a4d420f4f0c8a1b4c228ca5c631f3d2f66745a7c4d8c85e98609dc4119bc224306d972f65ab432385a1231 SHA512 51ad85d42824d22ace66ce2eeee62df598d55efe11caad7f6e5c9d09377a80431013711a0243fb0dc1f7a4bf3aa24ed77024a311aa77277743b784e3ef6a946e
|
||||
|
||||
@@ -1,19 +0,0 @@
|
||||
# Copyright 1999-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
DESCRIPTION="OpenPGP keys used by tomcat.apache.org"
|
||||
HOMEPAGE="https://tomcat.apache.org/download-10.cgi"
|
||||
SRC_URI="https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/KEYS -> ${P}-KEYS.asc"
|
||||
S="${WORKDIR}"
|
||||
|
||||
LICENSE="public-domain"
|
||||
SLOT="${PV}"
|
||||
KEYWORDS="amd64 ~arm arm64 ppc64 x86"
|
||||
|
||||
src_install() {
|
||||
local files=( ${A} )
|
||||
insinto /usr/share/openpgp-keys
|
||||
newins - tomcat-${PV}.apache.org.asc < <(cat "${files[@]/#/${DISTDIR}/}" || die)
|
||||
}
|
||||
@@ -1,19 +0,0 @@
|
||||
# Copyright 1999-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
DESCRIPTION="OpenPGP keys used by tomcat.apache.org"
|
||||
HOMEPAGE="https://tomcat.apache.org/download-11.cgi"
|
||||
SRC_URI="https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/KEYS -> ${P}-KEYS.asc"
|
||||
S="${WORKDIR}"
|
||||
|
||||
LICENSE="public-domain"
|
||||
SLOT="${PV}"
|
||||
KEYWORDS="amd64 arm64"
|
||||
|
||||
src_install() {
|
||||
local files=( ${A} )
|
||||
insinto /usr/share/openpgp-keys
|
||||
newins - tomcat-${PV}.apache.org.asc < <(cat "${files[@]/#/${DISTDIR}/}" || die)
|
||||
}
|
||||
@@ -1,19 +0,0 @@
|
||||
# Copyright 1999-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
DESCRIPTION="OpenPGP keys used by tomcat.apache.org"
|
||||
HOMEPAGE="https://tomcat.apache.org/download-90.cgi"
|
||||
SRC_URI="https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/KEYS -> ${P}-KEYS.asc"
|
||||
S="${WORKDIR}"
|
||||
|
||||
LICENSE="public-domain"
|
||||
SLOT="${PV}"
|
||||
KEYWORDS="amd64 ~arm arm64 ppc64 x86"
|
||||
|
||||
src_install() {
|
||||
local files=( ${A} )
|
||||
insinto /usr/share/openpgp-keys
|
||||
newins - tomcat-${PV}.apache.org.asc < <(cat "${files[@]/#/${DISTDIR}/}" || die)
|
||||
}
|
||||
@@ -1,15 +1,9 @@
|
||||
DIST apache-tomcat-10.1.31-src.tar.gz 6898465 BLAKE2B bcc4b1e973be8f83a02b046bd0df046367d1eaef897e0e5ef88127ede77988ed97243e39f240542a24ab81ffbe3d97abef81a39b790a63e2319e1990c2aacb84 SHA512 79d4052935c6f1757de34cd5cab1560095c901764d363509d84a3c77527e146f38776c78ae934adde19cf04d863b0e6010adba5cb403dae1ff48bdc99e9126e9
|
||||
DIST apache-tomcat-10.1.31-src.tar.gz.asc 833 BLAKE2B 59d59001cdaa03d52ab807689959349b41d59fed0a896106567c8fc2392966aa365c355fd1ac944943e0571202a088c3ebbd439b62b8e446a1d48c001d9d7be3 SHA512 11f917d616ea00c1d53b7e439cfe0033fa922bb8a0a3c4d430e3bfae536c24af0de5fbba4ab99b2cd84dc0e3b4f98a5ac4c8fe776e2d2f2fb7335fef6a7c78b1
|
||||
DIST apache-tomcat-10.1.33-src.tar.gz 6926625 BLAKE2B 4502c02d618569eb9f526769877f0817722d4a474a72ad9020c2fbf86ff6ec17599df547d019d81656d433a22efb7d81c56902e435bf3fde636849957070cdd5 SHA512 63ef609bbb2d664f5fe969216eee157a3f45f040f2aa90b6885c9ebe706099896beb620b7659d2dc8c759a08a0370d7849f5e664844e3b78bc82d521617bfd8d
|
||||
DIST apache-tomcat-10.1.33-src.tar.gz.asc 833 BLAKE2B 8bf20910fbefc277cf7e677c06aa3476ad4190f38fafb820063e4af59854d955666ff77eede13e6a7a952a21b88d169d9601655dcfcd38682f87db5522310e2a SHA512 111e8d7c7d7d365a8fee2207307fb64685a3c77e1b87a73ede8fe87a083e3e2f3425c41ca6072f6ded51ba6e59ff2997b7198f048d86daa1a947a91fcfe276e4
|
||||
DIST apache-tomcat-10.1.34-src.tar.gz 6946871 BLAKE2B 9e25c8fd0ca4a8d19e2d4f912bb904d691b98b1597fbdd823a3381bdf99073a00cc8655924ef733c13214afb2a9ef92f75708eb4454e266245ad8861f90f64cb SHA512 0124d92eb1d184bdce1a50d5934958a0c796460a7157a8622aeee2b21060f5377198939a0260285bcdaa25cea42b880cb97575469a63f7b33ec22d532927e6ca
|
||||
DIST apache-tomcat-10.1.34-src.tar.gz.asc 833 BLAKE2B 564c266e4967967450c10944a388c3df051971d00a632d8ecfe68f0a8741f89b270d965f8f62ff8cdc1f097f184f34025ec18b0e4ecfef26bed3a8db9ff8e028 SHA512 2c96d2f89f2bfc449516cdc06682a5404168cdd9e473211444a141aafe3fabe743d68d4e7e32c8a2bc2bb23d875e09c28781ca4cb33e9e13288086c97c20e891
|
||||
DIST apache-tomcat-11.0.1-src.tar.gz 6857402 BLAKE2B 7e8b006454578328b200a2ecb93ab6db7f5db19c9a7be5af794cd90cf72a6836170c1ca8228b89c132ef42adedbc4a6ac4ee0b0c11ab77cdd3180cbdd40ad394 SHA512 9e05a85331d5c868b149476e8bad4618c4608cd82d425c2bd907c1c4888e7d7e8eebba623ad7e5ded03123e089a1a8c271f69d4d9c62c3829634fe145b668588
|
||||
DIST apache-tomcat-11.0.1-src.tar.gz.asc 849 BLAKE2B e7d20faf4bf17318bf3afb053b0c573b1c721b2d40633f0bdb928143b632dabcd53dac302de672e119195947ea11aaee5fbab1f5d6b1fd660c9839369c27f4ff SHA512 32fb68ead6b5576d9d52f7c27a9b8aa55cec0f6db76f5fb2abb5666804d5eacba3636d7fa8b337ada3320a1cab7e01f829a9d644ede3584a5a05aec613aa92a8
|
||||
DIST apache-tomcat-11.0.2-src.tar.gz 6877090 BLAKE2B 3ed1b184ecf43d12678d3682830065562ce4442aab571ee926b91f509195e314aeceeb10ff2ad935332b38607fd09237eeca274d526df9b7daad17fe6f144508 SHA512 38c5b9c75edb7e620a89376deab0c2e2af08e5853021e207ba26f8b4a2fa1dae2aecffb79bc9c443eb989c96317268a947a42b6869ca2cd827d2bda3be426433
|
||||
DIST apache-tomcat-11.0.2-src.tar.gz.asc 849 BLAKE2B 0e670e67396068747d5371da13135696be8b4555892e1cd8338413f7540ded08203c986074cfe42bd077e475a30a05299fd35def29e8a089e570e68be473366c SHA512 ae10b95f4a5a9e922721d190ff9abfeeb62d5814277b076e1d12a5dec64491de8c382273a1b4ccc3f3d193ce561ba34214334048a9e28dcb22a50458d9103016
|
||||
DIST apache-tomcat-9.0.96-src.tar.gz 7042818 BLAKE2B de7d573a2ee83ffe997f65ff2b66b8205efdb05c7155e6e6982c5ff0406b0f7ddf1a93978b758c956e5fee8f5b8df8880ef55b4009248a2477f26dc1da30a8b0 SHA512 cd6d0730b2aa34520249f8285b0663f88b601ca508f8534fa948ad0a9502dd760f446b6adc930b947c310d05e33025186b88ecab71a0ea16618ae24edb0c4884
|
||||
DIST apache-tomcat-9.0.96-src.tar.gz.asc 833 BLAKE2B 6df8c0c7ee73b9104c102c1c4c0f2030728de90a968efc26a0c85537d7876a0402bc66fea9a3a398be8f210c6255b5741ee969a0633cdecd95268731615f8635 SHA512 37404f8687b0bfc761611402ac4581e98063a229f9a4b40d4b4c6fc25e966d48a2b951cdd198cf60930bb7b776ebce6ef02eeaa89e51351120b462ae1b20e54c
|
||||
DIST apache-tomcat-9.0.97-src.tar.gz 7072346 BLAKE2B ab6e4359d01016f83d66ed516471701c4a9ecc6c4bffc13474978b7bf01cf4336ea88a6f3c3bb9e97f63f9056e4b3fc7d766e144f100862b2c0e5540109f46e9 SHA512 e0500e0c7e4af40f0a6db845b73f41423a7b7746e110053c36744fc376a0db96d141069035171f5b6efdf6011c155cbc29815cd286a0508cefaddb776909a00a
|
||||
DIST apache-tomcat-9.0.97-src.tar.gz.asc 833 BLAKE2B 0efe929bc4e6be06cfdb4ea424af5d7a07633aeab42320b46eb724f25a3bdb8eccee0cd7cdd437579d49c63e40b4bfe6689620048e3a23196e5b34345a9c7c17 SHA512 00ae9e08cdec0ddee501ba51f42b44979dd2a9ffd8211eb121eb8851cd8332e2ff00de25d1ba517a494b5ef71b5ae8934a6fbf8094623631bd2cc70c49c0140c
|
||||
DIST apache-tomcat-9.0.98-src.tar.gz 7091158 BLAKE2B 040f6a1a02140b85e324f1a17485c3866d9d336f8c032e7de4b8e3880d405339d43e853cf0999ff3e5e4e12c0551d64a39a3bb218dd0cad4cc5124ce2915a3cd SHA512 eb380dae515a259d23d5311d0b96b8ef5068c0d8d72da215410e5475582d2ff82182b7331e0d197eb993d8014a99ea40290154a343e961a07ed02be6894759cc
|
||||
|
||||
@@ -1,179 +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 ~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: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
|
||||
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"
|
||||
|
||||
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"
|
||||
}
|
||||
@@ -1,185 +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.1/JSP-4.0/EL-6.0/WebSocket-2.2/JASPIC-3.1 Container"
|
||||
HOMEPAGE="https://tomcat.apache.org/"
|
||||
SRC_URI="mirror://apache/${PN}/tomcat-$(ver_cut 1)/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="11"
|
||||
KEYWORDS="~amd64 ~arm64 ~amd64-linux"
|
||||
IUSE="extra-webapps"
|
||||
|
||||
RESTRICT="test" # can we run them on a production system?
|
||||
|
||||
ECJ_SLOT="4.33"
|
||||
|
||||
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"
|
||||
|
||||
# jre-17:* because of line 1081, build.xml
|
||||
# <filter token="target.jdk" value="${compile.release}"/>
|
||||
RDEPEND="
|
||||
${COMMON_DEP}
|
||||
acct-group/tomcat
|
||||
acct-user/tomcat
|
||||
>=virtual/jre-17:*"
|
||||
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
|
||||
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-11.0.0-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
|
||||
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"
|
||||
|
||||
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"
|
||||
}
|
||||
@@ -1,172 +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 ~arm64 ~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: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
|
||||
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