From patchwork Wed Feb 13 21:26:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Leo Famulari X-Patchwork-Id: 1085 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id C3C9D16C20; Wed, 13 Feb 2019 21:28:12 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 3102F16C1E for ; Wed, 13 Feb 2019 21:28:12 +0000 (GMT) Received: from localhost ([127.0.0.1]:35322 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gu24h-0000kp-Lv for patchwork@mira.cbaines.net; Wed, 13 Feb 2019 16:28:11 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50318) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gu24c-0000kk-Au for guix-patches@gnu.org; Wed, 13 Feb 2019 16:28:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gu24b-0001xP-1v for guix-patches@gnu.org; Wed, 13 Feb 2019 16:28:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:48122) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gu24a-0001wi-Da for guix-patches@gnu.org; Wed, 13 Feb 2019 16:28:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gu24Z-0004rE-QU for guix-patches@gnu.org; Wed, 13 Feb 2019 16:28:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#30448] [PATCH] gnu: librsync: Update to 2.0.2. References: <20180213190113.GA22610@jasmine.lan> In-Reply-To: <20180213190113.GA22610@jasmine.lan> Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 13 Feb 2019 21:28:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 30448 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 30448@debbugs.gnu.org Received: via spool by 30448-submit@debbugs.gnu.org id=B30448.155009322618597 (code B ref 30448); Wed, 13 Feb 2019 21:28:01 +0000 Received: (at 30448) by debbugs.gnu.org; 13 Feb 2019 21:27:06 +0000 Received: from localhost ([127.0.0.1]:47401 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gu23Y-0004pV-99 for submit@debbugs.gnu.org; Wed, 13 Feb 2019 16:27:05 -0500 Received: from wout2-smtp.messagingengine.com ([64.147.123.25]:44175) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gu23V-0004pH-IN for 30448@debbugs.gnu.org; Wed, 13 Feb 2019 16:26:58 -0500 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.west.internal (Postfix) with ESMTP id A8ABF33EA; Wed, 13 Feb 2019 16:26:51 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Wed, 13 Feb 2019 16:26:51 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=from:to:subject:date:message-id:mime-version:content-type :content-transfer-encoding; s=mesmtp; bh=4E+zp9Bwp4m0Kcy10arijm7 e/3/AlwI9u87qgbsyemU=; b=Eh6lmP8x5CmnyPrE9F+wB269iyQlJKtOXWAIrLo Gsa26I9AOm3d5L5faN5uSjFajNODBqvw3GEUYsqJhIlKDccT0YMuJhqovrqFO9iQ QDAN5NNniAtAKn59YvepxQjJn/4/KbRxwa6hVNG+0zrEverTUSlIjbES7bRJymC0 sONo= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:content-type :date:from:message-id:mime-version:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=4E+zp9 Bwp4m0Kcy10arijm7e/3/AlwI9u87qgbsyemU=; b=hDUxrnks31eIJlD+35NlKx dVFhfHSeKNNNvDDUSCUDRIpV3Jf3Nrx8w6F43SulolgJO5OL8HBZCyse81CxgAIA ekKmbVHCjJCMLrSutGZfVZ/IIlTC6m4MWhSceJv11JvlK4gwd57HBmwX3q11F0Yj YqYNi4CAykc0ZTRxnd0U5SL6Hzr7ZUvxvm5MGIIO8wHsL7IctbtSMWCOD3JYu0Cp 40byvRtn3swAMWT4yZ5IpPBuO7LriStUChomT2dRngS/saA6HKPGZBjC+j/Ge1hX UYvsNzFWryC8d3RzKCijdGwcVaKy2/gPJ7Cz6O+LqB4mzC0BBlMfOzKNXlhMcRTQ == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedtledruddtfedgudehtdcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfhuthenuceurghilhhouhhtmecu fedttdenucenucfjughrpefhvffufffkofggtgfgsehtkeertdertdejnecuhfhrohhmpe fnvghoucfhrghmuhhlrghrihcuoehlvghosehfrghmuhhlrghrihdrnhgrmhgvqeenucff ohhmrghinhepshgrmhgsrgdrohhrghdpshhouhhrtggvfhhorhhgvgdrnhgvthdpghhith hhuhgsrdgtohhmnecukfhppeejiedruddvgedrvddtvddrudefjeenucfrrghrrghmpehm rghilhhfrhhomheplhgvohesfhgrmhhulhgrrhhirdhnrghmvgenucevlhhushhtvghruf hiiigvpedt X-ME-Proxy: Received: from jasmine.lan (c-76-124-202-137.hsd1.pa.comcast.net [76.124.202.137]) by mail.messagingengine.com (Postfix) with ESMTPA id C908610318 for <30448@debbugs.gnu.org>; Wed, 13 Feb 2019 16:26:49 -0500 (EST) From: Leo Famulari Date: Wed, 13 Feb 2019 16:26:45 -0500 Message-Id: <9841ea716f575c21b5eeed136fd6af8aa81e7c98.1550093203.git.leo@famulari.name> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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 ;;; Copyright © 2017 Efraim Flashner ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2019 Leo Famulari ;;; ;;; 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 '())))