X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=net%2Frsync%2FMakefile;h=f66c694f144b92409e4d90eb82c383148bc4d82b;hp=8035f7c9d841340b603722bd3372e6dc2049c182;hb=0a29dac51b870034c5839044ea38f0a6f2849a14;hpb=27846ad723bc3d6ccc555a64d6be62c37648f995

diff --git a/net/rsync/Makefile b/net/rsync/Makefile
index 8035f7c9d8..f66c694f14 100644
--- a/net/rsync/Makefile
+++ b/net/rsync/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2007-2010 OpenWrt.org
+# Copyright (C) 2007-2014 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=rsync
-PKG_VERSION:=3.0.8
-PKG_RELEASE:=1
+PKG_VERSION:=3.1.0
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://rsync.samba.org/ftp/rsync/src
-PKG_MD5SUM:=0ee8346ce16bdfe4c88a236e94c752b4
+PKG_MD5SUM:=3be148772a33224771a8d4d2a028b132
 
 PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=1
@@ -25,24 +25,32 @@ define Package/rsync
   CATEGORY:=Network
   SUBMENU:=File Transfer
   TITLE:=Fast remote file copy program (like rcp)
-  DEPENDS:=+libpopt
+  DEPENDS:=+libpopt +zlib
+  URL:=http://rsync.samba.org/
+endef
+
+define Package/rsyncd
+  SECTION:=net
+  CATEGORY:=Network
+  SUBMENU:=File Transfer
+  TITLE:=Rsync daemon
+  DEPENDS:=+rsync
   URL:=http://rsync.samba.org/
 endef
 
 define Package/rsync/description
-	rsync is a program that allows files to be copied to
-	and from remote machines in much the same way as rcp.
-	It has many more options than rcp, and uses the rsync
-	remote-update protocol to greatly speed up file
-	transfers when the destination file already exists.
-
-	The rsync remote-update protocol allows rsync to
-	transfer just the differences between two sets of files
-	across the network link.
+ rsync is a program that allows files to be copied to and from remote machines
+ in much the same way as rcp. It has many more options than rcp, and uses the
+ rsync remote-update protocol to greatly speed up file transfers when the
+ destination file already exists.
+
+ The rsync remote-update protocol allows rsync to transfer just the differences
+ between two sets of files across the network link.
 endef
 
 CONFIGURE_ARGS += \
 	--with-included-popt=no \
+	--with-included-zlib=no \
 	--disable-debug \
 	--disable-locale \
 	--disable-xattr-support \
@@ -53,4 +61,21 @@ define Package/rsync/install
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/$(PKG_NAME) $(1)/usr/bin/
 endef
 
+define Package/rsyncd/description
+ rsyncd is a configuration file and initscript to utilize rsync as a daemon. It
+ uses the same binary as rsync.
+endef
+
+define Package/rsyncd/conffiles
+/etc/rsyncd.conf
+endef
+
+define Package/rsyncd/install
+	$(INSTALL_DIR) $(1)/etc
+	$(INSTALL_DATA) ./files/rsyncd.conf $(1)/etc/
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/rsyncd.init $(1)/etc/init.d/rsyncd
+endef
+
 $(eval $(call BuildPackage,rsync))
+$(eval $(call BuildPackage,rsyncd))