From debbugs-submit-bounces@debbugs.gnu.org Sun Mar 31 14:33:15 2024 Received: (at submit) by debbugs.gnu.org; 31 Mar 2024 18:33:15 +0000 Received: from localhost ([127.0.0.1]:48386 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rqzzX-0001mE-Cp for submit@debbugs.gnu.org; Sun, 31 Mar 2024 14:33:15 -0400 Received: from lists.gnu.org ([2001:470:142::17]:39466) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1rqzzV-0001lw-Sq for submit@debbugs.gnu.org; Sun, 31 Mar 2024 14:33:14 -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 <~@wolfsden.cz>) id 1rqzzM-0007XA-55 for guix-patches@gnu.org; Sun, 31 Mar 2024 14:33:05 -0400 Received: from wolfsden.cz ([37.205.8.62]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <~@wolfsden.cz>) id 1rqzzK-0007M1-3i for guix-patches@gnu.org; Sun, 31 Mar 2024 14:33:03 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 47A052A086A; Sun, 31 Mar 2024 18:32:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1711909979; bh=XhzLYb8uNtzNEP2gDj9tuCga89aE71hTZCD+hY/1MeU=; h=From:To:Cc:Subject:Date; b=M7GBTzoFUnWrijWiPK2pl3ebpQgrAZFJz2ODzlEw1GUvl9xsQTBDHYa7b3fn8oDfY WAmLrybfNhkmVI17b0TckqRGajWfa7EnTicM/dYvV0U5HhPRIZrBd8VFTC3KDQZG6P AF0STb3rfmDzrQvO7XBAgcgBWR5AfPSUiy/clPS3VPrnq7MQDDaFUajVe6HLdCVQz7 nMoY0UZc2GgI7LCcOxR5JiSjjc3e+Ph08ZA8IhFsQdOIJowVwJEQrrmCF5JFZ0Rhni zKStAB1qOL0Tb2wwx9CQlhVypZ+EaJ92BzaIC2dz555Ytq9CXfn9Z/x9mLQye9Uixv JTz/4rGOKdUU4twijaFMHjJ5ZY/OBxioODeYXlRFEoRBHZjPk8Gnta4sz4A/LcZmfz QmHprk5d2tXOGatVvnyXISp/whznBoyBNgD0YeZjHmeDGqav80mJrDKLldaUcOmghe bHBz2GW5Yu+oGWT3/O8Z/Dyiy/jhtXHAWt2B5hVllslxIxx4v7hiDzqVAGE/la/dfH RaEkN5SUmWqOAKVKts0fYUptaT23Q2Glr6/QrRqLwlUTg9Ll8vsjJj8eQ3MIFxRvQf +xNVi/elzSbzidEVuk/czR9HyKj/2k4P2sGxid1PloYyfy/B/shEIoCM0gm2os1i/T pAdVjMIkh7wrNG+yW4jhCHPI= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-1.2 required=5.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from localhost (unknown [193.32.127.158]) by wolfsden.cz (Postfix) with ESMTPSA id 65C1829E65A; Sun, 31 Mar 2024 18:32:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1711909978; bh=XhzLYb8uNtzNEP2gDj9tuCga89aE71hTZCD+hY/1MeU=; h=From:To:Cc:Subject:Date; b=bdE5ZI0Ya+OsvrjaiYtGmjyBWdIyZLyERYuIpYdLXD2WMnKdmePN8VN3XXnijdpf3 c7ThePadmAXsq2iatvx/x4sljdHu8L6BZYFImSK4QFF5Y0Wi1MNTkk/LyO5QaxnVCk ybYQvypY6LFkNdIqVLZtOf+7XzKJc+UCB8WYAWJUbkPBK+jf6OrgmA+rgW4UHEJaa1 +iROS3TRn1D/Nq2nhwjD6hxtpqbsuBxI9PusQDQ2FGimqzyDzkIqxCDmnbRogq5WdP sa9L5sMZVPELWDkkGT5EnhDU1itwGrjhjMWA3n16UOdX5ODaDJvuTyTkwicoh3Z/zh uvKWvqkEDmGh55rumbCRkJv5YKPTpPBe80hhJSE2VHaAXdHngRr6vQVakY1Zws4zh0 7QLHiqArABK1oZpUpYj3ARo/W80NRczIN1Rg5ARPF6d3vRDtwRxmds2meOlFv67lL8 S/u/wUuw4pMb7TukuH0CAVcN3RJnrH3It4JXfBZoFgRFOWj8lXNYiHaj/fvleaYtmX ejtysL4WQpozXkDlwEgGKXNQR+2oN7bk2WKG8ysIj3fJwQv8ppqRAYFivQ/OtB4UFo 1NVQsbOUsCokTQyrTE2O9eOKmoSC7OWr/9IHkoPdglkGIK/QnglgR+F0lkz4TsLsYo VOJ5I4fTyNvDBy3MEEjuse8o= From: Tomas Volf <~@wolfsden.cz> To: guix-patches@gnu.org Subject: [PATCH 00/11] Update container tooling (podman, buildah) Date: Sun, 31 Mar 2024 20:32:38 +0200 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=37.205.8.62; envelope-from=~@wolfsden.cz; helo=wolfsden.cz 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, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: submit Cc: Tomas Volf <~@wolfsden.cz> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) This series reworks the build process for podman and buildah, making it more self-contained and (hopefully) more maintainable going to the future. Some required packages are also updated or added. Tomas Volf (10): gnu: crun: Update to 1.14.4. gnu: podman: Drop obsolete comment. gnu: podman: Update to 5.0.0. gnu: conmon: Update to 2.1.10. gnu: passt: Update to 2024_03_20.71dd405. gnu: Add podman-compose. gnu: gvisor-tap-vsock: Remove references to go. gnu: podman: Revamp the package. gnu: buildah: Update to 1.35.3. gnu: buildah: Switch to gnu-build-system. Wilke Schwiedop (1): gnu: Add catatonit. gnu/local.mk | 1 - gnu/packages/containers.scm | 313 ++++++++++++------ .../patches/podman-program-lookup.patch | 120 ------- 3 files changed, 212 insertions(+), 222 deletions(-) delete mode 100644 gnu/packages/patches/podman-program-lookup.patch -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Mar 31 14:35:25 2024 Received: (at 70112) by debbugs.gnu.org; 31 Mar 2024 18:35:25 +0000 Received: from localhost ([127.0.0.1]:48402 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rr01c-0001vz-TH for submit@debbugs.gnu.org; Sun, 31 Mar 2024 14:35:25 -0400 Received: from wolfsden.cz ([37.205.8.62]:40178) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1rr01Z-0001vA-IC for 70112@debbugs.gnu.org; Sun, 31 Mar 2024 14:35:22 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 438E42A08B4; 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=1711910118; bh=n/iGokKMBCXXwXHtj+Yy8/NqE/Gh+x4Fg/ktVfwoChI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=hQNEeDq1RplP7iQGwVSM/yMVOYjJCAZKRyXKraW49lg+CzbI2mnAOVdu4f6p2cH3n QvtghDhZh/XhnT/3Ri4nNj0AoqDLfspPAtV8EXPpwJ2YaIfd2LgXWwjJKrEoHNzkKF iKUTooh+1aoL6mZkjAPQxTeJMC/rG69eaipxyZFG7bAFyiykL+RqDpjAh5p7YHZO5s PrYxDMPM6mGXB5cqiRXqJ83tDC5ZH6nF2xCyTORW0VFdzTQXLoDFq5/h57xhIJ4LWe 3TY6XSLEUf6ZX0BSeR2IjlyngkMtc7eM0gtCYh90ah8KxhS5KgH06O5uMp0sXlAGR3 gbdWmYn1Ie5yMnHkOpUGEpN4Urp5ZRCmXtyJF/0RuR+gzUWtx9nIXagCaWnJO2Kjb+ Wl1Q90MiWSNvYkhfuZc1kNaobGsyCdpRHw1tTKnntsnA77gIx2yIEHQEGznqprtM8q 3WSp5bQM/Jtlf6LYewtcEskGpJGyXXzEP4l7AuCfcq3q+LjKdTf6FHCJfSLYnDgz0S 5icru+Zwq4X86XXPUgwVEXYDuxszlYq2lNel2pyfIpBb7uGAEBixUoAM/roFEgCL28 go+RLZAhOYotlHCa5U228cnFGI36MS0cjdWjnvhIv8m8Dct0zr+rZ85PO87eucRpFx 4cFG3vSdFVWmeac55Urc6KA4= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-1.2 required=5.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from localhost (unknown [193.32.127.158]) by wolfsden.cz (Postfix) with ESMTPSA id F222B2A08B3; Sun, 31 Mar 2024 18:35:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1711910118; bh=n/iGokKMBCXXwXHtj+Yy8/NqE/Gh+x4Fg/ktVfwoChI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=hQNEeDq1RplP7iQGwVSM/yMVOYjJCAZKRyXKraW49lg+CzbI2mnAOVdu4f6p2cH3n QvtghDhZh/XhnT/3Ri4nNj0AoqDLfspPAtV8EXPpwJ2YaIfd2LgXWwjJKrEoHNzkKF iKUTooh+1aoL6mZkjAPQxTeJMC/rG69eaipxyZFG7bAFyiykL+RqDpjAh5p7YHZO5s PrYxDMPM6mGXB5cqiRXqJ83tDC5ZH6nF2xCyTORW0VFdzTQXLoDFq5/h57xhIJ4LWe 3TY6XSLEUf6ZX0BSeR2IjlyngkMtc7eM0gtCYh90ah8KxhS5KgH06O5uMp0sXlAGR3 gbdWmYn1Ie5yMnHkOpUGEpN4Urp5ZRCmXtyJF/0RuR+gzUWtx9nIXagCaWnJO2Kjb+ Wl1Q90MiWSNvYkhfuZc1kNaobGsyCdpRHw1tTKnntsnA77gIx2yIEHQEGznqprtM8q 3WSp5bQM/Jtlf6LYewtcEskGpJGyXXzEP4l7AuCfcq3q+LjKdTf6FHCJfSLYnDgz0S 5icru+Zwq4X86XXPUgwVEXYDuxszlYq2lNel2pyfIpBb7uGAEBixUoAM/roFEgCL28 go+RLZAhOYotlHCa5U228cnFGI36MS0cjdWjnvhIv8m8Dct0zr+rZ85PO87eucRpFx 4cFG3vSdFVWmeac55Urc6KA4= From: Tomas Volf <~@wolfsden.cz> To: 70112@debbugs.gnu.org Subject: [PATCH 02/11] gnu: podman: Drop obsolete comment. Date: Sun, 31 Mar 2024 20:34:59 +0200 Message-ID: <286152c31974061c0783ef711489b25c0273cfa8.1711909824.git.~@wolfsden.cz> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 70112 Cc: Tomas Volf <~@wolfsden.cz> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) cgroup2 is now the default type. * gnu/packages/containers.scm (podman): Drop the comment. Change-Id: I197ed7e4901b26ad820295ed7adcaffd7bf533f5 --- gnu/packages/containers.scm | 3 --- 1 file changed, 3 deletions(-) diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm index f1b76f8512..b08d0ee762 100644 --- a/gnu/packages/containers.scm +++ b/gnu/packages/containers.scm @@ -410,9 +410,6 @@ (define-public gvisor-tap-vsock The binary is called @command{gvproxy}.") (license license:asl2.0))) -;; For podman to work, the user needs to run -;; `sudo mount -t cgroup2 none /sys/fs/cgroup` - (define-public podman (package (name "podman") -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Mar 31 14:35:25 2024 Received: (at 70112) by debbugs.gnu.org; 31 Mar 2024 18:35:26 +0000 Received: from localhost ([127.0.0.1]:48407 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rr01d-0001w2-8O for submit@debbugs.gnu.org; Sun, 31 Mar 2024 14:35:25 -0400 Received: from wolfsden.cz ([37.205.8.62]:40168) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1rr01Z-0001uu-3R for 70112@debbugs.gnu.org; Sun, 31 Mar 2024 14:35:22 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 67F6F2A04B0; Sun, 31 Mar 2024 18:35:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1711910117; bh=pkNLUiaJzTRsLaYBt4mNRPhdpZWocpn1PaiEec48ZHk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ZPnBiBgxtuJZ6OFkrpnfYi3LdaMo335MpBl7WRUkkn2q+0pCb1PuXFjXKM0mWytA8 hpQxJdUtreHmR1Cu8f4vGAvMS4zo+UAbZ452xpmb0Uj0O5sEhBC5auZ5tRlAUJs3Q4 0qKZipm8nDhlfeArzDPosc0HvnLxHv+6KV4aSvBe1Uw8sshm0iISwzeJbJMF6pffeH E/h/U118bsk2tHg9EKHb6WQw9EX8d3RXUX83hPiJkJ/8QPAiwydkWO2PJd7yQ7AHlA nxZgnqS3ZDb0JxRCiRsOTzpSlmuRFM5cYtj/ypLgDA0r3LOsi4bu1/if/f55jkwCag Dn/swz1P3ewKGx1LMDp/XC2sF5yRwNtpPJqLksbBa39dkyq6eVeEBlxPglOSmwswNc 60jUBm4JDPLJAhqVXHNcFbxZjpWTvL1+3iSUXfymJ0iUVB+krMr0gzUufZImxAvGlK VxjIaJVv1rKRpHTGsOnMtFXMUVhf7ORrjLFk1Vkc3fxc+Tr6tMu9Ofp/5bIzK4H9Lq GJCNH/a/kbhYL8AIDWU9Eg+EDqb2y9dYrr8+5RzeRMQZEUnY+Kcbss2qfukEHe2wiu Qf/MtHs2DoQSMlZKI8HxJ+Kv34cdK2iCtar7hOEG7bEs6svkSDL5HA4YVfqNq7g7Lj o2QI5oYh0XcG1Xfn7IhsNBdQ= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-1.2 required=5.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from localhost (unknown [193.32.127.158]) by wolfsden.cz (Postfix) with ESMTPSA id 0F9852A04AF; Sun, 31 Mar 2024 18:35:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1711910117; bh=pkNLUiaJzTRsLaYBt4mNRPhdpZWocpn1PaiEec48ZHk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ZPnBiBgxtuJZ6OFkrpnfYi3LdaMo335MpBl7WRUkkn2q+0pCb1PuXFjXKM0mWytA8 hpQxJdUtreHmR1Cu8f4vGAvMS4zo+UAbZ452xpmb0Uj0O5sEhBC5auZ5tRlAUJs3Q4 0qKZipm8nDhlfeArzDPosc0HvnLxHv+6KV4aSvBe1Uw8sshm0iISwzeJbJMF6pffeH E/h/U118bsk2tHg9EKHb6WQw9EX8d3RXUX83hPiJkJ/8QPAiwydkWO2PJd7yQ7AHlA nxZgnqS3ZDb0JxRCiRsOTzpSlmuRFM5cYtj/ypLgDA0r3LOsi4bu1/if/f55jkwCag Dn/swz1P3ewKGx1LMDp/XC2sF5yRwNtpPJqLksbBa39dkyq6eVeEBlxPglOSmwswNc 60jUBm4JDPLJAhqVXHNcFbxZjpWTvL1+3iSUXfymJ0iUVB+krMr0gzUufZImxAvGlK VxjIaJVv1rKRpHTGsOnMtFXMUVhf7ORrjLFk1Vkc3fxc+Tr6tMu9Ofp/5bIzK4H9Lq GJCNH/a/kbhYL8AIDWU9Eg+EDqb2y9dYrr8+5RzeRMQZEUnY+Kcbss2qfukEHe2wiu Qf/MtHs2DoQSMlZKI8HxJ+Kv34cdK2iCtar7hOEG7bEs6svkSDL5HA4YVfqNq7g7Lj o2QI5oYh0XcG1Xfn7IhsNBdQ= From: Tomas Volf <~@wolfsden.cz> To: 70112@debbugs.gnu.org Subject: [PATCH 01/11] gnu: crun: Update to 1.14.4. Date: Sun, 31 Mar 2024 20:34:58 +0200 Message-ID: <160eb0e97e1f079ba6a20e2336b1cb5704622536.1711909824.git.~@wolfsden.cz> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 70112 Cc: Tomas Volf <~@wolfsden.cz> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/containers.scm (crun): Update to 1.14.4. Change-Id: I769c15663bf668a967cf32243dd8139b6c949953 --- gnu/packages/containers.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm index 31260c5c0a..f1b76f8512 100644 --- a/gnu/packages/containers.scm +++ b/gnu/packages/containers.scm @@ -58,7 +58,7 @@ (define-module (gnu packages containers) (define-public crun (package (name "crun") - (version "1.14.1") + (version "1.14.4") (source (origin (method url-fetch) @@ -68,7 +68,7 @@ (define-public crun "/crun-" version ".tar.gz")) (sha256 (base32 - "02lplc2asyllb58mvy7l8b9gsk7fxs95g928xk28yzmf592ay33x")))) + "1d7fjhajf3bg576fzz96yi1djdqqs12bbhzv8br02h5czlxh29sm")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--disable-systemd") -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Mar 31 14:35:26 2024 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= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-1.2 required=5.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 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> To: 70112@debbugs.gnu.org Subject: [PATCH 03/11] gnu: podman: Update to 5.0.0. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 70112 Cc: Tomas Volf <~@wolfsden.cz> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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")))) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Mar 31 14:35:26 2024 Received: (at 70112) by debbugs.gnu.org; 31 Mar 2024 18:35:27 +0000 Received: from localhost ([127.0.0.1]:48414 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rr01e-0001wO-HF for submit@debbugs.gnu.org; Sun, 31 Mar 2024 14:35:26 -0400 Received: from wolfsden.cz ([37.205.8.62]:40202) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1rr01b-0001vh-Gw for 70112@debbugs.gnu.org; Sun, 31 Mar 2024 14:35:23 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 3AD372A086F; Sun, 31 Mar 2024 18:35:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1711910120; bh=YaefCbYRrcXwnbwhAtU0AizfXAXJw1wCM54uuyZaJrg=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=bWqRVMBdXEbjY7ihQ+nLfXwGHOmQOg+b9p0x1IfBT+gj1jeUGKxGiGsk6ttry7yj3 OjxSLv8fGsT+abd3E/mXAfwYWiEEDXql8Ni0z8Wo8YlO5t5ul/+Y1vKyfWp9p7zCkz 1IKHBbWnmO5Ua36ptcvMLt7t9KaZgd0RhAnrY1VeBXfUBPmR6oc/i8sTJOwjAnthZh Fo2Ty8hLSLak4U7CQBu0D7Rg8V8TOeXRweeND0TuKyIS0ON34sk0vfYZTfM43CWiov vq1RQcXwyeXgiOOaNRc2dOJ9cbt4mumiRrx+pe9cePdDoSRWGjP2cOc5k941vt7g/l vi+XD2Ob0jX/EM5q6ky92tk08b/Ylmc8AoQ1XPXcgetFZgyeC6EdMrh3utWIGxGCK+ paTkPC3gpd4adox9/6/mFHW4JT1MfSvYtPcmE7I59wJWcPlq4rNA7JfH3IKp7jiP/0 fbYtTzsak01xWqjeGb9bd26AqA/pFkrxY9iBGmBm96ADP54wkNKkYganW3SKRRdPj9 Wu913MBKpHuBxOO7aqychHVPEdkt/F1V4p/qq646V8HIcNk7lX3yuMVgBeTihuReky 8kaha6Spa2eNInlVVXG/4xPMP/MsCvHU77WjXxYoibB82kCd23tYWd6ZGhZL9AX4XR TuTboZdHcxeAiH4+/TVFMnBA= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-1.2 required=5.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from localhost (unknown [193.32.127.158]) by wolfsden.cz (Postfix) with ESMTPSA id D0D6F2A01BB; 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=YaefCbYRrcXwnbwhAtU0AizfXAXJw1wCM54uuyZaJrg=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=clmgo34U+nP3WkWAGFpUYqRd0XAD2YAsok7QKMFJ2iZ7aDpNoj4+0R0uSMIY+96VO TdB42tUZc9PAudKBhT7sY56syr3LVvJrsWyI10+pK0CfwmBNJ9wIjq+bsbVWuizWDj FPJEvaZgn62QeQBeakkepScvIekeW8NKo8zWjIzBsam+DcsTwt02hYANehm/+MQKEG QYkXM/YD3Gqe1ZdZQy3NlwHKCdcCCwfNDVQFuZkcczvGgyYB9L0fyVyFmU7mheUD3x 2WVfyari3DFiyHP+0RShok5A0q6uY3lHiZmOk7ypmI6+lISVmSjcnGpxww8o+sJN5p mCX0tI7zk2ligYQSY78pbGSW2MwyvEcZp6R7wkEqfzRBrsM+ejZ+XppmGBQhm79BB0 /6ZRu4uR5sqIUxKeg9CR5GE4SMInGLupSmJnGC1LyDyuFXzyb78cAEeW1GCCGAE6My lrx9e74d1OGrRTxaPH7L8Zlm4y1eXx5JudpoHGvsdPxW+YhaeM+9+7WPhWH9jSfc1N tnn+05ilksJP88UgmyX/U5CuTO2qttP5BWfts1rs3dj47/K8sSDy8nCtLFlpPyNOHt /+SIzQ8aRDMZcswfvqd+G3iWJh0zvIw91SGbmX+MY+qdX5tyy9OlmQk7cdUoyvJvGo o27Oh6Oc1x2m/iPElLA/Q0TA= From: Tomas Volf <~@wolfsden.cz> To: 70112@debbugs.gnu.org Subject: [PATCH 04/11] gnu: conmon: Update to 2.1.10. Date: Sun, 31 Mar 2024 20:35:01 +0200 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 70112 Cc: Tomas Volf <~@wolfsden.cz> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/containers.scm (conmon): Update to 2.1.10. Change-Id: I2a46b2dcd344909da34199145fef4ad3fa4418de --- gnu/packages/containers.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm index f62e4017dc..9e3ba8918e 100644 --- a/gnu/packages/containers.scm +++ b/gnu/packages/containers.scm @@ -105,7 +105,7 @@ (define-public crun (define-public conmon (package (name "conmon") - (version "2.0.31") + (version "2.1.10") (source (origin (method git-fetch) @@ -113,7 +113,7 @@ (define-public conmon (url "https://github.com/containers/conmon") (commit (string-append "v" version)))) (sha256 - (base32 "1cxklcihb2i4ywli0fxafkp2gi1x831r37z7spnigaj6pzj1517w")) + (base32 "0q4kn54pfgq1c2h00hkidagxrynkgq9nmm1ikgd9084njg3z4iar")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Mar 31 14:35:42 2024 Received: (at 70112) by debbugs.gnu.org; 31 Mar 2024 18:35:43 +0000 Received: from localhost ([127.0.0.1]:48432 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rr01u-0001yB-01 for submit@debbugs.gnu.org; Sun, 31 Mar 2024 14:35:42 -0400 Received: from wolfsden.cz ([37.205.8.62]:40204) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1rr01d-0001vw-00 for 70112@debbugs.gnu.org; Sun, 31 Mar 2024 14:35:25 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id B144B2A0D03; Sun, 31 Mar 2024 18:35:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1711910121; bh=FRxuRJ+DR9um26p43p/AS3tSF4F5Q78R1DoeMI+Fjus=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=IZp3oHfASIhTEjKGbh/hg9Y7KxrrpNXyyvqTl6wGari/+qdN9+sTdh3wmxN2wXRwh T0g7a5v0xWdh0FnNnlcbZ136fMyLy3KeT9yEHHs/tr0ezRXUfkFn0D7zKCrEH+1T4/ ux2qOLvhGFX7NpWF+LLnFqQbELUrfVqaMitZq1BKZM4L0RGZ8EOGMRldSI4it8LZyd Z5EzvN90ijJ6iCk84RE0N3gtGhIibBqoFWenSJDqvsciyyP5N5ETd7sjaH1sNZGnto rR6QYViq0UBPvmN64oqMv6dqkw3lW+au0JzaXke8fWNDp/N72tbx5eZH2WK01oZZpf vKkjGsruGVadeDv48u1SxpSTlheYsV0RoxiWp6M6z39JzNPBMBG0krvA4Q3ia9n3mD yExDmz0o95wnlQ4NrscROTEqwVUsJklVifQCLSYpyDKiFZkOJn0x5Bh7FEGhKHQYRx FHv2Bg43pQ6FjGHQDl8Thkf42IlHmsDgjKf94d6gi5CvT0susk7b8t+T5M+HsY+p+c /JYZGE4F61wAYUq1W9qxCUE0IgF+IH4TPD2lyybHqgKp/wDs64uHat2P1ForTUDE4T 45Ro/ev4d8+N4z3tUgjR/mmvoZEBHfkd4YO7wUbJ9LAQJ4kTFUM7Cum/ZrXS70H8Bn ivFUCs7mqrNXS5YQPjlMVJeo= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-1.2 required=5.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,PDS_OTHER_BAD_TLD,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from localhost (unknown [193.32.127.158]) by wolfsden.cz (Postfix) with ESMTPSA id C13F92A006C; Sun, 31 Mar 2024 18:35:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1711910120; bh=FRxuRJ+DR9um26p43p/AS3tSF4F5Q78R1DoeMI+Fjus=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=xq5l3LcphFdq7pQ9AG55k0+tdlfrAJP1eCACrdy4K3qVQpJ4tEn7pqs0DUtXtfkuA 2bEVA3TgFemy/UP70QF5rl9vbaIAaAXLgKDQMh2+kBCdgTKikrpDCPYrVKb0NaRCr+ b/dLlQUCj2Ksxy80Cz96iME/MOrUVyTDhK4gKDORI8YD0QQizDe1HKp3k6w/VyUQB5 1roU07FQIEDGECbSQGJeyZk6hiH/l09FAxSZIUVdatEO4lVaqE4A6TLQ9LxZxUxzMh Tb8RmGyQP2z7uAmH+9pqzsemI5xCnhGbk2j53rlOn8Woz4tQwtbLwUcvI6G+kXfo5v PcGcajsnLHvj0er3zOXAkmhV+Ko1504YtEcuDp8suBt7f+aDUdy6YSTVDTEKkx0cQR MDLD7aGVek+bDZa2tQZibRpuXSn2+uA4rMYjZ3S+3Q/3RWAOOWeUeJjopwVtTj5QDj RcKKzjUCy9ZhiwUlVVJGhtNqDPPLFBEHSRdD5214X8nH526KNvgjHgE4F4FaDopnGo MV2mlRASuQgUXinNAypK8ZToZTbzttby69dGvXB1Lr7ki8n46TIkMij1tn5ijNtmNb +qaJVML0bswPNJhsqINYupFg4sUyjGtugsJvkwa1M2TTCKgiqRfIG3cM3Lt8dEyuDQ 4szOPWkhsufjgCLdU+sA02W8= From: Tomas Volf <~@wolfsden.cz> To: 70112@debbugs.gnu.org Subject: [PATCH 05/11] gnu: passt: Update to 2024_03_20.71dd405. Date: Sun, 31 Mar 2024 20:35:02 +0200 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 70112 Cc: Tomas Volf <~@wolfsden.cz> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/containers.scm (passt): Update to 2024_03_20.71dd405. Change-Id: I089b7e9364058e59139bdb7cb942fad693254c1f --- gnu/packages/containers.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm index 9e3ba8918e..29577c5201 100644 --- a/gnu/packages/containers.scm +++ b/gnu/packages/containers.scm @@ -282,14 +282,14 @@ (define-public slirp4netns (define-public passt (package (name "passt") - (version "2023_12_30.f091893") + (version "2024_03_20.71dd405") (source (origin (method url-fetch) (uri (string-append "https://passt.top/passt/snapshot/passt-" version ".tar.gz")) (sha256 - (base32 "1nyd4h93qlxn1r01ffijpsd7r7ny62phki5j58in8gz021jj4f3d")))) + (base32 "1xyi1rqc3q2nbkd5mc4mp2m488ih5jy8v3xg0dgznh0149alx3y0")))) (build-system gnu-build-system) (arguments (list -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Mar 31 14:35:43 2024 Received: (at 70112) by debbugs.gnu.org; 31 Mar 2024 18:35:43 +0000 Received: from localhost ([127.0.0.1]:48434 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rr01u-0001yE-Qs for submit@debbugs.gnu.org; Sun, 31 Mar 2024 14:35:43 -0400 Received: from wolfsden.cz ([37.205.8.62]:40212) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1rr01d-0001w0-AT for 70112@debbugs.gnu.org; Sun, 31 Mar 2024 14:35:26 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 0D07A29F246; Sun, 31 Mar 2024 18:35:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1711910122; bh=DnesEVQhnXTGC2o1yULvRQIFkaG35gu/VpXHsicc3M4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=C6DRGfN5TiaUFqqrwFeTavmu4RvumoP98OhFS1giF9o3zV2CYJf93PnklzyMitxu2 Np5FJ0vPrByhMCnS/6LijYPAgIoF01G22uJ5JE0RfDNFLuMUDgmWrN39lUC9UI/GVP 8HkyIkynMx25omtungRtnj6/VtopjkuxgYxmxXMehTlrSdG/yNaz5no7kRnk0JVKUp E3xgtnE3wtRpr6AZ+ULPGTT+2B2+fRN8ZKMHZB1rLidnjY1mZcWd8pJWVjtHvMiUe+ 6G13rez69K6vsgdEZhAtngJMEI+/pRnsyWT2cV2GTTxVcyxQR/bdEV7oQJcvrq+dKZ AJk5q7p0G3qup8sIrudXgUzA9peGpIRt+ggM/ifLHz9P4fPaQUvKVAJEkENNOcgcOB dVkAp0kRxW93WJlZH2R6hVNE8zunwBvwaSgjgXRhO/dVp/c6MSp5nDZz+vDsm8spYM xiBMForUAq7UDVpy6C0M3wm/mm/Rj6yIFVAfnGtAWgPrjkrOO08TIXtZVn9CgPNdbJ ozujI94CcRI2lk9igeIeVL7AuzY/breNPQ3UZWD7HoxnNZleezlpccOY7LhHknV5KP 4ZC27kIvY6PfH17zKjQUF1wWmiidtzM/H78xOLy6YWaw6YQdGx92NSMKUpxhZXOyBK W/FzDPVkbMIkIBdoqoQuIflU= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-1.2 required=5.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from localhost (unknown [193.32.127.158]) by wolfsden.cz (Postfix) with ESMTPSA id B6F5E2A039A; Sun, 31 Mar 2024 18:35:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1711910121; bh=DnesEVQhnXTGC2o1yULvRQIFkaG35gu/VpXHsicc3M4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=KRwChInc6uIQBS0cwXQdsHS74FPR8jkLUFeKwKYwTPW/8PPSv7x37CLf/TEyl9R8S 9/AAIrFmsIxGAmTNCqxf7yu8DTr/arV5JhW2iADgTUP+rEb+zg6cZ3S7/z/syciYC8 vxmN45tXX5TJLwfu2JR3S+40vqZnVNAzWtl3gkeQ1nxs0WYD3O+QftbnBm9vlpt5g5 +NbqwdYe4iOk9/mxK67hs5HT1JBFePcNDa6oLVMFo6dBynP5pipMvD+vt6i6dTO5tT o+EuNM7uNtljjCIVOPGeX6VeSHPDRKtUbnVghv0jfzgdmoQoiMMhnRF10+/UCIATJB bh2oYHJkqdjDxXMP6QYXhbMy78C/5jMsjg5S48hRlyJ7EPxqST3mKaBoF/8wxP1DdZ s/X8d1nbCZXYDaMFS9j7IULxG6IO5VQnYd3O7SBqKWozBUtxunPDKw2VYo4Xr/KAPJ k9eXrLrBNGfkuvqQVV9slJFk3HIS9X/t72TMNtZXCdPhlUJUfcD5kPxLYx9fOthwOg qccREFEpGgRG/f3U8Hr93Q7YPvENp71YbhQf36pxJNvohHAGlmZKwI7pk/AkSGSbin WeGEbv1Z/VFAnv2rsYaAsn12LMVSzYxoRrCUPFgZJHPAuAZN58rTMvvvsIBCp7g/Hl SWoVNzx3H6/uwohE0b5vkwQc= From: Tomas Volf <~@wolfsden.cz> To: 70112@debbugs.gnu.org Subject: [PATCH 06/11] gnu: Add catatonit. Date: Sun, 31 Mar 2024 20:35:03 +0200 Message-ID: <09c7cafab463c35a8b3a47358dfab5b22c4bcf51.1711909824.git.~@wolfsden.cz> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 70112 Cc: Wilke Schwiedop X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Wilke Schwiedop * gnu/packages/containers.scm (catatonit): New variable. Change-Id: Ib6948bde8204426a8cb008982cb7cc9302f9e6d6 --- gnu/packages/containers.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm index 29577c5201..36948cf5e2 100644 --- a/gnu/packages/containers.scm +++ b/gnu/packages/containers.scm @@ -411,6 +411,26 @@ (define-public gvisor-tap-vsock The binary is called @command{gvproxy}.") (license license:asl2.0))) +(define-public catatonit + (package + (name "catatonit") + (version "0.2.0") + (source + (origin + (method url-fetch) + (uri (string-append + "https://github.com/openSUSE/catatonit/releases/download/v" + version "/catatonit.tar.xz")) + (sha256 + (base32 "141b5lypgqib546zmldi4kqzpqfd6vvqddqqkfaz3w11fjsc4hwq")))) + (build-system gnu-build-system) + (native-inputs (list autoconf automake libtool)) + (synopsis "Container init") + (description + "A container init that is so simple it's effectively brain-dead.") + (home-page "https://github.com/openSUSE/catatonit") + (license license:gpl2+))) + (define-public podman (package (name "podman") -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Mar 31 14:35:44 2024 Received: (at 70112) by debbugs.gnu.org; 31 Mar 2024 18:35:44 +0000 Received: from localhost ([127.0.0.1]:48436 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rr01v-0001yL-Gf for submit@debbugs.gnu.org; Sun, 31 Mar 2024 14:35:44 -0400 Received: from wolfsden.cz ([37.205.8.62]:51994) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1rr01e-0001wP-RA for 70112@debbugs.gnu.org; Sun, 31 Mar 2024 14:35:27 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 87E612A0D04; Sun, 31 Mar 2024 18:35:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1711910123; bh=jW4JzNg0Farh/zeG9pMpvK//Dj/gBU2vO0nvDJPQ8bs=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=NSCaYuw2jUK8i0wjCO2l180SeI3hrmcY6htn7pbsW9bnByM14DnIzqEnCENWzQt8Q 1LCTMj/dIz38gi+uEmTEIJTKJYp/S0LBgNUkCCDAE2DxHyB+MVWSN/HbZgJSkAfA/W u845zSZT0dSYY0/O8ObB7YQLUsrZhnntVZxGcPhyC5m9ASFk6XI/6DQ3Urf88uaDZ1 /y1Yd4YCSOzDYqHk7U1ztyMAZGt+S5U2Bq3zcW61JrTn0wC5dTRlKo4OOzyVETtfd3 dzN/qtJ1ABFKzgvEfcgQWrHvKLaQ9ozLw0e+/U4Gh7moRWEGG+nPn0NiSbnqZN+YIn CpdIvQQFZ16X9LDH/RiHt2fYifZh4JpHAMYHxmUzt9H9ljuta7Llysra7d38j9cjFo 2MVb1/ZGSTmB6KZMXosvcepzU3D6S8hGGmbBP+6iFc9DDS+3IjYJjm8/ku3gXygVDK NQP4WT2WIVsm/CRyO2Xj3FmNb4/cfpHZWBraNtxbCgpNynK3Kxl5xvUtIcm3GAhbrG +WbByR047ovIXbhpUqLChpj7yxFHl2n/l2LuWvporoDxnrCT8yldlbZ3uiufeTf4Cf cOfCGCB2dCIJJEu58nJfE/ahs4+7ewWSzKglw8Y3Q3FV67Yutf7y4qqqxPlqQyD1Pw dBJ3sUcE/dB1Zjs1AmahsrbQ= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-1.2 required=5.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from localhost (unknown [193.32.127.158]) by wolfsden.cz (Postfix) with ESMTPSA id A513329F6BD; Sun, 31 Mar 2024 18:35:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1711910122; bh=jW4JzNg0Farh/zeG9pMpvK//Dj/gBU2vO0nvDJPQ8bs=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Ae0mezBtMT3FnGzMk3dNx02Er5N3esbBkHshUZBYjW7bFK/rAP2HeWNb7FLFh5Q0T 0Z/ByxgOE/D6zcqM6Nipfy8n3i4oSV2dUk3uE+cX3FhRmzhYFHfGKz2XPoDFby5C84 JywxxyInnjNBxv9+ixU3yQwH9rqBH/tk6QxdDF7BXk4Pk7QujKjwE+DhcNKVnocxTu 8fM2lHRdnriAq0/XyxXd8UhSUcfXKraQYhhc5JP4BJ9Gup3ONiE8t/MHMmY+eCjswI /Y+hbIYSpsgXNKJZK/PTL6wnhyuihFl/SGrcokvQAj7cM98rK4EGNlhRztJn+dL3+q YJc4P8seeJbqypdAb3DkAGuB1HeYWOUP9qBp+jrglgOxMiWYkbs1s5tHwcMCrpOHdJ UPwhFRogyMqfVzThkGzf6Zfn/a4J0gurviSdgZeVOi3GXSfmFfupqo1yq+/p3G29xr 3KhngqU5esDqWy2vdm987/cQivy2uFCc0KbISIE5sPVk8Wvdj6Xyd8XouqA89dgXbp byrLWeNMklIBHbe4mForh4FiRBqV70Jlzg71+McL5/gWOQnT3bait2BPvIzjmYCBqi 2V7S/N1L2LJjJ//tfFxaQo9InjD0QLrf+zWwg3sEiq7Wg4hVD9TslzS1YIb6IHUFvF e7/3cjqr7oIUgNxgioCoTvmk= From: Tomas Volf <~@wolfsden.cz> To: 70112@debbugs.gnu.org Subject: [PATCH 07/11] gnu: Add podman-compose. Date: Sun, 31 Mar 2024 20:35:04 +0200 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 70112 Cc: Tomas Volf <~@wolfsden.cz> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/containers.scm (podman-compose): New variable. Change-Id: Ieb5ee4b6e82464599a17ec950be8a7dbb2efa842 --- gnu/packages/containers.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm index 36948cf5e2..faea15b8c4 100644 --- a/gnu/packages/containers.scm +++ b/gnu/packages/containers.scm @@ -34,6 +34,7 @@ (define-module (gnu packages containers) #:use-module (guix build-system gnu) #:use-module (guix build-system go) #:use-module (guix build-system meson) + #:use-module (guix build-system python) #:use-module (guix utils) #:use-module (gnu packages admin) #:use-module (gnu packages autotools) @@ -49,6 +50,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 python-xyz) #:use-module (gnu packages rust-apps) #:use-module (gnu packages selinux) #:use-module (gnu packages version-control) @@ -532,6 +534,34 @@ (define-public podman packaged.") (license license:asl2.0))) +(define-public podman-compose + (package + (name "podman-compose") + (version "1.0.6") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/containers/podman-compose") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "11dwpifkm20vyi6r3fgmiiqc01mpm4r8l0p5gfh0bawi2gklrhsf")))) + (build-system python-build-system) + (arguments + (list + #:tests? #f)) + (inputs (list python-dotenv + python-pyyaml)) + (home-page "https://github.com/containers/podman-compose") + (synopsis "Implementation of @url{https://compose-spec.io/,,Compose Spec} +with @code{podman} backend") + (description "Provides an implementation of +@url{https://compose-spec.io/,,Compose Spec} for @code{podman} focused on +being rootless and not requiring any daemon to be running.") + (license license:gpl2))) + (define-public buildah (package (name "buildah") -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Mar 31 14:35:54 2024 Received: (at 70112) by debbugs.gnu.org; 31 Mar 2024 18:35:54 +0000 Received: from localhost ([127.0.0.1]:48438 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rr026-0001yk-5e for submit@debbugs.gnu.org; Sun, 31 Mar 2024 14:35:54 -0400 Received: from wolfsden.cz ([37.205.8.62]:52008) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1rr01f-0001we-8J for 70112@debbugs.gnu.org; Sun, 31 Mar 2024 14:35:27 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id EF1B929DBFD; Sun, 31 Mar 2024 18:35:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1711910123; bh=PzXepjfMo84A2bxtyoRqJhbcfJmks8zwozmLG7KfvVQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Rih9SovF2MV3JUfkQ2//izWYAFBP7X8PEZY+SMwHTDf5P6163luP1Rw+iHag/NPjK 0yU3UsHxZO04o5CpiHu5b2fGqXZO0eaY58y54RUDHGnQ6XdTaPDBKRXBhunDfXVqk5 pID/sVNLux/jfOzzlbyuxKTi+jQrT9MMU5gOlTKG0Yt7tlRg10ynciYYjPJdh3wh9R Uz1VaWAHAWWV2pbmY5edoWtREOI0Nzlm3QVodHiC/TEQamairrMPIuQbAYdTV263xe 4oDeKD/HDcy+fhch9SnOJBIchwYXa3Z04VenXOfpWLY8idgBE3+kVuQXfhdoeeRblJ 73vcQFP2OXeL41mzF5N4JkWooA/sReanNPA2tGAeQHQChiNPdZC+rwVOvpZmiyt700 MDTxhSteUtI96KCrGSUprEaxxwlRa1WwSruTOO6S3fMLyLJr2MQP+K8pjjI43cmyOt gWRWzh6QpX8GQZs2x9VkbMUFgBlGF84uYVYP0QPPZ+moDl/Zkv2ra0BRw1C52gP1Nx 76QSP/uEbsu/IKmXDe9XrlM7x3IURaNY4k6zylUJk7VVrU4CiW5Hhv4q0L0wY0v3hb 7eDIHvk9RfedZhPSr+jDP7Yy10a+ohFes5ams5UDUsRJ97IQ2adfo6VaznhNIECRHZ pfT/gILCLvPnAI+cLsW3aNaQ= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-1.2 required=5.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from localhost (unknown [193.32.127.158]) by wolfsden.cz (Postfix) with ESMTPSA id 934812A0154; Sun, 31 Mar 2024 18:35:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1711910123; bh=PzXepjfMo84A2bxtyoRqJhbcfJmks8zwozmLG7KfvVQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Rih9SovF2MV3JUfkQ2//izWYAFBP7X8PEZY+SMwHTDf5P6163luP1Rw+iHag/NPjK 0yU3UsHxZO04o5CpiHu5b2fGqXZO0eaY58y54RUDHGnQ6XdTaPDBKRXBhunDfXVqk5 pID/sVNLux/jfOzzlbyuxKTi+jQrT9MMU5gOlTKG0Yt7tlRg10ynciYYjPJdh3wh9R Uz1VaWAHAWWV2pbmY5edoWtREOI0Nzlm3QVodHiC/TEQamairrMPIuQbAYdTV263xe 4oDeKD/HDcy+fhch9SnOJBIchwYXa3Z04VenXOfpWLY8idgBE3+kVuQXfhdoeeRblJ 73vcQFP2OXeL41mzF5N4JkWooA/sReanNPA2tGAeQHQChiNPdZC+rwVOvpZmiyt700 MDTxhSteUtI96KCrGSUprEaxxwlRa1WwSruTOO6S3fMLyLJr2MQP+K8pjjI43cmyOt gWRWzh6QpX8GQZs2x9VkbMUFgBlGF84uYVYP0QPPZ+moDl/Zkv2ra0BRw1C52gP1Nx 76QSP/uEbsu/IKmXDe9XrlM7x3IURaNY4k6zylUJk7VVrU4CiW5Hhv4q0L0wY0v3hb 7eDIHvk9RfedZhPSr+jDP7Yy10a+ohFes5ams5UDUsRJ97IQ2adfo6VaznhNIECRHZ pfT/gILCLvPnAI+cLsW3aNaQ= From: Tomas Volf <~@wolfsden.cz> To: 70112@debbugs.gnu.org Subject: [PATCH 08/11] gnu: gvisor-tap-vsock: Remove references to go. Date: Sun, 31 Mar 2024 20:35:05 +0200 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 70112 Cc: Tomas Volf <~@wolfsden.cz> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This is handled automatically by go-build-system, but (obviously) not by the gnu-build-system, so add the phase manually. * gnu/packages/containers.scm (gvisor-tap-vsock)[arguments]<#:phases>: Add 'remove-go-references phase. Change-Id: I5cef0bc03dfa7f219bdfec4226d0e7772401a5a5 --- gnu/packages/containers.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm index faea15b8c4..992ef82d3f 100644 --- a/gnu/packages/containers.scm +++ b/gnu/packages/containers.scm @@ -26,6 +26,7 @@ (define-module (gnu packages containers) #:use-module (guix gexp) #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix modules) #:use-module (gnu packages) #:use-module (guix packages) #:use-module (guix download) @@ -387,6 +388,9 @@ (define-public gvisor-tap-vsock (list #:make-flags `(list ,(string-append "GIT_VERSION=v" version)) #:test-target "test" + #:imported-modules + (source-module-closure `(,@%gnu-build-system-modules + (guix build go-build-system))) #:phases #~(modify-phases %standard-phases (delete 'configure) @@ -400,7 +404,9 @@ (define-public gvisor-tap-vsock (invoke "rm" "-r" "test"))) (replace 'install (lambda _ - (install-file "bin/gvproxy" (string-append #$output "/bin"))))))) + (install-file "bin/gvproxy" (string-append #$output "/bin")))) + (add-after 'install 'remove-go-references + (@@ (guix build go-build-system) remove-go-references))))) (native-inputs (list go-1.20)) (home-page "https://github.com/containers/gvisor-tap-vsock") (synopsis "Network stack for virtualization based on gVisor") -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Mar 31 14:35:55 2024 Received: (at 70112) by debbugs.gnu.org; 31 Mar 2024 18:35:55 +0000 Received: from localhost ([127.0.0.1]:48440 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rr026-0001ym-Of for submit@debbugs.gnu.org; Sun, 31 Mar 2024 14:35:55 -0400 Received: from wolfsden.cz ([37.205.8.62]:52020) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1rr01h-0001ww-2y for 70112@debbugs.gnu.org; Sun, 31 Mar 2024 14:35:29 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id C43C129E5F6; Sun, 31 Mar 2024 18:35:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1711910125; bh=sNzwnE5RMjMrsiZBletzus3N4jvQkYlFnTysY7LcHTk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=WxgcPnCFVdonnQlntrk011EnaCp4P1UQutRJvKb5Y9GPQ1ivp30CESriXp2Xjn7wK c+CWFugZh3OC3fUFLPOnuJNL24jH6VPL72xmkWS+uZ2Kgp/LsSDFMcIXHNifN3KJZV g2ek+xHrHr1v3lsHQFP0QMZeKLlPm8oY3MuIQND88O6aQemT/WIObFxSj8vHrj2FTW GyWqQOO5M6gxsHzDIDfjrxqmEbOqfVA97aclZEraAb2JuD5vXFmk7TE35SZMQiegox qKw+lFMwIMuAObT+oY1B+Dcq2ST/yzEW3LlverXcnJtkv45vKRp5VQ+k2vBgmifJyC q8O2ni55MMPco4O6Jec2X8+iLD8QjcenppvRdv1NZ7p89tr9XRdkO74lXpCaP0eamg ZSDi8MYKZWQsyIIE3bEqRT/tBkQqwB6kCVfhm0P98mmr9gEpckpDtGD5gEpCsaoCOV aeI5ZJl2lqi73GW/4tiNiOJM7CnP31TjcSanLLoeSIx1RTIx7YoyiuTmLlO5WuYerR 0nZ8eGffchc1niaVecgdCxsQVTL6Vsp1feoupnkPc9T4w7PRlJ6AfGGdh4GkDBXvw5 eNbAAFluborB8DGaVhb7oOcyg5c/2JVrI28u6MrCEQcTW86nvDQtbeDzoUlC3Ts9Ld b70F9w5N1aqYgVs1Hs5Nw3ho= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-1.2 required=5.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from localhost (unknown [193.32.127.158]) by wolfsden.cz (Postfix) with ESMTPSA id 758162A1080; Sun, 31 Mar 2024 18:35:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1711910125; bh=sNzwnE5RMjMrsiZBletzus3N4jvQkYlFnTysY7LcHTk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=WxgcPnCFVdonnQlntrk011EnaCp4P1UQutRJvKb5Y9GPQ1ivp30CESriXp2Xjn7wK c+CWFugZh3OC3fUFLPOnuJNL24jH6VPL72xmkWS+uZ2Kgp/LsSDFMcIXHNifN3KJZV g2ek+xHrHr1v3lsHQFP0QMZeKLlPm8oY3MuIQND88O6aQemT/WIObFxSj8vHrj2FTW GyWqQOO5M6gxsHzDIDfjrxqmEbOqfVA97aclZEraAb2JuD5vXFmk7TE35SZMQiegox qKw+lFMwIMuAObT+oY1B+Dcq2ST/yzEW3LlverXcnJtkv45vKRp5VQ+k2vBgmifJyC q8O2ni55MMPco4O6Jec2X8+iLD8QjcenppvRdv1NZ7p89tr9XRdkO74lXpCaP0eamg ZSDi8MYKZWQsyIIE3bEqRT/tBkQqwB6kCVfhm0P98mmr9gEpckpDtGD5gEpCsaoCOV aeI5ZJl2lqi73GW/4tiNiOJM7CnP31TjcSanLLoeSIx1RTIx7YoyiuTmLlO5WuYerR 0nZ8eGffchc1niaVecgdCxsQVTL6Vsp1feoupnkPc9T4w7PRlJ6AfGGdh4GkDBXvw5 eNbAAFluborB8DGaVhb7oOcyg5c/2JVrI28u6MrCEQcTW86nvDQtbeDzoUlC3Ts9Ld b70F9w5N1aqYgVs1Hs5Nw3ho= From: Tomas Volf <~@wolfsden.cz> To: 70112@debbugs.gnu.org Subject: [PATCH 10/11] gnu: buildah: Update to 1.35.3. Date: Sun, 31 Mar 2024 20:35:07 +0200 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 70112 Cc: Tomas Volf <~@wolfsden.cz> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/containers.scm (buildah): Update to 1.35.3. Change-Id: I0a00d6a73079ddaa38a454856781adfc2d7f158f --- gnu/packages/containers.scm | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm index abd403af34..48b276e250 100644 --- a/gnu/packages/containers.scm +++ b/gnu/packages/containers.scm @@ -600,16 +600,17 @@ (define-public podman-compose (define-public buildah (package (name "buildah") - (version "1.29.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/containers/buildah") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1mcqkz68fjccdla1bgxw57w268a586brm6x28fcm6x425ah0w07h")))) + (version "1.35.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/containers/buildah") + (commit (string-append "v" version)))) + (sha256 + (base32 + "07hr2cfp4kblnmva02ap97id5nzhbqigdfvx7c8nyrkfzw0340n0")) + (file-name (git-file-name name version)))) (build-system go-build-system) (arguments (list #:import-path "github.com/containers/buildah/cmd/buildah" -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Mar 31 14:35:56 2024 Received: (at 70112) by debbugs.gnu.org; 31 Mar 2024 18:35:56 +0000 Received: from localhost ([127.0.0.1]:48442 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rr027-0001yy-49 for submit@debbugs.gnu.org; Sun, 31 Mar 2024 14:35:56 -0400 Received: from wolfsden.cz ([37.205.8.62]:52018) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1rr01g-0001wu-Mj for 70112@debbugs.gnu.org; Sun, 31 Mar 2024 14:35:30 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 6962F29FEC1; Sun, 31 Mar 2024 18:35:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1711910125; bh=zNPrhNwHiroLcuKqsEG5jc88lsRJk2vhli2JsrI8AnQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ohli54QSn3zQgiB/V1ZX1bk8KbIiWOJhGqa7oMPR7TwqSz8fKe73/CEUTrjIzt9BD NmF89UfLOZS5do/c9NeF+iH3zbAs2HjsO+fqQsVenRQwDWLKEJEjm6Lwl9sw2wIm7U rS45Pzstg8mV3RetGUlPOCOiShvrDU1Xi1Ry73QT/nwzIf4JdNheELRXX1r8j06eGC xPtFFVvocersvW/rcPJcQ89mPpfAHsbLhyH+fxigPIyZXvzI9OrMFkkGfc9oG7T99t oWKGVM3E0yRH7p29sJynt6ZGbROpfcjLXhdNPYerl2CK5Y6id7mk3RLvXicsV0j9GX fje5jd02ymUJDIIa1TQspYiacVxJFVOrMsVtVmwVXzG4/ynKkuUn2I90Juow/cr8EA VlKy5Fh2hwN39Z0/orwQXYO451WczYmVpdt483i3l4d1EbePvkwskGwURS0Lsq38wM qVlcaTeuybHyUbOU0+7tXCNvtTOd2AiSBQ7VnR9rzK1rNcGJeK3IFEmF5FXiJccZkx v2wUWflTJYAB+vuofjlP9G+LITl3lqdCw4lnz64Ye0RkZIvEtHESzFizYh9O1xO0Yp QANVk62Z83JvKOGsOn/CbpoX7bYsWzbYCH/wMYUSvFchze8kBGpNpAkWSZMd8UV1wi QfbjLVzgROy0K+wtjjOncgA0= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,URIBL_BLOCKED,URIBL_SBL_A autolearn=unavailable autolearn_force=no version=3.4.6 Received: from localhost (unknown [193.32.127.158]) by wolfsden.cz (Postfix) with ESMTPSA id 8538829F7B8; Sun, 31 Mar 2024 18:35:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1711910124; bh=zNPrhNwHiroLcuKqsEG5jc88lsRJk2vhli2JsrI8AnQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=cOY33h4IbMXek2+cw4GDwbdfnlRo+sOLvU8GPiWUGJj9C+OJ91tH4EKA5chmD4lHG QL3IzY6oqk/0qLc51DqinQft8r7NI8Xkh40eATD5qlBHp9SjZdPlMsAEYNufHx3B/9 gHAHPzbh17zsto1180a8VWqVeGCyUmsKJcz6S4h3UEb6OVgfJMkZR6akvC2NGXgW6N 3b9JDstXm0RXm1BrLfM1tcpV/3BBEu2EkmsIwhb5BFTRLmpeZ4bYc6LJrr4R3Wzlsb 7tPUiRzuIeDJ3an8cYQ/Ta+Ts6mxqM7jkXFS45djQrEG1qO6IcGnn6rtrBt9jVOxtN jfbwnLdpub+YyFZVAM+zTd3/PnDTgq1gd2EkQk/qxgPmX30q8QwzCiKcJKMJZ3yFch VNZA9PRTjjK+DhR86JXx7dOYqH9CvKtdhcrPwlo7f0pSWcGCbBUGuW/xwvZ94Hr0Gp 3TEosvUdlfqckfUV1qdxPWuJ+I9Mu/9XOcQObb18wmlDhx23QBGzToFRGvWhp2JwEj 2mMHQ+qxdFX01aRoXzq4+soZrJOOvrmVb/DFwzzBe/F339cdZj7L47QGL2LPfAOS2A 8LrLzRK0PLeS1LGjmkjc+gZNyV8dQLlmHGRT3OUNJGzkuTISAgO6QqnqodXg53BqLH 1VrCx2tvHEKTJ0jj8LZWXMDg= From: Tomas Volf <~@wolfsden.cz> To: 70112@debbugs.gnu.org Subject: [PATCH 09/11] gnu: podman: Revamp the package. Date: Sun, 31 Mar 2024 20:35:06 +0200 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.7 (/) X-Debbugs-Envelope-To: 70112 Cc: Tomas Volf <~@wolfsden.cz> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.3 (/) Substantial rework of the podman package. The source is no longer patched (at all) and all necessary modifications were moved into wrap-program and phases. Not everything is supported out of the box, but description mentions what packages to install to get additional functionality working. * gnu/packages/containers.scm (podman)[source]: Remove snippet and patches. [arguments]<#:make-flags>: Add HELPER_BINARIES_DIR. Add GOMD2MAN to actually use go-github-com-go-md2man package instead of the bundled version. <#:imported-modules>: Add (guix build go-build-system). <#:phases>{'set-env}: Set `CC' as an environment variable due to bug in make before 4.4. {'fix-hardcoded-paths}: Remove everything except patching `libexec' and `lib' locations. {'symlink-helpers}: New phase symlinking tools not discoverable via $PATH into one directory (`HELPER_BINARIES_DIR'). {'wrap-podman}: New phase wrapping `podman' to set correct $PATH. {'remove-go-references}: New phase stripping references to the golang toolchain from the binaries. [inputs]: Remove no longer needed cni-plugins, slirp4netns. Remove referenced in 'wrap-podman conmon, crun, iptables, passt. Move go-github-com-go-md2man into native-inputs. Add bash-minimal. [native-inputs]: Add custom grep with supported -P. Use newer go. Add mandoc. [description]: Explain how to get `podman compose' and `podman machine' working. * gnu/packages/patches/podman-program-lookup.patch: Delete file. Change-Id: Ifc28971a68751831d781517b041eec951a617087 --- gnu/local.mk | 1 - gnu/packages/containers.scm | 119 ++++++++++------- .../patches/podman-program-lookup.patch | 120 ------------------ 3 files changed, 74 insertions(+), 166 deletions(-) delete mode 100644 gnu/packages/patches/podman-program-lookup.patch diff --git a/gnu/local.mk b/gnu/local.mk index f2b480bded..7056d4fdbc 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1804,7 +1804,6 @@ dist_patch_DATA = \ %D%/packages/patches/plasp-fix-normalization.patch \ %D%/packages/patches/plasp-include-iostream.patch \ %D%/packages/patches/pocketfft-cpp-prefer-preprocessor-if.patch \ - %D%/packages/patches/podman-program-lookup.patch \ %D%/packages/patches/pokerth-boost.patch \ %D%/packages/patches/ppsspp-disable-upgrade-and-gold.patch \ %D%/packages/patches/procps-strtod-test.patch \ diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm index 992ef82d3f..abd403af34 100644 --- a/gnu/packages/containers.scm +++ b/gnu/packages/containers.scm @@ -44,10 +44,13 @@ (define-module (gnu packages containers) #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages glib) + #:use-module (gnu packages gcc) #:use-module (gnu packages gnupg) #:use-module (gnu packages golang) #:use-module (gnu packages guile) #:use-module (gnu packages linux) + #:use-module (gnu packages man) + #:use-module (gnu packages pcre) #:use-module (gnu packages python) #:use-module (gnu packages networking) #:use-module (gnu packages pkg-config) @@ -449,84 +452,104 @@ (define-public podman (uri (git-reference (url "https://github.com/containers/podman") (commit (string-append "v" version)))) - (modules '((guix build utils))) - ;; FIXME: Btrfs libraries not detected by these scripts. - (snippet '(substitute* "Makefile" - ((".*hack/btrfs.*") ""))) - (patches - (search-patches - "podman-program-lookup.patch")) (sha256 (base32 "0g15m10mgwssw5axkyn2ms5k858dbc6vf3cbxv7hvdncgwnfk5f0")) (file-name (git-file-name name version)))) - (build-system gnu-build-system) (arguments (list #:make-flags - #~(list #$(string-append "CC=" (cc-for-target)) - (string-append "PREFIX=" #$output)) + #~(list (string-append "CC=" #$(cc-for-target)) + (string-append "PREFIX=" #$output) + (string-append "HELPER_BINARIES_DIR=" #$output "/_guix") + (string-append "GOMD2MAN=" + #$go-github-com-go-md2man "/bin/go-md2man")) #:tests? #f ; /sys/fs/cgroup not set up in guix sandbox #:test-target "test" + #:imported-modules + (source-module-closure `(,@%gnu-build-system-modules + (guix build go-build-system))) #:phases #~(modify-phases %standard-phases (delete 'configure) (add-after 'unpack 'set-env - (lambda* (#:key inputs #:allow-other-keys) - ;; when running go, things fail because - ;; HOME=/homeless-shelter. - (setenv "HOME" "/tmp"))) + (lambda _ + ;; When running go, things fail because HOME=/homeless-shelter. + (setenv "HOME" "/tmp") + ;; Required for detecting btrfs in hack/btrfs* due to bug in GNU + ;; Make <4.4 causing CC not to be propagated into $(shell ...) + ;; calls. Can be removed once we update to >4.3. + (setenv "CC" #$(cc-for-target)))) (replace 'check (lambda* (#:key tests? #:allow-other-keys) (when tests? - ;; (invoke "strace" "-f" "bin/podman" "version") (invoke "make" "localsystem") (invoke "make" "remotesystem")))) (add-after 'unpack 'fix-hardcoded-paths (lambda _ - (substitute* "vendor/github.com/containers/common/pkg/config/config.go" - (("@SLIRP4NETNS_DIR@") - (string-append #$slirp4netns "/bin")) - (("@PASST_DIR@") - (string-append #$passt "/bin")) - (("@NETAVARK_DIR@") - (string-append #$netavark "/bin"))) - (substitute* "hack/install_catatonit.sh" - (("CATATONIT_PATH=\"[^\"]+\"") - (string-append "CATATONIT_PATH=" (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"))) - (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"))))) + (string-append #$output "/bin"))))) + (add-after 'install 'symlink-helpers + (lambda _ + (mkdir-p (string-append #$output "/_guix")) + (for-each + (lambda (what) + (symlink (string-append (car what) "/bin/" (cdr what)) + (string-append #$output "/_guix/" (cdr what)))) + ;; Only tools that cannot be discovered via $PATH are + ;; symlinked. Rest is handled in the 'wrap-podman phase. + `((#$aardvark-dns . "aardvark-dns") + ;; Required for podman-machine, which is *not* supported out + ;; of the box. But it cannot be discovered via $PATH, so + ;; there is no other way for the user to install it. It + ;; costs ~10MB, so let's leave it here. + (#$gvisor-tap-vsock . "gvproxy") + (#$netavark . "netavark"))))) + (add-after 'install 'wrap-podman + (lambda _ + (wrap-program (string-append #$output "/bin/podman") + `("PATH" suffix + (,(string-append #$catatonit "/bin") + ,(string-append #$conmon "/bin") + ,(string-append #$crun "/bin") + ,(string-append #$gcc "/bin") ; cpp + ,(string-append #$iptables "/sbin") + ,(string-append #$passt "/bin") + ,(string-append #$procps "/bin") ; ps + "/run/setuid-programs"))))) + (add-after 'install 'remove-go-references + (lambda* (#:key inputs #:allow-other-keys) + (let ((go (assoc-ref inputs "go"))) + (for-each + (lambda (file) + (when (executable-file? file) + ((@@ (guix build go-build-system) remove-store-reference) + file go))) + (append (find-files (string-append #$output "/bin")) + (find-files (string-append #$output "/libexec")) + (find-files (string-append #$output "/lib"))))))) (add-after 'install 'install-completions (lambda _ (invoke "make" "install.completions" (string-append "PREFIX=" #$output))))))) (inputs - (list btrfs-progs - cni-plugins - conmon - crun + (list bash-minimal + btrfs-progs gpgme - go-github-com-go-md2man - iptables libassuan libseccomp - libselinux - passt - slirp4netns)) + libselinux)) (native-inputs - (list bats + (list (package/inherit grep + (inputs (list pcre2))) ; Drop once grep on master supports -P + bats git go-1.21 - ; strace ; XXX debug + go-github-com-go-md2man + mandoc pkg-config python)) (home-page "https://podman.io") @@ -536,8 +559,14 @@ (define-public podman volumes mounted into those containers, and pods made from groups of containers. -The @code{machine} subcommand is not supported due to gvproxy not being -packaged.") +Not all commands are working out of the box due to requiring additional +binaries to be present in the $PATH. + +To get @code{podman compose} working, install either @code{podman-compose} or +@code{docker-compose} packages. + +To get @code{podman machine} working, install @code{qemu-minimal}, and +@code{openssh} packages.") (license license:asl2.0))) (define-public podman-compose diff --git a/gnu/packages/patches/podman-program-lookup.patch b/gnu/packages/patches/podman-program-lookup.patch deleted file mode 100644 index 27a9421285..0000000000 --- a/gnu/packages/patches/podman-program-lookup.patch +++ /dev/null @@ -1,120 +0,0 @@ -From 914aed3e04f71453fbdc30f4287e13ca3ce63a36 Mon Sep 17 00:00:00 2001 -From: Tomas Volf <~@wolfsden.cz> -Date: Wed, 14 Feb 2024 20:02:03 +0100 -Subject: [PATCH] Modify search for binaries to fit Guix model - -Podman basically looked into the $PATH and into its libexec. That does not fit -Guix's model very well, to an additional option to specify additional -directories during compilation was added. - -* pkg/rootless/rootless_linux.go -(tryMappingTool): Also check /run/setuid-programs. -* vendor/github.com/containers/common/pkg/config/config.go -(extraGuixDir): New function. -(FindHelperBinary): Use it. -* vendor/github.com/containers/storage/pkg/unshare/unshare_linux.go -(guixLookupSetuidPath): New function. -(Start): Use it. ---- - pkg/rootless/rootless_linux.go | 3 +++ - .../containers/common/pkg/config/config.go | 23 +++++++++++++++++++ - .../storage/pkg/unshare/unshare_linux.go | 14 +++++++++-- - 3 files changed, 38 insertions(+), 2 deletions(-) - -diff --git a/pkg/rootless/rootless_linux.go b/pkg/rootless/rootless_linux.go -index d303c8b..0191d90 100644 ---- a/pkg/rootless/rootless_linux.go -+++ b/pkg/rootless/rootless_linux.go -@@ -102,6 +102,9 @@ func tryMappingTool(uid bool, pid int, hostID int, mappings []idtools.IDMap) err - idtype = "setgid" - } - path, err := exec.LookPath(tool) -+ if err != nil { -+ path, err = exec.LookPath("/run/setuid-programs/" + tool) -+ } - if err != nil { - return fmt.Errorf("command required for rootless mode with multiple IDs: %w", err) - } -diff --git a/vendor/github.com/containers/common/pkg/config/config.go b/vendor/github.com/containers/common/pkg/config/config.go -index 75b917f..ed2f131 100644 ---- a/vendor/github.com/containers/common/pkg/config/config.go -+++ b/vendor/github.com/containers/common/pkg/config/config.go -@@ -1102,6 +1102,24 @@ func findBindir() string { - return bindirCached - } - -+func extraGuixDir(bin_name string) string { -+ if (bin_name == "slirp4netns") { -+ return "@SLIRP4NETNS_DIR@"; -+ } else if (bin_name == "pasta") { -+ return "@PASST_DIR@"; -+ } else if (strings.HasPrefix(bin_name, "qemu-")) { -+ return "@QEMU_DIR@"; -+ } else if (bin_name == "gvproxy") { -+ return "@GVPROXY_DIR@"; -+ } else if (bin_name == "netavark") { -+ return "@NETAVARK_DIR@"; -+ } else if (bin_name == "aardvark-dns") { -+ return "@AARDVARK_DNS_DIR@"; -+ } else { -+ return ""; -+ } -+} -+ - // FindHelperBinary will search the given binary name in the configured directories. - // If searchPATH is set to true it will also search in $PATH. - func (c *Config) FindHelperBinary(name string, searchPATH bool) (string, error) { -@@ -1109,6 +1127,11 @@ func (c *Config) FindHelperBinary(name string, searchPATH bool) (string, error) - bindirPath := "" - bindirSearched := false - -+ if dir := extraGuixDir(name); dir != "" { -+ /* If there is a Guix dir, skip the PATH search. */ -+ dirList = append([]string{dir}, dirList...) -+ } -+ - // If set, search this directory first. This is used in testing. - if dir, found := os.LookupEnv("CONTAINERS_HELPER_BINARY_DIR"); found { - dirList = append([]string{dir}, dirList...) -diff --git a/vendor/github.com/containers/storage/pkg/unshare/unshare_linux.go b/vendor/github.com/containers/storage/pkg/unshare/unshare_linux.go -index a8dc1ba..0b0d755 100644 ---- a/vendor/github.com/containers/storage/pkg/unshare/unshare_linux.go -+++ b/vendor/github.com/containers/storage/pkg/unshare/unshare_linux.go -@@ -26,6 +26,16 @@ import ( - "github.com/syndtr/gocapability/capability" - ) - -+func guixLookupSetuidPath(prog string) (string, error) { -+ path, err := exec.LookPath(prog) -+ if err != nil { -+ path, err = exec.LookPath("/run/setuid-programs/" + prog) -+ } -+ return path, err -+} -+ -+ -+ - // Cmd wraps an exec.Cmd created by the reexec package in unshare(), and - // handles setting ID maps and other related settings by triggering - // initialization code in the child. -@@ -237,7 +247,7 @@ func (c *Cmd) Start() error { - gidmapSet := false - // Set the GID map. - if c.UseNewgidmap { -- path, err := exec.LookPath("newgidmap") -+ path, err := guixLookupSetuidPath("newgidmap") - if err != nil { - return fmt.Errorf("finding newgidmap: %w", err) - } -@@ -297,7 +307,7 @@ func (c *Cmd) Start() error { - uidmapSet := false - // Set the UID map. - if c.UseNewuidmap { -- path, err := exec.LookPath("newuidmap") -+ path, err := guixLookupSetuidPath("newuidmap") - if err != nil { - return fmt.Errorf("finding newuidmap: %w", err) - } --- -2.41.0 - -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Mar 31 14:35:56 2024 Received: (at 70112) by debbugs.gnu.org; 31 Mar 2024 18:35:56 +0000 Received: from localhost ([127.0.0.1]:48444 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rr028-0001z2-4f for submit@debbugs.gnu.org; Sun, 31 Mar 2024 14:35:56 -0400 Received: from wolfsden.cz ([37.205.8.62]:52022) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1rr01i-0001x3-B2 for 70112@debbugs.gnu.org; Sun, 31 Mar 2024 14:35:30 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 113432A0B1E; Sun, 31 Mar 2024 18:35:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1711910127; bh=ba4BtJdnhGFJdUMaGqk4GWEzEYsOHuUfbGR+CnVBojw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=EA89OLBUS+nr4h1VqcGcJYEQf/gaJvZHODTCf+3tc68Ei6PIMxtTWj9yE11xP5W5M +8EQvWw2bxTDeyC2qRZdWo228Y+gEq+m2rDN65QGmJh6RrbfH1Sst8brkPNJGpxC+P u9zNqvqwJfpmw6JMMPvtFG9z8YkROR2jqr3OmzoDMg8FRnNSFxfvtoSHYWj8Lnke54 XwU6XqyxQPn3GuZPY/h6atzZWdcVDnwU3mtD9ViALKNr87iiJUn7JyWuvvEgVBYBwK 1mGP0qAszuvSEDPaIweqbqF2f7dYQaLF35CrWmDXw9S0JCsclovJjADzXqYgWIIVlM 2qCTDHfJHScHXuMMuv5CXAel2/dqMDVh9JtwFpSoe5iieqHqOyE2lezaUp07r7Ge2j 4U/HpT7UWXVgfMQ8JAsozW8yUHktsfAKVP+YBGiUqpahIR1jM6nYUJ1SLv7X5twyyu dUutmfMp9fCWGu7kplrQsST/JSZESHEHhTU/s8hL6E5QDb6opcQ6uD407tmpSlvsN+ PT0MM5cMC95MZHbq04mv7SUAC6ki6modWeBzaNRwIYrR5+T/4YHq5594sWq2yyi6l7 43G51Sds5RbZlHT7AmFx5Gf5ABKBsk8cMrSTgkVFadN/WIKacWPX7uD7g1kk9hEpTj QlvWB/12/UjIuGjLt3SFwOqc= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-1.2 required=5.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from localhost (unknown [193.32.127.158]) by wolfsden.cz (Postfix) with ESMTPSA id 76EBF2A1082; Sun, 31 Mar 2024 18:35:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1711910126; bh=ba4BtJdnhGFJdUMaGqk4GWEzEYsOHuUfbGR+CnVBojw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=EwLC5Ny1dmhDoSHOrDmApq39PKT5D3GJLH3+q75jiwOnDZqhTeTuvXCsU3Sm20Ogo w5E45/bMglZUFURmqKwDcBhscxCp6HVBJCfx9EIuMZndYYCTKZf7AUw9YdQSolD7r7 OSSawmSX52O+cubX8pZOCBPvej6pe3TbRpSLahiF3us4mYVdXpld2Gnhzn18kTJFtl 4gAo7cFd/+iS+ns6w4ZBJ6UI0EK3TBhPSMxRkTLcQTP/+yHM9WhXZi4BtU9XwAMkdS Fugnm1GoFa/o4JHhvR2AhhEmhf8BfpuajZ7N2xED29NtXDwZc1FpViF2aodavyYIvr 9mr6siTT+lC1Rez7nS/+R5nqH/zvMTw2YhrlxDHPONiK+JWhaaWgrMFhSgt1xObhuh YacUMtlp/3qb4qNaruPZboyjBt+bmoNrVa5duKwgfFEtV4ghi1JMBjz5PVb/mbS6bf hrNAo1M3G52dtH4AuD/Bkmo5krzyz9MqA/jwn+cj/2jCE+QPmkc6s202dIUB/nsOGD omn1QN5D4WBhKt+KvzdtLLeYBqHGes2GVWYW/ZKhYBJzr941ZUSgKpBAbKFIbSviHa +ly4QyeeefdzJylqWG5wbmMPkGCSS8WBPMx5OZPQmIxRmkj/mtE7Q/fZHKPeCpQQdq VNj3G9G4dufCelE+o4mena/c= From: Tomas Volf <~@wolfsden.cz> To: 70112@debbugs.gnu.org Subject: [PATCH 11/11] gnu: buildah: Switch to gnu-build-system. Date: Sun, 31 Mar 2024 20:35:08 +0200 Message-ID: <31a1cbe8a908ae2892ea88606ee877be0915aeae.1711909824.git.~@wolfsden.cz> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 70112 Cc: Tomas Volf <~@wolfsden.cz> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Buildah is fundamentally similar to podman and provides its own Makefile. This commit switches from go-build-system to gnu-build-system so that the build can be done using `make' instead of reinvention some parts (like documentation) in the guile. The package pretty much follows how podman package looks like. * gnu/packages/containers.scm (buildah)[source]: Reformat. [build-system]: Use gnu-build-system. [arguments]<#:import-path, #:unpack-path, #:go, #:install-source?>: Delete. <#:make-flags>: Set make flags. <#:test-target>: Set, even though the tests are disabled. <#:imported-modules>: Also import (guix build go-build-system) for the remove-go-references phase. <#:phases>{'prepare-install-docs, 'build-docs, 'install-docs}: Delete. {'configure}: Delete. {'set-env, 'check, 'symlink-helpers, 'wrap-buildah, 'remove-go-references} {'install-completions}: New phases. [inputs]: Remove no longer used cni-plugins, conmon, runc. Add bash-minimal. [native-inputs]: Remove gnu-make, add go-1.21 and bats. Change-Id: I0ddd5febb0116a71a857e2a98a9951dbe8bd40d9 --- gnu/packages/containers.scm | 99 +++++++++++++++++++++++-------------- 1 file changed, 62 insertions(+), 37 deletions(-) diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm index 48b276e250..2e68d08c94 100644 --- a/gnu/packages/containers.scm +++ b/gnu/packages/containers.scm @@ -611,50 +611,75 @@ (define-public buildah (base32 "07hr2cfp4kblnmva02ap97id5nzhbqigdfvx7c8nyrkfzw0340n0")) (file-name (git-file-name name version)))) - (build-system go-build-system) + (build-system gnu-build-system) (arguments - (list #:import-path "github.com/containers/buildah/cmd/buildah" - #:unpack-path "github.com/containers/buildah" - - ;; Some dependencies require go-1.18 to build. - #:go go-1.18 - - #:tests? #f - #:install-source? #f - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'prepare-install-docs - (lambda* (#:key unpack-path #:allow-other-keys) - (substitute* (string-append "src/" - unpack-path - "/docs/Makefile") - (("../tests/tools/build/go-md2man") - (which "go-md2man"))) - (substitute* (string-append "src/" - unpack-path - "/docs/Makefile") - (("/usr/local") (string-append #$output))))) - (add-after 'build 'build-docs - (lambda* (#:key unpack-path #:allow-other-keys) - (let ((doc (string-append "src/" unpack-path "/docs"))) - (invoke "make" "-C" doc)))) - (add-after 'install 'install-docs - (lambda* (#:key unpack-path #:allow-other-keys) - (let ((doc (string-append "src/" unpack-path "/docs"))) - (invoke "make" "-C" doc "install"))))))) - (inputs (list btrfs-progs - cni-plugins - conmon + (list + #:make-flags + #~(list (string-append "CC=" #$(cc-for-target)) + (string-append "PREFIX=" #$output) + (string-append "GOMD2MAN=" + #$go-github-com-go-md2man "/bin/go-md2man")) + #:tests? #f ; /sys/fs/cgroup not set up in guix sandbox + #:test-target "test-unit" + #:imported-modules + (source-module-closure `(,@%gnu-build-system-modules + (guix build go-build-system))) + #:phases + #~(modify-phases %standard-phases + (delete 'configure) + (add-after 'unpack 'set-env + (lambda _ + ;; When running go, things fail because HOME=/homeless-shelter. + (setenv "HOME" "/tmp") + ;; Required for detecting btrfs in hack/btrfs* due to bug in GNU + ;; Make <4.4 causing CC not to be propagated into $(shell ...) + ;; calls. Can be removed once we update to >4.3. + (setenv "CC" #$(cc-for-target)))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "make" "test-unit") + (invoke "make" "test-conformance") + (invoke "make" "test-integration")))) + (add-after 'install 'symlink-helpers + (lambda _ + (mkdir-p (string-append #$output "/_guix")) + (for-each + (lambda (what) + (symlink (string-append (car what) "/bin/" (cdr what)) + (string-append #$output "/_guix/" (cdr what)))) + ;; Only tools that cannot be discovered via $PATH are + ;; symlinked. Rest is handled in the 'wrap-buildah phase. + `((#$aardvark-dns . "aardvark-dns") + (#$netavark . "netavark"))))) + (add-after 'install 'wrap-buildah + (lambda _ + (wrap-program (string-append #$output "/bin/buildah") + `("CONTAINERS_HELPER_BINARY_DIR" = + (,(string-append #$output "/_guix"))) + `("PATH" suffix + (,(string-append #$crun "/bin") + ,(string-append #$gcc "/bin") ; cpp + ,(string-append #$passt "/bin") + "/run/setuid-programs"))))) + (add-after 'install 'remove-go-references + (@@ (guix build go-build-system) remove-go-references)) + (add-after 'install 'install-completions + (lambda _ + (invoke "make" "install.completions" + (string-append "PREFIX=" #$output))))))) + (inputs (list bash-minimal + btrfs-progs eudev glib gpgme libassuan libseccomp - lvm2 - runc)) + lvm2)) (native-inputs - (list go-github-com-go-md2man - gnu-make + (list bats + go-1.21 + go-github-com-go-md2man pkg-config)) (synopsis "Build @acronym{OCI, Open Container Initiative} images") (description -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Apr 05 17:38:25 2024 Received: (at 70112) by debbugs.gnu.org; 5 Apr 2024 21:38:25 +0000 Received: from localhost ([127.0.0.1]:37668 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rsrGL-0002GQ-3z for submit@debbugs.gnu.org; Fri, 05 Apr 2024 17:38:25 -0400 Received: from wolfsden.cz ([37.205.8.62]:50016) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1rsrGF-0002GE-77 for 70112@debbugs.gnu.org; Fri, 05 Apr 2024 17:38:15 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 9F4702A8202; Fri, 5 Apr 2024 21:38:03 +0000 (UTC) Authentication-Results: wolfsden.cz; dkim=pass (1024-bit key; unprotected) header.d=agfa.com header.i=@agfa.com header.a=rsa-sha256 header.s=selector1 header.b=RbSrXiSE X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=0.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_MSPIKE_H2, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from localhost (unknown [81.17.16.72]) by wolfsden.cz (Postfix) with ESMTPSA id 9D11D2A683B for <70112@debbugs.gnu.org>; Fri, 5 Apr 2024 21:38:02 +0000 (UTC) Resent-From: Tomas Volf <~@wolfsden.cz> Resent-Date: Fri, 5 Apr 2024 23:38:01 +0200 Resent-Message-ID: Resent-To: 70112@debbugs.gnu.org Delivered-To: ~@wolfsden.cz Received: from wolfsden.cz by wolfsden.cz with LMTP id Z/C6FwFqDmY8GQAA2oAhgg (envelope-from ) for <~@wolfsden.cz>; Thu, 04 Apr 2024 08:51:13 +0000 Received: by wolfsden.cz (Postfix, from userid 104) id 4FF622A42A9; Thu, 4 Apr 2024 08:51:13 +0000 (UTC) Received-SPF: pass (agfa.com: Sender is authorized to use 'wilke.schwiedop@agfa.com' in 'mfrom' identity (mechanism 'include:spf.protection.outlook.com' matched)) receiver=wolfsden; identity=mailfrom; envelope-from="wilke.schwiedop@agfa.com"; helo=EUR03-DBA-obe.outbound.protection.outlook.com; client-ip=40.107.104.97 Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03on2097.outbound.protection.outlook.com [40.107.104.97]) by wolfsden.cz (Postfix) with ESMTPS id 6BFC32A595D for <~@wolfsden.cz>; Thu, 4 Apr 2024 08:51:10 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KRFwLqmCECJIDq4yCbIgcp6zyc0Lh2/dn8775M35Iww/Nmxx+rtmZXwQ+y5SUZhvlc9Ez/9tcUEkGyPW0+0Z22+eD7ZCPi1ozRxAXea5b5johSSIMrUd2d+fI3DRBriHr33ytKOsPkb2W+68IGR+Yc3CbJ639nBwtlv+s/MH1mU+CCU64mWGM8Nx89kwfa/zL8auZJk9J/gNWM1CP3fSrpnKEqm1uOCT4pcYPYockLQozHK4YDLTSrAlS9VJZG1VNv2EV6R+Wji6ex8DcUxyykebwA86P1xLKiLBWlwgFY/v3D0fpZJajnwiVck8Q1h/2n2D97wSNR0mp35byTdpvQ== 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=Z0d1GkQEADqKEjmfT+bKURUrlE8hFGjAOvSRvPk/U5A=; b=bD0TY/0syvUHMJT1rPJgDnGdDFsaqzGhLXU8IAbYcVpYu0JIWDkyWAl9uWnmT9cqt9PiZqBVOJ1XYcTYmQBBUdBAoVs/qI7WrbkPXgbB+nQB9TXECb0tCohcGN4HnDEKf6TL4qbGVnsgjtcZj/Dj9sxugMRjt/Eh652hG+TX5rno2pn13oaaD32xPAJ+bcKWN8I3MDecd3+xxVZPwz11Keo7azsDmJw9fg7Qi4nt0ZYKLkN3dJNOGj98JUTJ9WbSqinscXOAQsgW2fMHSPOAaT6cn3icYoL8fLvUEQSyqLsJ6pAyec10xIQkNiteaRwaR4UedCrP9CEEYEmHh7DrrQ== 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=Z0d1GkQEADqKEjmfT+bKURUrlE8hFGjAOvSRvPk/U5A=; b=RbSrXiSEK8PEte72ipW9aZdAznMx1UdKsOwxS80Ps1k0qRPmuj96z8wJ0FCgJCIbyk+8BKo0DlKM7QFdcEpO5P55Vx+Zw7A/MN0B0HT1fjbN8PwiyWSC6OTOtKuzuzwtT3F1wYjIvjQAifwInfbY8tt9dU87OdcEd6kcT0npycw= Received: from DB9P190MB1985.EURP190.PROD.OUTLOOK.COM (2603:10a6:10:398::19) by DU0P190MB1881.EURP190.PROD.OUTLOOK.COM (2603:10a6:10:3a7::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.46; Thu, 4 Apr 2024 08:51:08 +0000 Received: from DB9P190MB1985.EURP190.PROD.OUTLOOK.COM ([fe80::f017:15d3:299:6511]) by DB9P190MB1985.EURP190.PROD.OUTLOOK.COM ([fe80::f017:15d3:299:6511%5]) with mapi id 15.20.7409.042; Thu, 4 Apr 2024 08:51:08 +0000 From: Wilke Schwiedop To: Tomas Volf <~@wolfsden.cz> Subject: RE: #66887: guix-podman missing catatonit binary Thread-Topic: #66887: guix-podman missing catatonit binary Thread-Index: Adp9GkEboy9zVvDHRL2pwyOwoZpORwAa3paAAEC+ixAADVTVAAACaBygATTHvIAAKrboYAAA+z8AAIjiiwA= Date: Thu, 4 Apr 2024 08:51:08 +0000 Message-ID: References: In-Reply-To: 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_|DU0P190MB1881:EE_ x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: JMoGUW7Y6f5T5toNzRT4+440UxsrbUSkKvW/crLu8pGQPyCeYKDxjkRrk9OcTncDaMXJauqAYptBfA7UDsOEBgU9J7Dr+yT9opRkZeVSyslxpG+TDV1i0iWxnymiHYCCI3nhgBcbsfJIfANUtPGK1IgzCzzX4oJQfOzO3x0fq6bAVJ0b0nihx1Og9m/67ajBy4UHvZTRc4t2dgxS70KyI2lVBptsXFa2U9qEc0rOrIFzQRDxNZpYZWgJTF0CfGUcqRvTq7Idnzk7ou9zaB+dVNzxxpuhRAxwwV+WQOwW8Qa9GK+tmJ094CkigYjqPet/9D1lKonyCw9SvNYjOwxd96bIuwKgm2XO/YL6VESIj3wkox15MRRwa8Mgmk/pB7So9/0QtdN/UKQtBJuUSE6xk8pSzGh/8L8AMrTOFvILiEefC11Zz1j8yIJa4xmHbGhEtZyJh5B90i35zmRKMRk5Hnbb5pNqh/rmxp4Lr5RgQjpnx+XEXVT4GvjpK/LHpaXoQ9WnvV+KKcAgYRpsNNIEKWLUHFQLZInGlOPulS+nYzbi6n/8BzqWw65o/K98hrOBpnfrLCbom/6ysZHBSUpsF8eNSkk8rlJiDLqB+Rjq0FwRGn9vq9gCNMTnW28sdUGU/CeKZ8xwULdOUG0r+vAVCJRGpINvXH2I32L01RLc9ZI= 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)(366007)(376005)(1800799015); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?B?UENmTWdTMktMM0szY2xpSFZ0ZTcwTzFwQXg2Q1cvZk5DSERPVzY1amUzcXpG?= =?utf-8?B?ZlFzOEpwT203WW1id1lZb09RRGhlb2Q5VEJ0TnIybVVVWll3NmdiWFpFLzNk?= =?utf-8?B?SkpzZU9ndldxUURNZDl2OTJPNjhJTzdBdm1WRVNDM05QZWluY0dmZ0VCM0xy?= =?utf-8?B?TGF5Y1l2a2p0QUtQclpmYWdNNng2YmFrbWdnWkpqclozcmpXamhxMHlGUzNG?= =?utf-8?B?cThHbUV5dWN0TGsvazdEUStlQmhOdEJCUWlCK0ZXOHl5WEIycWI2WXN6aG1j?= =?utf-8?B?ekxCSmVqa2lTTTRia3VDaGFhOWY2TDV0VVVhRzhsSm5FdDY3ME85bDkxS3Iz?= =?utf-8?B?dHM2aS9WWElveTNtaXFYSjVncEU4VVBxTUtSYmo5d2ZKS0hwVW1vNU4xVWhn?= =?utf-8?B?QTZHY3RNY2poTjJtWmlHaUlNQWh3ZlJ2RmxBcVpveitlb0JQeXlucHVwWjh6?= =?utf-8?B?amJBdkd4TmtyMEpUTHRDb00yUGpqLzYvMjBYaHoxN0VoMjlPdzRyZlMweW1G?= =?utf-8?B?R29PdUw1WVVLMnpwYkxiSVlrb2JNaVF5bDI0VnZKN09rY2lPTGhGRjM0M3dC?= =?utf-8?B?Vm1SQ0xjaUNCeDFmNitFMUQ2bVY5c0RjRHY0eW5NWEZRb0p4bGtDN2ZMaUFh?= =?utf-8?B?bFpCZ05IMWtXdlBFVWs0VTBDc3FpYzlCSGpaa2ZBKzdPY1VMSjlvUFRMSVVL?= =?utf-8?B?RjgvVXl4SG5BWHF6QmVLZU8xZGpvc0dDWC9GTmtOM1BWVWhqR0lQOTdVdDB5?= =?utf-8?B?M2lUbDhjNlNvdkRQdzFzNEp6YXdoMjVlN2hLUmViRTJZbTVGMmpOUW1rb3VY?= =?utf-8?B?NHVad1ViMFFSNkZ4L3IvRGdLU0xRVldDOHpJWjhOenYzZmZoNXNqVXBkMllO?= =?utf-8?B?Y3NmZndqRDB3UE1hREoxam91WmJJc3ZWTmJhcmdIRkdpSFJtZDczaG1oOFNS?= =?utf-8?B?Z1FEdElHSXNLZFppZ1c3N0Vmb05YbGJyRmRjVTRHOWUyR2t4OVRSZytHWHdi?= =?utf-8?B?TVd5cXV3d2RZQ1dMVmtxc0tzQmF4RHB0TGVxa1c4R1M0TG1Iamh5VDNxZjlQ?= =?utf-8?B?aFRVbnlnTGpKVWlVWDRXVVF1Zm10cGdFZFJHQXVJQmJubFc3cDdqWXZaanNZ?= =?utf-8?B?M1R0R0V2c1hpNDJBV2laT3BmTThFNUI4THdYRS9pQVhYbWI1dlNiaDhZNDJD?= =?utf-8?B?a1BlMm82citHLzMxN2l3SFltcjZ2ekVqTmt1TVgwemQ4N1Q0YnVvbHcrUDda?= =?utf-8?B?ZG1BVHRGQjV4dWJmSjBINE16L0k1Rzh3VnNIZ2NyQTBkT2Q5cmN0M24xYnc5?= =?utf-8?B?dG5kTEUwcWJnaG5uNmFrdTNDeEo2VlppaDQ5U0U2TnhDdjlpd0dORXhhcUFm?= =?utf-8?B?bE51QndBRnRJZm01bFA0cGVWTURudUFXSllBSGVLdHJ4NVNnaHJrVlR2UWhv?= =?utf-8?B?RUlucS9OeGN2aXRSZlZqVm0rY1VQZnIzekJ4M3dsQzcxUGt5UE1TZGhjc014?= =?utf-8?B?Z2NqUkdYS2U2VDNxK294OE5hY0pVUFNLRDh5N2NCLyt4b25JQzY4T1JhNWtR?= =?utf-8?B?RnhiWWJoczVNK1Z5eko3enpsMzNHS0cyNkZZd01IbzRVaXdJVVc0a21YUFpk?= =?utf-8?B?dmtYTmRmQ1M4VEJtUzJyZklOcXBTemorUEV5NWh5TzNuNEZ3WjFLVlI4czNC?= =?utf-8?B?Q0YzeVA2aUFJbEhQU0pseEg2ck9zbWhLSGxCeDN0WkRzaTFNZDhWS0FhbXlx?= =?utf-8?B?eGIwQ25NSGpndGE5b25tSTRhUnYzNDRxU2NjOUVyMlpQVkhkNDRrNkVZYnp3?= =?utf-8?B?YWJScTJBcVNtaFZiQi9YWVU0UDRyRjdLS1FXV29QNTAwS3p2RjFST2wvUUhI?= =?utf-8?B?VnZBUXhBc1dJL2NiaSs3cGIzalpJc0F4YThOQW1DL3lsRlMvSTQ0bkNFdVcr?= =?utf-8?B?eTU2UGFWZktwSDVVYmJZS0ZRRFVxV0IzM1RLZzhCeTBaejlmelB0QUUxR3JZ?= =?utf-8?B?dVlVMHJ2a2lyUVovdjJTZk8xT2ZyRU9aTGxKdVFvbHllL2cxMk9FRytGVkpi?= =?utf-8?B?NEJwNUV0OGIzVW1DQ0NweEFwY3VxNlV3ait1Wlh2eW1ib1hKNWg4SHVMMk04?= =?utf-8?Q?TP84wCRIwl5cJY3IRJqPyhNrc?= Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 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: 602778ef-752b-4172-a939-08dc54845eda X-MS-Exchange-CrossTenant-originalarrivaltime: 04 Apr 2024 08:51:08.3029 (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: DDSHh4Vlq/6CCyOsPAPOH9cDyGpx0RbyyeUK1NU6ukBhRl59pAU6iDlynufneQ5tW+nR2mp2okqA0XDZgfFvjkofcwlsEkfG5eton1oDYzw= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0P190MB1881 X-TUID: dAypKlMjYjlx X-Spam-Score: 0.2 (/) X-Debbugs-Envelope-To: 70112 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.8 (/) SGVsbG8gVG9tYXMsDQoNCmFic29sdXRlbHkgbm8gaXNzdWVzIHRvIHJlcG9ydC4gV29ya3MgbGlr ZSBhIGNoYXJtLiDwn5iKDQoNCldpbGtlDQoNCi0tLS0tT3JpZ2luYWwgTWVzc2FnZS0tLS0tDQpG cm9tOiBUb21hcyBWb2xmIDx+QHdvbGZzZGVuLmN6PiANClNlbnQ6IE1vbnRhZywgMS4gQXByaWwg MjAyNCAxNzozMQ0KVG86IFdpbGtlIFNjaHdpZWRvcCA8d2lsa2Uuc2Nod2llZG9wQGFnZmEuY29t Pg0KU3ViamVjdDogUmU6ICM2Njg4NzogZ3VpeC1wb2RtYW4gbWlzc2luZyBjYXRhdG9uaXQgYmlu YXJ5DQoNCk9uIDIwMjQtMDQtMDEgMTU6MjA6MjggKzAwMDAsIFdpbGtlIFNjaHdpZWRvcCB3cm90 ZToNCj4gSGkgVG9tYXMsDQo+DQo+IEkganVzdCByZWFkIHRoZSBwYXRjaCBzZXJpZXMuIFRoYXQg c29sdXRpb24gdG8gcG9kbWFuJ3MgYmluYXJ5LWxvb2t1cCANCj4gbG9va3MgdmVyeSBjbGVhbi4g 8J+Yig0KPiBJJ3ZlIHJ1biBwb2RtYW4tNSB3aXRoIGEgc2xpZ2h0bHkgbW9yZSBhZHZhbmNlZCBk ZXBsb3ltZW50IChhIHBhcGVybGVzcy1uZ3ggaW5zdGFuY2U6IHBwbC1uZ3gsIHJlZGlzLCBwYXVz ZS1jb250YWluZXIpIHdoaWNoIHdvcmtlZCB3aXRob3V0IGFueSBwcm9ibGVtcy4NCg0KSGFwcHkg dG8gaGVhciB0aGF0Lg0KDQo+IFR1ZSBvciBXZWQgSSdsbCB0ZXN0IHRoZSBzZXR1cCB3ZSdyZSBy dW5uaW5nIGF0IHdvcmssIHdoaWNoIGluY2x1ZGVzIGFsbCBzdGVwcyBmcm9tIGJ1aWxkaW5nIHRv IHB1c2hpbmcgdG8gcnVubmluZyBhIGRlcGxveW1lbnQgb2YgOCAob3IgOT8pIGRpZmZlcmVudCBj b250YWluZXJzLg0KPiBJJ2xsIHJlcG9ydCBiYWNrIHRvIHlvdS4NCg0KTG9va2luZyBmb3J3YXJk IHRvIGl0Lg0KDQo+DQo+IEEgcXVlc3Rpb24gdGhvdWdoOiBwb2RtYW4gdXNlcyBpcHRhYmxlcywg d2hpY2ggcmVxdWlyZXMgdGhlIGtlcm5lbCBtb2R1bGUgaXBfdGFibGVzIHRvIGJlIGxvYWRlZC4g RG8geW91IGhhcHBlbiB0byBrbm93IGlmIHRoZXJlIGlzIGEgd2F5IHRvIHNwZWNpZnkgdGhlIG1v ZHVsZSBhcyBhIGRlcGVuZGVuY3k/DQo+IExpa2UgImlmIGlwdGFibGVzIGlzIGluIHByb2ZpbGU6 IG1vZHByb2JlIGlwX3RhYmxlcyI/DQoNClNhZGx5IEkgZG8gbm90IGtub3cgb2YgYSB3YXkgdG8g c3BlY2lmeSBkZXBlbmRlbmN5IGxpa2UgdGhhdC4gIEl0IGlzIGZ1cnRoZXIgY29tcGxpY2F0ZWQg YnkgdGhlIGZhY3QgdGhhdCB0aGUgdXNlciBpbnN0YWxsaW5nIHRoZSBwb2RtYW4gcGFja2FnZSBt aWdodCBub3QgZXZlbiBoYXZlIHBlcm1pc3Npb25zIHRvIGxvYWQgdGhlIG1vZHVsZS4NCg0KVGhp cyBhY3R1YWxseSBjYXVzZWQgbWUgc29tZSBwcm9ibGVtcyBhbmQgSSBoYWQgdG8gbG9hZCB0aGUg aXBfdGFibGVzIG1hbnVhbGx5IChJIG5vcm1hbGx5IGhhdmUganVzdCBuZl90YWJsZXMgbG9hZGVk KSB1c2luZyBzdWRvIHdoZW4gSSB3YXMgdHJ5aW5nIHRvIHRlc3QgaXQuDQoNCkkgYW0gbm90IHN1 cmUgd2hhdCB0aGUgc29sdXRpb24gc2hvdWxkIGJlIGhlcmUuLi4NCg0KVG9tYXMNCg0KLS0NClRo ZXJlIGFyZSBvbmx5IHR3byBoYXJkIHRoaW5ncyBpbiBDb21wdXRlciBTY2llbmNlOg0KY2FjaGUg aW52YWxpZGF0aW9uLCBuYW1pbmcgdGhpbmdzIGFuZCBvZmYtYnktb25lIGVycm9ycy4NCg== From debbugs-submit-bounces@debbugs.gnu.org Thu May 09 18:24:04 2024 Received: (at 70112) by debbugs.gnu.org; 9 May 2024 22:24:04 +0000 Received: from localhost ([127.0.0.1]:40924 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s5CBI-00027N-8i for submit@debbugs.gnu.org; Thu, 09 May 2024 18:24:04 -0400 Received: from wolfsden.cz ([37.205.8.62]:45226) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1s5CBF-00026l-HN for 70112@debbugs.gnu.org; Thu, 09 May 2024 18:24:03 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 8ABC3287B21; Thu, 9 May 2024 22:24:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1715293442; bh=FLXS2CYj3MRHnkCdEAjDZ1ii+Jzb8uYszgiM8r58CWQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=sff08J7oeyDcEX2E1qZb7TbvkaC5zsHrE3y2ABEfAhcC6thzYllX8tTewv0CTAz4x nW/zUGXeCMQE3Lb89r/FEgLBVPDcGSNywItcKgLMfH8zs7jDBwXrFTIVY/l0fISFqd OrflqXxmAmyDV4sEsAaZF/qSLvU9dDFZp8teA+9OP3OG6WoSkgSXKuELofYv087dm3 qHr0W7Rl7lFMO4BGfH0aJySluG+l/UPGcy9OnBIfMD2xXgjW9rQUzJeQOZkEi+mw7d wEE3b5Bks6gGJVgurtydL+9VYFFOiXDwPIZZk+XjDVvh34/944jctw8jjHKGU7hFxh lu32pQjIoz5sThy2KV8ov62x/quoYJ4OQYUCc2b16UtMt+W6fZXFwhyg5orQt9e6I8 q+m9AfMAkSM1FzVkYwb2fmA0QdwJaIDNUP4L5VzsfPiXmmQqzJWfpj/KAYRLU+F24G LlJGh8aq+GvN2lxla6QgsRUq1iFZQzefb636nmOYbcolyTk8zqs0GN0ue60coU9XGO nHRbSGsWjW0r51PfcSzJvmpGXXsSktM+JUjnM1To63reAOeq5Y7Jz5S9jhmWMfExTw YSmVp8RTcIwKzfJw+43YzrfKNLInJYeqJeK9Lz6DYQrWDk0LKyQjuI2+PFxCYkFPnc I3ROCSgKxjGZpBdFPQEr83nc= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-1.2 required=5.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from localhost (unknown [146.70.134.143]) by wolfsden.cz (Postfix) with ESMTPSA id 1E74A28465D; Thu, 9 May 2024 22:24:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1715293442; bh=FLXS2CYj3MRHnkCdEAjDZ1ii+Jzb8uYszgiM8r58CWQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=sff08J7oeyDcEX2E1qZb7TbvkaC5zsHrE3y2ABEfAhcC6thzYllX8tTewv0CTAz4x nW/zUGXeCMQE3Lb89r/FEgLBVPDcGSNywItcKgLMfH8zs7jDBwXrFTIVY/l0fISFqd OrflqXxmAmyDV4sEsAaZF/qSLvU9dDFZp8teA+9OP3OG6WoSkgSXKuELofYv087dm3 qHr0W7Rl7lFMO4BGfH0aJySluG+l/UPGcy9OnBIfMD2xXgjW9rQUzJeQOZkEi+mw7d wEE3b5Bks6gGJVgurtydL+9VYFFOiXDwPIZZk+XjDVvh34/944jctw8jjHKGU7hFxh lu32pQjIoz5sThy2KV8ov62x/quoYJ4OQYUCc2b16UtMt+W6fZXFwhyg5orQt9e6I8 q+m9AfMAkSM1FzVkYwb2fmA0QdwJaIDNUP4L5VzsfPiXmmQqzJWfpj/KAYRLU+F24G LlJGh8aq+GvN2lxla6QgsRUq1iFZQzefb636nmOYbcolyTk8zqs0GN0ue60coU9XGO nHRbSGsWjW0r51PfcSzJvmpGXXsSktM+JUjnM1To63reAOeq5Y7Jz5S9jhmWMfExTw YSmVp8RTcIwKzfJw+43YzrfKNLInJYeqJeK9Lz6DYQrWDk0LKyQjuI2+PFxCYkFPnc I3ROCSgKxjGZpBdFPQEr83nc= From: Tomas Volf <~@wolfsden.cz> To: 70112@debbugs.gnu.org Subject: [PATCH v2 03/11] gnu: podman: Update to 5.0.2. Date: Fri, 10 May 2024 00:23:06 +0200 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: <4554ead7e7440610c700ba6d5403489f95cfdf80.1715293394.git.~@wolfsden.cz> References: <4554ead7e7440610c700ba6d5403489f95cfdf80.1715293394.git.~@wolfsden.cz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 70112 Cc: Tomas Volf <~@wolfsden.cz> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/containers.scm (podman): Update to 5.0.2. Change-Id: Id12c017e68f30db4ea99547beca54dbd01e3b029 --- v2: Update to 5.0.2. 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 f5328e4803..44317acbea 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.2") (source (origin (method git-fetch) @@ -428,7 +429,7 @@ (define-public podman (search-patches "podman-program-lookup.patch")) (sha256 - (base32 "17g7n09ndxhpjr39s9qwxdcv08wavjj0g5nmnrvrkz2wgdqigl1x")) + (base32 "0x8npz0i3dyiaw30vdlb5n8kiaflgjqnrdbdk0yn5zgf5k1jlb7i")) (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")))) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu May 09 18:24:05 2024 Received: (at 70112) by debbugs.gnu.org; 9 May 2024 22:24:05 +0000 Received: from localhost ([127.0.0.1]:40929 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s5CBI-00027V-KU for submit@debbugs.gnu.org; Thu, 09 May 2024 18:24:04 -0400 Received: from wolfsden.cz ([37.205.8.62]:45216) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1s5CBF-00026k-DM for 70112@debbugs.gnu.org; Thu, 09 May 2024 18:24:03 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 8DEBC28838E; Thu, 9 May 2024 22:24:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1715293441; bh=f0FkpFEIlOWe8VEvnZ3UwICecRnP7skmI2HQVnJFHoY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=fAwbn2GXDojzY8K3siF1B+wsTv8mE7UmiUB+N5VTrmryiCFH1w0Pb8wQz8eVyuCeK nRF12wasNlYPO3y+Pjhn4vGmhMv53IJap1gRDEDxlakP9vgCONxMPVYeInHQjMU9rR JDdoxXEIpBi5xBQKZJH5rE4AUg80LEKUj96PQmVJ5dyydSVjSLSELFMe2qX25Gu0sB 4gRKRB7nQmLI8UTSffpCzn2ybPpA7RxQfpfE8WQ/891PqCgFk48pPUEcd27oayBtFW tXv5luLwhCf+AQoad9K/sRW6lEIdYkMJKufsfgp3NCykNa1vHzxas3KFd72zdWDora OkmIDDMr2b6TDmLKjTQxR+mARjqW4vX/HSTscxRGZZN/FOPxV7YiGiWoB8eDOQX5r0 vJN/BLQjEDkhbquI2RAeuHxSpQD1PyzVDXKLlaeXHA2Acs9sCHbXmaG1GsrfPKS7tF Chy5/rWsi0XPrm5/BY8z55XdRihVfERFQH/D9mdQcew5JkCC6xnAfJv1IdhQMEzG89 t1OorYWVofhKpEzLRWHqmVXc7BuDVZpm/wIGwRnql3S/N4lHCc4g2VAs49i5BSKjmA /JrKRGZ60od3a0S3Ug3kHTb91Annp+8+xh6mkFUKTk2jd2ydJ7Lxvl8bA7u804HxY8 LZTSUQ26rYhGv6JRP5m8x30E= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-1.2 required=5.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from localhost (unknown [146.70.134.143]) by wolfsden.cz (Postfix) with ESMTPSA id 383A6286DE1; Thu, 9 May 2024 22:24:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1715293441; bh=f0FkpFEIlOWe8VEvnZ3UwICecRnP7skmI2HQVnJFHoY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=fAwbn2GXDojzY8K3siF1B+wsTv8mE7UmiUB+N5VTrmryiCFH1w0Pb8wQz8eVyuCeK nRF12wasNlYPO3y+Pjhn4vGmhMv53IJap1gRDEDxlakP9vgCONxMPVYeInHQjMU9rR JDdoxXEIpBi5xBQKZJH5rE4AUg80LEKUj96PQmVJ5dyydSVjSLSELFMe2qX25Gu0sB 4gRKRB7nQmLI8UTSffpCzn2ybPpA7RxQfpfE8WQ/891PqCgFk48pPUEcd27oayBtFW tXv5luLwhCf+AQoad9K/sRW6lEIdYkMJKufsfgp3NCykNa1vHzxas3KFd72zdWDora OkmIDDMr2b6TDmLKjTQxR+mARjqW4vX/HSTscxRGZZN/FOPxV7YiGiWoB8eDOQX5r0 vJN/BLQjEDkhbquI2RAeuHxSpQD1PyzVDXKLlaeXHA2Acs9sCHbXmaG1GsrfPKS7tF Chy5/rWsi0XPrm5/BY8z55XdRihVfERFQH/D9mdQcew5JkCC6xnAfJv1IdhQMEzG89 t1OorYWVofhKpEzLRWHqmVXc7BuDVZpm/wIGwRnql3S/N4lHCc4g2VAs49i5BSKjmA /JrKRGZ60od3a0S3Ug3kHTb91Annp+8+xh6mkFUKTk2jd2ydJ7Lxvl8bA7u804HxY8 LZTSUQ26rYhGv6JRP5m8x30E= From: Tomas Volf <~@wolfsden.cz> To: 70112@debbugs.gnu.org Subject: [PATCH v2 02/11] gnu: podman: Drop obsolete comment. Date: Fri, 10 May 2024 00:23:05 +0200 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: <4554ead7e7440610c700ba6d5403489f95cfdf80.1715293394.git.~@wolfsden.cz> References: <4554ead7e7440610c700ba6d5403489f95cfdf80.1715293394.git.~@wolfsden.cz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 70112 Cc: Tomas Volf <~@wolfsden.cz> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) cgroup2 is now the default type. * gnu/packages/containers.scm (podman): Drop the comment. Change-Id: I197ed7e4901b26ad820295ed7adcaffd7bf533f5 --- gnu/packages/containers.scm | 3 --- 1 file changed, 3 deletions(-) diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm index ccee920325..f5328e4803 100644 --- a/gnu/packages/containers.scm +++ b/gnu/packages/containers.scm @@ -410,9 +410,6 @@ (define-public gvisor-tap-vsock The binary is called @command{gvproxy}.") (license license:asl2.0))) -;; For podman to work, the user needs to run -;; `sudo mount -t cgroup2 none /sys/fs/cgroup` - (define-public podman (package (name "podman") -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu May 09 18:24:05 2024 Received: (at 70112) by debbugs.gnu.org; 9 May 2024 22:24:05 +0000 Received: from localhost ([127.0.0.1]:40931 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s5CBJ-00027i-0N for submit@debbugs.gnu.org; Thu, 09 May 2024 18:24:05 -0400 Received: from wolfsden.cz ([37.205.8.62]:45230) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1s5CBG-00026s-Bg for 70112@debbugs.gnu.org; Thu, 09 May 2024 18:24:03 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 556C52877D6; Thu, 9 May 2024 22:24:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1715293443; bh=gtDP7aFDeAL/Hzj/i5J4rSJ5rUybdcBQeTqOYm9sIgo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=wmrzkjcXON7S3xFsLHsEDIdFiO0gY3UPqvA0rbSScEs0E0HYKAv9gIMCVTnNNuL0p gPS+//ScfOS4rqBqimwuKCli8YpCxfk+0wOL5t/o/VL9bi6nQdYX7R/fle28xiOTYW QmCzjrE5c0/Z9rbZMBR1TQydPhAgwybv/fvvXOLcyB17PtT4/sbZA03QBWGmb9suRh 7W6f3XjftgiEcMX8XByy1T6UEz8267+NizmBteD8MA1bxsb7Fz8U0g7mMxtYkj9R8Y vixPpiZDvav/Krj81vjEC8zG9W1tgTlv4EfYtA5noLQOJMH56gpI+2sgmw3D9RjPyE DnnRo2gv2I1MAmN1OmRcFJn01r41IEGmrb71Cl9DmkYFerVpiA72o0SDMGP6X1S6CI VS5N0wXb+TSPB0y49VrIkl2y9HLC9VMfr1Kg49UBAUhSSs/kzD76Sj3HPKe9Q2XK3F dwFAPfSq7fIYF6O0FWeN6tgn813gw+NBdZNK3KBkVsCcr3JzjYznWGy2AfWPwfjYsk 6156TFiknBsuW157Fx9FocTvw3AklFEYIg0gwuoL2rsEnTfL3FWvBn3qN8CWZYwDE+ IqBBtb3zZrK2NPClBK7K0rr1sUMRCfplQtG44Jd88inVg4Nb8zePAY9VUnuSnZax6P 9GGO9g2jVnzPEhdWu4200KSI= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-1.2 required=5.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from localhost (unknown [146.70.134.143]) by wolfsden.cz (Postfix) with ESMTPSA id 07D8D28838F; Thu, 9 May 2024 22:24:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1715293443; bh=gtDP7aFDeAL/Hzj/i5J4rSJ5rUybdcBQeTqOYm9sIgo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=wmrzkjcXON7S3xFsLHsEDIdFiO0gY3UPqvA0rbSScEs0E0HYKAv9gIMCVTnNNuL0p gPS+//ScfOS4rqBqimwuKCli8YpCxfk+0wOL5t/o/VL9bi6nQdYX7R/fle28xiOTYW QmCzjrE5c0/Z9rbZMBR1TQydPhAgwybv/fvvXOLcyB17PtT4/sbZA03QBWGmb9suRh 7W6f3XjftgiEcMX8XByy1T6UEz8267+NizmBteD8MA1bxsb7Fz8U0g7mMxtYkj9R8Y vixPpiZDvav/Krj81vjEC8zG9W1tgTlv4EfYtA5noLQOJMH56gpI+2sgmw3D9RjPyE DnnRo2gv2I1MAmN1OmRcFJn01r41IEGmrb71Cl9DmkYFerVpiA72o0SDMGP6X1S6CI VS5N0wXb+TSPB0y49VrIkl2y9HLC9VMfr1Kg49UBAUhSSs/kzD76Sj3HPKe9Q2XK3F dwFAPfSq7fIYF6O0FWeN6tgn813gw+NBdZNK3KBkVsCcr3JzjYznWGy2AfWPwfjYsk 6156TFiknBsuW157Fx9FocTvw3AklFEYIg0gwuoL2rsEnTfL3FWvBn3qN8CWZYwDE+ IqBBtb3zZrK2NPClBK7K0rr1sUMRCfplQtG44Jd88inVg4Nb8zePAY9VUnuSnZax6P 9GGO9g2jVnzPEhdWu4200KSI= From: Tomas Volf <~@wolfsden.cz> To: 70112@debbugs.gnu.org Subject: [PATCH v2 04/11] gnu: conmon: Update to 2.1.11. Date: Fri, 10 May 2024 00:23:07 +0200 Message-ID: <7f94ed781f3f402afea9b6bb4c06505ca19ba867.1715293394.git.~@wolfsden.cz> X-Mailer: git-send-email 2.41.0 In-Reply-To: <4554ead7e7440610c700ba6d5403489f95cfdf80.1715293394.git.~@wolfsden.cz> References: <4554ead7e7440610c700ba6d5403489f95cfdf80.1715293394.git.~@wolfsden.cz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 70112 Cc: Tomas Volf <~@wolfsden.cz> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/containers.scm (conmon): Update to 2.1.11. Change-Id: I2a46b2dcd344909da34199145fef4ad3fa4418de --- v2: Update to 2.1.11. gnu/packages/containers.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm index 44317acbea..680ef6cee7 100644 --- a/gnu/packages/containers.scm +++ b/gnu/packages/containers.scm @@ -105,7 +105,7 @@ (define-public crun (define-public conmon (package (name "conmon") - (version "2.0.31") + (version "2.1.11") (source (origin (method git-fetch) @@ -113,7 +113,7 @@ (define-public conmon (url "https://github.com/containers/conmon") (commit (string-append "v" version)))) (sha256 - (base32 "1cxklcihb2i4ywli0fxafkp2gi1x831r37z7spnigaj6pzj1517w")) + (base32 "1ax13n2npz5b7qa7f4glvnfq9biz220gyb8prh8s0jrvz6z2j221")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu May 09 18:24:05 2024 Received: (at 70112) by debbugs.gnu.org; 9 May 2024 22:24:05 +0000 Received: from localhost ([127.0.0.1]:40933 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s5CBJ-00027u-C7 for submit@debbugs.gnu.org; Thu, 09 May 2024 18:24:05 -0400 Received: from wolfsden.cz ([37.205.8.62]:47472) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1s5CBH-00027B-RR for 70112@debbugs.gnu.org; Thu, 09 May 2024 18:24:04 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id D9207286F67; Thu, 9 May 2024 22:24:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1715293444; bh=qycPDURq2Wgp1MBfU98/JiHncbV4Aqvb9hmyHcSu1Ec=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=IcQRrXvw9DJT86np+v78Plb7jTCQZB/4tm/p1U8WE+JVPdXpM+PovWxCkY9y6ux1c KtaaxwS7B/Y5GzT8esG/iBYS7tO3wzcrQrbLFSK9P72GORYupoz/64UxgR/inxM9hg pTustplJr6ZmnPcyjQg9ePfvlaV6Gr8T7ImdefRXi2A1Stxa6+/Gn0YJLvFf8godUL C1b59e65XVytmnL/TUVY08Qkix0Q0WoNEZn0SgV29Ol0LW8w64BzfrgFTFB4GfVUXE 0gGuZf24V9P9RL4cDvG8XZFpCxn0GuUzbkO9gdvkfvZHAYIb4FOzEnw9dU6qgHSLdy K9w6xHfGr0dcnAMIez89UHWG1wtaqiw80QKCxQmeeseSt1eewS0yrMEyuHOwuDqLvU qpe0jwP4/qtsUvb8EQohnAa9GpyQhRRPnSfkg9fOxkLVR7a7HSdcNq8/iP4IzF+kSr 7F+0vV5cjCNWuqX0fHOYbGuAzvSVSIGr39eIsyh6d+tHIlNa3AmrAn9mMaM1kJqZZ3 pppOptMeqs7FwYzJ2FkvZWQgWLifdyNs6EdoKyecTGMHh9EZWX6UBBIHHDlrxvCETT ybtUH21ceOIGKpGe/WQhdO+UiUR6t6u1NcJA0QPE6Mvf4ZMjwqfaGyO7noMzonnWB6 JD0JUktx48339yRhe15Iiozk= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,PDS_OTHER_BAD_TLD,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from localhost (unknown [146.70.134.143]) by wolfsden.cz (Postfix) with ESMTPSA id 012252863E7; Thu, 9 May 2024 22:24:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1715293444; bh=qycPDURq2Wgp1MBfU98/JiHncbV4Aqvb9hmyHcSu1Ec=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=IcQRrXvw9DJT86np+v78Plb7jTCQZB/4tm/p1U8WE+JVPdXpM+PovWxCkY9y6ux1c KtaaxwS7B/Y5GzT8esG/iBYS7tO3wzcrQrbLFSK9P72GORYupoz/64UxgR/inxM9hg pTustplJr6ZmnPcyjQg9ePfvlaV6Gr8T7ImdefRXi2A1Stxa6+/Gn0YJLvFf8godUL C1b59e65XVytmnL/TUVY08Qkix0Q0WoNEZn0SgV29Ol0LW8w64BzfrgFTFB4GfVUXE 0gGuZf24V9P9RL4cDvG8XZFpCxn0GuUzbkO9gdvkfvZHAYIb4FOzEnw9dU6qgHSLdy K9w6xHfGr0dcnAMIez89UHWG1wtaqiw80QKCxQmeeseSt1eewS0yrMEyuHOwuDqLvU qpe0jwP4/qtsUvb8EQohnAa9GpyQhRRPnSfkg9fOxkLVR7a7HSdcNq8/iP4IzF+kSr 7F+0vV5cjCNWuqX0fHOYbGuAzvSVSIGr39eIsyh6d+tHIlNa3AmrAn9mMaM1kJqZZ3 pppOptMeqs7FwYzJ2FkvZWQgWLifdyNs6EdoKyecTGMHh9EZWX6UBBIHHDlrxvCETT ybtUH21ceOIGKpGe/WQhdO+UiUR6t6u1NcJA0QPE6Mvf4ZMjwqfaGyO7noMzonnWB6 JD0JUktx48339yRhe15Iiozk= From: Tomas Volf <~@wolfsden.cz> To: 70112@debbugs.gnu.org Subject: [PATCH v2 05/11] gnu: passt: Update to 2024_03_20.71dd405. Date: Fri, 10 May 2024 00:23:08 +0200 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: <4554ead7e7440610c700ba6d5403489f95cfdf80.1715293394.git.~@wolfsden.cz> References: <4554ead7e7440610c700ba6d5403489f95cfdf80.1715293394.git.~@wolfsden.cz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 2.0 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/containers.scm (passt): Update to 2024_03_20.71dd405. Change-Id: I089b7e9364058e59139bdb7cb942fad693254c1f --- gnu/packages/containers.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Content analysis details: (2.0 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: passt.top (top)] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record X-Debbugs-Envelope-To: 70112 Cc: Tomas Volf <~@wolfsden.cz> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.0 (+) * gnu/packages/containers.scm (passt): Update to 2024_03_20.71dd405. Change-Id: I089b7e9364058e59139bdb7cb942fad693254c1f --- gnu/packages/containers.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm index 680ef6cee7..12716ac787 100644 --- a/gnu/packages/containers.scm +++ b/gnu/packages/containers.scm @@ -282,14 +282,14 @@ (define-public slirp4netns (define-public passt (package (name "passt") - (version "2023_12_30.f091893") + (version "2024_03_20.71dd405") (source (origin (method url-fetch) (uri (string-append "https://passt.top/passt/snapshot/passt-" version ".tar.gz")) (sha256 - (base32 "1nyd4h93qlxn1r01ffijpsd7r7ny62phki5j58in8gz021jj4f3d")))) + (base32 "1xyi1rqc3q2nbkd5mc4mp2m488ih5jy8v3xg0dgznh0149alx3y0")))) (build-system gnu-build-system) (arguments (list -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu May 09 18:24:06 2024 Received: (at 70112) by debbugs.gnu.org; 9 May 2024 22:24:06 +0000 Received: from localhost ([127.0.0.1]:40938 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s5CBJ-000281-P6 for submit@debbugs.gnu.org; Thu, 09 May 2024 18:24:06 -0400 Received: from wolfsden.cz ([37.205.8.62]:47486) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1s5CBI-00027M-8A for 70112@debbugs.gnu.org; Thu, 09 May 2024 18:24:04 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 4C58F288405; Thu, 9 May 2024 22:24:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1715293445; bh=BMrdKW+uPh+w+KvbrArJKSH6fClDBGpRdVAGD+RERh8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=amiSFtO2oJd3LxWP0HNntSJYiQ5Iwxutbo9FweSoAyQBmv06wqkw7gaJNUoC564OQ AE9mOCaSEo/c33U+d/ih4X8iF3sYbwEd35CraA71GhJQ8BuJSa6V3/pWiHTDvfKv6J fOBr8p3fz81aJiWC1VkAh2cna7g63Iv6c3TTH8+kP0dA8ZK+b9hJGMZIiR15GpF5x5 7AVd4+Arf4rh/m7DdwwuGM9RrG5Ybqf4X0ZqEKkVo1puAeXMAc4jbJ961RrG6V6xUh vIBbkQCpP7ZyX8j52WGMzLAgebTF4N/+yDnRvAQppWGvFjOqZs+oYxPYQ9u3AprCls ZTc4FjJ4EDXLrreQ+UWQhb4itt/TGiqjFt5ful1pa7gcnHgMte4BWqTInbBsgoOmjE BQr1ewuceuFrxc6HXIZf+J4teQjb4jdz78eQyYmGJR3JJ9DXrhjfareu8PcX4uaniB S8KxlNoHL50q8C/aI/XS3Zl8MaM6GqgCXPh7UzhL+UZPsnFAi2u+0USoFWn8gCOi9/ OJ1szuwASYmjDiyJPV3I/cwzXP2TeQuXb6jvc7d+qOB29LlS4b1JUF0Ww3HYRq/StL 2ABJdupYtvlmTvCb7rfzRarXXSivvv2y9EI3x2SAweRnp0mQXc28xA+N2azhVCFeDM 6ap/2XCw9OlnJJmAUCAlIuuM= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-1.2 required=5.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from localhost (unknown [146.70.134.143]) by wolfsden.cz (Postfix) with ESMTPSA id E092F286F68; Thu, 9 May 2024 22:24:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1715293445; bh=BMrdKW+uPh+w+KvbrArJKSH6fClDBGpRdVAGD+RERh8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=amiSFtO2oJd3LxWP0HNntSJYiQ5Iwxutbo9FweSoAyQBmv06wqkw7gaJNUoC564OQ AE9mOCaSEo/c33U+d/ih4X8iF3sYbwEd35CraA71GhJQ8BuJSa6V3/pWiHTDvfKv6J fOBr8p3fz81aJiWC1VkAh2cna7g63Iv6c3TTH8+kP0dA8ZK+b9hJGMZIiR15GpF5x5 7AVd4+Arf4rh/m7DdwwuGM9RrG5Ybqf4X0ZqEKkVo1puAeXMAc4jbJ961RrG6V6xUh vIBbkQCpP7ZyX8j52WGMzLAgebTF4N/+yDnRvAQppWGvFjOqZs+oYxPYQ9u3AprCls ZTc4FjJ4EDXLrreQ+UWQhb4itt/TGiqjFt5ful1pa7gcnHgMte4BWqTInbBsgoOmjE BQr1ewuceuFrxc6HXIZf+J4teQjb4jdz78eQyYmGJR3JJ9DXrhjfareu8PcX4uaniB S8KxlNoHL50q8C/aI/XS3Zl8MaM6GqgCXPh7UzhL+UZPsnFAi2u+0USoFWn8gCOi9/ OJ1szuwASYmjDiyJPV3I/cwzXP2TeQuXb6jvc7d+qOB29LlS4b1JUF0Ww3HYRq/StL 2ABJdupYtvlmTvCb7rfzRarXXSivvv2y9EI3x2SAweRnp0mQXc28xA+N2azhVCFeDM 6ap/2XCw9OlnJJmAUCAlIuuM= From: Tomas Volf <~@wolfsden.cz> To: 70112@debbugs.gnu.org Subject: [PATCH v2 06/11] gnu: Add catatonit. Date: Fri, 10 May 2024 00:23:09 +0200 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: <4554ead7e7440610c700ba6d5403489f95cfdf80.1715293394.git.~@wolfsden.cz> References: <4554ead7e7440610c700ba6d5403489f95cfdf80.1715293394.git.~@wolfsden.cz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 70112 Cc: Wilke Schwiedop X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Wilke Schwiedop * gnu/packages/containers.scm (catatonit): New variable. Change-Id: Ib6948bde8204426a8cb008982cb7cc9302f9e6d6 --- gnu/packages/containers.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm index 12716ac787..2fd5d844ec 100644 --- a/gnu/packages/containers.scm +++ b/gnu/packages/containers.scm @@ -411,6 +411,26 @@ (define-public gvisor-tap-vsock The binary is called @command{gvproxy}.") (license license:asl2.0))) +(define-public catatonit + (package + (name "catatonit") + (version "0.2.0") + (source + (origin + (method url-fetch) + (uri (string-append + "https://github.com/openSUSE/catatonit/releases/download/v" + version "/catatonit.tar.xz")) + (sha256 + (base32 "141b5lypgqib546zmldi4kqzpqfd6vvqddqqkfaz3w11fjsc4hwq")))) + (build-system gnu-build-system) + (native-inputs (list autoconf automake libtool)) + (synopsis "Container init") + (description + "A container init that is so simple it's effectively brain-dead.") + (home-page "https://github.com/openSUSE/catatonit") + (license license:gpl2+))) + (define-public podman (package (name "podman") -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu May 09 18:24:13 2024 Received: (at 70112) by debbugs.gnu.org; 9 May 2024 22:24:13 +0000 Received: from localhost ([127.0.0.1]:40952 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s5CBR-00028g-8E for submit@debbugs.gnu.org; Thu, 09 May 2024 18:24:13 -0400 Received: from wolfsden.cz ([37.205.8.62]:45204) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1s5CBF-00026j-DQ for 70112@debbugs.gnu.org; Thu, 09 May 2024 18:24:05 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 5A5D3287DD0; Thu, 9 May 2024 22:24:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1715293441; bh=eAoYim0s9YtHhbTDr9dBnamTqZvjVLOy0nA1V2/IS+c=; h=From:To:Cc:Subject:Date; b=c4uWdc9pi3KBNHTWIjEXhOKzgBQaBza9Tu5aCyHmqwAyKb0GiIE6M+aMl5/oAvjxs QJjmPrvFkZrkXElDvZr8Dw/KiHXIg1RgcD7HXuc/HYz5/wN+B3QI9HDdA0puFqXQp3 iCfPMX6SWdigizEoHokNuwrq7wEFiNXoFKKPwebNGyA090xhNi+3LwbM2dPs0ICjtq 0+sxg4TpiO+tTSi1wcWIG+XyGfTdHSAh7halDwY5se/a2lbWFLR2OJJ6PYin7gXcKE tKO9XCF7eAXXBy+8MubEt9BCLgox8oDoeJvVhWyuZ3pHHl3d/MqHTOx1zx725i14Rl arFPGsXlBeJMCVUkZmr8Br+ILRvtjLL0VyzX2Dl+V81J+k2yZmsjeD+V9+6CwegfNq VOacXz8BW8ipdtPLhpx6cfgdm1JgjbjDEf9KuA8UZkq2MOfvQGixbBY584ZxJQlPi7 II3YFpMJoG8whrMfC3Q7Sy4MxIWehLaFB6sKDJM4G/cb4HSthX+NJAsfjfYeD5FB/A 9F66UyLda7lbN+yQDbxn1g0DwLWI2qeL2hfUJm2MaLiU/SnjBDKGVWvRMoJHCym0Cz UufzifpiJp1XPWkNqrF4xZsfFU0zXPNCxoJCe4Qcd8jaNU5ByPX/oz8yqb48sYvHDA hdiHnfNMakPhzgj3k08YL4zw= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-1.2 required=5.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from localhost (unknown [146.70.134.143]) by wolfsden.cz (Postfix) with ESMTPSA id 51BA9287A98; Thu, 9 May 2024 22:24:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1715293440; bh=eAoYim0s9YtHhbTDr9dBnamTqZvjVLOy0nA1V2/IS+c=; h=From:To:Cc:Subject:Date; b=RvvUCFfhv2mQME5E4G4XpsfYwKoCqU7qnC7BqmYqwjVpx2yv6/TLnz8dbo3txOnRH M81+ws267p9cQqgUxhj0fY3FiV+WYbdrlnOcetLWMQdRTp/+pgZ+6jxZ0vGPtwMwOG 0PuDZrmo1b9c3IAVEwKsE9Zbiv2NSUHVXui5cwRrt4+TZT/dkIqkRAp9ckxEWpZ35j lO1kzONXNybrm+wd+PgZxlnyrK0vZHNu86bm0klJMN92OuHYet4L6YMyqms5LlGSrT 2p74rBeP7Xj7XPsANczew9XH5Y/6iZTQSCsTI7wxxnGfbEZwfkDVglk7Z7+ZBji3Lh sxIfNhidetlRfaAMEiGxEUT37xAdboUc4iB9R3/e2vNNUdVNXK7jx83LC5ujWRxLdB gtKOp4zatahXeAmRCf61PqdNBA5fUAaVuSaDb/rQ+r+f0Sqa+Wh7ux6dSBRPkIsQAg gdja13E8M8GwAbki0ZDGKgzMwjYeT3fBiCiWe5uYK9J1jT7hJoRlGVWQ7hZuhhZVpI dzsLKHhYb1qkdkSIC7DUoceVk7DqlA2esqP9VhDn1VLFNNv+FsV+GqJllg6BJuUjRP PLXaTV10Ew08fjWtzEfO/4HDkqSWG0ffZdjae7x7XV2lVoFS6gE5wggYV9P/s0u319 WbfTEuirLsM202xf0rBo/OkM= From: Tomas Volf <~@wolfsden.cz> To: 70112@debbugs.gnu.org Subject: [PATCH v2 01/11] gnu: crun: Update to 1.15. Date: Fri, 10 May 2024 00:23:04 +0200 Message-ID: <4554ead7e7440610c700ba6d5403489f95cfdf80.1715293394.git.~@wolfsden.cz> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 70112 Cc: Tomas Volf <~@wolfsden.cz> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/containers.scm (crun): Update to 1.15. Change-Id: I769c15663bf668a967cf32243dd8139b6c949953 --- v2: Update to 1.15. gnu/packages/containers.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm index 31260c5c0a..ccee920325 100644 --- a/gnu/packages/containers.scm +++ b/gnu/packages/containers.scm @@ -58,7 +58,7 @@ (define-module (gnu packages containers) (define-public crun (package (name "crun") - (version "1.14.1") + (version "1.15") (source (origin (method url-fetch) @@ -68,7 +68,7 @@ (define-public crun "/crun-" version ".tar.gz")) (sha256 (base32 - "02lplc2asyllb58mvy7l8b9gsk7fxs95g928xk28yzmf592ay33x")))) + "0zq8vcn2vg9snaqmf8k5gngskiclpm1ln0hhs1vsw8w8igjs2fx0")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--disable-systemd") -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu May 09 18:24:14 2024 Received: (at 70112) by debbugs.gnu.org; 9 May 2024 22:24:14 +0000 Received: from localhost ([127.0.0.1]:40954 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s5CBR-00028i-JO for submit@debbugs.gnu.org; Thu, 09 May 2024 18:24:13 -0400 Received: from wolfsden.cz ([37.205.8.62]:47472) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1s5CBJ-00027B-Ex for 70112@debbugs.gnu.org; Thu, 09 May 2024 18:24:06 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id C70DB288503; Thu, 9 May 2024 22:24:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1715293446; bh=SNYNEtRIcU5vcc/QJIe5IUIHVqHazi50znf7DJ/js2o=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=iPPu2URPdnFQ/Mt1y3Z3pwmxMCjvNV+lSwoFy0F/3XeiIn8gH9Eya7dAxBpva+kt0 UbHQRaTazK1yA12Q6r5eX3l8UEodnnMbNh8ZMIHJg8V6YE7O2NdOVuUPrAXgiT1+lo oXygDlptKdmzP7EZrDJEdpAo9qFm4tcTO0pZ+/1LsI9MG8clb0l8w1ufgV0NDj+BDb u6tgIiVwa+GZgUIadhfop1U9WBXnoSW9MGMU4m6GKP2DeF567/3tPYdVedjZNGOV6z GnlYy01qEUmxAEp7a0H9uIZZsaEZVUy6bgXd5XUwpL98WfQGvMtwEUaOjecVJCVmop rGXfH5wJTsZEHMCgraOQbXc6Cz+BSaoP36t6pd6wqRQPI2MSTLBqOxaQNNgUY7g58c 9wNub3OIdLoCS5/cZZuX7t0FGr1IKNRoqiDqdkpiS2UoP9fRmuLLvJVnrO1rZQYMmW wcGP+TuVceGXqXgicz8VwlTdgAz091DOmPO3nYRxCoQqIJzzsTHpn7639/BcL0lU2W sXj2E2al7k5E5WWVDWSnXR1nm2uR//OXCt9h5RjzGnRG2FD+R02X3aeRCNUdHFee7T myzXpuyy7kIQtFOOP6TOG7XqwahUrKpG/H+PA0KwBqcaudx2n9iJYG0Ytv2muAHOD7 bo+9reQVZNu2232zjvHarVAE= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-1.2 required=5.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from localhost (unknown [146.70.134.143]) by wolfsden.cz (Postfix) with ESMTPSA id CD2102876B6; Thu, 9 May 2024 22:24:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1715293445; bh=SNYNEtRIcU5vcc/QJIe5IUIHVqHazi50znf7DJ/js2o=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=mw6Dis0nnMyzHPPdR4km3IBPrMnmilsbh6aeedI5nzCvOUvTMkoER2k1g+qtl72ej OgNFJ7yh/o4RAuJ0dDeK7mlLOos+o2Xk287HKkmK3F2ThYZko5HRSXVO8lc+5SQ7pB NtRoIlb0QO+i/VefwKFas8IjiOHW7dSeLU/Pe6FRrmAjkzyPRw1s99OJcPNEq6HrJk 18Qaly4Xn6c0Ln2LlIrJgn8nsI3MZ13FYXjHCdUGAzfjTC/6qIcAeHGSnmTrhOVss/ u0Qlj4GhP8yOARAuAYjKtkS15tvUurEE+lkWS93ZoICWhG+b0M3FklHKOtNfxZJ/DK 9btJbSZnhVPHHUml3E/rhZT5pzYfJrrPrDdrGE9l/nHqNenWJ7Er/2Fx5YzwI3HVkk kyskrouUD9PXVrkMtUdRY2CUV24VG+8UhWyHY6TJtIRZUMF84CR3NW5k36A8Mdp4tl RwcMy9LK5LGdgIhp6Fob/Kjizim5VlUZbVMg9dA3br/DtEso38cujHJGkc91CCwx0n uE6qAWVwwfzhYi3NVDG64UhwyeHh5whrBiRieYQbq9CNjuwKQcwrWHd8/mVn0YihoX oATeHC/4ULKdy1HK670VJziV1q/ZeR2wnhYTyPf4DNt2rxY+7nOw3mKDkvi7y826ir L5NBzi2n9DAODU7SQp2fG/ms= From: Tomas Volf <~@wolfsden.cz> To: 70112@debbugs.gnu.org Subject: [PATCH v2 07/11] gnu: Add podman-compose. Date: Fri, 10 May 2024 00:23:10 +0200 Message-ID: <3e21bec1560a61969b5873e514fd26b71f0192d5.1715293394.git.~@wolfsden.cz> X-Mailer: git-send-email 2.41.0 In-Reply-To: <4554ead7e7440610c700ba6d5403489f95cfdf80.1715293394.git.~@wolfsden.cz> References: <4554ead7e7440610c700ba6d5403489f95cfdf80.1715293394.git.~@wolfsden.cz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 70112 Cc: Tomas Volf <~@wolfsden.cz> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/containers.scm (podman-compose): New variable. Change-Id: Ieb5ee4b6e82464599a17ec950be8a7dbb2efa842 --- gnu/packages/containers.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm index 2fd5d844ec..dadef35d6d 100644 --- a/gnu/packages/containers.scm +++ b/gnu/packages/containers.scm @@ -34,6 +34,7 @@ (define-module (gnu packages containers) #:use-module (guix build-system gnu) #:use-module (guix build-system go) #:use-module (guix build-system meson) + #:use-module (guix build-system python) #:use-module (guix utils) #:use-module (gnu packages admin) #:use-module (gnu packages autotools) @@ -49,6 +50,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 python-xyz) #:use-module (gnu packages rust-apps) #:use-module (gnu packages selinux) #:use-module (gnu packages version-control) @@ -532,6 +534,34 @@ (define-public podman packaged.") (license license:asl2.0))) +(define-public podman-compose + (package + (name "podman-compose") + (version "1.0.6") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/containers/podman-compose") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "11dwpifkm20vyi6r3fgmiiqc01mpm4r8l0p5gfh0bawi2gklrhsf")))) + (build-system python-build-system) + (arguments + (list + #:tests? #f)) + (inputs (list python-dotenv + python-pyyaml)) + (home-page "https://github.com/containers/podman-compose") + (synopsis "Implementation of @url{https://compose-spec.io/,,Compose Spec} +with @code{podman} backend") + (description "Provides an implementation of +@url{https://compose-spec.io/,,Compose Spec} for @code{podman} focused on +being rootless and not requiring any daemon to be running.") + (license license:gpl2))) + (define-public buildah (package (name "buildah") -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu May 09 18:24:14 2024 Received: (at 70112) by debbugs.gnu.org; 9 May 2024 22:24:14 +0000 Received: from localhost ([127.0.0.1]:40956 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s5CBS-00028p-0g for submit@debbugs.gnu.org; Thu, 09 May 2024 18:24:14 -0400 Received: from wolfsden.cz ([37.205.8.62]:47496) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1s5CBK-00028C-Gk for 70112@debbugs.gnu.org; Thu, 09 May 2024 18:24:06 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 8B54A2877D9; Thu, 9 May 2024 22:24:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1715293447; bh=fnA6g66Aq3nB46OsqBtFY0hMbp2Int04DJ6kcYpdo98=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ATEVT3qkmVP9zGkveswJVO/DHasjQu2/SXth9Sy7eyZU1EYpfeZCruUBkcm8+kGeE VlHOzyL1igso7p89eUT2xFZGvPZLERvy5I3uwiuN3457ImUFfPLecf3AK8dJLraSjk fyOJRC+i5TBC9aRRfcSK5kMrbPiSrKYXVarZN0dv6aw3RYrxRFhYzXBVtssedFAK55 7YKZM5zbiDTHcSB/ASeiJOX1ZjMe7DjbU13nsOB9GuA8AiOgaltTPEDXKooDwJJrK9 sQ0iZUvxr9jVE4TvAad8UeC6zuv6JzLE4tX0Ca1o3nkGnDKwemWmc3IY1SlegD/a0p 1DcG1UEVbhMC7JRFn/GsEYL9KcqBhmtnOzBti+/czz5j2OYEKtvvZdXuRW8fhNUZpx WYCVLbqi4+qnBu7dZOnQC9uNjOjT3AlV9LHOQi+EsdG7Iql8WCeszZVM1rFR8c/xYs tqqwvuvr+r75L7hJhO2ffdseGWuSqrrU680OhK1GcvIT7vWpsceyHL8gY3t3FuXKyY byajO0iYOwcT5rvW+k2hn8PxrjKk8QklqJDaMh80gaekYb5+J4Hh2giJ13kGfFhhjc SMode+2U71CHU4oDk1vV8do4bLbtULpXcbL2xksi8M55xTWOgHk7hZul4OeIKQ3yOS pUolgb/hnyXjJjq0jWqdLnjs= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-1.2 required=5.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from localhost (unknown [146.70.134.143]) by wolfsden.cz (Postfix) with ESMTPSA id CCE4C286561; Thu, 9 May 2024 22:24:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1715293446; bh=fnA6g66Aq3nB46OsqBtFY0hMbp2Int04DJ6kcYpdo98=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ozZ9kjpdU+FpOcCqFYElPeMQPxq4JV36dH00zznyt2s0njsG3BpReOlsj2qWEpFP8 126lLSCVHVjLOIsgobRTM2Z9kGBsNfU47F+9sPXT2dRwDroxHPcBoDfpc1sO8MLtOm WpjdJWLwzTAB5C4XuTFko51LPOpIXMpFySn8B+2T1oSgN47q/W0sVRir4/YmHC1rD3 /QtTUsBKhtcF5wwHRcOkg3o3zsDz9esuQMmZYxN2ogJNtajW6Oa5VroeMOaC321zBk 4+Cv7h5uyHrmxfNeqp7/KPmga677VVN+FcmZXK5PIj324iuDWUNQtd2E06Df9VBQaM XM72n6r+wZv4fKH8dxIBqqo5bCnktf/ILiru2m9Z32IIJDY5tMdhSJLwqb4bR08ved xrBtEEG4sYyy5Wfit+RKPvko9xqbK3MlMAJDvqDl7XbzbE565uVFtg7s20npLjwaMH 8r7cspqrQKPKaTmNJMsvxuHZ5C59h/EaD8hB54ieZeERauzsG7J4s2pRyXZ+c+BSvD Ms1HfpYMD6DDgjXKQxSwwt0Ztp7RWxnv23kGoVDLq6+cEYQUDJtVMoxEUtSeyWNAJT 2obouG4ZslHSujY+A7j9e3U0JSphtB40i29v2vCTUxhOpc1ohVJPS155HfgfrPtZQW sMm8Z0jfUIj6k4w4kt9uUy18= From: Tomas Volf <~@wolfsden.cz> To: 70112@debbugs.gnu.org Subject: [PATCH v2 08/11] gnu: gvisor-tap-vsock: Remove references to go. Date: Fri, 10 May 2024 00:23:11 +0200 Message-ID: <9588f1b48e3b48040b4eabd51649893ada913955.1715293394.git.~@wolfsden.cz> X-Mailer: git-send-email 2.41.0 In-Reply-To: <4554ead7e7440610c700ba6d5403489f95cfdf80.1715293394.git.~@wolfsden.cz> References: <4554ead7e7440610c700ba6d5403489f95cfdf80.1715293394.git.~@wolfsden.cz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 70112 Cc: Tomas Volf <~@wolfsden.cz> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This is handled automatically by go-build-system, but (obviously) not by the gnu-build-system, so add the phase manually. * gnu/packages/containers.scm (gvisor-tap-vsock)[arguments]<#:phases>: Add 'remove-go-references phase. Change-Id: I5cef0bc03dfa7f219bdfec4226d0e7772401a5a5 --- gnu/packages/containers.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm index dadef35d6d..517eba45d9 100644 --- a/gnu/packages/containers.scm +++ b/gnu/packages/containers.scm @@ -26,6 +26,7 @@ (define-module (gnu packages containers) #:use-module (guix gexp) #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix modules) #:use-module (gnu packages) #:use-module (guix packages) #:use-module (guix download) @@ -387,6 +388,9 @@ (define-public gvisor-tap-vsock (list #:make-flags `(list ,(string-append "GIT_VERSION=v" version)) #:test-target "test" + #:imported-modules + (source-module-closure `(,@%gnu-build-system-modules + (guix build go-build-system))) #:phases #~(modify-phases %standard-phases (delete 'configure) @@ -400,7 +404,9 @@ (define-public gvisor-tap-vsock (invoke "rm" "-r" "test"))) (replace 'install (lambda _ - (install-file "bin/gvproxy" (string-append #$output "/bin"))))))) + (install-file "bin/gvproxy" (string-append #$output "/bin")))) + (add-after 'install 'remove-go-references + (@@ (guix build go-build-system) remove-go-references))))) (native-inputs (list go-1.20)) (home-page "https://github.com/containers/gvisor-tap-vsock") (synopsis "Network stack for virtualization based on gVisor") -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu May 09 18:24:14 2024 Received: (at 70112) by debbugs.gnu.org; 9 May 2024 22:24:14 +0000 Received: from localhost ([127.0.0.1]:40958 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s5CBS-00028w-D4 for submit@debbugs.gnu.org; Thu, 09 May 2024 18:24:14 -0400 Received: from wolfsden.cz ([37.205.8.62]:47522) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1s5CBM-00028O-Kd for 70112@debbugs.gnu.org; Thu, 09 May 2024 18:24:09 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id A71FF287067; Thu, 9 May 2024 22:24:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1715293449; bh=7hxt1B74kvC0fGPf5Ue7HvIlwfxOS9GcUZiLDV/E0xQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Prkjr7nue1xQTpyFrbu6kKyD+ohnUmq50amrholKONTttZeC08BHa5bpY5NUfnRvX P0YIUkNjBfG4OHV4mWVoPrfpHNQ+0ek+irE5fhvgnZ7XxPe0TguBI8teVfWCIIrBdi hYNYQKhJaApOICvUoQXJN7HAxD8d6neyZ5ClsPszt0Vhh+kKKWHA4nj2SkB9M5EmnB u2yT4fIzcCaYZ9o0Vzu+/u4ajqOh0wXbke2VSOneM/bXn5UGc7rrYSl0gNdBU7U5s7 HJdVKVCZ9b9dDk7NGxEIVEOMdtP5T5vy5mJxGNGA4oybNJpXftv3T7ypLNvvj+ks3+ EEc49/0iSIo1E2o1AWM1dJI8tAkzwBh7saQNieuTodftPOVk9u7Q8oiXvN5iSN4Yec kW/ItJdZxOwGo6ceLJMyUSsmObKwaXTrsU/MgayQVXN/mbG8Udx29fmeGDik81G96A 5s1pk+QQ8yhOY3y3nOthTDMaCa+Ev79WsPUzdeGn+omi0tO6lzoHxUT3+1uJNjbvQn PvNNcqAVukdCOpwH9cx9DObcpy1xiHlx19Ec20kRj6LEN1qO4K8qNtr+2JIUfwFrF0 4v5ILBo7YHbh7jdXMucm74lEAx03PakBcJmCCGazXQEn3Aed5bJ0iHKSruBuW7+kBW hGSDc+LFaPmhjMMnqmmtOT8Q= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-1.2 required=5.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from localhost (unknown [146.70.134.143]) by wolfsden.cz (Postfix) with ESMTPSA id 99E912835F0; Thu, 9 May 2024 22:24:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1715293448; bh=7hxt1B74kvC0fGPf5Ue7HvIlwfxOS9GcUZiLDV/E0xQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=noWYIe/mAVVcGo+tK92f/pjtk7TnZGzH2jgL0jQClOgbPTU1ur6eS8/DVtxmXYvhy VsZ3URwgEJ65Y/3d1LXyz4Pl4RwiqNKrtbL18cqwwyEx95Dr+XHLw2SCeEGgS/nGrc jPCvyXI/N4lldgJ+Erjo8xT3dsI6+P/sXcfpL2g3dNxmdzzLeWBUZy6RPDhAJRZdXa nfQH9IBr7RQulYS+jrbqb+uF7RU/yJGaxdrPvLo+LkO7Tq+rHFpGxpdrpjrhMpvGT1 /jsRd0/P3INdy1lkjjro1stA0obc79EADYXV7EIPcDNlvCcTN6DZl+YpD1YQtEWD44 B/EB4vMA5dlcHyelBA9Xkn2pKxkCUty4MofLwO+KXcmoLH9zePphAuok0j8l0NSKtL tKopfzWn5C4NPv8ra0eaEwHjvcf3uz9tIUEpaRViqRmnRJPW6Q3e5QY74g+98zmfuo LSak1K0YwnCvefyMJhkX9AF7Eyra2gKCdKHV6W5NkgS+sbVTKyyMxo0uMp26Sdwg+6 6cLHFh6pBXe1mlFspz9LT3svfpb7YWXQXEilsNeoUP2DvtTcEuwtRUT0AYDPlbSJGr GexizC9ALXQT/gsXTIF8JKsSJFQVVsVicphF20tOk0c5ql1auf40PL/a1vVb0ur4s2 0m/93xI34lewcA0RmnhGrQyY= From: Tomas Volf <~@wolfsden.cz> To: 70112@debbugs.gnu.org Subject: [PATCH v2 10/11] gnu: buildah: Update to 1.35.3. Date: Fri, 10 May 2024 00:23:13 +0200 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: <4554ead7e7440610c700ba6d5403489f95cfdf80.1715293394.git.~@wolfsden.cz> References: <4554ead7e7440610c700ba6d5403489f95cfdf80.1715293394.git.~@wolfsden.cz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 70112 Cc: Tomas Volf <~@wolfsden.cz> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/containers.scm (buildah): Update to 1.35.3. Change-Id: I0a00d6a73079ddaa38a454856781adfc2d7f158f --- gnu/packages/containers.scm | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm index d0bec87fe8..494777cd28 100644 --- a/gnu/packages/containers.scm +++ b/gnu/packages/containers.scm @@ -600,16 +600,17 @@ (define-public podman-compose (define-public buildah (package (name "buildah") - (version "1.29.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/containers/buildah") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1mcqkz68fjccdla1bgxw57w268a586brm6x28fcm6x425ah0w07h")))) + (version "1.35.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/containers/buildah") + (commit (string-append "v" version)))) + (sha256 + (base32 + "07hr2cfp4kblnmva02ap97id5nzhbqigdfvx7c8nyrkfzw0340n0")) + (file-name (git-file-name name version)))) (build-system go-build-system) (arguments (list #:import-path "github.com/containers/buildah/cmd/buildah" -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu May 09 18:24:15 2024 Received: (at 70112) by debbugs.gnu.org; 9 May 2024 22:24:15 +0000 Received: from localhost ([127.0.0.1]:40960 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s5CBS-000293-Nf for submit@debbugs.gnu.org; Thu, 09 May 2024 18:24:15 -0400 Received: from wolfsden.cz ([37.205.8.62]:47506) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1s5CBM-00028N-7L for 70112@debbugs.gnu.org; Thu, 09 May 2024 18:24:09 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 45A4D2835F1; Thu, 9 May 2024 22:24:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1715293449; bh=SmWJdi8UWFPZO+bEikvp0vAW1XmfBo+co5QwmEAc+q8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=JbwzjN0lsTikKy/60eSehTOQpn0xYdws3lzH8X1AVcgQC6xVrcwkrIBLFvU6NilwY TAomKbCF14omvWwn5PShYwBUuG+9/VuY3lW53lkwgI3zQctAF0UaMm03s1/0p1T7kZ mgUZkmKRZposS/DFiInNptb9QnXqONTopLxQBVZLXGdp6d3XyLh2DJOLfVYgNVKYuh Oy1IcVcgK+QFiRTp0U2yKgwcX7bE5pEwX1Js1I7K0/SG7Czq1cnbQd70IhMWk9iEb/ XJC4FnIeOgkk9jaRTzz+hELYhMtDzyqLi9QMQ7mEnf8OhaTGNYf1pDsI8Wqvhg4IDc gZpmeLLmC4sg9PNs7M3o3DcCANR/ViYSroZ8ShASZ9kJcvpin+8BEXIxzPC/fRn7uG i3lVbwbr/Xl9SNESUEMbhgDduDHrHRmLrh1Z9uVyKiHBNBDj3PSdqwJ4rDzo6ICrUh E/9tIhBcbwDYoGxEcmK/zlAQIeolAd8Xa61cALdMUJSSSCcsqen8wLUDvugYYlGut/ kJMzU9Qzgd8+XGZd4+dGHngoERJmklPWB0FOEF8+vfDLd/zi5iWrt76RVmDSRN1N8p S7Ceqh/eLaaRPhbJMXQnj+x5P1LP0/L8isKYnfu+4sgzed/ZC23PDQ2aEXHjv36PYi 3TrbkhDCLzO2rBdHBH0U+Z5A= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-1.2 required=5.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from localhost (unknown [146.70.134.143]) by wolfsden.cz (Postfix) with ESMTPSA id B20722876B7; Thu, 9 May 2024 22:24:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1715293447; bh=SmWJdi8UWFPZO+bEikvp0vAW1XmfBo+co5QwmEAc+q8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=qjA2g+W+wjCfCeX+vKJ5LRDnGudwaMytVyUg+SttTSNIkXDZRi+AbNZTDLfduJ19v 9MEf3ml7niR4w79wo8lOWGBzFE0dwqRvzmKzx5U/Ox0qPbEgkhqZES+3Bo1x3nw+dz boCJakCZ6hCy1mB5Q57DHFnd3aeTY+jYVAgKvqXrIK/QntfEKoKAfdqFRskDqWkiwr ATsr7BCUNM6gG+UievS8aaV926yciL30q0nZ4R6C569Bp9caCd3dXT5a0094JVd68j y/NvFl0TtE09dgEpE9Rh8CMfelgBvlpb3rf9MEylvzqixArB3hNPQX4fIhEAPKbgNm ftDL42w/Rd9NUjWSmhknKleVAZBmSaihD63srJ+an8qtG/0zmQQROL9e4WRrW/XIrT mNJh20Ma7PAO9IzvmU1YtP1TpztqL3wNZke1p88ZgmJr1G3m005NjAnOUlbgjUwl3z J1/TtsmE6XTFAFppujj/NYmrtp7XkqiWJOolOlQWQYi3yNUdz90AfLKM/4atqf93N5 7AzPLeWcmmM2gO5sBTvUSvTw49kU80DHh3AoGiH2jEXiTqv3b2yjVg94a0b4gJ8X0I Rz+TkQf1D/FcKXQVWnXZ2PAKaisSQBjLlud2k6pF80nkwLAk21tIyuXlx9alFuQjpn wiEixh7Jvh6BaGsHzEdXAVzw= From: Tomas Volf <~@wolfsden.cz> To: 70112@debbugs.gnu.org Subject: [PATCH v2 09/11] gnu: podman: Revamp the package. Date: Fri, 10 May 2024 00:23:12 +0200 Message-ID: <05152041d295556cb113eb4462252795005e10a6.1715293394.git.~@wolfsden.cz> X-Mailer: git-send-email 2.41.0 In-Reply-To: <4554ead7e7440610c700ba6d5403489f95cfdf80.1715293394.git.~@wolfsden.cz> References: <4554ead7e7440610c700ba6d5403489f95cfdf80.1715293394.git.~@wolfsden.cz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 70112 Cc: Tomas Volf <~@wolfsden.cz> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Substantial rework of the podman package. The source is no longer patched (at all) and all necessary modifications were moved into wrap-program and phases. Not everything is supported out of the box, but description mentions what packages to install to get additional functionality working. * gnu/packages/containers.scm (podman)[source]: Remove snippet and patches. [arguments]<#:make-flags>: Add HELPER_BINARIES_DIR. Add GOMD2MAN to actually use go-github-com-go-md2man package instead of the bundled version. <#:imported-modules>: Add (guix build go-build-system). <#:phases>{'set-env}: Set `CC' as an environment variable due to bug in make before 4.4. {'fix-hardcoded-paths}: Remove everything except patching `libexec' and `lib' locations. {'symlink-helpers}: New phase symlinking tools not discoverable via $PATH into one directory (`HELPER_BINARIES_DIR'). {'wrap-podman}: New phase wrapping `podman' to set correct $PATH. {'remove-go-references}: New phase stripping references to the golang toolchain from the binaries. [inputs]: Remove no longer needed cni-plugins, slirp4netns. Remove referenced in 'wrap-podman conmon, crun, iptables, passt. Move go-github-com-go-md2man into native-inputs. Add bash-minimal. [native-inputs]: Add custom grep with supported -P. Use newer go. Add mandoc. [description]: Explain how to get `podman compose' and `podman machine' working. * gnu/packages/patches/podman-program-lookup.patch: Delete file. Change-Id: Ifc28971a68751831d781517b041eec951a617087 --- gnu/local.mk | 1 - gnu/packages/containers.scm | 119 ++++++++++------- .../patches/podman-program-lookup.patch | 120 ------------------ 3 files changed, 74 insertions(+), 166 deletions(-) delete mode 100644 gnu/packages/patches/podman-program-lookup.patch diff --git a/gnu/local.mk b/gnu/local.mk index 439fe587b0..fc14c98197 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1810,7 +1810,6 @@ dist_patch_DATA = \ %D%/packages/patches/plasp-fix-normalization.patch \ %D%/packages/patches/plasp-include-iostream.patch \ %D%/packages/patches/pocketfft-cpp-prefer-preprocessor-if.patch \ - %D%/packages/patches/podman-program-lookup.patch \ %D%/packages/patches/pokerth-boost.patch \ %D%/packages/patches/ppsspp-disable-upgrade-and-gold.patch \ %D%/packages/patches/procps-strtod-test.patch \ diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm index 517eba45d9..d0bec87fe8 100644 --- a/gnu/packages/containers.scm +++ b/gnu/packages/containers.scm @@ -44,10 +44,13 @@ (define-module (gnu packages containers) #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages glib) + #:use-module (gnu packages gcc) #:use-module (gnu packages gnupg) #:use-module (gnu packages golang) #:use-module (gnu packages guile) #:use-module (gnu packages linux) + #:use-module (gnu packages man) + #:use-module (gnu packages pcre) #:use-module (gnu packages python) #:use-module (gnu packages networking) #:use-module (gnu packages pkg-config) @@ -449,84 +452,104 @@ (define-public podman (uri (git-reference (url "https://github.com/containers/podman") (commit (string-append "v" version)))) - (modules '((guix build utils))) - ;; FIXME: Btrfs libraries not detected by these scripts. - (snippet '(substitute* "Makefile" - ((".*hack/btrfs.*") ""))) - (patches - (search-patches - "podman-program-lookup.patch")) (sha256 (base32 "0x8npz0i3dyiaw30vdlb5n8kiaflgjqnrdbdk0yn5zgf5k1jlb7i")) (file-name (git-file-name name version)))) - (build-system gnu-build-system) (arguments (list #:make-flags - #~(list #$(string-append "CC=" (cc-for-target)) - (string-append "PREFIX=" #$output)) + #~(list (string-append "CC=" #$(cc-for-target)) + (string-append "PREFIX=" #$output) + (string-append "HELPER_BINARIES_DIR=" #$output "/_guix") + (string-append "GOMD2MAN=" + #$go-github-com-go-md2man "/bin/go-md2man")) #:tests? #f ; /sys/fs/cgroup not set up in guix sandbox #:test-target "test" + #:imported-modules + (source-module-closure `(,@%gnu-build-system-modules + (guix build go-build-system))) #:phases #~(modify-phases %standard-phases (delete 'configure) (add-after 'unpack 'set-env - (lambda* (#:key inputs #:allow-other-keys) - ;; when running go, things fail because - ;; HOME=/homeless-shelter. - (setenv "HOME" "/tmp"))) + (lambda _ + ;; When running go, things fail because HOME=/homeless-shelter. + (setenv "HOME" "/tmp") + ;; Required for detecting btrfs in hack/btrfs* due to bug in GNU + ;; Make <4.4 causing CC not to be propagated into $(shell ...) + ;; calls. Can be removed once we update to >4.3. + (setenv "CC" #$(cc-for-target)))) (replace 'check (lambda* (#:key tests? #:allow-other-keys) (when tests? - ;; (invoke "strace" "-f" "bin/podman" "version") (invoke "make" "localsystem") (invoke "make" "remotesystem")))) (add-after 'unpack 'fix-hardcoded-paths (lambda _ - (substitute* "vendor/github.com/containers/common/pkg/config/config.go" - (("@SLIRP4NETNS_DIR@") - (string-append #$slirp4netns "/bin")) - (("@PASST_DIR@") - (string-append #$passt "/bin")) - (("@NETAVARK_DIR@") - (string-append #$netavark "/bin"))) - (substitute* "hack/install_catatonit.sh" - (("CATATONIT_PATH=\"[^\"]+\"") - (string-append "CATATONIT_PATH=" (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"))) - (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"))))) + (string-append #$output "/bin"))))) + (add-after 'install 'symlink-helpers + (lambda _ + (mkdir-p (string-append #$output "/_guix")) + (for-each + (lambda (what) + (symlink (string-append (car what) "/bin/" (cdr what)) + (string-append #$output "/_guix/" (cdr what)))) + ;; Only tools that cannot be discovered via $PATH are + ;; symlinked. Rest is handled in the 'wrap-podman phase. + `((#$aardvark-dns . "aardvark-dns") + ;; Required for podman-machine, which is *not* supported out + ;; of the box. But it cannot be discovered via $PATH, so + ;; there is no other way for the user to install it. It + ;; costs ~10MB, so let's leave it here. + (#$gvisor-tap-vsock . "gvproxy") + (#$netavark . "netavark"))))) + (add-after 'install 'wrap-podman + (lambda _ + (wrap-program (string-append #$output "/bin/podman") + `("PATH" suffix + (,(string-append #$catatonit "/bin") + ,(string-append #$conmon "/bin") + ,(string-append #$crun "/bin") + ,(string-append #$gcc "/bin") ; cpp + ,(string-append #$iptables "/sbin") + ,(string-append #$passt "/bin") + ,(string-append #$procps "/bin") ; ps + "/run/setuid-programs"))))) + (add-after 'install 'remove-go-references + (lambda* (#:key inputs #:allow-other-keys) + (let ((go (assoc-ref inputs "go"))) + (for-each + (lambda (file) + (when (executable-file? file) + ((@@ (guix build go-build-system) remove-store-reference) + file go))) + (append (find-files (string-append #$output "/bin")) + (find-files (string-append #$output "/libexec")) + (find-files (string-append #$output "/lib"))))))) (add-after 'install 'install-completions (lambda _ (invoke "make" "install.completions" (string-append "PREFIX=" #$output))))))) (inputs - (list btrfs-progs - cni-plugins - conmon - crun + (list bash-minimal + btrfs-progs gpgme - go-github-com-go-md2man - iptables libassuan libseccomp - libselinux - passt - slirp4netns)) + libselinux)) (native-inputs - (list bats + (list (package/inherit grep + (inputs (list pcre2))) ; Drop once grep on master supports -P + bats git go-1.21 - ; strace ; XXX debug + go-github-com-go-md2man + mandoc pkg-config python)) (home-page "https://podman.io") @@ -536,8 +559,14 @@ (define-public podman volumes mounted into those containers, and pods made from groups of containers. -The @code{machine} subcommand is not supported due to gvproxy not being -packaged.") +Not all commands are working out of the box due to requiring additional +binaries to be present in the $PATH. + +To get @code{podman compose} working, install either @code{podman-compose} or +@code{docker-compose} packages. + +To get @code{podman machine} working, install @code{qemu-minimal}, and +@code{openssh} packages.") (license license:asl2.0))) (define-public podman-compose diff --git a/gnu/packages/patches/podman-program-lookup.patch b/gnu/packages/patches/podman-program-lookup.patch deleted file mode 100644 index 27a9421285..0000000000 --- a/gnu/packages/patches/podman-program-lookup.patch +++ /dev/null @@ -1,120 +0,0 @@ -From 914aed3e04f71453fbdc30f4287e13ca3ce63a36 Mon Sep 17 00:00:00 2001 -From: Tomas Volf <~@wolfsden.cz> -Date: Wed, 14 Feb 2024 20:02:03 +0100 -Subject: [PATCH] Modify search for binaries to fit Guix model - -Podman basically looked into the $PATH and into its libexec. That does not fit -Guix's model very well, to an additional option to specify additional -directories during compilation was added. - -* pkg/rootless/rootless_linux.go -(tryMappingTool): Also check /run/setuid-programs. -* vendor/github.com/containers/common/pkg/config/config.go -(extraGuixDir): New function. -(FindHelperBinary): Use it. -* vendor/github.com/containers/storage/pkg/unshare/unshare_linux.go -(guixLookupSetuidPath): New function. -(Start): Use it. ---- - pkg/rootless/rootless_linux.go | 3 +++ - .../containers/common/pkg/config/config.go | 23 +++++++++++++++++++ - .../storage/pkg/unshare/unshare_linux.go | 14 +++++++++-- - 3 files changed, 38 insertions(+), 2 deletions(-) - -diff --git a/pkg/rootless/rootless_linux.go b/pkg/rootless/rootless_linux.go -index d303c8b..0191d90 100644 ---- a/pkg/rootless/rootless_linux.go -+++ b/pkg/rootless/rootless_linux.go -@@ -102,6 +102,9 @@ func tryMappingTool(uid bool, pid int, hostID int, mappings []idtools.IDMap) err - idtype = "setgid" - } - path, err := exec.LookPath(tool) -+ if err != nil { -+ path, err = exec.LookPath("/run/setuid-programs/" + tool) -+ } - if err != nil { - return fmt.Errorf("command required for rootless mode with multiple IDs: %w", err) - } -diff --git a/vendor/github.com/containers/common/pkg/config/config.go b/vendor/github.com/containers/common/pkg/config/config.go -index 75b917f..ed2f131 100644 ---- a/vendor/github.com/containers/common/pkg/config/config.go -+++ b/vendor/github.com/containers/common/pkg/config/config.go -@@ -1102,6 +1102,24 @@ func findBindir() string { - return bindirCached - } - -+func extraGuixDir(bin_name string) string { -+ if (bin_name == "slirp4netns") { -+ return "@SLIRP4NETNS_DIR@"; -+ } else if (bin_name == "pasta") { -+ return "@PASST_DIR@"; -+ } else if (strings.HasPrefix(bin_name, "qemu-")) { -+ return "@QEMU_DIR@"; -+ } else if (bin_name == "gvproxy") { -+ return "@GVPROXY_DIR@"; -+ } else if (bin_name == "netavark") { -+ return "@NETAVARK_DIR@"; -+ } else if (bin_name == "aardvark-dns") { -+ return "@AARDVARK_DNS_DIR@"; -+ } else { -+ return ""; -+ } -+} -+ - // FindHelperBinary will search the given binary name in the configured directories. - // If searchPATH is set to true it will also search in $PATH. - func (c *Config) FindHelperBinary(name string, searchPATH bool) (string, error) { -@@ -1109,6 +1127,11 @@ func (c *Config) FindHelperBinary(name string, searchPATH bool) (string, error) - bindirPath := "" - bindirSearched := false - -+ if dir := extraGuixDir(name); dir != "" { -+ /* If there is a Guix dir, skip the PATH search. */ -+ dirList = append([]string{dir}, dirList...) -+ } -+ - // If set, search this directory first. This is used in testing. - if dir, found := os.LookupEnv("CONTAINERS_HELPER_BINARY_DIR"); found { - dirList = append([]string{dir}, dirList...) -diff --git a/vendor/github.com/containers/storage/pkg/unshare/unshare_linux.go b/vendor/github.com/containers/storage/pkg/unshare/unshare_linux.go -index a8dc1ba..0b0d755 100644 ---- a/vendor/github.com/containers/storage/pkg/unshare/unshare_linux.go -+++ b/vendor/github.com/containers/storage/pkg/unshare/unshare_linux.go -@@ -26,6 +26,16 @@ import ( - "github.com/syndtr/gocapability/capability" - ) - -+func guixLookupSetuidPath(prog string) (string, error) { -+ path, err := exec.LookPath(prog) -+ if err != nil { -+ path, err = exec.LookPath("/run/setuid-programs/" + prog) -+ } -+ return path, err -+} -+ -+ -+ - // Cmd wraps an exec.Cmd created by the reexec package in unshare(), and - // handles setting ID maps and other related settings by triggering - // initialization code in the child. -@@ -237,7 +247,7 @@ func (c *Cmd) Start() error { - gidmapSet := false - // Set the GID map. - if c.UseNewgidmap { -- path, err := exec.LookPath("newgidmap") -+ path, err := guixLookupSetuidPath("newgidmap") - if err != nil { - return fmt.Errorf("finding newgidmap: %w", err) - } -@@ -297,7 +307,7 @@ func (c *Cmd) Start() error { - uidmapSet := false - // Set the UID map. - if c.UseNewuidmap { -- path, err := exec.LookPath("newuidmap") -+ path, err := guixLookupSetuidPath("newuidmap") - if err != nil { - return fmt.Errorf("finding newuidmap: %w", err) - } --- -2.41.0 - -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu May 09 18:24:16 2024 Received: (at 70112) by debbugs.gnu.org; 9 May 2024 22:24:16 +0000 Received: from localhost ([127.0.0.1]:40962 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s5CBT-00029A-LL for submit@debbugs.gnu.org; Thu, 09 May 2024 18:24:16 -0400 Received: from wolfsden.cz ([37.205.8.62]:47528) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1s5CBN-00028P-4E for 70112@debbugs.gnu.org; Thu, 09 May 2024 18:24:09 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 253BA2840BA; Thu, 9 May 2024 22:24:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1715293450; bh=7lRJgKWvceax2Oa6N87wZkbB3optIHMtQP20NXKaxV4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=jzJkcUhx8keLq175ANYxSOLPoHvLEyRRCj/sipa8crX5LMECoCaMZmmgFfwlN304c SFrCq1M1Nn6xQGvncqqQx5sJRTQi/eShzRpIKU8xa1jxJrHAIgonVMxaIr7omkc0vh o9SLBGLvdl+9CC5e9fMF0mKAPUBe+gLgNuFXTfohicdr95L2rJTKoXDMhJIys/UoED 0j1xYw9lcaxfyrZnwj+xDOxYx1VC6tvaP9B2wqjihhnJEeF+woy1dFmqqZbzX0pfO8 Zkp4VGBuq3aNcX3i8gwx//L/rbrjaH/ffTUuX271iqjNKilIZlrAmUk8KV0yruvzzI TnBRBNJ5YD7OSOaTzFrl1onyCL/oH8/ydg0g4NcGTlVEP1RchwOXjpSPEOLdHNkyEr uFu/WUuvrpnpfGVH1NXvaX8onC9JyAwY4cMMmLphsWAz8Yw8C9UBjK7FnFa6JeiPXt xDHeLkUcTnuY6pCB0hEXPKy9irb6xaSVULZmg9LSY5y2WbEyHICCxEpmzxhONw/TVr ZGVEC8MIRr34l3jEWB80idm4X7/9M+RpTpDRia8i02rmiGpTbp6e9a3ruC7xQrKxiv qOc3WsT6a/uZUObkqMYISNmfz4b85xqaJ/JL91AR3gT1vdF8O4eChqubhGCNMHmzJb O7k7v1NYiEp5aoo9BgAtbDv8= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-1.2 required=5.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from localhost (unknown [146.70.134.143]) by wolfsden.cz (Postfix) with ESMTPSA id 8283F283F6E; Thu, 9 May 2024 22:24:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1715293449; bh=7lRJgKWvceax2Oa6N87wZkbB3optIHMtQP20NXKaxV4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=cdP1a5h/vMwKKm996kdTms8xIeRDw3zeSfHNxaBQGy9bhYx3qbrKP+DDvc6gxBI6K DfcFPATOzG5WlwO6T0ErYYydkNt3VoMMwTeP2QsXVG17yM2XapNGZGkDPhfm3J08ke PdNBzzicbj2gbFamLIVDowy56KN61IzK5fFsklTdMraZhu6xyehX01CKdcI6niyFAT f7LLPELRnkB291lw57QB04+h0ti36kQK2CCVcNdcwAByaka5hhMyzdd88qywEVXOCS yedcMDNtW6jNiGHsP9aQMPN4noXO9C+NjNhaZorEm+JLSwGTC+4Ui1QpYxl06fobYh B5iRXvI0c9TUgMCehMAQ1/pT9SZwBiCOVH63Gujk/Fmm2WzfRyEj1BwdfNiuBhKnaP oaefFYwSTsdSFAh9V9r1BgKTckmsh6R8uGubltQf6y4SeH6G7eUt4w52sqKwZIvMEA bjT5gTfOfHW5kg31IP2EAnQ/sPdQ+HmuidYr6KWH0f+icjoFuVQ6MjXiJDBQQn6vrZ YzGzj/a/YujwePlR1oASfyJsUnOpJ51IxElcQSjVhCYDibaISuO0uMBYuLSyodXhrK qo4FwU6QeVGaisBNZJcdw3zD7u57EprK/LKu4LaMorqC9zoxgqKP+EfEtWu4yY609J Ka0I9zsTOQAnRN6fC144p91A= From: Tomas Volf <~@wolfsden.cz> To: 70112@debbugs.gnu.org Subject: [PATCH v2 11/11] gnu: buildah: Switch to gnu-build-system. Date: Fri, 10 May 2024 00:23:14 +0200 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: <4554ead7e7440610c700ba6d5403489f95cfdf80.1715293394.git.~@wolfsden.cz> References: <4554ead7e7440610c700ba6d5403489f95cfdf80.1715293394.git.~@wolfsden.cz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 70112 Cc: Tomas Volf <~@wolfsden.cz> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Buildah is fundamentally similar to podman and provides its own Makefile. This commit switches from go-build-system to gnu-build-system so that the build can be done using `make' instead of reinvention some parts (like documentation) in the guile. The package pretty much follows how podman package looks like. * gnu/packages/containers.scm (buildah)[source]: Reformat. [build-system]: Use gnu-build-system. [arguments]<#:import-path, #:unpack-path, #:go, #:install-source?>: Delete. <#:make-flags>: Set make flags. <#:test-target>: Set, even though the tests are disabled. <#:imported-modules>: Also import (guix build go-build-system) for the remove-go-references phase. <#:phases>{'prepare-install-docs, 'build-docs, 'install-docs}: Delete. {'configure}: Delete. {'set-env, 'check, 'symlink-helpers, 'wrap-buildah, 'remove-go-references} {'install-completions}: New phases. [inputs]: Remove no longer used cni-plugins, conmon, runc. Add bash-minimal. [native-inputs]: Remove gnu-make, add go-1.21 and bats. Change-Id: I0ddd5febb0116a71a857e2a98a9951dbe8bd40d9 --- gnu/packages/containers.scm | 99 +++++++++++++++++++++++-------------- 1 file changed, 62 insertions(+), 37 deletions(-) diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm index 494777cd28..286dc0491e 100644 --- a/gnu/packages/containers.scm +++ b/gnu/packages/containers.scm @@ -611,50 +611,75 @@ (define-public buildah (base32 "07hr2cfp4kblnmva02ap97id5nzhbqigdfvx7c8nyrkfzw0340n0")) (file-name (git-file-name name version)))) - (build-system go-build-system) + (build-system gnu-build-system) (arguments - (list #:import-path "github.com/containers/buildah/cmd/buildah" - #:unpack-path "github.com/containers/buildah" - - ;; Some dependencies require go-1.18 to build. - #:go go-1.18 - - #:tests? #f - #:install-source? #f - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'prepare-install-docs - (lambda* (#:key unpack-path #:allow-other-keys) - (substitute* (string-append "src/" - unpack-path - "/docs/Makefile") - (("../tests/tools/build/go-md2man") - (which "go-md2man"))) - (substitute* (string-append "src/" - unpack-path - "/docs/Makefile") - (("/usr/local") (string-append #$output))))) - (add-after 'build 'build-docs - (lambda* (#:key unpack-path #:allow-other-keys) - (let ((doc (string-append "src/" unpack-path "/docs"))) - (invoke "make" "-C" doc)))) - (add-after 'install 'install-docs - (lambda* (#:key unpack-path #:allow-other-keys) - (let ((doc (string-append "src/" unpack-path "/docs"))) - (invoke "make" "-C" doc "install"))))))) - (inputs (list btrfs-progs - cni-plugins - conmon + (list + #:make-flags + #~(list (string-append "CC=" #$(cc-for-target)) + (string-append "PREFIX=" #$output) + (string-append "GOMD2MAN=" + #$go-github-com-go-md2man "/bin/go-md2man")) + #:tests? #f ; /sys/fs/cgroup not set up in guix sandbox + #:test-target "test-unit" + #:imported-modules + (source-module-closure `(,@%gnu-build-system-modules + (guix build go-build-system))) + #:phases + #~(modify-phases %standard-phases + (delete 'configure) + (add-after 'unpack 'set-env + (lambda _ + ;; When running go, things fail because HOME=/homeless-shelter. + (setenv "HOME" "/tmp") + ;; Required for detecting btrfs in hack/btrfs* due to bug in GNU + ;; Make <4.4 causing CC not to be propagated into $(shell ...) + ;; calls. Can be removed once we update to >4.3. + (setenv "CC" #$(cc-for-target)))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "make" "test-unit") + (invoke "make" "test-conformance") + (invoke "make" "test-integration")))) + (add-after 'install 'symlink-helpers + (lambda _ + (mkdir-p (string-append #$output "/_guix")) + (for-each + (lambda (what) + (symlink (string-append (car what) "/bin/" (cdr what)) + (string-append #$output "/_guix/" (cdr what)))) + ;; Only tools that cannot be discovered via $PATH are + ;; symlinked. Rest is handled in the 'wrap-buildah phase. + `((#$aardvark-dns . "aardvark-dns") + (#$netavark . "netavark"))))) + (add-after 'install 'wrap-buildah + (lambda _ + (wrap-program (string-append #$output "/bin/buildah") + `("CONTAINERS_HELPER_BINARY_DIR" = + (,(string-append #$output "/_guix"))) + `("PATH" suffix + (,(string-append #$crun "/bin") + ,(string-append #$gcc "/bin") ; cpp + ,(string-append #$passt "/bin") + "/run/setuid-programs"))))) + (add-after 'install 'remove-go-references + (@@ (guix build go-build-system) remove-go-references)) + (add-after 'install 'install-completions + (lambda _ + (invoke "make" "install.completions" + (string-append "PREFIX=" #$output))))))) + (inputs (list bash-minimal + btrfs-progs eudev glib gpgme libassuan libseccomp - lvm2 - runc)) + lvm2)) (native-inputs - (list go-github-com-go-md2man - gnu-make + (list bats + go-1.21 + go-github-com-go-md2man pkg-config)) (synopsis "Build @acronym{OCI, Open Container Initiative} images") (description -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Tue May 21 18:01:42 2024 Received: (at 70112-done) by debbugs.gnu.org; 21 May 2024 22:01:42 +0000 Received: from localhost ([127.0.0.1]:51426 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s9XYE-00073X-BA for submit@debbugs.gnu.org; Tue, 21 May 2024 18:01:42 -0400 Received: from mail-wm1-f44.google.com ([209.85.128.44]:45224) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s9XYA-00073P-DR for 70112-done@debbugs.gnu.org; Tue, 21 May 2024 18:01:40 -0400 Received: by mail-wm1-f44.google.com with SMTP id 5b1f17b1804b1-4202959b060so36339985e9.2 for <70112-done@debbugs.gnu.org>; Tue, 21 May 2024 15:01:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1716328826; x=1716933626; darn=debbugs.gnu.org; h=mime-version:message-id:date:subject:to:from:from:to:cc:subject :date:message-id:reply-to; bh=3A4rBnfanBmtetsheYSyAaNHmxiNuw2YU+G5AiTlD4U=; b=TPUSC4oAUb2Hw3McNJtmex/ReZkOOIRm9U3XPt8qvt1vnt7BFYL20bfJIMG5UD547F M2CKnsNQ7doZ5WCEGWuPuyi0SXrf7LLXpyVS33U1PGaxIArafBWctUHNX1pdyR2+GX4U C57R4xE9D1HgJXvRmCA6BRv+7mLY5GmnVkdC3WfLp3A3DJa8vsGg1dvcEeiflaFeiPzX ft0FUIu6zGM92FkEh2wvKNMEJXM3v8aOMeBH5IaKHIfjN1/3txnhu4NErGf+b3Xi1NKl SxGLo9muCL6WII5AZJ5esy05NnGfFfzCpevdSqjnwWn78281exA4a6zRHHsD8rW4NFgJ VdFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716328826; x=1716933626; h=mime-version:message-id:date:subject:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=3A4rBnfanBmtetsheYSyAaNHmxiNuw2YU+G5AiTlD4U=; b=Wj7zrv7UB5Igb+7VpAxtWVURzvQGF2ColOizq4tPBrlex3xaxXkDFMjbMRV2m9XEBV PlV0o5QBnzVouD6i0mGXPWWBTbnTM9hBrOT4L3OcK0sef4s43fBZgvC/0ZUrhrYNR6eI fzOaQ/Msl+hpR5qbaQOWCYLwFWgKW4Ph0wvU7bJBMuOedPrnldyA+DpTpDDu9ADb7MMn AGSquISpiHzQnR15b7eixGc080DrKah8spqylqWRFwcf7yi+KvrCoLYqyb+hI5kMgYyD k3H+coizCrDzOLWP+K5pd1BWFkfmQUZoE+u+3jxn6gIZLFFhTYoRELmm09iJp0+kWumQ NO1Q== X-Gm-Message-State: AOJu0YzAqwQTl1CWKvPxfmZc1h6sgbyxDgB7JSQELj2BMXAONf6Kmb4d 6iHLVsWvRR9afBzoi8RF/ZjUGKCPe771M4Ha6AXeIXhCKLlOPaGqBBIhscio X-Google-Smtp-Source: AGHT+IH14FCacBpJaovaWf0uqUzdUAeA4MheYrGnJs6drfHo9KCE5GXlPwjuMOwOo4FnMP20ES1Aqw== X-Received: by 2002:a05:600c:570d:b0:41c:5eb:4f8f with SMTP id 5b1f17b1804b1-420fd2ffc8amr1606885e9.15.1716328826375; Tue, 21 May 2024 15:00:26 -0700 (PDT) Received: from guxtil (bagu-15-b2-v4wan-170076-cust245.vm21.cable.virginm.net. [77.98.0.246]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-41fa90e93absm505956215e9.9.2024.05.21.15.00.25 for <70112-done@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 May 2024 15:00:25 -0700 (PDT) From: Sharlatan Hellseher To: 70112-done@debbugs.gnu.org Subject: [PATCH 00/11] Update container tooling (podman, buildah) Date: Tue, 21 May 2024 23:00:12 +0100 Message-ID: <87plte966r.fsf@gmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 70112-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain Hi, - patches [11/11] 1. [X] [PATCH v2 01/11] gnu: crun: Update to 1.15. 2. [X] [PATCH v2 02/11] gnu: podman: Drop obsolete comment. 3. [X] [PATCH v2 03/11] gnu: podman: Update to 5.0.2. 4. [X] [PATCH v2 04/11] gnu: conmon: Update to 2.1.11. 5. [X] [PATCH v2 05/11] gnu: passt: Update to 2024_03_20.71dd405. 6. [X] [PATCH v2 06/11] gnu: Add catatonit. - Adjust description - Shift homepage above synopsis 7. [X] [PATCH v2 07/11] gnu: Add podman-compose. - Adjust description - Enable tests - Swapt to pyprject-build-system 8. [X] [PATCH v2 08/11] gnu: gvisor-tap-vsock: Remove references to go. 9. [X] [PATCH v2 09/11] gnu: podman: Revamp the package. 10. [X] [PATCH v2 10/11] gnu: buildah: Update to 1.35.3. 11. [X] [PATCH v2 11/11] gnu: buildah: Switch to gnu-build-system. Pushed as 5c5e2a7491..abc62671e0 to master. -- Oleg --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEmEeB3micIcJkGAhndtcnv/Ys0rUFAmZNGW0ACgkQdtcnv/Ys 0rW56w//XC0PVVxs+1c8pRcpp1wpoD+SzBvCt/wFVKSdejcv1Bq2YBw1v8aLkLPt /NPOj/GPLb66aYV7VDIMhz3W/030SqNHe1Ji7xzoeZawlMSkVIrNTf4ZgKJVGLC1 DkMpfvYxYTZ01RXzfa2bcux4dNLrXqlwbthgPmlJhXDVglRbuHMh2RNfJxyf7B1x 94DRHoAeHoSWgYJD229NG98mPmCNn3evIBIg6zv8qwuW6eVvIWGAnAEcJ8wJ4lHw AwGONWgIJoXC+ae8/sJB9m8JxamDscw88VgqVcXfDB9WvTsttzF4/E4vYa6Vvh5t PNlXex99zUS55jkj1mJhitSuc95Y4IMorptf35+ScR7V4ymitj9a8yn0fp2hS0VI t055Cuw+WTBjMHo7bscu9a6t89157tCFy3gpq1Li6Ak7Imda7UpfoqazYdMvGas7 SMKOkV7B5EpVRof9H4K6Pmvx3xpbueXUWXdHB9ha4ctGstrhAigvOV3eNHnuaUbd 0w2/IOpHnNYwBUl+k/YCg22cYN00AWSlwwkrPTF1j1jOwiuaQY18+YXYVPzvH/II pR4+WDAa2PATkH2v9EUFsMmH+qYSgdjm7dxCO6MTRB+q9M4c6R0s2oTd4e6mu6Jf Y/psLY9cAxc24YpFFHmmDILgifEoYrVQnTz3JQubeJbuBYhrcXU= =rDLX -----END PGP SIGNATURE----- --=-=-=-- From unknown Fri Jun 20 07:16:11 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Wed, 19 Jun 2024 11:24:07 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator