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

[andyrtr at archlinux.org]

    Date: Saturday, February 21, 2009 @ 17:21:44
  Author: andyrtr
Revision: 27441

upgpkg: vsftpd 2.1.0-1
    new version 2.1.0

Modified:
  vsftpd/trunk/PKGBUILD
  vsftpd/trunk/vsftpd.install

----------------+
 PKGBUILD       |   28 +++++++++++++++-------------
 vsftpd.install |    5 -----
 2 files changed, 15 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-02-21 20:13:42 UTC (rev 27440)
+++ PKGBUILD	2009-02-21 22:21:44 UTC (rev 27441)
@@ -1,7 +1,9 @@
 # $Id$
-# Maintainer: judd <jvinet at zeroflux.org>
+# Maintainer: Andreas Radke <andyrtr at archlinux.org>
+# Contributor: judd <jvinet at zeroflux.org>
+
 pkgname=vsftpd
-pkgver=2.0.7
+pkgver=2.1.0
 pkgrel=1
 pkgdesc="Very Secure FTP daemon"
 arch=(i686 x86_64)
@@ -9,30 +11,30 @@
 backup=(etc/vsftpd.conf etc/xinetd.d/vsftpd)
 url="http://vsftpd.beasts.org/"
 makedepends=('vim')
-depends=('glibc' 'pam' 'tcp_wrappers' 'openssl' 'libcap')
+depends=('glibc' 'pam' 'tcp_wrappers>=7.6-8' 'openssl>=0.9.8j-1' 'libcap>=1.10-2')
 install=vsftpd.install
 source=(ftp://vsftpd.beasts.org/users/cevans/vsftpd-$pkgver.tar.gz \
         vsftpd.xinetd vsftpd.d)
-md5sums=('3e39cb7b0bee306ad7df8e3552e15297'
+md5sums=('7890b54e7ffa6106ffbdfda53f47fa41'
          'b07fd4609c70063c1d6b20142910c1a6'
          'e46ed8e4c4a6e6a3de59f60b98e4f569')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
+  cd ${srcdir}/${pkgname}-${pkgver}
   # build-time config
   sed \
     -e 's|^#undef VSF_BUILD_TCPWRAPPERS$|#define VSF_BUILD_TCPWRAPPERS|' \
     -e 's|^#undef VSF_BUILD_SSL$|#define VSF_BUILD_SSL|' \
     -i builddefs.h
-  make || return 1
-  install -D -m755 vsftpd $startdir/pkg/usr/sbin/vsftpd
-  install -D -m644 vsftpd.conf $startdir/pkg/etc/vsftpd.conf
-  install -D -m644 vsftpd.8 $startdir/pkg/usr/man/man8/vsftpd.8
-  install -D -m644 vsftpd.conf.5 $startdir/pkg/usr/man/man5/vsftpd.conf.5
-  install -D -m644 ../vsftpd.xinetd $startdir/pkg/etc/xinetd.d/vsftpd 
-  install -D -m755 ../vsftpd.d $startdir/pkg/etc/rc.d/vsftpd
+  make CFLAGS="${CFLAGS}" || return 1
+  install -D -m755 vsftpd ${pkgdir}/usr/sbin/vsftpd || return 1
+  install -D -m644 vsftpd.conf ${pkgdir}/etc/vsftpd.conf || return 1
+  install -D -m644 vsftpd.8 ${pkgdir}/usr/share/man/man8/vsftpd.8 || return 1
+  install -D -m644 vsftpd.conf.5 ${pkgdir}/usr/share/man/man5/vsftpd.conf.5 || return 1
+  install -D -m644 ../vsftpd.xinetd ${pkgdir}/etc/xinetd.d/vsftpd  || return 1
+  install -D -m755 ../vsftpd.d ${pkgdir}/etc/rc.d/vsftpd || return 1
   mkdir -p $startdir/pkg/usr/share/empty
-  ex $startdir/pkg/etc/vsftpd.conf <<_EOF
+  ex ${pkgdir}/etc/vsftpd.conf <<_EOF
 2
 i
 #

Modified: vsftpd.install
===================================================================
--- vsftpd.install	2009-02-21 20:13:42 UTC (rev 27440)
+++ vsftpd.install	2009-02-21 22:21:44 UTC (rev 27441)
@@ -11,12 +11,7 @@
   fi
 }
 
-# arg 1:  the new package version
-# arg 2:  the old package version
 post_upgrade() {
   post_install $1
 }
 
-op=$1
-shift
-$op $*