Fri Jun 7 00:17:01 PDT 2013

2 files changed, 5 insertions, 51 deletions

diff --git a/extra/bftpd/PKGBUILD b/extra/bftpd/PKGBUILD
index 3d8c636ae..166b2faa8 100644
--- a/extra/bftpd/PKGBUILD
+++ b/extra/bftpd/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 165789 2012-08-29 23:52:16Z thomas $
+# $Id: PKGBUILD 187832 2013-06-06 18:31:08Z thomas $
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 
 pkgname=bftpd
-pkgver=3.8
-pkgrel=2
+pkgver=4.0
+pkgrel=1
 pkgdesc="Small, easy-to-configure FTP server"
 arch=(i686 x86_64)
 url="http://bftpd.sourceforge.net/"
@@ -15,15 +15,13 @@ backup=(etc/bftpd.conf
         etc/pam.d/bftpd
         etc/xinetd.d/bftpd)
 source=(http://downloads.sourceforge.net/sourceforge/bftpd/bftpd-$pkgver.tar.gz
-        bftpd.rc
         bftpd.logrotate
         bftpd.pam
         bftpd.xinetd
         bftpd.service
         bftpd.socket
         bftpd_AT.service)
-md5sums=('880c1274e623ddd1e3e37f9f0cf09d70'
-         '2419d7293000813f9d01bd357181445c'
+md5sums=('34bac87bb196ae823fa2b4731dfa9383'
          '853680dad0df39d0b4d2fb43d4be430a'
          '96f82c38f3f540b53f3e5144900acf17'
          '23feb84e8ecbae5df320b49e01821d9a'
@@ -35,6 +33,7 @@ build() {
   cd "${srcdir}"/$pkgname
   # The bftpd author keeps screwing up the release tarballs
   rm -f config.{cache,status}
+  autoreconf
   sed 's|$(prefix)/sbin|$(prefix)/bin|g' -i Makefile.in
   ./configure --prefix=/usr \
               --enable-pam \
@@ -47,7 +46,6 @@ package() {
   cd "${srcdir}"/$pkgname
   install -d -m755 "${pkgdir}"/usr/{bin,share/man/man8}
   install -D -m644 "${srcdir}"/bftpd.logrotate "${pkgdir}"/etc/logrotate.d/bftpd
-  install -D -m755 "${srcdir}"/bftpd.rc "${pkgdir}"/etc/rc.d/bftpd
   make DESTDIR="${pkgdir}" install
   # Remove log file and /var/run from the package
   # This guy keeps messing up his Makefile, /usr/var, wtf?
diff --git a/extra/bftpd/bftpd.rc b/extra/bftpd/bftpd.rc
deleted file mode 100755
index 4784ae28a..000000000
--- a/extra/bftpd/bftpd.rc
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PIDFILE="/var/run/bftpd.pid"
-
-case "$1" in
-  start)
-    stat_busy "Starting bftpd Server"
-    PID="$(pidof -o %PPID /usr/bin/bftpd)"
-    if [ -z "$PID" ]; then
-      /usr/bin/bftpd -d
-      if [ $? -gt 0 ]; then
-        stat_fail
-      else
-        # wait until it forks
-        sleep 2
-        echo $(pidof -o %PPID /usr/bin/bftpd) > $PIDFILE
-        add_daemon bftpd
-        stat_done
-      fi
-    else
-      stat_fail
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping bftpd Server"
-    if [ -f $PIDFILE ] && kill -0 $(cat $PIDFILE); then
-      kill -15 $(cat $PIDFILE)
-      rm $PIDFILE
-      stat_done
-    else
-      stat_fail
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac