Date: Monday, September 26, 2011 @ 08:20:21
Author: guillaume
Revision: 138508
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
tomcat/repos/extra-i686/PKGBUILD
(from rev 138507, tomcat/trunk/PKGBUILD)
tomcat/repos/extra-i686/tomcat
(from rev 138507, tomcat/trunk/tomcat)
tomcat/repos/extra-i686/tomcat.conf.d
(from rev 138507, tomcat/trunk/tomcat.conf.d)
tomcat/repos/extra-i686/tomcat.install
(from rev 138507, tomcat/trunk/tomcat.install)
tomcat/repos/extra-x86_64/PKGBUILD
(from rev 138507, tomcat/trunk/PKGBUILD)
tomcat/repos/extra-x86_64/tomcat
(from rev 138507, tomcat/trunk/tomcat)
tomcat/repos/extra-x86_64/tomcat.conf.d
(from rev 138507, tomcat/trunk/tomcat.conf.d)
tomcat/repos/extra-x86_64/tomcat.install
(from rev 138507, tomcat/trunk/tomcat.install)
Deleted:
tomcat/repos/extra-i686/PKGBUILD
tomcat/repos/extra-i686/tomcat
tomcat/repos/extra-i686/tomcat.conf.d
tomcat/repos/extra-i686/tomcat.install
tomcat/repos/extra-x86_64/PKGBUILD
tomcat/repos/extra-x86_64/tomcat
tomcat/repos/extra-x86_64/tomcat.conf.d
tomcat/repos/extra-x86_64/tomcat.install
-----------------------------+
extra-i686/PKGBUILD | 95 +++++++++++++++++++------------------
extra-i686/tomcat | 106 +++++++++++++++++++++---------------------
extra-i686/tomcat.conf.d | 10 +--
extra-i686/tomcat.install | 63 ++++++++++++++----------
extra-x86_64/PKGBUILD | 95 +++++++++++++++++++------------------
extra-x86_64/tomcat | 106 +++++++++++++++++++++---------------------
extra-x86_64/tomcat.conf.d | 10 +--
extra-x86_64/tomcat.install | 63 ++++++++++++++----------
8 files changed, 286 insertions(+), 262 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2011-09-26 12:18:42 UTC (rev 138507)
+++ extra-i686/PKGBUILD 2011-09-26 12:20:21 UTC (rev 138508)
@@ -1,46 +0,0 @@
-# $Id$
-# Maintainer: Guillaume ALAUX <guillaume at archlinux dot org>
-# Contributor: Hugo Doria <h...@archlinux.org>
-pkgname=tomcat
-pkgver=5.5.33
-pkgrel=1
-arch=('i686' 'x86_64')
-pkgdesc="Servlet container for Java Servlet and JavaServer Pages"
-url="http://tomcat.apache.org/";
-license=('APACHE')
-depends=('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=('3d79cd245497b2c501b4fd64e1da641c'
- '20e6a8e89a148e2b0ac81ca03ceea6b1'
- '368322d8a51ce20cc5dbdb505706a16a')
-
-build() {
- unset LDFLAGS
- # build jsvc
- cd ${srcdir}/apache-${pkgname}-${pkgver}/bin
- tar xzf commons-daemon-native.tar.gz
- cd commons-daemon-1.0.5-native-src/unix
- sh configure --with-java=/usr/lib/jvm/java-6-openjdk
- make clean
- make
- 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
- 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}
- chmod 0660
${pkgdir}/opt/tomcat/conf/{*.xml,*.policy,*.properties,/Catalina/localhost/*.xml}
- chmod 775 ${pkgdir}/opt/tomcat/{conf,work,webapps}
-}
Copied: tomcat/repos/extra-i686/PKGBUILD (from rev 138507,
tomcat/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2011-09-26 12:20:21 UTC (rev 138508)
@@ -0,0 +1,49 @@
+# $Id$
+# Maintainer: Guillaume ALAUX <guillaume at archlinux dot org>
+# Contributor: Hugo Doria <h...@archlinux.org>
+pkgname=tomcat
+pkgver=5.5.34
+pkgrel=1
+arch=('i686' 'x86_64')
+pkgdesc="Servlet-2.4/JSP-2.0 Container"
+url="http://tomcat.apache.org/";
+license=('APACHE')
+depends=('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=('d09a09bc84409510574a673d35939f16'
+ '20e6a8e89a148e2b0ac81ca03ceea6b1'
+ '368322d8a51ce20cc5dbdb505706a16a')
+
+build() {
+ unset LDFLAGS
+ # build jsvc
+ cd ${srcdir}/apache-${pkgname}-${pkgver}/bin
+ tar xzf commons-daemon-native.tar.gz
+ cd commons-daemon-1.0.7-native-src/unix
+ sh configure --with-java=/usr/lib/jvm/java-6-openjdk
+ 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
+ rm -fr bin/*.exe bin/*.bat bin/*.tar.gz bin/jsvc-src
+
+ # install everything
+ mkdir -p ${pkgdir}/opt/tomcat
+ 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,logs}
+ chmod 0660
${pkgdir}/opt/tomcat/conf/{*.xml,*.policy,*.properties,/Catalina/localhost/*.xml}
+ chmod 775 ${pkgdir}/opt/tomcat/{conf,work,webapps,logs}
+}
Deleted: extra-i686/tomcat
===================================================================
--- extra-i686/tomcat 2011-09-26 12:18:42 UTC (rev 138507)
+++ extra-i686/tomcat 2011-09-26 12:20:21 UTC (rev 138508)
@@ -1,53 +0,0 @@
-#!/bin/bash
-
-[ -f /etc/conf.d/tomcat ] && . /etc/conf.d/tomcat
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
- start)
- stat_busy "Starting Tomcat"
- /opt/tomcat/bin/jsvc \
- -user tomcat \
- -home $TOMCAT_JAVA_HOME \
- -Dcatalina.home=/opt/tomcat \
- -Dcatalina.base=/opt/tomcat \
- -Djava.io.tmpdir=/opt/tomcat/temp \
- -wait 10 \
- -pidfile /var/run/tomcat.pid \
- -errfile /opt/tomcat/logs/catalina.log \
- $CATALINA_OPTS \
- -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
- stat_fail
- else
- add_daemon tomcat
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping Tomcat"
- /opt/tomcat/bin/jsvc \
- -stop \
- -pidfile /var/run/tomcat.pid \
- org.apache.catalina.startup.Bootstrap
-
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon tomcat
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
Copied: tomcat/repos/extra-i686/tomcat (from rev 138507, tomcat/trunk/tomcat)
===================================================================
--- extra-i686/tomcat (rev 0)
+++ extra-i686/tomcat 2011-09-26 12:20:21 UTC (rev 138508)
@@ -0,0 +1,53 @@
+#!/bin/bash
+
+[ -f /etc/conf.d/tomcat ] && . /etc/conf.d/tomcat
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+case "$1" in
+ start)
+ stat_busy "Starting Tomcat"
+ /opt/tomcat/bin/jsvc \
+ -user tomcat \
+ -home $TOMCAT_JAVA_HOME \
+ -Dcatalina.home=/opt/tomcat \
+ -Dcatalina.base=/opt/tomcat \
+ -Djava.io.tmpdir=/opt/tomcat/temp \
+ -wait 10 \
+ -pidfile /var/run/tomcat.pid \
+ -errfile /opt/tomcat/logs/catalina.log \
+ $CATALINA_OPTS \
+ -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
+ stat_fail
+ else
+ add_daemon tomcat
+ stat_done
+ fi
+ ;;
+ stop)
+ stat_busy "Stopping Tomcat"
+ /opt/tomcat/bin/jsvc \
+ -stop \
+ -pidfile /var/run/tomcat.pid \
+ org.apache.catalina.startup.Bootstrap
+
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ rm_daemon tomcat
+ stat_done
+ fi
+ ;;
+ restart)
+ $0 stop
+ sleep 1
+ $0 start
+ ;;
+ *)
+ echo "usage: $0 {start|stop|restart}"
+esac
+exit 0
Deleted: extra-i686/tomcat.conf.d
===================================================================
--- extra-i686/tomcat.conf.d 2011-09-26 12:18:42 UTC (rev 138507)
+++ extra-i686/tomcat.conf.d 2011-09-26 12:20:21 UTC (rev 138508)
@@ -1,5 +0,0 @@
-# The JAVA_HOME of the JVM for Tomcat to use
-TOMCAT_JAVA_HOME=/usr/lib/jvm/java-6-openjdk
-
-# Tomcat additional commandline options
-CATALINA_OPTS=
Copied: tomcat/repos/extra-i686/tomcat.conf.d (from rev 138507,
tomcat/trunk/tomcat.conf.d)
===================================================================
--- extra-i686/tomcat.conf.d (rev 0)
+++ extra-i686/tomcat.conf.d 2011-09-26 12:20:21 UTC (rev 138508)
@@ -0,0 +1,5 @@
+# The JAVA_HOME of the JVM for Tomcat to use
+TOMCAT_JAVA_HOME=/usr/lib/jvm/java-6-openjdk
+
+# Tomcat additional commandline options
+CATALINA_OPTS=
Deleted: extra-i686/tomcat.install
===================================================================
--- extra-i686/tomcat.install 2011-09-26 12:18:42 UTC (rev 138507)
+++ extra-i686/tomcat.install 2011-09-26 12:20:21 UTC (rev 138508)
@@ -1,27 +0,0 @@
-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"
- echo ">>> functionality to operate."
- echo ">>>"
- echo ">>> To activate the module, please load it now (modprobe
capability)."
- echo ">>> Also, you should add it to your MODULES array in rc.conf, so"
- echo ">>> it will be activated automatically at boot-up."
- fi
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- if getent passwd tomcat >/dev/null 2>&1; then
- userdel tomcat
- fi
- if getent group tomcat >/dev/null 2>&1; then
- groupdel tomcat
- fi
-}
Copied: tomcat/repos/extra-i686/tomcat.install (from rev 138507,
tomcat/trunk/tomcat.install)
===================================================================
--- extra-i686/tomcat.install (rev 0)
+++ extra-i686/tomcat.install 2011-09-26 12:20:21 UTC (rev 138508)
@@ -0,0 +1,36 @@
+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"
+ echo ">>> functionality to operate."
+ echo ">>>"
+ echo ">>> To activate the module, please load it now (modprobe
capability)."
+ 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() {
+ post_install $1
+}
+
+pre_remove() {
+ if getent passwd tomcat >/dev/null 2>&1; then
+ userdel tomcat
+ fi
+ if getent group tomcat >/dev/null 2>&1; then
+ groupdel tomcat
+ fi
+}
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2011-09-26 12:18:42 UTC (rev 138507)
+++ extra-x86_64/PKGBUILD 2011-09-26 12:20:21 UTC (rev 138508)
@@ -1,46 +0,0 @@
-# $Id$
-# Maintainer: Guillaume ALAUX <guillaume at archlinux dot org>
-# Contributor: Hugo Doria <h...@archlinux.org>
-pkgname=tomcat
-pkgver=5.5.33
-pkgrel=1
-arch=('i686' 'x86_64')
-pkgdesc="Servlet container for Java Servlet and JavaServer Pages"
-url="http://tomcat.apache.org/";
-license=('APACHE')
-depends=('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=('3d79cd245497b2c501b4fd64e1da641c'
- '20e6a8e89a148e2b0ac81ca03ceea6b1'
- '368322d8a51ce20cc5dbdb505706a16a')
-
-build() {
- unset LDFLAGS
- # build jsvc
- cd ${srcdir}/apache-${pkgname}-${pkgver}/bin
- tar xzf commons-daemon-native.tar.gz
- cd commons-daemon-1.0.5-native-src/unix
- sh configure --with-java=/usr/lib/jvm/java-6-openjdk
- make clean
- make
- 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
- 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}
- chmod 0660
${pkgdir}/opt/tomcat/conf/{*.xml,*.policy,*.properties,/Catalina/localhost/*.xml}
- chmod 775 ${pkgdir}/opt/tomcat/{conf,work,webapps}
-}
Copied: tomcat/repos/extra-x86_64/PKGBUILD (from rev 138507,
tomcat/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2011-09-26 12:20:21 UTC (rev 138508)
@@ -0,0 +1,49 @@
+# $Id$
+# Maintainer: Guillaume ALAUX <guillaume at archlinux dot org>
+# Contributor: Hugo Doria <h...@archlinux.org>
+pkgname=tomcat
+pkgver=5.5.34
+pkgrel=1
+arch=('i686' 'x86_64')
+pkgdesc="Servlet-2.4/JSP-2.0 Container"
+url="http://tomcat.apache.org/";
+license=('APACHE')
+depends=('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=('d09a09bc84409510574a673d35939f16'
+ '20e6a8e89a148e2b0ac81ca03ceea6b1'
+ '368322d8a51ce20cc5dbdb505706a16a')
+
+build() {
+ unset LDFLAGS
+ # build jsvc
+ cd ${srcdir}/apache-${pkgname}-${pkgver}/bin
+ tar xzf commons-daemon-native.tar.gz
+ cd commons-daemon-1.0.7-native-src/unix
+ sh configure --with-java=/usr/lib/jvm/java-6-openjdk
+ 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
+ rm -fr bin/*.exe bin/*.bat bin/*.tar.gz bin/jsvc-src
+
+ # install everything
+ mkdir -p ${pkgdir}/opt/tomcat
+ 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,logs}
+ chmod 0660
${pkgdir}/opt/tomcat/conf/{*.xml,*.policy,*.properties,/Catalina/localhost/*.xml}
+ chmod 775 ${pkgdir}/opt/tomcat/{conf,work,webapps,logs}
+}
Deleted: extra-x86_64/tomcat
===================================================================
--- extra-x86_64/tomcat 2011-09-26 12:18:42 UTC (rev 138507)
+++ extra-x86_64/tomcat 2011-09-26 12:20:21 UTC (rev 138508)
@@ -1,53 +0,0 @@
-#!/bin/bash
-
-[ -f /etc/conf.d/tomcat ] && . /etc/conf.d/tomcat
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
- start)
- stat_busy "Starting Tomcat"
- /opt/tomcat/bin/jsvc \
- -user tomcat \
- -home $TOMCAT_JAVA_HOME \
- -Dcatalina.home=/opt/tomcat \
- -Dcatalina.base=/opt/tomcat \
- -Djava.io.tmpdir=/opt/tomcat/temp \
- -wait 10 \
- -pidfile /var/run/tomcat.pid \
- -errfile /opt/tomcat/logs/catalina.log \
- $CATALINA_OPTS \
- -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
- stat_fail
- else
- add_daemon tomcat
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping Tomcat"
- /opt/tomcat/bin/jsvc \
- -stop \
- -pidfile /var/run/tomcat.pid \
- org.apache.catalina.startup.Bootstrap
-
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon tomcat
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
Copied: tomcat/repos/extra-x86_64/tomcat (from rev 138507, tomcat/trunk/tomcat)
===================================================================
--- extra-x86_64/tomcat (rev 0)
+++ extra-x86_64/tomcat 2011-09-26 12:20:21 UTC (rev 138508)
@@ -0,0 +1,53 @@
+#!/bin/bash
+
+[ -f /etc/conf.d/tomcat ] && . /etc/conf.d/tomcat
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+case "$1" in
+ start)
+ stat_busy "Starting Tomcat"
+ /opt/tomcat/bin/jsvc \
+ -user tomcat \
+ -home $TOMCAT_JAVA_HOME \
+ -Dcatalina.home=/opt/tomcat \
+ -Dcatalina.base=/opt/tomcat \
+ -Djava.io.tmpdir=/opt/tomcat/temp \
+ -wait 10 \
+ -pidfile /var/run/tomcat.pid \
+ -errfile /opt/tomcat/logs/catalina.log \
+ $CATALINA_OPTS \
+ -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
+ stat_fail
+ else
+ add_daemon tomcat
+ stat_done
+ fi
+ ;;
+ stop)
+ stat_busy "Stopping Tomcat"
+ /opt/tomcat/bin/jsvc \
+ -stop \
+ -pidfile /var/run/tomcat.pid \
+ org.apache.catalina.startup.Bootstrap
+
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ rm_daemon tomcat
+ stat_done
+ fi
+ ;;
+ restart)
+ $0 stop
+ sleep 1
+ $0 start
+ ;;
+ *)
+ echo "usage: $0 {start|stop|restart}"
+esac
+exit 0
Deleted: extra-x86_64/tomcat.conf.d
===================================================================
--- extra-x86_64/tomcat.conf.d 2011-09-26 12:18:42 UTC (rev 138507)
+++ extra-x86_64/tomcat.conf.d 2011-09-26 12:20:21 UTC (rev 138508)
@@ -1,5 +0,0 @@
-# The JAVA_HOME of the JVM for Tomcat to use
-TOMCAT_JAVA_HOME=/usr/lib/jvm/java-6-openjdk
-
-# Tomcat additional commandline options
-CATALINA_OPTS=
Copied: tomcat/repos/extra-x86_64/tomcat.conf.d (from rev 138507,
tomcat/trunk/tomcat.conf.d)
===================================================================
--- extra-x86_64/tomcat.conf.d (rev 0)
+++ extra-x86_64/tomcat.conf.d 2011-09-26 12:20:21 UTC (rev 138508)
@@ -0,0 +1,5 @@
+# The JAVA_HOME of the JVM for Tomcat to use
+TOMCAT_JAVA_HOME=/usr/lib/jvm/java-6-openjdk
+
+# Tomcat additional commandline options
+CATALINA_OPTS=
Deleted: extra-x86_64/tomcat.install
===================================================================
--- extra-x86_64/tomcat.install 2011-09-26 12:18:42 UTC (rev 138507)
+++ extra-x86_64/tomcat.install 2011-09-26 12:20:21 UTC (rev 138508)
@@ -1,27 +0,0 @@
-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"
- echo ">>> functionality to operate."
- echo ">>>"
- echo ">>> To activate the module, please load it now (modprobe
capability)."
- echo ">>> Also, you should add it to your MODULES array in rc.conf, so"
- echo ">>> it will be activated automatically at boot-up."
- fi
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- if getent passwd tomcat >/dev/null 2>&1; then
- userdel tomcat
- fi
- if getent group tomcat >/dev/null 2>&1; then
- groupdel tomcat
- fi
-}
Copied: tomcat/repos/extra-x86_64/tomcat.install (from rev 138507,
tomcat/trunk/tomcat.install)
===================================================================
--- extra-x86_64/tomcat.install (rev 0)
+++ extra-x86_64/tomcat.install 2011-09-26 12:20:21 UTC (rev 138508)
@@ -0,0 +1,36 @@
+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"
+ echo ">>> functionality to operate."
+ echo ">>>"
+ echo ">>> To activate the module, please load it now (modprobe
capability)."
+ 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() {
+ post_install $1
+}
+
+pre_remove() {
+ if getent passwd tomcat >/dev/null 2>&1; then
+ userdel tomcat
+ fi
+ if getent group tomcat >/dev/null 2>&1; then
+ groupdel tomcat
+ fi
+}
