[arch-commits] Commit in bftpd/trunk (PKGBUILD bftpd.xinetd)

[Thomas Bächler]

    Date: Saturday, May 14, 2011 @ 05:54:29
  Author: thomas
Revision: 123903

bftpd: Upstream update (3.4), remove /var/run, fix default config, add xinetd file

Added:
  bftpd/trunk/bftpd.xinetd
Modified:
  bftpd/trunk/PKGBUILD

--------------+
 PKGBUILD     |   50 ++++++++++++++++++++++++++++++++------------------
 bftpd.xinetd |   11 +++++++++++
 2 files changed, 43 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-05-14 09:19:01 UTC (rev 123902)
+++ PKGBUILD	2011-05-14 09:54:29 UTC (rev 123903)
@@ -2,7 +2,7 @@
 # Maintainer: Thomas Baechler <thomas at archlinux.org>
 
 pkgname=bftpd
-pkgver=3.1
+pkgver=3.4
 pkgrel=1
 pkgdesc="Small, easy-to-configure FTP server"
 arch=(i686 x86_64)
@@ -10,30 +10,44 @@
 license=('GPL')
 depends=('glibc' 'pam')
 install=bftpd.install
-backup=(etc/bftpd.conf etc/logrotate.d/bftpd etc/pam.d/bftpd)
+backup=(etc/bftpd.conf
+        etc/logrotate.d/bftpd
+        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)
-md5sums=('1aeda6f3da2b10dcf5dca1b1d8466c48'
+        bftpd.rc
+        bftpd.logrotate
+        bftpd.pam
+        bftpd.xinetd)
+md5sums=('dcee04b5fad8c918e86c49712424fcdd'
          '56a1bf7738a6db2b2cff89e611f4f11a'
          '853680dad0df39d0b4d2fb43d4be430a'
-         '96f82c38f3f540b53f3e5144900acf17')
+         '96f82c38f3f540b53f3e5144900acf17'
+         'ff70fd962666f4d74749a1c68167a966')
 
 build() {
-  cd ${srcdir}/$pkgname
+  cd "${srcdir}"/$pkgname
+  # The bftpd author keeps screwing up the release tarballs
+  rm -f config.{cache,status}
   ./configure --prefix=/usr --enable-pam --mandir=/usr/share/man
-  make || return 1
+  make
 }
 
 package() {
-  cd ${srcdir}/$pkgname
-  install -d -m755 ${pkgdir}/usr/{sbin,share/man/man8}
-  install -d -m755 ${pkgdir}/var/run/bftpd
-  install -d -m755 ${pkgdir}/var/log
-  install -D -m644 ${srcdir}/bftpd.logrotate ${pkgdir}/etc/logrotate.d/bftpd || return 1
-  install -D -m755 ${srcdir}/bftpd.rc ${pkgdir}/etc/rc.d/bftpd || return 1
-  make DESTDIR=${pkgdir} install || return 1
-  rm -f ${pkgdir}/var/log/bftpd.log
-  rmdir ${pkgdir}/var/log
-  mkdir -p ${pkgdir}/etc/pam.d
-  cp ${srcdir}/bftpd.pam ${pkgdir}/etc/pam.d/bftpd || return 1
+  cd "${srcdir}"/$pkgname
+  install -d -m755 "${pkgdir}"/usr/{sbin,share/man/man8}
+  install -d -m755 "${pkgdir}"/var/log
+  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
+  rm -f "${pkgdir}"/var/log/bftpd.log
+  rmdir "${pkgdir}"/var/{run/bftpd,run,log,}
+  # Install PAM file
+  mkdir -p "${pkgdir}"/etc/pam.d
+  cp "${srcdir}"/bftpd.pam "${pkgdir}"/etc/pam.d/bftpd
+  # Install xinetd file
+  install -D -m644 "${srcdir}"/bftpd.xinetd "${pkgdir}"/etc/xinetd.d/bftpd
+  # Fix default in config file
+  sed 's|#ROOTDIR="/path/for/anonymous/user"|# bftpd interprets ROOTDIR="%h" (the default), as ROOTDIR="/" for the anonymous user, override it\n  ROOTDIR="/srv/ftp"|' -i "${pkgdir}"/etc/bftpd.conf
 }

Added: bftpd.xinetd
===================================================================
--- bftpd.xinetd	                        (rev 0)
+++ bftpd.xinetd	2011-05-14 09:54:29 UTC (rev 123903)
@@ -0,0 +1,11 @@
+service ftp
+{
+        socket_type             = stream
+        wait                    = no
+        user                    = root
+        server                  = /usr/sbin/bftpd
+        server_args             = -i
+        log_on_success         += HOST DURATION
+        log_on_failure         += HOST
+        disable                 = yes
+}