From patchwork Sun Jun 28 07:36:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Fischer X-Patchwork-Id: 3220 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 49vj9n1gmcz3x5j for ; Sun, 28 Jun 2020 07:36:45 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 49vj9l3dgFz2JV; Sun, 28 Jun 2020 07:36:43 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 49vj9l1xTNz2yd9; Sun, 28 Jun 2020 07:36:43 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 49vj9j6g7rz2xGc for ; Sun, 28 Jun 2020 07:36:41 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 49vj9j0Ypkz1dh for ; Sun, 28 Jun 2020 07:36:41 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1593329801; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:in-reply-to:in-reply-to:references:references; bh=KkSeAciTvPr74LVUacUuitCaL17f6vBk4NWycCkPucc=; b=6CvA/hPF0dsK9ASPesGeV5D+HECQR3ZhKY7mqP5Xj5MF9bAdDV+GFzNtuf8+Z0b+qHHYfO W3jaLgzQ5ynfjGDw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1593329801; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:in-reply-to:in-reply-to:references:references; bh=KkSeAciTvPr74LVUacUuitCaL17f6vBk4NWycCkPucc=; b=hzOzqJFqL6GTm9K9V5S1eTZwwp0v6bREUBMcecGNDlY2rfhi8iwz0d+1oX8gEaaljkOCam Uh7BtNZgPL/xn/m37iYbLX8gr6GnRk31zJ6WKtJr4pe90dBKvKm63xMixhwF/HRIDtoHf8 XXn+NGXA1UmGMlNyn7NsQBbxLDeYVPD1hBtER7tqVB5Xu2bnXhHjyFsSVTVXm/iYFQnG9x NuLt5rmYP9OzARnr7Iquvr03QGUEvUmaRMWCEGxN3ZDEwXyVZrTwUUz1eK6tI5qa0wnrRn LkO6YGThhk4v0wyk75wNewttniM9EGnm4f9ga//IAnXmo2EVPKSYBUoE5x3aeA== From: Matthias Fischer 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> References: <20200628073633.2368-1-matthias.fischer@ipfire.org> Authentication-Results: mail01.ipfire.org; auth=pass smtp.mailfrom=matthias.fischer@ipfire.org X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" 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 Reviewed-by: Michael Tremer --- 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 # +# Copyright (C) 2007-2020 IPFire Team # # # # 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)