diff options
Diffstat (limited to 'extra/rsync')
| -rw-r--r-- | extra/rsync/PKGBUILD | 10 | ||||
| -rw-r--r-- | extra/rsync/rsyncd | 37 | ||||
| -rw-r--r-- | extra/rsync/rsyncd.service | 3 |
3 files changed, 5 insertions, 45 deletions
diff --git a/extra/rsync/PKGBUILD b/extra/rsync/PKGBUILD index bfa7063cd..9cc142f00 100644 --- a/extra/rsync/PKGBUILD +++ b/extra/rsync/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 168629 2012-10-13 16:16:09Z thomas $ +# $Id: PKGBUILD 185234 2013-05-12 10:36:09Z pierre $ pkgname=rsync pkgver=3.0.9 -pkgrel=5 +pkgrel=6 pkgdesc="A file transfer program to keep remote files in sync" arch=('i686' 'x86_64') url="http://samba.anu.edu.au/rsync/" @@ -10,13 +10,12 @@ license=('GPL3') depends=('perl') backup=('etc/rsyncd.conf' 'etc/xinetd.d/rsync') source=("http://rsync.samba.org/ftp/rsync/$pkgname-$pkgver.tar.gz" - 'rsyncd.conf' 'rsyncd' 'rsync.xinetd' 'rsyncd.service' + 'rsyncd.conf' 'rsync.xinetd' 'rsyncd.service' 'rsyncd.socket' 'rsyncd@.service') md5sums=('5ee72266fe2c1822333c407e1761b92b' 'bce64d122a8e0f86872a4a21a03bc7f3' - 'ba413da4ebca05c57860151fda21efbc' 'ea3e9277dc908bc51f9eddc0f6b935c1' - 'ec96f9089d71109557cdcaa3f0633ed6' + '084140868d38cf3e937a2db716d47c0f' 'ae4c381e0c02d6132c7f6ded3f473041' '53f94e613e0bc502d38dd61bd2cd7636') @@ -34,7 +33,6 @@ check() { package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install - install -Dm755 ../rsyncd "$pkgdir/etc/rc.d/rsyncd" install -Dm644 ../rsyncd.conf "$pkgdir/etc/rsyncd.conf" install -Dm644 ../rsync.xinetd "$pkgdir/etc/xinetd.d/rsync" install -Dm644 ../rsyncd.service "$pkgdir/usr/lib/systemd/system/rsyncd.service" diff --git a/extra/rsync/rsyncd b/extra/rsync/rsyncd deleted file mode 100644 index 27836d5c4..000000000 --- a/extra/rsync/rsyncd +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -[ -f /etc/conf.d/rsyncd ] && . /etc/conf.d/rsyncd - -case "$1" in - start) - stat_busy "Starting rsyncd" - [ ! -f /run/daemons/rsyncd ] && /usr/bin/rsync --daemon $RSYNCD_ARGS - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon rsyncd - stat_done - fi - ;; - stop) - stat_busy "Stopping rsyncd" - [ -f /run/rsyncd.pid ] && kill `cat /run/rsyncd.pid` - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon rsyncd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/extra/rsync/rsyncd.service b/extra/rsync/rsyncd.service index ea2e32c68..8502c08cf 100644 --- a/extra/rsync/rsyncd.service +++ b/extra/rsync/rsyncd.service @@ -2,8 +2,7 @@ Description=A file transfer program to keep remote files in sync [Service] -EnvironmentFile=-/etc/conf.d/rsyncd -ExecStart=/usr/bin/rsync --daemon --no-detach ${RSYNCD_ARGS} +ExecStart=/usr/bin/rsync --daemon --no-detach RestartSec=1 [Install] |