From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id GPWAAwiwQmURYAEAauVa8A:P1 (envelope-from ) for ; Wed, 01 Nov 2023 21:07:36 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id GPWAAwiwQmURYAEAauVa8A (envelope-from ) for ; Wed, 01 Nov 2023 21:07:36 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id A5DF158A57 for ; Wed, 1 Nov 2023 21:07:35 +0100 (CET) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=agfa.com header.s=selector1 header.b=VBjNJ42t; dmarc=pass (policy=none) header.from=gnu.org; arc=reject ("signature check failed: fail, {[1] = sig:microsoft.com:reject}"); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1698869255; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=JDFEJARvvJF0VdjkBkncsk0WFf28/0lBG/lCuPq4ies=; b=GdOwtMmXhIsiMmsrB9jt9szbw6TfOuUaJKeva7LRXvCsTlGuwi59uxCO2GcOXcyBPtjQDA R9z1cmbnf1Swvc4ckGC0H3tSBMOt5We4kGWGRt+C2tRPghyM9BF/qlvgpbfDNLGFJeldeQ 3k3whmb8j6Vb2n+QYUE3z2qBz5s0LGy6iq4KBU5OR6Lg1NRNZJigA/HogG/+ZqYKrGvYX8 eLaKn8LRyA/hhpP/1uaDYwTTgNCj0sL7jgT+7cvG8U5wzg9OgD0wbmGYlPaJLAY0EP5pth bnpyyEQ0zV0dE5EyxYADgsApnH1cJpeWf7PrqYWeWEGsGmd1mkKj6iGFozmEcg== ARC-Authentication-Results: i=2; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=agfa.com header.s=selector1 header.b=VBjNJ42t; dmarc=pass (policy=none) header.from=gnu.org; arc=reject ("signature check failed: fail, {[1] = sig:microsoft.com:reject}"); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=2; s=key1; d=yhetil.org; t=1698869255; a=rsa-sha256; cv=fail; b=dge7DCbW/GnO5kJclQYpQC+YKLNfgkQRn+8NaHs+Wqs/l0zx7yFpuzMQweIQAGjPVRkkxW PnyYyxj/XXKLzFOWaw9cSyPdrU7Z5HTs/tO1MK4Q20vMJ/5NsvGEJ5TjYVk/MJX5MjZ8fD CwUlyPUGitibfS9FOCV+1tRZOQ6toqey1ROlE07VXZxf67g6pLiUwnuKBFiuV92cT7WB4G HoobT4/gvv8zl85rw38h34myvIg64CXEwzhvarliDzKVx/UWqr1uWuv3gfyVS1gbvXQPB8 MaKJuyhsM/aMgmpHFNbQFKyZyf46W4Nw6r6yaGkomIvcIWsz9YFaFt+1hjVhcw== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qyHUe-0002RK-Vq; Wed, 01 Nov 2023 16:07:13 -0400 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 1qyGFT-0007V2-Mz for guix-patches@gnu.org; Wed, 01 Nov 2023 14:47:27 -0400 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 1qyGFT-00022W-Es for guix-patches@gnu.org; Wed, 01 Nov 2023 14:47:27 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qyGG1-0004Pr-Te for guix-patches@gnu.org; Wed, 01 Nov 2023 14:48:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66887] Subject: [PATCH 2/3] gnu: podman: Use catatonit References: In-Reply-To: Resent-From: Wilke Schwiedop Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 01 Nov 2023 18:48:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66887 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: "66887@debbugs.gnu.org" <66887@debbugs.gnu.org> Received: via spool by 66887-submit@debbugs.gnu.org id=B66887.169886446616950 (code B ref 66887); Wed, 01 Nov 2023 18:48:01 +0000 Received: (at 66887) by debbugs.gnu.org; 1 Nov 2023 18:47:46 +0000 Received: from localhost ([127.0.0.1]:52585 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qyGFm-0004PI-0Y for submit@debbugs.gnu.org; Wed, 01 Nov 2023 14:47:46 -0400 Received: from mail-db8eur05on2063.outbound.protection.outlook.com ([40.107.20.63]:59457 helo=EUR05-DB8-obe.outbound.protection.outlook.com) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qyGFj-0004P2-0b for 66887@debbugs.gnu.org; Wed, 01 Nov 2023 14:47:44 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TEHDf9RGCsm0iZr+AhucOeerGwwahjVvChPsRCXwXfbTZ+ke8d87YmJO4IrRRSqpP9T/M3nBVwhAYT+NZqI1OeR5O6koevtbfoL9duFWAOGcpzZhdYlhiOj578EO3pq3P/Q5OZaKUwzITmx9AmHK63INo8o0XYJvufEO4aLU50b8n+HMFipinSAdVRy6A3S8igl63kDJ7EFewarW/zwK65bCTxPY6YJdn671z7dfd89ZiA1npjSvwQOHRD2iOp8OLqSiZb811mpvDU4n6Xf3sLwlVvDtJ+r87FRktLd1ybcqtUaRBIoMmdgdsB13SlIfdG4ohUaMAVet3Nh1+jYtEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=JDFEJARvvJF0VdjkBkncsk0WFf28/0lBG/lCuPq4ies=; b=Asycl+ImH1eswc+4a1TrKmbbH4/tOXmWfOAZjwSNkcrqg83iWih/MqtBYmp0LLd0a09ZPhfRGl2q+A/PzhXmlue6DjlOFkzk+AGB5aCVxCYOsbvAQI2SJJxRUNpRcRKD7i2UT19Er/KBnWP8W1VfKs2QReSZOXUnmJiX0DN6yOUtARvlqjyJZtXNVszdG12xtDg6kIurjd7Dwrf4XJIoPmXB20+zEV4GXPz2YtuEFoEpiLeav240UfpJiZDxbbM4F54CxFLC1MaM3PdMHD7g8DsNE5zDyeNP3QxcOCNTtbPalg4WkPsXJZlb2I6CVDamOm3MKYTIpuHu9gM1SYk1Tw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=agfa.com; dmarc=pass action=none header.from=agfa.com; dkim=pass header.d=agfa.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=agfa.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=JDFEJARvvJF0VdjkBkncsk0WFf28/0lBG/lCuPq4ies=; b=VBjNJ42tzmJuJz4KxilriAiD2DgBHqy0t+BEGpeIN1WxKlXkMFWajRAx/6k51QwKfNTLt5Daklnvg5DXpzioqM3D5mg6oUu8SRp/ECG+qdwLzDhjSN50nNRyKBOZvd+P79ocr8MpuNRIWu9EURNFQwCanqCXP6Ps3+OMWXjG8YQ= Received: from DB9P190MB1985.EURP190.PROD.OUTLOOK.COM (2603:10a6:10:398::19) by AM9P190MB1409.EURP190.PROD.OUTLOOK.COM (2603:10a6:20b:3e1::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6954.19; Wed, 1 Nov 2023 18:47:02 +0000 Received: from DB9P190MB1985.EURP190.PROD.OUTLOOK.COM ([fe80::5591:8d87:e450:f5bf]) by DB9P190MB1985.EURP190.PROD.OUTLOOK.COM ([fe80::5591:8d87:e450:f5bf%3]) with mapi id 15.20.6933.028; Wed, 1 Nov 2023 18:47:02 +0000 Thread-Topic: Subject: [PATCH 2/3] gnu: podman: Use catatonit Thread-Index: AdoM874jEydx7E4tSHOlAqh6GQWfTA== Date: Wed, 1 Nov 2023 18:47:02 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-publictraffictype: Email x-ms-traffictypediagnostic: DB9P190MB1985:EE_|AM9P190MB1409:EE_ x-ms-office365-filtering-correlation-id: 870cfd64-2f21-4801-725b-08dbdb0aefb8 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 2HLlUnLAdf9CTTATfkZntRIUQgy4+u5q8MSz4aXv3XR7zQdO3QNIREoQDvEUn6Y0wTWVPfAfn8oRb7euQ7CKuRvpL/bWve6zrFI0gHBRk8Wqbt8uayldgoX5HT9GSwT3XhGC+4ZZW9CWMSqER/lp/4bLlO3tZXO/h55WBcAdorDfMzYjM5w7kHotRPVj4aBG21Nq0eNKNmtbma+J3mhUTk3/YOxRrwmGSdUK39IS6WEGa+9NtM22+Ee6RyZk/89ZPLYgDYuesgOA2tfvBdMFsDCNcc/wh90+Y5QXQq/H075xVWeZK1NnzIVbBa1BBsilaN3b70mIXm1gn9jbw3/rpBiRLP1MPtWQWsxrhTZHJW45PGL8My/ROeE+Ry/6u4zmO8Ql4AyOXNwpy9uMXnQN1RlDpUwz179ajDtRlcRITFNZVoDK8MY/fC1JyfMBx4nipsXX86aBS6o6VT3I2+X2YFi1hDtYByetCe/0LL6Qyn7rl5Ynqi+jMP3YyCi8o3Qcg+9MGES+qyRCVQL+3oyFG4FA1flohGJpbtNZb/Xisjz+KA/cg2DzJfj3KfrKaO03E/LKhNHynF8q91FPWclouQAh/U1kjMrToYVdKIDO8qCUKAc+GJya5EoOd4X59Jc8 x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB9P190MB1985.EURP190.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(13230031)(346002)(366004)(376002)(39860400002)(396003)(136003)(230922051799003)(64100799003)(1800799009)(451199024)(186009)(38070700009)(33656002)(55016003)(71200400001)(478600001)(8676002)(7696005)(8936002)(52536014)(9686003)(38100700002)(83380400001)(6506007)(66446008)(66476007)(66946007)(64756008)(66556008)(6916009)(316002)(76116006)(122000001)(86362001)(2906002)(41300700001)(44832011)(5660300002); DIR:OUT; SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: r4cGIoS0oHk9RWjA5+2gNTEN3cbwR5S3gME4Ms2R25I5YQCNtriECcfL4Cz2C/zAkFrHnv90/x8ydlzQ9dRGpyKyPB7ja9AYyAYeRJLtF8xDZvdoAuTcZqnFPeCFuM+8Khb+kg9nx/f/+qIHcCV7wAqYjL9zzF0l2PCayJNpgl0o2uuzaqqDc5ANDpikJwHeOcyWN6aTRWpjPyhqVwd7InuZkR0CTxQaiqnVPG43nWmbdV4zYV68LGN1OL8A5rBHQ2q3K7vIyBfFswPnJc8SOyh1HyRgVSLfPRVOkTatOpJdmI7IbTBMYQa9GTjH//cYV6UkV+kHP9SepSoD7YHmD1GraXrqTPhdUVjmFwdbbTRDbGz1IQhkt2IchW5TVLGqJ5zhuzsOKPvxN79Cal7Cr+jrWaqojVLpXtMFYPyCZdI5U2C/9/w7Bvlq6150vOiXYvgMGhFKnsUPNlW4nGP4K8ZZnUD2psGYYmL2ZJPuYI59Af+KYz+sqKiUYocexbzLPGoj2+DCtv9t1FT+LehNQtAcq1w9wA8FgrlIBNh4S1PV+e5RnA2Oo8Zvl5wFb+VfT+opqfDPjGkZCNCLIFYBSM8qzE62UD/ITkdDfyuAKVD/hbbT5wdC+I499zCa6lHIG6xg8s4KVJ9MgmmHYVyEG9cKGc1Of7txs92NhiBVXyCSBcZa0id5E0Q2azOLLqqMcfAYvaMHp3YEXLxtvwo/BI0iP2qika5ekYBqQTPfh6ZsxtizMCvTdcFTMJg0B5XkuH/4yWrFqDL5mpBlb1uACPTPWiV6nFLtTrZlpeeuTB3DpCO9/qItvXQquInIHRzyc4MGwKseW3l+ScOqyTwsINUpch2f08c3QrqGWQbY6R2UGihZApxLMWxeLk760KW+xSVSrr6cnR1RiQvFlfvHcVVhchuGlxszphmlHz0ChWlHRoa587rpdtx0iEtjJTXu arrd7ena3oVvZFPQt7pP+B2eXUyqn9khmL474oKbrnq+VnOzZ9qPeBIkvMXtnqlP1uFU2JvmL0R9xfo9HOCyfqThBltS8iCNRwLLSp/M8n6HNwTPIXhLxmO6Lt0nMNLtgLb0F837oZmK6LIxDNkhWFGXIOgSqh7s+FE//R2m14uP0cKBI48qPXCpYHp5hCEt0XFbQv6qr6lq4uvQwA0mBskGtCg060ia8ttHDPXlMd2TlObdLJtRHFxdGZbaOr/fjODxH7M7drQD4DiTCcflVQeOjdr5BlcUXeqBJfL77vlza9ltEXUN7dme6sgW5kRH9MgZW+jL7Xayaqs2lFo6m9x9/r9k+izdBznEetX42dZIRCBqn97zKeOU15FTVW3pWkPdAjkq8LdDSoXoWly4nWfll4urLQAL5KHI83mRinSeZIySWEyojdIN4AyQIzdBp7OsMc7O0zo2dMVOoUMJodBfP4qgwfhpiQsDVetL0MkUDKxcwbCkVnDLbfpiU9lhdLwxYCbELWzJkfxCa8oCmewxli7NDCooTeqIn7x2MCzmjgiTBpTxn2RgBN4Hz6wQ4WXDEPQgHXjKOLYsLtosCKnkl79IiBnZRsH095iNyEITuu8kIWlipT3sT6WIz0f0wV/3vjHPoFYhkjH+a5qgGIq3ftKux6VUAY+FWr7h6CF/OvcNneVc7UcjD/9wLAq5 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: agfa.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DB9P190MB1985.EURP190.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-Network-Message-Id: 870cfd64-2f21-4801-725b-08dbdb0aefb8 X-MS-Exchange-CrossTenant-originalarrivaltime: 01 Nov 2023 18:47:02.0790 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 97e959a5-ac28-45db-ac5e-51662f663cf0 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: rC+vxzChnwEM/CXH0JtiI+Vdkw7Ha76vgvFaNSaSjJ9Eecqc/CQLDAGG9EOhl70ITZkTUJxWsY6iY/vZ0D6OlqS79LLa0161fsL7QQ51XX8= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9P190MB1409 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Wed, 01 Nov 2023 16:07:09 -0400 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Wilke Schwiedop X-ACL-Warn: , Wilke Schwiedop via Guix-patches From: Wilke Schwiedop via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -5.61 X-Spam-Score: -5.61 X-Migadu-Queue-Id: A5DF158A57 X-Migadu-Scanner: mx10.migadu.com X-TUID: l1rt7iSsBeS7 defaultHelperBinariesDir is a string array of paths searched by the FindHelperBinary function. This patch inserts new entries at the beginning of array instead of modifying individual elements. This will make it easier to include additional helper binaries, e.g. aardvark, netavark and pasta. --- gnu/packages/containers.scm | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm index e26b5acf21..c00394af2b 100644 --- a/gnu/packages/containers.scm +++ b/gnu/packages/containers.scm @@ -381,22 +381,31 @@ (define-public podman (("CATATONIT_PATH=3D\"[^\"]+\"") (string-append "CATATONIT_PATH=3D" (which "true")))) (substitute* "vendor/github.com/containers/common/pkg/config= /config_linux.go" - (("/usr/local/libexec/podman") - (string-append #$output "/libexec/podman")) - (("/usr/local/lib/podman") - (string-append #$output "/bin"))) + (("var defaultHelperBinariesDir =3D ..string." all) + (string-append + all + (string-join + (map (lambda (s) (string-append "\n\"" s "\",")) + (list + (string-append #$output "/libexec/podman") + (string-append #$output "/bin") + (string-append #$(this-package-input "catatonit")= "/bin"))))))) (substitute* "vendor/github.com/containers/common/pkg/config= /default.go" (("/usr/libexec/podman/conmon") (which "conmon")) (("/usr/local/libexec/cni") (string-append #$(this-package-input "cni-plugins") "/bin")) - (("/usr/bin/crun") (which "crun"))))) + (("/usr/bin/crun") (which "crun")) + (("/usr/libexec/podman/catatonit") (which "catatonit"))) + (substitute* "pkg/rootless/rootless_linux.c" + (("/usr/bin/catatonit") (which "catatonit"))))) (add-after 'install 'install-completions (lambda _ (invoke "make" "install.completions" (string-append "PREFIX=3D" #$output))))))) (inputs (list btrfs-progs + catatonit cni-plugins conmon crun --=20 2.41.0