[arch-commits] Commit in rsync/trunk (PKGBUILD rsyncd)

[Angel Velásquez]

    Date: Friday, January 28, 2011 @ 00:41:54
  Author: angvp
Revision: 107956

upgpkg: rsync 3.0.7-2
Fixing FS#20942

Modified:
  rsync/trunk/PKGBUILD
  rsync/trunk/rsyncd

----------+
 PKGBUILD |   33 +++++++++++++++++++--------------
 rsyncd   |    2 +-
 2 files changed, 20 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-01-28 03:54:23 UTC (rev 107955)
+++ PKGBUILD	2011-01-28 05:41:54 UTC (rev 107956)
@@ -1,11 +1,11 @@
 # $Id$
+# Maintainer: Angel Velasquez <angvp at archlinux.org> 
 # Contributor: Eric Belanger <eric at archlinux.org>
 # Contributor: Judd Vinet <jvinet at zeroflux.org>
-# Maintainer: Daniel J Griffiths <ghost1227 at archlinux.us>
-
+# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
 pkgname=rsync
 pkgver=3.0.7
-pkgrel=1
+pkgrel=2
 pkgdesc="A file transfer program to keep remote files in sync"
 arch=('i686' 'x86_64')
 url="http://samba.anu.edu.au/rsync/"
@@ -14,23 +14,28 @@
 backup=('etc/rsyncd.conf' 'etc/xinetd.d/rsync')
 source=(http://rsync.samba.org/ftp/rsync/${pkgname}-${pkgver}.tar.gz \
         rsyncd.conf rsyncd rsync.xinetd)
-md5sums=('b53525900817cf1ba7ad3a516ab5bfe9' '4395c0591638349b1a7aeaaa4da1f03a'\
-         '9de4d03d49f4b5c73ffd67d452716a49' 'ea3e9277dc908bc51f9eddc0f6b935c1')
-sha1sums=('63426a1bc71991d93159cd522521fbacdafb7a61' '48be09294134dfed888818872fe552a59c29147a'\
-         'ebec275bbd0c11692c91dc59368349601bd9eaf4' 'fdb99785bc87ee13d77aa90dc1804f3f75dd7fc1')
+md5sums=('b53525900817cf1ba7ad3a516ab5bfe9'
+         '4395c0591638349b1a7aeaaa4da1f03a'
+         '3d8f90ac8467ff6af28754584a61fd11'
+         'ea3e9277dc908bc51f9eddc0f6b935c1')
+sha1sums=('63426a1bc71991d93159cd522521fbacdafb7a61'
+          '48be09294134dfed888818872fe552a59c29147a'
+          '357af5648eb4ecf84cc6b1de1cd79d21eca3a518'
+          'fdb99785bc87ee13d77aa90dc1804f3f75dd7fc1')
 
 build() {
 	cd ${srcdir}/${pkgname}-${pkgver}
-	./prepare-source || return 1
+	./prepare-source 
 	./configure --prefix=/usr --with-included-popt \
-              --enable-acl-support --enable-xattr-support || return 1
-	make || return 1
+              --enable-acl-support --enable-xattr-support 
+	make 
 }
 
 package() {
 	cd ${srcdir}/${pkgname}-${pkgver}
-	make DESTDIR=${pkgdir} install || return 1
-	install -Dm755 ../rsyncd ${pkgdir}/etc/rc.d/rsyncd || return 1
-	install -Dm644 ../rsyncd.conf ${pkgdir}/etc/rsyncd.conf || return 1
-	install -Dm644 ../rsync.xinetd ${pkgdir}/etc/xinetd.d/rsync || return 1
+	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 
 }
+

Modified: rsyncd
===================================================================
--- rsyncd	2011-01-28 03:54:23 UTC (rev 107955)
+++ rsyncd	2011-01-28 05:41:54 UTC (rev 107956)
@@ -10,7 +10,7 @@
     if [ $? -gt 0 ]; then
       stat_fail
     else
-      pgrep -of "/usr/bin/rsync --daemon" > /var/run/rsyncd.pid
+      #pgrep -of "/usr/bin/rsync --daemon" > /var/run/rsyncd.pid # Removed FS#20942
       add_daemon rsyncd
       stat_done
     fi