[arch-commits] Commit in tomcat/trunk (PKGBUILD tomcat.install)

[Guillaume Alaux]

Date: Monday, September 26, 2011 @ 08:18:42
  Author: guillaume
Revision: 138507

upgpkg: tomcat 5.5.34-1

Upstream release

Modified:
  tomcat/trunk/PKGBUILD
  tomcat/trunk/tomcat.install

+
 PKGBUILD   |   10 +-
 tomcat.install |9 +
 2 files changed, 14 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-09-26 08:00:12 UTC (rev 138506)
+++ PKGBUILD2011-09-26 12:18:42 UTC (rev 138507)
@@ -2,7 +2,7 @@
 # Maintainer: Guillaume ALAUX guillaume at archlinux dot org
 # Contributor: Hugo Doria h...@archlinux.org
 pkgname=tomcat
-pkgver=5.5.33
+pkgver=5.5.34
 pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc=Servlet-2.4/JSP-2.0 Container
@@ -15,7 +15,7 @@
 
source=(http://archive.apache.org/dist/tomcat/tomcat-5/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz
'tomcat'
'tomcat.conf.d')
-md5sums=('3d79cd245497b2c501b4fd64e1da641c'
+md5sums=('d09a09bc84409510574a673d35939f16'
  '20e6a8e89a148e2b0ac81ca03ceea6b1'
  '368322d8a51ce20cc5dbdb505706a16a')
 
@@ -24,7 +24,7 @@
   # build jsvc
   cd ${srcdir}/apache-${pkgname}-${pkgver}/bin
   tar xzf commons-daemon-native.tar.gz
-  cd commons-daemon-1.0.5-native-src/unix
+  cd commons-daemon-1.0.7-native-src/unix
   sh configure --with-java=/usr/lib/jvm/java-6-openjdk
   make clean
   make
@@ -43,7 +43,7 @@
   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}
+  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}
+  chmod 775 ${pkgdir}/opt/tomcat/{conf,work,webapps,logs}
 }

Modified: tomcat.install
===
--- tomcat.install  2011-09-26 08:00:12 UTC (rev 138506)
+++ tomcat.install  2011-09-26 12:18:42 UTC (rev 138507)
@@ -11,6 +11,15 @@
 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() {

[arch-commits] Commit in tomcat/trunk (PKGBUILD tomcat.install)

[Ionut Biru]

Date: Friday, August 6, 2010 @ 11:46:45
  Author: ibiru
Revision: 86882

upgpkg: tomcat 5.5.30-2 fix removing user

Modified:
  tomcat/trunk/PKGBUILD
  tomcat/trunk/tomcat.install

+
 PKGBUILD   |4 ++--
 tomcat.install |   10 +++---
 2 files changed, 9 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-08-06 10:57:45 UTC (rev 86881)
+++ PKGBUILD2010-08-06 15:46:45 UTC (rev 86882)
@@ -3,7 +3,7 @@
 # Contributor: Guillaume ALAUX guillaume at alaux dot net
 pkgname=tomcat
 pkgver=5.5.30
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 pkgdesc=Servlet container for Java Servlet and JavaServer Pages
 url=http://tomcat.apache.org/;
@@ -27,7 +27,7 @@
   cd commons-daemon-1.0.2-native-src/unix
   sh configure --with-java=/usr/lib/jvm/java-6-openjdk
   make clean
-  make || return 1
+  make
   cp jsvc ../..
 
   # get rid of some cruft

Modified: tomcat.install
===
--- tomcat.install  2010-08-06 10:57:45 UTC (rev 86881)
+++ tomcat.install  2010-08-06 15:46:45 UTC (rev 86882)
@@ -1,7 +1,7 @@
 post_install() {
   getent group tomcat /dev/null 21 || groupadd -g 66 tomcat
   getent passwd tomcat /dev/null 21 || 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
@@ -18,6 +18,10 @@
 }
 
 pre_remove() {
-  getent passwd tomcat /dev/null 21 || userdel tomcat  /dev/null
-  getent group tomcat /dev/null 21 || groupdel tomcat  /dev/null
+  if getent passwd tomcat /dev/null 21; then
+  userdel tomcat
+  fi
+  if getent group tomcat /dev/null 21; then
+  groupdel tomcat
+  fi
 }