[arch-commits] CVS update of arch/build/daemons/bftpd (PKGBUILD bftpd bftpd.rc)

[Thomas Baechler]

    Date: Saturday, August 25, 2007 @ 05:19:30
  Author: thomas
    Path: /home/cvs-arch/arch/build/daemons/bftpd

   Added: bftpd.rc (1.1)
Modified: PKGBUILD (1.24 -> 1.25)
 Removed: bftpd (1.7)

upgpkg: bftpd 2.0-1


----------+
 PKGBUILD |   30 +++++++++++++++---------------
 bftpd    |   39 ---------------------------------------
 bftpd.rc |   44 ++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 59 insertions(+), 54 deletions(-)


Index: arch/build/daemons/bftpd/PKGBUILD
diff -u arch/build/daemons/bftpd/PKGBUILD:1.24 arch/build/daemons/bftpd/PKGBUILD:1.25
--- arch/build/daemons/bftpd/PKGBUILD:1.24	Wed Jul  4 20:07:27 2007
+++ arch/build/daemons/bftpd/PKGBUILD	Sat Aug 25 05:19:30 2007
@@ -1,34 +1,34 @@
-# $Id: PKGBUILD,v 1.24 2007/07/05 00:07:27 eric Exp $
-# Maintainer: dorphell <dorphell at archlinux.org>
-# Committer: dorphell <dorphell at gmx.net>
+# $Id: PKGBUILD,v 1.25 2007/08/25 09:19:30 thomas Exp $
+# Maintainer: Thomas Baechler <thomas at archlinux.org>
 
 pkgname=bftpd
-pkgver=1.9
+pkgver=2.0
 pkgrel=1
 pkgdesc="A very configurable (and secure) Linux FTP server"
 arch=(i686 x86_64)
 url="http://bftpd.sourceforge.net/"
 license=('GPL')
 depends=('glibc' 'pam')
-backup=(etc/bftpd.conf etc/logrotate.d/bftpd etc/pam.d/bftpd)
-source=(http://downloads.sourceforge.net/sourceforge/bftpd/bftpd-$pkgver.tar.gz bftpd bftpd.logrotate bftpd.pam)
-md5sums=('e55ebb3f5009a67c371b38cb6ff1e71b' '610584cd9b08289ca94fe4603bc3771a'\
-         '853680dad0df39d0b4d2fb43d4be430a' '96f82c38f3f540b53f3e5144900acf17')
+backup=(etc/bftpd.conf etc/logrotate.d/bftpd etc/pam.d/bftpd var/log/bftpd.log)
+source=(http://downloads.sourceforge.net/sourceforge/bftpd/bftpd-$pkgver.tar.gz
+        bftpd.rc bftpd.logrotate bftpd.pam)
+md5sums=('1bcd007522520f89ee8a4a13bcefa247'
+         '56a1bf7738a6db2b2cff89e611f4f11a'
+         '853680dad0df39d0b4d2fb43d4be430a'
+         '96f82c38f3f540b53f3e5144900acf17')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
+  cd $startdir/src/$pkgname
   # install fixes
   sed -i -e 's| /var| $(DESTDIR)/var|g' Makefile.in
-  # fix wrong version number
-  sed -i -e 's|^VERSION=.*|VERSION=1.7|' Makefile.in
   ./configure --prefix=/usr --enable-pam
   make || return 1
   install -d -m755 $startdir/pkg/usr/{sbin,man/man8}
   install -d -m755 $startdir/pkg/var/run/bftpd
   install -d -m755 $startdir/pkg/var/log
-  install -D -m644 ../bftpd.logrotate $startdir/pkg/etc/logrotate.d/bftpd
-  install -D -m755 ../bftpd $startdir/pkg/etc/rc.d/bftpd
-  make DESTDIR=$startdir/pkg install
+  install -D -m644 $startdir/src/bftpd.logrotate $startdir/pkg/etc/logrotate.d/bftpd || return 1
+  install -D -m755 $startdir/src/bftpd.rc $startdir/pkg/etc/rc.d/bftpd || return 1
+  make DESTDIR=$startdir/pkg install || return 1
   mkdir -p $startdir/pkg/etc/pam.d
-  cp $startdir/src/bftpd.pam $startdir/pkg/etc/pam.d/bftpd
+  cp $startdir/src/bftpd.pam $startdir/pkg/etc/pam.d/bftpd || return 1
 }
Index: arch/build/daemons/bftpd/bftpd
diff -u arch/build/daemons/bftpd/bftpd:1.7 arch/build/daemons/bftpd/bftpd:removed
--- arch/build/daemons/bftpd/bftpd:1.7	Sun Feb 16 22:13:11 2003
+++ arch/build/daemons/bftpd/bftpd	Sat Aug 25 05:19:30 2007
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/bftpd`
-case "$1" in
-  start)
-    stat_busy "Starting bftpd Server"
-    [ -z "$PID" ] && /usr/sbin/bftpd -d
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      # wait until it forks
-      sleep 2
-      echo $PID > /var/run/bftpd.pid
-      add_daemon bftpd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping bftpd Server"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm /var/run/bftpd.pid
-      rm_daemon bftpd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
Index: arch/build/daemons/bftpd/bftpd.rc
diff -u /dev/null arch/build/daemons/bftpd/bftpd.rc:1.1
--- /dev/null	Sat Aug 25 05:19:30 2007
+++ arch/build/daemons/bftpd/bftpd.rc	Sat Aug 25 05:19:30 2007
@@ -0,0 +1,44 @@
+#!/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/sbin/bftpd)"
+    if [ -z "$PID" ]; then
+      /usr/sbin/bftpd -d
+      if [ $? -gt 0 ]; then
+        stat_fail
+      else
+        # wait until it forks
+        sleep 2
+        echo $(pidof -o %PPID /usr/sbin/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