From patchwork Mon Jan 22 13:36:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Josselin Poiret X-Patchwork-Id: 59313 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 BC7C127BBE9; Mon, 22 Jan 2024 15:26:30 +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=-1.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 1654827BBE2 for ; Mon, 22 Jan 2024 15:26:30 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rRwBT-0007MQ-Vj; Mon, 22 Jan 2024 10:26:00 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rRwBS-0007Lf-4t for guix-patches@gnu.org; Mon, 22 Jan 2024 10:25:58 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rRwBR-0005gG-Ib for guix-patches@gnu.org; Mon, 22 Jan 2024 10:25:57 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rRwBV-00071o-Ju for guix-patches@gnu.org; Mon, 22 Jan 2024 10:26:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68656] [PATCH core-updates 1/7] gnu: cryptsetup: Update to 2.6.1. Resent-From: Josselin Poiret Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 22 Jan 2024 15:26:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68656 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68656@debbugs.gnu.org Cc: Josselin Poiret Received: via spool by 68656-submit@debbugs.gnu.org id=B68656.170593713726905 (code B ref 68656); Mon, 22 Jan 2024 15:26:01 +0000 Received: (at 68656) by debbugs.gnu.org; 22 Jan 2024 15:25:37 +0000 Received: from localhost ([127.0.0.1]:41536 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rRwB7-0006zr-6r for submit@debbugs.gnu.org; Mon, 22 Jan 2024 10:25:37 -0500 Received: from jpoiret.xyz ([206.189.101.64]:44504) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rRwB4-0006za-5u for 68656@debbugs.gnu.org; Mon, 22 Jan 2024 10:25:35 -0500 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id 7EB0118530C; Mon, 22 Jan 2024 15:25:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1705937128; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wTOGq5QoOooMaN/LVBuaXTP5E0xhwe5jLo8IZzKktBU=; b=iYBBpBvqTSLl1KUnSUOGQqjUqcKlbeffaGkHhz7zkImgREw+7fsV5SVwP5JXH6EyiLc8R/ i5rVn9TL9NMdi9Tu2OowiRuOWTv2BZ7ALbjP+DRn/4Kcg/MOudP9vUvTkN1O/jfvpHWnxs coLAMw3jnOv75AvjggEJW7+Ar+5kOcl9rKYd2TtfLZNi58exCnF0pzW1oatc5W8t5WEHT7 o3VDuFf4RK/YvIjjBikZWp/D+IYg5NZ0uXx9CpC3bflu7+N1WfSRSNEltuDJVH1+TfZAzo ErF5hGDTQNZZGEp0iJEOQrpsXnUp9mqL5dN37SPChfmel+nM94hSd+J+d9+HiQ== Date: Mon, 22 Jan 2024 14:36:17 +0100 Message-ID: <9939efb9bb6e769d0a0298183128e4b6c34771d2.1705762361.git.dev@jpoiret.xyz> In-Reply-To: References: MIME-Version: 1.0 X-Spamd-Bar: --- Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz 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: , Reply-to: Josselin Poiret X-ACL-Warn: , Josselin Poiret via Guix-patches X-Patchwork-Original-From: Josselin Poiret via Guix-patches via From: Josselin Poiret Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Josselin Poiret * gnu/packages/cryptsetup.scm (cryptsetup): Update to 2.6.1. Disable external tokens for now. Change-Id: I5610cabfbd46d010a8241430d8d90f5920847c04 --- gnu/packages/cryptsetup.scm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/gnu/packages/cryptsetup.scm b/gnu/packages/cryptsetup.scm index 3bdc68ae5a..3cb669206a 100644 --- a/gnu/packages/cryptsetup.scm +++ b/gnu/packages/cryptsetup.scm @@ -30,12 +30,13 @@ (define-module (gnu packages cryptsetup) #:use-module (gnu packages pkg-config) #:use-module (gnu packages popt) #:use-module (gnu packages linux) + #:use-module (gnu packages ruby) #:use-module (gnu packages web)) (define-public cryptsetup (package (name "cryptsetup") - (version "2.3.7") + (version "2.6.1") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/linux/utils/cryptsetup/v" @@ -43,7 +44,7 @@ (define-public cryptsetup "/cryptsetup-" version ".tar.xz")) (sha256 (base32 - "1a97rvi6arsj8dikh1qsvixx9rizm89k155q2ypifqlqllr530v1")))) + "14s6vbb9llpgnhmv0badxxzhi73jp4vyvp8swk4bjah7l5jys3a1")))) (build-system gnu-build-system) (arguments `(#:configure-flags @@ -54,12 +55,16 @@ (define-public cryptsetup "--with-crypto_backend=gcrypt" ;; GRUB 2.06 supports LUKS2, but does it reliably support all set-ups…? "--with-default-luks-format=LUKS1" + ;; External tokens would need an env variable to work on Guix, and we + ;; don't have users for it yet. + "--disable-external-tokens" + "--disable-ssh-token" ;; libgcrypt is not found otherwise when cross-compiling. ;; (string-append "--with-libgcrypt-prefix=" (assoc-ref %build-inputs "libgcrypt"))))) (native-inputs - (list pkg-config)) + (list pkg-config ruby-asciidoctor)) (inputs (list argon2 json-c From patchwork Mon Jan 22 13:36:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josselin Poiret X-Patchwork-Id: 59316 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 26EBC27BBE9; Mon, 22 Jan 2024 15:26:47 +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=-1.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 857A327BBE2 for ; Mon, 22 Jan 2024 15:26:46 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rRwBY-0007Ny-Sf; Mon, 22 Jan 2024 10:26:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rRwBT-0007MA-H7 for guix-patches@gnu.org; Mon, 22 Jan 2024 10:25:59 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rRwBT-0005gf-8Q for guix-patches@gnu.org; Mon, 22 Jan 2024 10:25:59 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rRwBV-00071v-Ve; Mon, 22 Jan 2024 10:26:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68656] [PATCH core-updates 2/7] gnu: Add libdevmapper-propagated-inputs. Resent-From: Josselin Poiret Original-Sender: "Debbugs-submit" Resent-CC: leo@famulari.name, me@tobias.gr, w@wmeyer.eu, guix-patches@gnu.org Resent-Date: Mon, 22 Jan 2024 15:26:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68656 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68656@debbugs.gnu.org Cc: Josselin Poiret , Leo Famulari , Tobias Geerinckx-Rice , Wilko Meyer X-Debbugs-Original-Xcc: Leo Famulari , Tobias Geerinckx-Rice , Wilko Meyer Received: via spool by 68656-submit@debbugs.gnu.org id=B68656.170593713826913 (code B ref 68656); Mon, 22 Jan 2024 15:26:01 +0000 Received: (at 68656) by debbugs.gnu.org; 22 Jan 2024 15:25:38 +0000 Received: from localhost ([127.0.0.1]:41538 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rRwB7-0006zu-Jp for submit@debbugs.gnu.org; Mon, 22 Jan 2024 10:25:38 -0500 Received: from jpoiret.xyz ([206.189.101.64]:44572) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rRwB5-0006zc-MO for 68656@debbugs.gnu.org; Mon, 22 Jan 2024 10:25:36 -0500 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id BB06B185457; Mon, 22 Jan 2024 15:25:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1705937130; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=FSuyg0GoSyLJ7vjqV7LKmVWmVBIxzR0aEGB+YDhQSM8=; b=DQaITE58FHoeCrhpimFkzU5fNoQl8qoI5fKE/dIMLH5cFudM72+kzz2aPntHdswV3+30AI Y1ldc5XL4OTvx3WHifUdXZxX4DBrbZVQRmoQ31vqXAwlA5m0HshTB3oZ6y3YmFPsdHjmjk O7eRYyKWmhhbnzOwm2VMe2uJXrKd3QjHQm7V2dI2/GXNd8pl3pzpZvCl24GTaYjEVcNafJ Dlx7IedCSeP4RpVBq9TuEJSavg/mW7KJpn2x7oxYgGiZNHZHpgxMobv3UvTT4R1dq8W9dt nSqrS+Fa3GB1hvCCNWRNdT1jT77W2TJPuoD6O5s/XxTqq8ZD8fSQYcHXR+KrNA== Date: Mon, 22 Jan 2024 14:36:18 +0100 Message-ID: <04d8f33027a67a32de0460a490bd2be727650070.1705762361.git.dev@jpoiret.xyz> In-Reply-To: References: MIME-Version: 1.0 X-Spamd-Bar: / Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz 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: , Reply-to: Josselin Poiret X-ACL-Warn: , Josselin Poiret via Guix-patches X-Patchwork-Original-From: Josselin Poiret via Guix-patches via From: Josselin Poiret Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Josselin Poiret * gnu/packages/linux.scm (libdevmapper-propagated-inputs): Record needed inputs for libdevmapper. Change-Id: I6db51ea2ce640f77198fd67f0e2480052907f28e --- gnu/packages/linux.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 5cfd2025f6..2977b8f88e 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4588,6 +4588,9 @@ (define-public lvm2 ;; Command-line tools are GPLv2. (license (list license:gpl2 license:lgpl2.1)))) +(define-public (libdevmapper-propagated-inputs) + (list eudev)) + (define-public lvm2-static (package (inherit lvm2) From patchwork Mon Jan 22 13:36:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josselin Poiret X-Patchwork-Id: 59312 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 D31E927BBE9; Mon, 22 Jan 2024 15:26: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=-1.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 C2BD427BBE2 for ; Mon, 22 Jan 2024 15:26:08 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rRwBV-0007Mf-Pr; Mon, 22 Jan 2024 10:26:01 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rRwBS-0007Lh-Is for guix-patches@gnu.org; Mon, 22 Jan 2024 10:25:58 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rRwBS-0005gL-9u for guix-patches@gnu.org; Mon, 22 Jan 2024 10:25:58 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rRwBW-000721-C7 for guix-patches@gnu.org; Mon, 22 Jan 2024 10:26:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68656] [PATCH core-updates 3/7] gnu: Add libcryptsetup-propagated-inputs. Resent-From: Josselin Poiret Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 22 Jan 2024 15:26:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68656 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68656@debbugs.gnu.org Cc: Josselin Poiret Received: via spool by 68656-submit@debbugs.gnu.org id=B68656.170593714426950 (code B ref 68656); Mon, 22 Jan 2024 15:26:02 +0000 Received: (at 68656) by debbugs.gnu.org; 22 Jan 2024 15:25:44 +0000 Received: from localhost ([127.0.0.1]:41548 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rRwBE-00070b-3U for submit@debbugs.gnu.org; Mon, 22 Jan 2024 10:25:44 -0500 Received: from jpoiret.xyz ([206.189.101.64]:44634) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rRwB7-0006zs-GG for 68656@debbugs.gnu.org; Mon, 22 Jan 2024 10:25:38 -0500 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id 47F4A18530C; Mon, 22 Jan 2024 15:25:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1705937132; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4UEPJ+9Y6+NlVV4qhKXc6XOhwq9vEO0S7fbuMvxqGO0=; b=VR7V6SjGF0zvzpFtDgMd4RfFyS2DxM4uR6SiM5O+Mj546WfGVvtJM6qrP5WAjk1NAITXy3 bYGUPs5bBDnaysh+YzhsgF2iu6w8ZMr80TNa49JFFllH3sI+Jg3ysKjeW1TVwH1ZZi8BYK goRRjINeFMV8YIMBYpXV55wRL0FMJje7J+U+XsqMwkz1TYvKrfN8DoflEsHL2SMNZoYYtN 0Qz6IflhOLtDlJy31KomgeWZmXHysD679FxEw3m4bytY3S6sAQm7rAC7t6pz/7+os4VMCm 2ctAr1oizFlNL/ienhy2Xp3rfScRLiX2bQzyxuLzgHDHjYhc8iz96++zRRjKpA== Date: Mon, 22 Jan 2024 14:36:19 +0100 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Spamd-Bar: / Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz 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: , Reply-to: Josselin Poiret X-ACL-Warn: , Josselin Poiret via Guix-patches X-Patchwork-Original-From: Josselin Poiret via Guix-patches via From: Josselin Poiret Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Josselin Poiret * gnu/packages/cryptsetup.scm (libcryptsetup-propagated-inputs): Record needed inputs for libcryptsetup. Change-Id: Ia630f2d5f180536d997af93e57aa547379b2c010 --- gnu/packages/cryptsetup.scm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/gnu/packages/cryptsetup.scm b/gnu/packages/cryptsetup.scm index 3cb669206a..8e2bdb6d9e 100644 --- a/gnu/packages/cryptsetup.scm +++ b/gnu/packages/cryptsetup.scm @@ -91,6 +91,13 @@ (define-public cryptsetup (license license:gpl2) (home-page "https://gitlab.com/cryptsetup/cryptsetup"))) +(define-public (libcryptsetup-propagated-inputs) + (list argon2 + json-c + libgcrypt + lvm2 + `(,util-linux "lib"))) + (define (static-library library) "Return a variant of package LIBRARY that provides static libraries ('.a' files). This assumes LIBRARY uses Libtool." From patchwork Mon Jan 22 13:36:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josselin Poiret X-Patchwork-Id: 59314 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 05ABC27BBE9; Mon, 22 Jan 2024 15:26:41 +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=-1.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 9FF2927BBE2 for ; Mon, 22 Jan 2024 15:26:40 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rRwBX-0007NK-19; Mon, 22 Jan 2024 10:26:03 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rRwBT-0007Lu-2V for guix-patches@gnu.org; Mon, 22 Jan 2024 10:25:59 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rRwBS-0005gV-Q2 for guix-patches@gnu.org; Mon, 22 Jan 2024 10:25:58 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rRwBW-00072A-P9 for guix-patches@gnu.org; Mon, 22 Jan 2024 10:26:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68656] [PATCH core-updates 4/7] gnu: volume-key: Add required transitive dependencies. Resent-From: Josselin Poiret Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 22 Jan 2024 15:26:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68656 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68656@debbugs.gnu.org Cc: Josselin Poiret Received: via spool by 68656-submit@debbugs.gnu.org id=B68656.170593714526959 (code B ref 68656); Mon, 22 Jan 2024 15:26:02 +0000 Received: (at 68656) by debbugs.gnu.org; 22 Jan 2024 15:25:45 +0000 Received: from localhost ([127.0.0.1]:41552 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rRwBE-00070d-GF for submit@debbugs.gnu.org; Mon, 22 Jan 2024 10:25:44 -0500 Received: from jpoiret.xyz ([206.189.101.64]:44710) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rRwB9-00070D-0R for 68656@debbugs.gnu.org; Mon, 22 Jan 2024 10:25:39 -0500 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id 296C818530C; Mon, 22 Jan 2024 15:25:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1705937134; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0p94CDwgZM2jN50z9j1PpTqrLw+hkUpt5ZcBm8mWcg0=; b=iAa4VYsU420LNV3xuKPd361bW3q6lff2Uh1t66eevQsY7uKL9qEwraNmCh0S+IhCzyv9Ny 8GpbBz/cnd+RE/GsKnjs+SZvXk3n4kW1T+EWM+KAvwN7JBjY7hAsvyZkG0ASWxCBisvc8p snd+C3OS/TKzJEn1sdUOgFtoy+r90ovXobJobhlgYRl61Wo2YRAkQBJOQBx8PTON62kVTA 5jhT+n2YDkBmRqrRBDad3tpIwwr+A9ZJXM6fcZ925j+88Ys1DLIfToCYYVGKYNkd5p7wHo wyPw0FcmnrBX0E4hnUbWkdmznBBEaKjOXF2fDfgwia/vd3jRo2fIjXaRn81gNw== Date: Mon, 22 Jan 2024 14:36:20 +0100 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Spamd-Bar: / Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz 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: , Reply-to: Josselin Poiret X-ACL-Warn: , Josselin Poiret via Guix-patches X-Patchwork-Original-From: Josselin Poiret via Guix-patches via From: Josselin Poiret Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Josselin Poiret * gnu/packages/disk.scm (volume-key): Add transitive dependencies for libdevmapper and libcryptsetup. Change-Id: Iaced5bedd2f6ec8e67118b2ee4d01f14704a3694 --- gnu/packages/disk.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index 4582ad3555..6cc191ff25 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -1036,12 +1036,13 @@ (define-public volume-key (native-inputs (list pkg-config swig python-3)) ; used to generate the Python bindings (inputs - `(("cryptsetup" ,cryptsetup) - ("nss" ,nss) - ("libblkid" ,util-linux "lib") - ("lvm2" ,lvm2) ; for "-ldevmapper" - ("glib" ,glib) - ("gpgme" ,gpgme))) + (append + (cons cryptsetup (libcryptsetup-propagated-inputs)) + (cons lvm2 (libdevmapper-propagated-inputs)) + (list nss + (list util-linux "lib") + glib + gpgme))) (arguments `(#:tests? #f ; not sure how tests are supposed to pass, even when run manually #:phases From patchwork Mon Jan 22 13:36:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josselin Poiret X-Patchwork-Id: 59317 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 B868E27BBEA; Mon, 22 Jan 2024 15:26:48 +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=-1.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 278C927BBE2 for ; Mon, 22 Jan 2024 15:26:48 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rRwBY-0007Nh-M6; Mon, 22 Jan 2024 10:26:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rRwBT-0007MB-HJ for guix-patches@gnu.org; Mon, 22 Jan 2024 10:25:59 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rRwBT-0005ge-8I for guix-patches@gnu.org; Mon, 22 Jan 2024 10:25:59 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rRwBX-00072H-AO for guix-patches@gnu.org; Mon, 22 Jan 2024 10:26:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68656] [PATCH core-updates 5/7] gnu: libblockdev: Add libcryptsetup propagated inputs. Resent-From: Josselin Poiret Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 22 Jan 2024 15:26:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68656 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68656@debbugs.gnu.org Cc: Josselin Poiret Received: via spool by 68656-submit@debbugs.gnu.org id=B68656.170593714826976 (code B ref 68656); Mon, 22 Jan 2024 15:26:03 +0000 Received: (at 68656) by debbugs.gnu.org; 22 Jan 2024 15:25:48 +0000 Received: from localhost ([127.0.0.1]:41554 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rRwBE-00070m-TF for submit@debbugs.gnu.org; Mon, 22 Jan 2024 10:25:47 -0500 Received: from jpoiret.xyz ([206.189.101.64]:44780) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rRwBA-00070L-RT for 68656@debbugs.gnu.org; Mon, 22 Jan 2024 10:25:41 -0500 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id B64CF18530C; Mon, 22 Jan 2024 15:25:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1705937135; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=6/qKGOAAAL0JxWOgK4bony72TfOlcNTpmPxiKxogoyc=; b=KuuSne/fZLtLH2LTdbRmjsk4/AQZaonmbpKFCw4+vIDcUbUtq+0uWWtikj+ndKXZ5+9kXL 9ERH3Sy0aTz+yrNL7uTy63pCbHG7L9wFhShKHh2/wGgohICEuCF2ZmM/Sj4MDimaiQhQaU 7CByMnesjapIMMij9IIL3i+/s7gRV+5gu4JTAlv8y3y8NjqNMaz3HLVLf07jg93LLKOjhF rgfVhwdkK2qNzhab2UYobDppmf3Po9m+Iixao5MKEFfU6vpcNRrFz+KoCJVVZbLslOfgJq HajL5OCS6h50eqHlvnPXCEObbCNmiwUPu5TJtBuuleOVmXhXk+u9mJIOGUAqUw== Date: Mon, 22 Jan 2024 14:36:21 +0100 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Spamd-Bar: / Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz 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: , Reply-to: Josselin Poiret X-ACL-Warn: , Josselin Poiret via Guix-patches X-Patchwork-Original-From: Josselin Poiret via Guix-patches via From: Josselin Poiret Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Josselin Poiret * gnu/packages/disk.scm (libblockdev): Add propagated inputs from libcryptsetup. Change-Id: I4e1a6330f093d7829b1cd97921d078c524f5f9fc --- gnu/packages/disk.scm | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index 6cc191ff25..20956c1bda 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -1198,22 +1198,23 @@ (define-public libblockdev python-wrapper util-linux)) (inputs - (list btrfs-progs - cryptsetup - dosfstools - dmraid - eudev - glib - kmod - libbytesize - libyaml - lvm2 - mdadm - ndctl - nss - parted - volume-key - xfsprogs)) + (append + (cons cryptsetup (libcryptsetup-propagated-inputs)) + (list btrfs-progs + dosfstools + dmraid + eudev + glib + kmod + libbytesize + libyaml + lvm2 + mdadm + ndctl + nss + parted + volume-key + xfsprogs))) (home-page "https://github.com/storaged-project/libblockdev") (synopsis "Library for manipulating block devices") (description From patchwork Mon Jan 22 13:36:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josselin Poiret X-Patchwork-Id: 59315 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 CD06027BBEA; Mon, 22 Jan 2024 15:26:42 +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=-1.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 1D11A27BBE2 for ; Mon, 22 Jan 2024 15:26:42 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rRwBY-0007Nb-DE; Mon, 22 Jan 2024 10:26:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rRwBU-0007MW-Bz for guix-patches@gnu.org; Mon, 22 Jan 2024 10:26:01 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rRwBU-0005gy-2u for guix-patches@gnu.org; Mon, 22 Jan 2024 10:26:00 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rRwBX-00072S-PQ; Mon, 22 Jan 2024 10:26:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68656] [PATCH core-updates 6/7] gnu: lvm2-static: Properly handle eudev dependency in pkg-config. Resent-From: Josselin Poiret Original-Sender: "Debbugs-submit" Resent-CC: leo@famulari.name, me@tobias.gr, w@wmeyer.eu, guix-patches@gnu.org Resent-Date: Mon, 22 Jan 2024 15:26:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68656 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68656@debbugs.gnu.org Cc: Josselin Poiret , Leo Famulari , Tobias Geerinckx-Rice , Wilko Meyer X-Debbugs-Original-Xcc: Leo Famulari , Tobias Geerinckx-Rice , Wilko Meyer Received: via spool by 68656-submit@debbugs.gnu.org id=B68656.170593714826983 (code B ref 68656); Mon, 22 Jan 2024 15:26:03 +0000 Received: (at 68656) by debbugs.gnu.org; 22 Jan 2024 15:25:48 +0000 Received: from localhost ([127.0.0.1]:41556 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rRwBH-000713-Rs for submit@debbugs.gnu.org; Mon, 22 Jan 2024 10:25:48 -0500 Received: from jpoiret.xyz ([206.189.101.64]:44854) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rRwBC-00070S-FM for 68656@debbugs.gnu.org; Mon, 22 Jan 2024 10:25:43 -0500 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id 95A5118530C; Mon, 22 Jan 2024 15:25:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1705937137; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=W+GYtfmTdi2wMlY3kJaBCQj4RLXBybsaRgBjkYwroMc=; b=o09eKzzj/oPKKjFEA15LqemTnMrmzVH6d8jLA+N4znAfVl23cZEoohHqG/lTrd+bMCX2XQ WpEalXGx852wvmND987oF0XlfAaAQba5HMTKZ4S/x4PIxzvKca5/qF/CGAj5Bm2cQvyEmU wcnKCWZRf8LH+DuAGJxRTEC3USEgj1G6S5zcKXdTtmgYje9oWmYH82TGstfpodfnvOTUq7 2SqMCj+2mdyYDN9xNQ4/TAlwMyXGjNqldXi5pMHPezUwpjK0H3d03X/9YMG9ozIawOxu6Y 3AvUe6bcnTkvWVN2o6LF4h3En0bYXVnKTEbmETrTu4l1GBqOVnquoop7O6Z+3Q== Date: Mon, 22 Jan 2024 14:36:22 +0100 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Spamd-Bar: / Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz 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: , Reply-to: Josselin Poiret X-ACL-Warn: , Josselin Poiret via Guix-patches X-Patchwork-Original-From: Josselin Poiret via Guix-patches via From: Josselin Poiret Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Josselin Poiret * gnu/packages/linux.scm (lvm2-static): Add linking flags for the static eudev output. Change-Id: Ic43be600f0569a8ffa69544cbf661f05d82e2084 --- gnu/packages/linux.scm | 39 ++++++++++++++++++++++++--------------- 1 file changed, 24 insertions(+), 15 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 2977b8f88e..38a7caf71b 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4596,8 +4596,8 @@ (define-public lvm2-static (inherit lvm2) (name "lvm2-static") - ;; Propagate udev because libdevmapper.a depends on libudev. - (propagated-inputs `(("udev:static" ,eudev "static"))) + (inputs `(,@(package-inputs lvm2) + ("udev:static" ,eudev "static"))) (arguments (substitute-keyword-arguments (package-arguments lvm2) @@ -4611,19 +4611,28 @@ (define-public lvm2-static ;; it until the situation improves. (delete "--enable-dmeventd" ,flags))) ((#:phases phases) - `(modify-phases ,phases - (add-before 'configure 'adjust-Makefile - (lambda _ - ;; These fixes are related to the upstream libdm->device_mapper - ;; migration and will hopefully be fixed upstream in due time. - (substitute* "tools/Makefile.in" - ;; This variable is empty in a static configuration and causes - ;; an erroneous GCC command line. - (("-L\\$\\(interfacebuilddir\\)") "") - ;; Remove obsolete reference to libdevmapper.a. - (("-ldevmapper") "")) - #t)))))) - (synopsis "Logical volume management for Linux (statically linked)"))) + #~(modify-phases #$phases + (add-before 'configure 'adjust-Makefile + (lambda _ + ;; These fixes are related to the upstream libdm->device_mapper + ;; migration and will hopefully be fixed upstream in due time. + (substitute* "tools/Makefile.in" + ;; This variable is empty in a static configuration and causes + ;; an erroneous GCC command line. + (("-L\\$\\(interfacebuilddir\\)") "") + ;; Remove obsolete reference to libdevmapper.a. + (("-ldevmapper") "")) + #t)) + (add-after 'install 'adjust-pkgconfig + ;; The static eudev is missing its pkg config file, and I am not + ;; rebuilding it at this point. + (lambda* (#:key inputs #:allow-other-keys) + (substitute* (string-append #$output "/lib/pkgconfig/devmapper.pc") + (("Requires.private: .*") "") + (("Libs.private:") + (format #f "Libs.private: -L~a -ludev" + (dirname (search-input-file inputs "lib/libudev.a"))))))))))) + (synopsis "Logical volume management for Linux (statically linked)"))) (define-public thin-provisioning-tools (package From patchwork Mon Jan 22 13:36:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josselin Poiret X-Patchwork-Id: 59318 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 1A9EA27BBE9; Mon, 22 Jan 2024 15:26:51 +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=-1.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 23A2127BBE2 for ; Mon, 22 Jan 2024 15:26:50 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rRwBY-0007O7-UR; Mon, 22 Jan 2024 10:26:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rRwBU-0007MX-C3 for guix-patches@gnu.org; Mon, 22 Jan 2024 10:26:01 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rRwBU-0005gx-2g for guix-patches@gnu.org; Mon, 22 Jan 2024 10:26:00 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rRwBY-00072Y-4R for guix-patches@gnu.org; Mon, 22 Jan 2024 10:26:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68656] [PATCH core-updates 7/7] gnu: cryptsetup-static: Fix static build. Resent-From: Josselin Poiret Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 22 Jan 2024 15:26:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68656 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68656@debbugs.gnu.org Cc: Josselin Poiret Received: via spool by 68656-submit@debbugs.gnu.org id=B68656.170593715827005 (code B ref 68656); Mon, 22 Jan 2024 15:26:04 +0000 Received: (at 68656) by debbugs.gnu.org; 22 Jan 2024 15:25:58 +0000 Received: from localhost ([127.0.0.1]:41558 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rRwBS-00071V-A7 for submit@debbugs.gnu.org; Mon, 22 Jan 2024 10:25:58 -0500 Received: from jpoiret.xyz ([206.189.101.64]:44922) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rRwBE-00070a-Ad for 68656@debbugs.gnu.org; Mon, 22 Jan 2024 10:25:45 -0500 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id 6A8A918530C; Mon, 22 Jan 2024 15:25:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1705937139; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=D74yMCDyqxCfn6p6u5xQiGcWxflit1CxmD1ZYghBdPQ=; b=Ke455/FaBV1Vpr+ZwGG35OaUaYh6eZaBL2Pm2eOOzMWzx0YDT8FopkrdYC3E6fPQQ4N6Jj +nHqHqnuDpx/9kosNym2x2sQE5G89hemlzmNYJYkCDfOSBP+JGcsY5hI72YWpLurUrJ8vE 8tW5WwI7Cnk8dQhFZJ8IYGGW8I26aaj0Y5Q7ZVzpCBJ+QVxJvLjruzFi5tlzvN48QCSFSJ 95sgEXRjJFpZlKz4gGa6ZnPxe31pmmLLrnr0ut34DMaOlUpcEpNJgi37IruPUHuZfCidqe pm9rkXwEBupfJpY2AhejiPggJTKaqZnWvBc9iaT3g1xEQkTcjDjXnuZxg9myjA== Date: Mon, 22 Jan 2024 14:36:23 +0100 Message-ID: <3b0266f455e3789bc3eb9eaa5f9e26551312852c.1705762361.git.dev@jpoiret.xyz> In-Reply-To: References: MIME-Version: 1.0 X-Spamd-Bar: / Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz 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: , Reply-to: Josselin Poiret X-ACL-Warn: , Josselin Poiret via Guix-patches X-Patchwork-Original-From: Josselin Poiret via Guix-patches via From: Josselin Poiret Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Josselin Poiret * gnu/packages/cryptsetup.scm (cryptsetup-static): Pass static variants of dependencies. Also work around wrong pkg-config paths of util-linux for the static output. Change-Id: I025f241b02ee0ea80227ef7d31789571e635ef2c --- gnu/packages/cryptsetup.scm | 86 +++++++++++++++++++------------------ 1 file changed, 45 insertions(+), 41 deletions(-) diff --git a/gnu/packages/cryptsetup.scm b/gnu/packages/cryptsetup.scm index 8e2bdb6d9e..8ff649bccc 100644 --- a/gnu/packages/cryptsetup.scm +++ b/gnu/packages/cryptsetup.scm @@ -23,6 +23,7 @@ (define-module (gnu packages cryptsetup) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system gnu) + #:use-module (guix gexp) #:use-module (guix utils) #:use-module (gnu packages) #:use-module (gnu packages gnupg) @@ -116,56 +117,59 @@ (define-public cryptsetup-static (inherit cryptsetup) (name "cryptsetup-static") (arguments - '(#:configure-flags '("--disable-shared" - "--enable-static-cryptsetup" - - "--disable-veritysetup" - "--disable-cryptsetup-reencrypt" - "--disable-integritysetup" - - ;; The default is OpenSSL which provides better PBKDF performance. - "--with-crypto_backend=gcrypt" - - "--disable-blkid" - ;; 'libdevmapper.a' pulls in libpthread, libudev and libm. - "LIBS=-ludev -pthread -lm") - - #:allowed-references () ;this should be self-contained - - #:modules ((ice-9 ftw) - (ice-9 match) - (guix build utils) - (guix build gnu-build-system)) + (substitute-keyword-arguments (package-arguments cryptsetup) + ((#:configure-flags flags ''()) + `(cons* "--disable-shared" + "--enable-static-cryptsetup" - #:phases (modify-phases %standard-phases - (add-after 'install 'remove-cruft - (lambda* (#:key outputs #:allow-other-keys) - ;; Remove everything except the 'cryptsetup' command. - (let ((out (assoc-ref outputs "out"))) - (with-directory-excursion out - (let ((dirs (scandir "." - (match-lambda - ((or "." "..") #f) - (_ #t))))) - (for-each delete-file-recursively - (delete "sbin" dirs)) - (for-each (lambda (file) - (rename-file (string-append file - ".static") - file) - (remove-store-references file)) - '("sbin/cryptsetup")) - #t)))))))) + "--disable-veritysetup" + "--disable-integritysetup" + ;; Bypass broken pkg-config paths for the static output of + ;; util-linux. Only blkid is located through pkg-config, not + ;; uuid. + (format #f "BLKID_CFLAGS=-I~a" + (search-input-directory %build-inputs "include/blkid")) + (format #f "BLKID_LIBS=-L~a -lblkid" + (dirname (search-input-file %build-inputs "lib/libblkid.a"))) + ,flags)) + ((#:allowed-references refs '()) + '()) + ((#:modules modules '()) + '((ice-9 ftw) + (ice-9 match) + (guix build utils) + (guix build gnu-build-system))) + ((#:phases phases #~%standard-phases) + #~(modify-phases #$phases + (add-after 'install 'remove-cruft + (lambda* (#:key outputs #:allow-other-keys) + ;; Remove everything except the 'cryptsetup' command. + (let ((out (assoc-ref outputs "out"))) + (with-directory-excursion out + (let ((dirs (scandir "." + (match-lambda + ((or "." "..") #f) + (_ #t))))) + (for-each delete-file-recursively + (delete "sbin" dirs)) + (for-each (lambda (file) + (rename-file (string-append file + ".static") + file) + (remove-store-references file)) + '("sbin/cryptsetup")) + #t))))))))) (inputs (let ((libgcrypt-static (package (inherit (static-library libgcrypt)) (propagated-inputs `(("libgpg-error-host" ,(static-library libgpg-error))))))) - `(("json-c" ,json-c-0.13) + `(("argon2" ,(static-library argon2)) + ("json-c" ,(static-library json-c-0.13)) ("libgcrypt" ,libgcrypt-static) ("lvm2" ,lvm2-static) ("util-linux" ,util-linux "static") ("util-linux" ,util-linux "lib") - ("popt" ,popt)))) + ("popt" ,(static-library popt))))) (synopsis "Hard disk encryption tool (statically linked)")))