diff options
| -rw-r--r-- | www-servers/tomcat/Manifest | 1 | ||||
| -rw-r--r-- | www-servers/tomcat/files/tomcat-6.0.45-build.xml.patch | 71 | ||||
| -rw-r--r-- | www-servers/tomcat/tomcat-6.0.45.ebuild | 143 |
3 files changed, 215 insertions, 0 deletions
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest index 9b782e8d10f8..e3193d227658 100644 --- a/www-servers/tomcat/Manifest +++ b/www-servers/tomcat/Manifest @@ -1,4 +1,5 @@ DIST apache-tomcat-6.0.44-src.tar.gz 3447711 SHA256 c6f01526d58f2ba7b9da496e959d9e68cc49183006077704ab91c36ebebf5a4a SHA512 0d6a1539b28fa8ca3442557889d7d21cc523b18136f6998820ba13f41420536aba65ce78bac526002ee1dd86df3cbc80d9f043a3f765d7cf0b79e58e516030be WHIRLPOOL c65e704466191a0f98ec777e95dda889599ff6a545e7c013fd04bc0b72e0d0edf4491415f243d6a4de60cf76abe5c13ffbcc6d98f78b51490f7b7b43b24ecb97 +DIST apache-tomcat-6.0.45-src.tar.gz 3494054 SHA256 d464b3e770197f026bf802d19be0195b941e8c3be7e552dc2f8eb563f9cc010e SHA512 d300e6b805bb70fc348133467b2aeac728dc0ae44f2fc1f309c3b2971987c1e46b81f156ebd7ddfda38f6746e90af1402c4e16a2d30bc7b081b761c87df8ffab WHIRLPOOL 144678884f75034f1d692619ea8064daf02aee03bcac62fb0b666b5c0283f5abf93414d636c03c94488632cd13081cf00e69a9ddf19f4c8bafd80e7eca5a69da DIST apache-tomcat-7.0.59-src.tar.gz 4687344 SHA256 3a1dedda4019db87464fca3aeb4e800a538f0baee96d8b14c9d64967b0d2ea44 SHA512 acc322eee1446dd1bff72910ae9f40a62f88332ee69d6057b3c684e2abf8f28e6df6ab9505900f0b0cf7a5e2e0e80e64b0a790b3b78594ce595ce897706b4bcb WHIRLPOOL 4948964c1746e6ee912ac72c901ba271793610f402bf082455d104e2e8d6dbfa0bf5371d42d48d8ad7c826271fa60d989119a01e700497099022d0cf3564fdff DIST apache-tomcat-7.0.67-src.tar.gz 4624303 SHA256 0464ebbeec17fb15103cad9f6639edc826f4eca246dd58a5cb1c5d46aff58e0a SHA512 dd299cab7a172860f51bae19e3490432af874b94825de289095647026a91b27cb3544ba85ab1f786bf4696dc59475ca85d051841ebaa221e3b46079e139a6e52 WHIRLPOOL ae7ec13ffd3bd0964496060413924854c5b956dc88b8d0f1de4ac094e8fb5595ccfc7c2eaa7051f082c575253ed9fdadc8833f494281770f8f72b8c64d9b9593 DIST apache-tomcat-8.0.30-src.tar.gz 4939771 SHA256 0f79b74f303cce809ea63a85586efb5d4bb67ea53622f1b44ecffff0f1aa9cf6 SHA512 cc1546292e6b674e251bf5c92b2f63f9fe96f979753a74991dd6e851f7da44743415c3bfc06525071b89faa35c90abb4129cb76dffdc75945a2ea94c3bb92110 WHIRLPOOL a20d1f1e6a290d174e5f7181655d555a5b39296e4c059fcd4833709e0ee635d9c02cf319be29aef9b5442db0283c8590c6d062d5f6eae09136ccb77c4610a5fc diff --git a/www-servers/tomcat/files/tomcat-6.0.45-build.xml.patch b/www-servers/tomcat/files/tomcat-6.0.45-build.xml.patch new file mode 100644 index 000000000000..743065130f07 --- /dev/null +++ b/www-servers/tomcat/files/tomcat-6.0.45-build.xml.patch @@ -0,0 +1,71 @@ +diff -Naur apache-tomcat-6.0.44-src.orig/build.xml apache-tomcat-6.0.44-src/build.xml +--- apache-tomcat-6.0.44-src.orig/build.xml 2015-05-08 13:22:05.000000000 +0100 ++++ apache-tomcat-6.0.44-src/build.xml 2015-08-25 23:38:46.147332131 +0100 +@@ -159,12 +159,14 @@ + </fileset> + </copy> + <!-- Copy JSP Schemas and DTDs to be packed into servlet-api.jar --> ++<!-- + <copy todir="${tomcat.classes}/javax/servlet/resources" encoding="ISO-8859-1"> + <fileset dir="${tomcat.classes}/javax/servlet/jsp/resources"> + <include name="*" /> + <exclude name="jspxml*" /> + </fileset> + </copy> ++ --> + + </target> + +@@ -307,19 +309,25 @@ + manifest="${tomcat.manifests}/annotations-api.jar.manifest" /> + + <!-- Servlet 2.5 Implementation JAR File --> ++<!-- + <jarIt jarfile="${servlet-api.jar}" filesId="files.servlet-api" + manifest="${tomcat.manifests}/servlet-api.jar.manifest" + license="${tomcat.manifests}/servlet-api.jar.license" + notice="${tomcat.manifests}/servlet-api.jar.notice" /> ++--> + + <!-- JSP 2.1 Implementation JAR File --> ++<!-- + <jarIt jarfile="${jsp-api.jar}" filesId="files.jsp-api" + manifest="${tomcat.manifests}/jsp-api.jar.manifest" /> ++--> + + + <!-- JSP 2.1 EL Implementation JAR File --> ++<!-- + <jarIt jarfile="${el-api.jar}" filesId="files.el-api" + manifest="${tomcat.manifests}/el-api.jar.manifest" /> ++--> + + <!-- Bootstrap JAR File --> + <jarIt jarfile="${bootstrap.jar}" filesId="files.bootstrap" +@@ -492,12 +500,14 @@ + + <target name="deploy" depends="build-only,build-docs,warn.dbcp"> + ++<!-- + <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz" + file="${tomcat-native.tar.gz}" /> + <copy tofile="${tomcat.build}/bin/commons-daemon-native.tar.gz" + file="${commons-daemon.native.src.tgz}" /> + + <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" /> ++--> + + <!-- Copy scripts --> + <copy todir="${tomcat.build}/bin"> +@@ -649,9 +659,11 @@ + </fileset> + </txt2html> + ++<!-- + <copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib" + failonerror="false"/> + <copy file="${jdt.jar}" todir="${tomcat.build}/lib" /> ++--> + + </target> + diff --git a/www-servers/tomcat/tomcat-6.0.45.ebuild b/www-servers/tomcat/tomcat-6.0.45.ebuild new file mode 100644 index 000000000000..4c91ddae9ae7 --- /dev/null +++ b/www-servers/tomcat/tomcat-6.0.45.ebuild @@ -0,0 +1,143 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +JAVA_PKG_IUSE="source test" + +inherit eutils java-pkg-2 java-ant-2 prefix user + +MY_P="apache-${P}-src" + +DESCRIPTION="Tomcat Servlet-2.5/JSP-2.1 Container" +HOMEPAGE="http://tomcat.apache.org/" +SRC_URI="mirror://apache/${PN}/tomcat-6/v${PV}/src/${MY_P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="6" +KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd" +IUSE="extra-webapps" + +ECJ_SLOT="3.7" +SAPI_SLOT="2.5" + +COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT} + dev-java/oracle-javamail:0 + >=dev-java/tomcat-servlet-api-6.0.44-r1:${SAPI_SLOT}" +RDEPEND="${COMMON_DEP} + >=virtual/jre-1.6 + !<dev-java/tomcat-native-1.1.20" +DEPEND="${COMMON_DEP} + >=virtual/jdk-1.6 + test? ( dev-java/ant-junit:0 )" + +S=${WORKDIR}/${MY_P} + +pkg_setup() { + java-pkg-2_pkg_setup + enewgroup tomcat 265 + enewuser tomcat 265 -1 /dev/null tomcat +} + +java_prepare() { + find -name '*.jar' -type f -delete -print || die + + # Remove bundled javamail, servlet-api + rm -rv java/javax/{el,mail,servlet} || die + + epatch \ + "${FILESDIR}/${P}-build.xml.patch" \ + "${FILESDIR}/tomcat-6-sysprop.patch" + + # For use of catalina.sh in netbeans + sed -i -e "/^# ----- Execute The Requested Command/ a\ + CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \ + bin/catalina.sh || die +} + +JAVA_ANT_REWRITE_CLASSPATH="true" + +EANT_BUILD_TARGET="deploy" +EANT_TEST_TARGET="all" +EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},oracle-javamail,tomcat-servlet-api-${SAPI_SLOT}" +EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes" +EANT_NEEDS_TOOLS="true" +EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false" + +# revisions of the scripts +IM_REV="-r1" +INIT_REV="-r1" + +src_compile() { + EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)" + java-pkg-2_src_compile +} + +src_test() { + EANT_BUILD_XML="test/build.xml" 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 source && java-pkg_dosrc java/* + + ### Webapps ### + + 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=$(echo ${RANDOM}|md5sum|cut -c 1-15) + 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 (<6.0.36), 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://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information." +} |