Tue Sep 27 23:14:33 UTC 2011

4 files changed, 29 insertions, 24 deletions

diff --git a/extra/proftpd/PKGBUILD b/extra/proftpd/PKGBUILD
index 9acc9206a..4199294d8 100644
--- a/extra/proftpd/PKGBUILD
+++ b/extra/proftpd/PKGBUILD
@@ -1,21 +1,20 @@
-# $Id: PKGBUILD 129323 2011-06-26 18:29:37Z andrea $
+# $Id: PKGBUILD 138532 2011-09-27 03:18:03Z eric $
 # Maintainer:
 # Contributor: Eric Belanger <eric@archlinux.org>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=proftpd
-pkgver=1.3.3e
-pkgrel=2
+pkgver=1.3.3f
+pkgrel=1
 pkgdesc="A high-performance, scalable FTP server"
 arch=('i686' 'x86_64')
 url="http://www.proftpd.org"
 license=('GPL')
-depends=('glibc' 'pam' 'ncurses' 'libcap' 'libldap' 'libmysqlclient'
-         'postgresql-libs')
+depends=('libldap' 'libmysqlclient' 'postgresql-libs')
 backup=('etc/proftpd.conf' 'etc/conf.d/proftpd')
 source=("ftp://ftp.proftpd.org/distrib/source/${pkgname}-${pkgver}.tar.bz2"
         'proftpd' 'proftpd.logrotate' 'proftpd.conf.d')
-md5sums=('acc49b6589bc8c9fdf1dce9000bebdbd'
+md5sums=('e9416d2aa7ac1246af4fc8a80fd73f27'
          '99f6f9a989e70e3fa50809fc2bbbbb0a'
          'ddb09eb13131becdf0e081eef413116b'
          '71d5932b0461c318ed68c2c0c2660736')
diff --git a/extra/swt/PKGBUILD b/extra/swt/PKGBUILD
index 747013569..e2e34ebd6 100644
--- a/extra/swt/PKGBUILD
+++ b/extra/swt/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 129501 2011-06-28 14:09:34Z guillaume $
+# $Id: PKGBUILD 138506 2011-09-26 08:00:12Z guillaume $
 # Maintainer: Guillaume ALAUX <guillaume@archlinux.org>
 pkgname=swt
-pkgver=3.7
+pkgver=3.7.1
 pkgrel=1
 pkgdesc="An open source widget toolkit for Java"
-_date=201106131736
+_date=201109091335
 arch=(i686 x86_64)
 url="http://www.eclipse.org/swt/"
 license=('EPL')
@@ -13,23 +13,17 @@ depends=('java-runtime>=6' 'gtk2>=2.20.1' 'libxtst')
 #makedepends=('openjdk6' 'libxtst' 'mesa' 'libgnomeui' 'xulrunner>=1.9.1' 'unzip' 'pkgconfig' 'apache-ant')
 optdepends=('libgnomeui' 'mesa')
 makedepends=('openjdk6' 'libxtst' 'mesa' 'libgnomeui' 'unzip' 'pkgconfig' 'apache-ant')
-source=(http://download.eclipse.org/eclipse/downloads/drops/R-${pkgver}-${_date}/swt-${pkgver}-gtk-linux-x86.zip
-        http://download.eclipse.org/eclipse/downloads/drops/R-${pkgver}-${_date}/swt-${pkgver}-gtk-linux-x86_64.zip
-        build-swt.xml)
-md5sums=('21d084526f5df4e02900b2ce4ae8b5d1'
-         '60f11408bc8db299c5406a904a665a5e'
-         'f5e548bc26a0f1f3c18131be76face40')
 if [ "${CARCH}" = "i686" ]; then
   source=(http://download.eclipse.org/eclipse/downloads/drops/R-${pkgver}-${_date}/swt-${pkgver}-gtk-linux-x86.zip
           build-swt.xml)
   noextract=(swt-${pkgver}-gtk-linux-x86.zip)
-  md5sums=('21d084526f5df4e02900b2ce4ae8b5d1'
+  md5sums=('b7d6d24e2feb7489b0baa0ce941ea4d2'
            'f5e548bc26a0f1f3c18131be76face40')
 fi
 if [ "${CARCH}" = "x86_64" ]; then
   source=(http://download.eclipse.org/eclipse/downloads/drops/R-${pkgver}-${_date}/swt-${pkgver}-gtk-linux-x86_64.zip
           build-swt.xml)
-  md5sums=('60f11408bc8db299c5406a904a665a5e'
+  md5sums=('8816631e7993a783a87e98ba39da7fa6'
            'f5e548bc26a0f1f3c18131be76face40')
   noextract=(swt-${pkgver}-gtk-linux-x86_64.zip)
 fi
diff --git a/extra/tomcat/PKGBUILD b/extra/tomcat/PKGBUILD
index b58268347..8875fed4f 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')
-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() {