From mboxrd@z Thu Jan  1 00:00:00 1970
From: Matthias Fischer <matthias.fischer@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH 2/3] rsync: Update to 3.2.1
Date: Sun, 28 Jun 2020 09:36:32 +0200
Message-ID: <20200628073633.2368-2-matthias.fischer@ipfire.org>
In-Reply-To: <20200628073633.2368-1-matthias.fischer@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5754644241156385017=="
List-Id: <development.lists.ipfire.org>

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

For details see:
https://download.samba.org/pub/rsync/NEWS#3.2.1

Although 3.2.2 is in "release testing", I decided to push this release now to=
 get things running.

I activated zstd-support and added 'DEPS =3D zstd'.=20

Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
---
 lfs/rsync | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/lfs/rsync b/lfs/rsync
index 342de920b..46da6075b 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.1
=20
 THISAPP    =3D rsync-$(VER)
 DL_FILE    =3D $(THISAPP).tar.gz
@@ -32,9 +32,9 @@ 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
+DEPS       =3D zstd
=20
 ############################################################################=
###
 # Top-level Rules
@@ -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 d2d7f1c6b07a1434203a2a2406e0bddd
=20
 install : $(TARGET)
=20
@@ -77,11 +77,18 @@ $(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
+
+	# Replace shebang in rsync-ssl
+	cd $(DIR_APP) && sed -i -e "s@^#!.*@#!/bin/bash@" rsync-ssl
+
+	cd $(DIR_APP) && ./configure \
+	--prefix=3D/usr \
+	--without-included-popt \
+	--without-included-zlib \
+	--disable-xxhash
+
 	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


--===============5754644241156385017==--