From mboxrd@z Thu Jan  1 00:00:00 1970
From: Matthias Fischer <matthias.fischer@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH] rsync: Update to 3.2.0
Date: Sun, 21 Jun 2020 18:29:33 +0200
Message-ID: <20200621162933.20345-1-matthias.fischer@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4610243386851513378=="
List-Id: <development.lists.ipfire.org>

--===============4610243386851513378==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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(a)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(a)ipfire.org>                 =
    #
+# Copyright (C) 2007-2020  IPFire Team  <info(a)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 @@
=20
 include Config
=20
-VER        =3D 3.1.3
+VER        =3D 3.2.0
=20
 THISAPP    =3D rsync-$(VER)
 DL_FILE    =3D $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    =3D $(URL_IPFIRE)
 DIR_APP    =3D $(DIR_SRC)/$(THISAPP)
 TARGET     =3D $(DIR_INFO)/$(THISAPP)
 PROG       =3D rsync
-PAK_VER    =3D 11
+PAK_VER    =3D 12
=20
 DEPS       =3D
=20
@@ -44,7 +44,7 @@ objects =3D $(DL_FILE)
=20
 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE)
=20
-$(DL_FILE)_MD5 =3D 1581a588fde9d89f6bc6201e8129afaf
+$(DL_FILE)_MD5 =3D 768700bc8a555f5fdbc97dac8ebfbdd3
=20
 install : $(TARGET)
=20
@@ -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=3D/usr
+	cd $(DIR_APP) && ./configure \
+	--prefix=3D/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)
--=20
2.18.0


--===============4610243386851513378==--