Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #13562 from antonlacon/rsync-options

Browse source 
rsync: disable option for bundled zlib, add option for zstd
This commit is contained in:
Rosen Penev 2020-10-04 02:56:23 -07:00 committed by GitHub
commit 0d157b2543
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
net/rsync/Config.in
View file

@ -12,16 +12,9 @@ if PACKAGE_rsync
default y if USE_FS_ACL_ATTR default y if USE_FS_ACL_ATTR
default n default n
config RSYNC_zlib config RSYNC_zstd
bool bool
prompt "Enable system zlib" prompt "Enable zstd stream compression"
help default n
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 endif

8
net/rsync/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=rsync PKG_NAME:=rsync
PKG_VERSION:=3.2.3 PKG_VERSION:=3.2.3
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://download.samba.org/pub/rsync/src PKG_SOURCE_URL:=https://download.samba.org/pub/rsync/src
@ -30,7 +30,7 @@ define Package/rsync
CATEGORY:=Network CATEGORY:=Network
SUBMENU:=File Transfer SUBMENU:=File Transfer
TITLE:=Fast remote file copy program (like rcp) TITLE:=Fast remote file copy program (like rcp)
DEPENDS:=+libpopt +RSYNC_xattr:libattr +RSYNC_acl:libacl +RSYNC_zlib:zlib DEPENDS:=+libpopt +zlib +RSYNC_xattr:libattr +RSYNC_acl:libacl +RSYNC_zstd:libzstd
URL:=https://rsync.samba.org/ URL:=https://rsync.samba.org/
MENU:=1 MENU:=1
endef endef
@ -43,6 +43,7 @@ TARGET_CFLAGS += $(if $(CONFIG_IPV6),-DINET6,)
CONFIGURE_ARGS += \ CONFIGURE_ARGS += \
--without-included-popt \ --without-included-popt \
--without-included-zlib \
--disable-debug \ --disable-debug \
--disable-asm \ --disable-asm \
--disable-iconv \ --disable-iconv \
@ -53,10 +54,9 @@ CONFIGURE_ARGS += \
--disable-openssl \ --disable-openssl \
--disable-simd \ --disable-simd \
--disable-xxhash \ --disable-xxhash \
--disable-zstd \ --$(if $(CONFIG_RSYNC_zstd),en,dis)able-zstd \
--$(if $(CONFIG_RSYNC_xattr),en,dis)able-xattr-support \ --$(if $(CONFIG_RSYNC_xattr),en,dis)able-xattr-support \
--$(if $(CONFIG_RSYNC_acl),en,dis)able-acl-support \ --$(if $(CONFIG_RSYNC_acl),en,dis)able-acl-support \
--with$(if $(CONFIG_RSYNC_zlib),,out)-included-zlib \
$(if $(CONFIG_IPV6),,--disable-ipv6) $(if $(CONFIG_IPV6),,--disable-ipv6)
define Package/rsyncd define Package/rsyncd