From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id 2PtULB0+FGM9MAEAbAwnHQ (envelope-from ) for ; Sun, 04 Sep 2022 07:56:45 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id yBp5Kx0+FGMRPwAAG6o9tA (envelope-from ) for ; Sun, 04 Sep 2022 07:56:45 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 9ED7314408 for ; Sun, 4 Sep 2022 07:56:44 +0200 (CEST) Received: from localhost ([::1]:37116 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oUicd-0006aH-Oq for larch@yhetil.org; Sun, 04 Sep 2022 01:56:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39210) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oUiby-0006ZC-IQ for guix-patches@gnu.org; Sun, 04 Sep 2022 01:56:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54613) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oUiby-0008De-6V for guix-patches@gnu.org; Sun, 04 Sep 2022 01:56:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oUiby-00081d-2a for guix-patches@gnu.org; Sun, 04 Sep 2022 01:56:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57571] [PATCH]: Update podman to 4.2.0. Resent-From: Zhu Zihao Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 04 Sep 2022 05:56:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 57571 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57571@debbugs.gnu.org X-Debbugs-Original-To: guix-patches Received: via spool by submit@debbugs.gnu.org id=B.166227090630782 (code B ref -1); Sun, 04 Sep 2022 05:56:01 +0000 Received: (at submit) by debbugs.gnu.org; 4 Sep 2022 05:55:06 +0000 Received: from localhost ([127.0.0.1]:43312 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oUib3-00080Q-NT for submit@debbugs.gnu.org; Sun, 04 Sep 2022 01:55:06 -0400 Received: from lists.gnu.org ([209.51.188.17]:59886) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oUib1-00080F-5u for submit@debbugs.gnu.org; Sun, 04 Sep 2022 01:55:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39164) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oUiay-0006Ii-F5 for guix-patches@gnu.org; Sun, 04 Sep 2022 01:55:02 -0400 Received: from mail-m973.mail.163.com ([123.126.97.3]:30737) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oUias-0007tW-8u for guix-patches@gnu.org; Sun, 04 Sep 2022 01:54:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-ID:MIME-Version; bh=g0Sf5 Mc/lu+cKAjmKK+As0IdVCia6CpjdI4DxsmyHb4=; b=qANqMa6xrXZXq9lLy1zyK zWT26x0dKMfe5Tgn71obTcZOYG2KwUo7FvO/7/s4lRmOigs3iAbtfz6e1+hOYdVM 9XRGltDtjD8YRhrZD9DEaU64cSKFtNpaOKNmQW7FcGZQ0aqMVxcp56lE4I2Ah59C /IciL8WnA83IOAjJQDmQpU= Received: from asus-laptop (unknown [27.38.249.43]) by smtp3 (Coremail) with SMTP id G9xpCgCXM5WgPRRjXzTaag--.53298S2; Sun, 04 Sep 2022 13:54:42 +0800 (CST) User-agent: mu4e 1.8.9; emacs 29.0.50 From: Zhu Zihao Date: Sun, 04 Sep 2022 13:53:59 +0800 Message-ID: <86czcbbs6a.fsf@163.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-CM-TRANSID: G9xpCgCXM5WgPRRjXzTaag--.53298S2 X-Coremail-Antispam: 1Uf129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UbIYCTnIWIevJa73UjIFyTuYvj4REmhzUUUUU X-Originating-IP: [27.38.249.43] X-CM-SenderInfo: pdoosuxxwbztlvw6il2tof0z/xtbBaxdyr1et6X3IegAAs9 Received-SPF: pass client-ip=123.126.97.3; envelope-from=all_but_last@163.com; helo=mail-m973.mail.163.com 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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1662271005; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:list-id:list-help:list-unsubscribe:list-subscribe: list-post:dkim-signature; bh=g0Sf5Mc/lu+cKAjmKK+As0IdVCia6CpjdI4DxsmyHb4=; b=vBFEUFAQn3mrJdSFm0cQhp0a2f/5eLTe1HvUPP6EQSEHBFbMydk9yDU57rsmiqMV6fNMp+ nYHoQYdB2qmtuyUs7qHXUdiXAFw/88I3qUO3V7bG69trruxRK7hefKa+NF6J6woFG3B/oB VtLElChGMsui+2OPWqn51MbClmQ3TqUkoF8nrQ6B4cGEsxxzBa/0huK6vTWKbjbBeVAZy9 LnWjL/veyeJTMgXMhqXim2ge+FxQRf8hrBQlrO0kn3iTJ+gMUPFZHpDCELXp8XHZT/EZy5 gwy5SdaVFKIM7Ah1l1lJbmQs7FWV75j8IqnXBrCYfI+owsrgOQnSfXGJXfacpQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1662271005; a=rsa-sha256; cv=none; b=JBX0bxITPwOZk20B4A6xXmcRKLP17atRPwDcLnMGBC7U2kladunIl3QoiAnKRs/MwLMfs9 u1mtXkzHE01tVMh+PWlvmO7QTuTk8hOXFB7K+S/FFHAgPfEbkyKCKLbzsvaxupls0S168r +gZiJeYUJDJh1zt+3nYoYtSgJIrtEzChbXZ9LF5Dhx5qCKxi2P0N11eSV9PUpoIJgi+eeO SYajZeoIaQTu0AKB3TCDEMiUMdlEXxVboWo4s/Y/bckzYW6NbPtqZG2FKkaxLJr2kOgWrG 08bllh17C5AbIA155p3fiLvtZZQCMyn2Rqk0J+TKmEWDNN0KdNtWD3wue69L0A== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=163.com header.s=s110527 header.b=qANqMa6x; dmarc=fail reason="SPF not aligned (relaxed)" header.from=163.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: 4.62 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=163.com header.s=s110527 header.b=qANqMa6x; dmarc=fail reason="SPF not aligned (relaxed)" header.from=163.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 9ED7314408 X-Spam-Score: 4.62 X-Migadu-Scanner: scn0.migadu.com X-TUID: SkLLlGJCMY49 --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0001-gnu-podman-Use-G-expressions.patch Content-Transfer-Encoding: quoted-printable >From ad34900d79073e37fe5e4794aa7de2c0b7980401 Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Sun, 4 Sep 2022 13:23:29 +0800 Subject: [PATCH 1/2] gnu: podman: Use G-expressions. * gnu/packages/containers.scm (podman)[arguments]: Use G-expressions. --- gnu/packages/containers.scm | 74 +++++++++++++++++++------------------ 1 file changed, 39 insertions(+), 35 deletions(-) diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm index a156f4191c..32d772f16c 100644 --- a/gnu/packages/containers.scm +++ b/gnu/packages/containers.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright =C2=A9 2021 Timmy Douglas ;;; Copyright =C2=A9 2022 Tobias Geerinckx-Rice +;;; Copyright =C2=A9 2022 Zhu Zihao ;;; ;;; This file is part of GNU Guix. ;;; @@ -284,41 +285,44 @@ (define-public podman =20 (build-system gnu-build-system) (arguments - `(#:make-flags (list ,(string-append "CC=3D" (cc-for-target)) - (string-append "PREFIX=3D" %output)) - #:tests? #f ; /sys/fs/cgroup not set up in guix sandbox - #:test-target "test" - #: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=3D/homeless-shelter. - (setenv "HOME" "/tmp"))) - (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* (find-files "libpod" "\\.go") - (("exec.LookPath[(][\"]slirp4netns[\"][)]") - (string-append "exec.LookPath(\"" - (which "slirp4netns") "\")"))) - (substitute* "hack/install_catatonit.sh" - (("CATATONIT_PATH=3D\"[^\"]+\"") - (string-append "CATATONIT_PATH=3D" (which "true")= ))) - (substitute* "vendor/github.com/containers/common/pk= g/config/config_linux.go" - (("/usr/local/libexec/podman") - (string-append (assoc-ref %outputs "out") "/bin")= )) - (substitute* "vendor/github.com/containers/common/pk= g/config/default.go" - (("/usr/libexec/podman/conmon") (which "conmon")) - (("/usr/local/libexec/cni") - (string-append (assoc-ref %build-inputs "cni-plug= ins") - "/bin")) - (("/usr/bin/crun") (which "crun")))))))) + (list + #:make-flags + #~(list #$(string-append "CC=3D" (cc-for-target)) + (string-append "PREFIX=3D" #$output)) + #:tests? #f ; /sys/fs/cgroup not set up in guix san= dbox + #:test-target "test" + #: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=3D/homeless-shelter. + (setenv "HOME" "/tmp"))) + (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* (find-files "libpod" "\\.go") + (("exec.LookPath[(][\"]slirp4netns[\"][)]") + (string-append "exec.LookPath(\"" + (which "slirp4netns") "\")"))) + (substitute* "hack/install_catatonit.sh" + (("CATATONIT_PATH=3D\"[^\"]+\"") + (string-append "CATATONIT_PATH=3D" (which "true")))) + (substitute* "vendor/github.com/containers/common/pkg/config= /config_linux.go" + (("/usr/local/libexec/podman") + (string-append #$output "/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")))))))) (inputs (list btrfs-progs cni-plugins --=20 2.37.2 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0002-gnu-podman-Update-to-4.2.0.patch >From bc90eae17b851f8cd8a43a7be254fe85a4dc0098 Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Sun, 4 Sep 2022 13:28:30 +0800 Subject: [PATCH 2/2] gnu: podman: Update to 4.2.0. * gnu/packages/containers.scm (podman): Update to 4.2.0. --- 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 32d772f16c..2c7e7ae9c4 100644 --- a/gnu/packages/containers.scm +++ b/gnu/packages/containers.scm @@ -272,7 +272,7 @@ (define-public cni-plugins (define-public podman (package (name "podman") - (version "3.4.4") + (version "4.2.0") (source (origin (method git-fetch) @@ -280,7 +280,7 @@ (define-public podman (url "https://github.com/containers/podman") (commit (string-append "v" version)))) (sha256 - (base32 "1q09qsl1wwiiy5njvb97n1j5f5jin4ckmzj5xbdfs28czb2kx3g5")) + (base32 "00wyjppd11hznmals9ax4s2qjklj6p1vfz4jjkp50bk8q4blxfbj")) (file-name (git-file-name name version)))) (build-system gnu-build-system) -- 2.37.2 --=-=-= Content-Type: text/plain -- Retrieve my PGP public key: gpg --recv-keys 481F5EEEBA425ADC13247C76A6E672D981B8E744 Zihao --=-=-=--