Date: Monday, May 6, 2013 @ 21:20:35 Author: guillaume Revision: 184355
'Upstream release + removed '-wait 10' from start script Modified: tomcat6/trunk/PKGBUILD tomcat6/trunk/rc.d_tomcat6 tomcat6/trunk/systemd_tomcat6.service -------------------------+ PKGBUILD | 12 ++++++------ rc.d_tomcat6 | 1 - systemd_tomcat6.service | 1 - 3 files changed, 6 insertions(+), 8 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-05-06 19:19:52 UTC (rev 184354) +++ PKGBUILD 2013-05-06 19:20:35 UTC (rev 184355) @@ -1,8 +1,8 @@ # Maintainer: Guillaume ALAUX <guilla...@archlinux.org> pkgbase=tomcat6 pkgname=('java-servlet2.5-tomcat' 'java-jsp2.1-tomcat' 'tomcat6') -pkgver=6.0.36 -pkgrel=3 +pkgver=6.0.37 +pkgrel=1 arch=('any') url='http://tomcat.apache.org/' license=('APACHE') @@ -15,11 +15,11 @@ systemd_tmpfiles.d_tomcat6.conf tomcat6.install) -sha256sums=('8da5b897ff28f688a5c7fe5abaa95e0ae0de9562283cec3c2643faaa13a6932c' - 'bc1be532d48a239a6945b028bf8f253087d3405f6522229226c484bf8ae4d45e' +sha256sums=('665d72f375a9bf9ec5b8f9300c0af620948ff14d35b4c57c4297030ff6c1f281' + '3e91abc752bf2b6ca19df9c8644bccdd92ba837397a8c1a745d72f58d5301b00' '13289d05abec4acc1fdd5ed0405271f1a18a90ef88cdcf87778e639edaf056ce' - 'f7b205a30c29e836daa7aa7d2fe7462ff5695d3706856a1e460241c746e67834' - 'c6323e28e800d557b40f3b66b918897662003efdc080f0c012686238641b8599' + 'ab5c4a6e342962cbde2b0bc62674be4db416113097835336e863a42d261534cf' + '8eab99cff8baa3e75d656c2f221f8b146e822d7e6962527d07a2f20cb8ccb404' '07b9ff0686134b3256cda8b5253b91ba23f54b547640729e2382c3c12067ea80' '9c97bbbee0724107d9045d8e2c4d110e5d52815979116e502e2921bb100be4f2') Modified: rc.d_tomcat6 =================================================================== --- rc.d_tomcat6 2013-05-06 19:19:52 UTC (rev 184354) +++ rc.d_tomcat6 2013-05-06 19:20:35 UTC (rev 184355) @@ -21,7 +21,6 @@ -cp /usr/share/java/commons-daemon.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 \ -outfile /var/log/tomcat6/catalina.out \ Modified: systemd_tomcat6.service =================================================================== --- systemd_tomcat6.service 2013-05-06 19:19:52 UTC (rev 184354) +++ systemd_tomcat6.service 2013-05-06 19:20:35 UTC (rev 184355) @@ -18,7 +18,6 @@ -cp /usr/share/java/commons-daemon.jar:${CATALINA_HOME}/bin/bootstrap.jar:${CATALINA_HOME}/bin/tomcat-juli.jar \ -user tomcat \ -java-home ${TOMCAT_JAVA_HOME} \ - -wait 10 \ -pidfile /var/run/tomcat6.pid \ -errfile /var/log/tomcat6/catalina.err \ -outfile /var/log/tomcat6/catalina.out \