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

[Thomas Bächler]

    Date: Friday, March 16, 2012 @ 14:21:20
  Author: thomas
Revision: 153625

upgpkg: bftpd 3.7-1: upstream update, work around Makefile screwups in this release

Modified:
  bftpd/trunk/PKGBUILD

----------+
 PKGBUILD |   20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-03-16 18:19:24 UTC (rev 153624)
+++ PKGBUILD	2012-03-16 18:21:20 UTC (rev 153625)
@@ -1,8 +1,8 @@
 # $Id$
-# Maintainer: Thomas Baechler <thomas at archlinux.org>
+# Maintainer: Thomas Bächler <thomas at archlinux.org>
 
 pkgname=bftpd
-pkgver=3.6
+pkgver=3.7
 pkgrel=1
 pkgdesc="Small, easy-to-configure FTP server"
 arch=(i686 x86_64)
@@ -19,7 +19,7 @@
         bftpd.logrotate
         bftpd.pam
         bftpd.xinetd)
-md5sums=('7c45b158646e3b266530bf46778fc2d0'
+md5sums=('6614e25ef1864ad80d92724d03832407'
          '56a1bf7738a6db2b2cff89e611f4f11a'
          '853680dad0df39d0b4d2fb43d4be430a'
          '96f82c38f3f540b53f3e5144900acf17'
@@ -29,25 +29,31 @@
   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
+  ./configure --prefix=/usr \
+              --enable-pam \
+              --mandir=/usr/share/man \
+              --sysconfdir=/etc
   make
 }
 
 package() {
   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,}
+  # This guy keeps messing up his Makefile, /usr/var, wtf?
+  rm -f "${pkgdir}"/usr/var/log/bftpd.log
+  rmdir "${pkgdir}"/usr/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
+  # Did I mention this guy keeps messing up his Makefiles?
+  mv "${pkgdir}"/usr/etc/bftpd.conf "${pkgdir}"/etc/
+  rmdir "${pkgdir}"/usr/etc
   # 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
 }