summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClemens Gruber <clemens.gruber@pqgruber.com>2020-09-22 12:20:12 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2020-09-24 15:50:08 +0200
commit82c0ac9c5d25fcfa5a9cfbfdd753e4fe6eb47d23 (patch)
tree9c134f5aa1077e298e8def2d86c13ed36192784c
parentce5b6bc02fbcd63a3feac426b97374c90f93c45f (diff)
downloadptxdist-82c0ac9c5d25fcfa5a9cfbfdd753e4fe6eb47d23.tar.gz
ptxdist-82c0ac9c5d25fcfa5a9cfbfdd753e4fe6eb47d23.tar.xz
rsync3: version bump 3.0.5 -> 3.2.3
Fixes several security issues and other bugs. No longer use the bundled (outdated) zlib, instead depend on the ZLIB package in PTXdist and fix configure arguments. We also switch to the https URL. Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com> Message-Id: <20200922102013.84967-1-clemens.gruber@pqgruber.com> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--rules/rsync3.in1
-rw-r--r--rules/rsync3.make18
2 files changed, 15 insertions, 4 deletions
diff --git a/rules/rsync3.in b/rules/rsync3.in
index 3781f50ba..7dc03a52e 100644
--- a/rules/rsync3.in
+++ b/rules/rsync3.in
@@ -2,6 +2,7 @@
menuconfig RSYNC3
tristate
prompt "rsync v3 "
+ select ZLIB
select OPENSSH if RUNTIME
select OPENSSH_SSH
select ACL if RSYNC3_ACL
diff --git a/rules/rsync3.make b/rules/rsync3.make
index 69a33b4c6..a585f6265 100644
--- a/rules/rsync3.make
+++ b/rules/rsync3.make
@@ -14,11 +14,11 @@ PACKAGES-$(PTXCONF_RSYNC3) += rsync3
#
# Paths and names
#
-RSYNC3_VERSION := 3.0.5
-RSYNC3_MD5 := a130e736c011572cb423b6245e97fc4b
+RSYNC3_VERSION := 3.2.3
+RSYNC3_MD5 := 209f8326f5137d8817a6276d9577a2f1
RSYNC3 := rsync-$(RSYNC3_VERSION)
RSYNC3_SUFFIX := tar.gz
-RSYNC3_URL := http://rsync.samba.org/ftp/rsync/src/$(RSYNC3).$(RSYNC3_SUFFIX)
+RSYNC3_URL := https://download.samba.org/pub/rsync/src/$(RSYNC3).$(RSYNC3_SUFFIX)
RSYNC3_SOURCE := $(SRCDIR)/$(RSYNC3).$(RSYNC3_SUFFIX)
RSYNC3_DIR := $(BUILDDIR)/$(RSYNC3)
RSYNC3_LICENSE := GPL-3.0-only
@@ -34,13 +34,23 @@ RSYNC3_AUTOCONF := \
$(CROSS_AUTOCONF_USR) \
--disable-debug \
--disable-profile \
+ --disable-md2man \
+ --$(call ptx/endis, PTXCONF_ARCH_X86)-simd \
+ --$(call ptx/endis, PTXCONF_ARCH_X86)-asm \
$(GLOBAL_LARGE_FILE_OPTION) \
$(GLOBAL_IPV6_OPTION) \
--disable-locale \
+ --disable-openssl \
+ --disable-xxhash \
+ --disable-zstd \
+ --disable-lz4 \
+ --$(call ptx/endis, PTXCONF_ICONV)-iconv-open \
--$(call ptx/endis, PTXCONF_ICONV)-iconv \
--$(call ptx/endis, PTXCONF_RSYNC3_ACL)-acl-support \
--$(call ptx/endis, PTXCONF_RSYNC3_ATTR)-xattr-support \
- --with-included-popt
+ --with-included-popt \
+ --without-included-zlib \
+ --with-protected-args
# ----------------------------------------------------------------------------
# Target-Install