From ce8f38096421a49fbb87fbf470f95a66dfa9ad97 Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sun, 5 Feb 2012 16:05:38 +0000
Subject: [PATCH] rsync: merge r27238, r28906, r29526

SVN-Revision: 30254
---
 net/rsync/Makefile          | 6 +++---
 net/rsync/files/rsyncd.init | 9 ++++-----
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/net/rsync/Makefile b/net/rsync/Makefile
index 46670e576..650b6610b 100644
--- a/net/rsync/Makefile
+++ b/net/rsync/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=rsync
-PKG_VERSION:=3.0.8
-PKG_RELEASE:=3
+PKG_VERSION:=3.0.9
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://rsync.samba.org/ftp/rsync/src
-PKG_MD5SUM:=0ee8346ce16bdfe4c88a236e94c752b4
+PKG_MD5SUM:=5ee72266fe2c1822333c407e1761b92b
 
 PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=1
diff --git a/net/rsync/files/rsyncd.init b/net/rsync/files/rsyncd.init
index 741e09c34..fdbc01662 100644
--- a/net/rsync/files/rsyncd.init
+++ b/net/rsync/files/rsyncd.init
@@ -2,14 +2,13 @@
 # Copyright (C) 2011 OpenWrt.org
 
 START=50
-BIN=/usr/bin/rsync
-PID=/var/run/rsyncd.pid
-SSD=start-stop-daemon
+
+SERVICE_PID_FILE=/var/run/rsyncd.pid
 
 start() {
-	$SSD -p $PID -S -x $BIN -- --daemon
+	service_start /usr/bin/rsync --daemon
 }
 
 stop() {
-	$SSD -p $PID -K
+	service_stop /usr/bin/rsync
 }
-- 
2.30.2