Date: Sunday, August 21, 2011 @ 16:27:55 Author: guillaume Revision: 136028
upgpkg: tomcat6 6.0.33-2 Fixed start at boot and pid number retrieval Modified: tomcat6/trunk/PKGBUILD tomcat6/trunk/tomcat6 tomcat6/trunk/tomcat6.conf.d ----------------+ PKGBUILD | 6 +++--- tomcat6 | 1 + tomcat6.conf.d | 4 ++++ 3 files changed, 8 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2011-08-21 18:06:36 UTC (rev 136027) +++ PKGBUILD 2011-08-21 20:27:55 UTC (rev 136028) @@ -1,7 +1,7 @@ # Maintainer: Guillaume ALAUX <guilla...@archlinux.org> pkgname=tomcat6 pkgver=6.0.33 -pkgrel=1 +pkgrel=2 pkgdesc="Servlet-2.5/JSP-2.1 Container" arch=('any') url='http://tomcat.apache.org/' @@ -27,8 +27,8 @@ noextract=(dbcp-${pkgver}.jar) md5sums=('84b314ba89a77baca7bd7f2c9e2f86a1' 'a6ff671562c9ac91e8cc2812760df49d' - '84e819ababbc8e1ac5c325d8af7febf8' - '50de34665d96f8e12d0a0d3d9a15fc1a' + 'b9aaaaf482437de11587d72b53ddaa2a' + '8f2ccc09837577394441d29a03b0e667' '1be39071bd27781c352b2d73b765e29d') build() { Modified: tomcat6 =================================================================== --- tomcat6 2011-08-21 18:06:36 UTC (rev 136027) +++ tomcat6 2011-08-21 20:27:55 UTC (rev 136028) @@ -20,6 +20,7 @@ -Djava.io.tmpdir=/var/tmp/tomcat6/temp \ -cp /usr/share/java/commons-daemon.jar:/usr/share/java/eclipse-ecj.jar:${CATALINA_HOME}/bin/bootstrap.jar:${CATALINA_HOME}/bin/tomcat-juli.jar \ -user tomcat \ + -java-home ${TOMCAT_JAVA_HOME} \ -wait 10 \ -pidfile /var/run/${daemon_name}.pid \ -errfile /var/log/tomcat6/catalina.err \ Modified: tomcat6.conf.d =================================================================== --- tomcat6.conf.d 2011-08-21 18:06:36 UTC (rev 136027) +++ tomcat6.conf.d 2011-08-21 20:27:55 UTC (rev 136028) @@ -1,3 +1,7 @@ +# The JAVA_HOME of the JVM for Tomcat to use +# (compulsory to enable tomcat to start at boot) +TOMCAT_JAVA_HOME=/usr/lib/jvm/java-6-openjdk + # Tomcat home directory CATALINA_HOME=/usr/share/tomcat6