From patchwork Tue Nov 23 23:13:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: John Kehayias X-Patchwork-Id: 34778 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 A251327BBE9; Tue, 23 Nov 2021 23:14:10 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A20F127BBEA for ; Tue, 23 Nov 2021 23:14:09 +0000 (GMT) Received: from localhost ([::1]:42424 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mpezI-00032y-NN for patchwork@mira.cbaines.net; Tue, 23 Nov 2021 18:14:08 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38702) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mpezC-00032k-S9 for guix-patches@gnu.org; Tue, 23 Nov 2021 18:14:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:40917) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mpezC-0006Zs-Jd for guix-patches@gnu.org; Tue, 23 Nov 2021 18:14:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mpezC-0001BJ-9V for guix-patches@gnu.org; Tue, 23 Nov 2021 18:14:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52068] [PATCH] [core-updates-frozen] gnu: libostree: Build with libsoup 2. Resent-From: John Kehayias Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 23 Nov 2021 23:14:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 52068 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52068@debbugs.gnu.org X-Debbugs-Original-To: Guix-patches Received: via spool by submit@debbugs.gnu.org id=B.16377092064476 (code B ref -1); Tue, 23 Nov 2021 23:14:02 +0000 Received: (at submit) by debbugs.gnu.org; 23 Nov 2021 23:13:26 +0000 Received: from localhost ([127.0.0.1]:52463 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mpeyc-0001A8-09 for submit@debbugs.gnu.org; Tue, 23 Nov 2021 18:13:26 -0500 Received: from lists.gnu.org ([209.51.188.17]:44082) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mpeyY-00019w-9i for submit@debbugs.gnu.org; Tue, 23 Nov 2021 18:13:25 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38604) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mpeyX-00030t-Sq for guix-patches@gnu.org; Tue, 23 Nov 2021 18:13:22 -0500 Received: from mail-4316.protonmail.ch ([185.70.43.16]:50863) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mpeyV-0006H0-4f for guix-patches@gnu.org; Tue, 23 Nov 2021 18:13:21 -0500 Date: Tue, 23 Nov 2021 23:13:04 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1637709188; bh=gzlGlVF2pVFR+NOX7NjoPtsDi39D+4Y5ZZJn08CuVd8=; h=Date:To:From:Reply-To:Subject:From; b=EQYBpuBFwhcOTXkTISaQHsvBEKdK0uEQocZElmwiOXqa5LAwZRYY0uMRWyinY0ykh 8AJYICv7RRKTTik642sVP0aR56TSAt7zB5cXK6IOTDyqhU43CdaRDPO43/Ll8bDNk1 8r8FBtt3EoULVFXbrhKh0mMA0h6a45eBZEFmkSbA= Message-ID: MIME-Version: 1.0 Received-SPF: pass client-ip=185.70.43.16; envelope-from=john.kehayias@protonmail.com; helo=mail-4316.protonmail.ch X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" 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 Hello, libostree should be built with libsoup-2 (doesn't support libsoup 3 currently) to have HTTP support. This was noticed due to Flatpak updates failing with "This version of ostree was built without libsoup or libcurl, and cannot fetch over HTTP". In the build log of ostree (eg https://ci.guix.gnu.org/build/1775196/log/raw ) you can see that it will report no HTTP backend with libsoup 3, but properly shows libsoup when libsoup-2 is provided as an input as in this patch. I've checked libostree builds and that Flatpak built with this version successfully can download over HTTP. Thanks to jackhill on IRC for spotting the configuration error of ostree when we both hit the Flatpak update bug. (Also, I added my copyright line as I forgot it on earlier Flatpak updates around the p11-kit workaround and version updates.) Happily running on core-updates-frozen, John From fc854d57513835493895c8030bfc131f36f72175 Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Tue, 23 Nov 2021 18:04:17 -0500 Subject: [PATCH] gnu: libostree: Build with libsoup 2. * gnu/packages/package-management.scm (libostree)[inputs]: Change LIBSOUP to LIBSOUP-MINIMAL-2. --- gnu/packages/package-management.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 163683ebdd..9d0d8d4670 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -19,6 +19,7 @@ ;;; Copyright © 2020 Vincent Legoll ;;; Copyright © 2021 Ivan Gankevich ;;; Copyright © 2021 Maxim Cournoyer +;;; Copyright © 2021 John Kehayias ;;; ;;; This file is part of GNU Guix. ;;; @@ -1567,7 +1568,7 @@ (define-public libostree ("glib" ,glib) ("gpgme" ,gpgme) ("libarchive" ,libarchive) - ("libsoup" ,libsoup) + ("libsoup" ,libsoup-minimal-2) ; needs libsoup-2.4 ("util-linux" ,util-linux))) (home-page "https://ostree.readthedocs.io/en/latest/") (synopsis "Operating system and container binary deployment and upgrades") -- 2.34.0