guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

15/17: gnu: rsync: Use system zlib and popt libraries.


From: guix-commits
Subject: 15/17: gnu: rsync: Use system zlib and popt libraries.
Date: Fri, 20 Mar 2020 22:14:20 -0400 (EDT)

nckx pushed a commit to branch master
in repository guix.

commit acf2b20069b1f74b59185292d981024eea4d7055
Author: Tobias Geerinckx-Rice <address@hidden>
AuthorDate: Sat Mar 21 01:08:08 2020 +0100

    gnu: rsync: Use system zlib and popt libraries.
    
    Reduce our likelihood of contracting security bugs at the expense of
    compression ratio (in some cases) and compatibility with rsync≤3.1.1.
    
    rsync@3.1.2 was released in 2014.  Time to upgrade your CentOS box.
    
    * gnu/packages/rsync.scm (rsync)[inputs]: Add popt and zlib.
    [arguments]: Use them.
---
 gnu/packages/rsync.scm | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/rsync.scm b/gnu/packages/rsync.scm
index 74efae7..0d8217e 100644
--- a/gnu/packages/rsync.scm
+++ b/gnu/packages/rsync.scm
@@ -34,7 +34,6 @@
   #:use-module (guix build-system cmake)
   #:use-module (guix build-system gnu))
 
-
 (define-public rsync
   (package
    (name "rsync")
@@ -47,10 +46,17 @@
              (base32
               "1h0011dj6jgqpgribir4anljjv7bbrdcs8g91pbsmzf5zr75bk2m"))))
    (build-system gnu-build-system)
+   (arguments
+    `(#:configure-flags
+      ;; The bundled copies are preferred by default.
+      (list "--without-included-zlib"
+            "--without-included-popt")))
    (native-inputs
     `(("perl" ,perl)))
    (inputs
-    `(("acl" ,acl)))
+    `(("acl" ,acl)
+      ("popt" ,popt)
+      ("zlib" ,zlib)))
    (synopsis "Remote (and local) file copying tool")
    (description
     "Rsync is a fast and versatile file copying tool.  It can copy locally,



reply via email to

[Prev in Thread] Current Thread [Next in Thread]