From patchwork Sun Jun 21 16:29:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Fischer X-Patchwork-Id: 3215 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) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 49qdL63jvyz3wbg for ; Sun, 21 Jun 2020 16:29:50 +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) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 49qdL06QShz1X4; Sun, 21 Jun 2020 16:29:44 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 49qdL02qQtz2yN1; Sun, 21 Jun 2020 16:29:44 +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) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 49qdKy5W2Jz2xSc for ; Sun, 21 Jun 2020 16:29:42 +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 49qdKx5RvNzXh for ; Sun, 21 Jun 2020 16:29:39 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1592756981; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=RwGo4CM7vG5oZHKWb8ompsYFISBC05dzFuvO0MCJXxQ=; b=fj7WkkupD0keWqf9Rv7FSDDr3hzA5hBbW/69Y884ywBKAqnaWprDIlhldnH4xWyxdt/ePg jG1nNp5du43JRJAA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1592756981; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=RwGo4CM7vG5oZHKWb8ompsYFISBC05dzFuvO0MCJXxQ=; b=FdXUEMSMbPnETLXwzWjXCMVWfluPQral907l/bJj3atmg7dcUyHoD4+P5SZzKQbnnx7dC5 GX6/VUvR9mvsrW5tUoRXIqnpsBtaTT74giu+V9CqNaLMuVLHgf2JV45U4U5OFKHccpALId sG7acjMObho6jQJfJay4wx0xiEZfnUzspO/tYmjmvCUluq4hXJH1hqFd2VY91J+Wfy5Yp5 MPc1RdtlriFSo+uNJrWrA1k7jsxqChF0D2qApR9YSDx+tXDjNudYnlN30NmV0kHvFocxsT 87hQ3rptjLD9isiAnSZ3+eHbFv+eZ459zJiqirIv4ouzDyBwkVbCpXP3M5thuA== From: Matthias Fischer 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> 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/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 Reviewed-by: Michael Tremer --- 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 # +# 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.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)