From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34891) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dmZmp-00044D-Sf for guix-patches@gnu.org; Tue, 29 Aug 2017 02:14:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dmZmo-0005l6-8F for guix-patches@gnu.org; Tue, 29 Aug 2017 02:14:07 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:51332) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dmZmo-0005l1-3N for guix-patches@gnu.org; Tue, 29 Aug 2017 02:14:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dmZmn-0001x3-Ts for guix-patches@gnu.org; Tue, 29 Aug 2017 02:14:05 -0400 Subject: [bug#28272] [PATCH 12/12] gnu: Update signing-party. Resent-Message-ID: From: Christopher Baines Date: Tue, 29 Aug 2017 07:13:05 +0100 Message-Id: <20170829061305.2290-12-mail@cbaines.net> In-Reply-To: <20170829061305.2290-1-mail@cbaines.net> References: <20170829061305.2290-1-mail@cbaines.net> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 28272@debbugs.gnu.org Also add more inputs to make the caff program run. I haven't successfully used it yet though. * gnu/packages/gnupg.scm (signing-party)[version]: Update to 2.6. [source]: Update origin sha256. [native-inputs]: Add autoconf and automake. [inputs]: Add perl-text-template, perl-mime-tools, perl-gnupg-interface and perl-net-idn-encode as these are required by caff. Also add libmd as this is required by TODO. [arguments]: Add the change-directory and wrap-programs phase, and fix a regex and Makefile path in the configure phase. --- gnu/packages/gnupg.scm | 40 +++++++++++++++++++++++++++++----------- 1 file changed, 29 insertions(+), 11 deletions(-) diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index b1b63caa2..a518c8e7b 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -32,8 +32,10 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (gnu packages) #:use-module (gnu packages adns) + #:use-module (gnu packages autotools) #:use-module (gnu packages base) #:use-module (gnu packages curl) + #:use-module (gnu packages crypto) #:use-module (gnu packages openldap) #:use-module (gnu packages perl) #:use-module (gnu packages pth) @@ -605,38 +607,48 @@ PGP keysigning parties.") (define-public signing-party (package (name "signing-party") - (version "1.1.4") + (version "2.6") (source (origin (method url-fetch) (uri (string-append "mirror://debian/pool/main/s/signing-party/" "signing-party_" version ".orig.tar.gz")) (sha256 (base32 - "188gp0prbh8qs29lq3pbf0qibfd6jq4fk7i0pfrybl8aahvm84rx")))) + "1n5bpcfpl9vg1xp6r1jhbyahrgdyxp05b5pria1rh4m0qnv8sifr")))) (build-system gnu-build-system) - (inputs `(("perl" ,perl))) + (native-inputs + `(("autoconf" ,(autoconf-wrapper)) + ("automake" ,automake))) + (inputs `(("perl" ,perl) + ("perl-text-template" ,perl-text-template) + ("perl-mime-tools" ,perl-mime-tools) + ("perl-gnupg-interface" ,perl-gnupg-interface) + ("perl-net-idn-encode" ,perl-net-idn-encode) + ("libmd" ,libmd))) (arguments `(#:tests? #f #:phases (modify-phases %standard-phases - (add-after 'unpack 'remove-spurious-links - (lambda _ (delete-file "keyanalyze/pgpring/depcomp"))) + (add-before 'configure 'change-directory + (lambda _ + ;; The build system in the unpack phase changes to a less useful + ;; subdirectory, so move up one level + (chdir (dirname (getcwd))))) (replace 'configure (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) (substitute* "keyanalyze/Makefile" (("LDLIBS") (string-append "CC=" (which "gcc") "\nLDLIBS"))) (substitute* "keyanalyze/Makefile" - (("./configure") (string-append "./configure --prefix=" out))) - (substitute* "keyanalyze/pgpring/configure" - (("/bin/sh") (which "sh"))) - (substitute* "gpgwrap/Makefile" + (("\\./configure") (string-append "./configure --prefix=" out))) + (substitute* "gpgwrap/src/Makefile" (("\\} clean") (string-append "} clean\ninstall:\n\tinstall -D bin/gpgwrap " out "/bin/gpgwrap\n"))) (substitute* '("gpgsigs/Makefile" "keyanalyze/Makefile" "keylookup/Makefile" "sig2dot/Makefile" "springgraph/Makefile") - (("/usr") out))))) + (("/usr") out)) + (setenv "CONFIG_SHELL" (which "sh"))))) (replace 'install (lambda* (#:key outputs #:allow-other-keys #:rest args) (let ((out (assoc-ref outputs "out")) @@ -661,7 +673,13 @@ PGP keysigning parties.") '("caff.1" "pgp-clean.1" "pgp-fixkey.1" "gpgdir.1" "gpg-key2ps.1" "gpglist.1" "gpg-mailkeys.1" "gpgparticipants.1" "gpgsigs.1" "gpgwrap.1" - "process_keys.1" "pgpring.1" "keyanalyze.1")))))))) + "process_keys.1" "pgpring.1" "keyanalyze.1"))))) + (add-after 'install 'wrap-programs + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out"))) + (wrap-program + (string-append out "/bin/caff") + `("PERL5LIB" ":" prefix (,(getenv "PERL5LIB")))))))))) (synopsis "Collection of scripts for simplifying gnupg key signing") (description "Signing-party is a collection for all kinds of PGP/GnuPG related things, -- 2.14.1