[arch-commits] CVS update of extra/daemons/proftpd (PKGBUILD proftpd)

[Eric Belanger]

    Date: Wednesday, November 21, 2007 @ 21:25:10
  Author: eric
    Path: /home/cvs-extra/extra/daemons/proftpd

Modified: PKGBUILD (1.26 -> 1.27) proftpd (1.5 -> 1.6)

upgpkg: proftpd 1.3.1-2
fixed location of proftpd.pid, closes FS#8327


----------+
 PKGBUILD |   14 ++++++++------
 proftpd  |    8 +++-----
 2 files changed, 11 insertions(+), 11 deletions(-)


Index: extra/daemons/proftpd/PKGBUILD
diff -u extra/daemons/proftpd/PKGBUILD:1.26 extra/daemons/proftpd/PKGBUILD:1.27
--- extra/daemons/proftpd/PKGBUILD:1.26	Tue Oct  9 20:51:46 2007
+++ extra/daemons/proftpd/PKGBUILD	Wed Nov 21 21:25:09 2007
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD,v 1.26 2007/10/10 00:51:46 eric Exp $
+# $Id: PKGBUILD,v 1.27 2007/11/22 02:25:09 eric Exp $
 # Maintainer: Eric Belanger <eric at archlinux.org>
 
 pkgname=proftpd
 pkgver=1.3.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A high-performance, scalable FTP server"
 arch=('i686' 'x86_64')
 url="http://www.proftpd.org"
@@ -12,16 +12,18 @@
 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=('175958df8de92d5209b7b1e2e23a5a28' '2ab07084433a57c994e65eabdf3971a9'\
+md5sums=('175958df8de92d5209b7b1e2e23a5a28' 'f4ee75856da5f2857442006835d8fae0'\
          'ddb09eb13131becdf0e081eef413116b' '71d5932b0461c318ed68c2c0c2660736')
-sha1sums=('0b54286492967172c5355e2f489f9665b46591e5' '29684bdff212ff148f773dd6232cecd78b42ca2b' \
-          '83c38ec40efb7cc09d9824b98e65cd948a195cc6' 'f34f60cb4fb1f4af7be7aca427cbad3cad22bbb9')
+sha1sums=('0b54286492967172c5355e2f489f9665b46591e5'
+          '441165492808b9e20903dc6bb40784fedd977ade'
+          '83c38ec40efb7cc09d9824b98e65cd948a195cc6'
+          'f34f60cb4fb1f4af7be7aca427cbad3cad22bbb9')
 
 build() {
   cd $startdir/src/$pkgname-$pkgver
   ./configure --prefix=/usr --disable-pam \
     --with-modules=mod_quotatab:mod_quotatab_file \
-    --sysconfdir=/etc --localstatedir=/var --enable-ctrls
+    --sysconfdir=/etc --localstatedir=/var --enable-ctrls --localstatedir=/var/run
   make || return 1
   make DESTDIR=$startdir/pkg install
   install -D -m644 ../proftpd.logrotate $startdir/pkg/etc/logrotate.d/proftpd
Index: extra/daemons/proftpd/proftpd
diff -u extra/daemons/proftpd/proftpd:1.5 extra/daemons/proftpd/proftpd:1.6
--- extra/daemons/proftpd/proftpd:1.5	Fri Sep 21 00:39:35 2007
+++ extra/daemons/proftpd/proftpd	Wed Nov 21 21:25:09 2007
@@ -7,26 +7,24 @@
 . /etc/rc.conf
 . /etc/rc.d/functions
 
-PID=`pidof -o %PPID /usr/sbin/proftpd`
 case "$1" in
   start)
     stat_busy "Starting ProFTPd Server"
-    [ -z "$PID" ] && /usr/sbin/proftpd ${PROFTPD_ARGS}
+    /usr/sbin/proftpd ${PROFTPD_ARGS}
     if [ $? -gt 0 ]; then
       stat_fail
     else
-      echo $PID > /var/run/proftpd.pid
       add_daemon proftpd
       stat_done
     fi
     ;;
   stop)
     stat_busy "Stopping ProFTPd Server"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
+    [ -f /var/run/proftpd.pid ] && kill $(cat /var/run/proftpd.pid) &> /dev/null
     if [ $? -gt 0 ]; then
       stat_fail
     else
-      rm /var/run/proftpd.pid
+      rm -f /var/run/proftpd.pid
       rm_daemon proftpd
       stat_done
     fi