From patchwork Fri Oct 8 20:03:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: John Kehayias X-Patchwork-Id: 33694 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 4537627BBE3; Fri, 8 Oct 2021 21:04:15 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 027AD27BBE1 for ; Fri, 8 Oct 2021 21:04:15 +0100 (BST) Received: from localhost ([::1]:55070 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mYw6I-0001k9-3e for patchwork@mira.cbaines.net; Fri, 08 Oct 2021 16:04:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58222) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mYw66-0001gg-QJ for guix-patches@gnu.org; Fri, 08 Oct 2021 16:04:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40399) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mYw66-0003VC-4y for guix-patches@gnu.org; Fri, 08 Oct 2021 16:04:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mYw66-00029A-1U for guix-patches@gnu.org; Fri, 08 Oct 2021 16:04:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#51100] [PATCH 4/8] Update and fix Flatpak and portals Resent-From: John Kehayias Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 08 Oct 2021 20:04:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51100 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: "51100@debbugs.gnu.org" <51100@debbugs.gnu.org> Received: via spool by 51100-submit@debbugs.gnu.org id=B51100.16337234308229 (code B ref 51100); Fri, 08 Oct 2021 20:04:01 +0000 Received: (at 51100) by debbugs.gnu.org; 8 Oct 2021 20:03:50 +0000 Received: from localhost ([127.0.0.1]:51944 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mYw5t-00028f-Tj for submit@debbugs.gnu.org; Fri, 08 Oct 2021 16:03:50 -0400 Received: from mail-40134.protonmail.ch ([185.70.40.134]:13428) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mYw5r-00028R-WC for 51100@debbugs.gnu.org; Fri, 08 Oct 2021 16:03:48 -0400 Date: Fri, 08 Oct 2021 20:03:19 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1633723417; bh=ijdK6KpVQgifTJDqIdiCPyYRddBnAInEXItklwSNqP8=; h=Date:To:From:Reply-To:Subject:In-Reply-To:References:From; b=Ot/XLjUVGdAv/iNJpIoaLwiFxaBWLvMaXsQY9oPxI/zzZd/z7h9oHMLbpX7nPHBjp ev3FJYfO4HoOSWcVtTvTqdi6vphR9s/MhUiG1evE4VxM3z80pBQbggLZXttl2wwI1q l9ZdlgLNRrEmOVyDComEgShjsPnbDuo3QJyf9z+A= Message-ID: <5iopUmIVAAKwNv_cATe8VzZuufIs8QAhldp5IAQHOahJt6J6e52vNE9JBgJApB5doRcafyzmMavmEQ_DzsQ-10pn3RPdmAq0tTzQ68I0WLk=@protonmail.com> In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: John Kehayias X-ACL-Warn: , John Kehayias via Guix-patches X-Patchwork-Original-From: John Kehayias via Guix-patches via From: John Kehayias X-getmail-retrieved-from-mailbox: Patches From 71d64041fb6754a1b1cf67b0ea0e18da9b724f74 Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Fri, 8 Oct 2021 14:15:13 -0400 Subject: [PATCH 4/8] gnu: Add p11-kit-next. * gnu/packages/tls.scm (p11-kit-next): New variable. [source]: Update to latest version of p11-kit. [arguments]: Configure with system-wide CA certificate store which fixes a certificate error with Flatpak. Original patch by Andrew Whatson. --- gnu/packages/tls.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) -- 2.33.0 diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 69ed9de11f..beda86e8c0 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -18,6 +18,7 @@ ;;; Copyright © 2021 Solene Rapenne ;;; Copyright © 2021 Brice Waegeneire ;;; Copyright © 2021 Matthew James Kraai +;;; Copyright © 2021 John Kehayias ;;; ;;; This file is part of GNU Guix. ;;; @@ -165,6 +166,31 @@ coordinating the use of PKCS#11 by different components or libraries living in the same process.") (license license:bsd-3))) +(define-public p11-kit-next + (package + (inherit p11-kit) + (name "p11-kit-next") + (version "0.24.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/p11-glue/p11-kit/releases/" + "download/" version "/p11-kit-" version ".tar.xz")) + (sha256 + (base32 "11f6saclxsclc1f3lbavzw8kikws4cr3mfd1avly8dgnhh2i9rl1")))) + (arguments + `(#:configure-flags '("--with-trust-paths=/etc/ssl/certs/ca-certificates.crt") + #:phases (modify-phases %standard-phases + (add-before 'check 'prepare-tests + (lambda _ + ;; "test-runtime" expects XDG_RUNTIME_DIR to be set up + ;; and looks for .cache and other directories (only). + ;; For simplicity just drop it since it is irrelevant + ;; in the build container. + (substitute* "Makefile" + (("test-runtime\\$\\(EXEEXT\\)") "")) + #t))))))) + (define-public gnutls (package (name "gnutls")