From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id gCQhFxnmyF47PQAA0tVLHw (envelope-from ) for ; Sat, 23 May 2020 09:00:09 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id wAMaExnmyF4mbgAA1q6Kng (envelope-from ) for ; Sat, 23 May 2020 09:00:09 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id CB16D940607 for ; Sat, 23 May 2020 09:00:08 +0000 (UTC) Received: from localhost ([::1]:45252 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jcQ0l-0001v9-Mf for larch@yhetil.org; Sat, 23 May 2020 05:00:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37926) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jcQ0g-0001ul-Qs for guix-patches@gnu.org; Sat, 23 May 2020 05:00:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50095) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jcQ0g-0003Zy-HA for guix-patches@gnu.org; Sat, 23 May 2020 05:00:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jcQ0g-0003py-Fg for guix-patches@gnu.org; Sat, 23 May 2020 05:00:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41475] [PATCH 2/5] gnu: Add pep-engine. Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 23 May 2020 09:00:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 41475 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 41474@debbugs.gnu.org, 41475@debbugs.gnu.org X-Debbugs-Original-To: 41474@debbugs.gnu.org, guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.159022435714578 (code B ref -1); Sat, 23 May 2020 09:00:02 +0000 Received: (at submit) by debbugs.gnu.org; 23 May 2020 08:59:17 +0000 Received: from localhost ([127.0.0.1]:33391 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jcPzx-0003my-D8 for submit@debbugs.gnu.org; Sat, 23 May 2020 04:59:17 -0400 Received: from lists.gnu.org ([209.51.188.17]:47562) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jcPzq-0003mC-QS for submit@debbugs.gnu.org; Sat, 23 May 2020 04:59:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37854) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jcPzq-0001tL-IO for guix-patches@gnu.org; Sat, 23 May 2020 04:59:10 -0400 Received: from mail-out.m-online.net ([212.18.0.9]:51796) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jcPzp-0003LN-H7 for guix-patches@gnu.org; Sat, 23 May 2020 04:59:10 -0400 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 49TcjS3kWpz1qrfD; Sat, 23 May 2020 10:59:08 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 49TcjS27MCz1qspy; Sat, 23 May 2020 10:59:08 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id lKYSBn2Pa1_Q; Sat, 23 May 2020 10:59:07 +0200 (CEST) Received: from hermia.goebel-consult.de (ppp-188-174-50-23.dynamic.mnet-online.de [188.174.50.23]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS; Sat, 23 May 2020 10:59:07 +0200 (CEST) Received: from thisbe.fritz.box (unknown [192.168.110.24]) by hermia.goebel-consult.de (Postfix) with ESMTP id BF8F3601B3; Sat, 23 May 2020 10:59:04 +0200 (CEST) From: Hartmut Goebel Date: Sat, 23 May 2020 10:58:58 +0200 Message-Id: <0a89d83f3b7d0c7923d6f868b81de98849a2ec15.1590224092.git.h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: none client-ip=212.18.0.9; envelope-from=h.goebel@crazy-compilers.com; helo=mail-out.m-online.net X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/23 04:56:52 X-ACL-Warn: Detected OS = Linux 3.11 and newer X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -3.3 (---) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: -0.01 X-TUID: gbKG27hvQ/2E * gnu/packages/pep.scm (fdik-libetpan, sequoia4pEp, pep-engine): New variables. --- gnu/packages/pep.scm | 105 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 105 insertions(+) diff --git a/gnu/packages/pep.scm b/gnu/packages/pep.scm index 9e5be66f78..d69e1a3929 100644 --- a/gnu/packages/pep.scm +++ b/gnu/packages/pep.scm @@ -19,9 +19,19 @@ (define-module (gnu packages pep) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) + #:use-module (guix git-download) #:use-module (guix hg-download) + #:use-module (guix build-system gnu) #:use-module (guix build-system python) #:use-module (gnu packages) + #:use-module (gnu packages base) + #:use-module (gnu packages linux) + #:use-module (gnu packages mail) ; for libetpan + #:use-module (gnu packages nettle) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages sequoia) + #:use-module (gnu packages sqlite) + #:use-module (gnu packages tls) #:use-module (gnu packages xml)) (define-public yml2 @@ -47,3 +57,98 @@ provides the command line front end yml2c. As default, it compiles your script and outputs to stdout, that usually is the terminal. Your shell provides options to redirect the output into a pipe or a file.") (license license:gpl2))) + +(define fdik-libetpan + ;; pEp Engine requires libetpan with a set of patches that have not been + ;; upstreamed yet. + (let ((commit "370050956b7ee95b0c3b54c018b40ad1f366683a") ; 2019-11-12 + (checksum "0lcqcnij3ray7nssvq0lzb352wmnab8ffzk7dgff2c68mvjbh1l6") + (revision "4")) + (package + (inherit libetpan) + (name "fdik-libetpan") + (version (string-append "1.6-" revision "." (string-take commit 8))) + (source + (origin + (inherit (package-source libetpan)) + (method git-fetch) + (uri (git-reference + (url "https://github.com/fdik/libetpan") + (commit commit))) + (file-name (string-append name "-" version)) + (sha256 (base32 checksum))))))) + +(define sequoia4pEp + ;; Currently pEp Engine requires sequoia in not-so-current version + (package/inherit sequoia + (name "sequoia") + (version "0.15.0-pEp") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/sequoia-pgp/sequoia.git") + (commit "0eb1b6cd846ea8c36b3dfdf01ec88383fc64f2fe"))) + (sha256 + (base32 "06dqs9whwp9lfibwp8dqm0aw4nm3s3v4jp2n4fz51zcvsld40nfh")) + (file-name (git-file-name name version)))))) + +(define-public pep-engine + (package + (name "pep-engine") + (version "2.0.5") + (source + (origin + (method hg-fetch) + (uri (hg-reference + (url "https://pep.foundation/dev/repos/pEpEngine") + (changeset "3db667f48863"))) ;; r4701 + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 "0ljf79j4ng7l8w6pbdcrfzb4yk51zslypvq0n72ib1d7grqvnagi")))) + (build-system gnu-build-system) + (arguments + '(#:parallel-build? #f + #:phases + (modify-phases %standard-phases + (replace 'configure + ;; pEpEngie does not use autotools and configure, + ;; but a local.conf. We need to tweak the values there. + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (yml2 (assoc-ref inputs "yml2"))) + (with-output-to-file "local.conf" + (lambda () + (format #t " +PREFIX=~a +PER_MACHINE_DIRECTORY=${PREFIX}/share/pEp +SYSTEM_DB=~a/share/pEp/system.db +ASN1C=~a +YML2_PATH=~a +OPENPGP=SEQUOIA +" + out out (which "asn1c") + (string-append yml2 "/bin")))) + #t))) + (delete 'check) + (add-after 'install 'install-db + (lambda _ + (invoke "make" "-C" "db" "install")))))) + (native-inputs + `(("asn1c" ,asn1c) ; >= 0.9.27 + ("pkg-config" ,pkg-config) + ("yml2" ,yml2))) + (inputs + `(("libetpan" ,fdik-libetpan) + ("libiconv" ,libiconv) + ("nettle" ,nettle) + ("openssl" ,openssl) + ("sequoia" ,sequoia4pEp) + ("sqlite3" ,sqlite) + ("util-linux" ,util-linux "lib"))) ;; uuid.h + (home-page "https://pep.foundation/") + (synopsis "p≡p engine") + (description "The p≡p engine is the core part of p≡p (pretty Easy +privacy).") + (license ;; code: GPL 3, docs: CC-BY-SA + (list license:gpl3 license:cc-by-sa3.0)))) -- 2.21.3