From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andreas Enge Subject: Gnupg update Date: Thu, 19 Feb 2015 22:05:21 +0100 Message-ID: <20150219210521.GA12129@debian> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="pf9I7BMVVzbSWLtt" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:51729) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YOYHq-0007ZD-5W for guix-devel@gnu.org; Thu, 19 Feb 2015 16:05:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YOYHn-0001VK-Cy for guix-devel@gnu.org; Thu, 19 Feb 2015 16:05:30 -0500 Received: from mout.kundenserver.de ([212.227.17.24]:59837) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YOYHm-0001VA-TO for guix-devel@gnu.org; Thu, 19 Feb 2015 16:05:27 -0500 Content-Disposition: inline List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: guix-devel@gnu.org --pf9I7BMVVzbSWLtt Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Hello, the attached patch updates gnupg to the most recent version 2.1.2. As Mark Weaver pointed out to me, it might be judicious to keep the previous version as gnupg-2.0 because the interface has changed. Andreas --pf9I7BMVVzbSWLtt Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="0001-gnu-gnupg-Add-version-2.1.2.patch" >From 32f7763e007cf0a690b21072ff4acaeadb213e54 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Thu, 19 Feb 2015 22:01:03 +0100 Subject: [PATCH] gnu: gnupg: Add version 2.1.2. * gnu/packages/gnupg.scm (gnupg): Update to 2.1.2. * gnu/packages/gnupg.scm (gnupg-2.0): Copy of previous package for version 2.0.26. --- gnu/packages/gnupg.scm | 40 +++++++++++++++++++++++++++++++++++----- 1 file changed, 35 insertions(+), 5 deletions(-) diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index a7b303b..584b1c6 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -190,14 +190,14 @@ compatible to GNU Pth.") (define-public gnupg (package (name "gnupg") - (version "2.0.26") + (version "2.1.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnupg/gnupg/gnupg-" version ".tar.bz2")) (sha256 (base32 - "1q5qcl5panrvcvpwvz6nl9gayl5a6vwvfhgdcxqpmbl2qc6y6n3p")))) + "14k7c5spai3yppz6izf1ggbnffskl54ln87v1wgy9pwism1mlks0")))) (build-system gnu-build-system) (inputs `(("bzip2" ,guix:bzip2) @@ -206,7 +206,7 @@ compatible to GNU Pth.") ("libgcrypt" ,libgcrypt) ("libgpg-error" ,libgpg-error) ("libksba" ,libksba) - ("pth" ,pth) + ("npth" ,npth) ("openldap" ,openldap) ("zlib" ,guix:zlib) ("readline" ,readline))) @@ -215,8 +215,8 @@ compatible to GNU Pth.") (alist-cons-before 'configure 'patch-config-files (lambda _ - (substitute* "tests/openpgp/Makefile.in" - (("/bin/sh") (which "bash")))) + (substitute* "tests/openpgp/defs.inc" + (("/bin/pwd") (which "pwd")))) %standard-phases))) (home-page "http://gnupg.org/") (synopsis "GNU Privacy Guard") @@ -229,6 +229,36 @@ components), libgpg-error (centralized GnuPG error values), and libskba (working with X.509 certificates and CMS data).") (license gpl3+))) +(define-public gnupg-2.0 + (package (inherit gnupg) + (version "2.0.26") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnupg/gnupg/gnupg-" version + ".tar.bz2")) + (sha256 + (base32 + "1q5qcl5panrvcvpwvz6nl9gayl5a6vwvfhgdcxqpmbl2qc6y6n3p")))) + (inputs + `(("bzip2" ,guix:bzip2) + ("curl" ,curl) + ("libassuan" ,libassuan) + ("libgcrypt" ,libgcrypt) + ("libgpg-error" ,libgpg-error) + ("libksba" ,libksba) + ("pth" ,pth) + ("openldap" ,openldap) + ("zlib" ,guix:zlib) + ("readline" ,readline))) + (arguments + `(#:phases + (alist-cons-before + 'configure 'patch-config-files + (lambda _ + (substitute* "tests/openpgp/Makefile.in" + (("/bin/sh") (which "bash")))) + %standard-phases))))) + (define-public gnupg-1 (package (inherit gnupg) (version "1.4.18") -- 2.2.1 --pf9I7BMVVzbSWLtt--