diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-06-10 11:35:18 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-06-10 11:35:18 +0200 |
| commit | 51d25a8023c8dafdbcafd8bcc6adb19979f15ac6 (patch) | |
| tree | 3419b254ec8c04b09a938d993fdb768eae03c005 /extra/proftpd | |
| parent | 11fe0679d59f68c3fbe3d0a205e5087bf694262e (diff) | |
| parent | 7b2739f21a7ed0d52497fa381c9a2383e71ab7a8 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
extra/kdemultimedia/PKGBUILD
extra/kdenetwork/PKGBUILD
extra/samba/PKGBUILD
multilib/lib32-gnutls/PKGBUILD
multilib/wine/PKGBUILD
staging/kdemultimedia/PKGBUILD
Diffstat (limited to 'extra/proftpd')
| -rw-r--r-- | extra/proftpd/PKGBUILD | 17 | ||||
| -rwxr-xr-x | extra/proftpd/proftpd | 4 |
2 files changed, 12 insertions, 9 deletions
diff --git a/extra/proftpd/PKGBUILD b/extra/proftpd/PKGBUILD index a3b616eec..e157d47d4 100644 --- a/extra/proftpd/PKGBUILD +++ b/extra/proftpd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 153971 2012-03-21 06:21:09Z pierre $ +# $Id: PKGBUILD 161293 2012-06-08 23:31:04Z tomegun $ # Maintainer: # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=proftpd pkgver=1.3.4a -pkgrel=4 +pkgrel=5 epoch=1 pkgdesc="A high-performance, scalable FTP server" arch=('i686' 'x86_64' 'mips64el') @@ -14,11 +14,6 @@ depends=('libldap' 'libmysqlclient' 'postgresql-libs') backup=('etc/proftpd.conf' 'etc/conf.d/proftpd') source=(ftp://ftp.proftpd.org/distrib/source/${pkgname}-${pkgver}.tar.bz2{,.asc} 'proftpd' 'proftpd.logrotate' 'proftpd.conf.d') -sha1sums=('18ea33d8b9f858b6e735cc81af900f0eebee8d25' - '195b06e28e503f5e5ef355c3332884cc5e7954a9' - 'b7819d725817e55b69c73e2572c21a05db48cc86' - '83c38ec40efb7cc09d9824b98e65cd948a195cc6' - 'f34f60cb4fb1f4af7be7aca427cbad3cad22bbb9') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -48,4 +43,12 @@ package() { 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" + + # /var/run is a symlink to /run now + rm -rf "${pkgdir}/var" } +md5sums=('4e3235dc1ef95d36e59721d70c5c489c' + '3b0f44496adb36640b7a6cc165556bcf' + '8177292919acb2f087ded0bb7b2dcc32' + 'ddb09eb13131becdf0e081eef413116b' + '71d5932b0461c318ed68c2c0c2660736') diff --git a/extra/proftpd/proftpd b/extra/proftpd/proftpd index 357a7663d..df9283a77 100755 --- a/extra/proftpd/proftpd +++ b/extra/proftpd/proftpd @@ -20,11 +20,11 @@ case "$1" in ;; stop) stat_busy "Stopping ProFTPd Server" - [ -f /var/run/proftpd.pid ] && kill $(cat /var/run/proftpd.pid) &> /dev/null + [ -f /run/proftpd.pid ] && kill $(cat /run/proftpd.pid) &> /dev/null if [ $? -gt 0 ]; then stat_fail else - rm -f /var/run/proftpd.pid + rm -f /run/proftpd.pid rm_daemon proftpd stat_done fi |