Merge branch 'master' of vparabola:~/abslibre-pre-mips64el into pre

Conflicts:
	core/heimdal/PKGBUILD
	extra/apache-ant/PKGBUILD
	extra/aria2/PKGBUILD
	extra/bs/PKGBUILD
	extra/dosbox/PKGBUILD
	extra/ettercap-gtk/PKGBUILD
	extra/gqmpeg/PKGBUILD
	extra/gtk-theme-switch2/PKGBUILD
	extra/icecast/PKGBUILD
	extra/kmldonkey/PKGBUILD
	extra/kmplayer/PKGBUILD
	extra/libbtctl/PKGBUILD
	extra/libx86/PKGBUILD
	extra/mc/PKGBUILD
	extra/monotone/PKGBUILD
	extra/nbsmtp/PKGBUILD
	extra/nickle/PKGBUILD
	extra/nppangband/PKGBUILD
	extra/numlockx/PKGBUILD
	extra/python-gtkglext/PKGBUILD
	extra/speedcrunch/PKGBUILD
	extra/vbetool/PKGBUILD
	libre/xchat-gnome-libre/PKGBUILD
	libre/xchat-gnome-libre/gtk2-2.20.patch
	libre/xchat-gnome-libre/xchat-gnome-0.26.1-deprecated-symbol.patch
	libre/xchat-gnome-libre/xchat-gnome.install

1 files changed, 33 insertions, 19 deletions

diff --git a/extra/bftpd/PKGBUILD b/extra/bftpd/PKGBUILD
index bb06cf506..5d3424581 100644
--- a/extra/bftpd/PKGBUILD
+++ b/extra/bftpd/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 95186 2010-10-16 23:03:07Z thomas $
+# $Id: PKGBUILD 123903 2011-05-14 09:54:29Z thomas $
 # Maintainer: Thomas Baechler <thomas@archlinux.org>
 
 pkgname=bftpd
-pkgver=3.1
+pkgver=3.4
 pkgrel=1
 pkgdesc="Small, easy-to-configure FTP server"
 arch=(i686 x86_64 'mips64el')
@@ -10,30 +10,44 @@ url="http://bftpd.sourceforge.net/"
 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
 }