Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community-staging/kid3/kid3.install
	community/cherokee/PKGBUILD
	community/supercollider/supercollider.install
	core/libusb/PKGBUILD
	core/systemd/PKGBUILD
	core/udev/PKGBUILD
	extra/gimp-devel/PKGBUILD
	extra/maxima/PKGBUILD
	libre/kdenetwork-kopete-libre/PKGBUILD
	staging/kdebase-workspace/kdm
	staging/kdebindings-perlkde/PKGBUILD
	staging/kdebindings-perlqt/PKGBUILD
	staging/kdemultimedia/PKGBUILD
	staging/kdenetwork/PKGBUILD
	staging/kdeplasma-addons/kdeplasma-addons-applets.install

5 files changed, 31 insertions, 75 deletions

diff --git a/extra/rsync/ChangeLog b/extra/rsync/ChangeLog
deleted file mode 100644
index d07e4ad5a..000000000
--- a/extra/rsync/ChangeLog
+++ /dev/null
@@ -1,39 +0,0 @@
-2011-05-17  Angel Velasquez <angvp@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@archlinux.org>
-
-	* rsync 3.0.7-1
-	* Upstream update
-
-2009-05-08  Eric Belanger  <eric@archlinux.org>
-
-	* rsync 3.0.6-1
-	* Upstream update
-
-2008-12-29  Eric Belanger  <eric@archlinux.org>
-
-	* rsync 3.0.5-1
-	* Upstream update
-
-2008-09-06  Eric Belanger  <eric@archlinux.org>
-
-	* rsync 3.0.4-1
-	* Upstream update
-
-2008-07-05  Eric Belanger  <eric@archlinux.org>
-
-	* rsync 3.0.3-1
-	* Upstream update
-
-2008-04-13  Eric Belanger  <eric@archlinux.org>
-
-	* rsync 3.0.2-1
-	* Upstream update
-
-2008-03-01  Eric Belanger  <eric@archlinux.org>
-
-	* rsync 3.0.0-1
-	* Upstream update
-	* Updated license
diff --git a/extra/rsync/PKGBUILD b/extra/rsync/PKGBUILD
index 685558262..dbe19cdb7 100644
--- a/extra/rsync/PKGBUILD
+++ b/extra/rsync/PKGBUILD
@@ -1,42 +1,39 @@
-# $Id: PKGBUILD 149915 2012-02-11 20:09:00Z ibiru $
-# Maintainer: Angel Velasquez <angvp@archlinux.org> 
-# Contributor: Eric Belanger <eric@archlinux.org>
-# Contributor: Judd Vinet <jvinet@zeroflux.org>
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
+# $Id: PKGBUILD 160933 2012-06-07 05:56:33Z pierre $
+
 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' 'mips64el')
 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"
 }
diff --git a/extra/rsync/rsyncd b/extra/rsync/rsyncd
index d7a772e8e..27836d5c4 100644
--- a/extra/rsync/rsyncd
+++ b/extra/rsync/rsyncd
@@ -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
diff --git a/extra/rsync/rsyncd.conf b/extra/rsync/rsyncd.conf
index f7161f3f8..152106091 100644
--- a/extra/rsync/rsyncd.conf
+++ b/extra/rsync/rsyncd.conf
@@ -3,14 +3,8 @@ gid = nobody
 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
diff --git a/extra/rsync/rsyncd.service b/extra/rsync/rsyncd.service
new file mode 100644
index 000000000..ea2e32c68
--- /dev/null
+++ b/extra/rsync/rsyncd.service
@@ -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