From: William Thomson Date: Fri, 2 Feb 2007 21:37:53 +0000 (+0000) Subject: Bumped package to latest alpha X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a066083d9371841d875ed498ded745957a7ce326;p=gentoo.git Bumped package to latest alpha Package-Manager: portage-2.1.2-r4 --- diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog index 0890c0288399..a219b052dc5f 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.113 2007/01/31 10:31:50 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.114 2007/02/02 21:37:53 wltjr Exp $ + +*tomcat-6.0.9_alpha (02 Feb 2007) + + 02 Feb 2007; William L. Thomson Jr. + +tomcat-6.0.9_alpha.ebuild: + -m Bumped package to latest alpha 31 Jan 2007; Vlastimil Babka tomcat-6.0.7_beta-r6.ebuild, tomcat-6.0.8_alpha-r3.ebuild: diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest index ebb2b87f0ee2..1f95cce4f296 100644 --- a/www-servers/tomcat/Manifest +++ b/www-servers/tomcat/Manifest @@ -121,6 +121,7 @@ SHA256 5f06449e261300a0f6ba6cb67f0908ddceb8c0ea06178ac41c791055068ec72b files/6/ DIST apache-tomcat-5.5.20-src.tar.gz 4796377 RMD160 587590d2e272d1ede73501b62933f544cd969822 SHA1 cc416242d8c9e1978702a207e305ca97afe53d4d SHA256 19f24717fb3e2db902c33e21650dfa88bbf98428c15b1ed68ecaf7a9150e4a77 DIST apache-tomcat-6.0.7-src.tar.gz 3210405 RMD160 830485c5e25926da950e6b2148aa8baae263b351 SHA1 6883fbed7840c20d0967c435deafc0260609200f SHA256 a76be3230db0a3363835916f14afcccce6f18509577c2999f5491c0fb861e4f3 DIST apache-tomcat-6.0.8-src.tar.gz 3215835 RMD160 678f6a5c6a8709774735c07618512c6fe651d84b SHA1 757cd847d7a2c7de8f121cb99e4a9f6f48310168 SHA256 132d82dc169ce0de9ca9eba2891e7b3b6182ea7080bc41c160335da06e017ba8 +DIST apache-tomcat-6.0.9-src.tar.gz 3218164 RMD160 c35c6441a358926a8bef4bc855b275ad2445f842 SHA1 2194a1162c0de5c5765fcd419145dbec44470be9 SHA256 ce3a2a6976ecf0059245debcb2c69c9b3947baf1ecc383fa80c27e55f2ee5647 DIST jakarta-tomcat-5.0.27.tar.gz 10298374 RMD160 a333fcb531bb98af20db6e0a10d3e8b2c72ee1fa SHA1 5f3981ecdd67e2b9774e643b336ad98ebc1bd4e3 SHA256 873fc94b4316235091e69bca926bd66a0fb9fab542016e582a03323ed6777d78 DIST jakarta-tomcat-5.0.28-src.tar.gz 3565766 RMD160 22c5e60b2c5009dc33a62edcefa6760d82da859b SHA1 a4ac2ad52f8b8db8ae8c38979f5f50713e242e36 SHA256 bbf584b3c376d23d92b1a0d306eb8f3729cea244c7a850f81d2527a7df6d20fc EBUILD tomcat-5.0.27-r6.ebuild 3847 RMD160 41cea01bc672d5ab288f88b5af3bd61cc295c970 SHA1 70a142673897e04a5a0ebaeca26e21e58132e987 SHA256 8784db8376eed0d3b5fdb74c1377505e7e3c3996c7e426dfa2fb795f0b91b019 @@ -151,10 +152,14 @@ EBUILD tomcat-6.0.8_alpha-r3.ebuild 5070 RMD160 f3810c7cc03346e6c25abbefcd5425fc MD5 14cde4e706b8e59667ff316b9b9e6e59 tomcat-6.0.8_alpha-r3.ebuild 5070 RMD160 f3810c7cc03346e6c25abbefcd5425fc548fb5dd tomcat-6.0.8_alpha-r3.ebuild 5070 SHA256 e74842549ad1b9b1ce74232cfb2e8684accfc8809428b50f93ccdf0a2b98dfb9 tomcat-6.0.8_alpha-r3.ebuild 5070 -MISC ChangeLog 36843 RMD160 da4918875dcd8396b5044a248bd487106f557dee SHA1 6f612bbada8a3e934fbd8cb6132d97cba5c45d9c SHA256 0beff91cd92805fe1e09eade894e9930ba24230c47b9544a380d825c6d3d8627 -MD5 cb577a3947467d60d7260680d307c3d9 ChangeLog 36843 -RMD160 da4918875dcd8396b5044a248bd487106f557dee ChangeLog 36843 -SHA256 0beff91cd92805fe1e09eade894e9930ba24230c47b9544a380d825c6d3d8627 ChangeLog 36843 +EBUILD tomcat-6.0.9_alpha.ebuild 5159 RMD160 99e2bd2c61b224ed78ad1535020cbdbf8d83d74b SHA1 4696b8a4ed5b9b47f2d895293b21d351a971111e SHA256 e745f275c275cb006b1797f99c228e27caadfd7bbd56e88f1d28211991556b7f +MD5 b44165a1e43307637beea6abaadb8d49 tomcat-6.0.9_alpha.ebuild 5159 +RMD160 99e2bd2c61b224ed78ad1535020cbdbf8d83d74b tomcat-6.0.9_alpha.ebuild 5159 +SHA256 e745f275c275cb006b1797f99c228e27caadfd7bbd56e88f1d28211991556b7f tomcat-6.0.9_alpha.ebuild 5159 +MISC ChangeLog 37001 RMD160 be852570bcc463e2c97fc9d8bd5adc8e3ef638c9 SHA1 482e7054dade5412d1d4d1db2508c019b0d1777a SHA256 5c35585157b5ef1c33e0579ac3c50766140186919d6e5a91155d9d244508b708 +MD5 4353083f312c8bde1b78a23977adc7da ChangeLog 37001 +RMD160 be852570bcc463e2c97fc9d8bd5adc8e3ef638c9 ChangeLog 37001 +SHA256 5c35585157b5ef1c33e0579ac3c50766140186919d6e5a91155d9d244508b708 ChangeLog 37001 MISC metadata.xml 556 RMD160 88a7809fe3f73c2d351b9fdda025fe88dfb11f31 SHA1 e8dcd8204d0ea02558dd07e1aded5dc58ed1460c SHA256 ac94c1d58b05b47598f311e6efb971fdb30ad9a25f3c32cb9c064fb6330dad79 MD5 0609d3339e0b8d5a3b4707f6b02aad3a metadata.xml 556 RMD160 88a7809fe3f73c2d351b9fdda025fe88dfb11f31 metadata.xml 556 @@ -180,3 +185,6 @@ SHA256 8c88ae20979c83fd4529d2493cf5bfc63d86ff37cb46af296db58166d2e0ad3d files/di MD5 d42fe3d19844276dfb1df24bd3d29897 files/digest-tomcat-6.0.8_alpha-r3 274 RMD160 831d3266c513184c82d467da6933a289798935b6 files/digest-tomcat-6.0.8_alpha-r3 274 SHA256 74cd7a38575a75a9f68d2e6da21d94ec2ae7c729431ab90b89716d6a5dcf7374 files/digest-tomcat-6.0.8_alpha-r3 274 +MD5 09759fb978add9cc1dd420dc82345dbb files/digest-tomcat-6.0.9_alpha 274 +RMD160 ff8e425e3de1f5fa5d1c31dd29d40752585d14d4 files/digest-tomcat-6.0.9_alpha 274 +SHA256 80dce4147154d253edad52355cd69b8a6a53e9d8261dee84d9944fa5b9e06600 files/digest-tomcat-6.0.9_alpha 274 diff --git a/www-servers/tomcat/files/digest-tomcat-6.0.9_alpha b/www-servers/tomcat/files/digest-tomcat-6.0.9_alpha new file mode 100644 index 000000000000..ac34a58141dd --- /dev/null +++ b/www-servers/tomcat/files/digest-tomcat-6.0.9_alpha @@ -0,0 +1,3 @@ +MD5 f22e59e244270d8aef6e96d5026e8e1b apache-tomcat-6.0.9-src.tar.gz 3218164 +RMD160 c35c6441a358926a8bef4bc855b275ad2445f842 apache-tomcat-6.0.9-src.tar.gz 3218164 +SHA256 ce3a2a6976ecf0059245debcb2c69c9b3947baf1ecc383fa80c27e55f2ee5647 apache-tomcat-6.0.9-src.tar.gz 3218164 diff --git a/www-servers/tomcat/tomcat-6.0.9_alpha.ebuild b/www-servers/tomcat/tomcat-6.0.9_alpha.ebuild new file mode 100644 index 000000000000..e4d7b76b87f6 --- /dev/null +++ b/www-servers/tomcat/tomcat-6.0.9_alpha.ebuild @@ -0,0 +1,165 @@ +# 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.9_alpha.ebuild,v 1.1 2007/02/02 21:37:53 wltjr Exp $ + +inherit eutils java-pkg-2 java-ant-2 + +DESCRIPTION="Apache Servlet-2.5/JSP-2.1 Container" + +MY_P="apache-${P/_alpha/}-src" +SLOT="6" +#SRC_URI="mirror://apache/${PN}/${PN}-6/v${PV/_/-}/src/${MY_P}.tar.gz" +SRC_URI="http://people.apache.org/~remm/tomcat-6/v6.0.9/src/apache-tomcat-6.0.9-src.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 )" + +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" + +# cd "${S}/bin" +# java-pkg_jar-from commons-daemon +} + +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 +}