From debbugs-submit-bounces@debbugs.gnu.org Sat Dec 18 15:50:04 2021 Received: (at submit) by debbugs.gnu.org; 18 Dec 2021 20:50:04 +0000 Received: from localhost ([127.0.0.1]:44059 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mygeZ-0004b6-VS for submit@debbugs.gnu.org; Sat, 18 Dec 2021 15:50:04 -0500 Received: from lists.gnu.org ([209.51.188.17]:50662) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mygeY-0004ar-P6 for submit@debbugs.gnu.org; Sat, 18 Dec 2021 15:50:03 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48720) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mygeY-0004qU-I1 for guix-patches@gnu.org; Sat, 18 Dec 2021 15:50:02 -0500 Received: from mout.kundenserver.de ([212.227.126.134]:35971) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mygeW-0003FJ-Fq for guix-patches@gnu.org; Sat, 18 Dec 2021 15:50:02 -0500 Received: from hermia.goebel-consult.de ([46.87.136.58]) by mrelayeu.kundenserver.de (mreue011 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MIMOy-1mkRYe21Tw-00EMKQ for ; Sat, 18 Dec 2021 21:49:56 +0100 Received: from thisbe.fritz.box (thisbe.fritz.box [192.168.110.24]) by hermia.goebel-consult.de (Postfix) with ESMTP id 3F9B35F53C; Sat, 18 Dec 2021 21:50:05 +0100 (CET) From: Hartmut Goebel To: guix-patches@gnu.org Subject: [PATCH 00/42] Revising sequoia packaging and update to 1.6 Date: Sat, 18 Dec 2021 21:49:11 +0100 Message-Id: X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Cs: Efraim Flashner , Nicolas Goaziou , John Soo Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K1:1LHqynWTfSKqj1yunuIUajcxEl+R5sGfo6cEITPBjHzyGxn/E9P 89ZGZgz2vhZeXDCjjcTsrNWeLnltcobRYTxVhLkhOY+mqUsFY19fEuizVeDt/TF+fE/SUSA g6ihRnN/hyo3tZvrJwrrXae1F9rAXnRm5fvIUjfRbA/23OZ3FEuJyPYlaz0sJwED79mFEMu fO5JJt//4NTS11XPL+ltQ== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:OtMEqfL3U6I=:Rf2m/W4J66PaS4XvWfc3wJ 47w4VBeMkXHxm5dIqZDK4zDjSZMDR9xNaeAR4LaZNLQg/ZvYYk5jrhOQlxdMxntjW6t0DKdp0 pAdCedkbQSMhuP3nk79e3Ggn/rFnjirtzBsHrMxi6oCYjoPmgtx+YZWItDATxpihVeSzfYQi8 7VCOc+9nK+9NrcNkbvsS5uvITY9tP/0MBfutloURBfo3KVqNAsHdJJE9ikUXEGJEfB9oJABMl vdFKTN96nhzzQW/SHncQOQc0+oG3qMAtWmmwWCB0W25KZvK7Y0XIi01WletbPzjHmB3tLMFAr eZI9zN3NsEptkut8KReZ0VzndZHbqV+8jqEMifq0vAegf2dRBomh6AXuPv64sBth5OnbVWaAC agojX2vooEjhfF3yCgBazTkbTw+FrtEuNT3E80naDlafm5Self9uGsVeilDixLUr8jOl+2eKU pr2LDucmQiDHTf4p7V06JX58Gj38Q5rzhD345YL7YOzgr0guHnIPwA+zyJCd8YFZtuoFJ7PT/ +e45EmT7fY+KMz70pa6b1xAkCgK/J0HiAN85cJW3YFepZ7hLvQJloAjhVde2RbapXfqq0mPtS /ccQ9+wjjBL9e9cWSaKc/neMWWVCqJkUlGu2nOc4lJ6meSjFHloLExutbcyhwgDxx7km5/eCr XWnPENuh0ibe03o5tKOY8EmnswfWdtRzIVnQkn0E2mBpuv8sraYqN3xzMTvRhjFsXMS02fk9U LP4BSg7fq9i4wTWo Received-SPF: none client-ip=212.227.126.134; envelope-from=h.goebel@crazy-compilers.com; helo=mout.kundenserver.de 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, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) This implements the following changes I announced some weeks ago, see . It also updates each sequoia package to its current version. * Move all sequoia related crates in to sequoia.scm. As of now these are only rust-sequoia-openpgp-0.9, rust-sequoia-rfc2822-0.9 and there is only on package depending on them rust-libpijul-0.12 * bufferedreader, rust-nettle and other crates from the sequoia project but not having "sequoia" (or such) in the name would be kept in crates-io.scm * In sequoia.scm there would be all sequoia crates, with the app packages named without "rust-" prefix ("sequoia-sq", …) * The current "sequoia" package will become a "wrapper", just propagating (or copying, what ever is more common in guix) the other packages which have an actual output. Hartmut Goebel (42): gnu: rust-nettle: Update to 7.0.2. gnu: rust-criterion-0.3: Update to 0.3.4. gnu: rust-serde-1: Update to 1.0.126. gnu: rust-serde-derive-1: Update to 1.0.126. gnu: rust-wasm-bindgen-futures-0.4: Update to 0.4.24. gnu: rust-wasm-bindgen-test-0.3: Update to 0.3.24. gnu: rust-wasm-bindgen-test-macro-0.3: Update to 0.3.24. gnu: rust-wasm-bindgen-0.2: Update to 0.2.74. gnu: rust-wasm-bindgen-backend-0.2: Update to 0.2.74. gnu: rust-wasm-bindgen-macro-0.2: Update to 0.2.74. gnu: rust-wasm-bindgen-macro-support-0.2: Update to 0.2.74. gnu: rust-wasm-bindgen-shared-0.2: Update to 0.2.74. gnu: rust-js-sys-0.3: Update to 0.3.51. gnu: rust-web-sys-0.3: Update to 0.3.51. gnu: rust-version-compare 0.0.11: Fix variable name. gnu: Add rust-ttf-parser-0.12. gnu: Add rust-gif-0.11. gnu: Add rust-fallible-collections-0.3. gnu: Add rust-target-lexicon-0.11. gnu: Add rust-dcv-color-primitives-0.1. gnu: Add rust-cfg-expr-0.7. gnu: Add rust-system-deps-3. gnu: Add rust-pathfinder-simd-0.5. gnu: Add rust-pathfinder-geometry-0.5. gnu: Add rust-freetype-0.7. gnu: Add rust-font-kit-0.10. gnu: Add rust-plotters-backend-0.3. gnu: Add rust-plotters-bitmap-0.3. gnu: Add rust-plotters-svg-0.3. gnu: Add rust-plotters-0.3. gnu: Add rust-buffered-reader-1. gnu: Add rust-xxhash-rust-0.8. gnu: Add rust-sequoia-openpgp-1. gnu: Add rust-sequoia-net-0.23. gnu: Add rust-sequoia-ipc-0.25. gnu: Add rust-sequoia-autocrypt-0.23. gnu: Add sequoia-sq. gnu: Add sequoia-sqv. gnu: Add libsequoia. gnu: sequoia: Change into a meta-package and update to 1.6.0. gnu: rust-sequoia-openpgp-0.9: Move to (gnu packages sequoia). gnu: rust-sequoia-rfc2822-0.9: Move to (gnu packages sequoia). gnu/local.mk | 2 + gnu/packages/crates-io.scm | 652 ++++++++++++------ .../patches/libsequoia-fix-ffi-Makefile.patch | 32 + .../patches/libsequoia-remove-store.patch | 432 ++++++++++++ gnu/packages/sequoia.scm | 600 ++++++++++++---- 5 files changed, 1399 insertions(+), 319 deletions(-) create mode 100644 gnu/packages/patches/libsequoia-fix-ffi-Makefile.patch create mode 100644 gnu/packages/patches/libsequoia-remove-store.patch -- 2.30.2 From debbugs-submit-bounces@debbugs.gnu.org Sat Dec 18 15:51:38 2021 Received: (at submit) by debbugs.gnu.org; 18 Dec 2021 20:51:38 +0000 Received: from localhost ([127.0.0.1]:44244 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mygg6-0004tc-0H for submit@debbugs.gnu.org; Sat, 18 Dec 2021 15:51:38 -0500 Received: from lists.gnu.org ([209.51.188.17]:51284) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mygfw-0004sa-Af for submit@debbugs.gnu.org; Sat, 18 Dec 2021 15:51:28 -0500 Received: from eggs.gnu.org ([209.51.188.92]:49496) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mygft-0005SL-2i for guix-patches@gnu.org; Sat, 18 Dec 2021 15:51:26 -0500 Received: from mout.kundenserver.de ([212.227.126.134]:38415) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mygfr-0003fc-Co for guix-patches@gnu.org; Sat, 18 Dec 2021 15:51:24 -0500 Received: from hermia.goebel-consult.de ([46.87.136.58]) by mrelayeu.kundenserver.de (mreue011 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MAOa3-1mnRL70Ef5-00BrkZ for ; Sat, 18 Dec 2021 21:51:22 +0100 Received: from thisbe.fritz.box (thisbe.fritz.box [192.168.110.24]) by hermia.goebel-consult.de (Postfix) with ESMTP id 97DE066159; Sat, 18 Dec 2021 21:50:12 +0100 (CET) From: Hartmut Goebel To: guix-patches@gnu.org Subject: [PATCH 37/42] gnu: Add sequoia-sq. Date: Sat, 18 Dec 2021 21:49:48 +0100 Message-Id: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K1:pRT2u+Ro+nkvQ9tJDTDVQJZask6kHNGQohAg3Xz+FagCQLryjVd 1NhEkmfCCRPEmkA6iHwdUFhDo92RlJB5x8XoHNFLlG8GYVzPuxgihUk0FN69EnTkic/axAu vP70wFXXhaaozyu+8uNcXUh68+VLsk2R9RzSAZrh6lWL13CungEYCH5QsM7FP1HJ9GIGw8m 2ZgQKuqDmTjv+hkKYoTBA== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:umhE/TVBqOk=:ko/Wa3ZTBmXSlTOP7P618Y UOYkCjvf/PhNcHU0xijsZj/4RoEbYnAmwQC1itZk6kf/3SejXZXauILAedOhJPZFc/wdP4pLL s1wfZpT4YcYvXHA6FYXsnyZf7Q/sPgad8qX130aNdlirG/y6NQFfSQhMkoTsVvaOYgfqhocSk 0Iczqv5d3KEQ2A678+uy/tXSa0/9s4i9TtcWnoJtLzZsh3HTAlY8CuO0TPyWyUQg56GWJEgpH 1SDlKe0Uq5am/fjZgTc1P16iRSd09J0I25CrL2WUxyhUzftTshb4EY+Fv2dz0z/VWt0iQm+3L x75i9HFK8M1OL2D2IjpXXSZxE32At9aEFG/LwMCoY8dhdjNLE7g2gcCVZ3MTi8/XNkJk1K6RO MvbBNN6oz8kLjRKsoqzoSJRj7HtaglPzs7uIGNIShcfSCmccf4X0xwSlP+5LPkbJ3Awf2FW2z YPXj1IdhfCzpPK0bd4XnxXmqdpaHePHWgXNUosHG3HeQs1Tt+ST/Z2K15GE0JuQYbMskREQj1 ltROYLiADWOT3IJ/+XepaU2UTAFbfUpXeJtmvcokPNTiWTpu2lL54jEbHxkzw8qYl5c0XgSrd xu/E4P3iW3lOlXnQRqx1Ogpyg8a57ViRbzu3nivs3cjeJWx8Eej5Gwp7qhb8uF6PhcQl/cxAd 3Qa/R2Fmd9sMhKMaQQdxFqTIt81a+icM/aEPZsn2rUKtcoDFSgDdUMRKdYaFmCyNbFSY1bLW5 /aNd26tKD/dm0+vW Received-SPF: none client-ip=212.227.126.134; envelope-from=h.goebel@crazy-compilers.com; helo=mout.kundenserver.de 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, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/sequoia.scm (sequoia-sq): New variable. --- gnu/packages/sequoia.scm | 51 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/gnu/packages/sequoia.scm b/gnu/packages/sequoia.scm index f228caf734..802feaba4f 100644 --- a/gnu/packages/sequoia.scm +++ b/gnu/packages/sequoia.scm @@ -248,6 +248,57 @@ version 3 compatibility) have been left out. The developers have also updated some OpenPGP defaults to avoid foot guns (e.g., they selected modern algorithm defaults). +This Guix package is built to use the nettle cryptographic library.") + (license license:lgpl2.0+))) + +(define-public sequoia-sq + (package + (name "sequoia-sq") + (version "0.25.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "sequoia-sq" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0j26vpp98i7zwwhqsvwj0zknj4s0s0ilfqpynj1vgd5laanhyr0d")))) + (build-system cargo-build-system) + (inputs + (list nettle openssl)) + (native-inputs + (list clang pkg-config)) + (arguments + `(#:tests? #f ;; tests require data-files not provided in the package + #:install-source? #f + #:cargo-inputs + (("rust-anyhow" ,rust-anyhow-1) + ("rust-buffered-reader" ,rust-buffered-reader-1) + ("rust-chrono" ,rust-chrono-0.4) + ("rust-clap" ,rust-clap-2) + ("rust-clap" ,rust-clap-2) + ("rust-itertools" ,rust-itertools-0.9) + ("rust-rpassword" ,rust-rpassword-5) + ("rust-sequoia-autocrypt" ,rust-sequoia-autocrypt-0.23) + ("rust-sequoia-net" ,rust-sequoia-net-0.23) + ("rust-sequoia-openpgp" ,rust-sequoia-openpgp-1) + ("rust-tempfile" ,rust-tempfile-3) + ("rust-term-size" ,rust-term-size-0.3) + ("rust-tokio" ,rust-tokio-0.2)) + #:cargo-development-inputs + (("rust-assert-cli" ,rust-assert-cli-0.6)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'remove-other-crypto-features + (lambda _ + (substitute* "Cargo.toml" + (("^crypto-cng =" line) (string-append "# " line)) + (("^crypto-rust =" line) (string-append "# " line))) + #t))))) + (home-page "https://sequoia-pgp.org/") + (synopsis "Command-line frontend for Sequoia OpenPGP") + (description "This package provides the command-line frontend for Sequoia +OpenPGP. + This Guix package is built to use the nettle cryptographic library.") (license license:lgpl2.0+))) -- 2.30.2 From debbugs-submit-bounces@debbugs.gnu.org Sat Dec 18 15:51:41 2021 Received: (at submit) by debbugs.gnu.org; 18 Dec 2021 20:51:41 +0000 Received: from localhost ([127.0.0.1]:44247 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mygg9-0004tw-Ax for submit@debbugs.gnu.org; Sat, 18 Dec 2021 15:51:41 -0500 Received: from lists.gnu.org ([209.51.188.17]:51416) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mygg8-0004tn-1J for submit@debbugs.gnu.org; Sat, 18 Dec 2021 15:51:40 -0500 Received: from eggs.gnu.org ([209.51.188.92]:49546) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mygg7-0005bx-1d for guix-patches@gnu.org; Sat, 18 Dec 2021 15:51:39 -0500 Received: from mout.kundenserver.de ([212.227.126.134]:44741) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mygfu-0003hd-UC for guix-patches@gnu.org; Sat, 18 Dec 2021 15:51:28 -0500 Received: from hermia.goebel-consult.de ([46.87.136.58]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MeUPU-1mOWyW1jee-00aSyG for ; Sat, 18 Dec 2021 21:51:24 +0100 Received: from thisbe.fritz.box (thisbe.fritz.box [192.168.110.24]) by hermia.goebel-consult.de (Postfix) with ESMTP id B5BF06615A; Sat, 18 Dec 2021 21:50:12 +0100 (CET) From: Hartmut Goebel To: guix-patches@gnu.org Subject: [PATCH 38/42] gnu: Add sequoia-sqv. Date: Sat, 18 Dec 2021 21:49:49 +0100 Message-Id: <856cde2f6f5108cd8badfe44c584757bacc760f5.1639859823.git.h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K1:MdYqq0xn2XfSBdi+qvsZWWmzHeUUieIwuGjDFN9PfzNsocvbt1C tThNGintbNUG//ApwHcwjT+YGzVSazwx+MRHw27wGWG6oCccqlhQN0zaTYSIXbiPTbiYWyz lvv+qrVBevk1jGIjo/HQOYjxABh/+UbjVqpi1+F0TbF1sqwGtS/OEMEQEhv6E//JxMgFlEG qLf27e0eIV5MBzo3YDFdg== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:UEsNAHEg+m8=:7l4UqrM1K2uJWdA6TnP5CU xNbB+qyaz6RNEKC0GMF/D1lOxNSQPVf+JkGIvBajOTGEl/DPOgEN4gN+jO6yhoxmhm3bdwte/ x3LwkA7WyuxyD067tyExrDAed9oytdSJVkfRanLWISIVORiq+vlvoFYGM4bpVvsu6mkG+lERj lNeELu6H1Ob4CRdysDHdR94UuS7MsFweG2t/69CdcOLxsh2PKg/aeFnl8LVw11BQSAmezHKnd yKk45J3MObLwMCD/4eCo8BPwEt3xd3EpH43vh15lPC0UCoAsbCkxTny6SzNJmK5Ect6AjpOPJ c4KvQzjf5geBq2x95QFYhLFl563mvpiiZ1Wy0jWoM/UFQs6434H9XLShaEmV0uFMGOzoOrPKK v3djYZm+5BrstsHdWOPrSl2OmP8X6LEfqisLM0kwJQDzNcMBOV/9CylCDzCLgkkOQrNCIF83S fLUr8qcjE6Q9kh+DEy1pNekl/DT9Jx5WspekC9Swz9pL3YH5xoOlaIvJHSNUHomC+5qxXq0j1 UpovZetg/G8OFTuiy/7NqVTQbaE47Evo1Ysg24p0/X3vMgUAOkjhYqMXHEBslRcBtJ4fY1+xE X8AjiW+bcJ2a0qesiQGxUUFG5vOvlTEQQ/yfvobfT2WWPVN1MwtuzfITzcpVH7r1SjM0YrhBj BeNCc81BXQZnymMPgjle03u1aiyO8b9w4Fav4ogyQT65YOGeynLvoQZdtIKLpRwk9RSGT7Ttm 8O5qxPsiTD5vwCR3 Received-SPF: none client-ip=212.227.126.134; envelope-from=h.goebel@crazy-compilers.com; helo=mout.kundenserver.de 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, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/sequoia.scm (sequoia-sqv): New variable. --- gnu/packages/sequoia.scm | 44 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/gnu/packages/sequoia.scm b/gnu/packages/sequoia.scm index 802feaba4f..70ac2e89cd 100644 --- a/gnu/packages/sequoia.scm +++ b/gnu/packages/sequoia.scm @@ -299,6 +299,50 @@ This Guix package is built to use the nettle cryptographic library.") (description "This package provides the command-line frontend for Sequoia OpenPGP. +This Guix package is built to use the nettle cryptographic library.") + (license license:lgpl2.0+))) + +(define-public sequoia-sqv + (package + (name "sequoia-sqv") + (version "1.0.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "sequoia-sqv" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0nrfjn64fm038x5dssipf7jxi27z741m5n5a7zsa9768zab1hr9d")))) + (build-system cargo-build-system) + (inputs + (list nettle openssl)) + (native-inputs + (list clang pkg-config)) + (arguments + `(#:tests? #f ;; tests require data-files not provided in the package + #:install-source? #f + #:cargo-inputs + (("rust-anyhow" ,rust-anyhow-1) + ("rust-chrono" ,rust-chrono-0.4) + ("rust-clap" ,rust-clap-2) + ("rust-clap" ,rust-clap-2) + ("rust-sequoia-openpgp" ,rust-sequoia-openpgp-1)) + #:cargo-development-inputs + (("rust-assert-cli" ,rust-assert-cli-0.6)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'remove-other-crypto-features + (lambda _ + (substitute* "Cargo.toml" + (("^crypto-cng =" line) (string-append "# " line)) + (("^crypto-rust =" line) (string-append "# " line))) + #t))))) + (home-page "https://sequoia-pgp.org/") + (synopsis "Simple OpenPGP signature verification program") + (description "@code{sqv} verifies detached OpenPGP signatures. It is a +replacement for @code{gpgv}. Unlike @code{gpgv}, it can take additional +constraints on the signature into account. + This Guix package is built to use the nettle cryptographic library.") (license license:lgpl2.0+))) -- 2.30.2 From debbugs-submit-bounces@debbugs.gnu.org Sat Dec 18 15:51:46 2021 Received: (at submit) by debbugs.gnu.org; 18 Dec 2021 20:51:47 +0000 Received: from localhost ([127.0.0.1]:44253 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1myggE-0004uS-Jr for submit@debbugs.gnu.org; Sat, 18 Dec 2021 15:51:46 -0500 Received: from lists.gnu.org ([209.51.188.17]:51476) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1myggC-0004u7-NC for submit@debbugs.gnu.org; Sat, 18 Dec 2021 15:51:45 -0500 Received: from eggs.gnu.org ([209.51.188.92]:49628) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1myggA-0005eY-IC for guix-patches@gnu.org; Sat, 18 Dec 2021 15:51:42 -0500 Received: from mout.kundenserver.de ([212.227.126.135]:41467) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mygg6-0003kH-QS for guix-patches@gnu.org; Sat, 18 Dec 2021 15:51:42 -0500 Received: from hermia.goebel-consult.de ([46.87.136.58]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1Mf3yk-1mIUIh3T9G-00gUDP for ; Sat, 18 Dec 2021 21:51:33 +0100 Received: from thisbe.fritz.box (thisbe.fritz.box [192.168.110.24]) by hermia.goebel-consult.de (Postfix) with ESMTP id 5145C6615E; Sat, 18 Dec 2021 21:50:13 +0100 (CET) From: Hartmut Goebel To: guix-patches@gnu.org Subject: [PATCH 42/42] gnu: rust-sequoia-rfc2822-0.9: Move to (gnu packages sequoia). Date: Sat, 18 Dec 2021 21:49:53 +0100 Message-Id: <632c7b34d32c7ba4053528da8d379f8f21370bef.1639859823.git.h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K1:yr4lU4Rnh6lLbbORjy5V/vGAt14kLeAAgXLbBbY+wir3OxpelDK zz0BHZ/yIoW0j+rG6jwFngG7JWgXp/6LUqZAgQVbinPtp7It+RzuGVc2/4GgUvTk2yrIrXj 4wGRsJKwiYpV6F2QwGy5oLSZVZX0osvNap5J6KNUfIwbmcIggO4y8zp8DrE94sxSWaaHek9 NqgQxBWHk38TQFNF+gQvg== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:0m8nMlVS5D4=:fQuTF55yemsXkDUHywOp0v oFYB9+nBP51qvGk1Pn5t21KWZmjVqlcmRyZRhDvQcfkx60+WkrnLNagvJsSlN0uP252KWtrI1 G6yAN2JHf8CAo95PpfLYR5W3qa7XGQCl4pjLza5cFtrfWr+ltKn/65cULLLxs02L6d6pPA/NT kIN98tt8FS+G6rCXWbYPF1f2HuQmFP5giWPXuHIGXh80gSnJEWNVpnDPmlENNOUwkviIrq+a0 Dw/mCrqImlWUtH86Pgn/K7Z8n/UriBkW6D5kn0LbbuX0Huab8wf6vo56p0I7nanWanPIkpMHV X6LA8wdoe7YPFvrdThLw5rumJ8eWkWn9pNnyYUHXmIifP+qxGX3zT/iu4aqoRmtC+hAdtqW6+ i2xtWMtmfqsWuM9qXs2Gc2m5prF3e/Z47MBPemWo9tkhkzs9DKCFo1ABFXlCndUuiCswtGs/E fW3CePBn9ZnAcPFgBb8E6wEqNUn8s+9qX9l7Re63LHGNuf10rtW/01m94CMbfk1QzPW4YPZID zTSWA4Qu/I8DcUtpK2r30rsw1eiw1J5NijraSLoTc9PnzUQjBPCbSa3mQIA1d/hj+8U6SQaQL aHZ2oFzHVJQdUkKlPorBuXKtLnEH41lAWR91VUwRu9bFD/UgOcHNT57HNN/XfQ/qP4e1W6Gl2 /ptGoJPMc38HAFTDTQTn8lxqktLFGyOz4VHj5oTNr39Sqa9A8Xo4S6p+T22JFiHxRZvCyNOpr TlJk1j7KQqpg4KPR Received-SPF: none client-ip=212.227.126.135; envelope-from=h.goebel@crazy-compilers.com; helo=mout.kundenserver.de 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, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/crates-io.scm (rust-sequoia-rfc2822-0.9): Move package to ... * gnu/packages/sequoia.scm: ... here. [arguments] Add. : Remove. [description] Reformat and add markup. --- gnu/packages/crates-io.scm | 39 -------------------------------------- gnu/packages/sequoia.scm | 28 +++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 39 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 2fb35277a4..5d62156abe 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -46923,45 +46923,6 @@ formats: fragment of code.") (license (list license:expat license:asl2.0)))) -(define-public rust-sequoia-rfc2822-0.9 - (package - (name "rust-sequoia-rfc2822") - (version "0.9.0") - (source - (origin - (method url-fetch) - (uri (crate-uri "sequoia-rfc2822" version)) - (file-name - (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "1aj34i6862718m162rqfv69fkmvdw063s6ws7hbp42n73gb08p5c")))) - (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-failure" ,rust-failure-0.1) - ("rust-lalrpop" ,rust-lalrpop-0.17) - ("rust-lalrpop-util" ,rust-lalrpop-util-0.17)) - #:cargo-development-inputs - (("rust-lazy-static" ,rust-lazy-static-1) - ("rust-quickcheck" ,rust-quickcheck-0.8) - ("rust-rand" ,rust-rand-0.6)))) - (home-page "https://sequoia-pgp.org/") - (synopsis "RFC 2822 name-addr parser") - (description - "Currently, this crate only recognizes the RFC 2822 name-addr and -addr-spec productions, i.e., things of the form: - -Name (Comment) - -and - -email@@example.org - -Although the above appear simple to parse, RFC 2822's whitespace and comment -rules are rather complex. This crate implements the whole grammar." ) - (license license:gpl3))) - (define-public rust-serde-1 (package (name "rust-serde") diff --git a/gnu/packages/sequoia.scm b/gnu/packages/sequoia.scm index 3db85a9eba..bbab42bff8 100644 --- a/gnu/packages/sequoia.scm +++ b/gnu/packages/sequoia.scm @@ -283,6 +283,34 @@ This Guix package is built to use the nettle cryptographic library.") ("rust-sequoia-rfc2822" ,rust-sequoia-rfc2822-0.9) ("rust-time" ,rust-time-0.1)))))) +(define-public rust-sequoia-rfc2822-0.9 + (package + (name "rust-sequoia-rfc2822") + (version "0.9.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "sequoia-rfc2822" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1aj34i6862718m162rqfv69fkmvdw063s6ws7hbp42n73gb08p5c")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-failure" ,rust-failure-0.1) + ("rust-lalrpop" ,rust-lalrpop-0.17) + ("rust-lalrpop-util" ,rust-lalrpop-util-0.17)))) + (home-page "https://sequoia-pgp.org/") + (synopsis "RFC 2822 name-addr parser") + (description "Currently, this crate only recognizes the RFC 2822 name-addr +and addr-spec productions, i.e., things of the form: @code{Name (Comment) +} and @code{email@@example.org} + +Although the above appear simple to parse, RFC 2822's whitespace and comment +rules are rather complex. This crate implements the whole grammar." ) + (license license:gpl3))) + (define-public sequoia-sq (package (name "sequoia-sq") -- 2.30.2 From debbugs-submit-bounces@debbugs.gnu.org Sat Dec 18 15:51:47 2021 Received: (at submit) by debbugs.gnu.org; 18 Dec 2021 20:51:47 +0000 Received: from localhost ([127.0.0.1]:44255 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1myggE-0004uV-UY for submit@debbugs.gnu.org; Sat, 18 Dec 2021 15:51:47 -0500 Received: from lists.gnu.org ([209.51.188.17]:51480) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1myggC-0004u8-Ne for submit@debbugs.gnu.org; Sat, 18 Dec 2021 15:51:45 -0500 Received: from eggs.gnu.org ([209.51.188.92]:49626) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1myggA-0005eX-IG for guix-patches@gnu.org; Sat, 18 Dec 2021 15:51:42 -0500 Received: from mout.kundenserver.de ([212.227.126.130]:40013) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mygg6-0003k5-Og for guix-patches@gnu.org; Sat, 18 Dec 2021 15:51:42 -0500 Received: from hermia.goebel-consult.de ([46.87.136.58]) by mrelayeu.kundenserver.de (mreue009 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MOiLv-1n8FyO21Yl-00QG5L for ; Sat, 18 Dec 2021 21:51:31 +0100 Received: from thisbe.fritz.box (thisbe.fritz.box [192.168.110.24]) by hermia.goebel-consult.de (Postfix) with ESMTP id 2B7086615D; Sat, 18 Dec 2021 21:50:13 +0100 (CET) From: Hartmut Goebel To: guix-patches@gnu.org Subject: [PATCH 41/42] gnu: rust-sequoia-openpgp-0.9: Move to (gnu packages sequoia). Date: Sat, 18 Dec 2021 21:49:52 +0100 Message-Id: <7b5d84faa458368491795524d7dda4c3b428b056.1639859823.git.h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K1:jXjPAywVi29eKrbO/N9lKTSPq3lzlAnVkWyiJkFv/pH0rhT1K4r NI+S6NQVf/VMtNwb/rNWxQ7x1/2IS7LQ1CSroXjWwe4RKRQCBG3xIrdeXlq8VaBRL3gqg8w xe8jRi6GV0jkF/fG7H8nj+ULIqLFbb/58b4tEnGeLYalDRfHjLkMdpaNy0zK52FcX/dCw5O fLHlpYe+G8SvAVC3rgRug== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:Ak6OkvsvXk8=:/uSGP4+ximVw8Xm7b811nt tfkbnODMEYWfu0o2HFZDO3B8JC6E4J4/7jrBADWcAPWT94EqBHnRIH1CJIuALdERe7C20trWC Hvi0QlIIjFFnv4/3DnM/JvzMbJ++IK8psnvKaMchgh+ziXX7Sicv+xIQEpiSt32xnBkKqM9r1 3SHKZJUYeqS0uxkwt9+qmqmy2i6Y/KPmEVel5obGL3Oc2UDCKshXKMrFL/lw0WoD1ZJ4jfpYg pPuzj+Pqoq1P10nwkg8Wx7tjPlHalLSScYkgUeswLY+cbR/2h98pbKCQhPoQJrYpcPRd/NyX6 q/yIUYtQay/zDx68DKHg/OXA+6eMxAI/J0AfeLzCEJkM99s7GAGV4PQc9FZ3giWQq1pZaV2Fp r4YwKKYjVA4MFweqHRusitI1N4Di7wk9TE5Qd9X2xHNwEIGHpSqdd/2DSwzTutll8Kd+5r4qO VNruC43jLFGcXQgKJiea5YYBIOwkmqxsExJsLBfbBgQNUE4Lx3PnXp7V/uOr6UuxmUE7XuAmv uHA+XH9q7dmewpTj1wE/ILGRGzJMirXadfeP1RfR0pynmBSDcE0aHSmG6SzqlA8tb95myHT5e tEFpaRooRrfX5Z0i5DOfwuaytpaWPC/6BsLjQW59pcUnChXm9wUCV/u7hAaWisq/wq3vaT22W QfV9Bg67DxRsvGYVdx4WkhF7liGiu0QP//g0TUHpi/VITuHfnI/iZeucOfIoFHaGjOLmJiIw1 KH8N+149QiEutoK9 Received-SPF: none client-ip=212.227.126.130; envelope-from=h.goebel@crazy-compilers.com; helo=mout.kundenserver.de 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, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/crates-io.scm (rust-sequoia-openpgp-0.9): Move package to ... * gnu/packages/sequoia.scm: ... here. Inherit from rust-sequoia-openpgp-1. [arguments] add, : Remove. --- gnu/packages/crates-io.scm | 52 +------------------------------------- gnu/packages/sequoia.scm | 32 +++++++++++++++++++++++ 2 files changed, 33 insertions(+), 51 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index af194df56b..2fb35277a4 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -73,6 +73,7 @@ #:use-module (gnu packages python) #:use-module (gnu packages rust) #:use-module (gnu packages rust-apps) + #:use-module (gnu packages sequoia) #:use-module (gnu packages serialization) #:use-module (gnu packages sqlite) #:use-module (gnu packages ssh) @@ -46922,57 +46923,6 @@ formats: fragment of code.") (license (list license:expat license:asl2.0)))) -(define-public rust-sequoia-openpgp-0.9 - (package - (name "rust-sequoia-openpgp") - (version "0.9.0") - (source - (origin - (method url-fetch) - (uri (crate-uri "sequoia-openpgp" version)) - (file-name - (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "007h2pi7lcph5jf5bxjydm7hjwjai33yk6dic3cxknki22lxlkfw")))) - (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-base64" ,rust-base64-0.9) - ("rust-buffered-reader" ,rust-buffered-reader-0.9) - ("rust-bzip2" ,rust-bzip2-0.3) - ("rust-failure" ,rust-failure-0.1) - ("rust-flate2" ,rust-flate2-1) - ("rust-idna" ,rust-idna-0.1) - ("rust-lalrpop" ,rust-lalrpop-0.17) - ("rust-lalrpop-util" ,rust-lalrpop-util-0.17) - ("rust-lazy-static" ,rust-lazy-static-1) - ("rust-memsec" ,rust-memsec-0.5) - ("rust-nettle" ,rust-nettle-5) - ("rust-quickcheck" ,rust-quickcheck-0.8) - ("rust-rand" ,rust-rand-0.6) - ("rust-sequoia-rfc2822" ,rust-sequoia-rfc2822-0.9) - ("rust-time" ,rust-time-0.1)) - #:cargo-development-inputs - (("rust-rpassword" ,rust-rpassword-3)))) - (native-inputs - (list pkg-config)) - (inputs - (list clang nettle)) - (home-page "https://sequoia-pgp.org/") - (synopsis "OpenPGP data types and associated machinery") - (description - "This crate aims to provide a complete implementation of OpenPGP as -defined by RFC 4880 as well as some extensions (e.g., RFC 6637, which -describes ECC cryptography) for OpenPGP. This includes support for unbuffered -message processing. - -A few features that the OpenPGP community considers to be deprecated (e.g., -version 3 compatibility) have been left out. We have also updated some -OpenPGP defaults to avoid foot guns (e.g., we selected modern algorithm -defaults). If some functionality is missing, please file a bug report.") - (license license:gpl3))) - (define-public rust-sequoia-rfc2822-0.9 (package (name "rust-sequoia-rfc2822") diff --git a/gnu/packages/sequoia.scm b/gnu/packages/sequoia.scm index 16488ca073..3db85a9eba 100644 --- a/gnu/packages/sequoia.scm +++ b/gnu/packages/sequoia.scm @@ -251,6 +251,38 @@ defaults). This Guix package is built to use the nettle cryptographic library.") (license license:lgpl2.0+))) +(define-public rust-sequoia-openpgp-0.9 + (package + (inherit rust-sequoia-openpgp-1) + (name "rust-sequoia-openpgp") + (version "0.9.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "sequoia-openpgp" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "007h2pi7lcph5jf5bxjydm7hjwjai33yk6dic3cxknki22lxlkfw")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-base64" ,rust-base64-0.9) + ("rust-buffered-reader" ,rust-buffered-reader-0.9) + ("rust-bzip2" ,rust-bzip2-0.3) + ("rust-failure" ,rust-failure-0.1) + ("rust-flate2" ,rust-flate2-1) + ("rust-idna" ,rust-idna-0.1) + ("rust-lalrpop" ,rust-lalrpop-0.17) + ("rust-lalrpop-util" ,rust-lalrpop-util-0.17) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-memsec" ,rust-memsec-0.5) + ("rust-nettle" ,rust-nettle-5) + ("rust-quickcheck" ,rust-quickcheck-0.8) + ("rust-rand" ,rust-rand-0.6) + ("rust-sequoia-rfc2822" ,rust-sequoia-rfc2822-0.9) + ("rust-time" ,rust-time-0.1)))))) + (define-public sequoia-sq (package (name "sequoia-sq") -- 2.30.2 From debbugs-submit-bounces@debbugs.gnu.org Sat Dec 18 15:51:53 2021 Received: (at submit) by debbugs.gnu.org; 18 Dec 2021 20:51:53 +0000 Received: from localhost ([127.0.0.1]:44257 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1myggF-0004uc-Be for submit@debbugs.gnu.org; Sat, 18 Dec 2021 15:51:53 -0500 Received: from lists.gnu.org ([209.51.188.17]:51454) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mygg9-0004u3-UL for submit@debbugs.gnu.org; Sat, 18 Dec 2021 15:51:45 -0500 Received: from eggs.gnu.org ([209.51.188.92]:49596) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mygg9-0005dO-0Z for guix-patches@gnu.org; Sat, 18 Dec 2021 15:51:41 -0500 Received: from mout.kundenserver.de ([212.227.126.187]:52555) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mygg6-0003il-OF for guix-patches@gnu.org; Sat, 18 Dec 2021 15:51:40 -0500 Received: from hermia.goebel-consult.de ([46.87.136.58]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1Mw9oq-1mg3pV0YHU-00s83I for ; Sat, 18 Dec 2021 21:51:29 +0100 Received: from thisbe.fritz.box (thisbe.fritz.box [192.168.110.24]) by hermia.goebel-consult.de (Postfix) with ESMTP id 0DEE66615C; Sat, 18 Dec 2021 21:50:13 +0100 (CET) From: Hartmut Goebel To: guix-patches@gnu.org Subject: [PATCH 40/42] gnu: sequoia: Change into a meta-package and update to 1.6.0. Date: Sat, 18 Dec 2021 21:49:51 +0100 Message-Id: <7a938985ee6d71c3ecdd81b6e5fc494b2642e1d5.1639859823.git.h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K1:DnE+rRv6yMX6MpkCw9yUDdSeZae83HfrwVDjoOJtpL+Q1iE7MMa mRZ/NHbutgCRWzf32v3VjytZ/vpWyDBiG5gi3D23GuL14JIeiSELL3bQ5z7wWOQ30WmN8Mw czsBMDd/HuiGd4jKNaqDWvkjOP8KXlo+McwV2rtIj6Z3OMxfybR1eXmuB15PBYEy7D9Y6ZB QOjpi/6VJS/vFgBYJ3rog== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:BYJLparpHmU=:UB/P8/a5O4aN/mPiT72sFi 6/htL1b7Ew2++7kwKbHMoFyfAeLgs7PuiOCj0hGdyccJzeH1OmyWZgMYFEHElUGh1K5uxEk32 Vxoh5JZFaS+CqbtZDrLcrP/OoU0IpHaXREpCeXHbML0BzjdH+SJVccvWcbMqxI/xIj1iFTk/t crcMVukvyMWD43/dQK6YwwvLsCwiN1CtmN+8EWDEriONklBr5G1NzIYZOgNB1LLY96xyc2ZQD 5KIisUY90otvO+Oe9KsbStvDsO1a/xi4xju+71kddp9jCP6u+z5kLBshFnFKClG5pAbATdlsz PquRgx6KrTxuW3kM8s9EcKTN7aAxl6Z51uEdiwsfc+m7ZlIsZJ4RsiFJ4Gt+Je+cVyVZyLO2o /n7RFiSthijuS1iXvvds950LTawnpqhdVork6RfsVGLggfqLfNqt6VECtddepfCbFkUBfIshG lqwpsnZNAl+AcpEj337AFXD7/QPLbofLThvimPwEJsSlX/5ZePuSVm0Wlk/OoYa9V5LKdcVbb 5qNDc6n1xEatr6ORF05eneYn5/TDNPIZ5ddLSPUe6P1wWSFEVkaQCftOSHRxdV/M9gPuqp/Z+ NfKH5cMLu01WbhdKTBUjRdCTP9hKS5qICDkWTLajgU2RyhcKCg0rMAXwBunMkjGAn90cfLV4t KshvUYkMWTC9tBSTLEqhLdDlA2zjXZFNhCNQZSfMULsY3SZRpZnWnrUorXJxQ1ZW+AZ62bBgO ZLu1eZScVjETwmbP Received-SPF: none client-ip=212.227.126.187; envelope-from=h.goebel@crazy-compilers.com; helo=mout.kundenserver.de 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, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/sequoia.scm (sequoia): Update to 1.6.0. Change into a meta-package for all sequoia related binaries. [source, native-inputs]: Remove. [build-system]: Use trivial-build-system. [inputs]: Replace with list of packages to be merged. [arguments]: Replace by a trivial build step. [synopsis, description]: Adopt to being a meta-package. [license]: Adjust to license change of project. --- gnu/packages/sequoia.scm | 211 ++++++++------------------------------- 1 file changed, 40 insertions(+), 171 deletions(-) diff --git a/gnu/packages/sequoia.scm b/gnu/packages/sequoia.scm index 811beb823a..16488ca073 100644 --- a/gnu/packages/sequoia.scm +++ b/gnu/packages/sequoia.scm @@ -19,12 +19,14 @@ (define-module (gnu packages sequoia) #:use-module (guix build-system cargo) + #:use-module (guix build-system trivial) #:use-module (guix download) #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix utils) #:use-module (gnu packages) + #:use-module (gnu packages base) ; glibc #:use-module (gnu packages check) ;; python-pytest #:use-module (gnu packages crates-io) #:use-module (gnu packages libffi) ;; python-cffi @@ -35,8 +37,6 @@ #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) ;; python-setuptools #:use-module (gnu packages rust) - #:use-module (gnu packages serialization) - #:use-module (gnu packages sqlite) #:use-module (gnu packages tls)) (define-public rust-sequoia-autocrypt-0.23 @@ -469,176 +469,45 @@ even go away.") (define-public sequoia (package (name "sequoia") - (version "1.1.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://gitlab.com/sequoia-pgp/sequoia.git") - (commit (string-append "openpgp/v" version)))) - (sha256 - (base32 "0knkm0nw1h4ww51vks4jnnp1yc45llfi7j0i70f6vf2bcknnbmci")) - (file-name (git-file-name name version)))) - (build-system cargo-build-system) + (version "1.6.0") + (source #f) + (build-system trivial-build-system) (outputs '("out" "python")) - (native-inputs - (list clang pkg-config python-pytest python-pytest-runner - python-wrapper)) (inputs - (list capnproto - gmp - nettle - openssl - python - python-cffi - sqlite)) + `(("glibc" ,glibc) ;; for ldconfig in make-dynamic-linker-cache + ("libsequoia" ,libsequoia) + ("libsequoia:python" ,libsequoia "python") + ("sequoia-sq" ,sequoia-sq) + ("sequoia-sqv" ,sequoia-sqv))) (arguments - `(#:tests? #f ;; building the tests requires 9.7GB total - #:rust ,rust - #:cargo-inputs - (("rust-anyhow" ,rust-anyhow-1) - ("rust-backtrace" ,rust-backtrace-0.3) - ("rust-base64" ,rust-base64-0.13) - ;;("rust-buffered-reader" included - ("rust-bzip2" ,rust-bzip2-0.4) - ("rust-capnp" ,rust-capnp-0.13) - ("rust-capnp-rpc" ,rust-capnp-rpc-0.13) - ("rust-capnpc" ,rust-capnpc-0.13) - ("rust-chrono" ,rust-chrono-0.4) ;; for sqv, sop - ("rust-clap" ,rust-clap-2) ;; for sqv - ("rust-colored" ,rust-colored-1.9.1) - ("rust-crossterm" ,rust-crossterm-0.13) - ("rust-ctor" ,rust-ctor-0.1) - ("rust-dirs" ,rust-dirs-2) - ("rust-dyn-clone" ,rust-dyn-clone-1) - ("rust-ed25519-dalek" ,rust-ed25519-dalek-1) - ("rust-eax" ,rust-eax-0.3) - ;;("rust-failure" included - ("rust-filetime" ,rust-filetime-0.2) - ("rust-flate2" ,rust-flate2-1) - ("rust-fs2" ,rust-fs2-0.4) - ("rust-futures" ,rust-futures-0.3) - ("rust-futures-util" ,rust-futures-util-0.3) - ("rust-http" ,rust-http-0.2) - ("rust-hyper" ,rust-hyper-0.13) - ("rust-hyper-tls" ,rust-hyper-tls-0.4) - ("rust-idna" ,rust-idna-0.2) - ("rust-itertools" ,rust-itertools-0.9) ;; for sq - ("rust-lalrpop" ,rust-lalrpop-0.19) - ("rust-lalrpop-util" ,rust-lalrpop-util-0.19) - ("rust-lazy-static" ,rust-lazy-static-1) - ("rust-libc" ,rust-libc-0.2) - ("rust-memsec" ,rust-memsec-0.6) - ("rust-native-tls" ,rust-native-tls-0.2) - ("rust-nettle" ,rust-nettle-7) - ("rust-num-bigint-dig" ,rust-num-bigint-dig-0.6) - ("rust-parity-tokio-ipc" ,rust-parity-tokio-ipc-0.4) - ("rust-percent-encoding" ,rust-percent-encoding-2) - ("rust-prettytable-rs" ,rust-prettytable-rs-0.8) ;; for sq - ("rust-proc-macro2" ,rust-proc-macro2-1) - ("rust-quickcheck" ,rust-quickcheck-0.9) - ("rust-rand" ,rust-rand-0.7) - ("rust-regex" ,rust-regex-1) - ("rust-rusqlite" ,rust-rusqlite-0.24) - ("rust-sha1collisiondetection" ,rust-sha1collisiondetection-0.2) - ("rust-socket2", rust-socket2-0.3) - ("rust-structopt" ,rust-structopt-0.3) ;; for sop - ("rust-tempfile" ,rust-tempfile-3) ;; for sq - ("rust-thiserror" ,rust-thiserror-1) - ("rust-tokio" ,rust-tokio-0.2) - ("rust-tokio-core" ,rust-tokio-core-0.1) - ("rust-unicode-normalization" ,rust-unicode-normalization-0.1) - ("rust-url" ,rust-url-2) - ("rust-win-crypto-ng" ,rust-win-crypto-ng-0.4) - ("rust-winapi" ,rust-winapi-0.3) - ("rust-zbase32" ,rust-zbase32-0.1)) - #:cargo-development-inputs - (("rust-assert-cli" ,rust-assert-cli-0.6) ;; dev-dep for for sq, sqv - ("rust-bindgen" ,rust-bindgen-0.51) ;; FIXME for nettle-sys and rusqlite - ;;("rust-lalrpop" ,rust-lalrpop-0.19) - ("rust-quickcheck" ,rust-quickcheck-0.9) - ("rust-rand" ,rust-rand-0.7) - ("rust-rpassword" ,rust-rpassword-5)) - #:phases - (modify-phases %standard-phases - ;; Run make instead of using the rust build system, as - ;; suggested by the installation instructions - (replace 'build (lambda _ (invoke "make" "build-release") #t)) - (delete 'package) ;; cargo can't package a multi-crate workspace - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (if tests? - (invoke "make" "check") - #t))) - (replace 'install (lambda _ (invoke "make" "install") #t)) - (add-after 'unpack 'fix-rand-dependency - (lambda _ - (substitute* "ipc/Cargo.toml" - ;; required: enable rand::rngs::OsRng in rand >= 0.8 - (("(^rand =.*,) default-features = false(.*)" _ a b) - (string-append a " features = [\"getrandom\"]" b))) - #t)) - (add-after 'unpack 'fix-permissions - (lambda _ - (chmod "sq/src/sq-usage.rs" #o644) - (chmod "sqv/src/sqv-usage.rs" #o644) - #t)) - (add-after 'unpack 'fix-environment - (lambda* (#:key outputs #:allow-other-keys) - ;; adjust prefix - (setenv "PREFIX" (assoc-ref outputs "out")) - ;; fix install script detection - (setenv "INSTALL" "install") - #t)) - (add-after 'unpack 'fix-fo-python-output - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (pyout (assoc-ref outputs "python"))) - (substitute* "ffi/lang/python/Makefile" - ;; adjust prefix for python package - (("PREFIX\\s*\\??=.*") - (string-append "PREFIX = " pyout "\n")) - ;; fix rpath to include the main package - (("\\WLDFLAGS=" text) - (string-append text "'-Wl,-rpath=" out "/lib '")) - ;; make setuptools install into the prefix, see - ;; guix/build/python-build-system.scm for explanation - (("\\ssetup.py\\s+install\\s") - " setup.py install --root=/ --single-version-externally-managed ")) - #t))) - (add-after 'unpack 'fix-pkgconfig-file-substitutes - ;; preempt Makefiles replacing PREFIX by pwd - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (substitute* "ffi/sequoia.pc.in" - (("PREFIX") out)) - (substitute* "openpgp-ffi/sequoia-openpgp.pc.in" - (("PREFIX") out)) - #t))) - (add-after 'unpack 'keep-SOURCE_DATE_EPOCH - (lambda _ - ;; preempt Makefiles replacing SOURCE_DATE_EPOCH - (substitute* "Makefile" - (("SOURCE_DATE_EPOCH\\s=" line) - (string-append "#" line))) - #t)) - (add-after 'unpack 'set-missing-env-vars - (lambda* (#:key inputs #:allow-other-keys) - ;; FIXME: why do we need to set this here? - (setenv "LIBCLANG_PATH" - (string-append (assoc-ref inputs "clang") "/lib")) - #t)) - (add-after 'unpack 'unpin-deps - (lambda _ - ;; As the comment in that file explains, upstream encourages - ;; unpinning, as the pinned version is only to make sure the crate - ;; compiles on older versions of rustc - (substitute* '("openpgp/Cargo.toml" "sq/Cargo.toml") - (("= \"=") "= \"")) - #t))))) + `(#:modules ((guix build utils) (guix build gnu-build-system) + (guix build gremlin) (guix elf)) + #:builder + (begin + (use-modules (guix build utils) (guix build gnu-build-system)) + (let ((make-dynamic-linker-cache + (assoc-ref %standard-phases 'make-dynamic-linker-cache)) + (ld.so.cache + (string-append (assoc-ref %outputs "out") "/etc/ld.so.cache"))) + (copy-recursively (assoc-ref %build-inputs "libsequoia") + (assoc-ref %outputs "out")) + (copy-recursively (assoc-ref %build-inputs "sequoia-sq") + (assoc-ref %outputs "out")) + (delete-file ld.so.cache) + (copy-recursively (assoc-ref %build-inputs "sequoia-sqv") + (assoc-ref %outputs "out")) + (delete-file ld.so.cache) + (copy-recursively (assoc-ref %build-inputs "libsequoia:python") + (assoc-ref %outputs "python")) + (setenv "PATH" + (string-append (getenv "PATH") ":" + (assoc-ref %build-inputs "glibc") "/sbin")) + (make-dynamic-linker-cache #:outputs %outputs) + #t)))) (home-page "https://sequoia-pgp.org") - (synopsis "New OpenPGP implementation") - (description "Sequoia is a new OpenPGP implementation. It consists of -several crates, providing both a low-level and a high-level API for dealing -with OpenPGP data.") - (license license:gpl2+))) + (synopsis "New OpenPGP implementation (meta-package)") + (description "Sequoia is a new OpenPGP implementation, written in Rust, +consisting of several Rust crates/packages. This Guix meta-package combines +these packages into a single one for convenience. Anyhow, you should not +depend other packages on this one avoid excessive compile-times for users.") + (license license:lgpl2.0+))) -- 2.30.2 From debbugs-submit-bounces@debbugs.gnu.org Sat Dec 18 15:51:59 2021 Received: (at submit) by debbugs.gnu.org; 18 Dec 2021 20:51:59 +0000 Received: from localhost ([127.0.0.1]:44259 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1myggL-0004uu-5x for submit@debbugs.gnu.org; Sat, 18 Dec 2021 15:51:59 -0500 Received: from lists.gnu.org ([209.51.188.17]:51490) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1myggC-0004u9-PG for submit@debbugs.gnu.org; Sat, 18 Dec 2021 15:51:51 -0500 Received: from eggs.gnu.org ([209.51.188.92]:49630) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1myggA-0005eZ-IX for guix-patches@gnu.org; Sat, 18 Dec 2021 15:51:43 -0500 Received: from mout.kundenserver.de ([212.227.126.187]:49271) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mygg4-0003iV-Us for guix-patches@gnu.org; Sat, 18 Dec 2021 15:51:41 -0500 Received: from hermia.goebel-consult.de ([46.87.136.58]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MlL5x-1mDpbf3DZN-00llUJ for ; Sat, 18 Dec 2021 21:51:26 +0100 Received: from thisbe.fritz.box (thisbe.fritz.box [192.168.110.24]) by hermia.goebel-consult.de (Postfix) with ESMTP id DDF076615B; Sat, 18 Dec 2021 21:50:12 +0100 (CET) From: Hartmut Goebel To: guix-patches@gnu.org Subject: [PATCH 39/42] gnu: Add libsequoia. Date: Sat, 18 Dec 2021 21:49:50 +0100 Message-Id: <15bedd1793dc1262db443a37a46f776344491474.1639859823.git.h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K1:apoLhFX4a4VBOtlol6rUEngkKZnh0+vghdKiPCdE1bXPazPLFAm f6lTwkP+7fGF2svMOIa9pda2Kgmn1PJ7jm1b4a37jz39Pz7USdMBBmQw9cD+C3ZGHqmOrqO Jv4uerid38qY1TrQrnYujEO45NwDuh+NksN3wXmvrpQll3C9sCEo8dr4d4U55d0FAYX+9m1 bXLkDkpuukVGohlTfdWjw== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:2l/TTUqX2go=:7HUv3qxz4U+zwOOeNIiP4+ N0Qnwdpwx9N5Myg/cpZOpPnfa7gbsCSGApUzmcrV0ykwRnFP1JMeMUUetZ1pLkR807RdA/+8C EpwFQ8HUnlLbqDMBzGt2M6qwZebCJkl1GSA4JQDm4jFMZBJpdHYrX5QP9BFo9fjelXoBaDnxR rMI44J7Znq88MUcUcVewXPFoiwdEkLbWNN4TwZ2W8x/Ldoqb7EfyF1b6TsBQcksnfllfmj/yV CdMaBfzd6OYqYHqEsW4l23CTMMaNz1qE25p+AoMdA4BrYPBPn5CUIAc3V0O4neOrHZXx8MncA FFs8HBldk+Kv6FyOJoJfzorS2bpHvoUtM2/uy4juHYBs26FaqtiosTWRL7mLc40TElpyxUrqd EkB+e1Pb4INPwsAtzCZepO52km+Euikh9FoIcZQ7ktSz7bwfXg5aeOvYisCnRbu0N4MVYrGAO m1+NUnsd8cO3+5cliv+Ki/9UJqn0M10EuJ6XWxXNlc1madPxt857EOphLibPfF99u2vXwoEZU xgAD0olGXy7150urzOC6TRJ4gkjo/gCdWOvEkeAKLFbqyZwPtHy/JPfYHFhG7CWIs1AA0n2w1 QVZHFju5ZOjq51UxYqrE4x4HqMZn2m8MvxiEWRmanl4jJ62JStES3btl5Adv0GNIxcStXGXwn veItSQwtk2wPbFBDJ8Obps7xkQ+J2qOVjnj3ESbiMnc1u9MGUuN7lcW7gPD8SCyTcsGtpFlAQ a4YXqgJ0kb7dNlsB Received-SPF: none client-ip=212.227.126.187; envelope-from=h.goebel@crazy-compilers.com; helo=mout.kundenserver.de 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, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/sequoia.scm (sequoia-package-origin): New variable. (libsequoia): New variable. * gnu/packages/patches/sequoia-fix-ffi-Makefile.patch, gnu/packages/patches/sequoia-remove-store.patch New files. * gnu/local.mk (dist_patch_DATA): Add them. --- gnu/local.mk | 2 + .../patches/libsequoia-fix-ffi-Makefile.patch | 32 ++ .../patches/libsequoia-remove-store.patch | 432 ++++++++++++++++++ gnu/packages/sequoia.scm | 120 +++++ 4 files changed, 586 insertions(+) create mode 100644 gnu/packages/patches/libsequoia-fix-ffi-Makefile.patch create mode 100644 gnu/packages/patches/libsequoia-remove-store.patch diff --git a/gnu/local.mk b/gnu/local.mk index 33e108c752..598a85f512 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1785,6 +1785,8 @@ dist_patch_DATA = \ %D%/packages/patches/sendgmail-accept-ignored-gsuite-flag.patch \ %D%/packages/patches/sendgmail-remove-domain-restriction.patch \ %D%/packages/patches/seq24-rename-mutex.patch \ + %D%/packages/patches/libsequoia-fix-ffi-Makefile.patch \ + %D%/packages/patches/libsequoia-remove-store.patch \ %D%/packages/patches/serf-python3.patch \ %D%/packages/patches/shakespeare-spl-fix-grammar.patch \ %D%/packages/patches/sharutils-CVE-2018-1000097.patch \ diff --git a/gnu/packages/patches/libsequoia-fix-ffi-Makefile.patch b/gnu/packages/patches/libsequoia-fix-ffi-Makefile.patch new file mode 100644 index 0000000000..21f5a1e4df --- /dev/null +++ b/gnu/packages/patches/libsequoia-fix-ffi-Makefile.patch @@ -0,0 +1,32 @@ +From ed641d2048d131e077f54043764741b7e7b7fe03 Mon Sep 17 00:00:00 2001 +From: Hartmut Goebel +Date: Tue, 7 Dec 2021 16:42:43 +0100 +Subject: [PATCH] ffi: Update Makefile, remove rule remaining from store + removal. + +--- + ffi/Makefile | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/ffi/Makefile b/ffi/Makefile +index a5540db3..07328589 100644 +--- a/ffi/Makefile ++++ b/ffi/Makefile +@@ -62,7 +62,6 @@ build-release: + $(CARGO) build $(CARGO_FLAGS) --release --package sequoia-ffi + $(MAKE) -Clang/python build-release + $(call sequoia_pc,$(CARGO_TARGET_DIR)/release,true) +- $(MAKE) -C../store build-release + + .PHONY: install + install: build-release +@@ -82,7 +82,6 @@ install: build-release + $(DESTDIR)$(PREFIX)/lib/libsequoia_ffi.$(_SEQ_LIB_EXT) + $(INSTALL) $(CARGO_TARGET_DIR)/release/libsequoia_ffi.a \ + $(DESTDIR)$(PREFIX)/lib/libsequoia_ffi.a +- $(MAKE) -C../store install + # Now the bindings. + $(MAKE) -Clang/python install + +-- + diff --git a/gnu/packages/patches/libsequoia-remove-store.patch b/gnu/packages/patches/libsequoia-remove-store.patch new file mode 100644 index 0000000000..e7e1a91ee3 --- /dev/null +++ b/gnu/packages/patches/libsequoia-remove-store.patch @@ -0,0 +1,432 @@ +Shortend version of +From 351ad5e5e2dd67f427b7eb2e4d5d0b35d90ffaf7 Mon Sep 17 00:00:00 2001 +From: Justus Winter +Date: Wed, 24 Nov 2021 15:09:34 +0100 +Subject: [PATCH] store: Drop crate. + + - The store has never been really used, and never reached a maturity + where it was useful. And, we're on the verge of replacing it with + the Shared PGP Certificate Directory. +--- + Cargo.toml | 1 - + ffi/Cargo.toml | 4 +- + ffi/include/sequoia.h | 1 - + ffi/include/sequoia/store.h | 409 ------ + ffi/lang/python/sequoia/__init__.py | 1 - + ffi/lang/python/sequoia/prelude.py | 1 - + ffi/lang/python/sequoia/sequoia_build.py | 3 +- + ffi/lang/python/sequoia/store.py | 246 ---- + ffi/lang/python/tests/test_store.py | 47 - + ffi/src/lib.rs | 2 - + ffi/src/store.rs | 659 ---------- + 25 files changed, 3 insertions(+), 5064 deletions(-) + delete mode 100644 ffi/include/sequoia/store.h + delete mode 100644 ffi/lang/python/sequoia/store.py + delete mode 100644 ffi/lang/python/tests/test_store.py + delete mode 100644 ffi/src/store.rs + +diff --git a/Cargo.toml b/Cargo.toml +index a4f48520..a573ddbf 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -10,7 +10,6 @@ members = [ + "openpgp", + "openpgp-ffi", + "sq", +- "store", + ] + + [profile.release] +diff --git a/ffi/Cargo.toml b/ffi/Cargo.toml +index 53ddaf68..2ec84e6e 100644 +--- a/ffi/Cargo.toml ++++ b/ffi/Cargo.toml +@@ -24,7 +24,6 @@ maintenance = { status = "actively-developed" } + [dependencies] + sequoia-ffi-macros = { path = "../ffi-macros", version = "0.22" } + sequoia-openpgp = { path = "../openpgp", version = "1.0.0", default-features = false } +-sequoia-store = { path = "../store", version = "0.22", default-features = false } + sequoia-net = { path = "../net", version = "0.23", default-features = false } + sequoia-ipc = { path = "../ipc", version = "0.26", default-features = false } + anyhow = "1.0.18" +@@ -42,10 +41,9 @@ crate-type = ["cdylib", "staticlib"] + bench = false + + [features] +-default = ["sequoia-openpgp/default", "sequoia-store/default"] ++default = ["sequoia-openpgp/default"] + crypto-nettle = ["sequoia-openpgp/crypto-nettle"] + crypto-cng = ["sequoia-openpgp/crypto-cng"] + compression = ["sequoia-openpgp/compression"] + compression-deflate = ["sequoia-openpgp/compression-deflate"] + compression-bzip2 = ["sequoia-openpgp/compression-bzip2"] +-background-services = ["sequoia-store/background-services"] +diff --git a/ffi/include/sequoia.h b/ffi/include/sequoia.h +index 8c62ba8f..c32a2f3e 100644 +--- a/ffi/include/sequoia.h ++++ b/ffi/include/sequoia.h +@@ -5,6 +5,5 @@ + #include + #include + #include +-#include + + #endif +diff --git a/ffi/lang/python/sequoia/__init__.py b/ffi/lang/python/sequoia/__init__.py +index 4f84346e..fc170e20 100644 +--- a/ffi/lang/python/sequoia/__init__.py ++++ b/ffi/lang/python/sequoia/__init__.py +@@ -4,5 +4,4 @@ from . import ( + openpgp, + core, + net, +- store, + ) +diff --git a/ffi/lang/python/sequoia/prelude.py b/ffi/lang/python/sequoia/prelude.py +index 42b0156a..61efbab0 100644 +--- a/ffi/lang/python/sequoia/prelude.py ++++ b/ffi/lang/python/sequoia/prelude.py +@@ -3,4 +3,3 @@ from .error import * + from .openpgp import * + from .core import * + from .net import * +-from .store import * +diff --git a/ffi/lang/python/sequoia/sequoia_build.py b/ffi/lang/python/sequoia/sequoia_build.py +index a3ce2786..058f1380 100644 +--- a/ffi/lang/python/sequoia/sequoia_build.py ++++ b/ffi/lang/python/sequoia/sequoia_build.py +@@ -14,8 +14,7 @@ defs = "".join(l + open(join(pgp_inc, "openpgp/serialize.h")).readlines(), + open(join(pgp_inc, "openpgp.h")).readlines(), + open(join(sq_inc, "core.h")).readlines(), +- open(join(sq_inc, "net.h")).readlines(), +- open(join(sq_inc, "store.h")).readlines()) ++ open(join(sq_inc, "net.h")).readlines()) + if not l.startswith('#')) + + defs = defs.replace("INT_MAX", "{}".format(1<<31)) +diff --git a/ffi/lang/python/sequoia/store.py b/ffi/lang/python/sequoia/store.py +deleted file mode 100644 +index 57d1b18f..00000000 +--- a/ffi/lang/python/sequoia/store.py ++++ /dev/null +@@ -1,246 +0,0 @@ +-from _sequoia import ffi, lib +- +-from .error import Error +-from .glue import _str, _static_str, SQObject, sq_iterator, sq_time +-from .net import NetworkPolicy +-from .openpgp import Fingerprint, Cert +- +-class Store(object): +- @classmethod +- def log(cls, ctx): +- yield from sq_iterator( +- ffi.gc( +- lib.sq_store_server_log(ctx.ref()), +- lib.sq_log_iter_free), +- lib.sq_log_iter_next, +- lambda x: Log(x, context=ctx)) +- +- @classmethod +- def list_keys(cls, ctx): +- def next_fn(i): +- fpp = ffi.new("pgp_fingerprint_t[1]") +- key = lib.sq_key_iter_next(i, fpp) +- if key == ffi.NULL: +- return ffi.NULL +- else: +- return (Fingerprint(fpp[0], ctx), +- Key(key, ctx)) +- +- yield from sq_iterator( +- ffi.gc( +- lib.sq_store_list_keys(ctx.ref()), +- lib.sq_key_iter_free), +- next_fn) +- +-class Mapping(SQObject): +- _del = lib.sq_mapping_free +- +- # Keys used for communications. +- REALM_CONTACTS = _static_str(lib.SQ_REALM_CONTACTS) +- +- # Keys used for signing software updates. +- REALM_SOFTWARE_UPDATES = _static_str(lib.SQ_REALM_SOFTWARE_UPDATES) +- +- @classmethod +- def open(cls, ctx, network_policy=NetworkPolicy.Encrypted, realm=REALM_CONTACTS, name="default"): +- return Mapping(lib.sq_mapping_open(ctx.ref(), network_policy.value, +- realm.encode(), name.encode()), +- context=ctx) +- +- +- def add(self, label, fingerprint): +- return Binding(lib.sq_mapping_add(self.context().ref(), self.ref(), +- label.encode(), fingerprint.ref()), +- context=self.context()) +- +- def import_(self, label, cert): +- return Cert(lib.sq_mapping_import(self.context().ref(), self.ref(), +- label.encode(), cert.ref()), +- context=self.context()) +- +- def lookup(self, label): +- return Binding(lib.sq_mapping_lookup(self.context().ref(), self.ref(), +- label.encode()), +- self.context()) +- +- def delete(self): +- if lib.sq_mapping_delete(self.ref()): +- raise Error._last(self.context()) +- super(Mapping, self)._delete(skip_free=True) +- +- def iter(self): +- def next_fn(i): +- labelp = ffi.new("char *[1]") +- fpp = ffi.new("pgp_fingerprint_t[1]") +- binding = lib.sq_binding_iter_next(i, labelp, fpp) +- if binding == ffi.NULL: +- return ffi.NULL +- else: +- return (_str(labelp[0]), +- Fingerprint(fpp[0], self.context()), +- Binding(binding, self.context())) +- +- yield from sq_iterator( +- ffi.gc( +- lib.sq_mapping_iter(self.context().ref(), self.ref()), +- lib.sq_binding_iter_free), +- next_fn) +- +- def log(self): +- yield from sq_iterator( +- ffi.gc( +- lib.sq_mapping_log(self.context().ref(), self.ref()), +- lib.sq_log_iter_free), +- lib.sq_log_iter_next, +- lambda x: Log(x, context=self.context())) +- +-class Binding(SQObject): +- _del = lib.sq_binding_free +- +- def stats(self): +- return Stats(lib.sq_binding_stats(self.context().ref(), self.ref()), +- self.context()) +- +- def key(self): +- return Key(lib.sq_binding_key(self.context().ref(), self.ref()), +- self.context()) +- +- def cert(self): +- return Cert(lib.sq_binding_cert(self.context().ref(), self.ref()), +- self.context()) +- +- def import_(self, cert): +- return Cert(lib.sq_binding_import(self.context().ref(), self.ref(), cert), +- self.context()) +- +- def rotate(self, cert): +- return Cert(lib.sq_binding_rotate(self.context().ref(), self.ref(), cert), +- self.context()) +- +- def delete(self): +- if lib.sq_binding_delete(self.ref()): +- raise Error._last(self.context()) +- super(Binding, self)._delete(skip_free=True) +- +- def log(self): +- yield from sq_iterator( +- ffi.gc( +- lib.sq_binding_log(self.context().ref(), self.ref()), +- lib.sq_log_iter_free), +- lib.sq_log_iter_next, +- lambda x: Log(x, context=self.context())) +- +-class Key(SQObject): +- _del = lib.sq_key_free +- +- def stats(self): +- return Stats(lib.sq_key_stats(self.context().ref(), self.ref()), +- self.context()) +- +- def cert(self): +- return Cert(lib.sq_key_cert(self.context().ref(), self.ref()), +- self.context()) +- +- def import_(self, cert): +- return Cert(lib.sq_key_import(self.context().ref(), self.ref(), cert), +- self.context()) +- +- def log(self): +- yield from sq_iterator( +- ffi.gc( +- lib.sq_key_log(self.context().ref(), self.ref()), +- lib.sq_log_iter_free), +- lib.sq_log_iter_next) +- +- +-class Stats(SQObject): +- _del = lib.sq_stats_free +- def __init__(self, o, context=None): +- super(Stats, self).__init__(o, context=context) +- self.encryption = Stamps(ffi.addressof(o, "encryption")) +- self.verification = Stamps(ffi.addressof(o, "verification")) +- +- @property +- def created(self): +- return sq_time(self.ref().created) +- +- @property +- def updated(self): +- return sq_time(self.ref().updated) +- +- def __str__(self): +- return \ +- "Stats{{created={}, updated={}, encryption={}, verification={}}}" \ +- .format(self.created, self.updated, self.encryption, +- self.verification) +- +-class Stamps(SQObject): +- @property +- def count(self): +- return self.ref().count +- +- @property +- def first(self): +- return sq_time(self.ref().first) +- +- @property +- def last(self): +- return sq_time(self.ref().last) +- +- def __str__(self): +- return "Stamps{{count={}, first={}, last={}}}".format( +- self.count, self.first, self.last) +- +-class Log(SQObject): +- _del = lib.sq_log_free +- +- @property +- def timestamp(self): +- return sq_time(self.ref().timestamp) +- +- @property +- def store(self): +- if self.ref().store == ffi.NULL: +- return None +- else: +- return Store(self.ref().store, context=self.context(), +- owner=self) +- +- @property +- def binding(self): +- if self.ref().binding == ffi.NULL: +- return None +- else: +- return Binding(self.ref().binding, context=self.context(), +- owner=self) +- +- @property +- def key(self): +- if self.ref().key == ffi.NULL: +- return None +- else: +- return Key(self.ref().key, context=self.context(), +- owner=self) +- +- @property +- def slug(self): +- return ffi.string(self.ref().slug).decode() +- +- @property +- def status(self): +- return ffi.string(self.ref().status).decode() +- +- @property +- def error(self): +- if self.ref().error == ffi.NULL: +- return None +- else: +- return ffi.string(self.ref().error).decode() +- +- def __str__(self): +- if self.error: +- return "{}: {}: {}: {}".format( +- self.timestamp, self.slug, self.status, self.error) +- else: +- return "{}: {}: {}".format( +- self.timestamp, self.slug, self.status) +diff --git a/ffi/lang/python/tests/test_store.py b/ffi/lang/python/tests/test_store.py +deleted file mode 100644 +index 7b06cc1a..00000000 +--- a/ffi/lang/python/tests/test_store.py ++++ /dev/null +@@ -1,47 +0,0 @@ +-from sequoia.prelude import Context, Store, Mapping, Fingerprint +- +-def test_open(): +- c = Context(ephemeral=True) +- Mapping.open(c) +- +-def test_add(): +- c = Context(ephemeral=True) +- s = Mapping.open(c) +- fp = Fingerprint.from_hex("7DCA58B54EB143169DDEE15F247F6DABC84914FE") +- s.add("Ἀριστοτέλης", fp) +- +-def test_iterate(): +- c = Context(ephemeral=True) +- s = Mapping.open(c) +- fp = Fingerprint.from_hex("7DCA58B54EB143169DDEE15F247F6DABC84914FE") +- s.add("Ἀριστοτέλης", fp) +- l = list(s.iter()) +- assert len(l) == 1 +- l = list(Store.list_keys(c)) +- assert len(l) == 1 +- fpi, key = l[0] +- assert fpi == fp +- +-def test_logs(): +- c = Context(ephemeral=True) +- s = Mapping.open(c) +- fp = Fingerprint.from_hex("7DCA58B54EB143169DDEE15F247F6DABC84914FE") +- b = s.add("Ἀριστοτέλης", fp) +- l = list(s.iter()) +- assert len(l) == 1 +- +- # global logs +- logs = list(Store.log(c)) +- assert len(logs) > 0 +- +- # per store logs +- logs = list(s.log()) +- assert len(logs) > 0 +- +- # per binding logs +- logs = list(b.log()) +- assert len(logs) > 0 +- +- # per key logs +- logs = list(b.key().log()) +- assert len(logs) > 0 +diff --git a/ffi/src/lib.rs b/ffi/src/lib.rs +index 40e3672e..9b4577eb 100644 +--- a/ffi/src/lib.rs ++++ b/ffi/src/lib.rs +@@ -130,7 +130,6 @@ pub(crate) use crate::openpgp::{ + MoveResultIntoRaw, + Maybe, + maybe_time, +- to_time_t, + }; + + /* Error handling with implicit context. */ +@@ -146,5 +145,4 @@ macro_rules! ffi_make_fry_from_ctx { + pub mod core; + pub mod error; + pub mod net; +-pub mod store; + +GitLab + diff --git a/gnu/packages/sequoia.scm b/gnu/packages/sequoia.scm index 70ac2e89cd..811beb823a 100644 --- a/gnu/packages/sequoia.scm +++ b/gnu/packages/sequoia.scm @@ -346,6 +346,126 @@ constraints on the signature into account. This Guix package is built to use the nettle cryptographic library.") (license license:lgpl2.0+))) +(define (sequoia-package-origin version) + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/sequoia-pgp/sequoia.git") + (commit (string-append "openpgp/v" version)))) + (sha256 + (base32 "1cq1xgvllbpii5hfl3wlia2ayznpvhv8lq8g8ygwxga86ijg98lq")) + (file-name (git-file-name "sequoia" version)) + (patches (search-patches "libsequoia-remove-store.patch" + "libsequoia-fix-ffi-Makefile.patch")))) + +(define-public libsequoia + (package + (name "libsequoia") + (version "0.22.0") + (source (sequoia-package-origin "1.6.0")) + (build-system cargo-build-system) + (outputs '("out" "python")) + (native-inputs + (list clang pkg-config python-pytest python-pytest-runner + python-wrapper)) + (inputs + (list gmp nettle openssl python python-cffi)) + (arguments + `(#:tests? #f ;; TODO make python tests find the shared object file + #:cargo-inputs + (("rust-anyhow" ,rust-anyhow-1) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-libc" ,rust-libc-0.2) + ("rust-memsec" ,rust-memsec-0.6) + ("rust-native-tls" ,rust-native-tls-0.2) + ("rust-proc-macro2" ,rust-proc-macro2-1) ;; for ffi-macros + ("rust-quote" ,rust-quote-1) ;; for ffi-macros + ("rust-sequoia-ipc" ,rust-sequoia-ipc-0.26) + ("rust-sequoia-net" ,rust-sequoia-net-0.23) + ("rust-sequoia-openpgp" ,rust-sequoia-openpgp-1) + ("rust-sha2" ,rust-sha2-0.8) ;; for ffi-macros + ("rust-tokio" ,rust-tokio-1.8)) + #:cargo-development-inputs + (("rust-filetime" ,rust-filetime-0.2)) + #:phases + (modify-phases %standard-phases + (add-after 'configure 'set-PREFIX + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (setenv "PREFIX" out) + #t))) + (replace 'build + (lambda _ + (invoke "make" "-C" "openpgp-ffi" "build-release") + (invoke "make" "-C" "ffi" "build-release"))) + (delete 'package) ;; cargo can't package a multi-crate workspace + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (if tests? + (begin + (invoke "make" "-C" "openpgp-ffi" "check") + (invoke "make" "-C" "ffi" "check")) + #t))) + (replace 'install + (lambda _ + (invoke "make" "-C" "openpgp-ffi" "install") + (invoke "make" "-C" "ffi" "install"))) + (add-after 'configure 'fix-build-environment + (lambda _ + (delete-file "Cargo.toml") + (symlink "../.cargo" "openpgp-ffi/.cargo") + (symlink "../.cargo" "ffi/.cargo") + (for-each delete-file-recursively + (find-files "guix-vendor" "^sequoia-[0-9]+\\.*" + #:directories? #t)) + #t)) + (add-after 'unpack 'fix-for-python-output + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (pyout (assoc-ref outputs "python"))) + (substitute* "ffi/lang/python/Makefile" + ;; adjust prefix for python package + (("PREFIX\\s*\\??=.*") + (string-append "PREFIX = " pyout "\n")) + ;; fix rpath to include the main package + (("\\WLDFLAGS=" text) + (string-append text "'-Wl,-rpath=" out "/lib '")) + ;; make setuptools install into the prefix, see + ;; guix/build/python-build-system.scm for explanation + (("\\ssetup.py\\s+install\\s") + " setup.py install --root=/ --single-version-externally-managed ")) + #t))) + (add-after 'unpack 'fix-Makefiles + (lambda _ + (substitute* '("openpgp-ffi/Makefile") + (("^check-headers: force-build") "check-headers:")))) + (add-after 'unpack 'remove-other-crypto-features + (lambda _ + (substitute* '("openpgp-ffi/Cargo.toml" "ffi/Cargo.toml") + (("^crypto-cng =" line) (string-append "# " line)) + (("^crypto-rust =" line) (string-append "# " line))) + #t)) + (add-after 'unpack 'fix-missing-feature + (lambda _ + (substitute* '("ffi/Cargo.toml") + (("^(tokio = .* features = \\[)" line) + (string-append line "\"net\", "))) + #t)) + (add-after 'unpack 'unbundle-crates + (lambda _ + (substitute* '("openpgp-ffi/Cargo.toml" "ffi/Cargo.toml") + (("path = \"\\.\\./(openpgp|store|net|ipc)\",") "")) + #t))))) + (home-page "https://sequoia-pgp.org") + (synopsis "C/FFI interfaces for Sequoia-PGP") + (description "This package provides a C and FFI interface to both the +low-level and a high-level API of Sequoia-PGP. + +Use with caution: This is an \"unofficial\" package, which are not officially +released, but part of the Sequoia-PGP v1.6.0 archive. So this package might +even go away.") + (license license:lgpl2.0+))) + (define-public sequoia (package (name "sequoia") -- 2.30.2 From debbugs-submit-bounces@debbugs.gnu.org Sun Dec 19 10:18:41 2021 Received: (at control) by debbugs.gnu.org; 19 Dec 2021 15:18:41 +0000 Received: from localhost ([127.0.0.1]:47720 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1myxxR-0005nw-KL for submit@debbugs.gnu.org; Sun, 19 Dec 2021 10:18:41 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41918) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1myxxQ-0005nj-5L for control@debbugs.gnu.org; Sun, 19 Dec 2021 10:18:40 -0500 Received: from [2001:470:142:3::e] (port=36916 helo=fencepost.gnu.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1myxxK-0007QW-VN for control@debbugs.gnu.org; Sun, 19 Dec 2021 10:18:34 -0500 Received: from [2a01:e0a:19b:d9a0:45b5:a14a:5c75:5737] (port=54156 helo=meije) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1myxxK-0003Y2-SL for control@debbugs.gnu.org; Sun, 19 Dec 2021 10:18:35 -0500 Date: Sun, 19 Dec 2021 16:18:33 +0100 Message-Id: <87o85cei7q.fsf@meije.i-did-not-set--mail-host-address--so-tickle-me> To: control@debbugs.gnu.org From: Mathieu Othacehe Subject: control message for bug #52610 X-Spam-Score: -1.9 (-) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.9 (--) merge 52610 52610 quit From debbugs-submit-bounces@debbugs.gnu.org Tue Dec 21 03:10:59 2021 Received: (at control) by debbugs.gnu.org; 21 Dec 2021 08:10:59 +0000 Received: from localhost ([127.0.0.1]:52253 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mzaEd-0006ml-2e for submit@debbugs.gnu.org; Tue, 21 Dec 2021 03:10:59 -0500 Received: from mail-wr1-f52.google.com ([209.85.221.52]:43617) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mzaEb-0006mW-ND for control@debbugs.gnu.org; Tue, 21 Dec 2021 03:10:58 -0500 Received: by mail-wr1-f52.google.com with SMTP id v11so25149920wrw.10 for ; Tue, 21 Dec 2021 00:10:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=date:message-id:to:from:subject; bh=YZgGBZkUNJo3OzGoE4LyMnKTF0VLPDOHtFbcmp6aTJs=; b=RlNgxSTnKT+oLpjt49TVUeRrM0oPeJVasr/PYRm9sw7WiagEM9q6DuDuPRho+gB84o 8mFKxJF1rRBz5Zc72evq7enZABP9OBra93xkgSxgSzrWyXhkBwt8t8+8d7yQY2/AElsl NAN56VyFNsoqy1+kMRr4DM1bzFo1e+A60OWU+lbH3vGFqm/YG8w7vKFcV2nae/xCivn2 gnkSMc6UBEqTSAYg61+2WWlymYmBjyDGKodkqeUQJJYuRlt9lYS/8e+wtW9mRZDpfvEj 1r8WPj0QJWuo2wVVP7IDWFDYODaTWLHzsCsTnBqPCqUMmEmGnDr7ajQKlputtYlhcAu8 UF2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:message-id:to:from:subject; bh=YZgGBZkUNJo3OzGoE4LyMnKTF0VLPDOHtFbcmp6aTJs=; b=kI/mmJ7a6xdEjVvNQgEAYJV/6NVXLqEHjvwMlACE6nveGBfTuY+yTaaZiwRi+otzbH EoBaYtEKomXnf9nCdcDdzSoFlxLVnC0mecoInWziK8sFBapYjigG0UT6ubAEK2Ucez1o 6eEd4jIMvt6WEAb/HoJzw1Q4UCIm4bJXdp7exP0gMITyVSFvg9GvJRbaP3Od7HqH01TJ 5U9IVO1y8xsagmHEnIF4NErwrUPZTByKIoWX61bjVKjlljsn/Rn2uE1lN41mznun7hAD ZKd0mSHYedOGthor4VF0W1O7a7KNvp7PtgKtUPx5ZjgPZf0OVzYeeYfPFNOmhY5Rz1CK FnnQ== X-Gm-Message-State: AOAM532+Nt6HGAvcKDMFbraG5fUvOYCquIsPOfsWThwJuJa6oBwMd8CS urM7Rs3mY4VuXMbSPnatzInbTK5hFCI= X-Google-Smtp-Source: ABdhPJxmnX0LV8fN2/Au+JD1CkuNpo11dCW0/18OtuQrxVeQEgh9D7LX7Vp20FZE2eHossJ+HEHHQw== X-Received: by 2002:a5d:5348:: with SMTP id t8mr1605168wrv.439.1640074251717; Tue, 21 Dec 2021 00:10:51 -0800 (PST) Received: from lili ([2a01:e0a:59b:9120:65d2:2476:f637:db1e]) by smtp.gmail.com with ESMTPSA id e12sm1067985wrg.110.2021.12.21.00.10.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Dec 2021 00:10:51 -0800 (PST) Date: Tue, 21 Dec 2021 09:10:38 +0100 Message-Id: <86czlqs7i9.fsf@gmail.com> To: control@debbugs.gnu.org From: zimoun Subject: control message for bug #52609 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) merge 52609 52610 quit From debbugs-submit-bounces@debbugs.gnu.org Tue Dec 21 03:12:07 2021 Received: (at control) by debbugs.gnu.org; 21 Dec 2021 08:12:07 +0000 Received: from localhost ([127.0.0.1]:52260 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mzaFj-0006pP-AQ for submit@debbugs.gnu.org; Tue, 21 Dec 2021 03:12:07 -0500 Received: from mail-wm1-f46.google.com ([209.85.128.46]:37668) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mzaFh-0006ok-3i for control@debbugs.gnu.org; Tue, 21 Dec 2021 03:12:05 -0500 Received: by mail-wm1-f46.google.com with SMTP id a203-20020a1c7fd4000000b003457874263aso1071171wmd.2 for ; Tue, 21 Dec 2021 00:12:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:mime-version; bh=h/5gYAy3GgJuUDBKxxQUWW0NkIHth4eF2lljvq8sbYE=; b=RMHFokFdlWsfjrvWaLXLOZ2p3RtKHkDHdbtjkyTvV8oC6knhGtiz4ZhHIJFwi0Pf5U LI6Wqe6EDZQ0vKelyTBu/x/Ii29uoMQbnp9zy90qoRHzcoO9ljpjmmxyCAo7iM3zOGyu Tbqjs3A4TQHuL7ozVd9Rv57vpCLr/7DYa8X60vtxWfuYzARgge6F2HUJRZTFFnnME6FT KKrmdAzgR2TpPmG7HVKX3TZQlS1oBp9zRPydKANhaC96CtYL1Fe7SzoGuJAdIW6hJzjz Hh7xhlyFYta+M2pllgbIUwOYaWBiqxdhFa5YxmK7a2So+VeWUWKtqylcKF/CxFTzSUcq NXng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:mime-version; bh=h/5gYAy3GgJuUDBKxxQUWW0NkIHth4eF2lljvq8sbYE=; b=DboWj8ITu81Mc1RC5iSZtoEbCopdngBCf9QUly00X89LrwlU9pr0Yc8gNM2lfnjE7f KXsfQea6SvwGR8FW/lnj3sciH1wa0J4P4cMG5nDKOHMB9zLdnwMdrkJvEPc5FnLd6e8L +FvvqViihCBI3/noUlJ585nd8eFw+PnovgFhtYu6obrXOUuI7kgfEQxiy/DinslTTidI d7XdcDdBRSO+atFzju0gBYiC2ec8OawN4GiFDl8wnE/pMxDhun5KvlWoIAR7xyYcp7te ZAfgxHiZfv+f86FH4qtGtZx6nLTqjqSaTQV4YYwTliyXXDvFEzUnFud2rwn+mN/BD5GA 9VRg== X-Gm-Message-State: AOAM530KQnGLbNCEjFvkc/W0PpOdZfsaLaCr+PVAgjo+06bbzahT5xe7 wVAEFX/Giybu0cxU5I07TogdMOw0YYM= X-Google-Smtp-Source: ABdhPJzoaqV4zAc4I7PWMAPc/zHLjnBbvP1so+O9WB06REFh6iaMmUlKATliz5YjpJZwWrgYOkaxCw== X-Received: by 2002:a7b:c317:: with SMTP id k23mr45056wmj.20.1640074319447; Tue, 21 Dec 2021 00:11:59 -0800 (PST) Received: from lili ([2a01:e0a:59b:9120:65d2:2476:f637:db1e]) by smtp.gmail.com with ESMTPSA id 9sm163030wrz.90.2021.12.21.00.11.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Dec 2021 00:11:59 -0800 (PST) From: zimoun To: control@debbugs.gnu.org Subject: control merge #52610 Date: Tue, 21 Dec 2021 09:11:50 +0100 Message-ID: <868rwes7g9.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) merge 52610 52611 merge 52610 52612 merge 52610 52613 merge 52610 52614 merge 52610 52615 merge 52610 52616 merge 52610 52617 merge 52610 52618 merge 52610 52619 merge 52610 52620 merge 52610 52621 merge 52610 52622 merge 52610 52623 merge 52610 52624 merge 52610 52625 merge 52610 52626 merge 52610 52627 merge 52610 52628 merge 52610 52629 merge 52610 52630 merge 52610 52631 merge 52610 52632 merge 52610 52633 merge 52610 52634 merge 52610 52635 merge 52610 52636 merge 52610 52637 merge 52610 52638 merge 52610 52639 merge 52610 52640 merge 52610 52641 merge 52610 52642 merge 52610 52643 merge 52610 52644 quit From debbugs-submit-bounces@debbugs.gnu.org Wed Dec 29 19:27:21 2021 Received: (at 52610) by debbugs.gnu.org; 30 Dec 2021 00:27:21 +0000 Received: from localhost ([127.0.0.1]:50705 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n2jHt-00026r-6G for submit@debbugs.gnu.org; Wed, 29 Dec 2021 19:27:21 -0500 Received: from relay1-d.mail.gandi.net ([217.70.183.193]:56651) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n2jHr-00026a-CG for 52610@debbugs.gnu.org; Wed, 29 Dec 2021 19:27:20 -0500 Received: (Authenticated sender: admin@nicolasgoaziou.fr) by relay1-d.mail.gandi.net (Postfix) with ESMTPSA id 4E309240006; Thu, 30 Dec 2021 00:27:11 +0000 (UTC) From: Nicolas Goaziou To: Hartmut Goebel Subject: Re: [bug#52610] [PATCH 00/42] Revising sequoia packaging and update to 1.6 References: Date: Thu, 30 Dec 2021 01:27:11 +0100 In-Reply-To: (Hartmut Goebel's message of "Sat, 18 Dec 2021 21:49:11 +0100") Message-ID: <87r19v6iow.fsf@nicolasgoaziou.fr> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 52610 Cc: 52610@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Hello Hartmut Goebel writes: > This implements the following changes I announced some weeks ago, see > . > It also updates each sequoia package to its current version. > > * Move all sequoia related crates in to sequoia.scm. As of now these are = only > rust-sequoia-openpgp-0.9, rust-sequoia-rfc2822-0.9 and there is only on > package depending on them rust-libpijul-0.12 > > * bufferedreader, rust-nettle and other crates from the sequoia project b= ut > not having "sequoia" (or such) in the name would be kept in crates-io.s= cm > > * In sequoia.scm there would be all sequoia crates, with the app packages > named without "rust-" prefix ("sequoia-sq", =E2=80=A6) > > * The current "sequoia" package will become a "wrapper", just propagating= (or > copying, what ever is more common in guix) the other packages which hav= e an > actual output. Nice. Note that some patches are not necessary anymore (e.g., updating rust-criterion-0.3). Also, please remove trailing #t in packages definitions (snippets and phases) and make sequoia use new package style (e.g., $#sequoia-sqv instead of (assoc-ref %build-inputs "sequoia-sqv") and $#output instead of (assoc-ref %outputs "out")). Otherwise, LGTM. Regards, --=20 Nicolas Goaziou From debbugs-submit-bounces@debbugs.gnu.org Thu Dec 30 15:42:00 2021 Received: (at 52610) by debbugs.gnu.org; 30 Dec 2021 20:42:00 +0000 Received: from localhost ([127.0.0.1]:54585 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n32FL-0001py-Te for submit@debbugs.gnu.org; Thu, 30 Dec 2021 15:42:00 -0500 Received: from mout.kundenserver.de ([217.72.192.75]:58877) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n32FJ-0001pf-4i for 52610@debbugs.gnu.org; Thu, 30 Dec 2021 15:41:58 -0500 Received: from hermia.goebel-consult.de ([79.211.186.148]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MPoPd-1mpc8E0vcx-00MpF1; Thu, 30 Dec 2021 21:41:49 +0100 Received: from [192.168.110.2] (lenashee.goebel-consult.de [192.168.110.2]) by hermia.goebel-consult.de (Postfix) with ESMTP id 0802D5F540; Thu, 30 Dec 2021 21:41:58 +0100 (CET) Message-ID: Date: Thu, 30 Dec 2021 21:41:46 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.4.1 Subject: Re: [bug#52610] [PATCH 00/42] Revising sequoia packaging and update to 1.6 Content-Language: en-US To: Nicolas Goaziou References: <87r19v6iow.fsf@nicolasgoaziou.fr> From: Hartmut Goebel Organization: crazy-compilers.com In-Reply-To: <87r19v6iow.fsf@nicolasgoaziou.fr> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K1:MMtKGmhqAiWTsbviQ00beb0Pv+KGtOe9m8VXTHZnntwfIyNiasT cyO27ylsZGAJBOkX9OXm3mm3Sp7yjJbSmpyvaut7lnrwXf6AD9nM+AQLp0CQnMD40Y7YpYI FEXAotmpH+6v1aajlwPSvaFqwwKuoOD2CUlPpzJbuaVP6QkHDGqHhhLWWFeJiVgpJ5tajP5 oYmYPqcf4pW97QtdEitWw== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:tj+pbAm/XNo=:gqtcOnFrXp9xe834vr4eLw TDgHGrDYbzoBJQdunfV6IMWHPzKU4u6EVsCZBSM+4Lyr/nodYwvJEswgYADZvL+vXEhnim6sC H0U6veNa0FfyFiJWKtOdNa5u/9F/4cnAJPXKLM9nRnr1iFFceWvFRPr7qSF/rD4As6wzOpVOX Wv/x7a4BcKV614nwqyQ/N2kUQWyn8H9/fHHX/RW1zVmsotJXXjMxLCSkxmvegTjl3P0yVWQyu LrdcmhQoDypgMSp7Hm9OunzXa36IHo3K27YMrCip8V6gYmB4lYu4sN4YlZUkueAUeyUjRLskP nZDVbZDPGjvTWu6x4UmjQV9BBNePxNaNCi++awNK+EM9yBdWtoRuFVm9XjTjVNjevaIMu+qpd 6hho3csJvRv/mt3dLVr6CZDQISF2ZmgHvngMxTAC8CTfp1GxLMBqWZdqsRbbpzysFmlRxjDks pJ6lShhoq76zO0CnTZlf5FtdQVnE34pV1G04Qe5Ytj/T8FAgOz5+tiFKc/T0MovuqaqOU+V1e MOVHVQ9jBhs5GEnjMQpdxL5N3If3ZqALTvCvlGj/iyLdaDh4hthwL/J0qe9kTdZrZNPSJFRQt 2hpw7ej/z6I/LcRvhX0XnAGebd70EMGYCn0z3POm8yj3XE5llVEHoDHBtBObEbbpq5+uKlXkc iRkO5NZPPzWHakXaUjIktVvMWw2hSIhENeYH4sJjKid0zalMSt0N4zCoDjhHNsDhzepwbpmu0 q6awYVU0/3xyQF4Z X-Spam-Score: -0.1 (/) X-Debbugs-Envelope-To: 52610 Cc: 52610@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.1 (-) Updated and pushed as bf7ed7c9f2083e5bf81fffa41e2e7213817d5acd. Thanks for the review It took me quite some time to figure out how toe use the new gexp/ungexp since documentation and examples are rare. So now we have an example how to use gexp and cargo-inputs :-) -- Regards Hartmut Goebel | Hartmut Goebel | h.goebel@crazy-compilers.com | | www.crazy-compilers.com | compilers which you thought are impossible | From debbugs-submit-bounces@debbugs.gnu.org Thu Dec 30 15:42:19 2021 Received: (at 52610-close) by debbugs.gnu.org; 30 Dec 2021 20:42:19 +0000 Received: from localhost ([127.0.0.1]:54590 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n32Ff-0001r3-49 for submit@debbugs.gnu.org; Thu, 30 Dec 2021 15:42:19 -0500 Received: from mout.kundenserver.de ([212.227.126.130]:41377) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n32Fd-0001qn-LW for 52610-close@debbugs.gnu.org; Thu, 30 Dec 2021 15:42:18 -0500 Received: from hermia.goebel-consult.de ([79.211.186.148]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MqqLB-1mhSs625B3-00mqqz for <52610-close@debbugs.gnu.org>; Thu, 30 Dec 2021 21:42:11 +0100 Received: from [192.168.110.2] (lenashee.goebel-consult.de [192.168.110.2]) by hermia.goebel-consult.de (Postfix) with ESMTP id 9BE4D5F540 for <52610-close@debbugs.gnu.org>; Thu, 30 Dec 2021 21:42:20 +0100 (CET) Message-ID: Date: Thu, 30 Dec 2021 21:42:08 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.4.1 Subject: Re: [bug#52610] [PATCH 00/42] Revising sequoia packaging and update to 1.6 Content-Language: de-DE To: 52610-close@debbugs.gnu.org References: <87r19v6iow.fsf@nicolasgoaziou.fr> From: Hartmut Goebel Organization: crazy-compilers.com In-Reply-To: <87r19v6iow.fsf@nicolasgoaziou.fr> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K1:0H0sSJUp/lJRrmLTQbVMth7NKHTTPRz2UaUYopUrkDp3oNYCLyg SFHN6Sx+DrPlqOXk4dAvL8u9s9zD3D0hZ16rstp6yRcZmBqDKR92kCudcETPHi5aH35SGeE To0CjDhajmv1kg4N0v4SCp61PaafDUkQsh+BzgeRV0Hx5bThduH2V/kRQK/eh2ccmGsP+sw QAStAg7C4dfSF+dtBfzPg== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:JwTjs7MZVkc=:8/Qbvt+kcTF63mCr58BLkT mM4Wj6YfM3SgcbEavmfeQOLGBQSVT8/vxQglKWDUdq4jQ7bE6mhPNapf+wL/A/SbsC7DxtqQ2 3YrmxHMAY1UyD6pMvSMmIqD5Zzvr0Ulom4SuJeySM5JhL86XgHUD8GpNbulUv4Wbu6cFDiiWP jDp4YfD01hB+teWgfj004hOQ4hOvX2kwZdnd5y7saHM/NkfkawMm1q/TAA5CoXoYqOYJZpiuM DQ894nwVQDgXDDOfA16seZTr7Li9AJJI6nPd3B/1nYfqTubE1AwlCCoqQ/gSiCG6HVOey9NZb ZhNPF/vxBnypbVFWywCXMchcIVfc44Ek0Tb/HdzeN5wRUhq4CLETIHumUzok5d3vs+3aWmv6U M3VKiVtc+vA8jKY8dnQ7FCtMJCT7H4mLPrVOF67Ez95dKJeKRclXhwl56v25OpzTs/mZdw0Li j0CaUvdcGPAps49PNcxx0meWPpWC/V4kYl48xBuKvUp4LvpmiBQPPZJe9SipZplZmJv7YHl9Z n/GZbzgD7Vbx40rZ009phBg9nF77KxXyFqVTNNQaEGYjyvGVv3GagSEkjK9dfhizf6Emot4Lg M+q37I8lbys76UDCEsqWeVUnxbE2SsMr+/OQ9DlbEHH7jc0yooqJ433pG+f9fL9ognVNz+XVZ mDoi1RXAKscqtlOZZA1ucfer60XyxPDVAXHe+eOWUbjo2yJbrMkMCtFzB831UfE0m8D8KorjO Nk4QOQnIzPog0VUF X-Spam-Score: -0.1 (/) X-Debbugs-Envelope-To: 52610-close X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.1 (-) From unknown Sun Jun 15 13:01:34 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Fri, 28 Jan 2022 12:24:05 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator