From: William Thomson Date: Wed, 4 Apr 2007 22:22:55 +0000 (+0000) Subject: Additional sed to correct server webapp context. Switched from copying context's... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4cbe5a95d2894f0740b69d7df2495dfb44afa476;p=gentoo.git Additional sed to correct server webapp context. Switched from copying context's to symlinking. Unbundled examples jakarta-jstl jars when USE flag is set. Package-Manager: portage-2.1.2.3 --- diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog index dfd1e17e21c5..2755565d4028 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.131 2007/04/03 07:40:57 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.132 2007/04/04 22:22:55 wltjr Exp $ + +*tomcat-6.0.10-r2 (04 Apr 2007) + + 04 Apr 2007; William L. Thomson Jr. + -tomcat-6.0.10-r1.ebuild, +tomcat-6.0.10-r2.ebuild: + Additional sed to correct server webapp context. Switched from copying + context's to symlinking. Unbundled examples jakarta-jstl jars when USE flag + is set. 03 Apr 2007; Christian Faulhammer tomcat-5.5.23-r1.ebuild: diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest index df84e66e0c94..32bed5982f02 100644 --- a/www-servers/tomcat/Manifest +++ b/www-servers/tomcat/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX 5.5.20/catalinabuild-xml.patch 1149 RMD160 9622ca4f688e2c57e4bc34f08ceebb651f75deb1 SHA1 8eda11132851da5773ceb33f90515f0c8ffabdb6 SHA256 dc2d7255dd990359f765f329a04825aca18888e505b4024bb64e0dc6e348498e MD5 4b2dbaa2a74776229f4fffa1274d0a13 files/5.5.20/catalinabuild-xml.patch 1149 RMD160 9622ca4f688e2c57e4bc34f08ceebb651f75deb1 files/5.5.20/catalinabuild-xml.patch 1149 @@ -100,14 +97,14 @@ EBUILD tomcat-5.5.23-r1.ebuild 10585 RMD160 0dc6190f13c0c89a27318585d226cee81d73 MD5 6630f8096fbd46a5388b857896be587f tomcat-5.5.23-r1.ebuild 10585 RMD160 0dc6190f13c0c89a27318585d226cee81d73ea91 tomcat-5.5.23-r1.ebuild 10585 SHA256 1684f06b9e320de04a619e585db8d5c645f152a1621a965f2f829f2f12ff3978 tomcat-5.5.23-r1.ebuild 10585 -EBUILD tomcat-6.0.10-r1.ebuild 5020 RMD160 47410070eee746c2e9d35934acad4f1d826a56d2 SHA1 3dc49b928e184a0f7a09f0169c61d6beb836840a SHA256 9adb6e238ea27e8febeaaf0279c721f287bc0118dea14d62cdf0c57caca4dfe2 -MD5 d10ccf2250d5978776b327eb2114abc0 tomcat-6.0.10-r1.ebuild 5020 -RMD160 47410070eee746c2e9d35934acad4f1d826a56d2 tomcat-6.0.10-r1.ebuild 5020 -SHA256 9adb6e238ea27e8febeaaf0279c721f287bc0118dea14d62cdf0c57caca4dfe2 tomcat-6.0.10-r1.ebuild 5020 -MISC ChangeLog 42271 RMD160 756de18b1ef1359a278d78456408049622f7f254 SHA1 4fed035264cb553d700ba86118b0c751e288b8b4 SHA256 f9b7e5490681d08ed21aba58db714d65940f177d2e9cb881480fe4a73b8cf6b3 -MD5 d911f2be0c33cddc945925bd52d03fe2 ChangeLog 42271 -RMD160 756de18b1ef1359a278d78456408049622f7f254 ChangeLog 42271 -SHA256 f9b7e5490681d08ed21aba58db714d65940f177d2e9cb881480fe4a73b8cf6b3 ChangeLog 42271 +EBUILD tomcat-6.0.10-r2.ebuild 5340 RMD160 f87a307db7fd39facd71e2e618fed0ed915c707f SHA1 bc7132133f9318a4bf2fb558c00f06651bbcbda3 SHA256 e53fb16232a77c6bffcfa41719e05d9161cf4ca10a5f44df28c78ab7bf767f48 +MD5 a5bba79bbf78e8aed22f052e0ce55d98 tomcat-6.0.10-r2.ebuild 5340 +RMD160 f87a307db7fd39facd71e2e618fed0ed915c707f tomcat-6.0.10-r2.ebuild 5340 +SHA256 e53fb16232a77c6bffcfa41719e05d9161cf4ca10a5f44df28c78ab7bf767f48 tomcat-6.0.10-r2.ebuild 5340 +MISC ChangeLog 42577 RMD160 9e1782b7e6c42bae39582d328a3b0ca1f22f84fe SHA1 28ab75c1f1200b9f502f363e8d38e098149d00c1 SHA256 f97cdc99954661bb685cdeb8e91380ae97fbabb7dcda69dcaa565724c710cfe3 +MD5 c330f3e8b8fb2ea9daa66c1c4c706600 ChangeLog 42577 +RMD160 9e1782b7e6c42bae39582d328a3b0ca1f22f84fe ChangeLog 42577 +SHA256 f97cdc99954661bb685cdeb8e91380ae97fbabb7dcda69dcaa565724c710cfe3 ChangeLog 42577 MISC metadata.xml 556 RMD160 88a7809fe3f73c2d351b9fdda025fe88dfb11f31 SHA1 e8dcd8204d0ea02558dd07e1aded5dc58ed1460c SHA256 ac94c1d58b05b47598f311e6efb971fdb30ad9a25f3c32cb9c064fb6330dad79 MD5 0609d3339e0b8d5a3b4707f6b02aad3a metadata.xml 556 RMD160 88a7809fe3f73c2d351b9fdda025fe88dfb11f31 metadata.xml 556 @@ -118,13 +115,6 @@ SHA256 fda2efc7c4fe103d3fec9599fe3797d8784381008f71d9006c7224db91862b30 files/di MD5 6947c731df35ce2149f4a2f8009b575f files/digest-tomcat-5.5.23-r1 277 RMD160 c7a3b4f7dd1b085332606c3d6a68cc21f0ff78e2 files/digest-tomcat-5.5.23-r1 277 SHA256 7c1430575374307e6337ec7f22b7822c2093deb36bb3e9fffaa4cf8b23f34051 files/digest-tomcat-5.5.23-r1 277 -MD5 5f9244a61bfa0875478e8849b6cb845e files/digest-tomcat-6.0.10-r1 277 -RMD160 3d16b85b1dcb55e6874b535c06f2a5df00b46ce1 files/digest-tomcat-6.0.10-r1 277 -SHA256 49aef00c733c574a5c8536a6e5406769105dbe0b64ad0ea9b9682ca42bff23f0 files/digest-tomcat-6.0.10-r1 277 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.6 (GNU/Linux) - -iD8DBQFGEgUQNQqtfCuFneMRAuGSAJ0WSK3rV0JaVGS5DTmduyHjJyjMVgCgmMzT -x2gO4vvYiGeFx3/2bSid39k= -=Fsxe ------END PGP SIGNATURE----- +MD5 5f9244a61bfa0875478e8849b6cb845e files/digest-tomcat-6.0.10-r2 277 +RMD160 3d16b85b1dcb55e6874b535c06f2a5df00b46ce1 files/digest-tomcat-6.0.10-r2 277 +SHA256 49aef00c733c574a5c8536a6e5406769105dbe0b64ad0ea9b9682ca42bff23f0 files/digest-tomcat-6.0.10-r2 277 diff --git a/www-servers/tomcat/files/digest-tomcat-6.0.10-r1 b/www-servers/tomcat/files/digest-tomcat-6.0.10-r2 similarity index 100% rename from www-servers/tomcat/files/digest-tomcat-6.0.10-r1 rename to www-servers/tomcat/files/digest-tomcat-6.0.10-r2 diff --git a/www-servers/tomcat/tomcat-6.0.10-r1.ebuild b/www-servers/tomcat/tomcat-6.0.10-r2.ebuild similarity index 80% rename from www-servers/tomcat/tomcat-6.0.10-r1.ebuild rename to www-servers/tomcat/tomcat-6.0.10-r2.ebuild index 273b388b3c61..a964c9e7c790 100644 --- a/www-servers/tomcat/tomcat-6.0.10-r1.ebuild +++ b/www-servers/tomcat/tomcat-6.0.10-r2.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.10-r1.ebuild,v 1.2 2007/03/30 23:17:05 wltjr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.10-r2.ebuild,v 1.1 2007/04/04 22:22:55 wltjr Exp $ WANT_ANT_TASKS="ant-trax" @@ -23,7 +23,8 @@ RDEPEND=">=virtual/jre-1.5 >=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}" + ~dev-java/tomcat-servlet-api-${PV} + examples? ( dev-java/jakarta-jstl )" DEPEND=">=virtual/jdk-1.5 ${RDEPEND} @@ -81,9 +82,12 @@ src_install() { # create dir structure diropts -m755 -o tomcat -g tomcat - dodir /etc/${TOMCAT_NAME} + dodir /etc/${TOMCAT_NAME}/Catalina/localhost fperms 750 /etc/${TOMCAT_NAME} dodir /usr/share/${TOMCAT_NAME} + 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}." keepdir /var/log/${TOMCAT_NAME}/ keepdir /var/tmp/${TOMCAT_NAME}/ keepdir /var/run/${TOMCAT_NAME}/ @@ -93,13 +97,9 @@ src_install() { cd "${S}" # 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/host-manager/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 @@ -107,15 +107,11 @@ src_install() { # copy over the directories chown -R tomcat:tomcat webapps/* conf/* cp -pR conf/* ${D}/etc/${TOMCAT_NAME} || die "failed to copy conf" - cp -PR output/build/bin ${D}/usr/share/${TOMCAT_NAME} || die "failed to copy" + cp -pPR output/build/bin ${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 @@ -134,7 +130,12 @@ src_install() { 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 + cd output/build/webapps/examples/WEB-INF/lib + rm -f *.jar + java-pkg_jar-from jakarta-jstl jstl.jar + java-pkg_jar-from jakarta-jstl standard.jar + cd "${S}" + cp -pPr output/build/webapps/examples ${D}${CATALINA_BASE}/webapps fi # symlink the directories to make CATALINA_BASE possible @@ -143,6 +144,10 @@ src_install() { dosym /var/tmp/${TOMCAT_NAME} ${CATALINA_BASE}/temp dosym /var/run/${TOMCAT_NAME} ${CATALINA_BASE}/work + # link the manager's context to the right position + dosym ${TOMCAT_HOME}/webapps/host-manager/host-manager.xml /etc/${TOMCAT_NAME}/Catalina/localhost/host-manager.xml + dosym ${TOMCAT_HOME}/webapps/manager/manager.xml /etc/${TOMCAT_NAME}/Catalina/localhost/manager.xml + dodoc ${S}/{RELEASE-NOTES,RUNNING.txt} fperms 640 /etc/${TOMCAT_NAME}/tomcat-users.xml }