rsync: Update to 3.2.1

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 = zstd'.

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/lfs/rsync b/lfs/rsync
index 342de920b8a9e0812dbe75b5317fbb1e5e225973..46da6075b1dd3aca8780658a2bed6a2f7adb04ca 100644 (file)
--- 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.1
 
 THISAPP    = rsync-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,9 +32,9 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = rsync
-PAK_VER    = 11
+PAK_VER    = 12
 
-DEPS       =
+DEPS       = zstd
 
 ###############################################################################
 # Top-level Rules
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 1581a588fde9d89f6bc6201e8129afaf
+$(DL_FILE)_MD5 = d2d7f1c6b07a1434203a2a2406e0bddd
 
 install : $(TARGET)
 
@@ -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=/usr
+
+       # Replace shebang in rsync-ssl
+       cd $(DIR_APP) && sed -i -e "s@^#!.*@#!/bin/bash@" rsync-ssl
+
+       cd $(DIR_APP) && ./configure \
+       --prefix=/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)