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

[Eric Belanger]

    Date: Friday, September 21, 2007 @ 00:39:35
  Author: eric
    Path: /home/cvs-extra/extra/daemons/proftpd

   Added: proftpd.conf.d (1.1)
Modified: PKGBUILD (1.24 -> 1.25) proftpd (1.4 -> 1.5)

upgpkg: proftpd 1.3.1rc3-2
added configuration file for daemon script (close FS#7995)


----------------+
 PKGBUILD       |   18 +++++++++++-------
 proftpd        |    6 +++++-
 proftpd.conf.d |    4 ++++
 3 files changed, 20 insertions(+), 8 deletions(-)


Index: extra/daemons/proftpd/PKGBUILD
diff -u extra/daemons/proftpd/PKGBUILD:1.24 extra/daemons/proftpd/PKGBUILD:1.25
--- extra/daemons/proftpd/PKGBUILD:1.24	Mon Sep 10 00:53:08 2007
+++ extra/daemons/proftpd/PKGBUILD	Fri Sep 21 00:39:35 2007
@@ -1,18 +1,21 @@
-# $Id: PKGBUILD,v 1.24 2007/09/10 04:53:08 eric Exp $
+# $Id: PKGBUILD,v 1.25 2007/09/21 04:39:35 eric Exp $
 # Maintainer: judd <jvinet at zeroflux.org>
+
 pkgname=proftpd
 pkgver=1.3.1rc3
-pkgrel=1
+pkgrel=2
 pkgdesc="A high-performance, scalable FTP server"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url="http://www.proftpd.org"
 license=('GPL')
 depends=('glibc' 'pam' 'ncurses')
-backup=('etc/proftpd.conf')
+backup=('etc/proftpd.conf' 'etc/conf.d/proftpd')
 source=(ftp://ftp.proftpd.org/distrib/source/$pkgname-$pkgver.tar.bz2 proftpd \
-        proftpd.logrotate)
-md5sums=('485af3aee9ecebfeae1ae2003250a3a9' '66b1993aa80fe3fe6c063ee1e7cc1250'\
-         'ddb09eb13131becdf0e081eef413116b')
+        proftpd.logrotate proftpd.conf.d)
+md5sums=('485af3aee9ecebfeae1ae2003250a3a9' '2ab07084433a57c994e65eabdf3971a9'\
+         'ddb09eb13131becdf0e081eef413116b' '71d5932b0461c318ed68c2c0c2660736')
+sha1sums=('a752ccc2ea4d7ae6f55ac5486d1ede01f734280c' '29684bdff212ff148f773dd6232cecd78b42ca2b'\
+          '83c38ec40efb7cc09d9824b98e65cd948a195cc6' 'f34f60cb4fb1f4af7be7aca427cbad3cad22bbb9')
 
 build() {
   cd $startdir/src/$pkgname-$pkgver
@@ -22,6 +25,7 @@
   make || return 1
   make DESTDIR=$startdir/pkg install
   install -D -m644 ../proftpd.logrotate $startdir/pkg/etc/logrotate.d/proftpd
+  install -D -m644 ../proftpd.conf.d $startdir/pkg/etc/conf.d/proftpd
   install -D -m755 ../proftpd ${startdir}/pkg/etc/rc.d/proftpd
   cd $startdir/pkg/etc
   sed -i 's|nogroup|nobody|g' proftpd.conf
Index: extra/daemons/proftpd/proftpd
diff -u extra/daemons/proftpd/proftpd:1.4 extra/daemons/proftpd/proftpd:1.5
--- extra/daemons/proftpd/proftpd:1.4	Mon Jul 21 16:36:58 2003
+++ extra/daemons/proftpd/proftpd	Fri Sep 21 00:39:35 2007
@@ -1,5 +1,9 @@
 #!/bin/bash
 
+# source application-specific settings
+PROFTPD_ARGS=
+[ -f /etc/conf.d/proftpd ] && . /etc/conf.d/proftpd
+
 . /etc/rc.conf
 . /etc/rc.d/functions
 
@@ -7,7 +11,7 @@
 case "$1" in
   start)
     stat_busy "Starting ProFTPd Server"
-    [ -z "$PID" ] && /usr/sbin/proftpd
+    [ -z "$PID" ] && /usr/sbin/proftpd ${PROFTPD_ARGS}
     if [ $? -gt 0 ]; then
       stat_fail
     else
Index: extra/daemons/proftpd/proftpd.conf.d
diff -u /dev/null extra/daemons/proftpd/proftpd.conf.d:1.1
--- /dev/null	Fri Sep 21 00:39:35 2007
+++ extra/daemons/proftpd/proftpd.conf.d	Fri Sep 21 00:39:35 2007
@@ -0,0 +1,4 @@
+#
+# Parameters to be passed to proftpd
+#
+PROFTPD_ARGS=""