From: William Thomson Date: Thu, 1 Mar 2007 00:11:13 +0000 (+0000) Subject: Brand new 0 day release version of Tomcat 6.0.x :). Removed older development version... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7523554a9e8d81c3bcaa7a4509ef3519894f1ae3;p=gentoo.git Brand new 0 day release version of Tomcat 6.0.x :). Removed older development versions. Long live tc 6.0.x die <=5.5.x Package-Manager: portage-2.1.2-r11 --- diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog index 1036f7fc10e3..f3e91bbde5f8 100644 --- a/www-servers/tomcat/ChangeLog +++ b/www-servers/tomcat/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for www-servers/tomcat # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.123 2007/02/27 18:54:16 wltjr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.124 2007/03/01 00:11:13 wltjr Exp $ + +*tomcat-6.0.10 (01 Mar 2007) + + 01 Mar 2007; William L. Thomson Jr. + -tomcat-6.0.9_beta.ebuild, -tomcat-6.0.10_pre.ebuild, + +tomcat-6.0.10.ebuild: + Brand new 0 day release version of Tomcat 6.0.x :). Removed older + development versions. Long live tc 6.0.x die <=5.5.x 27 Feb 2007; William L. Thomson Jr. tomcat-5.5.20-r10.ebuild, tomcat-5.5.22_pre-r1.ebuild: diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest index 46cd75370b53..190cc0b68822 100644 --- a/www-servers/tomcat/Manifest +++ b/www-servers/tomcat/Manifest @@ -141,7 +141,6 @@ SHA256 5f06449e261300a0f6ba6cb67f0908ddceb8c0ea06178ac41c791055068ec72b files/6/ DIST apache-tomcat-5.5.20-src.tar.gz 4796377 RMD160 587590d2e272d1ede73501b62933f544cd969822 SHA1 cc416242d8c9e1978702a207e305ca97afe53d4d SHA256 19f24717fb3e2db902c33e21650dfa88bbf98428c15b1ed68ecaf7a9150e4a77 DIST apache-tomcat-5.5.22-src.tar.gz 4888257 RMD160 39a5da86cce996c7c41baddfab825e5bfbd334db SHA1 9b9ad830c4db0f0668aa2500cc1d954c1bf95b96 SHA256 206fa6040b06cc98d705afe3594d588e2556dc15eb73083d4c1da146b997216a 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 MD5 2729d48603266ae1654d7f6823109afb tomcat-5.0.28-r14.ebuild 9331 @@ -159,18 +158,14 @@ EBUILD tomcat-5.5.22_pre-r1.ebuild 10715 RMD160 bc361580d3815f1a32228d729eac0b61 MD5 8fc346bc15c953061b52717b9eedc70d tomcat-5.5.22_pre-r1.ebuild 10715 RMD160 bc361580d3815f1a32228d729eac0b614b7a3a54 tomcat-5.5.22_pre-r1.ebuild 10715 SHA256 f779c14cbc5bdb7816007794d9eebc7e66c0d608d64eb720f7e2631093d6b228 tomcat-5.5.22_pre-r1.ebuild 10715 -EBUILD tomcat-6.0.10_pre.ebuild 5083 RMD160 e6aa0c1fe440de1214523ca7c7c00f4415c29043 SHA1 a3d555038ac5d551b23bb2d98e64d9cfd8958d23 SHA256 1a659b2ef2bdd7af54924b4b5c82efec59e2d3dea450026b087a8c91753039f0 -MD5 15f646ff747ecfc7489134ba7e5f53ba tomcat-6.0.10_pre.ebuild 5083 -RMD160 e6aa0c1fe440de1214523ca7c7c00f4415c29043 tomcat-6.0.10_pre.ebuild 5083 -SHA256 1a659b2ef2bdd7af54924b4b5c82efec59e2d3dea450026b087a8c91753039f0 tomcat-6.0.10_pre.ebuild 5083 -EBUILD tomcat-6.0.9_beta.ebuild 5011 RMD160 8d26faa0d5807413feb91c7c8de356a6a438462f SHA1 311b18dafba3ec10f54e9ba022755dfbd36e86a0 SHA256 443e7cb5b0c4daedf0e35280f6e240bc9a95bb45587408585d8918a9a0429787 -MD5 145ef69975816401b17b7f32369556d5 tomcat-6.0.9_beta.ebuild 5011 -RMD160 8d26faa0d5807413feb91c7c8de356a6a438462f tomcat-6.0.9_beta.ebuild 5011 -SHA256 443e7cb5b0c4daedf0e35280f6e240bc9a95bb45587408585d8918a9a0429787 tomcat-6.0.9_beta.ebuild 5011 -MISC ChangeLog 1306 RMD160 1cac8fecca515e6c4d8b85aa4173398cbed92ad4 SHA1 b12c0eef42ad1550cbf0ef45cf6fdb40d0f0f3d8 SHA256 bcb264599fd3d7b15d5ea74ac5532d6614b0a89962a55f2252a73c05d51b5d55 -MD5 28c1c64d5685c1e9ba4ab3da9ecaa50b ChangeLog 1306 -RMD160 1cac8fecca515e6c4d8b85aa4173398cbed92ad4 ChangeLog 1306 -SHA256 bcb264599fd3d7b15d5ea74ac5532d6614b0a89962a55f2252a73c05d51b5d55 ChangeLog 1306 +EBUILD tomcat-6.0.10.ebuild 5000 RMD160 562e6ed3a081dd40b388f0882f382b6a69531b3a SHA1 573541582db37c7a49d758ac5b0ea7dc0a0ca20c SHA256 e4607fa447547219d4b4d003cf02285e21c9e3c8a1c3401b518f97e72b21e2b0 +MD5 bc93471a11d7e21bc1191e7fee70a429 tomcat-6.0.10.ebuild 5000 +RMD160 562e6ed3a081dd40b388f0882f382b6a69531b3a tomcat-6.0.10.ebuild 5000 +SHA256 e4607fa447547219d4b4d003cf02285e21c9e3c8a1c3401b518f97e72b21e2b0 tomcat-6.0.10.ebuild 5000 +MISC ChangeLog 1598 RMD160 94f995f6f9c63378c2a30d842ed90917caba0194 SHA1 0ba42343aee5eb053d2180e55623c7d4786ff2e9 SHA256 11b3ef5cd229e42c6f48b7e3de375d6ea20d235992506c5a37c090fb14900e7c +MD5 313df09d42139f122ee0dbd1c102fdda ChangeLog 1598 +RMD160 94f995f6f9c63378c2a30d842ed90917caba0194 ChangeLog 1598 +SHA256 11b3ef5cd229e42c6f48b7e3de375d6ea20d235992506c5a37c090fb14900e7c ChangeLog 1598 MISC metadata.xml 556 RMD160 88a7809fe3f73c2d351b9fdda025fe88dfb11f31 SHA1 e8dcd8204d0ea02558dd07e1aded5dc58ed1460c SHA256 ac94c1d58b05b47598f311e6efb971fdb30ad9a25f3c32cb9c064fb6330dad79 MD5 0609d3339e0b8d5a3b4707f6b02aad3a metadata.xml 556 RMD160 88a7809fe3f73c2d351b9fdda025fe88dfb11f31 metadata.xml 556 @@ -187,9 +182,6 @@ SHA256 fda2efc7c4fe103d3fec9599fe3797d8784381008f71d9006c7224db91862b30 files/di MD5 688aca3d811cb2516ca3d4e7efa05bb6 files/digest-tomcat-5.5.22_pre-r1 277 RMD160 bab389aec90e5bd2a4a67d940e7e2171ac94d257 files/digest-tomcat-5.5.22_pre-r1 277 SHA256 52c8b51127d5456a17e54290706ca09621523d7befa04bd76dd74ced904cad11 files/digest-tomcat-5.5.22_pre-r1 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 +MD5 5f9244a61bfa0875478e8849b6cb845e files/digest-tomcat-6.0.10 277 +RMD160 3d16b85b1dcb55e6874b535c06f2a5df00b46ce1 files/digest-tomcat-6.0.10 277 +SHA256 49aef00c733c574a5c8536a6e5406769105dbe0b64ad0ea9b9682ca42bff23f0 files/digest-tomcat-6.0.10 277 diff --git a/www-servers/tomcat/files/digest-tomcat-6.0.10_pre b/www-servers/tomcat/files/digest-tomcat-6.0.10 similarity index 100% rename from www-servers/tomcat/files/digest-tomcat-6.0.10_pre rename to www-servers/tomcat/files/digest-tomcat-6.0.10 diff --git a/www-servers/tomcat/files/digest-tomcat-6.0.9_beta b/www-servers/tomcat/files/digest-tomcat-6.0.9_beta deleted file mode 100644 index ac34a58141dd..000000000000 --- a/www-servers/tomcat/files/digest-tomcat-6.0.9_beta +++ /dev/null @@ -1,3 +0,0 @@ -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_beta.ebuild b/www-servers/tomcat/tomcat-6.0.10.ebuild similarity index 98% rename from www-servers/tomcat/tomcat-6.0.9_beta.ebuild rename to www-servers/tomcat/tomcat-6.0.10.ebuild index 38b6142acf82..02f27828347e 100644 --- a/www-servers/tomcat/tomcat-6.0.9_beta.ebuild +++ b/www-servers/tomcat/tomcat-6.0.10.ebuild @@ -1,6 +1,6 @@ # 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_beta.ebuild,v 1.3 2007/02/15 02:19:06 wltjr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.10.ebuild,v 1.1 2007/03/01 00:11:13 wltjr Exp $ WANT_ANT_TASKS="ant-trax" @@ -8,7 +8,7 @@ inherit eutils java-pkg-2 java-ant-2 DESCRIPTION="Tomcat Servlet-2.5/JSP-2.1 Container" -MY_P="apache-${P/_beta/}-src" +MY_P="apache-${P}-src" SLOT="6" SRC_URI="mirror://apache/${PN}/${PN}-6/v${PV/_/-}/src/${MY_P}.tar.gz" HOMEPAGE="http://tomcat.apache.org/" diff --git a/www-servers/tomcat/tomcat-6.0.10_pre.ebuild b/www-servers/tomcat/tomcat-6.0.10_pre.ebuild deleted file mode 100644 index f3b557d2cbbf..000000000000 --- a/www-servers/tomcat/tomcat-6.0.10_pre.ebuild +++ /dev/null @@ -1,162 +0,0 @@ -# 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.2 2007/02/15 02:19:06 wltjr Exp $ - -WANT_ANT_TASKS="ant-trax" - -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 )" - -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 -} - -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 -}