From patchwork Sat May 23 18:51:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Hartmut Goebel X-Patchwork-Id: 22312 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 92FB527BBE3; Sat, 23 May 2020 19:52:19 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 0AADE27BBE1 for ; Sat, 23 May 2020 19:52:19 +0100 (BST) Received: from localhost ([::1]:33736 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jcZFq-0001G2-Jr for patchwork@mira.cbaines.net; Sat, 23 May 2020 14:52:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53296) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jcZFc-0000rb-DQ for guix-patches@gnu.org; Sat, 23 May 2020 14:52:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52348) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jcZFc-0005Gf-1r for guix-patches@gnu.org; Sat, 23 May 2020 14:52:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jcZFc-00006e-11 for guix-patches@gnu.org; Sat, 23 May 2020 14:52:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41490] [PATCH 1/5] gnu: Add yml2. Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 23 May 2020 18:52:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41490 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 41490@debbugs.gnu.org X-Debbugs-Original-To: 41490@debbugs.gnu.org, guix-patches@gnu.org Received: via spool by 41490-submit@debbugs.gnu.org id=B41490.159025988632707 (code B ref 41490); Sat, 23 May 2020 18:52:03 +0000 Received: (at 41490) by debbugs.gnu.org; 23 May 2020 18:51:26 +0000 Received: from localhost ([127.0.0.1]:35631 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jcZEo-0008Um-RD for submit@debbugs.gnu.org; Sat, 23 May 2020 14:51:26 -0400 Received: from mail-out.m-online.net ([212.18.0.9]:37172) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jcZEj-0008UT-Bl for 41490@debbugs.gnu.org; Sat, 23 May 2020 14:51:12 -0400 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 49TsrX66NHz1qrfh; Sat, 23 May 2020 20:51:08 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 49TsrX5vwmz1qr47; Sat, 23 May 2020 20:51: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 03Z6PGfiAC1r; Sat, 23 May 2020 20:51: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 20:51:07 +0200 (CEST) Received: from thisbe.fritz.box (unknown [192.168.110.24]) by hermia.goebel-consult.de (Postfix) with ESMTP id 6E07560203; Sat, 23 May 2020 20:51:09 +0200 (CEST) From: Hartmut Goebel Date: Sat, 23 May 2020 20:51:00 +0200 Message-Id: X-Mailer: git-send-email 2.21.3 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/pep.scm: New file. * gnu/locak.mk (GNU_SYSTEM_MODULES): Add it. --- gnu/local.mk | 1 + gnu/packages/pep.scm | 49 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+) create mode 100644 gnu/packages/pep.scm diff --git a/gnu/local.mk b/gnu/local.mk index 2f24f892b1..ac22c7f224 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -412,6 +412,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/pcre.scm \ %D%/packages/pdf.scm \ %D%/packages/pem.scm \ + %D%/packages/pep.scm \ %D%/packages/perl.scm \ %D%/packages/perl-check.scm \ %D%/packages/perl-compression.scm \ diff --git a/gnu/packages/pep.scm b/gnu/packages/pep.scm new file mode 100644 index 0000000000..9e5be66f78 --- /dev/null +++ b/gnu/packages/pep.scm @@ -0,0 +1,49 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2016, 2020 Hartmut Goebel +;;; +;;; 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 . + +(define-module (gnu packages pep) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages) + #:use-module (guix hg-download) + #:use-module (guix build-system python) + #:use-module (gnu packages) + #:use-module (gnu packages xml)) + +(define-public yml2 + (package + (name "yml2") + (version "2.6.3") + (source (origin + (method hg-fetch) + (uri (hg-reference + (url "https://pep.foundation/dev/repos/yml2") + (changeset version))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 "10jjjyq1mz18zkzvxd62aba00h69gd9cglisqcvb81j67ml2v1bx")))) + (build-system python-build-system) + (propagated-inputs + `(("python-lxml" ,python-lxml))) + (home-page "https://fdik.org/yml/") + (synopsis "Use a Domain Specific Language for XML without defining +a grammar") + (description "The YML compiler is a small Python script. It +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))) From patchwork Sat May 23 18:51:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Hartmut Goebel X-Patchwork-Id: 22313 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id AF21127BBE3; Sat, 23 May 2020 19:52:24 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id D84B727BBE1 for ; Sat, 23 May 2020 19:52:23 +0100 (BST) Received: from localhost ([::1]:34164 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jcZFv-0001Rq-Eo for patchwork@mira.cbaines.net; Sat, 23 May 2020 14:52:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53292) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jcZFb-0000qL-Ge for guix-patches@gnu.org; Sat, 23 May 2020 14:52:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52346) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jcZFb-0005GY-6U for guix-patches@gnu.org; Sat, 23 May 2020 14:52:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jcZFb-00006O-5y for guix-patches@gnu.org; Sat, 23 May 2020 14:52:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41490] [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 18:52:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41490 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 41490@debbugs.gnu.org X-Debbugs-Original-To: 41490@debbugs.gnu.org, guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.1590259897319 (code B ref -1); Sat, 23 May 2020 18:52:03 +0000 Received: (at submit) by debbugs.gnu.org; 23 May 2020 18:51:37 +0000 Received: from localhost ([127.0.0.1]:35652 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jcZFA-000052-N9 for submit@debbugs.gnu.org; Sat, 23 May 2020 14:51:37 -0400 Received: from lists.gnu.org ([209.51.188.17]:35042) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jcZF4-0008Vm-8q for submit@debbugs.gnu.org; Sat, 23 May 2020 14:51:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53252) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jcZF4-0000eH-0t for guix-patches@gnu.org; Sat, 23 May 2020 14:51:30 -0400 Received: from mail-out.m-online.net ([212.18.0.9]:60318) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jcZEo-0005Cf-IS for guix-patches@gnu.org; Sat, 23 May 2020 14:51:29 -0400 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 49Tsrc46rCz1qrfk; Sat, 23 May 2020 20:51:12 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 49Tsrc41dVz1qr47; Sat, 23 May 2020 20:51:12 +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 RXxQS7BR3PQ4; Sat, 23 May 2020 20:51:11 +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 20:51:11 +0200 (CEST) Received: from thisbe.fritz.box (unknown [192.168.110.24]) by hermia.goebel-consult.de (Postfix) with ESMTP id 89AAF60223; Sat, 23 May 2020 20:51:09 +0200 (CEST) From: Hartmut Goebel Date: Sat, 23 May 2020 20:51:01 +0200 Message-Id: <1e8aecfb44c33bc054486cbbc2b6f6f8eee7155f.1590259641.git.h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: References: MIME-Version: 1.0 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 14:48:50 X-ACL-Warn: Detected OS = Linux 3.11 and newer X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/pep.scm (fdik-libetpan, sequoia4pEp, pep-engine): New variables. --- gnu/packages/pep.scm | 106 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 106 insertions(+) diff --git a/gnu/packages/pep.scm b/gnu/packages/pep.scm index 9e5be66f78..57fb0e88f3 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,99 @@ 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 "Library for automatic key management and encryption of +messages") + (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)))) From patchwork Sat May 23 18:51:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Hartmut Goebel X-Patchwork-Id: 22310 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id D763127BBE1; Sat, 23 May 2020 19:52:11 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 6D8F627BBE1 for ; Sat, 23 May 2020 19:52:11 +0100 (BST) Received: from localhost ([::1]:32932 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jcZFi-0000uc-UN for patchwork@mira.cbaines.net; Sat, 23 May 2020 14:52:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53300) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jcZFd-0000t7-6a for guix-patches@gnu.org; Sat, 23 May 2020 14:52:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52350) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jcZFc-0005Gq-Sq for guix-patches@gnu.org; Sat, 23 May 2020 14:52:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jcZFc-00006u-SU for guix-patches@gnu.org; Sat, 23 May 2020 14:52:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41490] [PATCH 3/5] gnu: Add libpepadapter. Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 23 May 2020 18:52:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41490 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 41490@debbugs.gnu.org X-Debbugs-Original-To: 41490@debbugs.gnu.org, guix-patches@gnu.org Received: via spool by 41490-submit@debbugs.gnu.org id=B41490.159025989232746 (code B ref 41490); Sat, 23 May 2020 18:52:04 +0000 Received: (at 41490) by debbugs.gnu.org; 23 May 2020 18:51:32 +0000 Received: from localhost ([127.0.0.1]:35643 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jcZF5-0008Vz-NR for submit@debbugs.gnu.org; Sat, 23 May 2020 14:51:32 -0400 Received: from mail-out.m-online.net ([212.18.0.10]:45354) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jcZEq-0008Uo-Ub for 41490@debbugs.gnu.org; Sat, 23 May 2020 14:51:18 -0400 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 49Tsrh0RWTz1rrLM; Sat, 23 May 2020 20:51:16 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 49Tsrh0Jqlz1qr47; Sat, 23 May 2020 20:51:16 +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 5e5fMMvSfJNu; Sat, 23 May 2020 20:51:15 +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 20:51:15 +0200 (CEST) Received: from thisbe.fritz.box (unknown [192.168.110.24]) by hermia.goebel-consult.de (Postfix) with ESMTP id A2F8560271; Sat, 23 May 2020 20:51:09 +0200 (CEST) From: Hartmut Goebel Date: Sat, 23 May 2020 20:51:02 +0200 Message-Id: X-Mailer: git-send-email 2.21.3 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/pep.scm (libpepadapter): New variable. --- gnu/packages/pep.scm | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/gnu/packages/pep.scm b/gnu/packages/pep.scm index 57fb0e88f3..9452435c35 100644 --- a/gnu/packages/pep.scm +++ b/gnu/packages/pep.scm @@ -153,3 +153,44 @@ messages") privacy).") (license ;; code: GPL 3, docs: CC-BY-SA (list license:gpl3 license:cc-by-sa3.0)))) + +(define-public libpepadapter + (package + (name "libpepadapter") + (version "2.0.2") + (source + (origin + (method hg-fetch) + (uri (hg-reference + (url "https://pep.foundation/dev/repos/libpEpAdapter") + (changeset "e8fe371c870a"))) ;; r168 + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 "1mlpavjbnmslvmr5jxcvpjgb2x40nhmxjb10hza3kn4qzj0k1pjz")))) + (build-system gnu-build-system) + (arguments + '(#:test-target "test" + #:tests? #f ;; building the tests fails + #:phases + (modify-phases %standard-phases + (replace 'configure + ;; libpEpAdapter 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")) + (engine (assoc-ref inputs "pep-engine"))) + (with-output-to-file "local.conf" + (lambda _ ;() + (format #t " +PREFIX=~a +ENGINE_LIB_PATH=~a/lib +ENGINE_INC_PATH=~a/include +" out engine engine)))) + #t))))) + (inputs + `(("pep-engine" ,pep-engine))) + (home-page "https://pep.foundation/") + (synopsis "Library for building p≡p adapters") + (description "This C++ library provides common structures used in p≡p +(pretty Easy privacy) adapters.") + (license license:bsd-3))) From patchwork Sat May 23 18:51:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Hartmut Goebel X-Patchwork-Id: 22311 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 80F8427BBE1; Sat, 23 May 2020 19:52:12 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id ADDD327BBE3 for ; Sat, 23 May 2020 19:52:11 +0100 (BST) Received: from localhost ([::1]:32948 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jcZFj-0000v2-8k for patchwork@mira.cbaines.net; Sat, 23 May 2020 14:52:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53290) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jcZFb-0000pf-2Z for guix-patches@gnu.org; Sat, 23 May 2020 14:52:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52345) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jcZFa-0005GS-Op for guix-patches@gnu.org; Sat, 23 May 2020 14:52:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jcZFa-00006H-OU for guix-patches@gnu.org; Sat, 23 May 2020 14:52:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41490] [PATCH 4/5] gnu: Add python-pep-adapter. Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 23 May 2020 18:52:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41490 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 41490@debbugs.gnu.org X-Debbugs-Original-To: 41490@debbugs.gnu.org, guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.1590259893305 (code B ref -1); Sat, 23 May 2020 18:52:02 +0000 Received: (at submit) by debbugs.gnu.org; 23 May 2020 18:51:33 +0000 Received: from localhost ([127.0.0.1]:35650 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jcZF7-0008WR-7F for submit@debbugs.gnu.org; Sat, 23 May 2020 14:51:33 -0400 Received: from lists.gnu.org ([209.51.188.17]:35040) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jcZEw-0008VH-3I for submit@debbugs.gnu.org; Sat, 23 May 2020 14:51:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53244) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jcZEv-0000e8-S1 for guix-patches@gnu.org; Sat, 23 May 2020 14:51:21 -0400 Received: from mail-out.m-online.net ([2001:a60:0:28:0:1:25:1]:46669) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jcZEu-0005D8-Uo for guix-patches@gnu.org; Sat, 23 May 2020 14:51:21 -0400 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 49Tsrl55tFz1rrW7; Sat, 23 May 2020 20:51:19 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 49Tsrl4wxwz1qr47; Sat, 23 May 2020 20:51:19 +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 QgdhCtJVSfmM; Sat, 23 May 2020 20:51:18 +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 20:51:18 +0200 (CEST) Received: from thisbe.fritz.box (unknown [192.168.110.24]) by hermia.goebel-consult.de (Postfix) with ESMTP id C04006040A; Sat, 23 May 2020 20:51:09 +0200 (CEST) From: Hartmut Goebel Date: Sat, 23 May 2020 20:51:03 +0200 Message-Id: <05c78e9a13ada47901fcfee3438bddf571c60d7a.1590259641.git.h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: References: MIME-Version: 1.0 Received-SPF: none client-ip=2001:a60:0:28:0:1:25:1; 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 14:51:16 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, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/pep.scm (python-pep-adapter): New variable. --- gnu/packages/pep.scm | 53 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/gnu/packages/pep.scm b/gnu/packages/pep.scm index 9452435c35..bcef915970 100644 --- a/gnu/packages/pep.scm +++ b/gnu/packages/pep.scm @@ -25,6 +25,7 @@ #:use-module (guix build-system python) #:use-module (gnu packages) #:use-module (gnu packages base) + #:use-module (gnu packages boost) #:use-module (gnu packages linux) #:use-module (gnu packages mail) ; for libetpan #:use-module (gnu packages nettle) @@ -194,3 +195,55 @@ ENGINE_INC_PATH=~a/include (description "This C++ library provides common structures used in p≡p (pretty Easy privacy) adapters.") (license license:bsd-3))) + +(define-public python-pep-adapter + (package + (name "python-pep-adapter") + (version "2.0.5") + (source + (origin + (method hg-fetch) + (uri (hg-reference + (url "https://pep.foundation/dev/repos/pEpPythonAdapter") + (changeset "66df0e5b9405"))) ;; r374 + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 "107i1s8jf8gyhpmqcs64q9csxa3fwc8g7s57iyccqb4czw8gph6d")))) + (build-system python-build-system) + (arguments + `(;; Adding configure-flags does not work, running `build_ext` + ;; with these flags, neither does adding the options to + ;; `setup.cfg`: Either `build` or `install` fails (since + ;; flags are given or missing), or "command 'BuildExtCommand' + ;; has no such option 'pep_engine" + ;; '(#:configure-flags + ;; (list (string-append "--with-pEp-engine=" + ;; (assoc-ref inputs "pEpEngine")) + ;; (string-append "--with-pEp-libadapter=" + ;; (assoc-ref inputs "libpEpAdapter")) + ;; ;;(string-append "--boost=" + ;; (assoc-ref inputs "boost")) not supported + ;; (string-append "--with-asn1c-share=" + ;; (assoc-ref inputs "asn1c") "/share")) + #:phases + (modify-phases %standard-phases + (add-before 'build 'fix-setup.py + (lambda _ + (substitute* "setup.py" + (("^(\\s+SYS_INCLUDES = )\\['/usr.*" _ a) + (string-append a "os.getenv('CPATH', '').split(os.pathsep)\n")) + (("^(\\s+SYS_LIB_PREFIXES = )\\['/usr.*" _ a) + (string-append a "os.getenv('LIBRARY_PATH', '').split(os.pathsep)\n")) + (("^(\\s+SYS_SHARES = )\\['/usr.*" _ a) + (string-append a "['" (assoc-ref %build-inputs "asn1c") "/share']\n"))) + #t))))) + (inputs + `(("asn1c" ,asn1c) + ("boost-python" ,boost-with-python3) + ("libpepadapter" ,libpepadapter) + ("pep-engine" ,pep-engine))) + (home-page "https://pep.foundation/") + (synopsis "Python adapter for p≡p (pretty Easy Privacy)") + (description "The p≡p Python adapter is an adaptor interface to the p≡p +(pretty Easy privacy) engine.") + (license license:gpl3))) From patchwork Sat May 23 18:51:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Hartmut Goebel X-Patchwork-Id: 22317 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id CEDAE27BBE3; Sat, 23 May 2020 19:53:41 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 98C2B27BBE1 for ; Sat, 23 May 2020 19:53:40 +0100 (BST) Received: from localhost ([::1]:36282 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jcZHA-0002Ox-6Y for patchwork@mira.cbaines.net; Sat, 23 May 2020 14:53:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53294) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jcZFc-0000qv-3L for guix-patches@gnu.org; Sat, 23 May 2020 14:52:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52347) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jcZFb-0005Gc-KH for guix-patches@gnu.org; Sat, 23 May 2020 14:52:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jcZFb-00006W-Jp for guix-patches@gnu.org; Sat, 23 May 2020 14:52:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41490] [PATCH 5/5] gnu: Add java-pep-adapter. Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 23 May 2020 18:52:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41490 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 41490@debbugs.gnu.org X-Debbugs-Original-To: 41490@debbugs.gnu.org, guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.1590259898339 (code B ref -1); Sat, 23 May 2020 18:52:03 +0000 Received: (at submit) by debbugs.gnu.org; 23 May 2020 18:51:38 +0000 Received: from localhost ([127.0.0.1]:35656 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jcZFB-00005H-Nc for submit@debbugs.gnu.org; Sat, 23 May 2020 14:51:38 -0400 Received: from lists.gnu.org ([209.51.188.17]:35044) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jcZF6-0008W5-3z for submit@debbugs.gnu.org; Sat, 23 May 2020 14:51:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53256) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jcZF5-0000eM-Rv for guix-patches@gnu.org; Sat, 23 May 2020 14:51:31 -0400 Received: from mail-out.m-online.net ([212.18.0.9]:36604) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jcZEy-0005DW-Qo for guix-patches@gnu.org; Sat, 23 May 2020 14:51:31 -0400 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 49Tsrq5pM7z1qrfh; Sat, 23 May 2020 20:51:23 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 49Tsrq5cj7z1qr47; Sat, 23 May 2020 20:51:23 +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 Tb8-By-i99MW; Sat, 23 May 2020 20:51:22 +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 20:51:22 +0200 (CEST) Received: from thisbe.fritz.box (unknown [192.168.110.24]) by hermia.goebel-consult.de (Postfix) with ESMTP id DBA9860489; Sat, 23 May 2020 20:51:09 +0200 (CEST) From: Hartmut Goebel Date: Sat, 23 May 2020 20:51:04 +0200 Message-Id: X-Mailer: git-send-email 2.21.3 In-Reply-To: References: MIME-Version: 1.0 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 14:48:50 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/pep.scm (java-pep-adapter): New variable. --- gnu/packages/pep.scm | 100 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 100 insertions(+) diff --git a/gnu/packages/pep.scm b/gnu/packages/pep.scm index bcef915970..0f169efd22 100644 --- a/gnu/packages/pep.scm +++ b/gnu/packages/pep.scm @@ -26,6 +26,8 @@ #:use-module (gnu packages) #:use-module (gnu packages base) #:use-module (gnu packages boost) + #:use-module (gnu packages documentation) + #:use-module (gnu packages java) #:use-module (gnu packages linux) #:use-module (gnu packages mail) ; for libetpan #:use-module (gnu packages nettle) @@ -247,3 +249,101 @@ ENGINE_INC_PATH=~a/include (description "The p≡p Python adapter is an adaptor interface to the p≡p (pretty Easy privacy) engine.") (license license:gpl3))) + +(define-public java-pep-adapter + (package + (name "java-pep-adapter") + (version "2.0.2") + (source + (origin + (method hg-fetch) + (uri (hg-reference + (url "https://pep.foundation/dev/repos/pEpJNIAdapter") + (changeset "9292f1b1a76a"))) ;; r699 + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 "107ldpssc80bq8kndn2nqmav31gphj4lqagaiv3fddlfph4vji48")))) + (build-system gnu-build-system) + (outputs '("out" "doc")) + (arguments + `(#:test-target "test" + #:make-flags (list "doxy-all") + #:phases + (modify-phases %standard-phases + (add-before 'configure 'fix-includes + (lambda _ + (substitute* "src/jniutils.hh" + (("#pragma once\n" line) + (string-append line + "#include \n" + "#include \n" + "#include \n"))) + #t)) + (add-before 'configure 'pin-shared-lib-path + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "src/foundation/pEp/jniadapter/AbstractEngine.java" + (("System.loadLibrary\\(\"pEpJNI\"\\);") + (string-append "System.load(\"" + (assoc-ref outputs "out") + "/lib/libpEpJNI.so" "\");"))) + #t)) + (replace 'configure + ;; pEpJNIAdapter 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")) + (engine (assoc-ref inputs "pep-engine")) + (libadapter (assoc-ref inputs "libpepadapter")) + (openjdk (assoc-ref inputs "openjdk"))) + (with-output-to-file "local.conf" + (lambda _ ;() + (format #t " +PREFIX=~a +ENGINE_LIB_PATH=~a/lib +ENGINE_INC_PATH=~a/include +AD_LIB_PATH=~a/lib +AD_INC_PATH=~a/include +YML2_PROC=~a +JAVA_HOME=~a +" + out engine engine libadapter libadapter + (which "yml2proc") openjdk))) + (substitute* "src/Makefile" ;; suppress some warnings + (("^\\s+OLD_JAVA=") " xxx_OLD_JAVA=")) + #t))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (libout (string-append out "/lib/")) + (javaout (string-append out "/share/java/"))) + (mkdir-p libout) + (mkdir-p javaout) + (copy-file "src/libpEpJNI.so" + (string-append libout "/libpEpJNI.so")) + (copy-file "src/pEp.jar" (string-append javaout "/pEp.jar")) + #t))) + (add-after 'install 'install-docs + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "doc")) + (docout (string-append out "/share/doc/pEp-JNI-adapter")) + (cxxout (string-append docout "/cxx")) + (javaout (string-append docout "/java"))) + (mkdir-p cxxout) + (mkdir-p javaout) + (copy-recursively "doc/doxygen/cxx/html" cxxout) + (copy-recursively "doc/doxygen/java/html" javaout) + #t)))))) + (native-inputs + `(("doxygen" ,doxygen) + ("openjdk" ,openjdk9 "jdk") + ("which" ,which) + ("yml2" ,yml2))) + (inputs + `(("libpepadapter" ,libpepadapter) + ("pep-engine" ,pep-engine) + ("util-linux" ,util-linux))) ;; uuid.h + (home-page "https://pep.foundation/") + (synopsis "Java adapter for p≡p (pretty Easy Privacy)") + (description "The p≡p JNI adapter is a Java adapter interface to the p≡p +(pretty Easy privacy) engine.") + (license license:gpl3)))