[v2 0/2] Signify

[v2 0/2] Signify

[Leo Famulari]

Here is a revised patch series adding signify and its dependency,
libbsd.

The only difference is the use of 'non-copyleft' to refer to the
Beerware license in libbsd and the IBM license in signify.

Leo Famulari (2):
  gnu: Add libbsd.
  gnu: Add signify.

 gnu-system.am           |  1 +
 gnu/packages/crypto.scm | 35 +++++++++++++++++++++++++++++++++++
 gnu/packages/libbsd.scm | 43 +++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 79 insertions(+)
 create mode 100644 gnu/packages/libbsd.scm

-- 
2.7.3

[v2 1/2] gnu: Add libbsd.

[Leo Famulari]

* gnu/packages/libbsd.scm: New file.
* gnu-system.am (GNU_SYSTEM_MODULES): Add it.
---
 gnu-system.am           |  1 +
 gnu/packages/libbsd.scm | 43 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+)
 create mode 100644 gnu/packages/libbsd.scm

diff --git a/gnu-system.am b/gnu-system.am
index d45b3d1..0817cdc 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -182,6 +182,7 @@ GNU_SYSTEM_MODULES =				\
   gnu/packages/lego.scm				\
   gnu/packages/less.scm				\
   gnu/packages/lesstif.scm			\
+  gnu/packages/libbsd.scm			\
   gnu/packages/libcanberra.scm			\
   gnu/packages/libdaemon.scm			\
   gnu/packages/libedit.scm			\
diff --git a/gnu/packages/libbsd.scm b/gnu/packages/libbsd.scm
new file mode 100644
index 0000000..81e43d1
--- /dev/null
+++ b/gnu/packages/libbsd.scm
@@ -0,0 +1,43 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2016 Leo Famulari <leo@famulari.name>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages libbsd)
+  #:use-module (guix build-system gnu)
+  #:use-module (guix download)
+  #:use-module (guix licenses)
+  #:use-module (guix packages))
+
+(define-public libbsd
+  (package
+    (name "libbsd")
+    (version "0.8.2")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://libbsd.freedesktop.org/releases/"
+                                  "libbsd-" version ".tar.xz"))
+              (sha256
+               (base32
+                "02i5brb2007sxq3mn862mr7yxxm0g6nj172417hjyvjax7549xmj"))))
+    (build-system gnu-build-system)
+    (synopsis "Utility functions from BSD systems")
+    (description "This library provides useful functions commonly found on BSD
+systems, and lacking on others like GNU systems, thus making it easier to port
+projects with strong BSD origins, without needing to embed the same code over
+and over again on each project.")
+    (home-page "https://libbsd.freedesktop.org/wiki/")
+    (license (list bsd-2 bsd-3 bsd-4 bsd-style expat isc public-domain non-copyleft))))
-- 
2.7.3

[v2 2/2] gnu: Add signify.

[Leo Famulari]

* gnu/packages/crypto.scm (signify): New variable.
---
 gnu/packages/crypto.scm | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm
index a8d675b..a9ff764 100644
--- a/gnu/packages/crypto.scm
+++ b/gnu/packages/crypto.scm
@@ -1,6 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2014 David Thompson <davet@gnu.org>
 ;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2016 Leo Famulari <leo@famulari.name>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -19,6 +20,8 @@
 
 (define-module (gnu packages crypto)
   #:use-module (gnu packages)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages libbsd)
   #:use-module (guix licenses)
   #:use-module (guix packages)
   #:use-module (guix download)
@@ -46,3 +49,35 @@
 communication, encryption, decryption, signatures, etc.")
     (license isc)
     (home-page "http://libsodium.org")))
+
+(define-public signify
+  (package
+    (name "signify")
+    (version "17")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://github.com/aperezdc/signify/"
+                                  "archive/v" version ".tar.gz"))
+              (sha256
+               (base32
+                "0kfv2k1fqck31vwlnicavb0h541ilad9zd7j8zz8x2kx36wwqpr7"))))
+    (build-system gnu-build-system)
+    ;; TODO Build with libwaive (described in README.md), to implement something
+    ;; like OpenBSD's pledge().
+    (arguments
+     `(#:make-flags
+       (list "CC=gcc"
+             (string-append "PREFIX=" (assoc-ref %outputs "out")))
+       #:phases
+       (modify-phases %standard-phases
+         (delete 'configure)
+         (delete 'check)))) ; no test suite
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (inputs
+     `(("libbsd" ,libbsd)))
+    (synopsis "Create and verify cryptographic signatures")
+    (description "The signify utility creates and verifies cryptographic
+signatures using the elliptic curve Ed25519.")
+    (home-page "https://github.com/aperezdc/signify")
+    (license (list bsd-3 bsd-4 isc public-domain non-copyleft))))
-- 
2.7.3

Re: [v2 1/2] gnu: Add libbsd.

[Alex Kost]

Leo Famulari (2016-04-02 04:24 +0300) wrote:

> * gnu/packages/libbsd.scm: New file.
> * gnu-system.am (GNU_SYSTEM_MODULES): Add it.
> ---
>  gnu-system.am           |  1 +
>  gnu/packages/libbsd.scm | 43 +++++++++++++++++++++++++++++++++++++++++++
>  2 files changed, 44 insertions(+)
>  create mode 100644 gnu/packages/libbsd.scm
[...]
> +(define-public libbsd
> +  (package
> +    (name "libbsd")
> +    (version "0.8.2")
> +    (source (origin
> +              (method url-fetch)
> +              (uri (string-append "https://libbsd.freedesktop.org/releases/"
> +                                  "libbsd-" version ".tar.xz"))
> +              (sha256
> +               (base32
> +                "02i5brb2007sxq3mn862mr7yxxm0g6nj172417hjyvjax7549xmj"))))
> +    (build-system gnu-build-system)
> +    (synopsis "Utility functions from BSD systems")
> +    (description "This library provides useful functions commonly found on BSD
> +systems, and lacking on others like GNU systems, thus making it easier to port
> +projects with strong BSD origins, without needing to embed the same code over
> +and over again on each project.")
> +    (home-page "https://libbsd.freedesktop.org/wiki/")
> +    (license (list bsd-2 bsd-3 bsd-4 bsd-style expat isc public-domain non-copyleft))))

Wow, a lot of licenses!  "guix lint" reports: "invalid license field".
This happens because 'non-copyleft' is a procedure, not a license.  Look
at other packages to see how it is used.  Also, please don't make such
long lines.  Overall it would be something like this:

    (license (list bsd-2 bsd-3 bsd-4 bsd-style expat isc public-domain
                   (non-copyleft "file://COPYING"
                                 "See COPYING in the distribution.")))

The rest looks good to me, thanks!

-- 
Alex

Re: [v2 2/2] gnu: Add signify.

[Alex Kost]

Leo Famulari (2016-04-02 04:24 +0300) wrote:

> * gnu/packages/crypto.scm (signify): New variable.
> ---
>  gnu/packages/crypto.scm | 35 +++++++++++++++++++++++++++++++++++
>  1 file changed, 35 insertions(+)
[...]
> +(define-public signify
> +  (package
> +    (name "signify")
> +    (version "17")
> +    (source (origin
> +              (method url-fetch)
> +              (uri (string-append "https://github.com/aperezdc/signify/"
> +                                  "archive/v" version ".tar.gz"))

Don't forget about "guix lint": you are missing (file-name ...) field here.

> +              (sha256
> +               (base32
> +                "0kfv2k1fqck31vwlnicavb0h541ilad9zd7j8zz8x2kx36wwqpr7"))))
> +    (build-system gnu-build-system)
> +    ;; TODO Build with libwaive (described in README.md), to implement something
> +    ;; like OpenBSD's pledge().
> +    (arguments
> +     `(#:make-flags
> +       (list "CC=gcc"
> +             (string-append "PREFIX=" (assoc-ref %outputs "out")))
> +       #:phases
> +       (modify-phases %standard-phases
> +         (delete 'configure)
> +         (delete 'check)))) ; no test suite

I think it's better to add “#:tests? #f” to arguments instead, as we do
for other packages.

> +    (native-inputs
> +     `(("pkg-config" ,pkg-config)))
> +    (inputs
> +     `(("libbsd" ,libbsd)))
> +    (synopsis "Create and verify cryptographic signatures")
> +    (description "The signify utility creates and verifies cryptographic
> +signatures using the elliptic curve Ed25519.")
> +    (home-page "https://github.com/aperezdc/signify")
> +    (license (list bsd-3 bsd-4 isc public-domain non-copyleft))))

The same note as for 'libbsd': non-copyleft is a procedure.

-- 
Alex

Re: [v2 1/2] gnu: Add libbsd.

[Leo Famulari]

On Sat, Apr 02, 2016 at 10:47:14AM +0300, Alex Kost wrote:
> Leo Famulari (2016-04-02 04:24 +0300) wrote:
> 
> > * gnu/packages/libbsd.scm: New file.
> > * gnu-system.am (GNU_SYSTEM_MODULES): Add it.
> > ---
> >  gnu-system.am           |  1 +
> >  gnu/packages/libbsd.scm | 43 +++++++++++++++++++++++++++++++++++++++++++
> >  2 files changed, 44 insertions(+)
> >  create mode 100644 gnu/packages/libbsd.scm
> [...]
> > +(define-public libbsd
> > +  (package
> > +    (name "libbsd")
> > +    (version "0.8.2")
> > +    (source (origin
> > +              (method url-fetch)
> > +              (uri (string-append "https://libbsd.freedesktop.org/releases/"
> > +                                  "libbsd-" version ".tar.xz"))
> > +              (sha256
> > +               (base32
> > +                "02i5brb2007sxq3mn862mr7yxxm0g6nj172417hjyvjax7549xmj"))))
> > +    (build-system gnu-build-system)
> > +    (synopsis "Utility functions from BSD systems")
> > +    (description "This library provides useful functions commonly found on BSD
> > +systems, and lacking on others like GNU systems, thus making it easier to port
> > +projects with strong BSD origins, without needing to embed the same code over
> > +and over again on each project.")
> > +    (home-page "https://libbsd.freedesktop.org/wiki/")
> > +    (license (list bsd-2 bsd-3 bsd-4 bsd-style expat isc public-domain non-copyleft))))
> 
> Wow, a lot of licenses!  "guix lint" reports: "invalid license field".
> This happens because 'non-copyleft' is a procedure, not a license.  Look
> at other packages to see how it is used.  Also, please don't make such
> long lines.  Overall it would be something like this:
> 
>     (license (list bsd-2 bsd-3 bsd-4 bsd-style expat isc public-domain
>                    (non-copyleft "file://COPYING"
>                                  "See COPYING in the distribution.")))

Ah, sorry for wasting your time by not linting! Thanks for the
instructions.

> The rest looks good to me, thanks!

Okay!

Re: [v2 2/2] gnu: Add signify.

[Leo Famulari]

On Sat, Apr 02, 2016 at 10:47:21AM +0300, Alex Kost wrote:
> Leo Famulari (2016-04-02 04:24 +0300) wrote:
> 
> > * gnu/packages/crypto.scm (signify): New variable.
> > ---
> >  gnu/packages/crypto.scm | 35 +++++++++++++++++++++++++++++++++++
> >  1 file changed, 35 insertions(+)
> [...]
> > +(define-public signify
> > +  (package
> > +    (name "signify")
> > +    (version "17")
> > +    (source (origin
> > +              (method url-fetch)
> > +              (uri (string-append "https://github.com/aperezdc/signify/"
> > +                                  "archive/v" version ".tar.gz"))
> 
> Don't forget about "guix lint": you are missing (file-name ...) field here.
> 
> > +              (sha256
> > +               (base32
> > +                "0kfv2k1fqck31vwlnicavb0h541ilad9zd7j8zz8x2kx36wwqpr7"))))
> > +    (build-system gnu-build-system)
> > +    ;; TODO Build with libwaive (described in README.md), to implement something
> > +    ;; like OpenBSD's pledge().
> > +    (arguments
> > +     `(#:make-flags
> > +       (list "CC=gcc"
> > +             (string-append "PREFIX=" (assoc-ref %outputs "out")))
> > +       #:phases
> > +       (modify-phases %standard-phases
> > +         (delete 'configure)
> > +         (delete 'check)))) ; no test suite
> 
> I think it's better to add “#:tests? #f” to arguments instead, as we do
> for other packages.
> 
> > +    (native-inputs
> > +     `(("pkg-config" ,pkg-config)))
> > +    (inputs
> > +     `(("libbsd" ,libbsd)))
> > +    (synopsis "Create and verify cryptographic signatures")
> > +    (description "The signify utility creates and verifies cryptographic
> > +signatures using the elliptic curve Ed25519.")
> > +    (home-page "https://github.com/aperezdc/signify")
> > +    (license (list bsd-3 bsd-4 isc public-domain non-copyleft))))
> 
> The same note as for 'libbsd': non-copyleft is a procedure.

Thanks for the review! I've made all the requested changes.