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 ms0.migadu.com with LMTPS id eJTjFMgTnGDPfwAAgWs5BA (envelope-from ) for ; Wed, 12 May 2021 19:43:36 +0200 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 KIKfEMgTnGCXVwAA1q6Kng (envelope-from ) for ; Wed, 12 May 2021 17:43:36 +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 A873B13733 for ; Wed, 12 May 2021 19:43:35 +0200 (CEST) Received: from localhost ([::1]:35606 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lgstS-0002ij-QU for larch@yhetil.org; Wed, 12 May 2021 13:43:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37156) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lgssy-000267-Au for guix-patches@gnu.org; Wed, 12 May 2021 13:43:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:57141) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lgssy-0006Lq-35 for guix-patches@gnu.org; Wed, 12 May 2021 13:43:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lgssy-00052p-1I for guix-patches@gnu.org; Wed, 12 May 2021 13:43:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48382] [PATCH 2/6] gnu: pep-engine: Update to 2.1.33. Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 12 May 2021 17:43:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48382 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 48382@debbugs.gnu.org X-Debbugs-Original-To: 48382@debbugs.gnu.org, guix-patches@gnu.org Received: via spool by 48382-submit@debbugs.gnu.org id=B48382.162084134819217 (code B ref 48382); Wed, 12 May 2021 17:43:03 +0000 Received: (at 48382) by debbugs.gnu.org; 12 May 2021 17:42:28 +0000 Received: from localhost ([127.0.0.1]:40427 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lgssN-0004zk-7C for submit@debbugs.gnu.org; Wed, 12 May 2021 13:42:27 -0400 Received: from mail-out.m-online.net ([212.18.0.9]:34435) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lgssJ-0004zX-8S for 48382@debbugs.gnu.org; Wed, 12 May 2021 13:42:25 -0400 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 4FgMYp1hzNz1qtdD; Wed, 12 May 2021 19:42:22 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 4FgMYn70zyz1qqwr; Wed, 12 May 2021 19:42:21 +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 aPfORNiwxllf; Wed, 12 May 2021 19:42:20 +0200 (CEST) Received: from hermia.goebel-consult.de (ppp-188-174-59-106.dynamic.mnet-online.de [188.174.59.106]) (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; Wed, 12 May 2021 19:42:20 +0200 (CEST) Received: from lenashee.fritz.box (lenashee.goebel-consult.de [192.168.110.2]) by hermia.goebel-consult.de (Postfix) with ESMTP id 50655601BC; Wed, 12 May 2021 19:42:29 +0200 (CEST) From: Hartmut Goebel Date: Wed, 12 May 2021 19:42:14 +0200 Message-Id: <46b2f04953e187f316d030a248c34fe452abe3ba.1620840984.git.h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.21.4 In-Reply-To: <9f40b4002667ba7c9e83f4c9aab84b7a88e94a19.1620840984.git.h.goebel@crazy-compilers.com> References: <9f40b4002667ba7c9e83f4c9aab84b7a88e94a19.1620840984.git.h.goebel@crazy-compilers.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1620841415; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=azPa3X7YZYTfJhsQdOx91xkdzdQC0xaTt2Z2XGA/65E=; b=gkn9VyS5eluUGEnc9xMD38+TeBEha4XVLvJNlAzF8Z84a/syjU5czZITkGrkqev3XXzOmv /orV6H7DboInTuHBB1M4AQr/65AbekmP+r0/wN6fpXf7ZuixEDIBeCO3tDzZ+uc9GToE58 VS3Dbs9+BGAXHtckwlAymSdf9qvXNgL7h+BvuAdonUDvgeAkd4y+Yce2fWA7DsVobeU6DB hTjuEE6FjFShjLxgCSiTre8Zj/qloNqZJS+RqGWK8HUk11AWkF8tOsvFlKjxi/HR91GsmJ kH+7GbnAo+CnyeqJ/JySgR+nIGKcahkboKjADZBda+ZR0pq2IlMWh2MjBfj0LQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1620841415; a=rsa-sha256; cv=none; b=Z47CYS3ebIV9s7V979+JVXDJQO8ytRNgaEK3YgLO3PCKasO14+aFTB6qk3h+1IENWKsvaB TgKpAx4Q19MEMjKw0dkZLFAhSZ4JN4WbcVmMQ7S+1dWhHTUu2zNKFyI1igIOpS9cRtO0+p N2xzuroTzPLfQUQJDg6xLrrH0wbFp9K7Al5v0brD62fig3nEM6TYezZbTVp6MRrzWjOfze jfkogLvQaUJDFLdi/c6NDF/r9lWjJ6JM0cU+cp5y8si0ynU+9XCncn2SpmVS7Oa2xx+bn7 mP1JzZgjARtTGu/ie/UExsxHNsKMkvQ+R/Bu49/k5XpnHAvh/8fVcxUkGRar+g== ARC-Authentication-Results: i=1; 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-Migadu-Spam-Score: 2.55 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-Migadu-Queue-Id: A873B13733 X-Spam-Score: 2.55 X-Migadu-Scanner: scn0.migadu.com X-TUID: jdQVQSdHly6u * gnu/packages/pep.scm (fdik-libetpan): Update to current development version. [source]: Switch to pep.foundation. (pep-engine): Update to 2.1.33. [source]: Switch to new git repo. [arguments]: Enable release-build. [inputs]: Use normal sequoia. * gnu/packages/sequoia.scm (sequoia4pEp): Remove variable. --- gnu/packages/pep.scm | 25 +++++++------- gnu/packages/sequoia.scm | 74 ---------------------------------------- 2 files changed, 13 insertions(+), 86 deletions(-) diff --git a/gnu/packages/pep.scm b/gnu/packages/pep.scm index 6d24534f7e..b0bc492f29 100644 --- a/gnu/packages/pep.scm +++ b/gnu/packages/pep.scm @@ -65,9 +65,9 @@ shell provides options to redirect the output into a pipe or a file.") (define fdik-libetpan ;; pEp Engine requires libetpan with a set of patches that have not been ;; upstreamed yet. - (let ((commit "210ba2b3b310b8b7a6ee4a4e35e50f7fa379643f") ; 2020-06-03 - (checksum "00000nij3ray7nssvq0lzb352wmnab8ffzk7dgff2c68mvjbh1l6") - (revision "5")) + (let ((commit "0b80c39dd1504462ba3a39dc53db7c960c3a63f3") ; 2020-11-27 + (checksum "0gv3ivaziadybjlf6rfpv1j5z5418243v5cvl4swlxd2njsh7gjk") + (revision "6")) (package (inherit libetpan) (name "fdik-libetpan") @@ -77,7 +77,7 @@ shell provides options to redirect the output into a pipe or a file.") (inherit (package-source libetpan)) (method git-fetch) (uri (git-reference - (url "https://github.com/fdik/libetpan") + (url "https://gitea.pep.foundation/pEp.foundation/libetpan") (commit commit))) (file-name (string-append name "-" version)) (sha256 (base32 checksum))))))) @@ -85,19 +85,20 @@ shell provides options to redirect the output into a pipe or a file.") (define-public pep-engine (package (name "pep-engine") - (version "2.0.6") + (version "2.1.33") (source (origin - (method hg-fetch) - (uri (hg-reference - (url "https://pep.foundation/dev/repos/pEpEngine") - (changeset "ebb62ba262dd"))) ;; r4721 - (file-name (string-append name "-" version "-checkout")) + (method git-fetch) + (uri (git-reference + (url "https://gitea.pep.foundation/pEp.foundation/pEpEngine") + (commit (string-append "Release_" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 "0ljf79j4ng7l8w6pbdcrfzb4yk51zslypvq0n72ib1d7grqvnagi")))) + (base32 "1nhrdal4yl9kmwfsxg13p5694n7dnb926h3fvcvg6q6ka2zmlrgd")))) (build-system gnu-build-system) (arguments '(#:parallel-build? #f + #:make-flags '("NDEBUG=1") ; release build #:phases (modify-phases %standard-phases (replace 'configure @@ -132,7 +133,7 @@ OPENPGP=SEQUOIA ("libiconv" ,libiconv) ("nettle" ,nettle) ("openssl" ,openssl) - ("sequoia" ,sequoia4pEp) + ("sequoia" ,sequoia) ("sqlite3" ,sqlite) ("util-linux" ,util-linux "lib"))) ;; uuid.h (home-page "https://pep.foundation/") diff --git a/gnu/packages/sequoia.scm b/gnu/packages/sequoia.scm index cb1e2a4872..2c68f43e36 100644 --- a/gnu/packages/sequoia.scm +++ b/gnu/packages/sequoia.scm @@ -218,77 +218,3 @@ several crates, providing both a low-level and a high-level API for dealing with OpenPGP data.") (license license:gpl2+))) - -(define-public 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)))) - (arguments - (substitute-keyword-arguments (package-arguments sequoia) - ((#:cargo-inputs _) - `(("rust-anyhow" ,rust-anyhow-1) - ("rust-base64" ,rust-base64-0.11) - ("rust-bzip2" ,rust-bzip2-0.3) - ("rust-capnp" ,rust-capnp-0.10) - ("rust-capnp-rpc" ,rust-capnp-rpc-0.10) - ("rust-chrono" ,rust-chrono-0.4) - ("rust-clap" ,rust-clap-2) - ("rust-crossterm" ,rust-crossterm-0.13) - ("rust-dirs" ,rust-dirs-2) - ("rust-flate2" ,rust-flate2-1) - ("rust-fs2" ,rust-fs2-0.4) - ("rust-futures" ,rust-futures-0.1) - ("rust-http" ,rust-http-0.1) - ("rust-hyper" ,rust-hyper-0.12) - ("rust-hyper-tls" ,rust-hyper-tls-0.3) - ("rust-idna" ,rust-idna-0.2) - ("rust-itertools" ,rust-itertools-0.8) - ("rust-lalrpop" ,rust-lalrpop-0.17) - ("rust-lalrpop-util" ,rust-lalrpop-util-0.17) - ("rust-lazy-static" ,rust-lazy-static-1) - ("rust-libc" ,rust-libc-0.2) - ("rust-memsec" ,rust-memsec-0.5) - ("rust-native-tls" ,rust-native-tls-0.2) - ("rust-nettle" ,rust-nettle-7) - ("rust-percent-encoding" ,rust-percent-encoding-2) - ("rust-prettytable-rs" ,rust-prettytable-rs-0.8) - ("rust-proc-macro2" ,rust-proc-macro2-1) - ("rust-quickcheck" ,rust-quickcheck-0.9) - ("rust-quote" ,rust-quote-1) - ("rust-rand" ,rust-rand-0.7) - ("rust-regex" ,rust-regex-1) - ("rust-rpassword" ,rust-rpassword-4) - ("rust-rusqlite" ,rust-rusqlite-0.19) - ("rust-sha2" ,rust-sha2-0.8) - ("rust-syn" ,rust-syn-1) - ("rust-tempfile" ,rust-tempfile-3) - ("rust-thiserror" ,rust-thiserror-1) - ("rust-tokio" ,rust-tokio-0.1) - ("rust-tokio-core" ,rust-tokio-core-0.1) - ("rust-tokio-io" ,rust-tokio-io-0.1) - ("rust-unicode-normalization" ,rust-unicode-normalization-0.1) - ("rust-url" ,rust-url-2) - ("rust-zbase32" ,rust-zbase32-0.1))) - ((#:cargo-development-inputs _) - `(("rust-assert-cli" ,rust-assert-cli-0.6) - ("rust-colored" ,rust-colored-1) - ("rust-filetime" ,rust-filetime-0.2))) - ((#:phases phases) - `(modify-phases ,phases - (replace 'unpin-deps - (lambda _ - (substitute* (find-files "." "Cargo.toml") - (("= \"<") "= \"") - (("= \"=") "= \"")) - #t)))))) - (properties `((hidden? . #t))))) -- 2.21.4