summaryrefslogtreecommitdiff
path: root/extra/rsync
diff options
context:
space:
mode:
authorNicolas Reynolds <fauno@kiwwwi.com.ar>2011-05-28 02:44:47 -0300
committerNicolas Reynolds <fauno@kiwwwi.com.ar>2011-05-28 02:44:47 -0300
commitc3b94090a6330f678ade2f767e76ab7802d3463e (patch)
treee3d2321dce46bfdbc070fcee19e2852566510fe8 /extra/rsync
parent652c41cc5fd8dc5f23ef6a6c93f488911e1054c7 (diff)
parent33feb015eb09eee76827f359e685fce981d88111 (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community/chmsee/PKGBUILD community/flumotion/PKGBUILD community/gnash/PKGBUILD community/kadu/PKGBUILD community/mythplugins/PKGBUILD community/performous/PKGBUILD community/sleuthkit/PKGBUILD community/virtualbox/PKGBUILD community/wbar/PKGBUILD core/attr/PKGBUILD core/binutils/PKGBUILD core/heimdal/PKGBUILD core/sqlite3/PKGBUILD extra/acpid/PKGBUILD extra/apache-ant/PKGBUILD extra/aria2/PKGBUILD extra/boost/PKGBUILD extra/bs/PKGBUILD extra/bzr/PKGBUILD extra/cvsps/PKGBUILD extra/dosbox/PKGBUILD extra/ettercap-gtk/PKGBUILD extra/fetchmail/PKGBUILD extra/gnome-desktop-sharp/PKGBUILD extra/gnome-panel/PKGBUILD extra/gptfdisk/PKGBUILD extra/gqmpeg/PKGBUILD extra/gstreamer0.10-base/PKGBUILD extra/gstreamer0.10-ugly/PKGBUILD extra/gtk-theme-switch2/PKGBUILD extra/icecast/PKGBUILD extra/kdeedu/PKGBUILD extra/kmldonkey/PKGBUILD extra/kmplayer/PKGBUILD extra/libbtctl/PKGBUILD extra/libftdi/PKGBUILD extra/liborigin2/PKGBUILD extra/libpst/PKGBUILD extra/libx86/PKGBUILD extra/lsdvd/PKGBUILD extra/mc/PKGBUILD extra/monotone/PKGBUILD extra/multitail/PKGBUILD extra/nbsmtp/PKGBUILD extra/nickle/PKGBUILD extra/nppangband/PKGBUILD extra/numlockx/PKGBUILD extra/pidgin/PKGBUILD extra/poppler/PKGBUILD extra/python-gtkglext/PKGBUILD extra/scim/PKGBUILD extra/socat/PKGBUILD extra/speedcrunch/PKGBUILD extra/transmission/PKGBUILD extra/vbetool/PKGBUILD extra/vlc/PKGBUILD extra/xchat-gnome/xchat-gnome.install libre/kernel26-libre/PKGBUILD libre/pacman/PKGBUILD libre/xchat-gnome-libre/PKGBUILD libre/xchat-gnome-libre/gtk2-2.20.patch libre/xchat-gnome-libre/xchat-gnome-0.26.1-deprecated-symbol.patch libre/xchat-gnome-libre/xchat-gnome.install multilib/nspluginwrapper/PKGBUILD testing/libgweather/libgweather.install testing/mesa/PKGBUILD
Diffstat (limited to 'extra/rsync')
-rw-r--r--extra/rsync/ChangeLog4
-rw-r--r--extra/rsync/PKGBUILD9
-rw-r--r--extra/rsync/rsyncd8
3 files changed, 16 insertions, 5 deletions
diff --git a/extra/rsync/ChangeLog b/extra/rsync/ChangeLog
index a1d6b4f9d..d07e4ad5a 100644
--- a/extra/rsync/ChangeLog
+++ b/extra/rsync/ChangeLog
@@ -1,3 +1,7 @@
+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
diff --git a/extra/rsync/PKGBUILD b/extra/rsync/PKGBUILD
index 27f09a91d..a43d1440f 100644
--- a/extra/rsync/PKGBUILD
+++ b/extra/rsync/PKGBUILD
@@ -1,26 +1,27 @@
-# $Id: PKGBUILD 118437 2011-04-06 20:17:24Z angvp $
+# $Id: PKGBUILD 124256 2011-05-18 05:08:59Z angvp $
# 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>
pkgname=rsync
pkgver=3.0.8
-pkgrel=1
+pkgrel=2
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')
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)
md5sums=('0ee8346ce16bdfe4c88a236e94c752b4'
'4395c0591638349b1a7aeaaa4da1f03a'
- '3d8f90ac8467ff6af28754584a61fd11'
+ '7a9ce3b5de97f3aae29b906f93e1d157'
'ea3e9277dc908bc51f9eddc0f6b935c1')
sha1sums=('10e80173c7e9ed8b8a4dc9e8fdab08402da5f08d'
'48be09294134dfed888818872fe552a59c29147a'
- '357af5648eb4ecf84cc6b1de1cd79d21eca3a518'
+ 'eda623c31d9def454cf8e3e88dcf63de4ca5c08b'
'fdb99785bc87ee13d77aa90dc1804f3f75dd7fc1')
build() {
diff --git a/extra/rsync/rsyncd b/extra/rsync/rsyncd
index 573130fb3..d7a772e8e 100644
--- a/extra/rsync/rsyncd
+++ b/extra/rsync/rsyncd
@@ -3,10 +3,16 @@
. /etc/rc.conf
. /etc/rc.d/functions
+[ -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 ] && /usr/bin/rsync --daemon
+ [ ! -f /var/run/daemons/rsyncd ] && call_rsyncd
if [ $? -gt 0 ]; then
stat_fail
else