From 9c2e506bd38c613bc10783473eaadbf1ec31976f Mon Sep 17 00:00:00 2001 From: William Thomson Date: Tue, 13 Feb 2007 19:24:58 +0000 Subject: [PATCH] Bumped package to latest development release Package-Manager: portage-2.1.2-r9 --- www-servers/tomcat/ChangeLog | 8 +- www-servers/tomcat/Manifest | 16 +- .../tomcat/files/digest-tomcat-6.0.10_pre | 3 + www-servers/tomcat/tomcat-6.0.10_pre.ebuild | 164 ++++++++++++++++++ 4 files changed, 186 insertions(+), 5 deletions(-) create mode 100644 www-servers/tomcat/files/digest-tomcat-6.0.10_pre create mode 100644 www-servers/tomcat/tomcat-6.0.10_pre.ebuild diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog index b89837de35cc..ca586e2e2f31 100644 --- a/www-servers/tomcat/ChangeLog +++ b/www-servers/tomcat/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for www-servers/tomcat # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.119 2007/02/09 19:38:05 wltjr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.120 2007/02/13 19:24:57 wltjr Exp $ + +*tomcat-6.0.10_pre (13 Feb 2007) + + 13 Feb 2007; William L. Thomson Jr. + +tomcat-6.0.10_pre.ebuild: + Bumped package to latest development release 09 Feb 2007; William L. Thomson Jr. tomcat-5.5.20-r10.ebuild, tomcat-6.0.9_beta.ebuild: diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest index 5d0ec7c2fae5..81802c820439 100644 --- a/www-servers/tomcat/Manifest +++ b/www-servers/tomcat/Manifest @@ -99,6 +99,7 @@ MD5 f6cfbfe83a55a5700ad52d43483be852 files/6/tomcat.init 3291 RMD160 b6bac4cf4ce2bac5aa0bd9dec28fa88a39c42570 files/6/tomcat.init 3291 SHA256 5f06449e261300a0f6ba6cb67f0908ddceb8c0ea06178ac41c791055068ec72b files/6/tomcat.init 3291 DIST apache-tomcat-5.5.20-src.tar.gz 4796377 RMD160 587590d2e272d1ede73501b62933f544cd969822 SHA1 cc416242d8c9e1978702a207e305ca97afe53d4d SHA256 19f24717fb3e2db902c33e21650dfa88bbf98428c15b1ed68ecaf7a9150e4a77 +DIST apache-tomcat-6.0.10-src.tar.gz 3221070 RMD160 64762f16606645c6ef507906f2eb8eeb102173bb SHA1 4ec1acda174ab19082c4900c293d8bc7f9544a69 SHA256 54ae6b89a3ac3e3e33a580708403ca4ea0a449f287b91e6246bb6a6550e39199 DIST apache-tomcat-6.0.9-src.tar.gz 3218164 RMD160 c35c6441a358926a8bef4bc855b275ad2445f842 SHA1 2194a1162c0de5c5765fcd419145dbec44470be9 SHA256 ce3a2a6976ecf0059245debcb2c69c9b3947baf1ecc383fa80c27e55f2ee5647 DIST jakarta-tomcat-5.0.28-src.tar.gz 3565766 RMD160 22c5e60b2c5009dc33a62edcefa6760d82da859b SHA1 a4ac2ad52f8b8db8ae8c38979f5f50713e242e36 SHA256 bbf584b3c376d23d92b1a0d306eb8f3729cea244c7a850f81d2527a7df6d20fc EBUILD tomcat-5.0.28-r14.ebuild 9331 RMD160 e88ac9bae92fc262ad9b7c37ef692629943167d9 SHA1 ce01158f8823dd521a5a4fadc7cfbd09e4f59a97 SHA256 b92c98a7411e5c80ea220a9245727c528440670fa7c29a025f71b18f97529c49 @@ -113,14 +114,18 @@ EBUILD tomcat-5.5.20-r8.ebuild 10296 RMD160 d745378ce830fbdc415f0f2de81e976cbff9 MD5 57d15320f6132d2222e2c9036c583f18 tomcat-5.5.20-r8.ebuild 10296 RMD160 d745378ce830fbdc415f0f2de81e976cbff91993 tomcat-5.5.20-r8.ebuild 10296 SHA256 72b899ccde992f7248ff3ce20b9274327c45790c94a4b924d4c09e8dd5528035 tomcat-5.5.20-r8.ebuild 10296 +EBUILD tomcat-6.0.10_pre.ebuild 5122 RMD160 231026bc3afedae9578dba5875e8c4274ef70bf1 SHA1 88b35e435e4d7540865814451996bc5a1d116fb2 SHA256 02a83cd1b206c9a8b0b423ec43a3451aa84467298f6fe14f1014a9ea9a3635bb +MD5 cde4aa7878a33eea073c039de67451c7 tomcat-6.0.10_pre.ebuild 5122 +RMD160 231026bc3afedae9578dba5875e8c4274ef70bf1 tomcat-6.0.10_pre.ebuild 5122 +SHA256 02a83cd1b206c9a8b0b423ec43a3451aa84467298f6fe14f1014a9ea9a3635bb tomcat-6.0.10_pre.ebuild 5122 EBUILD tomcat-6.0.9_beta.ebuild 5050 RMD160 059a06d40d9e1a96ee8768c756a2a7d7990dfef7 SHA1 767c4d77f18f2c97c8f278b3cd65997833bbf159 SHA256 4bddf108bd1d8772598c1473e3a069bed339f2aa3c891ead9b182f44f48b3813 MD5 b32c444a12871fe10eb20a26186da76e tomcat-6.0.9_beta.ebuild 5050 RMD160 059a06d40d9e1a96ee8768c756a2a7d7990dfef7 tomcat-6.0.9_beta.ebuild 5050 SHA256 4bddf108bd1d8772598c1473e3a069bed339f2aa3c891ead9b182f44f48b3813 tomcat-6.0.9_beta.ebuild 5050 -MISC ChangeLog 38038 RMD160 a9ede5b6aaab03c496c7169806821e38b4ba0bd7 SHA1 105ca86beded79f52189e0696f0195967f561237 SHA256 7ef3e3eb910d38baf60e900e84fd0a68084b5133b240fbc0b5b31969e83e815c -MD5 47141aebb680c2249242c48c2151788e ChangeLog 38038 -RMD160 a9ede5b6aaab03c496c7169806821e38b4ba0bd7 ChangeLog 38038 -SHA256 7ef3e3eb910d38baf60e900e84fd0a68084b5133b240fbc0b5b31969e83e815c ChangeLog 38038 +MISC ChangeLog 38206 RMD160 3abfcac185cbf6359dab15e61eca4ea09334043b SHA1 2804de8e5f8e0ca3ea89209e97c4d6ee757f5fd7 SHA256 63f96f2a7f02e88e4eff2ad2639ae55da235c24342fe8b5e494d6800c6b9c15e +MD5 0003ee78038be15a486ea27c9af690ff ChangeLog 38206 +RMD160 3abfcac185cbf6359dab15e61eca4ea09334043b ChangeLog 38206 +SHA256 63f96f2a7f02e88e4eff2ad2639ae55da235c24342fe8b5e494d6800c6b9c15e ChangeLog 38206 MISC metadata.xml 556 RMD160 88a7809fe3f73c2d351b9fdda025fe88dfb11f31 SHA1 e8dcd8204d0ea02558dd07e1aded5dc58ed1460c SHA256 ac94c1d58b05b47598f311e6efb971fdb30ad9a25f3c32cb9c064fb6330dad79 MD5 0609d3339e0b8d5a3b4707f6b02aad3a metadata.xml 556 RMD160 88a7809fe3f73c2d351b9fdda025fe88dfb11f31 metadata.xml 556 @@ -134,6 +139,9 @@ SHA256 fda2efc7c4fe103d3fec9599fe3797d8784381008f71d9006c7224db91862b30 files/di MD5 8adc14a8534e1c6f8d5f96b371e1895f files/digest-tomcat-5.5.20-r8 277 RMD160 b9c5deac84bf5acd7a65ad80bdfaca9f7e343f3f files/digest-tomcat-5.5.20-r8 277 SHA256 fda2efc7c4fe103d3fec9599fe3797d8784381008f71d9006c7224db91862b30 files/digest-tomcat-5.5.20-r8 277 +MD5 5f9244a61bfa0875478e8849b6cb845e files/digest-tomcat-6.0.10_pre 277 +RMD160 3d16b85b1dcb55e6874b535c06f2a5df00b46ce1 files/digest-tomcat-6.0.10_pre 277 +SHA256 49aef00c733c574a5c8536a6e5406769105dbe0b64ad0ea9b9682ca42bff23f0 files/digest-tomcat-6.0.10_pre 277 MD5 09759fb978add9cc1dd420dc82345dbb files/digest-tomcat-6.0.9_beta 274 RMD160 ff8e425e3de1f5fa5d1c31dd29d40752585d14d4 files/digest-tomcat-6.0.9_beta 274 SHA256 80dce4147154d253edad52355cd69b8a6a53e9d8261dee84d9944fa5b9e06600 files/digest-tomcat-6.0.9_beta 274 diff --git a/www-servers/tomcat/files/digest-tomcat-6.0.10_pre b/www-servers/tomcat/files/digest-tomcat-6.0.10_pre new file mode 100644 index 000000000000..3dd91cc642dc --- /dev/null +++ b/www-servers/tomcat/files/digest-tomcat-6.0.10_pre @@ -0,0 +1,3 @@ +MD5 cfbfa1812b6b46e767a4df5411424526 apache-tomcat-6.0.10-src.tar.gz 3221070 +RMD160 64762f16606645c6ef507906f2eb8eeb102173bb apache-tomcat-6.0.10-src.tar.gz 3221070 +SHA256 54ae6b89a3ac3e3e33a580708403ca4ea0a449f287b91e6246bb6a6550e39199 apache-tomcat-6.0.10-src.tar.gz 3221070 diff --git a/www-servers/tomcat/tomcat-6.0.10_pre.ebuild b/www-servers/tomcat/tomcat-6.0.10_pre.ebuild new file mode 100644 index 000000000000..aa9776b632c4 --- /dev/null +++ b/www-servers/tomcat/tomcat-6.0.10_pre.ebuild @@ -0,0 +1,164 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.10_pre.ebuild,v 1.1 2007/02/13 19:24:57 wltjr Exp $ + +inherit eutils java-pkg-2 java-ant-2 + +DESCRIPTION="Tomcat Servlet-2.5/JSP-2.1 Container" + +MY_P="apache-${P/_pre/}-src" +SLOT="6" +#SRC_URI="mirror://apache/${PN}/${PN}-6/v${PV/_/-}/src/${MY_P}.tar.gz" +SRC_URI="mirror://apache/${PN}/${PN}-6/v${PV/_pre/}/src/${MY_P}.tar.gz" +HOMEPAGE="http://tomcat.apache.org/" +KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd" +LICENSE="Apache-2.0" + +IUSE="doc examples source test" + +RDEPEND="|| ( >=virtual/jre-1.5 >=virtual/jre-1.6 ) + =dev-java/eclipse-ecj-3.2* + >=dev-java/commons-daemon-1.0.1 + >=dev-java/commons-dbcp-1.2.1 + >=dev-java/commons-logging-1.1 + >=dev-java/commons-pool-1.2 + ~dev-java/tomcat-servlet-api-${PV}" + +DEPEND="|| ( >=virtual/jdk-1.5 >=virtual/jdk-1.6 ) + ${RDEPEND} + test? ( dev-java/junit ) + dev-java/ant-core + dev-java/ant-trax" + +S=${WORKDIR}/${MY_P} + +TOMCAT_NAME="${PN}-${SLOT}" +TOMCAT_HOME="/usr/share/${TOMCAT_NAME}" +WEBAPPS_DIR="/var/lib/${TOMCAT_NAME}/webapps" + +pkg_setup() { + enewgroup tomcat 265 + enewuser tomcat 265 -1 /dev/null tomcat + + WANT_ANT_TASKS="ant-trax" +} + +src_unpack() { + unpack ${A} + cd "${S}" + + epatch "${FILESDIR}/${SLOT}/build-xml.patch" +} + +src_compile(){ + # Prevent out of memory/heap space errors + # Not sure if this is happening for others + + # Old way +# java-pkg_force-compiler ecj-3.2 + + # New way if others get out of heap space +# ANT_OPTS=-XX:MaxPermSize=128m + + local antflags="build-jasper-jdt deploy -Dbase.path=${T}" + antflags="${antflags} -Dcompile.debug=false" + if ! use doc; then + antflags="${antflags} -Dnobuild.docs=true" + fi + antflags="${antflags} -Dant.jar=$(java-pkg_getjar ant-core ant.jar)" + antflags="${antflags} -Dcommons-daemon.jar=$(java-pkg_getjar commons-daemon commons-daemon.jar)" + antflags="${antflags} -Djdt.jar=$(java-pkg_getjar eclipse-ecj-3.2 ecj.jar)" + antflags="${antflags} -Djsp-api.jar=$(java-pkg_getjar tomcat-servlet-api-2.5 jsp-api.jar)" + antflags="${antflags} -Dservlet-api.jar=$(java-pkg_getjar tomcat-servlet-api-2.5 servlet-api.jar)" + eant ${antflags} +} + +src_install() { + local CATALINA_BASE=/var/lib/${TOMCAT_NAME}/ + + # init.d, conf.d + newinitd ${FILESDIR}/${SLOT}/tomcat.init ${TOMCAT_NAME} + newconfd ${FILESDIR}/${SLOT}/tomcat.conf ${TOMCAT_NAME} + + # create dir structure + diropts -m755 -o tomcat -g tomcat + dodir /etc/${TOMCAT_NAME} + fperms 750 /etc/${TOMCAT_NAME} + dodir /usr/share/${TOMCAT_NAME} + keepdir /var/log/${TOMCAT_NAME}/ + keepdir /var/tmp/${TOMCAT_NAME}/ + keepdir /var/run/${TOMCAT_NAME}/ + dodir ${CATALINA_BASE} + diropts -m0755 + + cd "${S}" + # we don't need dos scripts + rm -f bin/*.bat + chmod 755 bin/*.sh + + # fix context's since upstream is slackin + sed -i -e 's:}/server/:}/:' ${S}/webapps/host-manager/host-manager.xml + sed -i -e 's:}/server/:}/:' ${S}/webapps/manager/manager.xml + + # copy the manager's context to the right position + mkdir -p conf/Catalina/localhost + cp ${S}/webapps/host-manager/host-manager.xml conf/Catalina/localhost + cp ${S}/webapps/manager/manager.xml conf/Catalina/localhost + + # replace the default pw with a random one, see #92281 + local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15) + sed -e s:SHUTDOWN:${randpw}: -i conf/server.xml + + # copy over the directories + chown -R tomcat:tomcat webapps/* conf/* + cp -pR conf/* ${D}/etc/${TOMCAT_NAME} || die "failed to copy conf" + cp -R bin output/build/bin output/build/lib ${D}/usr/share/${TOMCAT_NAME} \ + || die "failed to copy" + + cp ${T}/tomcat6-deps/jdt/jasper-jdt.jar ${D}/usr/share/${TOMCAT_NAME}/lib \ + || die "failed to copy" + + keepdir ${WEBAPPS_DIR} + chown tomcat:tomcat ${D}/${WEBAPPS_DIR} || die "Failed to change owner off ${1}." + chmod 750 ${D}/${WEBAPPS_DIR} || die "Failed to change permissions off ${1}." + + cd "${D}/usr/share/${TOMCAT_NAME}/lib" + java-pkg_jar-from tomcat-servlet-api-2.5 + + cd "${S}" + + # Copy over webapps, some controlled by use flags + cp -p RELEASE-NOTES webapps/ROOT/RELEASE-NOTES.txt + cp -pr webapps/ROOT ${D}${CATALINA_BASE}/webapps + + mkdir ${D}${TOMCAT_HOME}/webapps + chown tomcat:tomcat ${D}${TOMCAT_HOME}/webapps + cp -pr webapps/host-manager ${D}${TOMCAT_HOME}/webapps + cp -pr webapps/manager ${D}${TOMCAT_HOME}/webapps + + if use doc; then + cp -pr output/build/webapps/docs ${D}${CATALINA_BASE}/webapps + fi + if use examples; then + cp -pr output/build/webapps/examples ${D}${CATALINA_BASE}/webapps + fi + + # symlink the directories to make CATALINA_BASE possible + dosym /etc/${TOMCAT_NAME} ${CATALINA_BASE}/conf + dosym /var/log/${TOMCAT_NAME} ${CATALINA_BASE}/logs + dosym /var/tmp/${TOMCAT_NAME} ${CATALINA_BASE}/temp + dosym /var/run/${TOMCAT_NAME} ${CATALINA_BASE}/work + + dodoc ${S}/{RELEASE-NOTES,RUNNING.txt} + fperms 640 /etc/${TOMCAT_NAME}/tomcat-users.xml +} + +pkg_postinst() { + elog + elog " This ebuild implements a FHS compliant layout for tomcat" + elog " Please read http://www.gentoo.org/proj/en/java/tomcat-guide.xml" + elog " for more information." + elog + elog " Please report any bugs to http://bugs.gentoo.org/" + elog +} -- 2.26.2