[arch-commits] Commit in tomcat/trunk (PKGBUILD tomcat.install)
Date: Monday, September 26, 2011 @ 08:18:42 Author: guillaume Revision: 138507 upgpkg: tomcat 5.5.34-1 Upstream release Modified: tomcat/trunk/PKGBUILD tomcat/trunk/tomcat.install + PKGBUILD | 10 +- tomcat.install |9 + 2 files changed, 14 insertions(+), 5 deletions(-) Modified: PKGBUILD === --- PKGBUILD2011-09-26 08:00:12 UTC (rev 138506) +++ PKGBUILD2011-09-26 12:18:42 UTC (rev 138507) @@ -2,7 +2,7 @@ # Maintainer: Guillaume ALAUX # Contributor: Hugo Doria pkgname=tomcat -pkgver=5.5.33 +pkgver=5.5.34 pkgrel=1 arch=('i686' 'x86_64') pkgdesc="Servlet-2.4/JSP-2.0 Container" @@ -15,7 +15,7 @@ source=(http://archive.apache.org/dist/tomcat/tomcat-5/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz 'tomcat' 'tomcat.conf.d') -md5sums=('3d79cd245497b2c501b4fd64e1da641c' +md5sums=('d09a09bc84409510574a673d35939f16' '20e6a8e89a148e2b0ac81ca03ceea6b1' '368322d8a51ce20cc5dbdb505706a16a') @@ -24,7 +24,7 @@ # build jsvc cd ${srcdir}/apache-${pkgname}-${pkgver}/bin tar xzf commons-daemon-native.tar.gz - cd commons-daemon-1.0.5-native-src/unix + cd commons-daemon-1.0.7-native-src/unix sh configure --with-java=/usr/lib/jvm/java-6-openjdk make clean make @@ -43,7 +43,7 @@ cp -R * ${pkgdir}/opt/tomcat install -D -m755 ${srcdir}/tomcat ${pkgdir}/etc/rc.d/tomcat install -D -m644 ${srcdir}/tomcat.conf.d ${pkgdir}/etc/conf.d/tomcat - chgrp -R 66 ${pkgdir}/opt/tomcat/{conf,work,webapps} + chgrp -R 66 ${pkgdir}/opt/tomcat/{conf,work,webapps,logs} chmod 0660 ${pkgdir}/opt/tomcat/conf/{*.xml,*.policy,*.properties,/Catalina/localhost/*.xml} - chmod 775 ${pkgdir}/opt/tomcat/{conf,work,webapps} + chmod 775 ${pkgdir}/opt/tomcat/{conf,work,webapps,logs} } Modified: tomcat.install === --- tomcat.install 2011-09-26 08:00:12 UTC (rev 138506) +++ tomcat.install 2011-09-26 12:18:42 UTC (rev 138507) @@ -11,6 +11,15 @@ echo ">>> Also, you should add it to your MODULES array in rc.conf, so" echo ">>> it will be activated automatically at boot-up." fi + + echo "" + echo "== End of life for Apache Tomcat 5.5.x ==" + echo "The Apache Tomcat team announces that support for Apache Tomcat 5.5.x" + echo "will end on 30 September 2012." + echo "" + echo "You are thus strongly encouraged to migrate to tomcat6 or tomcat7" + echo "" + echo "See the Arch Linux wiki page for tomcat for more information." } post_upgrade() {
[arch-commits] Commit in tomcat/trunk (PKGBUILD)
Date: Friday, June 17, 2011 @ 12:05:32 Author: guillaume Revision: 127660 Splitted in build/package and fixed package desc Modified: tomcat/trunk/PKGBUILD --+ PKGBUILD |5 - 1 file changed, 4 insertions(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2011-06-17 15:49:10 UTC (rev 127659) +++ PKGBUILD2011-06-17 16:05:32 UTC (rev 127660) @@ -5,7 +5,7 @@ pkgver=5.5.33 pkgrel=1 arch=('i686' 'x86_64') -pkgdesc="Servlet container for Java Servlet and JavaServer Pages" +pkgdesc="Servlet-2.4/JSP-2.0 Container" url="http://tomcat.apache.org/"; license=('APACHE') depends=('java-environment') @@ -29,7 +29,10 @@ make clean make cp jsvc ../.. +} +package() { + cd ${srcdir}/apache-${pkgname}-${pkgver}/bin # get rid of some cruft cd ${srcdir}/apache-${pkgname}-${pkgver} rm -f LICENSE NOTICE RELEASE-NOTES RUNNING.txt
[arch-commits] Commit in tomcat/trunk (PKGBUILD)
Date: Monday, April 4, 2011 @ 03:40:54 Author: guillaume Revision: 117492 upgpkg: tomcat 5.5.33-1 Upstream release Modified: tomcat/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2011-04-04 07:31:14 UTC (rev 117491) +++ PKGBUILD2011-04-04 07:40:54 UTC (rev 117492) @@ -2,7 +2,7 @@ # Maintainer: Guillaume ALAUX # Contributor: Hugo Doria pkgname=tomcat -pkgver=5.5.32 +pkgver=5.5.33 pkgrel=1 arch=('i686' 'x86_64') pkgdesc="Servlet container for Java Servlet and JavaServer Pages" @@ -15,7 +15,7 @@ source=(http://archive.apache.org/dist/tomcat/tomcat-5/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz 'tomcat' 'tomcat.conf.d') -md5sums=('ce7a455da223977133577ffd9cafe233' +md5sums=('3d79cd245497b2c501b4fd64e1da641c' '20e6a8e89a148e2b0ac81ca03ceea6b1' '368322d8a51ce20cc5dbdb505706a16a')
[arch-commits] Commit in tomcat/trunk (PKGBUILD)
Date: Sunday, February 6, 2011 @ 16:19:55 Author: guillaume Revision: 109160 upgpkg: tomcat 5.5.32-1 Upstream release - fixes security issue Modified: tomcat/trunk/PKGBUILD --+ PKGBUILD |8 1 file changed, 4 insertions(+), 4 deletions(-) Modified: PKGBUILD === --- PKGBUILD2011-02-06 21:06:14 UTC (rev 109159) +++ PKGBUILD2011-02-06 21:19:55 UTC (rev 109160) @@ -2,8 +2,8 @@ # Maintainer: Guillaume ALAUX # Contributor: Hugo Doria pkgname=tomcat -pkgver=5.5.31 -pkgrel=2 +pkgver=5.5.32 +pkgrel=1 arch=('i686' 'x86_64') pkgdesc="Servlet container for Java Servlet and JavaServer Pages" url="http://tomcat.apache.org/"; @@ -15,7 +15,7 @@ source=(http://archive.apache.org/dist/tomcat/tomcat-5/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz 'tomcat' 'tomcat.conf.d') -md5sums=('9ab07386e23f4c3dfc3b0a5e29b5f854' +md5sums=('ce7a455da223977133577ffd9cafe233' '20e6a8e89a148e2b0ac81ca03ceea6b1' '368322d8a51ce20cc5dbdb505706a16a') @@ -24,7 +24,7 @@ # build jsvc cd ${srcdir}/apache-${pkgname}-${pkgver}/bin tar xzf commons-daemon-native.tar.gz - cd commons-daemon-1.0.2-native-src/unix + cd commons-daemon-1.0.5-native-src/unix sh configure --with-java=/usr/lib/jvm/java-6-openjdk make clean make
[arch-commits] Commit in tomcat/trunk (PKGBUILD)
Date: Thursday, September 30, 2010 @ 09:56:01 Author: guillaume Revision: 92725 upgpkg: tomcat 5.5.31-2 Added write access for group tomcat to folder webapps Modified: tomcat/trunk/PKGBUILD --+ PKGBUILD |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2010-09-30 13:46:44 UTC (rev 92724) +++ PKGBUILD2010-09-30 13:56:01 UTC (rev 92725) @@ -3,7 +3,7 @@ # Contributor: Hugo Doria pkgname=tomcat pkgver=5.5.31 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') pkgdesc="Servlet container for Java Servlet and JavaServer Pages" url="http://tomcat.apache.org/"; @@ -40,7 +40,7 @@ cp -R * ${pkgdir}/opt/tomcat install -D -m755 ${srcdir}/tomcat ${pkgdir}/etc/rc.d/tomcat install -D -m644 ${srcdir}/tomcat.conf.d ${pkgdir}/etc/conf.d/tomcat - chgrp -R 66 ${pkgdir}/opt/tomcat/conf ${pkgdir}/opt/tomcat/work + chgrp -R 66 ${pkgdir}/opt/tomcat/{conf,work,webapps} chmod 0660 ${pkgdir}/opt/tomcat/conf/{*.xml,*.policy,*.properties,/Catalina/localhost/*.xml} - chmod 775 ${pkgdir}/opt/tomcat/conf ${pkgdir}/opt/tomcat/work + chmod 775 ${pkgdir}/opt/tomcat/{conf,work,webapps} }
[arch-commits] Commit in tomcat/trunk (PKGBUILD)
Date: Thursday, September 23, 2010 @ 02:10:28 Author: guillaume Revision: 91128 upgpkg: tomcat 5.5.31-1 Upstream release Modified: tomcat/trunk/PKGBUILD --+ PKGBUILD |8 1 file changed, 4 insertions(+), 4 deletions(-) Modified: PKGBUILD === --- PKGBUILD2010-09-22 21:51:17 UTC (rev 91127) +++ PKGBUILD2010-09-23 06:10:28 UTC (rev 91128) @@ -1,9 +1,9 @@ # $Id$ +# Maintainer: Guillaume ALAUX # Contributor: Hugo Doria -# Contributor: Guillaume ALAUX pkgname=tomcat -pkgver=5.5.30 -pkgrel=2 +pkgver=5.5.31 +pkgrel=1 arch=('i686' 'x86_64') pkgdesc="Servlet container for Java Servlet and JavaServer Pages" url="http://tomcat.apache.org/"; @@ -15,7 +15,7 @@ source=(http://archive.apache.org/dist/tomcat/tomcat-5/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz 'tomcat' 'tomcat.conf.d') -md5sums=('661dd3fbc25249e9ceb86652eb6a4f07' +md5sums=('9ab07386e23f4c3dfc3b0a5e29b5f854' '20e6a8e89a148e2b0ac81ca03ceea6b1' '368322d8a51ce20cc5dbdb505706a16a')
[arch-commits] Commit in tomcat/trunk (PKGBUILD tomcat.install)
Date: Friday, August 6, 2010 @ 11:46:45 Author: ibiru Revision: 86882 upgpkg: tomcat 5.5.30-2 fix removing user Modified: tomcat/trunk/PKGBUILD tomcat/trunk/tomcat.install + PKGBUILD |4 ++-- tomcat.install | 10 +++--- 2 files changed, 9 insertions(+), 5 deletions(-) Modified: PKGBUILD === --- PKGBUILD2010-08-06 10:57:45 UTC (rev 86881) +++ PKGBUILD2010-08-06 15:46:45 UTC (rev 86882) @@ -3,7 +3,7 @@ # Contributor: Guillaume ALAUX pkgname=tomcat pkgver=5.5.30 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') pkgdesc="Servlet container for Java Servlet and JavaServer Pages" url="http://tomcat.apache.org/"; @@ -27,7 +27,7 @@ cd commons-daemon-1.0.2-native-src/unix sh configure --with-java=/usr/lib/jvm/java-6-openjdk make clean - make || return 1 + make cp jsvc ../.. # get rid of some cruft Modified: tomcat.install === --- tomcat.install 2010-08-06 10:57:45 UTC (rev 86881) +++ tomcat.install 2010-08-06 15:46:45 UTC (rev 86882) @@ -1,7 +1,7 @@ post_install() { getent group tomcat >/dev/null 2>&1 || groupadd -g 66 tomcat getent passwd tomcat >/dev/null 2>&1 || useradd -u 66 -g tomcat -d /opt/tomcat -s /bin/false tomcat - + if [ -f lib/modules/`uname -r`/kernel/security/capability.ko ]; then echo ">>> It appears that your current kernel has linux security" echo ">>> capabilities built as a module. Tomcat requires this" @@ -18,6 +18,10 @@ } pre_remove() { - getent passwd tomcat >/dev/null 2>&1 || userdel tomcat &> /dev/null - getent group tomcat >/dev/null 2>&1 || groupdel tomcat &> /dev/null + if getent passwd tomcat >/dev/null 2>&1; then + userdel tomcat + fi + if getent group tomcat >/dev/null 2>&1; then + groupdel tomcat + fi }
[arch-commits] Commit in tomcat/trunk (PKGBUILD)
Date: Saturday, July 31, 2010 @ 06:31:30 Author: ibiru Revision: 86383 upgpkg: tomcat 5.5.30-1 update to 5.5.30 Modified: tomcat/trunk/PKGBUILD --+ PKGBUILD | 17 + 1 file changed, 9 insertions(+), 8 deletions(-) Modified: PKGBUILD === --- PKGBUILD2010-07-30 23:07:27 UTC (rev 86382) +++ PKGBUILD2010-07-31 10:31:30 UTC (rev 86383) @@ -1,8 +1,8 @@ # $Id$ # Contributor: Hugo Doria - +# Contributor: Guillaume ALAUX pkgname=tomcat -pkgver=5.5.29 +pkgver=5.5.30 pkgrel=1 arch=('i686' 'x86_64') pkgdesc="Servlet container for Java Servlet and JavaServer Pages" @@ -15,7 +15,7 @@ source=(http://archive.apache.org/dist/tomcat/tomcat-5/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz 'tomcat' 'tomcat.conf.d') -md5sums=('228496a9cfe3aaa3b7e79386ccd9380a' +md5sums=('661dd3fbc25249e9ceb86652eb6a4f07' '20e6a8e89a148e2b0ac81ca03ceea6b1' '368322d8a51ce20cc5dbdb505706a16a') @@ -23,17 +23,18 @@ unset LDFLAGS # build jsvc cd ${srcdir}/apache-${pkgname}-${pkgver}/bin - tar xzf jsvc.tar.gz - cd jsvc-src + tar xzf commons-daemon-native.tar.gz + cd commons-daemon-1.0.2-native-src/unix sh configure --with-java=/usr/lib/jvm/java-6-openjdk + make clean make || return 1 - cp jsvc .. - + cp jsvc ../.. + # get rid of some cruft cd ${srcdir}/apache-${pkgname}-${pkgver} rm -f LICENSE NOTICE RELEASE-NOTES RUNNING.txt rm -fr bin/*.exe bin/*.bat bin/*.tar.gz bin/jsvc-src - + # install everything mkdir -p ${pkgdir}/opt/tomcat cp -R * ${pkgdir}/opt/tomcat
[arch-commits] Commit in tomcat/trunk (PKGBUILD)
Date: Wednesday, May 26, 2010 @ 16:31:33 Author: ibiru Revision: 81150 upgpkg: tomcat 5.5.29-1 update to 5.5.29 Modified: tomcat/trunk/PKGBUILD --+ PKGBUILD |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2010-05-26 19:58:33 UTC (rev 81149) +++ PKGBUILD2010-05-26 20:31:33 UTC (rev 81150) @@ -2,8 +2,8 @@ # Contributor: Hugo Doria pkgname=tomcat -pkgver=5.5.28 -pkgrel=5 +pkgver=5.5.29 +pkgrel=1 arch=('i686' 'x86_64') pkgdesc="Servlet container for Java Servlet and JavaServer Pages" url="http://tomcat.apache.org/"; @@ -15,7 +15,7 @@ source=(http://archive.apache.org/dist/tomcat/tomcat-5/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz 'tomcat' 'tomcat.conf.d') -md5sums=('ffe786075c2cdd9c1fde7640bce79d35' +md5sums=('228496a9cfe3aaa3b7e79386ccd9380a' '20e6a8e89a148e2b0ac81ca03ceea6b1' '368322d8a51ce20cc5dbdb505706a16a')
[arch-commits] Commit in tomcat/trunk (PKGBUILD)
Date: Tuesday, March 9, 2010 @ 08:50:24 Author: paul Revision: 71776 upgpkg: tomcat 5.5.28-5 bump for consistent rebuild across arches Modified: tomcat/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2010-03-09 13:15:25 UTC (rev 71775) +++ PKGBUILD2010-03-09 13:50:24 UTC (rev 71776) @@ -3,7 +3,7 @@ pkgname=tomcat pkgver=5.5.28 -pkgrel=4 +pkgrel=5 arch=('i686' 'x86_64') pkgdesc="Servlet container for Java Servlet and JavaServer Pages" url="http://tomcat.apache.org/";
[arch-commits] Commit in tomcat/trunk (PKGBUILD)
Date: Monday, March 8, 2010 @ 17:13:28 Author: paul Revision: 71734 upgpkg: tomcat 5.5.28-4 rebuild on i686 Modified: tomcat/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2010-03-08 22:08:40 UTC (rev 71733) +++ PKGBUILD2010-03-08 22:13:28 UTC (rev 71734) @@ -3,7 +3,7 @@ pkgname=tomcat pkgver=5.5.28 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64') pkgdesc="Servlet container for Java Servlet and JavaServer Pages" url="http://tomcat.apache.org/";
[arch-commits] Commit in tomcat/trunk (PKGBUILD)
Date: Monday, March 8, 2010 @ 07:44:11 Author: paul Revision: 71684 upgpkg: tomcat 5.5.28-3 rebuild to fix build environment errors Modified: tomcat/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2010-03-08 12:07:06 UTC (rev 71683) +++ PKGBUILD2010-03-08 12:44:11 UTC (rev 71684) @@ -3,7 +3,7 @@ pkgname=tomcat pkgver=5.5.28 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') pkgdesc="Servlet container for Java Servlet and JavaServer Pages" url="http://tomcat.apache.org/";
[arch-commits] Commit in tomcat/trunk (PKGBUILD tomcat tomcat.conf.d)
Date: Saturday, March 6, 2010 @ 18:22:57 Author: paul Revision: 71421 implemented TOMCAT_JAVA_HOME in /etc/conf.d/tomcat, closing FS#15417 Modified: tomcat/trunk/PKGBUILD tomcat/trunk/tomcat tomcat/trunk/tomcat.conf.d ---+ PKGBUILD | 10 +- tomcat|4 ++-- tomcat.conf.d |6 -- 3 files changed, 11 insertions(+), 9 deletions(-) Modified: PKGBUILD === --- PKGBUILD2010-03-06 23:18:01 UTC (rev 71420) +++ PKGBUILD2010-03-06 23:22:57 UTC (rev 71421) @@ -3,21 +3,21 @@ pkgname=tomcat pkgver=5.5.28 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') pkgdesc="Servlet container for Java Servlet and JavaServer Pages" url="http://tomcat.apache.org/"; license=('APACHE') depends=('java-environment') -makedepends=('java-environment') +makedepends=('openjdk6') backup=('opt/tomcat/conf/server.xml' 'opt/tomcat/conf/tomcat-users.xml' 'etc/conf.d/tomcat') install=tomcat.install source=(http://archive.apache.org/dist/tomcat/tomcat-5/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz 'tomcat' 'tomcat.conf.d') md5sums=('ffe786075c2cdd9c1fde7640bce79d35' - 'a9617b3c9b0227b1323e1a4f7468516a' - '4da263803378b208144183c9f7df66a7') + '20e6a8e89a148e2b0ac81ca03ceea6b1' + '368322d8a51ce20cc5dbdb505706a16a') build() { unset LDFLAGS @@ -38,7 +38,7 @@ mkdir -p ${pkgdir}/opt/tomcat cp -R * ${pkgdir}/opt/tomcat install -D -m755 ${srcdir}/tomcat ${pkgdir}/etc/rc.d/tomcat - install -D -m755 ${srcdir}/tomcat.conf.d ${pkgdir}/etc/conf.d/tomcat + install -D -m644 ${srcdir}/tomcat.conf.d ${pkgdir}/etc/conf.d/tomcat chgrp -R 66 ${pkgdir}/opt/tomcat/conf ${pkgdir}/opt/tomcat/work chmod 0660 ${pkgdir}/opt/tomcat/conf/{*.xml,*.policy,*.properties,/Catalina/localhost/*.xml} chmod 775 ${pkgdir}/opt/tomcat/conf ${pkgdir}/opt/tomcat/work Modified: tomcat === --- tomcat 2010-03-06 23:18:01 UTC (rev 71420) +++ tomcat 2010-03-06 23:22:57 UTC (rev 71421) @@ -10,7 +10,7 @@ stat_busy "Starting Tomcat" /opt/tomcat/bin/jsvc \ -user tomcat \ - -home /usr/lib/jvm/java-6-openjdk \ + -home $TOMCAT_JAVA_HOME \ -Dcatalina.home=/opt/tomcat \ -Dcatalina.base=/opt/tomcat \ -Djava.io.tmpdir=/opt/tomcat/temp \ @@ -18,7 +18,7 @@ -pidfile /var/run/tomcat.pid \ -errfile /opt/tomcat/logs/catalina.log \ $CATALINA_OPTS \ - -cp /usr/lib/jvm/java-6-openjdk/lib/tools.jar:/opt/tomcat/bin/commons-daemon.jar:/opt/tomcat/bin/bootstrap.jar \ + -cp $TOMCAT_JAVA_HOME/lib/tools.jar:/opt/tomcat/bin/commons-daemon.jar:/opt/tomcat/bin/bootstrap.jar \ org.apache.catalina.startup.Bootstrap if [ $? -gt 0 ]; then Modified: tomcat.conf.d === --- tomcat.conf.d 2010-03-06 23:18:01 UTC (rev 71420) +++ tomcat.conf.d 2010-03-06 23:22:57 UTC (rev 71421) @@ -1,3 +1,5 @@ -# Arguments for catalina +# The JAVA_HOME of the JVM for Tomcat to use +TOMCAT_JAVA_HOME=/usr/lib/jvm/java-6-openjdk -#CATALINA_OPTS= +# Tomcat additional commandline options +CATALINA_OPTS=
[arch-commits] Commit in tomcat/trunk (PKGBUILD tomcat tomcat.install)
Date: Saturday, November 21, 2009 @ 23:55:24 Author: andrea Revision: 59318 upgpkg: tomcat 5.5.28-1 upstream release Modified: tomcat/trunk/PKGBUILD tomcat/trunk/tomcat tomcat/trunk/tomcat.install + PKGBUILD | 26 ++ tomcat |4 ++-- tomcat.install | 24 +--- 3 files changed, 21 insertions(+), 33 deletions(-) Modified: PKGBUILD === --- PKGBUILD2009-11-22 04:24:13 UTC (rev 59317) +++ PKGBUILD2009-11-22 04:55:24 UTC (rev 59318) @@ -1,34 +1,36 @@ # $Id$ -# Maintainer: Hugo Doria +# Contributor: Hugo Doria pkgname=tomcat -pkgver=5.5.27 -pkgrel=2 +pkgver=5.5.28 +pkgrel=1 arch=('i686' 'x86_64') pkgdesc="Servlet container for Java Servlet and JavaServer Pages" url="http://tomcat.apache.org/"; -license=('Apache') +license=('APACHE') depends=('java-environment') makedepends=('java-environment') -backup=(opt/tomcat/conf/server.xml opt/tomcat/conf/tomcat-users.xml \ -etc/conf.d/tomcat) +backup=('opt/tomcat/conf/server.xml' 'opt/tomcat/conf/tomcat-users.xml' 'etc/conf.d/tomcat') install=tomcat.install -source=(http://archive.apache.org/dist/tomcat/tomcat-5/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz \ -tomcat tomcat.conf.d) -md5sums=('e576fed8ce66c32ee5295d5f7727b138' '4f171d32c2beb89bf988b7b4555e6cab' +source=(http://archive.apache.org/dist/tomcat/tomcat-5/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz + 'tomcat' + 'tomcat.conf.d') +md5sums=('ffe786075c2cdd9c1fde7640bce79d35' + 'a9617b3c9b0227b1323e1a4f7468516a' '4da263803378b208144183c9f7df66a7') build() { + unset LDFLAGS # build jsvc - cd ${srcdir}/apache-tomcat-${pkgver}/bin + cd ${srcdir}/apache-${pkgname}-${pkgver}/bin tar xzf jsvc.tar.gz cd jsvc-src - sh configure --with-java=/usr/lib/jvm/java-1.6.0-openjdk + sh configure --with-java=/usr/lib/jvm/java-6-openjdk make || return 1 cp jsvc .. # get rid of some cruft - cd ${srcdir}/apache-tomcat-${pkgver} + cd ${srcdir}/apache-${pkgname}-${pkgver} rm -f LICENSE NOTICE RELEASE-NOTES RUNNING.txt rm -fr bin/*.exe bin/*.bat bin/*.tar.gz bin/jsvc-src Modified: tomcat === --- tomcat 2009-11-22 04:24:13 UTC (rev 59317) +++ tomcat 2009-11-22 04:55:24 UTC (rev 59318) @@ -10,7 +10,7 @@ stat_busy "Starting Tomcat" /opt/tomcat/bin/jsvc \ -user tomcat \ - -home /usr/lib/jvm/java-1.6.0-openjdk \ + -home /usr/lib/jvm/java-6-openjdk \ -Dcatalina.home=/opt/tomcat \ -Dcatalina.base=/opt/tomcat \ -Djava.io.tmpdir=/opt/tomcat/temp \ @@ -18,7 +18,7 @@ -pidfile /var/run/tomcat.pid \ -errfile /opt/tomcat/logs/catalina.log \ $CATALINA_OPTS \ - -cp /usr/lib/jvm/java-1.6.0-openjdk/lib/tools.jar:/opt/tomcat/bin/commons-daemon.jar:/opt/tomcat/bin/bootstrap.jar \ + -cp /usr/lib/jvm/java-6-openjdk/lib/tools.jar:/opt/tomcat/bin/commons-daemon.jar:/opt/tomcat/bin/bootstrap.jar \ org.apache.catalina.startup.Bootstrap if [ $? -gt 0 ]; then Modified: tomcat.install === --- tomcat.install 2009-11-22 04:24:13 UTC (rev 59317) +++ tomcat.install 2009-11-22 04:55:24 UTC (rev 59318) @@ -1,14 +1,10 @@ post_install() { - if [ ! `grep tomcat /etc/group` ]; then -groupadd -g 66 tomcat &>/dev/null; - fi - - id tomcat &>/dev/null || \ -useradd -u 66 -g tomcat -d /opt/tomcat -s /bin/false tomcat + getent group tomcat >/dev/null 2>&1 || groupadd -g 66 tomcat + getent passwd tomcat >/dev/null 2>&1 || useradd -u 66 -g tomcat -d /opt/tomcat -s /bin/false tomcat if [ -f lib/modules/`uname -r`/kernel/security/capability.ko ]; then echo ">>> It appears that your current kernel has linux security" -echo ">>> capabilities built as a module. tomcat requires this" +echo ">>> capabilities built as a module. Tomcat requires this" echo ">>> functionality to operate." echo ">>>" echo ">>> To activate the module, please load it now (modprobe capability)." @@ -22,16 +18,6 @@ } pre_remove() { - userdel tomcat &> /dev/null - groupdel tomcat &> /dev/null + getent passwd tomcat >/dev/null 2>&1 || userdel tomcat &> /dev/null + getent group tomcat >/dev/null 2>&1 || groupdel tomcat &> /dev/null } - -post_remove() { - /bin/true -} - -op=$1 -shift - -$op $* -# vim: ts=2 sw=2 et ft=sh