From c50fa1b9d54c15707ec744b80db6610da7dd7832 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 28 Sep 2022 09:11:58 +0100 Subject: gentoo auto-resync : 28:09:2022 - 09:11:58 --- www-servers/tomcat/Manifest | 3 + .../tomcat/files/tomcat-10.0.26-build.xml.patch | 347 +++++++++++++++++++++ www-servers/tomcat/tomcat-10.0.26.ebuild | 198 ++++++++++++ 3 files changed, 548 insertions(+) create mode 100644 www-servers/tomcat/files/tomcat-10.0.26-build.xml.patch create mode 100644 www-servers/tomcat/tomcat-10.0.26.ebuild (limited to 'www-servers/tomcat') diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest index a53236116ee7..ef498ccd00f3 100644 --- a/www-servers/tomcat/Manifest +++ b/www-servers/tomcat/Manifest @@ -1,5 +1,6 @@ AUX tomcat-10.0.16-build.xml-strip-html5.patch 1201 BLAKE2B 57df5e44b741bc3c981312ce48330d0f43353f3ca010870c5f4a43539c120178147371129a66baa6d3a16da31328d21e0653060aa5cd4647b5935a05349d20e9 SHA512 38e194748ffae04be81624fe3dd5175acc1d0f62d07f9762e0831c5e840180c947492d03bde9722271690f6c94b5805992a5f7513520968bfdc037e33f9ba455 AUX tomcat-10.0.20-build.xml.patch 13813 BLAKE2B 2c6b1376751a768910b38de8bf4cd0e68f71e6215186f1efbfdd06e4a83e63faf8c124e7413f33f91eea50c8c35624f7cc0e43081c1ecdb18935bec6bae0f1e2 SHA512 43312b1fe6c25ff9144a20feba1871762abd6469d02cc7c92a649ffd738ce64fe3a2882d8129b6d0e1f8a69a73ba726001d6053873553cde25234701cd14e895 +AUX tomcat-10.0.26-build.xml.patch 13736 BLAKE2B 2946d2b8c1330fbf29244f1038f0854aff44bbfa702d6c648a041b7945b628e0f748a6bc13f89df466762542bb8904c406d1fa9c76f89f52b44d66348145aee9 SHA512 56670abd0e28b27d0fa27c99e69ed13964478edf64f6f8551a8a6bbde6ec70f0ff4f879fa40e6a61398d9e59f9b018e03e466a0b217f5667db448a60c61717b9 AUX tomcat-10.1.0-build.xml.patch 13790 BLAKE2B f84bfdd9da38d738cc8fbd91bc4bf29b76feb82bb7b562e90aa9fbaa55009e482260c39958210912c0fa9936b29e7a479951765d99f49c8d70fe2190aa50cabe SHA512 c30fba95c36190dd1d0b61497536c5b8880c3e2ef629e697509c343a34be24a4848d84279ad9881196752b40d5d9b1d496840ffc317f4f9e668290f52ebc48a8 AUX tomcat-8.5.66-build.xml.patch 10850 BLAKE2B 69353bcf5697e6ae0b930c71fbb870401e822340f0eb0b8a6283e0d8cd1388d1d22a12190d089f7001a06e2491bb2309aab8c93b8f2a79e8439571fed8d0aebb SHA512 498c2ac8ab49cd83151ddfc6b47bd3a7a7148096e331ae55c7fe3da90007c19387208de64f5b3e796ec54b4b8534b11f906940fcf49343157acc862fcf06f5c7 AUX tomcat-9.0.37-fix-build-rewrite.patch 513 BLAKE2B e806ca32771bcad0fbc2f1b3f223af2b17d2caffe6ed034783294650d4ec22c8d9d9d215ade85569f6627508c61b7d469412d582093708b6bb728d6123d65155 SHA512 7aab16d1b52fa88352df849ca051dcaf27f645b1b3edd3df3a7d87385b5068d300105f89c18ba3a0f65818739b85ec847ddd5b28b8b655efbb7b39036099cae2 @@ -9,6 +10,7 @@ AUX tomcat-instance-manager-r2.bash 6999 BLAKE2B f1c771678bd8b894ecf242d5a8fb22f AUX tomcat-r1.init 3200 BLAKE2B eb913d32bb8c1883e58551a25ff9516337d947c6fd2c7b449601a89a4518286d61dbca76417265289782a7a08540d8e78a3ea1cd1427d43d87e24813261c0fee SHA512 3d32e2ad998adfbaea5fe0ffcbbe6659dcb530a110faed5f2712ae2fd767353b1fc3f1ac83a24d43138c1bfc55949e645833a428ab982be14415887fc46d9fab AUX tomcat.conf 1811 BLAKE2B a92606e113172c6f0f73e18ab8ad8796f38bd8c741bb2fd1f6c43d7682728729d0198d4150e42282c7e732750231b7cdbfb51de9b24f2ba780a22700965113c5 SHA512 0747dd2fdad6c68123425adce39f625d34924ae3e7c9d5a00361565a593047d7a4d01dee64c1ef831e5ad79b51750babaf642b0588d4b5948bbed441d53d654d DIST apache-tomcat-10.0.23-src.tar.gz 6136614 BLAKE2B 4eaf963187b9a754ed459d7f85e6f7d329927b949bb4a390a602cdc6651aa037aeec559c511ddb9880b6ec4d7cd97b96d82da341509370e412e1b21b799d8c2e SHA512 19ec026bae75318e9ffbe2e619ad2e12ec116382ea88a1064696275afb3fd13e6f08efe497dde79689bfc828f76e27d114ad3a9284b79c8d956a6a85bdac6360 +DIST apache-tomcat-10.0.26-src.tar.gz 6153701 BLAKE2B fb16f83cf71dc97f21739c3714d2d3d201aa6b6b4242c351fabfc04ee767e59b6e376c7c8984dcda12d6942835221c55d4451b2d0a1245a2dbb73636c93da47c SHA512 f66387a3ca67b6b3df8504c4ae089e8f30e389811a8d0b7d2241e115b8cf712a38f3d0fea938cef7fa9745f412aa70ad47840e40e2385fbd1435b636e93b45b4 DIST apache-tomcat-10.1.0-src.tar.gz 6060833 BLAKE2B 49f36131c1e809b298ac915e671b9f4df55b55c2ba34d21ee3fdeb8759ddaf53a6780b177e8049446079d91186c52669969f30762ddf776d9f8615e527d5a975 SHA512 08323eec0403473fa97f419d7911980c3dfe7b1607a64741bbe972a737dfa70ea04ea80ca9ab28bf72bdde9d24cf8f7161eeb8b194204c777d1628d00c78611c DIST apache-tomcat-8.5.82-src.tar.gz 6011553 BLAKE2B ea34c0485877ace8c84144f0e75f370c0ac461b5b725d97a07e27014b7a14b1ab88fad4230d4fae60190d7bff3836f691615b57b9f085797477acc69560a57ce SHA512 3e0a0a808fb78493930ce8832731eba4ab3cc440387c3b5226ff6e4ac2faf5fd70eff1560d840d34f14a8acfd7e60fc8b7f638f3dbe0c0ed4569dc4271a9c3f2 DIST apache-tomcat-9.0.65-src.tar.gz 6195265 BLAKE2B 13ca956b58e9f1831700f67d1fa8883f6471ab6b700b2af169bf284552658a4e9ad4130451b36976af4dd366cc987e228e0b0f98e688cccf577c626dfc78aae7 SHA512 3ff344370cc36f5bed389ed198054783a4f5bc86476a751cda280618457a06bae38c1e764b0c110c2f68efe2d34243a4e24596e8b90e8fbd171bf584a22fd3bc @@ -18,6 +20,7 @@ DIST biz.aQute.bnd-6.3.1.jar 16703723 BLAKE2B 97cc171a926be326abe95695e795ccb575 DIST biz.aQute.bndlib-6.2.0.jar 3156015 BLAKE2B 922b9bc78e47968bad73a26f4df475d84d8a2bca3773473b1f8c147737e652728df4e90a49d09a20943f418a91fd5acfe18e51137e85850796d95b7415bcf684 SHA512 7b7b366467b71c6dd67b3d7a7bc63d476c4aca479153bbc1506435168b0b4c792152fb5b44e2b1f916cd67f482d15956d2c38182fdfaf9679dff65b1b109a16a DIST biz.aQute.bndlib-6.3.1.jar 3183076 BLAKE2B 73bef88e8f3c8015d259ac36b953672ed9cb0aa5d9dfca3361033a7f37646bb65bbea8be4ef1fb425518e85ec8a9cc63032815671ece5f956b754ecf555dc174 SHA512 7c3f7bc0280beb1b15182c558ef23f431719c046da8473545efe9aeec935776ebf6682cabbb7e7f53dcf2ccca168d8df35859be77121dab04340a5ec7e993608 EBUILD tomcat-10.0.23.ebuild 6258 BLAKE2B 438a3004bf5f4206f8aee6b0267f9597e56981ad4a698f181e135df2cc3576f7e695be10815fce7a15207646e991ecfcfc69de13ce8325cb285e0eb75cce38d8 SHA512 d5c7815169e200036d326f8b2901342a00fe88992409eb53c956393640f791bf4e5f8030bf0389d36be9fc04ae5c2a9a3c6a22e7bca4cad2a6b080d127f0f3a7 +EBUILD tomcat-10.0.26.ebuild 6259 BLAKE2B 76ee89aa40aad7928e6b5efda717f1b7921c90da7633d61d64badfab0b96dce00a6b2c664f3aa63e7d8f5a639e64e3b49ae82aee92c1f0a59f067375cc5ab190 SHA512 e68f8d88453df916f7fd46536495e591955b16eceb6b91392a0e9cc94c84a8583a641263497924983f75785eea01b0c19014e3ff2d84522cce0ee89c8701176f EBUILD tomcat-10.1.0.ebuild 5926 BLAKE2B 48b81bb89e5444506e8fe1c81bd7d3da502225bc6749e098e246f7fc6533c59cf10f6f2c75d1fcd1d79ea38b1c9341c003459bc2b744de3a67e8fbe36a979e2f SHA512 e8c817b480f93809ad6d8e2585cd3eed9035ef83e81595ab6f063db7776d2b67e8f740fd2c9be54640f3bc5ce3e08b3b87693e7b1a5c0f7115c5061c8ef1b05e EBUILD tomcat-8.5.82.ebuild 4749 BLAKE2B 07355b40016620c842b4b582ea11ca987bc04b4b89c65ed6228d0d94a37518d5cfe0da98589cec5985aa6d62fa701f9932c1bde8683734c1985bea6f7f181656 SHA512 2c5edb87d504df16582030f7340df7a27f845b12c95f0b342aaf5a2c88fae025ec1c8582d18312d9cf1d15cb8a0973e7f2763986690a3c3b59223832ea368cfe EBUILD tomcat-9.0.65.ebuild 5822 BLAKE2B 9ec1e8f21e7a6b07adf51e10dec445291e86260d33b2c014848c301e1593becc7a32a73c25c60ee19570c2ec8b6ead7005f9052b3b2e503b80d38e88e03baa73 SHA512 f5de64b7838ebeff771bb1c8f6aa3ddc0ad1a929faee65aa483ef79ae8aaecf6056b633f1ae0e4f169f09422b55b9053aefaa2caab94ab2d359a932e3d49dd16 diff --git a/www-servers/tomcat/files/tomcat-10.0.26-build.xml.patch b/www-servers/tomcat/files/tomcat-10.0.26-build.xml.patch new file mode 100644 index 000000000000..aff5333f0833 --- /dev/null +++ b/www-servers/tomcat/files/tomcat-10.0.26-build.xml.patch @@ -0,0 +1,347 @@ +diff --git a/build.xml b/build.xml +index 774e25e..2684b10 100644 +--- a/build.xml ++++ b/build.xml +@@ -1041,6 +1041,7 @@ + addOSGi="true" /> + + ++ + ++ + ++ + + + + +- ++ addOSGi="true" /> --> + + + +- ++ + + + +@@ -1477,7 +1480,7 @@ + + + +- ++ + + + +@@ -1488,7 +1491,7 @@ + + + +- ++ + + + +@@ -1517,7 +1520,7 @@ + + + +- ++ + + + + + +- ++ + + + + ++ + + + ++ + + + Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. +@@ -2172,13 +2178,13 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. + additionalparam="-breakiterator -notimestamp -html5" + source="${compile.release}" + maxmemory="512m" +- failonerror="true" +- failonwarning="true"> ++ failonerror="true"> + + + + + ++ + ++ failonerror="true"> + + + +@@ -2277,8 +2280,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. + charset="UTF-8" + additionalparam="-breakiterator -notimestamp -html5" + maxmemory="512m" +- failonerror="true" +- failonwarning="true"> ++ failonerror="true"> + + + +@@ -2297,20 +2299,23 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. + additionalparam="-breakiterator -notimestamp -html5" + source="${compile.release}" + maxmemory="512m" +- failonerror="true" + failonwarning="true"> + + + + + ++ + + ++ + + + +@@ -3275,7 +3280,7 @@ asf.ldap.username=${release.asfusername} + + + ++ description="Download additional components for the tests"> + + + +@@ -3403,7 +3408,7 @@ asf.ldap.username=${release.asfusername} + + + ++ description="Download additional components for a distribution"> + + + +@@ -3458,13 +3463,13 @@ asf.ldap.username=${release.asfusername} + + + +- ++ + + + + +- ++ + + + +@@ -3586,7 +3591,7 @@ asf.ldap.username=${release.asfusername} + + + +- ++ + + + +@@ -3603,7 +3608,7 @@ asf.ldap.username=${release.asfusername} + + + +- ++ + + + +@@ -3628,7 +3633,7 @@ asf.ldap.username=${release.asfusername} + + + +- ++ + + + +@@ -3644,7 +3649,7 @@ asf.ldap.username=${release.asfusername} + + + +- ++ + + + +@@ -3668,7 +3673,7 @@ asf.ldap.username=${release.asfusername} + + + +- ++ + + + +@@ -3683,7 +3688,7 @@ asf.ldap.username=${release.asfusername} + + + +- ++ + + + +@@ -3711,7 +3716,7 @@ asf.ldap.username=${release.asfusername} + + + +- ++ + + + +@@ -3722,7 +3727,7 @@ asf.ldap.username=${release.asfusername} + + + +- ++ + + + +@@ -3733,7 +3738,7 @@ asf.ldap.username=${release.asfusername} + + ++ description="Prepares the source tree to be built in Eclipse" unless="noget"> + + + +@@ -3751,7 +3756,7 @@ Read the Building page on the Apache Tomcat documentation site for details on ho + + ++ description="Creates project directory .idea for IntelliJ IDEA" unless="noget"> + + + diff --git a/www-servers/tomcat/tomcat-10.0.26.ebuild b/www-servers/tomcat/tomcat-10.0.26.ebuild new file mode 100644 index 000000000000..efe394d3f70d --- /dev/null +++ b/www-servers/tomcat/tomcat-10.0.26.ebuild @@ -0,0 +1,198 @@ +# Copyright 1999-2022 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 + +MY_P="apache-${PN}-${PV}-src" + +# Currently we bundle binary versions of bnd.jar and bndlib.jar +# See bugs #203080 and #676116 +BND_VERSION="6.2.0" +BND="biz.aQute.bnd-${BND_VERSION}.jar" +BNDLIB="biz.aQute.bndlib-${BND_VERSION}.jar" + +DESCRIPTION="Tomcat Servlet-5.0/JSP-3.0/EL-4.0/WebSocket-2.0/JASIC-2.0 Container" +HOMEPAGE="https://tomcat.apache.org/" +SRC_URI="mirror://apache/${PN}/tomcat-10/v${PV}/src/${MY_P}.tar.gz + https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/${BND_VERSION}/${BND} + https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/${BND_VERSION}/${BNDLIB}" + +LICENSE="Apache-2.0" +SLOT="10" +KEYWORDS="~amd64 ~amd64-linux" +IUSE="extra-webapps" + +RESTRICT="test" # can we run them on a production system? + +# though it could work with 4.22 and upstream uses 4.20, +# we still use 4.15 because 4.20+ is currently built with java 11 +# and it would force Tomcat to use at least java 11 too +ECJ_SLOT="4.15" +SAPI_SLOT="5.0" + +COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT} + dev-java/glassfish-xmlrpc-api:0 + dev-java/jakartaee-migration:0 + ~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT} + dev-java/wsdl4j:0" +RDEPEND="${COMMON_DEP} + acct-group/tomcat + acct-user/tomcat + virtual/jre" +DEPEND="${COMMON_DEP} + app-admin/pwgen + dev-java/ant-core + >=virtual/jdk-1.8:* + test? ( + dev-java/ant-junit:0 + dev-java/easymock:3.2 + )" + +S=${WORKDIR}/${MY_P} + +PATCHES=( + "${FILESDIR}/${PN}-9.0.50-insufficient-ecj.patch" +) + +BND_HOME="${S}/tomcat-build-libs/bnd" +BNDLIB_HOME="${S}/tomcat-build-libs/bndlib" +BND_JAR="${BND_HOME}/${BND}" +BNDLIB_JAR="${BNDLIB_HOME}/${BND_LIB}" + +src_unpack() { + unpack ${MY_P}.tar.gz + + mkdir -p "${BND_HOME}" "${BNDLIB_HOME}" || die "Failed to create dir" + ln -s "${DISTDIR}/${BND}" "${BND_HOME}/" || die "Failed to symlink bnd-*.jar" + ln -s "${DISTDIR}/${BND}" "${BNDLIB_HOME}/" || die "Failed to symlink bndlib-*.jar" +} + +src_prepare() { + default + + find -name '*.jar' -type f -delete -print || die + + # Remove bundled servlet-api + rm -rv java/jakarta/{el,servlet} || die + + eapply "${FILESDIR}/${PN}-10.0.26-build.xml.patch" + + local vm_version="$(java-config -g PROVIDES_VERSION)" + [[ "${vm_version}" == "1.8" ]] && eapply "${FILESDIR}/${PN}-10.0.16-build.xml-strip-html5.patch" + + # 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 + + java-pkg-2_src_prepare +} + +JAVA_ANT_REWRITE_CLASSPATH="true" + +EANT_BUILD_TARGET="deploy" +EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},jakartaee-migration,tomcat-servlet-api-${SAPI_SLOT},wsdl4j" +EANT_TEST_GENTOO_CLASSPATH="easymock-3.2" +EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes" +EANT_NEEDS_TOOLS="true" +EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dbnd.jar=${BND_JAR} -Dbndlib.jar=${BNDLIB_JAR}" + +# revisions of the scripts +IM_REV="-r2" +INIT_REV="-r1" + +src_configure() { + java-ant-2_src_configure + + eapply "${FILESDIR}/${PN}-9.0.37-fix-build-rewrite.patch" +} + +src_compile() { + EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar):$(java-pkg_getjars --build-only glassfish-xmlrpc-api)" + 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() { + elog "New ebuilds of Tomcat support running multiple instances. If you used prior version" + elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat." + elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat" + + elog "To manage Tomcat instances, run:" + elog " ${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." + + ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar" + ewarn "from upstream binary if you need it. Gentoo Bug # 144276" + + einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and" + einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information." +} -- cgit v1.2.3