Date: Wednesday, September 14, 2011 @ 12:25:41 Author: guillaume Revision: 138025
archrelease: copy trunk to extra-any Added: tomcat6/repos/extra-any/PKGBUILD (from rev 138024, tomcat6/trunk/PKGBUILD) tomcat6/repos/extra-any/tomcat6 (from rev 138024, tomcat6/trunk/tomcat6) tomcat6/repos/extra-any/tomcat6.conf.d (from rev 138024, tomcat6/trunk/tomcat6.conf.d) tomcat6/repos/extra-any/tomcat6.install (from rev 138024, tomcat6/trunk/tomcat6.install) Deleted: tomcat6/repos/extra-any/PKGBUILD tomcat6/repos/extra-any/tomcat6 tomcat6/repos/extra-any/tomcat6.conf.d tomcat6/repos/extra-any/tomcat6.install -----------------+ PKGBUILD | 173 +++++++++++++++++++++++++++--------------------------- tomcat6 | 154 ++++++++++++++++++++++++------------------------ tomcat6.conf.d | 30 ++++----- tomcat6.install | 54 ++++++++-------- 4 files changed, 206 insertions(+), 205 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2011-09-14 16:24:46 UTC (rev 138024) +++ PKGBUILD 2011-09-14 16:25:41 UTC (rev 138025) @@ -1,86 +0,0 @@ -# Maintainer: Guillaume ALAUX <guilla...@archlinux.org> -pkgname=tomcat6 -pkgver=6.0.33 -pkgrel=2 -pkgdesc="Servlet-2.5/JSP-2.1 Container" -arch=('any') -url='http://tomcat.apache.org/' -license=('APACHE') -depends=('java-runtime>=5' 'java-jsvc' 'eclipse-ecj') -makedepends=('java-environment>=5' 'apache-ant>=1.6' 'java-commons-daemon') -optdepends=('tomcat-native: to allow optimal performance in production environments') -backup=(etc/tomcat6/catalina.policy - etc/tomcat6/catalina.properties - etc/tomcat6/context.xml - etc/tomcat6/logging.properties - etc/tomcat6/server.xml - etc/tomcat6/tomcat-users.xml - etc/tomcat6/web.xml - etc/conf.d/tomcat6) -install=tomcat6.install -source=(http://archive.apache.org/dist/tomcat/tomcat-6/v${pkgver}/src/apache-tomcat-${pkgver}-src.tar.gz - http://tomcat.apache.org/dev/dist/m2-repository/org/apache/tomcat/dbcp/${pkgver}/dbcp-${pkgver}.jar - tomcat6.conf.d - tomcat6 - tomcat6.install) - -noextract=(dbcp-${pkgver}.jar) -md5sums=('84b314ba89a77baca7bd7f2c9e2f86a1' - 'a6ff671562c9ac91e8cc2812760df49d' - 'b9aaaaf482437de11587d72b53ddaa2a' - '8f2ccc09837577394441d29a03b0e667' - '1be39071bd27781c352b2d73b765e29d') - -build() { - cd "${srcdir}/apache-tomcat-${pkgver}-src" - - . /etc/profile.d/apache-ant.sh - ant download deploy\ - -Dbase.path=${srcdir}/DOWN_LIBS \ - -Dcommons-daemon.jar=/usr/share/java/commons-daemon.jar \ - -Djdt.jar=/usr/share/java/eclipse-ecj.jar -} - -package() { - cd "${srcdir}/apache-tomcat-${pkgver}-src/output/build" - - # Tomcat general files - install -dm755 ${pkgdir}/usr/share/{,java/}${pkgname} - # commons-daemon and tomcat-natives are packaged on their own - rm bin/{*.bat,commons-daemon*,tomcat-native.tar.gz} - cp -r bin ${pkgdir}/usr/share/${pkgname} - - # eclipse-ecj is packaged on its own - rm lib/eclipse-ecj.jar - install lib/* ${pkgdir}/usr/share/java/${pkgname} - install "${srcdir}/dbcp-${pkgver}.jar" \ - ${pkgdir}/usr/share/java/${pkgname}/tomcat-dbcp-${pkgver}.jar - ln -s tomcat-dbcp-${pkgver}.jar \ - ${pkgdir}/usr/share/java/${pkgname}/tomcat-dbcp.jar - 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} - 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 -dm770 ${pkgdir}/etc/${pkgname} - install -m660 conf/* ${pkgdir}/etc/${pkgname} - 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} - 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} - 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}/${pkgname}.conf.d ${pkgdir}/etc/conf.d/${pkgname} - install -Dm755 ${srcdir}/${pkgname} ${pkgdir}/etc/rc.d/${pkgname} -} - Copied: tomcat6/repos/extra-any/PKGBUILD (from rev 138024, tomcat6/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2011-09-14 16:25:41 UTC (rev 138025) @@ -0,0 +1,87 @@ +# Maintainer: Guillaume ALAUX <guilla...@archlinux.org> +pkgname=tomcat6 +pkgver=6.0.33 +pkgrel=3 +pkgdesc="Servlet-2.5/JSP-2.1 Container" +arch=('any') +url='http://tomcat.apache.org/' +license=('APACHE') +depends=('java-runtime>=5' 'java-jsvc' 'eclipse-ecj') +makedepends=('java-environment>=5' 'apache-ant>=1.6' 'java-commons-daemon') +optdepends=('tomcat-native: to allow optimal performance in production environments') +backup=(etc/tomcat6/catalina.policy + etc/tomcat6/catalina.properties + etc/tomcat6/context.xml + etc/tomcat6/logging.properties + etc/tomcat6/server.xml + etc/tomcat6/tomcat-users.xml + etc/tomcat6/web.xml + etc/conf.d/tomcat6) +install=tomcat6.install +source=(http://archive.apache.org/dist/tomcat/tomcat-6/v${pkgver}/src/apache-tomcat-${pkgver}-src.tar.gz + http://tomcat.apache.org/dev/dist/m2-repository/org/apache/tomcat/dbcp/${pkgver}/dbcp-${pkgver}.jar + tomcat6.conf.d + tomcat6 + tomcat6.install) + +noextract=(dbcp-${pkgver}.jar) +md5sums=('84b314ba89a77baca7bd7f2c9e2f86a1' + 'a6ff671562c9ac91e8cc2812760df49d' + 'b9aaaaf482437de11587d72b53ddaa2a' + '8f2ccc09837577394441d29a03b0e667' + 'afdb7edc5c7a7b5fa85ad110d021cad3') + +build() { + cd "${srcdir}/apache-tomcat-${pkgver}-src" + + . /etc/profile.d/apache-ant.sh + ant download deploy\ + -Dbase.path=${srcdir}/DOWN_LIBS \ + -Dcommons-daemon.jar=/usr/share/java/commons-daemon.jar \ + -Djdt.jar=/usr/share/java/eclipse-ecj.jar +} + +package() { + cd "${srcdir}/apache-tomcat-${pkgver}-src/output/build" + + # Tomcat general files + install -dm755 ${pkgdir}/usr/share/{,java/}${pkgname} + # commons-daemon and tomcat-natives are packaged on their own + rm bin/{*.bat,commons-daemon*,tomcat-native.tar.gz} + cp -r bin ${pkgdir}/usr/share/${pkgname} + + # eclipse-ecj is packaged on its own + rm lib/eclipse-ecj.jar + install lib/* ${pkgdir}/usr/share/java/${pkgname} + install "${srcdir}/dbcp-${pkgver}.jar" \ + ${pkgdir}/usr/share/java/${pkgname}/tomcat-dbcp-${pkgver}.jar + ln -s tomcat-dbcp-${pkgver}.jar \ + ${pkgdir}/usr/share/java/${pkgname}/tomcat-dbcp.jar + 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} + 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 + 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} + 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} + 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}/${pkgname}.conf.d ${pkgdir}/etc/conf.d/${pkgname} + install -Dm755 ${srcdir}/${pkgname} ${pkgdir}/etc/rc.d/${pkgname} +} + Deleted: tomcat6 =================================================================== --- tomcat6 2011-09-14 16:24:46 UTC (rev 138024) +++ tomcat6 2011-09-14 16:25:41 UTC (rev 138025) @@ -1,77 +0,0 @@ -#!/bin/bash - -daemon_name=tomcat6 - -. /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/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 \ - -outfile /var/log/tomcat6/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 Copied: tomcat6/repos/extra-any/tomcat6 (from rev 138024, tomcat6/trunk/tomcat6) =================================================================== --- tomcat6 (rev 0) +++ tomcat6 2011-09-14 16:25:41 UTC (rev 138025) @@ -0,0 +1,77 @@ +#!/bin/bash + +daemon_name=tomcat6 + +. /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/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 \ + -outfile /var/log/tomcat6/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 Deleted: tomcat6.conf.d =================================================================== --- tomcat6.conf.d 2011-09-14 16:24:46 UTC (rev 138024) +++ tomcat6.conf.d 2011-09-14 16:25:41 UTC (rev 138025) @@ -1,15 +0,0 @@ -# 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 - -# 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=${CATALINA_HOME} - -# Tomcat additional commandline options -CATALINA_OPTS= Copied: tomcat6/repos/extra-any/tomcat6.conf.d (from rev 138024, tomcat6/trunk/tomcat6.conf.d) =================================================================== --- tomcat6.conf.d (rev 0) +++ tomcat6.conf.d 2011-09-14 16:25:41 UTC (rev 138025) @@ -0,0 +1,15 @@ +# 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 + +# 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=${CATALINA_HOME} + +# Tomcat additional commandline options +CATALINA_OPTS= Deleted: tomcat6.install =================================================================== --- tomcat6.install 2011-09-14 16:24:46 UTC (rev 138024) +++ tomcat6.install 2011-09-14 16:25:41 UTC (rev 138025) @@ -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 /usr/share/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: tomcat6/repos/extra-any/tomcat6.install (from rev 138024, tomcat6/trunk/tomcat6.install) =================================================================== --- tomcat6.install (rev 0) +++ tomcat6.install 2011-09-14 16:25:41 UTC (rev 138025) @@ -0,0 +1,27 @@ +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/tomcat6 -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 +}