From patchwork Sun Mar 31 18:35:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomas Volf <~@wolfsden.cz> X-Patchwork-Id: 62397 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 EA9D927BBEA; Sun, 31 Mar 2024 19:36:54 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_ADSP_ALL, DKIM_INVALID,DKIM_SIGNED,MAILING_LIST_MULTI,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 95CF127BBE2 for ; Sun, 31 Mar 2024 19:36:54 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rr02K-0001DX-H1; Sun, 31 Mar 2024 14:36:08 -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 1rr02F-0001Bo-LD for guix-patches@gnu.org; Sun, 31 Mar 2024 14:36:04 -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 1rr02F-00081Y-Cl for guix-patches@gnu.org; Sun, 31 Mar 2024 14:36:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rr02H-00020M-R3 for guix-patches@gnu.org; Sun, 31 Mar 2024 14:36:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70112] [PATCH 03/11] gnu: podman: Update to 5.0.0. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 31 Mar 2024 18:36:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70112 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70112@debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Received: via spool by 70112-submit@debbugs.gnu.org id=B70112.17119101267468 (code B ref 70112); Sun, 31 Mar 2024 18:36:05 +0000 Received: (at 70112) by debbugs.gnu.org; 31 Mar 2024 18:35:26 +0000 Received: from localhost ([127.0.0.1]:48412 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rr01d-0001wD-Sd for submit@debbugs.gnu.org; Sun, 31 Mar 2024 14:35:26 -0400 Received: from wolfsden.cz ([37.205.8.62]:40188) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1rr01a-0001vN-HO for 70112@debbugs.gnu.org; Sun, 31 Mar 2024 14:35:23 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 3CA1C29EFFA; Sun, 31 Mar 2024 18:35:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1711910119; bh=lJEZPhGOzY7vlKCxjEuNUTxMZpxKSde0j8Sayqmy0r0=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=KmyWdduNmQ58tnMUhmCzPckIces+QtIDHzo2Q87AABLH8WLaMoIF0AEz8kyFUl8v+ dLOj/LOmm6DuYzS/CNdZL/X93AeOry3NCrHfYeROCIOfdxULiPGTdo7FkSZvvetCyV PgSIFfYBUsyLsRFFMp7cPPzYwUxqcev8MYGYjXMPVUxNuYQy+Aqq6EsCoxDJNRSCqD ssEK8TOb6VFfJXXQvoyH/HU55lhJ8YkuQ1aLxBOEqcj/LQrLNPWppkTUTM2dmQfS3Y giVXRkvNijwO329Y3QrZFphZBkCQKBmEsFu8VWkmKqplBeHZOCidHAog3kWonKFTwT UBQ3QKgz4PzT78M0v/Rk65ZEnIXFs3Q/zUPcep8i8PQUDJNGZWo3uXXY8SQnghm72S abZz1vcsey2r/TzvInSx03LziBeDKDSUQR9V5OktAY12mzDVDhj3OGmbCvi8i9qEOW EFGyenGiIktG0aS6tSZ3GVUOf1SW7erdDLu8pOQMTf7FDccxgte97hGOhY+HtL7Fjs lO2L5zXnnPJ+tLY29jwLuJiY1y7uxg6TghCeVrpA5kQRtacwC052Or/5L6VJNHYlvI ZmjniQ4hERsTgzzxUIFQk3jj23dp95Fq9BTZzWk9reJ6aI8UtPFBV0iCjXB9a50lZa 9lqsjijGCGzmvaWbHACma7Kc= Received: from localhost (unknown [193.32.127.158]) by wolfsden.cz (Postfix) with ESMTPSA id E24AB2A0F81; Sun, 31 Mar 2024 18:35:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1711910119; bh=lJEZPhGOzY7vlKCxjEuNUTxMZpxKSde0j8Sayqmy0r0=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=KmyWdduNmQ58tnMUhmCzPckIces+QtIDHzo2Q87AABLH8WLaMoIF0AEz8kyFUl8v+ dLOj/LOmm6DuYzS/CNdZL/X93AeOry3NCrHfYeROCIOfdxULiPGTdo7FkSZvvetCyV PgSIFfYBUsyLsRFFMp7cPPzYwUxqcev8MYGYjXMPVUxNuYQy+Aqq6EsCoxDJNRSCqD ssEK8TOb6VFfJXXQvoyH/HU55lhJ8YkuQ1aLxBOEqcj/LQrLNPWppkTUTM2dmQfS3Y giVXRkvNijwO329Y3QrZFphZBkCQKBmEsFu8VWkmKqplBeHZOCidHAog3kWonKFTwT UBQ3QKgz4PzT78M0v/Rk65ZEnIXFs3Q/zUPcep8i8PQUDJNGZWo3uXXY8SQnghm72S abZz1vcsey2r/TzvInSx03LziBeDKDSUQR9V5OktAY12mzDVDhj3OGmbCvi8i9qEOW EFGyenGiIktG0aS6tSZ3GVUOf1SW7erdDLu8pOQMTf7FDccxgte97hGOhY+HtL7Fjs lO2L5zXnnPJ+tLY29jwLuJiY1y7uxg6TghCeVrpA5kQRtacwC052Or/5L6VJNHYlvI ZmjniQ4hERsTgzzxUIFQk3jj23dp95Fq9BTZzWk9reJ6aI8UtPFBV0iCjXB9a50lZa 9lqsjijGCGzmvaWbHACma7Kc= From: Tomas Volf <~@wolfsden.cz> Date: Sun, 31 Mar 2024 20:35:00 +0200 Message-ID: X-Mailer: git-send-email 2.41.0 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/containers.scm (podman): Update to 5.0.0. Change-Id: Id12c017e68f30db4ea99547beca54dbd01e3b029 --- gnu/packages/containers.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm index b08d0ee762..f62e4017dc 100644 --- a/gnu/packages/containers.scm +++ b/gnu/packages/containers.scm @@ -49,6 +49,7 @@ (define-module (gnu packages containers) #:use-module (gnu packages python) #:use-module (gnu packages networking) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages rust-apps) #:use-module (gnu packages selinux) #:use-module (gnu packages version-control) #:use-module (gnu packages virtualization) @@ -413,7 +414,7 @@ (define-public gvisor-tap-vsock (define-public podman (package (name "podman") - (version "4.9.3") + (version "5.0.0") (source (origin (method git-fetch) @@ -428,7 +429,7 @@ (define-public podman (search-patches "podman-program-lookup.patch")) (sha256 - (base32 "17g7n09ndxhpjr39s9qwxdcv08wavjj0g5nmnrvrkz2wgdqigl1x")) + (base32 "0g15m10mgwssw5axkyn2ms5k858dbc6vf3cbxv7hvdncgwnfk5f0")) (file-name (git-file-name name version)))) (build-system gnu-build-system) @@ -459,7 +460,9 @@ (define-public podman (("@SLIRP4NETNS_DIR@") (string-append #$slirp4netns "/bin")) (("@PASST_DIR@") - (string-append #$passt "/bin"))) + (string-append #$passt "/bin")) + (("@NETAVARK_DIR@") + (string-append #$netavark "/bin"))) (substitute* "hack/install_catatonit.sh" (("CATATONIT_PATH=\"[^\"]+\"") (string-append "CATATONIT_PATH=" (which "true"))))