[arch-commits] Commit in tomcat/repos (4 files)

[Giovanni Scafora]

    Date: Sunday, November 22, 2009 @ 03:04:17
  Author: giovanni
Revision: 59324

Merged revisions 59318 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/tomcat/trunk

........
  r59318 | andrea | 2009-11-21 20:55:24 -0800 (sab, 21 nov 2009) | 2 lines
  
  upgpkg: tomcat 5.5.28-1
      upstream release
........

Modified:
  tomcat/repos/extra-x86_64/	(properties)
  tomcat/repos/extra-x86_64/PKGBUILD
  tomcat/repos/extra-x86_64/tomcat
  tomcat/repos/extra-x86_64/tomcat.install

----------------+
 PKGBUILD       |   26 ++++++++++++++------------
 tomcat         |    4 ++--
 tomcat.install |   24 +++++-------------------
 3 files changed, 21 insertions(+), 33 deletions(-)


Property changes on: tomcat/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /tomcat/trunk:1-19139
   + /tomcat/trunk:1-59323

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-11-22 07:57:27 UTC (rev 59323)
+++ extra-x86_64/PKGBUILD	2009-11-22 08:04:17 UTC (rev 59324)
@@ -1,34 +1,36 @@
 # $Id$
-# Maintainer: Hugo Doria <hugo at archlinux.org>
+# Contributor: Hugo Doria <hugo at archlinux.org>
 
 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: extra-x86_64/tomcat
===================================================================
--- extra-x86_64/tomcat	2009-11-22 07:57:27 UTC (rev 59323)
+++ extra-x86_64/tomcat	2009-11-22 08:04:17 UTC (rev 59324)
@@ -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: extra-x86_64/tomcat.install
===================================================================
--- extra-x86_64/tomcat.install	2009-11-22 07:57:27 UTC (rev 59323)
+++ extra-x86_64/tomcat.install	2009-11-22 08:04:17 UTC (rev 59324)
@@ -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