From bfddc3611c86f0c8e0744c53e715901ec347a221 Mon Sep 17 00:00:00 2001 From: William Thomson Date: Wed, 27 Dec 2006 17:16:09 +0000 Subject: [PATCH] Bumped 6.0 to latest alpha. Fixed home page link on 5.5 ebuilds. Dropped ~x86-fbsd keyword from 5.5.20-r5 due to dev-java/commons-httpclient-2.0 not being keyworded for that arch. Package-Manager: portage-2.1.1-r2 --- www-servers/tomcat/ChangeLog | 11 +- .../tomcat/files/digest-tomcat-6.0.7_alpha | 3 + www-servers/tomcat/tomcat-5.5.20-r4.ebuild | 4 +- www-servers/tomcat/tomcat-5.5.20-r5.ebuild | 8 +- www-servers/tomcat/tomcat-6.0.7_alpha.ebuild | 163 ++++++++++++++++++ 5 files changed, 182 insertions(+), 7 deletions(-) create mode 100644 www-servers/tomcat/files/digest-tomcat-6.0.7_alpha create mode 100644 www-servers/tomcat/tomcat-6.0.7_alpha.ebuild diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog index 2860a5928bdf..13e073c5df7b 100644 --- a/www-servers/tomcat/ChangeLog +++ b/www-servers/tomcat/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for www-servers/tomcat # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.92 2006/12/26 18:47:20 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.93 2006/12/27 17:16:09 wltjr Exp $ + +*tomcat-6.0.7_alpha (27 Dec 2006) + + 27 Dec 2006; William L. Thomson Jr. + tomcat-5.5.20-r4.ebuild, tomcat-5.5.20-r5.ebuild, -tomcat-6.0.6.ebuild, + +tomcat-6.0.7_alpha.ebuild: + Bumped 6.0 to latest alpha. Fixed home page link on 5.5 ebuilds. Dropped + ~x86-fbsd keyword from 5.5.20-r5 due to dev-java/commons-httpclient-2.0 not + being keyworded for that arch. 26 Dec 2006; Petteri Räty tomcat-5.5.20-r4.ebuild, tomcat-5.5.20-r5.ebuild: diff --git a/www-servers/tomcat/files/digest-tomcat-6.0.7_alpha b/www-servers/tomcat/files/digest-tomcat-6.0.7_alpha new file mode 100644 index 000000000000..1309a094c51c --- /dev/null +++ b/www-servers/tomcat/files/digest-tomcat-6.0.7_alpha @@ -0,0 +1,3 @@ +MD5 e4043356aeb6fd631df17adb1fbdb76d apache-tomcat-6.0.7-src.tar.gz 3210405 +RMD160 830485c5e25926da950e6b2148aa8baae263b351 apache-tomcat-6.0.7-src.tar.gz 3210405 +SHA256 a76be3230db0a3363835916f14afcccce6f18509577c2999f5491c0fb861e4f3 apache-tomcat-6.0.7-src.tar.gz 3210405 diff --git a/www-servers/tomcat/tomcat-5.5.20-r4.ebuild b/www-servers/tomcat/tomcat-5.5.20-r4.ebuild index 585c716ff349..67b692a187ea 100644 --- a/www-servers/tomcat/tomcat-5.5.20-r4.ebuild +++ b/www-servers/tomcat/tomcat-5.5.20-r4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.20-r4.ebuild,v 1.4 2006/12/26 18:47:20 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.20-r4.ebuild,v 1.5 2006/12/27 17:16:09 wltjr Exp $ inherit eutils java-pkg-2 java-ant-2 @@ -9,7 +9,7 @@ DESCRIPTION="Apache Servlet-2.4/JSP-2.0 Container" MY_P="apache-${P}-src" SLOT="5.5" SRC_URI="mirror://apache/${PN}/${PN}-5/v${PV}/src/${MY_P}.tar.gz" -HOMEPAGE="http://jakarta.apache.org/tomcat" +HOMEPAGE="http://tomcat.apache.org/" KEYWORDS="amd64 x86 -ppc -ppc64" LICENSE="Apache-2.0" diff --git a/www-servers/tomcat/tomcat-5.5.20-r5.ebuild b/www-servers/tomcat/tomcat-5.5.20-r5.ebuild index 42a8405b70a7..de8c9110bb0c 100644 --- a/www-servers/tomcat/tomcat-5.5.20-r5.ebuild +++ b/www-servers/tomcat/tomcat-5.5.20-r5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.20-r5.ebuild,v 1.5 2006/12/26 18:47:20 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.20-r5.ebuild,v 1.6 2006/12/27 17:16:09 wltjr Exp $ inherit eutils java-pkg-2 java-ant-2 @@ -9,8 +9,8 @@ DESCRIPTION="Apache Servlet-2.4/JSP-2.0 Container" MY_P="apache-${P}-src" SLOT="5.5" SRC_URI="mirror://apache/${PN}/${PN}-5/v${PV}/src/${MY_P}.tar.gz" -HOMEPAGE="http://jakarta.apache.org/tomcat" -KEYWORDS="~amd64 -ppc -ppc64 ~x86 ~x86-fbsd" +HOMEPAGE="http://tomcat.apache.org/" +KEYWORDS="~amd64 -ppc -ppc64 ~x86" LICENSE="Apache-2.0" IUSE="admin java5 doc examples source test" @@ -45,8 +45,8 @@ RDEPEND="=dev-java/eclipse-ecj-3.1* )" DEPEND="java5? ( >=virtual/jdk-1.5 ) !java5? ( =virtual/jdk-1.4* ) - >=dev-java/java-config-2.0.31 ${RDEPEND} + >=dev-java/java-config-2.0.31 dev-java/ant" S=${WORKDIR}/${MY_P} diff --git a/www-servers/tomcat/tomcat-6.0.7_alpha.ebuild b/www-servers/tomcat/tomcat-6.0.7_alpha.ebuild new file mode 100644 index 000000000000..7b8dee30143d --- /dev/null +++ b/www-servers/tomcat/tomcat-6.0.7_alpha.ebuild @@ -0,0 +1,163 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.7_alpha.ebuild,v 1.1 2006/12/27 17:16:09 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" +# jni? ( mirror://tomcat/tomcat-connectors/native/tomcat-native-1.1.8-src.tar.gz )" +HOMEPAGE="http://tomcat.apache.org/" +KEYWORDS="~amd64 ~x86" +LICENSE="Apache-2.0" + +IUSE="doc examples jni source test" + +RDEPEND=">=virtual/jre-1.5 + =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 + jni? ( dev-libs/apr + dev-libs/openssl )" + +DEPEND=">=virtual/jdk-1.5 + ${RDEPEND} + test? ( + dev-java/junit + dev-java/ant + ) + !test? ( dev-java/ant-core )" + +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 + + JAVA_PKG_WANT_SOURCE="1.5" + JAVA_PKG_WANT_TARGET="1.5" +} + +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 + java-pkg_force-compiler ecj-3.2 + + local antflags="build-jasper-jdt build-only -Dbase.path=${T}" + 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)" + eant ${antflags} + + if use jni; then + cd ${S}/native/connector + sh buildconf --with-apr=/usr || die + econf --with-apr=/usr --with-ssl=/usr || die + make || die + fi +} + +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 + + # 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 ${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 webapps/docs ${D}${CATALINA_BASE}/webapps + fi + if use examples; then + cp -pr 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() { + einfo + einfo " This ebuild implements a FHS compliant layout for tomcat" + einfo " Please read http://www.gentoo.org/proj/en/java/tomcat-guide.xml" + einfo " for more information." + einfo + einfo " Please report any bugs to http://bugs.gentoo.org/" + einfo +} -- 2.26.2