diff options
| -rw-r--r-- | abs/extra/rsync/PKGBUILD | 28 | ||||
| -rw-r--r-- | abs/extra/rsync/rsyncd | 37 | ||||
| -rw-r--r-- | abs/extra/rsync/rsyncd.service | 3 | ||||
| -rw-r--r-- | abs/extra/rsync/rsyncd.socket | 10 | ||||
| -rw-r--r-- | abs/extra/rsync/rsyncd@.service | 11 |
5 files changed, 40 insertions, 49 deletions
diff --git a/abs/extra/rsync/PKGBUILD b/abs/extra/rsync/PKGBUILD index 1224537..ab83127 100644 --- a/abs/extra/rsync/PKGBUILD +++ b/abs/extra/rsync/PKGBUILD @@ -1,25 +1,32 @@ -# $Id: PKGBUILD 160933 2012-06-07 05:56:33Z pierre $ +# $Id$ pkgname=rsync -pkgver=3.0.9 -pkgrel=3 +pkgver=3.1.0 +pkgrel=1 pkgdesc="A file transfer program to keep remote files in sync" arch=('i686' 'x86_64') url="http://samba.anu.edu.au/rsync/" license=('GPL3') -depends=('perl') +depends=('perl' 'popt') 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') -md5sums=('5ee72266fe2c1822333c407e1761b92b' + "http://rsync.samba.org/ftp/rsync/$pkgname-$pkgver.tar.gz.asc" + 'rsyncd.conf' 'rsync.xinetd' 'rsyncd.service' + 'rsyncd.socket' 'rsyncd@.service') +md5sums=('3be148772a33224771a8d4d2a028b132' + 'SKIP' 'bce64d122a8e0f86872a4a21a03bc7f3' - 'ba413da4ebca05c57860151fda21efbc' 'ea3e9277dc908bc51f9eddc0f6b935c1' - 'ec96f9089d71109557cdcaa3f0633ed6') + '084140868d38cf3e937a2db716d47c0f' + 'ae4c381e0c02d6132c7f6ded3f473041' + '53f94e613e0bc502d38dd61bd2cd7636') build() { cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr --with-included-popt + ./configure --prefix=/usr \ + --with-included-popt=no \ + --with-included-zlib=no \ + --disable-debug make } @@ -31,9 +38,10 @@ 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" + install -m644 ../rsyncd.socket "$pkgdir/usr/lib/systemd/system/rsyncd.socket" + install -m644 ../rsyncd@.service "$pkgdir/usr/lib/systemd/system/rsyncd@.service" install -Dm755 support/rrsync "$pkgdir/usr/lib/rsync/rrsync" } diff --git a/abs/extra/rsync/rsyncd b/abs/extra/rsync/rsyncd deleted file mode 100644 index 27836d5..0000000 --- a/abs/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/abs/extra/rsync/rsyncd.service b/abs/extra/rsync/rsyncd.service index ea2e32c..8502c08 100644 --- a/abs/extra/rsync/rsyncd.service +++ b/abs/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] diff --git a/abs/extra/rsync/rsyncd.socket b/abs/extra/rsync/rsyncd.socket new file mode 100644 index 0000000..2b9a964 --- /dev/null +++ b/abs/extra/rsync/rsyncd.socket @@ -0,0 +1,10 @@ +[Unit] +Description=Rsync Socket +Conflicts=rsyncd.service + +[Socket] +ListenStream=873 +Accept=true + +[Install] +WantedBy=sockets.target diff --git a/abs/extra/rsync/rsyncd@.service b/abs/extra/rsync/rsyncd@.service new file mode 100644 index 0000000..33db95c --- /dev/null +++ b/abs/extra/rsync/rsyncd@.service @@ -0,0 +1,11 @@ +[Unit] +Description=A file transfer program to keep remote files in sync +After=network.target + +[Service] +ExecStart=-/usr/bin/rsync --daemon +StandardInput=socket +StandardOutput=inherit +StandardError=journal +User=nobody +Group=nobody |