diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-01-06 12:11:06 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-01-06 12:11:06 +0000 |
commit | 29efd7db303b443e103311cc0e458ee5c134e8e5 (patch) | |
tree | cb6e3ef15df82575a93cae8bd11b635d473f3796 /www-servers/tomcat | |
parent | 19a808581ca18addf4b12d09f7e440b7244679e5 (diff) |
gentoo auto-resync : 06:01:2023 - 12:11:06
Diffstat (limited to 'www-servers/tomcat')
-rw-r--r-- | www-servers/tomcat/Manifest | 3 | ||||
-rw-r--r-- | www-servers/tomcat/tomcat-9.0.69.ebuild | 202 |
2 files changed, 0 insertions, 205 deletions
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest index d02e7bfdbfb2..f47131525480 100644 --- a/www-servers/tomcat/Manifest +++ b/www-servers/tomcat/Manifest @@ -12,8 +12,6 @@ DIST apache-tomcat-10.1.4-src.tar.gz 6065442 BLAKE2B 92e8a2dbe686ce2faa7b766f523 DIST apache-tomcat-10.1.4-src.tar.gz.asc 849 BLAKE2B 27aa419e86171188ed510db939e943dd19d24dcfdca4072458c1d37be14f28ef0e7887b6f9f4bace2bab26a4e82f3ae71fbdb7371de6b01a93123d74cf68228e SHA512 60b1c5decddd37d8d1c11a4d1c73c5c50b8823136588cca53149480613c1baee3c06a54f84d8e4adbc1a3c67a12af7db0d5ede95251e8763d32c7e7a17176243 DIST apache-tomcat-8.5.84-src.tar.gz 6027185 BLAKE2B 8637f65653ae025448d7ce3a96839825d5ec6b77a06fc8a410ff4de786af140deaf00cedc5c9de00172c9cc759a7728521a2384d722bdf63dcfc71aedec7308f SHA512 5224ee4d6c61ed1975fd7a20814eb53b3b5a3d88b31fd3227a94fcc261274aa69f992f161e14217dadea476e4720b7f0a24c733346533d5873206b899ee86695 DIST apache-tomcat-8.5.84-src.tar.gz.asc 849 BLAKE2B eeeb4c22190c9bb5c087db86807b194ef87d8a03d399cbc36e910dc3cf6f28c845efde4d3748eb8a362d06e870724869acf259b3e75cf892ca72fbea4a4bf943 SHA512 6f2478da242a49a72b0ebb9e51f17e681f84228d69cb9b7119ca9c772032c3fb5112f908077a200d5286b2170ac1529914c7682d5ed97ac58d3b8ff6baf00bf2 -DIST apache-tomcat-9.0.69-src.tar.gz 6214949 BLAKE2B 21387c7dbc830c5292d5ea315bf93c2faac2160dd21e8524184495e34cee0739ef57ce77ba46c99a64f7389047da431cffe000da9a5db2aabd481e84f149153f SHA512 8178ef757d8a8a04b87a08e0a5d45e2d244fe0c0fd11b8f6b50182da1811758b7e4b1ea52188e4b241278c32737c0f61ed93d53b5a95075ebabb9209fe57a3b1 -DIST apache-tomcat-9.0.69-src.tar.gz.asc 833 BLAKE2B e4002185d7054ff963d0ecb1373afb2affb4795281bd344fa5b707e45dac4c6168cc2365853923a0cca1b5c21806554987513177ed64e01d7905f5d46ee9c581 SHA512 7d9ea8ac9986303bf649781524dd93db22c9ab1101a50be9aad7b4b65f902640b24462117047ddeba99b3652d63e980deaa232f6b93aff2266887a183059ff8f DIST apache-tomcat-9.0.70-src.tar.gz 6219156 BLAKE2B c7cf415c11701edcd90bb35cd840036755876724394c48277236af1e169572f42599ffc2ec167363cd643dde608437cd06ee5c11289edec91a378f280f385259 SHA512 266ffbdfa57bd9778ea3485f5e2cabf9a2d389235afa74b154e684bcf2806a4fe7a54049f2bd8ea96414396d06695fe890b1eed9672278d9eb345ba3cd71032e DIST apache-tomcat-9.0.70-src.tar.gz.asc 833 BLAKE2B 979ffa63dccfeb89209a8ee357b231400d762a4ea7e4143960f2dd9fbf83a129c383dd06676c5800f7fc003a1a0cf832c392294cd9da080796fea06742ad9eb7 SHA512 6547167bf808c760bd5833d8049a80c4a64dbb258a80d5cbf6fd2fa459c1231635d55d62e2d0e7e07d0449403b4bddd87a6e22ff29a0eb9486ea7b996bdb1d07 DIST biz.aQute.bnd-6.3.1.jar 16703723 BLAKE2B 97cc171a926be326abe95695e795ccb575bc6ca770b4c4df7764bdedbd6dfcf5643673484f50cc34f845f27d03ddf8a971c1c502b3b63db2541266c2b35e8e23 SHA512 59d3a50575ea8fcfc5f5c2178f7d40248c987c77ae8afeb0a8c9ec397ce9e4ceae277ba3b26dafc245bd2185bbafeaef219dd1af0988921631b6a8fe0cbd0abf @@ -21,6 +19,5 @@ DIST biz.aQute.bndlib-6.3.1.jar 3183076 BLAKE2B 73bef88e8f3c8015d259ac36b953672e EBUILD tomcat-10.1.2.ebuild 6535 BLAKE2B f3893d7fe2b29bacac173dca2864202227fdb44299fbe2fea9ccf33e5add8eb384a50803f1a8e806297ebe84956f4f4096924ae90e2f198ebab2ed088302481a SHA512 fbe0a81548b2b45146d6e029c78522f7819fe6df27c69a7607ef1800babd230140c2f525984eb78d59fe435847d3ca34e0870946ba02dbefd06632d4a72f0742 EBUILD tomcat-10.1.4.ebuild 6536 BLAKE2B 60b4f1335795797298350554dae1c0bc68acaaf4c5af99fe2379cfce0a2b07aee8dc4d49f39c4d7fd2c2781acc31191d51a49211bf6615615c43929b0745414e SHA512 b239cac14c628bf9b493d7698be774bc82613d3d33fa4c2d396c0aa2081f79c8dbb95edb0a9fbc8fe43d3c68cc99db91d5494cc27bced58f7d23e35a15f8b8ca EBUILD tomcat-8.5.84.ebuild 5433 BLAKE2B 779607815b07ff151b82e94c6547acd08407b536f297fd4bd56453b5738230ad6c2b35a438d84ce75677234516cd85ac921343ac42c19b148ed8ffafe093565f SHA512 2bb0cbcab94901ffafb0d31a0e8a198e1835e3a432ee36b02764e24db199946308aed92c244432d5143d6791787a694667f28bb3d65609d92b88771b1d871c4c -EBUILD tomcat-9.0.69.ebuild 6424 BLAKE2B 23045cba06ef38470be81488ce24519e9b71ed7f933339ff510ea5e6242b7a723876d24b85148fa57dd310ee205bd4b710e0b37210ac601a872793d057968a17 SHA512 224e902cc9f9408354459f3d53604916ff1989edbecdb456456191040734a47593f5188eb249a9cf409a4e44351f61c134532bea1fb1f734e7787687152b31a0 EBUILD tomcat-9.0.70.ebuild 6424 BLAKE2B 2189fb588d1e9d65c7ba6e00acc2db9bf747af77693011e9333be410a217c4c6aea6836e168f3b2929edbd63d32d5d45ed443f4e950702ee8b80482f9409ddff SHA512 64bd43df27bad8e5119e1e42d5af81a9a8381a108be27dcb3f143ad4755215aeab7424acf3a389a237cc139603a8c38603dda81f961e34c1a509e3d136bd2766 MISC metadata.xml 621 BLAKE2B 5565658450eaf5d63d832ed5f771084532243318f93e66a6241acd067cba1262cd957f8450e5aacdb68dc30933d889889cbceeb8b630b6bb8e8e39e8b95688c8 SHA512 89273106acd986ea2ac909f858ebcd538e42364b1d4a756b3550a805d3477f731db796307acb3db7376b33e199bd714c03bb1201578e97541f45f3100e7480f9 diff --git a/www-servers/tomcat/tomcat-9.0.69.ebuild b/www-servers/tomcat/tomcat-9.0.69.ebuild deleted file mode 100644 index 21e395c5b53e..000000000000 --- a/www-servers/tomcat/tomcat-9.0.69.ebuild +++ /dev/null @@ -1,202 +0,0 @@ -# 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 verify-sig - -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.3.1" -BND="biz.aQute.bnd-${BND_VERSION}.jar" -BNDLIB="biz.aQute.bndlib-${BND_VERSION}.jar" - -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 - 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} - verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz.asc )" - -LICENSE="Apache-2.0" -SLOT="9" -KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris" -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" -SERVLET_API_SLOT="4.0" -JSP_API_SLOT="2.3" -EL_API_SLOT="3.0" - -COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT} - dev-java/glassfish-xmlrpc-api:0 - ~dev-java/tomcat-el-api-${PV}:${EL_API_SLOT} - ~dev-java/tomcat-jsp-api-${PV}:${JSP_API_SLOT} - ~dev-java/tomcat-servlet-api-${PV}:${SERVLET_API_SLOT} - 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-core-1.9.13 - >=virtual/jdk-1.8:* - test? ( - >=dev-java/ant-junit-1.9:0 - dev-java/easymock:3.2 - )" - -BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )" -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc" - -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() { - if use verify-sig; then - verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.gz{,.asc} - fi - - 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/javax/{el,servlet} || die - - eapply "${FILESDIR}/${PN}-9.0.62-build.xml.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},tomcat-servlet-api-${SERVLET_API_SLOT},tomcat-jsp-api-${JSP_API_SLOT},tomcat-el-api-${EL_API_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 "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." -} |