[arch-commits] Commit in (15 files)

Guillaume Alaux guillaume at archlinux.org
Mon May 9 20:15:37 UTC 2011


    Date: Monday, May 9, 2011 @ 16:15:36
  Author: guillaume
Revision: 123294

Creating package java-commons-daemon

Added:
  java-commons-daemon/
  java-commons-daemon/repos/
  java-commons-daemon/trunk/
  java-commons-daemon/trunk/PKGBUILD
  tomcat-native/
  tomcat-native/repos/
  tomcat-native/trunk/
  tomcat-native/trunk/PKGBUILD
  tomcat7/
  tomcat7/repos/
  tomcat7/trunk/
  tomcat7/trunk/PKGBUILD
  tomcat7/trunk/tomcat7
  tomcat7/trunk/tomcat7.conf.d
  tomcat7/trunk/tomcat7.install

------------------------------------+
 java-commons-daemon/trunk/PKGBUILD |   51 ++++++++++++++++++++++
 tomcat-native/trunk/PKGBUILD       |   32 +++++++++++++
 tomcat7/trunk/PKGBUILD             |   79 ++++++++++++++++++++++++++++++++++
 tomcat7/trunk/tomcat7              |   81 +++++++++++++++++++++++++++++++++++
 tomcat7/trunk/tomcat7.conf.d       |   11 ++++
 tomcat7/trunk/tomcat7.install      |   27 +++++++++++
 6 files changed, 281 insertions(+)

Added: java-commons-daemon/trunk/PKGBUILD
===================================================================
--- java-commons-daemon/trunk/PKGBUILD	                        (rev 0)
+++ java-commons-daemon/trunk/PKGBUILD	2011-05-09 20:15:36 UTC (rev 123294)
@@ -0,0 +1,51 @@
+# Maintainer: Guillaume ALAUX <guillaume at archlinux.org>
+_libname=commons-daemon
+pkgname=("java-${_libname}" 'java-jsvc')
+pkgbase=java-${_libname}
+pkgver=1.0.5
+pkgrel=1
+arch=('i686' 'x86_64')
+url="http://commons.apache.org/daemon/"
+license=('APACHE')
+source=(http://archive.apache.org/dist/commons/daemon/source/${_libname}-${pkgver}-src.tar.gz)
+md5sums=('2fe0a35d4a9c0338ecd45dad20f33662')
+makedepends=('apache-ant' 'docbook2x' 'docbook-xsl')
+
+
+build() {
+  # commons-daemon.jar
+  cd "${srcdir}/${_libname}-${pkgver}-src"
+  ant
+
+  # jsvc
+  cd "${srcdir}/${_libname}-${pkgver}-src/src/native/unix"
+  ./configure
+  make
+  docbook2man man/jsvc.1.xml
+}
+
+package_java-commons-daemon() {
+  pkgdesc="Set of Apache libraries for making Java applications run on UNIX more easily"
+  arch=('any')
+  depends=('java-runtime')
+
+  cd "${srcdir}/${_libname}-${pkgver}-src"
+
+  install -Dm755 dist/${_libname}-${pkgver}.jar \
+                 ${pkgdir}/usr/share/java/${_libname}-${pkgver}.jar
+  ln -s ${_libname}-${pkgver}.jar \
+        ${pkgdir}/usr/share/java/${_libname}.jar
+}
+
+package_java-jsvc() {
+  pkgdesc="Apache application for making Java applications run on UNIX more easily"
+  arch=('i686' 'x86_64')
+  depends=("java-${_libname}" 'libcap')
+
+  # jsvc
+  cd "${srcdir}/${_libname}-${pkgver}-src/src/native/unix"
+
+  install -Dm755 jsvc ${pkgdir}/usr/bin/jsvc
+  install -Dm644 JSVC.1 ${pkgdir}/usr/share/man/man1/JSVC.1
+}
+


Property changes on: java-commons-daemon/trunk/PKGBUILD
___________________________________________________________________
Added: svn:keywords
   + Id

Added: tomcat-native/trunk/PKGBUILD
===================================================================
--- tomcat-native/trunk/PKGBUILD	                        (rev 0)
+++ tomcat-native/trunk/PKGBUILD	2011-05-09 20:15:36 UTC (rev 123294)
@@ -0,0 +1,32 @@
+# Maintainer: Guillaume ALAUX <guillaume at archlinux.org>
+# Contributor: Vitaliy Berdinskikh ur6lad[at]i.ua
+
+pkgname=tomcat-native
+pkgver=1.1.20
+pkgrel=1
+pkgdesc="The Apache Tomcat Native Library"
+arch=('i686' 'x86_64')
+url="http://tomcat.apache.org/"
+license="Apache"
+depends=('tomcat' 'apr' 'openssl')
+makedepends=('java-environment')
+source=(http://www.apache.org/dist/tomcat/tomcat-connectors/native/${pkgver}/source/${pkgname}-${pkgver}-src.tar.gz)
+md5sums=('fb2b9d073cb6575c2d0020eda266ca0c')
+
+build() {
+  cd "${srcdir}/tomcat-native-${pkgver}-src/jni/native"
+
+  ./configure \
+    --prefix=/usr \
+    --with-java-home=${JAVA_HOME} \
+    --with-apr=/usr \
+    --with-ssl=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}-src/jni/native"
+
+  make DESTDIR=${pkgdir} install
+  rm -rf ${pkgdir}/usr/{bin,include}
+}


Property changes on: tomcat-native/trunk/PKGBUILD
___________________________________________________________________
Added: svn:keywords
   + Id

Added: tomcat7/trunk/PKGBUILD
===================================================================
--- tomcat7/trunk/PKGBUILD	                        (rev 0)
+++ tomcat7/trunk/PKGBUILD	2011-05-09 20:15:36 UTC (rev 123294)
@@ -0,0 +1,79 @@
+# Maintainer: Guillaume ALAUX <guillaume at archlinux.org>
+pkgname=tomcat7
+pkgver=7.0.12
+pkgrel=1
+pkgdesc="Servlet-3.0/JSP-2.2 Container"
+arch=('any')
+url='http://tomcat.apache.org/'
+license=('APACHE')
+depends=('java-runtime>=6' 'java-jsvc' 'eclipse-ecj')
+makedepends=('java-environment>=6' 'apache-ant>=1.8' 'java-commons-daemon' 'eclipse-ecj')
+optdepends=('tomcat-native: to allow optimal performance in production environments')
+backup=(etc/tomcat7/catalina.policy
+        etc/tomcat7/catalina.properties
+        etc/tomcat7/context.xml
+        etc/tomcat7/logging.properties
+        etc/tomcat7/server.xml
+        etc/tomcat7/tomcat-users.xml
+        etc/tomcat7/web.xml)
+install=tomcat7.install
+source=(http://archive.apache.org/dist/tomcat/tomcat-7/v${pkgver}/src/apache-tomcat-${pkgver}-src.tar.gz
+        tomcat7.conf.d
+        tomcat7
+        tomcat7.install)
+
+noextract=(dbcp-${pkgver}.jar)
+md5sums=('edfd253c21b51ccadce8ec05be5e61fb'
+         '13eb5570b4d7dcbbe8b8372575c010c9'
+         '70eabcf5bbfa0978e738d95c64abb7a7'
+         '1be39071bd27781c352b2d73b765e29d')
+
+build() {
+  cd "${srcdir}/apache-tomcat-${pkgver}-src"
+
+  . /etc/profile.d/apache-ant.sh
+  ant \
+    -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}
+  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}/tomcat7.conf.d ${pkgdir}/etc/conf.d/${pkgname}
+  install -Dm755 ${srcdir}/tomcat7 ${pkgdir}/etc/rc.d/${pkgname}
+}
+


Property changes on: tomcat7/trunk/PKGBUILD
___________________________________________________________________
Added: svn:keywords
   + Id

Added: tomcat7/trunk/tomcat7
===================================================================
--- tomcat7/trunk/tomcat7	                        (rev 0)
+++ tomcat7/trunk/tomcat7	2011-05-09 20:15:36 UTC (rev 123294)
@@ -0,0 +1,81 @@
+#!/bin/bash
+
+daemon_name=tomcat7
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+. /etc/conf.d/${daemon_name}
+
+get_pid() {
+	pidof -o %PPID ${daemon_name}
+}
+
+case "$1" in
+  start)
+    stat_busy "Starting ${daemon_name} daemon"
+
+    PID=$(get_pid)
+    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 \
+        -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"
+    PID=$(get_pid)
+    # 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


Property changes on: tomcat7/trunk/tomcat7
___________________________________________________________________
Added: svn:executable
   + *

Added: tomcat7/trunk/tomcat7.conf.d
===================================================================
--- tomcat7/trunk/tomcat7.conf.d	                        (rev 0)
+++ tomcat7/trunk/tomcat7.conf.d	2011-05-09 20:15:36 UTC (rev 123294)
@@ -0,0 +1,11 @@
+# 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=${CATALINA_HOME}
+
+# Tomcat additional commandline options
+CATALINA_OPTS=

Added: tomcat7/trunk/tomcat7.install
===================================================================
--- tomcat7/trunk/tomcat7.install	                        (rev 0)
+++ tomcat7/trunk/tomcat7.install	2011-05-09 20:15:36 UTC (rev 123294)
@@ -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/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
+}




More information about the arch-commits mailing list