From 42c1e7e80e09c087991ec86ca6aa7ff392198efe Mon Sep 17 00:00:00 2001
From: Leo Famulari <leo@famulari.name>
Date: Mon, 7 Dec 2020 23:44:40 -0500
Subject: [PATCH] gnu: rsync: Update to 3.2.3.

* gnu/packages/rsync.scm (rsync): Update to 3.2.3.
[arguments]: Disable optional lz4, openssl, and zstd support that was
added in 3.2.0. Use assembly MD5 implementation when appropriate.
[inputs]: Add xxhash.
* gnu/packages/commencement.scm (rsync-boot0)[arguments]: Disable
optional lz4, openssl, xxhash, and zstd support, and disable x86_64
assembly MD5 implementation.
---
 gnu/packages/commencement.scm |  8 +++++++-
 gnu/packages/rsync.scm        | 16 +++++++++++++---
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 632ee46cea..6ab1f95a24 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -2946,7 +2946,13 @@ exec " gcc "/bin/" program
     (native-inputs `(("perl" ,perl-boot0)))
     (inputs (%boot0-inputs))
     (arguments
-     `(#:implicit-inputs? #f
+     `(#:configure-flags
+       '("--disable-asm"
+         "--disable-lz4"
+         "--disable-openssl"
+         "--disable-xxhash"
+         "--disable-zstd")
+       #:implicit-inputs? #f
        #:guile ,%bootstrap-guile))))
 
 (define-syntax define/system-dependent
diff --git a/gnu/packages/rsync.scm b/gnu/packages/rsync.scm
index 214095aa61..f1bdb97f0b 100644
--- a/gnu/packages/rsync.scm
+++ b/gnu/packages/rsync.scm
@@ -25,6 +25,7 @@
   #:use-module (gnu packages acl)
   #:use-module (gnu packages base)
   #:use-module (gnu packages compression)
+  #:use-module (gnu packages digest)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages popt)
   #:use-module ((guix licenses) #:prefix license:)
@@ -37,25 +38,34 @@
 (define-public rsync
   (package
    (name "rsync")
-   (version "3.1.3")
+   (version "3.2.3")
    (source (origin
             (method url-fetch)
             (uri (string-append "https://rsync.samba.org/ftp/rsync/src/rsync-"
                                 version ".tar.gz"))
             (sha256
              (base32
-              "1h0011dj6jgqpgribir4anljjv7bbrdcs8g91pbsmzf5zr75bk2m"))))
+              "03p5dha9g9krq61mdbcrjkpz5nglri0009ks2vs9k97f9i83rk5y"))))
    (build-system gnu-build-system)
    (arguments
     `(#:configure-flags
       ;; The bundled copies are preferred by default.
       (list "--without-included-zlib"
-            "--without-included-popt")))
+            "--without-included-popt"
+            ;; Avoid these dependencies for now.
+            "--disable-lz4"
+            "--disable-openssl"
+            "--disable-zstd"
+            ,@(if (string-prefix? "x86_64" (or (%current-target-system)
+                                               (%current-system)))
+                  '()
+                  '("--disable-asm")))))
    (native-inputs
     `(("perl" ,perl)))
    (inputs
     `(("acl" ,acl)
       ("popt" ,popt)
+      ("xxhash" ,xxhash)
       ("zlib" ,zlib)))
    (synopsis "Remote (and local) file copying tool")
    (description
-- 
2.29.2