;;; Copyright © 2013, 2015 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
+;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org>
;;;
;;; This file is part of GNU Guix.
;;;
#:use-module (gnu packages glib)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages ncurses)
+ #:use-module (gnu packages tls)
#:use-module (guix packages)
#:use-module (guix download)
- #:use-module (guix build-system gnu))
+ #:use-module (guix build-system gnu)
+ #:use-module (guix build-system python))
(define-public libgpg-error
(package
(name "libgpg-error")
- (version "1.18")
+ (version "1.19")
(source
(origin
(method url-fetch)
version ".tar.bz2"))
(sha256
(base32
- "0408v19h3h0q6w61g51hgbdg6cyw81nyzkh70qfprvsc3pkddwcz"))))
+ "12wpqhjlsw4iaanifbqm2kich6c7x7lm8a7zhy6x5ifm6c9hw4jk"))))
(build-system gnu-build-system)
(home-page "http://gnupg.org")
(synopsis "Library of error values for GnuPG components")
(define-public libassuan
(package
(name "libassuan")
- (version "2.2.0")
+ (version "2.2.1")
(source
(origin
(method url-fetch)
version ".tar.bz2"))
(sha256
(base32
- "1ikf9whfi7rg71qa610ynyv12qrw20zkn7zxgvvr9dp41gbqxxbx"))))
+ "1pp2kl5gc2vja41g3wk03h1hgh7gxy6pj354fb5n4lrlg6xqb4ll"))))
(build-system gnu-build-system)
(propagated-inputs
`(("libgpg-error" ,libgpg-error) ("pth" ,pth)))
(define-public libksba
(package
(name "libksba")
- (version "1.3.2")
+ (version "1.3.3")
(source
(origin
(method url-fetch)
version ".tar.bz2"))
(sha256
(base32
- "01l4hvcknk9nb4bvyb6aqaid19jg0wv3ik54j1b89hnzamwm75gb"))))
+ "11kp3h9l3b8ikydkcdkwgx45r662zi30m26ra5llyhfh6kz5yzqc"))))
(build-system gnu-build-system)
(propagated-inputs
`(("libgpg-error" ,libgpg-error)))
(define-public npth
(package
(name "npth")
- (version "1.1")
+ (version "1.2")
(source
(origin
(method url-fetch)
version ".tar.bz2"))
(sha256
(base32
- "0zyzwmk4mp6pas87jz35zx0jvwdz7x5b13w225gs73gcn8g5cv49"))))
+ "12n0nvhw4fzwp0k7gjv3rc6pdml0qiinbbfiz4ilg6pl5kdxvnvd"))))
(build-system gnu-build-system)
(home-page "http://www.gnupg.org")
(synopsis "Non-preemptive thread library")
(define-public gnupg
(package
(name "gnupg")
- (version "2.1.3")
+ (version "2.1.9")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnupg/gnupg/gnupg-" version
".tar.bz2"))
(sha256
(base32
- "1vf8fmwcq81abzw2mypz5j7m4xy0vl4z6lri5lxfbd2bsyq7ygi1"))))
+ "1dpp555glln6fldk72ad7lkrn8h3cr2bg714z5kfn2qrawx67dqw"))))
(build-system gnu-build-system)
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(inputs
`(("bzip2" ,bzip2)
("curl" ,curl)
+ ("gnutls" ,gnutls)
("libassuan" ,libassuan)
("libgcrypt" ,libgcrypt)
("libgpg-error" ,libgpg-error)
(define-public gnupg-2.0
(package (inherit gnupg)
- (version "2.0.27")
+ (version "2.0.28")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnupg/gnupg/gnupg-" version
".tar.bz2"))
(sha256
(base32
- "1wihx7dphacg9fy5wfj93h236lr1w5gwzh7ir3js37wi9cz6sr2p"))))
+ "0k2k399fnhfhhr4dvm8d6vs4ihq6gg06191lzfwikzaqmgj2w2ff"))))
+ (native-inputs '())
(inputs
`(("bzip2" ,bzip2)
("curl" ,curl)
(sha256
(base32
"11pxx26sfilh0vswylh9mhiifw5yffw7nn733zknw3sb0jfk22bz"))))
+ (native-inputs '())
(inputs
`(("zlib" ,zlib)
("bzip2" ,bzip2)
(define-public gpgme
(package
(name "gpgme")
- (version "1.5.4")
+ (version "1.5.5")
(source
(origin
(method url-fetch)
".tar.bz2"))
(sha256
(base32
- "0v7azxazsfakvhrxzj5ysvcxma0892c89d27c17fkj8mi3nc0f5v"))))
+ "01y28fkq52wwf4p470wscaxd2vgzl615irmafx3mj3380x8ksg8b"))))
(build-system gnu-build-system)
(propagated-inputs
;; Needs to be propagated because gpgme.h includes gpg-error.h.
`(("libgpg-error" ,libgpg-error)))
(inputs
- `(("gnupg" ,gnupg)
+ `(("gnupg" ,gnupg-2.0)
("libassuan" ,libassuan)))
(arguments '(#:make-flags '("GPG=gpg2")))
(home-page "http://www.gnupg.org/related_software/gpgme/")
and every application benefits from this.")
(license license:lgpl2.1+)))
+(define-public python-gnupg
+ (package
+ (name "python-gnupg")
+ (version "0.3.7")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "https://pypi.python.org/packages/source/p/"
+ "python-gnupg/python-gnupg-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1hg9gshk4b7raskj8mjadsjcv10axlx2z4xl4ag2f2bpi4f8chvq"))))
+ (build-system python-build-system)
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (replace 'check
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "test_gnupg.py"
+ ;; Test keyrings are missing, so this test fails.
+ (("'test_scan_keys'") "True")
+ (("def test_scan_keys") "def disabled__scan_keys")
+ ;; Unsure why this test fails.
+ (("'test_search_keys'") "True")
+ (("def test_search_keys") "def disabled__search_keys"))
+ (setenv "GPGBINARY" "gpg")
+ (setenv "USERNAME" "guixbuilder")
+ ;; The doctests are extremely slow and sometimes time out,
+ ;; so we disable them.
+ (zero? (system* "python"
+ "test_gnupg.py" "--no-doctests")))))))
+ (native-inputs
+ `(("gnupg" ,gnupg-1)))
+ (home-page "http://packages.python.org/python-gnupg/index.html")
+ (synopsis "Wrapper for the GNU Privacy Guard")
+ (description
+ "This module allows easy access to GnuPG’s key management, encryption
+and signature functionality from Python programs.")
+ (license license:bsd-3)))
+
+(define-public python2-gnupg
+ (package-with-python2 python-gnupg))
+
(define-public pius
(package
(name "pius")
- (version "2.0.11")
+ (version "2.1.1")
(source (origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/pgpius/pius/"
version "/pius-"
version ".tar.bz2"))
(sha256 (base32
- "0pdbyqz6k0bm182cz81ss7yckmpms5qhrrw0wcr4a1srzcjyzf5f"))))
- (build-system gnu-build-system)
- (inputs `(("perl" ,perl)
- ("python" ,python-2) ; uses the Python 2 'print' syntax
- ("gpg" ,gnupg)))
+ "0ry3kc3x1qjmvb581ja2z2v32r1rl1g8rhfj7iqvs8nzq4ca512i"))))
+ (build-system python-build-system)
+ (inputs `(("perl" ,perl) ;for 'pius-party-worksheet'
+ ("gpg" ,gnupg-2.0))) ;2.1 fails to talk to gpg-agent 2.0
(arguments
`(#:tests? #f
+ #:python ,python-2 ;uses the Python 2 'print' syntax
#:phases
- (alist-delete
- 'configure
- (alist-delete
- 'build
- (alist-replace
- 'install
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (gpg (string-append (assoc-ref inputs "gpg")
- "/bin/gpg2")))
- (mkdir out)
- (mkdir (string-append out "/bin"))
- (for-each (lambda (file)
- (substitute* file
- (("/usr/bin/gpg") gpg))
- (copy-file file (string-append out "/bin/" file)))
- '("pius" "pius-keyring-mgr" "pius-party-worksheet"))))
- %standard-phases)))))
+ (modify-phases %standard-phases
+ (add-before
+ 'build 'set-gpg-file-name
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let* ((gpg (string-append (assoc-ref inputs "gpg")
+ "/bin/gpg2")))
+ (substitute* "libpius/constants.py"
+ (("/usr/bin/gpg") gpg))))))))
(synopsis "Programs to simplify GnuPG key signing")
(description
"Pius (PGP Individual UID Signer) helps attendees of PGP keysigning
(define-public pinentry
(package
(name "pinentry")
- (version "0.9.0")
+ (version "0.9.5")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnupg/pinentry/pinentry-"
version ".tar.bz2"))
(sha256
(base32
- "1awhajq21hcjgqfxg9czaxg555gij4bba6axrwg8w6lfmc3ml14h"))))
+ "1338hj1h3sh34897120y30x12b64wyj3xjzzk5asm2hdzhxgsmva"))))
(build-system gnu-build-system)
(inputs
`(("ncurses" ,ncurses)
+ ("libassuan" ,libassuan)
("gtk+" ,gtk+-2)
("glib" ,glib)))
(native-inputs