From patchwork Wed Mar 16 03:03:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 37848 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 57CE927BBE9; Wed, 16 Mar 2022 03:04: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,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, 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 39B8E27BBEA for ; Wed, 16 Mar 2022 03:04:09 +0000 (GMT) Received: from localhost ([::1]:60374 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nUJxI-0003LG-BI for patchwork@mira.cbaines.net; Tue, 15 Mar 2022 23:04:08 -0400 Received: from eggs.gnu.org ([209.51.188.92]:37108) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nUJxC-0003Kt-4i for guix-patches@gnu.org; Tue, 15 Mar 2022 23:04:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56055) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nUJxB-00071c-Rd for guix-patches@gnu.org; Tue, 15 Mar 2022 23:04:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nUJxB-0003zw-LO for guix-patches@gnu.org; Tue, 15 Mar 2022 23:04:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54337] [PATCH v3] gnu: Update crfys to 0.11.2 Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 16 Mar 2022 03:04:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54337 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?utf-8?q?Court=C3=A8s?= Cc: Maxime Devos , 54337@debbugs.gnu.org Received: via spool by 54337-submit@debbugs.gnu.org id=B54337.164739982615342 (code B ref 54337); Wed, 16 Mar 2022 03:04:01 +0000 Received: (at 54337) by debbugs.gnu.org; 16 Mar 2022 03:03:46 +0000 Received: from localhost ([127.0.0.1]:49952 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nUJwv-0003zO-Je for submit@debbugs.gnu.org; Tue, 15 Mar 2022 23:03:45 -0400 Received: from mout-p-101.mailbox.org ([80.241.56.151]:50874) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nUJwt-0003z6-AA for 54337@debbugs.gnu.org; Tue, 15 Mar 2022 23:03:43 -0400 Received: from smtp102.mailbox.org (smtp102.mailbox.org [IPv6:2001:67c:2050:105:465:1:3:0]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-101.mailbox.org (Postfix) with ESMTPS id 4KJFTj0YTBz9sWb; Wed, 16 Mar 2022 04:03:37 +0100 (CET) Date: Wed, 16 Mar 2022 04:03:31 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1647399815; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=6wKFLiOKQqV8tOfdjNrU2DFTsNwyCf/LyKSnK7BBEoE=; b=oh2Cnjm2uRqIgACmCFyaxG0w6yXacEtRRPzd4xnE+BJVX9Ies6NUCjNQ7Or00pGUDy8o6J GM1v8gAxNIUbl6dh7frlxzFSygaPmxVA6NbulCGEvg6jZDfTu8Se5JR4rnoaNU/PEJmMW/ lg+3Lm/kvD72canj56NsRtKFfo4fQFsPZelWvneuwuoOA1LZB/9L3V/NKBE55/IFbnIBpy LDk4VkAEvvdJMEWovrzK3o2syJPcR0O+zu0Cb44HPE9gDzR0dj04MMIQR9ONlx4UyqN5+q vRybvxE/rnswgQ+3SWA1ChQqxiLUId74rvDZfuhHWCeY1T3zN9WM3RXHn4bixQ== From: Brendan Tildesley Message-ID: <855462635.430174.1647399811692@office.mailbox.org> In-Reply-To: <87sfrjocom.fsf@gnu.org> References: <20220314093550.16580-1-mail@brendan.scot> <20220314093550.16580-2-mail@brendan.scot> <87sfrjocom.fsf@gnu.org> MIME-Version: 1.0 X-Priority: 3 Importance: Normal X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches > On 03/15/2022 9:14 AM Ludovic Courtès wrote: > Since this affect only cryfs, and since it’s just a missing include, I > wonder if we could instead add “#include ” in the cryfs > source file(s) that include(s) Boost headers? That way, we wouldn’t > need an extra Boost build. > > Thoughts? > > Ludo’. Just this one patch works: From a5228fe860659c9bf6c410f8b57a407b30173648 Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Thu, 10 Mar 2022 20:49:44 +1100 Subject: [PATCH v3] gnu: cryfs: Update to 0.11.2. * gnu/packages/crypto.scm (cryfs): Update to 0.11.2. [arguments]: Fix build with boost 1.77 --- gnu/packages/crypto.scm | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index d8e7941903..cf8bc111e1 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -1461,7 +1461,7 @@ (define-public transcrypt (define-public cryfs (package (name "cryfs") - (version "0.11.0") + (version "0.11.2") (source (origin (method url-fetch) @@ -1469,7 +1469,7 @@ (define-public cryfs "https://github.com/cryfs/cryfs/releases/download/" version "/cryfs-" version ".tar.xz")) (sha256 - (base32 "0dxphbj5sssm82rkkdb71algrcki16qlpzlvrjyvvm6b7x7zi0sm")))) + (base32 "1ggizlacm4fccsw9syy2763ihxnby6cdh3mhhraxy8bmsdjza7lm")))) (build-system cmake-build-system) (arguments '(#:modules ((guix build cmake-build-system) @@ -1485,7 +1485,7 @@ (define-public cryfs "/cmake-utils/DependenciesFromLocalSystem.cmake")) #:phases (modify-phases %standard-phases - (add-before 'configure 'fix-configure + (add-before 'configure 'fix-up (lambda* (#:key tests? #:allow-other-keys) ;; Remove junk directory that breaks the build (chdir "..") (delete-file-recursively ".circleci") @@ -1496,7 +1496,14 @@ (define-public cryfs (when tests? (substitute* "CMakeLists.txt" (("option.BUILD_TESTING .build test cases. OFF.") - "option(BUILD_TESTING \"build test cases\" ON)"))))) + "option(BUILD_TESTING \"build test cases\" ON)"))) + ;; work around a missing import fixed upstream in boost 1.78 + ;; See https://github.com/boostorg/process/issues/213 + (substitute* (find-files "." "subprocess.cpp$") + (("#include .*" line) + (string-append + "#include \n" + line))))) (replace 'check (lambda* (#:key tests? #:allow-other-keys) (when tests? -- 2.34.0