GNU bug report logs - #26030
[PATCH] gnu: Add rsnapshot.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 26030 in the body.
You can then email your comments to 26030 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Thomas Danckaert <post <at> thomasdanckaert.be>
To: guix-patches <at> gnu.org
Subject: [PATCH] gnu: Add rsnapshot.
Date: Wed, 08 Mar 2017 20:08:56 +0100 (CET)

[0001-gnu-Add-rsnapshot.patch (text/x-patch, inline)]

From 0d653bfc22eab87e50434475a724a32fb4dfbce0 Mon Sep 17 00:00:00 2001
From: Thomas Danckaert <thomas.danckaert <at> gmail.com>
Date: Wed, 8 Mar 2017 18:04:58 +0100
Subject: [PATCH] gnu: Add rsnapshot.

* gnu/packages/backup.scm (rsnapshot): New variable.
---
 gnu/packages/backup.scm | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm
index 986ffef08..7afd33c37 100644
--- a/gnu/packages/backup.scm
+++ b/gnu/packages/backup.scm
@@ -3,6 +3,7 @@
 ;;; Copyright © 2014 Ian Denhardt <ian <at> zenhack.net>
 ;;; Copyright © 2015, 2016 Leo Famulari <leo <at> famulari.name>
 ;;; Copyright © 2017 Tobias Geerinckx-Rice <me <at> tobias.gr>
+;;; Copyright © 2017 Thomas Danckaert <post <at> thomasdanckaert.be>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -43,6 +44,7 @@
   #:use-module (gnu packages mcrypt)
   #:use-module (gnu packages nettle)
   #:use-module (gnu packages pcre)
+  #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages python)
   #:use-module (gnu packages rsync)
@@ -373,6 +375,50 @@ to a remote location, and only the differences will be transmitted.  Finally,
 rdiff-backup is easy to use and settings have sensible defaults.")
     (license license:gpl2+)))
 
+(define-public rsnapshot
+  (package
+    (name "rsnapshot")
+    (version "1.4.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://github.com/rsnapshot/rsnapshot/archive/"
+                           version ".tar.gz"))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256 (base32
+                "0rll7pvyyjdqiyc9chf2ingdv9qcf6s28zjb8q7znfgybcjd2wn4"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("autoconf" ,autoconf)
+       ("automake" ,automake)))
+    (inputs
+     `(("perl" ,perl)
+       ("rsync" ,rsync)
+       ("openssh" ,openssh)))
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-before 'configure 'autogen
+           (lambda _
+             (zero? (system* "./autogen.sh"))))
+         (replace 'check
+           (lambda _
+             (substitute*
+                 '("t/cmd-post_pre-exec/conf/pre-true-post-true.conf"
+                   "t/backup_exec/conf/backup_exec_fail.conf"
+                   "t/backup_exec/conf/backup_exec.conf")
+               (("/bin/true") (which "true"))
+               (("/bin/false") (which "false")))
+             (zero? (system* "make" "test")))))))
+    (synopsis "Incremental backup utility based on rsync")
+    (description "rsnapshot is a filesystem snapshot utility based on
+rsync.  rsnapshot makes it easy to make periodic snapshots of local
+machines, and remote machines over ssh.  The code makes extensive use
+of hard links whenever possible, to greatly reduce the disk space
+required.")
+    (home-page "http://rsnapshot.org")
+    (license license:gpl2+)))
+
 (define-public libchop
   (package
     (name "libchop")
-- 
2.11.1

Message #8 received at 26030 <at> debbugs.gnu.org (full text, mbox):

From: Leo Famulari <leo <at> famulari.name>
To: Thomas Danckaert <post <at> thomasdanckaert.be>
Cc: 26030 <at> debbugs.gnu.org
Subject: Re: bug#26030: [PATCH] gnu: Add rsnapshot.
Date: Wed, 8 Mar 2017 15:23:46 -0500

[Message part 1 (text/plain, inline)]

On Wed, Mar 08, 2017 at 08:08:56PM +0100, Thomas Danckaert wrote:
> Subject: [PATCH] gnu: Add rsnapshot.
> 
> * gnu/packages/backup.scm (rsnapshot): New variable.

Cool, the venerable rsnapshot!

> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (string-append "https://github.com/rsnapshot/rsnapshot/archive/"
> +                           version ".tar.gz"))
> +       (file-name (string-append name "-" version ".tar.gz"))
> +       (sha256 (base32
> +                "0rll7pvyyjdqiyc9chf2ingdv9qcf6s28zjb8q7znfgybcjd2wn4"))))
> +    (build-system gnu-build-system)
> +    (native-inputs
> +     `(("autoconf" ,autoconf)
> +       ("automake" ,automake)))

We should use the tarball from
<https://github.com/rsnapshot/rsnapshot/releases/download/1.4.2/rsnapshot-1.4.2.tar.gz>
instead, which is already bootstrapped. Then, we can leave out these
native-inputs.

The tarballs like 1.4.2.tar.gz are just directory snapshots
automatically generated by GitHub when you create a new tag. Often the
project will provide a "real" release tarball, as in this case.

> +    (inputs
> +     `(("perl" ,perl)
> +       ("rsync" ,rsync)
> +       ("openssh" ,openssh)))

The built package doesn't retain a reference to openssh. But, I
recommend not including openssh, even though there is a 'cmd_ssh' field
in the rsnapshot configuration file. Rsnapshot can work locally without
SSH, and users may want to use something besides OpenSSH.

> +    (synopsis "Incremental backup utility based on rsync")

I'd call it a "Deduplicating snapshot backup utility based on rsync",
but I admit this is a nit-pick, and you can ignore it :)

> +machines, and remote machines over ssh.  The code makes extensive use
> +of hard links whenever possible, to greatly reduce the disk space
> +required.")

I'd say, "To reduce the disk space required for each backup, rsnapshot
uses hard links to deduplicate identical files". This way, the reader
knows how the code uses hard links.

Can you send an updated patch?

[signature.asc (application/pgp-signature, inline)]

Message #11 received at 26030 <at> debbugs.gnu.org (full text, mbox):

From: Thomas Danckaert <post <at> thomasdanckaert.be>
To: leo <at> famulari.name
Cc: 26030 <at> debbugs.gnu.org
Subject: Re: bug#26030: [PATCH] gnu: Add rsnapshot.
Date: Thu, 09 Mar 2017 09:23:25 +0100 (CET)

[Message part 1 (text/plain, inline)]

From: Leo Famulari <leo <at> famulari.name>
Subject: Re: bug#26030: [PATCH] gnu: Add rsnapshot.
Date: Wed, 8 Mar 2017 15:23:46 -0500

> On Wed, Mar 08, 2017 at 08:08:56PM +0100, Thomas Danckaert wrote:
>> Subject: [PATCH] gnu: Add rsnapshot.
>>
>> * gnu/packages/backup.scm (rsnapshot): New variable.
>
> Cool, the venerable rsnapshot!

glad you agree :-)

> We should use the tarball from
> <https://github.com/rsnapshot/rsnapshot/releases/download/1.4.2/rsnapshot-1.4.2.tar.gz>
> instead, which is already bootstrapped. Then, we can leave out these
> native-inputs.
>
> The tarballs like 1.4.2.tar.gz are just directory snapshots
> automatically generated by GitHub when you create a new tag. Often 
> the
> project will provide a "real" release tarball, as in this case.

Ah yes, I got a little confused by the different links offered in the 
github “Downloads” section.  They should just remove those “source 
code”  links (made me think that the other link contained 
pre-compiled stuff).

> The built package doesn't retain a reference to openssh. But, I
> recommend not including openssh, even though there is a 'cmd_ssh' 
> field
> in the rsnapshot configuration file. Rsnapshot can work locally 
> without
> SSH, and users may want to use something besides OpenSSH.

Yes, you're right. I thought it would need it for the tests, but it 
happily skips the ssh tests, it seems.

>> +    (synopsis "Incremental backup utility based on rsync")
>
> I'd call it a "Deduplicating snapshot backup utility based on 
> rsync",
> but I admit this is a nit-pick, and you can ignore it :)

I Picked the nit anyway.

> I'd say, "To reduce the disk space required for each backup, 
> rsnapshot
> uses hard links to deduplicate identical files". This way, the 
> reader
> knows how the code uses hard links.

done.

> Can you send an updated patch?

Attached, feel free to add “Co-authored by...“ :-)

Thomas

[0001-gnu-Add-rsnapshot.patch (text/x-patch, inline)]

From b59515ba09cd7dc8767d23eb4e00cb94463e2dd0 Mon Sep 17 00:00:00 2001
From: Thomas Danckaert <thomas.danckaert <at> gmail.com>
Date: Wed, 8 Mar 2017 18:04:58 +0100
Subject: [PATCH] gnu: Add rsnapshot.

* gnu/packages/backup.scm (rsnapshot): New variable.
---
 gnu/packages/backup.scm | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm
index 986ffef08..e320904b4 100644
--- a/gnu/packages/backup.scm
+++ b/gnu/packages/backup.scm
@@ -3,6 +3,7 @@
 ;;; Copyright © 2014 Ian Denhardt <ian <at> zenhack.net>
 ;;; Copyright © 2015, 2016 Leo Famulari <leo <at> famulari.name>
 ;;; Copyright © 2017 Tobias Geerinckx-Rice <me <at> tobias.gr>
+;;; Copyright © 2017 Thomas Danckaert <post <at> thomasdanckaert.be>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -43,6 +44,7 @@
   #:use-module (gnu packages mcrypt)
   #:use-module (gnu packages nettle)
   #:use-module (gnu packages pcre)
+  #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages python)
   #:use-module (gnu packages rsync)
@@ -373,6 +375,43 @@ to a remote location, and only the differences will be transmitted.  Finally,
 rdiff-backup is easy to use and settings have sensible defaults.")
     (license license:gpl2+)))
 
+(define-public rsnapshot
+  (package
+    (name "rsnapshot")
+    (version "1.4.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://github.com/rsnapshot/rsnapshot/releases/download/"
+             version "/rsnapshot-" version ".tar.gz"))
+       (sha256
+        (base32
+         "05jfy99a0xs6lvsjfp3wz21z0myqhmwl2grn3jr9clijbg282ah4"))))
+    (build-system gnu-build-system)
+    (inputs
+     `(("perl" ,perl)
+       ("rsync" ,rsync)))
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (replace 'check
+           (lambda _
+             (substitute*
+                 '("t/cmd-post_pre-exec/conf/pre-true-post-true.conf"
+                   "t/backup_exec/conf/backup_exec_fail.conf"
+                   "t/backup_exec/conf/backup_exec.conf")
+               (("/bin/true") (which "true"))
+               (("/bin/false") (which "false")))
+             (zero? (system* "make" "test")))))))
+    (synopsis "Deduplicating snapshot backup utility based on rsync")
+    (description "rsnapshot is a filesystem snapshot utility based on rsync.
+rsnapshot makes it easy to make periodic snapshots of local machines, and
+remote machines over ssh.  To reduce the disk space required for each backup,
+rsnapshot uses hard links to deduplicate identical files.")
+    (home-page "http://rsnapshot.org")
+    (license license:gpl2+)))
+
 (define-public libchop
   (package
     (name "libchop")
-- 
2.11.1

Message #16 received at 26030-done <at> debbugs.gnu.org (full text, mbox):

From: Ricardo Wurmus <rekado <at> elephly.net>
To: Thomas Danckaert <post <at> thomasdanckaert.be>
Cc: 26030-done <at> debbugs.gnu.org, leo <at> famulari.name
Subject: Re: bug#26030: [PATCH] gnu: Add rsnapshot.
Date: Thu, 09 Mar 2017 12:31:52 +0100

Hi Thomas,

>> Can you send an updated patch?
>
> Attached, feel free to add “Co-authored by...“ :-)
>
> Thomas
> From b59515ba09cd7dc8767d23eb4e00cb94463e2dd0 Mon Sep 17 00:00:00 2001
> From: Thomas Danckaert <thomas.danckaert <at> gmail.com>
> Date: Wed, 8 Mar 2017 18:04:58 +0100
> Subject: [PATCH] gnu: Add rsnapshot.
>
> * gnu/packages/backup.scm (rsnapshot): New variable.
> ---

I’ve pushed this to master with commit 0da4f3659.  I made some very
minor cosmetic changes (e.g. order of fields for consistency,
capitalising ‘SSH’ in the description) — I hope you don’t mind!

--
Ricardo

GPG: BCA6 89B6 3655 3801 C3C6  2150 197A 5888 235F ACAC
https://elephly.net

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.