[arch-commits] Commit in rsync/trunk (5 files)

[Pierre Schmitz]

    Date: Thursday, June 7, 2012 @ 01:55:35
  Author: pierre
Revision: 160932

add systemd support; cleanup

Added:
  rsync/trunk/rsyncd.service
Modified:
  rsync/trunk/PKGBUILD
  rsync/trunk/rsyncd
  rsync/trunk/rsyncd.conf
Deleted:
  rsync/trunk/ChangeLog

----------------+
 ChangeLog      |   39 ---------------------------------------
 PKGBUILD       |   35 ++++++++++++++++-------------------
 rsyncd         |   10 ++--------
 rsyncd.conf    |   10 ++--------
 rsyncd.service |   10 ++++++++++
 5 files changed, 30 insertions(+), 74 deletions(-)

Deleted: ChangeLog
===================================================================
--- ChangeLog	2012-06-07 03:39:59 UTC (rev 160931)
+++ ChangeLog	2012-06-07 05:55:35 UTC (rev 160932)
@@ -1,39 +0,0 @@
-2011-05-17  Angel Velasquez <angvp at archlinux.org>
-    * rsync 3.0.8-2
-	* Added call_rsync func to rsyncd to support pass arguments to the daemon
-
-2010-01-01  Eric Belanger  <eric at archlinux.org>
-
-	* rsync 3.0.7-1
-	* Upstream update
-
-2009-05-08  Eric Belanger  <eric at archlinux.org>
-
-	* rsync 3.0.6-1
-	* Upstream update
-
-2008-12-29  Eric Belanger  <eric at archlinux.org>
-
-	* rsync 3.0.5-1
-	* Upstream update
-
-2008-09-06  Eric Belanger  <eric at archlinux.org>
-
-	* rsync 3.0.4-1
-	* Upstream update
-
-2008-07-05  Eric Belanger  <eric at archlinux.org>
-
-	* rsync 3.0.3-1
-	* Upstream update
-
-2008-04-13  Eric Belanger  <eric at archlinux.org>
-
-	* rsync 3.0.2-1
-	* Upstream update
-
-2008-03-01  Eric Belanger  <eric at archlinux.org>
-
-	* rsync 3.0.0-1
-	* Upstream update
-	* Updated license

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-06-07 03:39:59 UTC (rev 160931)
+++ PKGBUILD	2012-06-07 05:55:35 UTC (rev 160932)
@@ -1,42 +1,39 @@
 # $Id$
-# Maintainer: Angel Velasquez <angvp at archlinux.org> 
-# Contributor: Eric Belanger <eric at archlinux.org>
-# Contributor: Judd Vinet <jvinet at zeroflux.org>
-# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
+
 pkgname=rsync
 pkgver=3.0.9
-pkgrel=2
+pkgrel=3
 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=('acl')
+depends=('perl')
 backup=('etc/rsyncd.conf' 'etc/xinetd.d/rsync')
-changelog=ChangeLog
-source=(http://rsync.samba.org/ftp/rsync/$pkgname-$pkgver.tar.gz \
-        rsyncd.conf rsyncd rsync.xinetd)
+source=("http://rsync.samba.org/ftp/rsync/$pkgname-$pkgver.tar.gz"
+        'rsyncd.conf' 'rsyncd' 'rsync.xinetd' 'rsyncd.service')
 md5sums=('5ee72266fe2c1822333c407e1761b92b'
-         '4395c0591638349b1a7aeaaa4da1f03a'
-         '7a9ce3b5de97f3aae29b906f93e1d157'
-         'ea3e9277dc908bc51f9eddc0f6b935c1')
-sha1sums=('c64c8341984aea647506eb504496999fd968ddfc'
-          '48be09294134dfed888818872fe552a59c29147a'
-          'eda623c31d9def454cf8e3e88dcf63de4ca5c08b'
-          'fdb99785bc87ee13d77aa90dc1804f3f75dd7fc1')
+         'bce64d122a8e0f86872a4a21a03bc7f3'
+         'ba413da4ebca05c57860151fda21efbc'
+         'ea3e9277dc908bc51f9eddc0f6b935c1'
+         'ec96f9089d71109557cdcaa3f0633ed6')
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
-	./prepare-source
-	./configure --prefix=/usr --with-included-popt \
-              --enable-acl-support --enable-xattr-support
+	./configure --prefix=/usr --with-included-popt
 	make
 }
 
+check() {
+	cd "$srcdir/$pkgname-$pkgver"
+	make test
+}
+
 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 -Dm755 support/rrsync "$pkgdir/usr/lib/rsync/rrsync"
 }

Modified: rsyncd
===================================================================
--- rsyncd	2012-06-07 03:39:59 UTC (rev 160931)
+++ rsyncd	2012-06-07 05:55:35 UTC (rev 160932)
@@ -5,26 +5,20 @@
 
 [ -f /etc/conf.d/rsyncd ] && . /etc/conf.d/rsyncd
 
-function call_rsyncd() {
-	/usr/bin/rsync --daemon $RSYNCD_ARGS
-}
-
 case "$1" in
   start)
     stat_busy "Starting rsyncd"
-    [ ! -f /var/run/daemons/rsyncd ] && call_rsyncd
+    [ ! -f /run/daemons/rsyncd ] && /usr/bin/rsync --daemon $RSYNCD_ARGS
     if [ $? -gt 0 ]; then
       stat_fail
     else
-      #pgrep -of "/usr/bin/rsync --daemon" > /var/run/rsyncd.pid # Removed FS#20942
       add_daemon rsyncd
       stat_done
     fi
     ;;
-
   stop)
     stat_busy "Stopping rsyncd"
-    [ -f /var/run/rsyncd.pid ] && kill `cat /var/run/rsyncd.pid`
+    [ -f /run/rsyncd.pid ] && kill `cat /run/rsyncd.pid`
     if [ $? -gt 0 ]; then
       stat_fail
     else

Modified: rsyncd.conf
===================================================================
--- rsyncd.conf	2012-06-07 03:39:59 UTC (rev 160931)
+++ rsyncd.conf	2012-06-07 05:55:35 UTC (rev 160932)
@@ -3,14 +3,8 @@
 use chroot = no
 max connections = 4
 syslog facility = local5
-pid file = /var/run/rsyncd.pid
+pid file = /run/rsyncd.pid
 
 [ftp]
-        path = /home/ftp
+        path = /srv/ftp
         comment = ftp area
-
-#[cvs]
-#        path = /data/cvs
-#        comment = CVS repository (requires authentication)
-#        auth users = tridge, susan
-#        secrets file = /etc/rsyncd.secrets

Added: rsyncd.service
===================================================================
--- rsyncd.service	                        (rev 0)
+++ rsyncd.service	2012-06-07 05:55:35 UTC (rev 160932)
@@ -0,0 +1,10 @@
+[Unit]
+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}
+RestartSec=1
+
+[Install]
+WantedBy=multi-user.target