commit a256d99be8ca088d38c33b1b87775c142f934f3e
parent 7d49d4cf44a5cb1dbd47572b150a7658f1148a08
Author: champtar <champetier.etienne@gmail.com>
Date: Sat, 6 Sep 2014 11:34:54 +0200
Merge pull request #275 from antonlacon/rsync-zlib
rsync: optionally enable builtin zlib and add logfile to rsyncd
Diffstat:
3 files changed, 26 insertions(+), 7 deletions(-)
diff --git a/net/rsync/Config.in b/net/rsync/Config.in
@@ -9,4 +9,17 @@ if PACKAGE_rsync
bool
prompt "Enable ACL support"
default n
+
+ config RSYNC_zlib
+ bool
+ prompt "Enable system zlib"
+ help
+ Use the system's zlib library instead of rsync's internal copy. Enabling
+ this may create compatibility errors when using compression with older
+ clients, or those using the current default of the bundled zlib.
+
+ rsync's upstream default is to use their bundled zlib. OpenWrt uses the
+ system zlib for space reasons. The system zlib will eventually become
+ default for upstream as well.
+ default y
endif
diff --git a/net/rsync/Makefile b/net/rsync/Makefile
@@ -29,7 +29,7 @@ define Package/rsync
CATEGORY:=Network
SUBMENU:=File Transfer
TITLE:=Fast remote file copy program (like rcp)
- DEPENDS:=+libpopt +zlib +RSYNC_xattr:libattr +RSYNC_acl:libacl
+ DEPENDS:=+libpopt +RSYNC_xattr:libattr +RSYNC_acl:libacl +RSYNC_zlib:zlib
URL:=http://rsync.samba.org/
MENU:=1
endef
@@ -38,6 +38,11 @@ define Package/rsync/config
source "$(SOURCE)/Config.in"
endef
+CONFIGURE_ARGS += \
+ --with-included-popt=no \
+ --disable-debug \
+ --disable-locale \
+
ifeq ($(CONFIG_RSYNC_xattr),y)
CONFIGURE_ARGS+= --enable-xattr-support
else
@@ -50,6 +55,12 @@ else
CONFIGURE_ARGS+= --disable-acl-support
endif
+ifeq ($(CONFIG_RSYNC_zlib),y)
+ CONFIGURE_ARGS+= --with-included-zlib=no
+else
+ CONFIGURE_ARGS+= --with-included-zlib=yes
+endif
+
define Package/rsyncd
SECTION:=net
CATEGORY:=Network
@@ -69,12 +80,6 @@ define Package/rsync/description
between two sets of files across the network link.
endef
-CONFIGURE_ARGS += \
- --with-included-popt=no \
- --with-included-zlib=no \
- --disable-debug \
- --disable-locale \
-
define Package/rsync/install
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/$(PKG_NAME) $(1)/usr/bin/
diff --git a/net/rsync/files/rsyncd.conf b/net/rsync/files/rsyncd.conf
@@ -3,6 +3,7 @@
# Next line required for init script
pid file = /var/run/rsyncd.pid
+log file = /var/log/rsyncd.log
use chroot = yes
uid = nobody
gid = nogroup
