* [ptxdist] [PATCH 1/2] rsync3: version bump 3.0.5 -> 3.2.3
@ 2020-09-22 10:20 Clemens Gruber
2020-09-22 10:20 ` [ptxdist] [PATCH 2/2] rsync3: support zstd compression Clemens Gruber
2020-10-06 8:18 ` [ptxdist] [APPLIED] rsync3: version bump 3.0.5 -> 3.2.3 Michael Olbrich
0 siblings, 2 replies; 4+ messages in thread
From: Clemens Gruber @ 2020-09-22 10:20 UTC (permalink / raw)
To: ptxdist; +Cc: Clemens Gruber
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>
---
rules/rsync3.in | 1 +
rules/rsync3.make | 18 ++++++++++++++----
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
--
2.28.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 4+ messages in thread
* [ptxdist] [PATCH 2/2] rsync3: support zstd compression
2020-09-22 10:20 [ptxdist] [PATCH 1/2] rsync3: version bump 3.0.5 -> 3.2.3 Clemens Gruber
@ 2020-09-22 10:20 ` Clemens Gruber
2020-10-06 8:18 ` [ptxdist] [APPLIED] " Michael Olbrich
2020-10-06 8:18 ` [ptxdist] [APPLIED] rsync3: version bump 3.0.5 -> 3.2.3 Michael Olbrich
1 sibling, 1 reply; 4+ messages in thread
From: Clemens Gruber @ 2020-09-22 10:20 UTC (permalink / raw)
To: ptxdist; +Cc: Clemens Gruber
Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
rules/rsync3.in | 7 +++++++
rules/rsync3.make | 2 +-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/rules/rsync3.in b/rules/rsync3.in
index 7dc03a52e..0affd7661 100644
--- a/rules/rsync3.in
+++ b/rules/rsync3.in
@@ -7,6 +7,7 @@ menuconfig RSYNC3
select OPENSSH_SSH
select ACL if RSYNC3_ACL
select ATTR if RSYNC3_ATTR
+ select ZSTD if RSYNC3_ZSTD
help
rsync is a program that behaves in much the same way that rcp does,
but has many more options and uses the rsync remote-update protocol to
@@ -31,4 +32,10 @@ config RSYNC3_ATTR
prompt "enable extended attribute support"
help
--enable-xattr-support
+
+config RSYNC3_ZSTD
+ bool
+ prompt "enable zstd compression support"
+ help
+ --enable-zstd
endif
diff --git a/rules/rsync3.make b/rules/rsync3.make
index a585f6265..9c96dba76 100644
--- a/rules/rsync3.make
+++ b/rules/rsync3.make
@@ -42,7 +42,7 @@ RSYNC3_AUTOCONF := \
--disable-locale \
--disable-openssl \
--disable-xxhash \
- --disable-zstd \
+ --$(call ptx/endis, PTXCONF_ZSTD)-zstd \
--disable-lz4 \
--$(call ptx/endis, PTXCONF_ICONV)-iconv-open \
--$(call ptx/endis, PTXCONF_ICONV)-iconv \
--
2.28.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [ptxdist] [APPLIED] rsync3: version bump 3.0.5 -> 3.2.3
2020-09-22 10:20 [ptxdist] [PATCH 1/2] rsync3: version bump 3.0.5 -> 3.2.3 Clemens Gruber
2020-09-22 10:20 ` [ptxdist] [PATCH 2/2] rsync3: support zstd compression Clemens Gruber
@ 2020-10-06 8:18 ` Michael Olbrich
1 sibling, 0 replies; 4+ messages in thread
From: Michael Olbrich @ 2020-10-06 8:18 UTC (permalink / raw)
To: ptxdist; +Cc: Clemens Gruber
Thanks, applied as 82c0ac9c5d25fcfa5a9cfbfdd753e4fe6eb47d23.
Michael
[sent from post-receive hook]
On Tue, 06 Oct 2020 10:18:48 +0200, Clemens Gruber <clemens.gruber@pqgruber.com> wrote:
> 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>
>
> diff --git a/rules/rsync3.in b/rules/rsync3.in
> index 3781f50ba754..7dc03a52eb84 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 69a33b4c65fd..a585f6265a71 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
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [ptxdist] [APPLIED] rsync3: support zstd compression
2020-09-22 10:20 ` [ptxdist] [PATCH 2/2] rsync3: support zstd compression Clemens Gruber
@ 2020-10-06 8:18 ` Michael Olbrich
0 siblings, 0 replies; 4+ messages in thread
From: Michael Olbrich @ 2020-10-06 8:18 UTC (permalink / raw)
To: ptxdist; +Cc: Clemens Gruber
Thanks, applied as 8e2e6b628b535a8aec3eb14851d6521824e59442.
Michael
[sent from post-receive hook]
On Tue, 06 Oct 2020 10:18:49 +0200, Clemens Gruber <clemens.gruber@pqgruber.com> wrote:
> Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
> Message-Id: <20200922102013.84967-2-clemens.gruber@pqgruber.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/rsync3.in b/rules/rsync3.in
> index 7dc03a52eb84..0affd7661c89 100644
> --- a/rules/rsync3.in
> +++ b/rules/rsync3.in
> @@ -7,6 +7,7 @@ menuconfig RSYNC3
> select OPENSSH_SSH
> select ACL if RSYNC3_ACL
> select ATTR if RSYNC3_ATTR
> + select ZSTD if RSYNC3_ZSTD
> help
> rsync is a program that behaves in much the same way that rcp does,
> but has many more options and uses the rsync remote-update protocol to
> @@ -31,4 +32,10 @@ config RSYNC3_ATTR
> prompt "enable extended attribute support"
> help
> --enable-xattr-support
> +
> +config RSYNC3_ZSTD
> + bool
> + prompt "enable zstd compression support"
> + help
> + --enable-zstd
> endif
> diff --git a/rules/rsync3.make b/rules/rsync3.make
> index a585f6265a71..9c96dba766ba 100644
> --- a/rules/rsync3.make
> +++ b/rules/rsync3.make
> @@ -42,7 +42,7 @@ RSYNC3_AUTOCONF := \
> --disable-locale \
> --disable-openssl \
> --disable-xxhash \
> - --disable-zstd \
> + --$(call ptx/endis, PTXCONF_ZSTD)-zstd \
> --disable-lz4 \
> --$(call ptx/endis, PTXCONF_ICONV)-iconv-open \
> --$(call ptx/endis, PTXCONF_ICONV)-iconv \
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-10-06 8:18 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-22 10:20 [ptxdist] [PATCH 1/2] rsync3: version bump 3.0.5 -> 3.2.3 Clemens Gruber
2020-09-22 10:20 ` [ptxdist] [PATCH 2/2] rsync3: support zstd compression Clemens Gruber
2020-10-06 8:18 ` [ptxdist] [APPLIED] " Michael Olbrich
2020-10-06 8:18 ` [ptxdist] [APPLIED] rsync3: version bump 3.0.5 -> 3.2.3 Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox