diff options
author | William Thomson <wltjr@gentoo.org> | 2006-09-20 17:53:37 +0000 |
---|---|---|
committer | William Thomson <wltjr@gentoo.org> | 2006-09-20 17:53:37 +0000 |
commit | b8ae131374263356ea784f79dfb61ab04e6ba52c (patch) | |
tree | 913783b49169892b35b0e111ee5014db3ee31db2 /www-servers | |
parent | Fixed init script to set ${CATALINA_TMPDIR} per bug #148387 (diff) | |
download | historical-b8ae131374263356ea784f79dfb61ab04e6ba52c.tar.gz historical-b8ae131374263356ea784f79dfb61ab04e6ba52c.tar.bz2 historical-b8ae131374263356ea784f79dfb61ab04e6ba52c.zip |
Fixed init script to set ${CATALINA_TMPDIR} per bug #148387
Package-Manager: portage-2.1.2_pre1
Diffstat (limited to 'www-servers')
-rw-r--r-- | www-servers/tomcat/Manifest | 37 | ||||
-rw-r--r-- | www-servers/tomcat/files/digest-tomcat-5.5.17-r4 | 3 | ||||
-rw-r--r-- | www-servers/tomcat/files/digest-tomcat-5.5.17-r5 | 3 | ||||
-rw-r--r-- | www-servers/tomcat/tomcat-5.5.17-r4.ebuild | 322 | ||||
-rw-r--r-- | www-servers/tomcat/tomcat-5.5.17-r5.ebuild | 322 |
5 files changed, 15 insertions, 672 deletions
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest index e13eb9a15f21..518ee8c04d03 100644 --- a/www-servers/tomcat/Manifest +++ b/www-servers/tomcat/Manifest @@ -90,10 +90,10 @@ AUX 5.5.17/tomcat.env 36 RMD160 2d6488d26696ec0624b7774d3a31cb02afeaeea0 SHA1 1c MD5 f41b77c0652379c5cfbe0f04bf99b4c2 files/5.5.17/tomcat.env 36 RMD160 2d6488d26696ec0624b7774d3a31cb02afeaeea0 files/5.5.17/tomcat.env 36 SHA256 c2aa217a92fb637fb81a77c98cd769932923bbe65e72c25295993f7cf4982fef files/5.5.17/tomcat.env 36 -AUX 5.5.17/tomcat.init 3042 RMD160 77188431937c2d2d96cd38d459e572b0ad63f058 SHA1 43a62bfdd5214367125f2c71a0fa47c160ffb22e SHA256 bbed3d360595e204412d053314ada38502157b491025aef172a5b96f3afed487 -MD5 c4b888d49301372ec936bc82e00ca2af files/5.5.17/tomcat.init 3042 -RMD160 77188431937c2d2d96cd38d459e572b0ad63f058 files/5.5.17/tomcat.init 3042 -SHA256 bbed3d360595e204412d053314ada38502157b491025aef172a5b96f3afed487 files/5.5.17/tomcat.init 3042 +AUX 5.5.17/tomcat.init 3127 RMD160 38ca3bef47ff83979c67a43a5a62ecd7426ff21a SHA1 74de9b2e9d8e7365242b9d4eb0a5cb7bda4e182e SHA256 8be40da7341d937282733f32354f85dcee4cc3799d9becae862b0d63f7981e15 +MD5 b3d1c974594b273a8e8e7dd01fcc138e files/5.5.17/tomcat.init 3127 +RMD160 38ca3bef47ff83979c67a43a5a62ecd7426ff21a files/5.5.17/tomcat.init 3127 +SHA256 8be40da7341d937282733f32354f85dcee4cc3799d9becae862b0d63f7981e15 files/5.5.17/tomcat.init 3127 AUX 5.5.17/tomcatbuild-xml-docs.patch 4745 RMD160 ad084d8290dd628a4b1e1a13bfdc3dca7446fa04 SHA1 7c2d036d8931409dab360ed83346a6fc69203cf4 SHA256 ac0248500302ff5bac595296e30008dccc5e901c13a998aff859a36c6c8945ff MD5 ca2c6c89f893448ccaeebff6255b285f files/5.5.17/tomcatbuild-xml-docs.patch 4745 RMD160 ad084d8290dd628a4b1e1a13bfdc3dca7446fa04 files/5.5.17/tomcatbuild-xml-docs.patch 4745 @@ -121,18 +121,14 @@ EBUILD tomcat-5.0.28-r13.ebuild 9390 RMD160 edc2241e882d1b2e3b297927765c5358fd8f MD5 1533455980569c6999d5b9fe276d913f tomcat-5.0.28-r13.ebuild 9390 RMD160 edc2241e882d1b2e3b297927765c5358fd8fce32 tomcat-5.0.28-r13.ebuild 9390 SHA256 4a6b027e912c7ff680421cedf22b2dbc009f2639d076c5a1b3d3ad7e625ee502 tomcat-5.0.28-r13.ebuild 9390 -EBUILD tomcat-5.5.17-r4.ebuild 10024 RMD160 f7290ad1c512f21ba1bf2438976460164dcb7823 SHA1 c337e729d3362c15d0cdd0f12edf658196894547 SHA256 97dbe290a8f8449d069cc9a1c861ce12cf3962e20589c2477edfa9567cf95eaa -MD5 4f894fdb598e788028129044b66e5a0d tomcat-5.5.17-r4.ebuild 10024 -RMD160 f7290ad1c512f21ba1bf2438976460164dcb7823 tomcat-5.5.17-r4.ebuild 10024 -SHA256 97dbe290a8f8449d069cc9a1c861ce12cf3962e20589c2477edfa9567cf95eaa tomcat-5.5.17-r4.ebuild 10024 -EBUILD tomcat-5.5.17-r5.ebuild 10024 RMD160 f7290ad1c512f21ba1bf2438976460164dcb7823 SHA1 c337e729d3362c15d0cdd0f12edf658196894547 SHA256 97dbe290a8f8449d069cc9a1c861ce12cf3962e20589c2477edfa9567cf95eaa -MD5 4f894fdb598e788028129044b66e5a0d tomcat-5.5.17-r5.ebuild 10024 -RMD160 f7290ad1c512f21ba1bf2438976460164dcb7823 tomcat-5.5.17-r5.ebuild 10024 -SHA256 97dbe290a8f8449d069cc9a1c861ce12cf3962e20589c2477edfa9567cf95eaa tomcat-5.5.17-r5.ebuild 10024 -MISC ChangeLog 22644 RMD160 13395006e2a0f99fa6783480e337dfbfbb21d7cf SHA1 c64185a99a9e30f75ecc327f56fd6c4a4d08c5b5 SHA256 7e1c44715b989424513b56ed7cb75a138f2263afc5841871a53b0a698208757d -MD5 836c6f0677108a1cc430cee9c12209bc ChangeLog 22644 -RMD160 13395006e2a0f99fa6783480e337dfbfbb21d7cf ChangeLog 22644 -SHA256 7e1c44715b989424513b56ed7cb75a138f2263afc5841871a53b0a698208757d ChangeLog 22644 +EBUILD tomcat-5.5.17-r6.ebuild 10024 RMD160 e97c1373f46501a034a06eaaf214f47961a64eb2 SHA1 1add453cdf1050770f5179375c3f6c0b56073e9f SHA256 5fcb3706a2a5aa7fd3823b76d8ab57d84e448501c8bac8653b4d8dc14a90ac74 +MD5 eaa1497616248ef70dd7419bd4b39d62 tomcat-5.5.17-r6.ebuild 10024 +RMD160 e97c1373f46501a034a06eaaf214f47961a64eb2 tomcat-5.5.17-r6.ebuild 10024 +SHA256 5fcb3706a2a5aa7fd3823b76d8ab57d84e448501c8bac8653b4d8dc14a90ac74 tomcat-5.5.17-r6.ebuild 10024 +MISC ChangeLog 22921 RMD160 1b987dec882fe86f931dfc90a533c990e73b9742 SHA1 99bbafee0c88a3a64828287bafee82c8e031fe78 SHA256 daa6ad2be6c91916181a9fe22b0dae5231a9035d481baaef21ef1fefaad2732f +MD5 8d9e17eb50a76ccdeeb1bb37aad4f276 ChangeLog 22921 +RMD160 1b987dec882fe86f931dfc90a533c990e73b9742 ChangeLog 22921 +SHA256 daa6ad2be6c91916181a9fe22b0dae5231a9035d481baaef21ef1fefaad2732f ChangeLog 22921 MISC metadata.xml 558 RMD160 f81f3d20ca526007bbd8f0f88deffb7a097334ea SHA1 6ab9eadb2a8f19b0d4ea1f02ba88315d49e61fb1 SHA256 d5b4cdcd581677edce5b62c586d618f4c95660127fcb2fb7157f83e6d0e35fce MD5 e26537a19167254676bb36654dc01f91 metadata.xml 558 RMD160 f81f3d20ca526007bbd8f0f88deffb7a097334ea metadata.xml 558 @@ -146,9 +142,6 @@ SHA256 2c09d3ad89eb04ab24e5c95a9492d7f461e1935bdb076100010cd3d4f7cb8796 files/di MD5 d942ea8b8317ba352e744aed2d284d01 files/digest-tomcat-5.0.28-r13 280 RMD160 7283323e161ab5dd3a94549def34af040891e49a files/digest-tomcat-5.0.28-r13 280 SHA256 2c09d3ad89eb04ab24e5c95a9492d7f461e1935bdb076100010cd3d4f7cb8796 files/digest-tomcat-5.0.28-r13 280 -MD5 b8576467d4d99bc9c4862c31d5839d56 files/digest-tomcat-5.5.17-r4 277 -RMD160 6a37c8c24770ea3fdb63334615303b56350f1cf9 files/digest-tomcat-5.5.17-r4 277 -SHA256 99d72ea7a66a7df313d7f01eeb4bd0d7e6e0325601affc35142b9df1371398e7 files/digest-tomcat-5.5.17-r4 277 -MD5 b8576467d4d99bc9c4862c31d5839d56 files/digest-tomcat-5.5.17-r5 277 -RMD160 6a37c8c24770ea3fdb63334615303b56350f1cf9 files/digest-tomcat-5.5.17-r5 277 -SHA256 99d72ea7a66a7df313d7f01eeb4bd0d7e6e0325601affc35142b9df1371398e7 files/digest-tomcat-5.5.17-r5 277 +MD5 b8576467d4d99bc9c4862c31d5839d56 files/digest-tomcat-5.5.17-r6 277 +RMD160 6a37c8c24770ea3fdb63334615303b56350f1cf9 files/digest-tomcat-5.5.17-r6 277 +SHA256 99d72ea7a66a7df313d7f01eeb4bd0d7e6e0325601affc35142b9df1371398e7 files/digest-tomcat-5.5.17-r6 277 diff --git a/www-servers/tomcat/files/digest-tomcat-5.5.17-r4 b/www-servers/tomcat/files/digest-tomcat-5.5.17-r4 deleted file mode 100644 index 51d603367aa1..000000000000 --- a/www-servers/tomcat/files/digest-tomcat-5.5.17-r4 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 afedf090888029b19a1bebc471264105 apache-tomcat-5.5.17-src.tar.gz 4282022 -RMD160 004d87bc64b32eee42f9979d2fdbb36836b69015 apache-tomcat-5.5.17-src.tar.gz 4282022 -SHA256 295c9fa64d9aa81d5c836b694804d8d57fcfdbc76b9889a044852aa73f2c3ad8 apache-tomcat-5.5.17-src.tar.gz 4282022 diff --git a/www-servers/tomcat/files/digest-tomcat-5.5.17-r5 b/www-servers/tomcat/files/digest-tomcat-5.5.17-r5 deleted file mode 100644 index 51d603367aa1..000000000000 --- a/www-servers/tomcat/files/digest-tomcat-5.5.17-r5 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 afedf090888029b19a1bebc471264105 apache-tomcat-5.5.17-src.tar.gz 4282022 -RMD160 004d87bc64b32eee42f9979d2fdbb36836b69015 apache-tomcat-5.5.17-src.tar.gz 4282022 -SHA256 295c9fa64d9aa81d5c836b694804d8d57fcfdbc76b9889a044852aa73f2c3ad8 apache-tomcat-5.5.17-src.tar.gz 4282022 diff --git a/www-servers/tomcat/tomcat-5.5.17-r4.ebuild b/www-servers/tomcat/tomcat-5.5.17-r4.ebuild deleted file mode 100644 index 12d444d3a824..000000000000 --- a/www-servers/tomcat/tomcat-5.5.17-r4.ebuild +++ /dev/null @@ -1,322 +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.17-r4.ebuild,v 1.1 2006/09/09 21:20:21 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://jakarta.apache.org/tomcat" -KEYWORDS="~amd64 ~x86" -LICENSE="Apache-2.0" - -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.0 - >=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 - =dev-java/struts-1.2* - dev-java/sun-javamail-bin - java5? ( >=virtual/jre-1.5 ) - !java5? ( - =virtual/jre-1.4* - >=dev-java/commons-httpclient-2.0 - =dev-java/gnu-jaf-1* - ~dev-java/jaxen-1.0 - >=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} - sys-apps/sed - dev-java/ant" -IUSE="java5 doc examples source test" - -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_HOME="/usr/share/${PN}-${SLOT}" -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 - - 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 doc; then - epatch "${FILESDIR}/${PV}/tomcatbuild-xml-docs.patch" - fi - if ! use examples; then - epatch "${FILESDIR}/${PV}/tomcatbuild-xml-examples.patch" - 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-fileupload - java-pkg_jar-from commons-modeler -} - -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} -Dstruts.jar=$(java-pkg_getjar struts-1.2 struts.jar)" - 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-bin mail.jar)" - antflags="${antflags} -Dstruts.home=/usr/share/struts" - 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 gnu-jaf-1)" - antflags="${antflags} -Djaxen.jar=$(java-pkg_getjar jaxen jaxen-full.jar)" - 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 xerces-2 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}/${CATALIA_HOME}/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 - cp ${S}/container/webapps/admin/admin.xml \ - conf/Catalina/localhost - 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 - cd server/webapps/admin/WEB-INF/lib - rm -f struts.jar - java-pkg_jar-from struts-1.2 struts.jar - cd ${base} - - # 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 -} diff --git a/www-servers/tomcat/tomcat-5.5.17-r5.ebuild b/www-servers/tomcat/tomcat-5.5.17-r5.ebuild deleted file mode 100644 index 60b166cdd7c3..000000000000 --- a/www-servers/tomcat/tomcat-5.5.17-r5.ebuild +++ /dev/null @@ -1,322 +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.17-r5.ebuild,v 1.1 2006/09/20 14:34:07 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://jakarta.apache.org/tomcat" -KEYWORDS="~amd64 ~x86" -LICENSE="Apache-2.0" - -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.0 - >=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 - =dev-java/struts-1.2* - dev-java/sun-javamail-bin - java5? ( >=virtual/jre-1.5 ) - !java5? ( - =virtual/jre-1.4* - >=dev-java/commons-httpclient-2.0 - =dev-java/gnu-jaf-1* - ~dev-java/jaxen-1.0 - >=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} - sys-apps/sed - dev-java/ant" -IUSE="java5 doc examples source test" - -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_HOME="/usr/share/${PN}-${SLOT}" -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 - - 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 doc; then - epatch "${FILESDIR}/${PV}/tomcatbuild-xml-docs.patch" - fi - if ! use examples; then - epatch "${FILESDIR}/${PV}/tomcatbuild-xml-examples.patch" - 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-fileupload - java-pkg_jar-from commons-modeler -} - -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} -Dstruts.jar=$(java-pkg_getjar struts-1.2 struts.jar)" - 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-bin mail.jar)" - antflags="${antflags} -Dstruts.home=/usr/share/struts" - 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 gnu-jaf-1)" - antflags="${antflags} -Djaxen.jar=$(java-pkg_getjar jaxen jaxen-full.jar)" - 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 xerces-2 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}/${CATALIA_HOME}/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 - cp ${S}/container/webapps/admin/admin.xml \ - conf/Catalina/localhost - 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 - cd server/webapps/admin/WEB-INF/lib - rm -f struts.jar - java-pkg_jar-from struts-1.2 struts.jar - cd ${base} - - # 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 -} |