Date: Wednesday, February 10, 2010 @ 00:44:45 Author: dgriffiths Revision: 67975
Merged revisions 67970 via svnmerge from svn+ssh://gerolde.archlinux.org/srv/svn-packages/proftpd/trunk ........ r67970 | dgriffiths | 2010-02-09 23:42:07 -0600 (Tue, 09 Feb 2010) | 2 lines FS#16753&16529 ........ Modified: proftpd/repos/extra-i686/ (properties) proftpd/repos/extra-i686/PKGBUILD ----------+ PKGBUILD | 42 +++++++++++++++++++++++++----------------- 1 file changed, 25 insertions(+), 17 deletions(-) Property changes on: proftpd/repos/extra-i686 ___________________________________________________________________ Modified: svnmerge-integrated - /proftpd/trunk:1-65280 + /proftpd/trunk:1-67974 Modified: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2010-02-10 05:42:35 UTC (rev 67974) +++ extra-i686/PKGBUILD 2010-02-10 05:44:45 UTC (rev 67975) @@ -1,17 +1,17 @@ # $Id$ -# Maintainer: # Contributor: Eric Belanger <[email protected]> +# Maintainer: Daniel J Griffiths <[email protected]> pkgname=proftpd pkgver=1.3.2c -pkgrel=1 +pkgrel=2 pkgdesc="A high-performance, scalable FTP server" arch=('i686' 'x86_64') url="http://www.proftpd.org"; license=('GPL') -depends=('glibc' 'pam' 'ncurses' 'libcap') +depends=('glibc' 'pam' 'ncurses' 'libcap' 'libldap') backup=('etc/proftpd.conf' 'etc/conf.d/proftpd') -source=(ftp://ftp.proftpd.org/distrib/source/$pkgname-$pkgver.tar.bz2 +source=(ftp://ftp.proftpd.org/distrib/source/${pkgname}-${pkgver}.tar.bz2 'proftpd' 'proftpd.logrotate' 'proftpd.conf.d') @@ -21,17 +21,25 @@ '71d5932b0461c318ed68c2c0c2660736') build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr --mandir=/usr/share/man --disable-pam \ - --with-modules=mod_quotatab:mod_quotatab_file:mod_tls \ - --sysconfdir=/etc --localstatedir=/var/run --enable-ctrls \ - --enable-ipv6 - make || return 1 - make DESTDIR="$pkgdir" install - install -D -m644 ../proftpd.logrotate "$pkgdir"/etc/logrotate.d/proftpd - install -D -m644 ../proftpd.conf.d "$pkgdir"/etc/conf.d/proftpd - install -D -m755 ../proftpd "$pkgdir"/etc/rc.d/proftpd - cd "$pkgdir"/etc - sed -i 's|nogroup|nobody|g' proftpd.conf - rmdir "$pkgdir"/usr/{libexec,share/locale} + cd ${srcdir}/${pkgname}-${pkgver} + + ./configure --prefix=/usr --mandir=/usr/share/man --disable-pam \ + --with-modules=mod_quotatab:mod_quotatab_file:mod_tls:mod_ldap \ + --sysconfdir=/etc --localstatedir=/var/run --enable-ctrls \ + --enable-ipv6 + make || return 1 } + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + + make DESTDIR=${pkgdir} install + install -Dm644 ../proftpd.logrotate ${pkgdir}/etc/logrotate.d/proftpd + install -Dm644 ../proftpd.conf.d ${pkgdir}/etc/conf.d/proftpd + install -Dm755 ../proftpd ${pkgdir}/etc/rc.d/proftpd + install -Dm755 contrib/xferstats.holger-preiss \ + ${pkgdir}/usr/bin/ftpstats + cd ${pkgdir}/etc + sed -i 's|nogroup|nobody|g' proftpd.conf + rmdir ${pkgdir}/usr/{libexec,share/locale} +}
