From: Leo Famulari <leo@famulari.name>
To: 30448@debbugs.gnu.org
Subject: [bug#30448] [PATCH] gnu: librsync: Update to 2.0.2.
Date: Wed, 13 Feb 2019 16:26:45 -0500 [thread overview]
Message-ID: <9841ea716f575c21b5eeed136fd6af8aa81e7c98.1550093203.git.leo@famulari.name> (raw)
In-Reply-To: <20180213190113.GA22610@jasmine.lan>
* gnu/packages/rsync.scm (librsync): Update to 2.0.2.
[source]: Update source URL.
[build-system]: Use cmake-build-system.
[inputs]: Add popt.
[arguments]: Remove field.
(librsync-0.9): New variable.
(btar, duplicity, rdiff-backup)[inputs]: Use librsync-0.9.
---
gnu/packages/backup.scm | 6 +++---
gnu/packages/rsync.scm | 40 ++++++++++++++++++++++++++++++----------
2 files changed, 33 insertions(+), 13 deletions(-)
diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm
index 970d0adb06..64a02a1b7e 100644
--- a/gnu/packages/backup.scm
+++ b/gnu/packages/backup.scm
@@ -95,7 +95,7 @@
`(("lockfile" ,python2-lockfile)
("urllib3" ,python2-urllib3)))
(inputs
- `(("librsync" ,librsync)
+ `(("librsync" ,librsync-0.9)
("lftp" ,lftp)
("gnupg" ,gnupg) ; gpg executable needed
("util-linux" ,util-linux) ; for setsid
@@ -362,7 +362,7 @@ list and implement the backup strategy.")
"0miklk4bqblpyzh1bni4x6lqn88fa8fjn15x1k1n8bxkx60nlymd"))))
(build-system gnu-build-system)
(inputs
- `(("librsync" ,librsync)))
+ `(("librsync" ,librsync-0.9)))
(arguments
`(#:make-flags `(,(string-append "PREFIX=" (assoc-ref %outputs "out"))
"CC=gcc")
@@ -395,7 +395,7 @@ errors.")
(build-system python-build-system)
(inputs
`(("python" ,python-2)
- ("librsync" ,librsync)))
+ ("librsync" ,librsync-0.9)))
(arguments
`(#:python ,python-2
#:tests? #f))
diff --git a/gnu/packages/rsync.scm b/gnu/packages/rsync.scm
index 4fed03523e..b20b841478 100644
--- a/gnu/packages/rsync.scm
+++ b/gnu/packages/rsync.scm
@@ -3,6 +3,7 @@
;;; Copyright © 2016 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2019 Leo Famulari <leo@famulari.name>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -21,12 +22,15 @@
(define-module (gnu packages rsync)
#:use-module (gnu packages)
- #:use-module (gnu packages perl)
#:use-module (gnu packages acl)
#:use-module (gnu packages base)
- #:use-module (guix licenses)
+ #:use-module (gnu packages compression)
+ #:use-module (gnu packages perl)
+ #:use-module (gnu packages popt)
+ #:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
#:use-module (guix download)
+ #:use-module (guix build-system cmake)
#:use-module (guix build-system gnu))
@@ -51,25 +55,26 @@ to/from another host over any remote shell, or to/from a remote rsync daemon.
Its delta-transfer algorithm reduces the amount of data sent over the network
by sending only the differences between the source files and the existing
files in the destination.")
- (license gpl3+)
+ (license license:gpl3+)
(home-page "http://rsync.samba.org/")))
(define-public librsync
(package
(name "librsync")
- (version "0.9.7")
+ (version "2.0.2")
(source (origin
(method url-fetch)
- (uri (string-append "mirror://sourceforge/librsync/librsync/"
- version "/librsync-" version ".tar.gz"))
+ (uri (string-append "https://github.com/librsync/librsync/archive/v"
+ version ".tar.gz"))
(sha256
(base32
- "1mj1pj99mgf1a59q9f2mxjli2fzxpnf55233pc1klxk2arhf8cv6"))))
- (build-system gnu-build-system)
+ "1waa581pcscc1rnvy06cj584k5dx0dc7jj79wsdj7xw4xqh9ayz6"))))
+ (build-system cmake-build-system)
+ (inputs
+ `(("popt" ,popt)))
(native-inputs
`(("which" ,which)
("perl" ,perl)))
- (arguments '(#:configure-flags '("--enable-shared")))
(home-page "http://librsync.sourceforge.net/")
(synopsis "Implementation of the rsync remote-delta algorithm")
(description
@@ -78,4 +83,19 @@ remote-delta algorithm. This algorithm allows efficient remote updates of a
file, without requiring the old and new versions to both be present at the
sending end. The library uses a \"streaming\" design similar to that of zlib
with the aim of allowing it to be embedded into many different applications.")
- (license lgpl2.1+)))
+ (license license:lgpl2.1+)))
+
+(define-public librsync-0.9
+ (package
+ (inherit librsync)
+ (version "0.9.7")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://sourceforge/librsync/librsync/"
+ version "/librsync-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1mj1pj99mgf1a59q9f2mxjli2fzxpnf55233pc1klxk2arhf8cv6"))))
+ (build-system gnu-build-system)
+ (arguments '(#:configure-flags '("--enable-shared")))
+ (inputs '())))
--
2.20.1
prev parent reply other threads:[~2019-02-13 21:28 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-13 19:01 [bug#30448] Update librsync to 2.0.1 Leo Famulari
2018-02-15 14:27 ` Ludovic Courtès
2018-04-23 12:58 ` Ludovic Courtès
2018-04-24 17:57 ` [bug#30448] Breaking rdiff-backup and btar (was Re: [bug#30448] Update librsync to 2.0.1) Leo Famulari
2018-04-24 20:30 ` Ludovic Courtès
2018-04-25 17:23 ` Leo Famulari
2018-04-28 16:48 ` Oleg Pykhalov
2019-02-13 0:00 ` bug#30448: " Leo Famulari
2019-02-13 21:30 ` [bug#30448] Update librsync to 2.0.1 Leo Famulari
2019-02-25 23:24 ` bug#30448: " Leo Famulari
2019-02-13 21:26 ` Leo Famulari [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=9841ea716f575c21b5eeed136fd6af8aa81e7c98.1550093203.git.leo@famulari.name \
--to=leo@famulari.name \
--cc=30448@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).