summaryrefslogtreecommitdiff
path: root/extra/tomcat
diff options
context:
space:
mode:
Diffstat (limited to 'extra/tomcat')
-rw-r--r--extra/tomcat/PKGBUILD17
-rw-r--r--extra/tomcat/tomcat.install9
2 files changed, 19 insertions, 7 deletions
diff --git a/extra/tomcat/PKGBUILD b/extra/tomcat/PKGBUILD
index 273e65ae2..a1bba1b67 100644
--- a/extra/tomcat/PKGBUILD
+++ b/extra/tomcat/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 117492 2011-04-04 07:40:54Z guillaume $
+# $Id: PKGBUILD 138508 2011-09-26 12:20:21Z guillaume $
# Maintainer: Guillaume ALAUX <guillaume at archlinux dot org>
# Contributor: Hugo Doria <hugo@archlinux.org>
pkgname=tomcat
-pkgver=5.5.33
+pkgver=5.5.34
pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
-pkgdesc="Servlet container for Java Servlet and JavaServer Pages"
+pkgdesc="Servlet-2.4/JSP-2.0 Container"
url="http://tomcat.apache.org/"
license=('APACHE')
depends=('java-environment')
@@ -15,7 +15,7 @@ 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=('3d79cd245497b2c501b4fd64e1da641c'
+md5sums=('d09a09bc84409510574a673d35939f16'
'20e6a8e89a148e2b0ac81ca03ceea6b1'
'368322d8a51ce20cc5dbdb505706a16a')
@@ -24,12 +24,15 @@ build() {
# 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
cp jsvc ../..
+}
+package() {
+ cd ${srcdir}/apache-${pkgname}-${pkgver}/bin
# get rid of some cruft
cd ${srcdir}/apache-${pkgname}-${pkgver}
rm -f LICENSE NOTICE RELEASE-NOTES RUNNING.txt
@@ -40,7 +43,7 @@ build() {
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}
}
diff --git a/extra/tomcat/tomcat.install b/extra/tomcat/tomcat.install
index 4308274ce..9f7c21d38 100644
--- a/extra/tomcat/tomcat.install
+++ b/extra/tomcat/tomcat.install
@@ -11,6 +11,15 @@ post_install() {
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() {