From: William Thomson Date: Thu, 19 Apr 2007 16:35:22 +0000 (+0000) Subject: Multiple bug fixes, bugs #171487, #174498, #175016, & #175189. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=517fc84d5c8b94021d75e316878a62b6ec727f93;p=gentoo.git Multiple bug fixes, bugs #171487, #174498, #175016, & #175189. Package-Manager: portage-2.1.2.3 --- diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog index 2846dcc2c570..eae6f5bd3111 100644 --- a/www-servers/tomcat/ChangeLog +++ b/www-servers/tomcat/ChangeLog @@ -1,6 +1,13 @@ # 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.134 2007/04/07 00:35:32 wltjr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.135 2007/04/19 16:35:22 wltjr Exp $ + +*tomcat-6.0.10-r3 (19 Apr 2007) + + 19 Apr 2007; William L. Thomson Jr. + files/6/tomcat.conf, files/6/tomcat.init, -tomcat-6.0.10-r2.ebuild, + +tomcat-6.0.10-r3.ebuild: + Multiple bug fixes, bugs #171487, #174498, #175016, & #175189. 07 Apr 2007; William L. Thomson Jr. -files/5.5.20/catalinabuild-xml.patch, diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest index b6b80e6ce99a..1475a4a4db20 100644 --- a/www-servers/tomcat/Manifest +++ b/www-servers/tomcat/Manifest @@ -34,28 +34,28 @@ AUX 6/build-xml.patch 2611 RMD160 639b3f080dc47f799bf029c36e082c2c1976fd9d SHA1 MD5 8533b95643881c578f24e30098d3d178 files/6/build-xml.patch 2611 RMD160 639b3f080dc47f799bf029c36e082c2c1976fd9d files/6/build-xml.patch 2611 SHA256 7bf3bf095504f1063d5d282643ee2b61bc6bd6b4f32f80906484af53757e02c6 files/6/build-xml.patch 2611 -AUX 6/tomcat.conf 2669 RMD160 0f0b660670f1a5fd43aba9bac75d40ee33e902fe SHA1 53bf051861b624f619f78d99d8ea634b8e617464 SHA256 ae15a874568a888d5998db3ddbcc6469ceab1e1dcd72239b441e924ceb0465cb -MD5 87c3a871a5f81aa03cec06fe5b195bed files/6/tomcat.conf 2669 -RMD160 0f0b660670f1a5fd43aba9bac75d40ee33e902fe files/6/tomcat.conf 2669 -SHA256 ae15a874568a888d5998db3ddbcc6469ceab1e1dcd72239b441e924ceb0465cb files/6/tomcat.conf 2669 -AUX 6/tomcat.init 3291 RMD160 b6bac4cf4ce2bac5aa0bd9dec28fa88a39c42570 SHA1 c75b09aee3831a58715500215d1d914391c1d783 SHA256 5f06449e261300a0f6ba6cb67f0908ddceb8c0ea06178ac41c791055068ec72b -MD5 f6cfbfe83a55a5700ad52d43483be852 files/6/tomcat.init 3291 -RMD160 b6bac4cf4ce2bac5aa0bd9dec28fa88a39c42570 files/6/tomcat.init 3291 -SHA256 5f06449e261300a0f6ba6cb67f0908ddceb8c0ea06178ac41c791055068ec72b files/6/tomcat.init 3291 +AUX 6/tomcat.conf 2651 RMD160 f24439b4e260681e9d136e8eb583a43351617afb SHA1 461d8618e98e8b32787a434e4456a8f5a1010d0e SHA256 aaa297f37e83c92f1d7a4a521bbfa970bf896b23e42dd40db8400d11b4ce714a +MD5 beac076f68ce869066df90b1e3d770f0 files/6/tomcat.conf 2651 +RMD160 f24439b4e260681e9d136e8eb583a43351617afb files/6/tomcat.conf 2651 +SHA256 aaa297f37e83c92f1d7a4a521bbfa970bf896b23e42dd40db8400d11b4ce714a files/6/tomcat.conf 2651 +AUX 6/tomcat.init 3350 RMD160 1fb76aaed26e38112f504bff67c004626af13d36 SHA1 4deda11928f4e6c98368196e4b8eda7c4f908b49 SHA256 a401131da25f7855c6123143bf0e17e3b8df138b0e5fdfdf2dc32e79f51f57b8 +MD5 d7821e761f9d5c7388373648d189bd99 files/6/tomcat.init 3350 +RMD160 1fb76aaed26e38112f504bff67c004626af13d36 files/6/tomcat.init 3350 +SHA256 a401131da25f7855c6123143bf0e17e3b8df138b0e5fdfdf2dc32e79f51f57b8 files/6/tomcat.init 3350 DIST apache-tomcat-5.5.23-src.tar.gz 4895919 RMD160 fe669f6b864fd7dcf4ad74dad22a0256e5417005 SHA1 59272b5eedde9c32a126679ff9e1d2a5f56265c8 SHA256 e2f7ce250643349507b511a5ea96df7364030a061a8f4d5b71d8b5a099e2b6bd DIST apache-tomcat-6.0.10-src.tar.gz 3221070 RMD160 64762f16606645c6ef507906f2eb8eeb102173bb SHA1 4ec1acda174ab19082c4900c293d8bc7f9544a69 SHA256 54ae6b89a3ac3e3e33a580708403ca4ea0a449f287b91e6246bb6a6550e39199 EBUILD tomcat-5.5.23-r1.ebuild 10584 RMD160 c42b0b5268b7cc6e4047fbf8da52b0be12a783dd SHA1 58efb4c5d483e3a4bc8cb47ccbaf81607ba9e29d SHA256 744de62a876d0b2567d80aa9c1252f37c8c4ad6d0f74920693692b0ddf59000c MD5 367fce83dfc2e05c71de752be7dfd1e4 tomcat-5.5.23-r1.ebuild 10584 RMD160 c42b0b5268b7cc6e4047fbf8da52b0be12a783dd tomcat-5.5.23-r1.ebuild 10584 SHA256 744de62a876d0b2567d80aa9c1252f37c8c4ad6d0f74920693692b0ddf59000c tomcat-5.5.23-r1.ebuild 10584 -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 43528 RMD160 9120d8eae33610b80d1d01fce271af88670d4ee6 SHA1 57e4fe159e1a26e4df79bac38ac75792716a0972 SHA256 556b97888ece217497b84367cee0b2fa71c5344f61f1b2a6a8717de8c76a726f -MD5 6d33b128f7431ee6e49a4ece95dd01ed ChangeLog 43528 -RMD160 9120d8eae33610b80d1d01fce271af88670d4ee6 ChangeLog 43528 -SHA256 556b97888ece217497b84367cee0b2fa71c5344f61f1b2a6a8717de8c76a726f ChangeLog 43528 +EBUILD tomcat-6.0.10-r3.ebuild 5447 RMD160 30bde477c0f71d2f78030d318bb106d62611ac44 SHA1 9951d139e355f076abaee5fb0d77e04683641f7f SHA256 010618598b37cff4204289438117a0f637eb0832d96152bb77d20283e87f431f +MD5 55415fab4645acb6934928bfd6823388 tomcat-6.0.10-r3.ebuild 5447 +RMD160 30bde477c0f71d2f78030d318bb106d62611ac44 tomcat-6.0.10-r3.ebuild 5447 +SHA256 010618598b37cff4204289438117a0f637eb0832d96152bb77d20283e87f431f tomcat-6.0.10-r3.ebuild 5447 +MISC ChangeLog 43782 RMD160 65cfc443244c33e7b3bb813189f99b552e46f423 SHA1 3b286369774b1788728a176cdc9d07affafeab33 SHA256 b56ab3874870f78f6526fd33df8694679597496c7d0a37a5613718e28040364d +MD5 a009c58404fd0f0b74afa8bbfa801b2a ChangeLog 43782 +RMD160 65cfc443244c33e7b3bb813189f99b552e46f423 ChangeLog 43782 +SHA256 b56ab3874870f78f6526fd33df8694679597496c7d0a37a5613718e28040364d ChangeLog 43782 MISC metadata.xml 556 RMD160 88a7809fe3f73c2d351b9fdda025fe88dfb11f31 SHA1 e8dcd8204d0ea02558dd07e1aded5dc58ed1460c SHA256 ac94c1d58b05b47598f311e6efb971fdb30ad9a25f3c32cb9c064fb6330dad79 MD5 0609d3339e0b8d5a3b4707f6b02aad3a metadata.xml 556 RMD160 88a7809fe3f73c2d351b9fdda025fe88dfb11f31 metadata.xml 556 @@ -63,6 +63,6 @@ SHA256 ac94c1d58b05b47598f311e6efb971fdb30ad9a25f3c32cb9c064fb6330dad79 metadata 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-r2 277 -RMD160 3d16b85b1dcb55e6874b535c06f2a5df00b46ce1 files/digest-tomcat-6.0.10-r2 277 -SHA256 49aef00c733c574a5c8536a6e5406769105dbe0b64ad0ea9b9682ca42bff23f0 files/digest-tomcat-6.0.10-r2 277 +MD5 5f9244a61bfa0875478e8849b6cb845e files/digest-tomcat-6.0.10-r3 277 +RMD160 3d16b85b1dcb55e6874b535c06f2a5df00b46ce1 files/digest-tomcat-6.0.10-r3 277 +SHA256 49aef00c733c574a5c8536a6e5406769105dbe0b64ad0ea9b9682ca42bff23f0 files/digest-tomcat-6.0.10-r3 277 diff --git a/www-servers/tomcat/files/6/tomcat.conf b/www-servers/tomcat/files/6/tomcat.conf index becfac654717..7a56fce515bf 100644 --- a/www-servers/tomcat/files/6/tomcat.conf +++ b/www-servers/tomcat/files/6/tomcat.conf @@ -1,4 +1,4 @@ -# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/6/tomcat.conf,v 1.1 2006/12/08 07:00:55 wltjr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/6/tomcat.conf,v 1.2 2007/04/19 16:35:22 wltjr Exp $ # JVM Runtime # Using the default setting, it will determine your JVM from the system-vm @@ -6,9 +6,9 @@ # See java-config(1) manual page for assistance in determining this value. # # You can override this value with whatever path you wish. -# Example: JAVA_HOME=/opt/sun-jdk-1.5.0.09 +# Example: GENTOO_VM="sun-jdk-1.6" -JAVA_HOME=`java-config --jre-home` +#GENTOO_VM="sun-jdk-1.6" # (Optional) Java runtime options used when the "start", "stop", or "run" # commands are executed. diff --git a/www-servers/tomcat/files/6/tomcat.init b/www-servers/tomcat/files/6/tomcat.init index c4e863f61d0f..be49a38999e5 100755 --- a/www-servers/tomcat/files/6/tomcat.init +++ b/www-servers/tomcat/files/6/tomcat.init @@ -1,9 +1,12 @@ #!/sbin/runscript # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/6/tomcat.init,v 1.4 2007/01/28 07:26:59 wltjr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/6/tomcat.init,v 1.5 2007/04/19 16:35:22 wltjr Exp $ init_env_vars() { + # Populate JAVA_HOME + JAVA_HOME=`java-config --jre-home` + # Set some sane defaults if [ -z "${CATALINA_TMPDIR}" ] ; then CATALINA_TMPDIR="${CATALINA_BASE}"/temp @@ -38,7 +41,7 @@ init_env_vars() { fi } -start-helper() { +start_helper() { local executor=${1} shift local arguments="--start --quiet --background --chuid ${CATALINA_USER}:${CATALINA_GROUP} \ @@ -54,21 +57,21 @@ depend() { start() { ebegin "Starting Tomcat" init_env_vars - # Figure out what arguments to pass start-helper based on TOMCAT_START + # Figure out what arguments to pass start_helper based on TOMCAT_START if [[ "${TOMCAT_START}" == "debug" ]] ; then - start-helper ${JAVA_HOME}/bin/jdb \ + start_helper ${JAVA_HOME}/bin/jdb \ -sourcepath ${CATALINA_HOME}/../../jakarta-tomcat-catalina/catalina/src/share elif [[ "${TOMCAT_START}" == "debug -security" ]] ; then - start-helper ${JAVA_HOME}/bin/jdb \ + start_helper ${JAVA_HOME}/bin/jdb \ -sourcepath ${CATALINA_HOME}/../../jakarta-tomcat-catalina/catalina/src/share \ -Djava.security.manager \ -Djava.security.policy=${CATALINA_BASE}/conf/catalina.policy elif [[ "${TOMCAT_START}" == "jpda start" ]] ; then - start-helper ${JAVA_HOME}/bin/java ${JPDA_OPTS} + start_helper ${JAVA_HOME}/bin/java ${JPDA_OPTS} elif [[ "${TOMCAT_START}" == "start" ]] ; then - start-helper ${JAVA_HOME}/bin/java + start_helper ${JAVA_HOME}/bin/java elif [[ "${TOMCAT_START}" == "start -security" ]] ; then - start-helper ${JAVA_HOME}/bin/java \ + start_helper ${JAVA_HOME}/bin/java \ -Djava.security.manager \ -Djava.security.policy=${CATALINA_BASE}/conf/catalina.policy else diff --git a/www-servers/tomcat/files/digest-tomcat-6.0.10-r2 b/www-servers/tomcat/files/digest-tomcat-6.0.10-r3 similarity index 100% rename from www-servers/tomcat/files/digest-tomcat-6.0.10-r2 rename to www-servers/tomcat/files/digest-tomcat-6.0.10-r3 diff --git a/www-servers/tomcat/tomcat-6.0.10-r2.ebuild b/www-servers/tomcat/tomcat-6.0.10-r3.ebuild similarity index 95% rename from www-servers/tomcat/tomcat-6.0.10-r2.ebuild rename to www-servers/tomcat/tomcat-6.0.10-r3.ebuild index a964c9e7c790..0189fece44b4 100644 --- a/www-servers/tomcat/tomcat-6.0.10-r2.ebuild +++ b/www-servers/tomcat/tomcat-6.0.10-r3.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-r2.ebuild,v 1.1 2007/04/04 22:22:55 wltjr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.10-r3.ebuild,v 1.1 2007/04/19 16:35:22 wltjr Exp $ WANT_ANT_TASKS="ant-trax" @@ -17,17 +17,20 @@ LICENSE="Apache-2.0" IUSE="doc examples source test" -RDEPEND=">=virtual/jre-1.5 - =dev-java/eclipse-ecj-3.2* +COMMON_DEPEND="=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} + ~dev-java/tomcat-servlet-api-${PV}" + +RDEPEND=">=virtual/jre-1.5 + dev-java/ant-core + ${COMMON_DEPEND} examples? ( dev-java/jakarta-jstl )" DEPEND=">=virtual/jdk-1.5 - ${RDEPEND} + ${COMMON_DEPEND} test? ( dev-java/junit )" S=${WORKDIR}/${MY_P} @@ -83,6 +86,7 @@ src_install() { # create dir structure diropts -m755 -o tomcat -g tomcat dodir /etc/${TOMCAT_NAME}/Catalina/localhost + chown -R tomcat:tomcat ${D}/etc/${TOMCAT_NAME} fperms 750 /etc/${TOMCAT_NAME} dodir /usr/share/${TOMCAT_NAME} keepdir ${WEBAPPS_DIR}