[PATCH] gnu: par2cmdline.

[PATCH] gnu: par2cmdline.

[Brendan Tildesley]

[-- Attachment #1: Type: text/plain, Size: 1 bytes --]



[-- Attachment #2: 0001-gnu-Add-par2cmdline.patch --]
[-- Type: text/x-patch, Size: 2875 bytes --]

From 0bb6fe510ce6a6c1cd0851527909db16b167d703 Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <brendan.tildesley@openmailbox.org>
Date: Mon, 12 Sep 2016 16:02:27 +1000
Subject: [PATCH] gnu: Add par2cmdline.

* gnu/package/disk.scm (par2cmdline): New variable.
---
 gnu/packages/disk.scm | 42 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm
index 27ab7a6..d1dabca 100644
--- a/gnu/packages/disk.scm
+++ b/gnu/packages/disk.scm
@@ -28,6 +28,7 @@
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
   #:use-module (gnu packages)
+  #:use-module (gnu packages autotools)
   #:use-module (gnu packages base)
   #:use-module (gnu packages docbook)
   #:use-module (gnu packages gettext)
@@ -45,6 +46,47 @@
   #:use-module (gnu packages compression)
   #:use-module (gnu packages xml))
 
+(define-public par2cmdline
+  (package
+    (name "par2cmdline")
+    (version "0.6.14")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://github.com/Parchive/par2cmdline/archive/v"
+                                  version ".tar.gz"))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0ykfb7ar0x0flfdgf6i8xphyv5b93dalbjj2jb6hx7sdjax33n1g"))
+              ;; This test merely needs a file to test recovery on, but
+              ;; /dev/random is essentially /dev/urandom plus minimum entropy
+              ;; locking, making the test hang indefinitely. This change is
+              ;; already upstream: remove on upgrade to future 0.6.15.
+              (modules '((guix build utils)))
+              (snippet
+               '(substitute* "tests/test20" (("if=/dev/random") "if=/dev/urandom")))))
+    (native-inputs
+     `(("automake" ,automake)
+       ("autoconf" ,autoconf)))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'aclocal
+           (lambda _ (zero? (system* "aclocal"))))
+         (add-after 'aclocal 'automake
+           (lambda _ (zero? (system* "automake" "--add-missing"))))
+         (add-after 'automake 'autoconf
+           (lambda _ (zero? (system* "autoconf")))))))
+    (synopsis "File verification and repair tool")
+    (description "Par2cmdline is a tool for generating RAID-like PAR2 recovery
+files a fraction the size their of using Reed-Solomon coding.  PAR2 files can
+be stored along side backup or published files for recovering from bitrot.")
+    (home-page "https://github.com/Parchive/par2cmdline")
+    (license (list license:gpl2+  ; *
+                   license:gpl3+  ; config.guess
+                   license:x11)))); install-sh
+
 (define-public parted
   (package
     (name "parted")
-- 
2.10.0

Re: [PATCH] gnu: par2cmdline.

[Eric Bavier]

Hi!  Thanks for the patch; a few comments below:

On Mon, 12 Sep 2016 19:18:42 +1000
Brendan Tildesley <brendan.tildesley@openmailbox.org> wrote:

> From 0bb6fe510ce6a6c1cd0851527909db16b167d703 Mon Sep 17 00:00:00 2001
> From: Brendan Tildesley <brendan.tildesley@openmailbox.org>
> Date: Mon, 12 Sep 2016 16:02:27 +1000
> Subject: [PATCH] gnu: Add par2cmdline.
> 
> * gnu/package/disk.scm (par2cmdline): New variable.
[...]
> +    (source (origin
> +              (method url-fetch)
> +              (uri (string-append "https://github.com/Parchive/par2cmdline/archive/v"
> +                                  version ".tar.gz"))
> +              (file-name (string-append name "-" version ".tar.gz"))
> +              (sha256
> +               (base32
> +                "0ykfb7ar0x0flfdgf6i8xphyv5b93dalbjj2jb6hx7sdjax33n1g"))
> +              ;; This test merely needs a file to test recovery on, but
> +              ;; /dev/random is essentially /dev/urandom plus minimum entropy
> +              ;; locking, making the test hang indefinitely. This change is
> +              ;; already upstream: remove on upgrade to future 0.6.15.

Could you possobily list the upstream commit id for this change?

> +              (modules '((guix build utils)))
> +              (snippet
> +               '(substitute* "tests/test20" (("if=/dev/random") "if=/dev/urandom")))))
> +    (native-inputs
> +     `(("automake" ,automake)
> +       ("autoconf" ,autoconf)))
> +    (build-system gnu-build-system)
> +    (arguments
> +     `(#:phases
> +       (modify-phases %standard-phases
> +         (add-after 'unpack 'aclocal
> +           (lambda _ (zero? (system* "aclocal"))))
> +         (add-after 'aclocal 'automake
> +           (lambda _ (zero? (system* "automake" "--add-missing"))))
> +         (add-after 'automake 'autoconf
> +           (lambda _ (zero? (system* "autoconf")))))))

Could these phases be squashed into a single phase that calls
"autoreconf"?

> +    (synopsis "File verification and repair tool")
> +    (description "Par2cmdline is a tool for generating RAID-like PAR2 recovery
> +files a fraction the size their of using Reed-Solomon coding.  PAR2 files can
         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
I think that bit could be left out.  Unless fixing a typo could make it
understandable.

> +be stored along side backup or published files for recovering from bitrot.")
> +    (home-page "https://github.com/Parchive/par2cmdline")
> +    (license (list license:gpl2+  ; *

We can leave gpl2+ out, since in this case it is covered by gpl3+

> +                   license:gpl3+  ; config.guess
> +                   license:x11)))); install-sh

Could you send an updated patch?
Thanks,
`~Eric

Re: [PATCH] gnu: par2cmdline.

[Brendan Tildesley]

[-- Attachment #1: Type: text/plain, Size: 199 bytes --]

Ok thanks I'd forgotten to fix the text. I ended up deciding to move the
definition to backup.scm as it makes more sense, and my duplicity 7.0.10
package uses par2cmdline which is also in backup.scm

[-- Attachment #2: 0001-gnu-Add-par2cmdline.patch --]
[-- Type: text/x-patch, Size: 2802 bytes --]

From 8c3187a876c142acde5eb6cb0dc22c0699765a23 Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <brendan.tildesley@openmailbox.org>
Date: Tue, 13 Sep 2016 20:36:15 +1000
Subject: [PATCH] gnu: Add par2cmdline.

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

diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm
index 4678b9b..62d4341 100644
--- a/gnu/packages/backup.scm
+++ b/gnu/packages/backup.scm
@@ -28,6 +28,7 @@
   #:use-module (guix build-system python)
   #:use-module (gnu packages)
   #:use-module (gnu packages acl)
+  #:use-module (gnu packages autotools)
   #:use-module (gnu packages base)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages databases)
@@ -99,6 +100,43 @@ uses GnuPG to encrypt and/or sign these archives, they will be safe from
 spying and/or modification by the server.")
     (license license:gpl2+)))
 
+(define-public par2cmdline
+  (package
+    (name "par2cmdline")
+    (version "0.6.14")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://github.com/Parchive/par2cmdline/archive/v"
+                                  version ".tar.gz"))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0ykfb7ar0x0flfdgf6i8xphyv5b93dalbjj2jb6hx7sdjax33n1g"))
+              ;; This test merely needs a file to test recovery on, but
+              ;; /dev/random is essentially /dev/urandom plus minimum entropy
+              ;; locking, making the test hang indefinitely. This change is
+              ;; already upstream: remove on upgrade to future 0.6.15.
+              ;; https://github.com/Parchive/par2cmdline/commit/27723a678f780da82c79b98592592009c779a4fb
+              (modules '((guix build utils)))
+              (snippet
+               '(substitute* "tests/test20" (("if=/dev/random") "if=/dev/urandom")))))
+    (native-inputs
+     `(("automake" ,automake)
+       ("autoconf" ,autoconf)))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'autoreconf
+           (lambda _ (zero? (system* "autoreconf" "-vfi")))))))
+    (synopsis "File verification and repair tool")
+    (description "Par2cmdline is a tool for generating RAID-like PAR2 recovery
+files using Reed-Solomon coding.  PAR2 files can be stored along side backups
+or distributed files for recovering from bitrot.")
+    (home-page "https://github.com/Parchive/par2cmdline")
+    (license (list license:gpl3+  ; *
+                   license:x11)))); install-sh
+
 (define-public hdup
   (package
     (name "hdup")
-- 
2.9.3

Re: [PATCH] gnu: par2cmdline.

[Ludovic Courtès]

Hello,

Just a quick note:

Brendan Tildesley <brendan.tildesley@openmailbox.org> skribis:

> +                   license:gpl3+  ; config.guess
> +                   license:x11)))); install-sh

These two files are build system helpers provided by Autoconf and
Automake.  They are not installed so their license does not matter here.

Ludo’.

Re: [PATCH] gnu: par2cmdline.

[Brendan Tildesley]

[-- Attachment #1: Type: text/plain, Size: 454 bytes --]

On 2016-09-13 22:09, Ludovic Courtès wrote:
> Hello,
>
> Just a quick note:
>
> Brendan Tildesley <brendan.tildesley@openmailbox.org> skribis:
>
>> +                   license:gpl3+  ; config.guess
>> +                   license:x11)))); install-sh
> These two files are build system helpers provided by Autoconf and
> Automake.  They are not installed so their license does not matter here.
>
> Ludo’.

Right, I didn't realise that.


[-- Attachment #2: 0001-gnu-Add-par2cmdline.patch --]
[-- Type: text/x-patch, Size: 2745 bytes --]

From d63c6af98129e0de3eb1054dd69496b99a269c99 Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <brendan.tildesley@openmailbox.org>
Date: Tue, 13 Sep 2016 20:36:15 +1000
Subject: [PATCH] gnu: Add par2cmdline.

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

diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm
index 4678b9b..e77c4f2 100644
--- a/gnu/packages/backup.scm
+++ b/gnu/packages/backup.scm
@@ -28,6 +28,7 @@
   #:use-module (guix build-system python)
   #:use-module (gnu packages)
   #:use-module (gnu packages acl)
+  #:use-module (gnu packages autotools)
   #:use-module (gnu packages base)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages databases)
@@ -99,6 +100,42 @@ uses GnuPG to encrypt and/or sign these archives, they will be safe from
 spying and/or modification by the server.")
     (license license:gpl2+)))
 
+(define-public par2cmdline
+  (package
+    (name "par2cmdline")
+    (version "0.6.14")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://github.com/Parchive/par2cmdline/archive/v"
+                                  version ".tar.gz"))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0ykfb7ar0x0flfdgf6i8xphyv5b93dalbjj2jb6hx7sdjax33n1g"))
+              ;; This test merely needs a file to test recovery on, but
+              ;; /dev/random is essentially /dev/urandom plus minimum entropy
+              ;; locking, making the test hang indefinitely. This change is
+              ;; already upstream: remove on upgrade to future 0.6.15.
+              ;; https://github.com/Parchive/par2cmdline/commit/27723a678f780da82c79b98592592009c779a4fb
+              (modules '((guix build utils)))
+              (snippet
+               '(substitute* "tests/test20" (("if=/dev/random") "if=/dev/urandom")))))
+    (native-inputs
+     `(("automake" ,automake)
+       ("autoconf" ,autoconf)))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'autoreconf
+           (lambda _ (zero? (system* "autoreconf" "-vfi")))))))
+    (synopsis "File verification and repair tool")
+    (description "Par2cmdline is a tool for generating RAID-like PAR2 recovery
+files using Reed-Solomon coding.  PAR2 files can be stored along side backups
+or distributed files for recovering from bitrot.")
+    (home-page "https://github.com/Parchive/par2cmdline")
+    (license license:gpl3+)))
+
 (define-public hdup
   (package
     (name "hdup")
-- 
2.9.3

Re: [PATCH] gnu: par2cmdline.

[Ludovic Courtès]

Brendan Tildesley <brendan.tildesley@openmailbox.org> skribis:

> On 2016-09-13 22:09, Ludovic Courtès wrote:
>> Hello,
>>
>> Just a quick note:
>>
>> Brendan Tildesley <brendan.tildesley@openmailbox.org> skribis:
>>
>>> +                   license:gpl3+  ; config.guess
>>> +                   license:x11)))); install-sh
>> These two files are build system helpers provided by Autoconf and
>> Automake.  They are not installed so their license does not matter here.
>>
>> Ludo’.
>
> Right, I didn't realise that.
>
>
> From d63c6af98129e0de3eb1054dd69496b99a269c99 Mon Sep 17 00:00:00 2001
> From: Brendan Tildesley <brendan.tildesley@openmailbox.org>
> Date: Tue, 13 Sep 2016 20:36:15 +1000
> Subject: [PATCH] gnu: Add par2cmdline.
>
> * gnu/packages/backup.scm (par2cmdline): New variable.

Cool.  Eric, could you apply it if your concerns have been addressed?

Thanks!

Ludo’.

Re: [PATCH] gnu: par2cmdline.

[Eric Bavier]

On Wed, 14 Sep 2016 16:43:47 +0200
ludo@gnu.org (Ludovic Courtès) wrote:

> Brendan Tildesley <brendan.tildesley@openmailbox.org> skribis:
> 
> > On 2016-09-13 22:09, Ludovic Courtès wrote:  
> >> Hello,
> >>
> >> Just a quick note:
> >>
> >> Brendan Tildesley <brendan.tildesley@openmailbox.org> skribis:
> >>  
> >>> +                   license:gpl3+  ; config.guess
> >>> +                   license:x11)))); install-sh  
> >> These two files are build system helpers provided by Autoconf and
> >> Automake.  They are not installed so their license does not matter here.
> >>
> >> Ludo’.  
> >
> > Right, I didn't realise that.
> >
> >
> > From d63c6af98129e0de3eb1054dd69496b99a269c99 Mon Sep 17 00:00:00 2001
> > From: Brendan Tildesley <brendan.tildesley@openmailbox.org>
> > Date: Tue, 13 Sep 2016 20:36:15 +1000
> > Subject: [PATCH] gnu: Add par2cmdline.
> >
> > * gnu/packages/backup.scm (par2cmdline): New variable.  
> 
> Cool.  Eric, could you apply it if your concerns have been addressed?

Pushed in f6875394a6dce98c78c3d4f222f6f9bc4d5402aa

Thanks!
`~Eric