From 1c9045c6f5016fc2f87d5864da4c469b198a1643 Mon Sep 17 00:00:00 2001 From: William Thomson Date: Sat, 30 Dec 2006 16:25:40 +0000 Subject: [PATCH] Modified 5.5.20 ebuilds to respect symlink and not copy the jars per bug #159169. Package-Manager: portage-2.1.1-r2 --- www-servers/tomcat/Manifest | 30 +- .../tomcat/files/digest-tomcat-5.5.20-r4 | 3 - www-servers/tomcat/tomcat-5.5.20-r4.ebuild | 337 ------------------ 3 files changed, 15 insertions(+), 355 deletions(-) delete mode 100644 www-servers/tomcat/files/digest-tomcat-5.5.20-r4 delete mode 100644 www-servers/tomcat/tomcat-5.5.20-r4.ebuild diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest index bef04de4e3a8..639ae24ae460 100644 --- a/www-servers/tomcat/Manifest +++ b/www-servers/tomcat/Manifest @@ -118,22 +118,22 @@ EBUILD tomcat-5.0.28-r14.ebuild 9357 RMD160 a9a37ab6ec5479ff613eb071548285d62597 MD5 0bf6de6439b6a7f67509fe51bedbefab tomcat-5.0.28-r14.ebuild 9357 RMD160 a9a37ab6ec5479ff613eb071548285d62597e183 tomcat-5.0.28-r14.ebuild 9357 SHA256 a107e5be63f23f54b0664bcc71db4c825683aa18e2a9badfe3cd97805667dcfc tomcat-5.0.28-r14.ebuild 9357 -EBUILD tomcat-5.5.20-r4.ebuild 10275 RMD160 dc6fa27938de9727f61eeb34aed286fc74f1e39f SHA1 9b2e96b2ca259b5a1c8005448af02fa4013531b6 SHA256 f5d6420cd9d389bb4c1ff77d290caa8a29812d9c2730f50e3126bffae6a3c742 -MD5 14bc174c3ca92f03d2d3cf74ce12c405 tomcat-5.5.20-r4.ebuild 10275 -RMD160 dc6fa27938de9727f61eeb34aed286fc74f1e39f tomcat-5.5.20-r4.ebuild 10275 -SHA256 f5d6420cd9d389bb4c1ff77d290caa8a29812d9c2730f50e3126bffae6a3c742 tomcat-5.5.20-r4.ebuild 10275 -EBUILD tomcat-5.5.20-r5.ebuild 10283 RMD160 ea57a97815314755e57c2858a3206bcbd202759b SHA1 7056d24fccb2a5e4f9e7590612e94c0938ee3c47 SHA256 0b31cfb7a990a68439d196d5665063def25fcd7d3871c5f085b10ecb9f0ee978 -MD5 42f9db4da7fec019352a6dd3ddb2bc73 tomcat-5.5.20-r5.ebuild 10283 -RMD160 ea57a97815314755e57c2858a3206bcbd202759b tomcat-5.5.20-r5.ebuild 10283 -SHA256 0b31cfb7a990a68439d196d5665063def25fcd7d3871c5f085b10ecb9f0ee978 tomcat-5.5.20-r5.ebuild 10283 +EBUILD tomcat-5.5.20-r5.ebuild 10227 RMD160 7b09a525ac99d4d44ac53e3e193090f41aa8d047 SHA1 e2801a6f667491a8a35c832f681894d7d3a52d3c SHA256 30c697ecc987ace021a7fcbacc32f6e050fd7b8a49dc4e8a7382177f4acc3774 +MD5 38bf0e0238cc1cd76fcf3668b7bd252d tomcat-5.5.20-r5.ebuild 10227 +RMD160 7b09a525ac99d4d44ac53e3e193090f41aa8d047 tomcat-5.5.20-r5.ebuild 10227 +SHA256 30c697ecc987ace021a7fcbacc32f6e050fd7b8a49dc4e8a7382177f4acc3774 tomcat-5.5.20-r5.ebuild 10227 +EBUILD tomcat-5.5.20-r6.ebuild 10235 RMD160 c75db964790363a05b2f04234e96dc880caa54d5 SHA1 48b8258f56938af7c7683e21a88fe22ad53b2e76 SHA256 1b0ea606f802e3903fcb43d65983cad0606f1bc562d9373feb8a5905e73a27d7 +MD5 c29595278538a55ccc576c7ee80b0e03 tomcat-5.5.20-r6.ebuild 10235 +RMD160 c75db964790363a05b2f04234e96dc880caa54d5 tomcat-5.5.20-r6.ebuild 10235 +SHA256 1b0ea606f802e3903fcb43d65983cad0606f1bc562d9373feb8a5905e73a27d7 tomcat-5.5.20-r6.ebuild 10235 EBUILD tomcat-6.0.7_alpha.ebuild 4808 RMD160 529ff75c9283396cd17810b2ac594c3b928ef630 SHA1 eca749cfec385ebdc7aca3f422e69e97b9c5210a SHA256 451d2c99c8f9532ac8653ed0fc85b38653af790909d71a2683ab55ac6ac5db4b MD5 c7e51ccdd4e00d177ebe5024d92b829b tomcat-6.0.7_alpha.ebuild 4808 RMD160 529ff75c9283396cd17810b2ac594c3b928ef630 tomcat-6.0.7_alpha.ebuild 4808 SHA256 451d2c99c8f9532ac8653ed0fc85b38653af790909d71a2683ab55ac6ac5db4b tomcat-6.0.7_alpha.ebuild 4808 -MISC ChangeLog 31172 RMD160 5ed60b490aab4076b479dc998cd841d1338b6a10 SHA1 6b1f6c8c7a183e627d88e6b24e20beb0e811734a SHA256 564b0cfb4029ba5d38e54d12b7ce3eea464fdeb9400465971678258e7e4e06dc -MD5 318c889c64889ae6c36780d487da450b ChangeLog 31172 -RMD160 5ed60b490aab4076b479dc998cd841d1338b6a10 ChangeLog 31172 -SHA256 564b0cfb4029ba5d38e54d12b7ce3eea464fdeb9400465971678258e7e4e06dc ChangeLog 31172 +MISC ChangeLog 31430 RMD160 9a517b3f4fe3e118b71629030f9f10139f182bb9 SHA1 c5043801d573fa232dc0c1465ce064c2ae2cb9b1 SHA256 5ab7e74c707b8435a985b57444b94586ee7190894c1d42bf7eaa24402bf0fa58 +MD5 1e87a34dbbc737fb4b81f4522a01f440 ChangeLog 31430 +RMD160 9a517b3f4fe3e118b71629030f9f10139f182bb9 ChangeLog 31430 +SHA256 5ab7e74c707b8435a985b57444b94586ee7190894c1d42bf7eaa24402bf0fa58 ChangeLog 31430 MISC metadata.xml 556 RMD160 88a7809fe3f73c2d351b9fdda025fe88dfb11f31 SHA1 e8dcd8204d0ea02558dd07e1aded5dc58ed1460c SHA256 ac94c1d58b05b47598f311e6efb971fdb30ad9a25f3c32cb9c064fb6330dad79 MD5 0609d3339e0b8d5a3b4707f6b02aad3a metadata.xml 556 RMD160 88a7809fe3f73c2d351b9fdda025fe88dfb11f31 metadata.xml 556 @@ -144,12 +144,12 @@ SHA256 8adce6bec0e657beb514e68dc8196cca8650ec0f2b5d1e421106ccc9fe954531 files/di MD5 d942ea8b8317ba352e744aed2d284d01 files/digest-tomcat-5.0.28-r14 280 RMD160 7283323e161ab5dd3a94549def34af040891e49a files/digest-tomcat-5.0.28-r14 280 SHA256 2c09d3ad89eb04ab24e5c95a9492d7f461e1935bdb076100010cd3d4f7cb8796 files/digest-tomcat-5.0.28-r14 280 -MD5 8adc14a8534e1c6f8d5f96b371e1895f files/digest-tomcat-5.5.20-r4 277 -RMD160 b9c5deac84bf5acd7a65ad80bdfaca9f7e343f3f files/digest-tomcat-5.5.20-r4 277 -SHA256 fda2efc7c4fe103d3fec9599fe3797d8784381008f71d9006c7224db91862b30 files/digest-tomcat-5.5.20-r4 277 MD5 8adc14a8534e1c6f8d5f96b371e1895f files/digest-tomcat-5.5.20-r5 277 RMD160 b9c5deac84bf5acd7a65ad80bdfaca9f7e343f3f files/digest-tomcat-5.5.20-r5 277 SHA256 fda2efc7c4fe103d3fec9599fe3797d8784381008f71d9006c7224db91862b30 files/digest-tomcat-5.5.20-r5 277 +MD5 8adc14a8534e1c6f8d5f96b371e1895f files/digest-tomcat-5.5.20-r6 277 +RMD160 b9c5deac84bf5acd7a65ad80bdfaca9f7e343f3f files/digest-tomcat-5.5.20-r6 277 +SHA256 fda2efc7c4fe103d3fec9599fe3797d8784381008f71d9006c7224db91862b30 files/digest-tomcat-5.5.20-r6 277 MD5 ae090639fc2a4b844084020e9fd68796 files/digest-tomcat-6.0.7_alpha 274 RMD160 887290424c340b8a024770ae6ee2adeb0252b5ea files/digest-tomcat-6.0.7_alpha 274 SHA256 8c88ae20979c83fd4529d2493cf5bfc63d86ff37cb46af296db58166d2e0ad3d files/digest-tomcat-6.0.7_alpha 274 diff --git a/www-servers/tomcat/files/digest-tomcat-5.5.20-r4 b/www-servers/tomcat/files/digest-tomcat-5.5.20-r4 deleted file mode 100644 index 25cb711a112c..000000000000 --- a/www-servers/tomcat/files/digest-tomcat-5.5.20-r4 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 5775bae8fac16a0e3a2c913c4768bb37 apache-tomcat-5.5.20-src.tar.gz 4796377 -RMD160 587590d2e272d1ede73501b62933f544cd969822 apache-tomcat-5.5.20-src.tar.gz 4796377 -SHA256 19f24717fb3e2db902c33e21650dfa88bbf98428c15b1ed68ecaf7a9150e4a77 apache-tomcat-5.5.20-src.tar.gz 4796377 diff --git a/www-servers/tomcat/tomcat-5.5.20-r4.ebuild b/www-servers/tomcat/tomcat-5.5.20-r4.ebuild deleted file mode 100644 index 67b692a187ea..000000000000 --- a/www-servers/tomcat/tomcat-5.5.20-r4.ebuild +++ /dev/null @@ -1,337 +0,0 @@ -# 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.5 2006/12/27 17:16:09 wltjr Exp $ - -inherit eutils java-pkg-2 java-ant-2 - -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://tomcat.apache.org/" -KEYWORDS="amd64 x86 -ppc -ppc64" -LICENSE="Apache-2.0" - -IUSE="admin java5 doc examples source test" - -RDEPEND="=dev-java/eclipse-ecj-3.1* - =dev-java/commons-beanutils-1.7* - >=dev-java/commons-collections-3.1 - >=dev-java/commons-daemon-1.0.1 - >=dev-java/commons-dbcp-1.2.1 - >=dev-java/commons-digester-1.7 - >=dev-java/commons-fileupload-1.1 - >=dev-java/commons-io-1.1 - >=dev-java/commons-el-1.0 - >=dev-java/commons-launcher-0.9 - >=dev-java/commons-logging-1.0.4 - >=dev-java/commons-modeler-1.1 - >=dev-java/commons-pool-1.2 - >=dev-java/log4j-1.2.9 - ~dev-java/servletapi-2.4 - admin? ( =dev-java/struts-1.2* ) - dev-java/sun-javamail - java5? ( >=virtual/jre-1.5 ) - !java5? ( - =virtual/jre-1.4* - =dev-java/commons-httpclient-2.0* - dev-java/sun-jaf - >=dev-java/junit-3.8.1 - =dev-java/mx4j-3* - >=dev-java/saxpath-1.0 - >=dev-java/xerces-2.7.1 - =dev-java/xml-commons-external-1.3* - )" -DEPEND="java5? ( >=virtual/jdk-1.5 ) - !java5? ( =virtual/jdk-1.4* ) - ${RDEPEND} - dev-java/ant" - -if ! use java5; then - JAVA_PKG_NV_DEPEND="=virtual/jdk-1.4*" -else - JAVA_PKG_NV_DEPEND="=virtual/jdk-1.5" -fi - -S=${WORKDIR}/${MY_P} - -TOMCAT_NAME="${PN}-${SLOT}" -WEBAPPS_DIR="/var/lib/${TOMCAT_NAME}/webapps" - -pkg_setup() { - # new user for tomcat - enewgroup tomcat - enewuser tomcat -1 -1 /dev/null tomcat - - java-pkg_filter-compiler ecj-3.1 ecj-3.2 - - if use java5; then - JAVA_PKG_WANT_SOURCE="1.5" - JAVA_PKG_WANT_TARGET="1.5" - fi -} - -src_unpack() { - unpack ${A} - cd ${S} - - local PATCHES=" - mainbuild-xml.patch - tomcatbuild-xml.patch - catalinabuild-xml.patch - jasperbuild-xml.patch - " - for patch in ${PATCHES}; do - epatch "${FILESDIR}/${PV}/${patch}" - done - if ! use examples; then - epatch "${FILESDIR}/${PV}/jsr152build-xml-examples.patch" - epatch "${FILESDIR}/${PV}/jsr154build-xml-examples.patch" - fi - - # avoid packed jars :-) - mkdir -p ${S}/build/build/common - cd ${S}/build/build - - mkdir ./bin && cd ./bin - java-pkg_jar-from commons-logging commons-logging-api.jar - java-pkg_jar-from commons-daemon - if ! use java5; then - java-pkg_jar-from mx4j-3.0 mx4j.jar jmx.jar - java-pkg_jar-from mx4j-3.0 mx4j-rjmx.jar jmx-remote.jar - fi - - if ! use java5; then - mkdir ${S}/build/build/common/endorsed && cd ${S}/build/build/common/endorsed - java-pkg_jar-from xml-commons-external-1.3 xml-apis.jar - java-pkg_jar-from xerces-2 xercesImpl.jar - fi - - mkdir ${S}/build/build/common/lib && cd ${S}/build/build/common/lib - java-pkg_jar-from ant-core - java-pkg_jar-from commons-collections - java-pkg_jar-from commons-dbcp - java-pkg_jar-from commons-el - java-pkg_jar-from commons-pool - java-pkg_jar-from servletapi-2.4 - - mkdir -p ${S}/build/build/server/lib && cd ${S}/build/build/server/lib - java-pkg_jar-from commons-beanutils-1.7 commons-beanutils.jar - java-pkg_jar-from commons-digester - java-pkg_jar-from commons-modeler - - mkdir -p ${S}/container/webapps/manager/WEB-INF/lib - cd ${S}/container/webapps/manager/WEB-INF/lib - java-pkg_jar-from commons-fileupload - java-pkg_jar-from commons-io-1 - -} - -src_compile(){ - local antflags="-Dbase.path=${T}" - - antflags="${antflags} -Dcommons-collections.jar=$(java-config -p commons-collections)" - antflags="${antflags} -Dcommons-daemon.jar=$(java-config -p commons-daemon)" - antflags="${antflags} -Dcommons-digester.jar=$(java-config -p commons-digester)" - antflags="${antflags} -Dcommons-dbcp.jar=$(java-config -p commons-dbcp)" - antflags="${antflags} -Dcommons-el.jar=$(java-config -p commons-el)" - antflags="${antflags} -Dcommons-pool.jar=$(java-config -p commons-pool)" - antflags="${antflags} -Dcommons-fileupload.jar=$(java-config -p commons-fileupload)" - antflags="${antflags} -Dcommons-launcher.jar=$(java-config -p commons-launcher)" - antflags="${antflags} -Dcommons-modeler.jar=$(java-config -p commons-modeler)" - antflags="${antflags} -Djunit.jar=$(java-config -p junit)" - antflags="${antflags} -Djdt.jar=$(java-pkg_getjar eclipse-ecj-3.1 ecj.jar)" - antflags="${antflags} -Dlog4j.jar=$(java-config -p log4j)" - antflags="${antflags} -Dcommons-beanutils.jar=$(java-pkg_getjar commons-beanutils-1.7 commons-beanutils.jar)" - antflags="${antflags} -Dcommons-logging.jar=$(java-pkg_getjar commons-logging commons-logging.jar)" - antflags="${antflags} -Dcommons-logging-api.jar=$(java-pkg_getjar commons-logging commons-logging-api.jar)" - antflags="${antflags} -Dmail.jar=$(java-pkg_getjar sun-javamail mail.jar)" - if use admin; then - antflags="${antflags} -Dstruts.jar=$(java-pkg_getjar struts-1.2 struts.jar)" - antflags="${antflags} -Dstruts.home=/usr/share/struts" - else - antflags="${antflags} -Dadmin.build.notrequired=true" - antflags="${antflags} -Dadmin.precompile.notrequired=true" - fi - if ! use examples; then - antflags="${antflags} -Dexamples.precompile.notrequired=true" - fi - antflags="${antflags} -Djasper.home=${S}/jasper" - if ! use java5; then - antflags="${antflags} -Dcommons-httpclient.jar=$(java-config -p commons-httpclient)" - antflags="${antflags} -Dactivation.jar=$(java-config -p sun-jaf)" - antflags="${antflags} -Djmx.jar=$(java-pkg_getjar mx4j-3.0 mx4j.jar)" - antflags="${antflags} -Djmx-remote.jar=$(java-pkg_getjar mx4j-3.0 mx4j-rjmx.jar)" - antflags="${antflags} -Dsaxpath.jar=$(java-pkg_getjar saxpath saxpath.jar)" - antflags="${antflags} -DxercesImpl.jar=$(java-pkg_getjar xerces-2 xercesImpl.jar)" - antflags="${antflags} -Dxml-apis.jar=$(java-pkg_getjar xml-commons-external-1.3 xml-apis.jar)" - fi - - eant ${antflags} - -} - -src_install() { - cd ${S}/build/build - - # init.d, conf.d - newinitd ${FILESDIR}/${PV}/tomcat.init ${TOMCAT_NAME} - newconfd ${FILESDIR}/${PV}/tomcat.conf ${TOMCAT_NAME} - - # create dir structure - diropts -m755 -o tomcat -g tomcat - dodir /usr/share/${TOMCAT_NAME} - keepdir /var/log/${TOMCAT_NAME}/ - keepdir /var/tmp/${TOMCAT_NAME}/ - keepdir /var/run/${TOMCAT_NAME}/ - - local CATALINA_BASE=/var/lib/${TOMCAT_NAME}/ - dodir ${CATALINA_BASE} - keepdir ${CATALINA_BASE}/shared/lib - keepdir ${CATALINA_BASE}/shared/classes - - keepdir /usr/share/${TOMCAT_NAME}/common/lib - - dodir /etc/${TOMCAT_NAME} - fperms 750 /etc/${TOMCAT_NAME} - - diropts -m0755 - - # we don't need dos scripts - rm -f bin/*.bat - - # copy the manager and admin context's to the right position - mkdir -p conf/Catalina/localhost - if use admin; then - cp ${S}/container/webapps/admin/admin.xml \ - conf/Catalina/localhost - fi - cp ${S}/container/webapps/manager/manager.xml \ - conf/Catalina/localhost - - # make the jars available via java-config -p and jar-from, etc - base=$(pwd) - libdirs="common/lib server/lib" - for dir in ${libdirs} - do - cd ${dir} - - for jar in *.jar; - do - # replace the file with a symlink - if [ ! -L ${jar} ]; then - java-pkg_dojar ${jar} - rm -f ${jar} - ln -s ${DESTTREE}/share/${TOMCAT_NAME}/lib/${jar} ${jar} - fi - done - - cd ${base} - done - - # replace a packed struts.jar - if use admin; then - cd server/webapps/admin/WEB-INF/lib - rm -f struts.jar - java-pkg_jar-from struts-1.2 struts.jar - cd ${base} - else - rm -fR server/webapps/admin - fi - - # 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,server-minimal}.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 common server ${D}/usr/share/${TOMCAT_NAME} || die "failed to copy" - - keepdir ${WEBAPPS_DIR} - set_webapps_perms ${D}/${WEBAPPS_DIR} - - # 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 - if use doc; then - cp -pr webapps/tomcat-docs ${D}${CATALINA_BASE}/webapps - fi - if use examples; then - cp -pr webapps/{jsp-examples,servlets-examples,webdav} \ - ${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}/build/{RELEASE-NOTES,RUNNING.txt} - fperms 640 /etc/${TOMCAT_NAME}/tomcat-users.xml -} - -pkg_postinst() { - #due to previous ebuild bloopers, make sure everything is correct - chown root:root /etc/init.d/${TOMCAT_NAME} - chown root:root /etc/conf.d/${TOMCAT_NAME} - - einfo - ewarn " This ebuild implements a new filesystem layout for tomcat" - ewarn " please read http://www.gentoo.org/proj/en/java/tomcat-guide.xml" - ewarn " for more information!." - einfo - einfo " Please file any bugs at http://bugs.gentoo.org/ or else it" - einfo " may not get seen. Thank you." - einfo - -# einfo "Run emerge --config =${PF}" -# einfo "to configure Tomcat if you need to for example" -# einfo "change the home directory of the Tomcat user." -} - -#helpers -set_webapps_perms() { - chown tomcat:tomcat ${1} || die "Failed to change owner off ${1}." - chmod 750 ${1} || die "Failed to change permissions off ${1}." -} - -pkg_config() { - # Better suggestions are welcome - local currentdir="$(getent passwd tomcat | gawk -F':' '{ print $6 }')" - - einfo "The default home directory for Tomcat is /dev/null." - einfo "You need to change it if your applications needs it to" - einfo "be an actual directory. Current home directory:" - einfo "${currentdir}" - einfo "" - einfo "Do you want to change it [yes/no]?" - - local answer - read answer - - if [[ "${answer}" == "yes" ]]; then - einfo "" - einfo "Suggestions:" - einfo "${WEBAPPS_DIR}" - einfo "" - einfo "If you want to suggest a directory, file a bug to" - einfo "http://bugs.gentoo.org" - einfo "" - einfo "Enter home directory:" - - local homedir - read homedir - - einfo "" - einfo "Setting home directory to: ${homedir}" - - /usr/sbin/usermod -d"${homedir}" tomcat - - einfo "You can run emerge --config =${PF}" - einfo "again to change to homedir" - einfo "at any time." - fi -} -- 2.26.2