[arch-commits] Commit in tomcat7/trunk (6 files)
Guillaume Alaux
guillaume at nymeria.archlinux.org
Thu Feb 21 19:00:31 UTC 2013
Date: Thursday, February 21, 2013 @ 20:00:31
Author: guillaume
Revision: 178417
upstream release + Fixed FS#33443, FS#33372
Modified:
tomcat7/trunk/PKGBUILD
tomcat7/trunk/systemd_tmpfiles.d_tomcat7.conf
tomcat7/trunk/systemd_tomcat7.service
tomcat7/trunk/tomcat7.install
Deleted:
tomcat7/trunk/conf.d_tomcat7
tomcat7/trunk/rc.d_tomcat7
---------------------------------+
PKGBUILD | 35 ++++++-----------
conf.d_tomcat7 | 19 ---------
rc.d_tomcat7 | 77 --------------------------------------
systemd_tmpfiles.d_tomcat7.conf | 4 -
systemd_tomcat7.service | 3 -
tomcat7.install | 45 +++++++++++++++-------
6 files changed, 47 insertions(+), 136 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-02-21 17:18:12 UTC (rev 178416)
+++ PKGBUILD 2013-02-21 19:00:31 UTC (rev 178417)
@@ -1,7 +1,7 @@
# Maintainer: Guillaume ALAUX <guillaume at archlinux.org>
pkgbase=tomcat7
pkgname=('java-servlet3.0-tomcat' 'java-jsp2.2-tomcat' 'tomcat7')
-pkgver=7.0.35
+pkgver=7.0.37
pkgrel=1
arch=('any')
url='http://tomcat.apache.org/'
@@ -9,19 +9,15 @@
makedepends=('java-environment' 'apache-ant>=1.8' 'java-commons-daemon' 'eclipse-ecj')
source=(http://archive.apache.org/dist/tomcat/tomcat-7/v${pkgver}/src/apache-tomcat-${pkgver}-src.tar.gz
http://archive.apache.org/dist/tomcat/tomcat-7/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz
- conf.d_tomcat7
- rc.d_tomcat7
systemd_tomcat7.service
systemd_tmpfiles.d_tomcat7.conf
tomcat7.install)
-sha256sums=('3eefa08c8600839f32555e9a306fe8f1232c05c846839ab6901e81e5a11fccac'
- '5bb3825d1b5785b77761c9dde32776e56fa7a7362aab019a2578d00ffae2b0c1'
- 'a9a2d50244e5206e471af4cdf36fd8444e85d382d9f70ca776d72985c152b788'
- '7de8be5e501f0c697b6983f92e250702bb653fb8873a78bd04e15dce63670c01'
- 'a64609f621ec1838a5476d9c5a7860800fed5644940fbb32b40828d14d17485f'
- '871d2ba81cc8a52da00873e4ecf03ecd5dd2ef23626c2ee825ed06eeee54b72b'
- '8ae4e12ccdd1a7be04fae1cf68b0c170a5ee7559f8dffca5f9ecf05c20b66c8e')
+sha256sums=('eb9d3e6b6ff5024bb6865a8bab57d3f01e221f4e8761c07a894e067f8ca63c0c'
+ '4955fc8ca6ee20886d078360f0f169c0490949556044d96542750428e814d9aa'
+ '6b3d9711319165c331b827cba40cb788c0d1ea60fd181a56b8da4ca41e2d2930'
+ '4bfeb2f4462547bf15cb2b72db545c0531c70f8640fa79344d520ceea6812a93'
+ '4db469bcbcfb043c63ce3db0412997552861ea0f9c09d8825808570ed75aa27b')
_servletver=3.0
_jspver=2.2
@@ -78,8 +74,7 @@
etc/tomcat7/logging.properties
etc/tomcat7/server.xml
etc/tomcat7/tomcat-users.xml
- etc/tomcat7/web.xml
- etc/conf.d/tomcat7)
+ etc/tomcat7/web.xml)
install=tomcat7.install
cd "${srcdir}/apache-tomcat-${pkgver}-src/output/build"
@@ -113,31 +108,27 @@
ln -s /usr/share/java/${pkgname} ${pkgdir}/usr/share/${pkgname}/lib
- # 66=tomcat / 19=log
- install -dm775 -o 66 -g 19 ${pkgdir}/var/log/${pkgname}
+ # 71=tomcat7 / 19=log
+ install -dm775 -o 71 -g 19 ${pkgdir}/var/log/${pkgname}
ln -s /var/log/${pkgname} ${pkgdir}/usr/share/${pkgname}/logs
touch ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
chgrp 19 ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
install -dm775 ${pkgdir}/etc/${pkgname}
- install -g 66 -m640 conf/* ${pkgdir}/etc/${pkgname}
- install -d -g66 -m775 ${pkgdir}/etc/${pkgname}/Catalina
+ install -g 71 -m640 conf/* ${pkgdir}/etc/${pkgname}
+ install -d -g 71 -m775 ${pkgdir}/etc/${pkgname}/Catalina
ln -s /etc/${pkgname} ${pkgdir}/usr/share/${pkgname}/conf
install -dm775 ${pkgdir}/var/lib/${pkgname}
cp -r webapps ${pkgdir}/var/lib/${pkgname}
- chown -R 66:66 ${pkgdir}/var/lib/${pkgname}
+ chown -R 71:71 ${pkgdir}/var/lib/${pkgname}
ln -s /var/lib/${pkgname}/webapps ${pkgdir}/usr/share/${pkgname}/webapps
install -dm1777 ${pkgdir}/var/tmp
- install -dm755 -o 66 -g 66 ${pkgdir}/var/tmp/${pkgname}/{temp,work}
+ install -dm775 -o 71 -g 71 ${pkgdir}/var/tmp/${pkgname}/{temp,work}
ln -s /var/tmp/${pkgname}/temp ${pkgdir}/usr/share/${pkgname}/temp
ln -s /var/tmp/${pkgname}/work ${pkgdir}/usr/share/${pkgname}/work
- # Arch scripts
- install -Dm644 ${srcdir}/conf.d_tomcat7 ${pkgdir}/etc/conf.d/${pkgname}
- install -Dm755 ${srcdir}/rc.d_tomcat7 ${pkgdir}/etc/rc.d/${pkgname}
-
install -Dm644 ${srcdir}/systemd_tomcat7.service \
${pkgdir}/usr/lib/systemd/system/${pkgname}.service
install -Dm644 ${srcdir}/systemd_tmpfiles.d_tomcat7.conf \
Deleted: conf.d_tomcat7
===================================================================
--- conf.d_tomcat7 2013-02-21 17:18:12 UTC (rev 178416)
+++ conf.d_tomcat7 2013-02-21 19:00:31 UTC (rev 178417)
@@ -1,19 +0,0 @@
-# Configuration file for Tomcat 7 when used with initscripts
-# This file is NOT used when starting tomcat with systemd
-# Have a look at /usr/share/tomcat7/bin/catalina.sh for a complete list of environment variables
-
-# 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-7-openjdk
-
-# Tomcat home directory
-CATALINA_HOME=/usr/share/tomcat7
-
-# In many circumstances, it is desirable to have a single copy of a Tomcat
-# binary distribution shared among multiple users on the same server. To make
-# this possible, you can set the $CATALINA_BASE environment variable to the
-# directory that contains the files for your 'personal' Tomcat instance.
-CATALINA_BASE=/usr/share/tomcat7
-
-# Tomcat additional commandline options
-CATALINA_OPTS=
Deleted: rc.d_tomcat7
===================================================================
--- rc.d_tomcat7 2013-02-21 17:18:12 UTC (rev 178416)
+++ rc.d_tomcat7 2013-02-21 19:00:31 UTC (rev 178417)
@@ -1,77 +0,0 @@
-#!/bin/bash
-
-daemon_name=tomcat7
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/${daemon_name}
-
-case "$1" in
- start)
- stat_busy "Starting ${daemon_name} daemon"
-
- PID=$(get_pid 'jsvc.exec')
- if [ -z "$PID" ]; then
- [ -f /var/run/${daemon_name}.pid ] && rm -f /var/run/${daemon_name}.pid
- # RUN
- /usr/bin/jsvc \
- -Dcatalina.home=${CATALINA_HOME} \
- -Dcatalina.base=${CATALINA_BASE} \
- -Djava.io.tmpdir=/var/tmp/tomcat7/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/tomcat7/catalina.err \
- -outfile /var/log/tomcat7/catalina.out \
- ${CATALINA_OPTS} \
- org.apache.catalina.startup.Bootstrap
-
- if [ $? -gt 0 ]; then
- stat_fail
- exit 1
- else
- add_daemon ${daemon_name}
- stat_done
- fi
- else
- stat_fail
- exit 1
- fi
- ;;
-
- stop)
- stat_busy "Stopping ${daemon_name} daemon"
- # STOP
- /usr/bin/jsvc \
- -pidfile /var/run/${daemon_name}.pid \
- -stop \
- org.apache.catalina.startup.Bootstrap
- #
- if [ $? -gt 0 ]; then
- stat_fail
- exit 1
- else
- rm -f /var/run/${daemon_name}.pid &> /dev/null
- rm_daemon ${daemon_name}
- stat_done
- fi
- ;;
-
- restart)
- $0 stop
- sleep 3
- $0 start
- ;;
-
- status)
- stat_busy "Checking ${daemon_name} status";
- ck_status ${daemon_name}
- ;;
-
- *)
- echo "usage: $0 {start|stop|restart|status}"
-esac
-
-exit 0
Modified: systemd_tmpfiles.d_tomcat7.conf
===================================================================
--- systemd_tmpfiles.d_tomcat7.conf 2013-02-21 17:18:12 UTC (rev 178416)
+++ systemd_tmpfiles.d_tomcat7.conf 2013-02-21 19:00:31 UTC (rev 178417)
@@ -1,3 +1,3 @@
d /var/tmp/tomcat7
-d /var/tmp/tomcat7/temp 0775 tomcat tomcat
-d /var/tmp/tomcat7/work 0775 tomcat tomcat
+d /var/tmp/tomcat7/temp 0775 tomcat7 tomcat7
+d /var/tmp/tomcat7/work 0775 tomcat7 tomcat7
Modified: systemd_tomcat7.service
===================================================================
--- systemd_tomcat7.service 2013-02-21 17:18:12 UTC (rev 178416)
+++ systemd_tomcat7.service 2013-02-21 19:00:31 UTC (rev 178417)
@@ -16,9 +16,8 @@
-Dcatalina.base=${CATALINA_BASE} \
-Djava.io.tmpdir=/var/tmp/tomcat7/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 \
+ -user tomcat7 \
-java-home ${TOMCAT_JAVA_HOME} \
- -wait 10 \
-pidfile /var/run/tomcat7.pid \
-errfile /var/log/tomcat7/catalina.err \
-outfile /var/log/tomcat7/catalina.out \
Modified: tomcat7.install
===================================================================
--- tomcat7.install 2013-02-21 17:18:12 UTC (rev 178416)
+++ tomcat7.install 2013-02-21 19:00:31 UTC (rev 178417)
@@ -1,16 +1,28 @@
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 /usr/share/tomcat7 -s /bin/false tomcat
+ getent group tomcat7 >/dev/null 2>&1 || groupadd -g 71 tomcat7
+ getent passwd tomcat7 >/dev/null 2>&1 || useradd -u 71 -g tomcat7 -d /usr/share/tomcat7 -s /bin/false tomcat7
- 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."
+ 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
+
+ # Some tomcat7 files were owned by 'tomcat:tomcat', let's fix this
+ chown root:tomcat7 /etc/tomcat7 /etc/tomcat7/*
+ chown -R tomcat7:tomcat7 /etc/tomcat7/Catalina
+ chown -R tomcat7:tomcat7 /var/lib/tomcat7
+ chown -R tomcat7:tomcat7 /var/tmp/tomcat7
+ chown tomcat7:log /var/log/tomcat7
+ find /var/log/tomcat7 -user tomcat -exec chown tomcat7 {} \;
+ find /var/log/tomcat7 -group tomcat -exec chgrp tomcat7 {} \;
+
+ # Fix some previously erroneous mods
+ chmod 775 /var/tmp/tomcat7 /var/tmp/tomcat7/temp /var/tmp/tomcat7/work
}
post_upgrade() {
@@ -18,10 +30,15 @@
}
pre_remove() {
- if getent passwd tomcat >/dev/null 2>&1; then
- userdel tomcat
+ if getent passwd tomcat7 > /dev/null 2>&1; then
+ userdel tomcat7
fi
- if getent group tomcat >/dev/null 2>&1; then
- groupdel tomcat
+ if getent group tomcat7 > /dev/null 2>&1; then
+ groupdel tomcat7
fi
+
+ echo 'Please consider removing the following directories:'
+ echo ' /var/lib/tomcat7'
+ echo ' /var/tmp/tomcat7'
+ echo ' /var/log/tomcat7'
}
More information about the arch-commits
mailing list