And I forgot:

Reviewed-by: Michael Tremer michael.tremer@ipfire.org

On 21 Jun 2020, at 22:25, Michael Tremer michael.tremer@ipfire.org wrote:

Hi,

Thanks for submitting this patch. It looks good.

I would like to ask you to package zstd. It should be part of the core distribution because it is now being used in many places and a really good balance between compression ratio and performance.

Would you be up for doing that?

We can merge this patch already and later remove —disable-zstd and release an update so that rsync can benefit from the library being available.

Best, -Michael

...

On 21 Jun 2020, at 17:29, Matthias Fischer matthias.fischer@ipfire.org wrote:

For details see: https://download.samba.org/pub/rsync/src/rsync-3.2.0-NEWS

In order to use the new xxhash checksum support and zstd compression, the corresponding kernel modules would need to be activated.

For now, I disabled both with these configure options:

... --disable-xxhash \ --disable-zstd ...

I also commented the new 'rsync-ssl' script: "The rsync-ssl script helps you to run an rsync copy to/from an rsync daemon that requires ssl connections."

Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org

config/rootfiles/packages/rsync | 2 ++ lfs/rsync | 17 +++++++++-------- 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/config/rootfiles/packages/rsync b/config/rootfiles/packages/rsync index 59c8be9f1..5de7fa9ae 100644 --- a/config/rootfiles/packages/rsync +++ b/config/rootfiles/packages/rsync @@ -1,3 +1,5 @@ usr/bin/rsync +#usr/bin/rsync-ssl +#usr/share/man/man1/rsync-ssl.1 #usr/share/man/man1/rsync.1 #usr/share/man/man5/rsyncd.conf.5 diff --git a/lfs/rsync b/lfs/rsync index 342de920b..be693d166 100644 --- a/lfs/rsync +++ b/lfs/rsync @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2020 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@

include Config

-VER = 3.1.3 +VER = 3.2.0

THISAPP = rsync-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = rsync -PAK_VER = 11 +PAK_VER = 12

DEPS =

@@ -44,7 +44,7 @@ objects = $(DL_FILE)

$(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = 1581a588fde9d89f6bc6201e8129afaf +$(DL_FILE)_MD5 = 768700bc8a555f5fdbc97dac8ebfbdd3

install : $(TARGET)

@@ -77,11 +77,12 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)

• cd $(DIR_APP) && ./configure --prefix=/usr

• cd $(DIR_APP) && ./configure \
• --prefix=/usr \
• --disable-xxhash \
• --disable-zstd
• cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)

• #cd $(DIR_APP)/doc && docbook2html rsync.sgml cd $(DIR_APP) && make install
• #cd $(DIR_APP) && install -v -m755 -d /usr/share/doc/rsync-$(VER) &&
• #cd $(DIR_APP) && install -v -m644 doc/*.html /usr/share/doc/rsync-$(VER) @rm -rf $(DIR_APP) @$(POSTBUILD)

-- 2.18.0