From patchwork Fri Aug 11 10:46:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 52739 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id EEC9A27BBE2; Fri, 11 Aug 2023 11:48:29 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id E9DEE27BBE9 for ; Fri, 11 Aug 2023 11:48:28 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qUPgf-0002Pj-VC; Fri, 11 Aug 2023 06:48:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qUPgY-0002Ns-7w for guix-patches@gnu.org; Fri, 11 Aug 2023 06:48:03 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qUPgX-00038c-Vw for guix-patches@gnu.org; Fri, 11 Aug 2023 06:48:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qUPgX-0000Qf-SC for guix-patches@gnu.org; Fri, 11 Aug 2023 06:48:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64910] [PATCH v2 1/3] gnu: runc: Update to 1.1.9. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 11 Aug 2023 10:48:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64910 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64910@debbugs.gnu.org Cc: Hilton Chain Received: via spool by 64910-submit@debbugs.gnu.org id=B64910.16917508261420 (code B ref 64910); Fri, 11 Aug 2023 10:48:01 +0000 Received: (at 64910) by debbugs.gnu.org; 11 Aug 2023 10:47:06 +0000 Received: from localhost ([127.0.0.1]:45006 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qUPfd-0000Mq-NR for submit@debbugs.gnu.org; Fri, 11 Aug 2023 06:47:05 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:59670) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qUPfb-0000Mg-NA for 64910@debbugs.gnu.org; Fri, 11 Aug 2023 06:47:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1691750817; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ulDU64f4CZXV+zwq6/aJ3wx4CtSZPV1KqGbxuKhnIwU=; b=zrQeXdSNZeG2kY0m3KCVp/p2i6gj+jo2mTcE8AwszAOq05yiXLgE+u2NyEhgOoqiS8pscP 67fU6WYTMo4HYOBypt3JrfdgvNG8iLlYRuX40YNoS8EkSNZg+78+A1NHHXbXojlpIWpPTy nHPZayPkgQEOxwLD84jHZ8fYaR9OkLaU/Y6VZiiwd0uk7IMWaZah9RYWKFMxryX8VGGLvL fAm/G5+rlZg9wdo5BADqdncZjOzD1AIFw9XMmfKSBB7hyVBl1nm5JjX+1+cZuo8zvtXpqT 94Bs/HHtZK/CCvO3HAT6aO9PLefPEKcMO7YPOVZzZsXdv35uWa/MGmIV/2pABA== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space Date: Fri, 11 Aug 2023 18:46:27 +0800 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Spamd-Bar: -- X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches X-Patchwork-Original-From: Hilton Chain via Guix-patches via From: Hilton Chain Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/virtualization.scm (runc): Update to 1.1.9. --- gnu/packages/virtualization.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 9556fbc61e..9410b674a3 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -2002,7 +2002,7 @@ (define-public looking-glass-client (define-public runc (package (name "runc") - (version "1.1.1") + (version "1.1.9") (source (origin (method url-fetch) (uri (string-append @@ -2011,7 +2011,7 @@ (define-public runc (file-name (string-append name "-" version ".tar.xz")) (sha256 (base32 - "0jx56x49dgkygdbrfb3pmxycy1n37arj97jra8n422dj36xz1hbm")))) + "1hhxqwg0mblrgv2aim3scfd9xg13l6i22j124sdma5sf2fzgx5bn")))) (build-system go-build-system) (arguments '(#:import-path "github.com/opencontainers/runc" From patchwork Fri Aug 11 10:46:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 52740 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 13A5927BBEA; Fri, 11 Aug 2023 11:48:37 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 869B727BBE2 for ; Fri, 11 Aug 2023 11:48:36 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qUPgh-0002S3-Ep; Fri, 11 Aug 2023 06:48:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qUPgZ-0002OH-1D for guix-patches@gnu.org; Fri, 11 Aug 2023 06:48:04 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qUPgY-00038k-P7 for guix-patches@gnu.org; Fri, 11 Aug 2023 06:48:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qUPgY-0000Qp-8J for guix-patches@gnu.org; Fri, 11 Aug 2023 06:48:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64910] [PATCH v2 2/3] gnu: containerd: Update to 1.6.22. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 11 Aug 2023 10:48:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64910 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64910@debbugs.gnu.org Cc: Hilton Chain Received: via spool by 64910-submit@debbugs.gnu.org id=B64910.16917508291436 (code B ref 64910); Fri, 11 Aug 2023 10:48:02 +0000 Received: (at 64910) by debbugs.gnu.org; 11 Aug 2023 10:47:09 +0000 Received: from localhost ([127.0.0.1]:45009 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qUPfh-0000N6-0n for submit@debbugs.gnu.org; Fri, 11 Aug 2023 06:47:09 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:59676) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qUPff-0000My-0L for 64910@debbugs.gnu.org; Fri, 11 Aug 2023 06:47:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1691750820; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=GEWbImCaJMcGxEymmY0LJ7OikTQuZ8TcU6PVruqf9Wg=; b=qFM0j/RiTIS0AP8jzAc2YNKwqNmeAtTGyptjb/t5jzpo5OP+pTFG2hZ+3o4rgCsqb0v0vK UKCc1FfNjYIf+ssCeMMBjpgt/2F9mwvPUdEv+PMyc4yQqLetyY6zTXlvvnC+a67AzL4CFq NqWG/vQuZjiV8pHdWwCh7/nLq/hD8HlokyhAD2BXazRZWAtcCqo4GtSInPgu3d1U0OUSgl OgBblky+GXFSc35+2s/tQX0gSM/4wm+uc1saWoPk8OI++O9UPH6rPfJ6wl2Hy4qovyd7Yf eNtKRgQI9hvqNQhCZK+JWNccjmHl1oerQGsZW8DqYtZUD3N8oy0egpNMvi9mJg== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space Date: Fri, 11 Aug 2023 18:46:28 +0800 Message-ID: <69b56dbf3a55f19e0ac9232eab0e3003a5c380d2.1691750473.git.hako@ultrarare.space> In-Reply-To: References: MIME-Version: 1.0 X-Spamd-Bar: -- X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches X-Patchwork-Original-From: Hilton Chain via Guix-patches via From: Hilton Chain Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/docker.scm (containerd): Update to 1.6.22. [#:phases]: Patch Runtime name. --- gnu/packages/docker.scm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index 0b2a18d661..3815824202 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -177,7 +177,7 @@ (define-public python-docker-pycreds (define-public containerd (package (name "containerd") - (version "1.6.6") + (version "1.6.22") (source (origin (method git-fetch) @@ -186,7 +186,7 @@ (define-public containerd (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1vsl747i3wyy68j4lp4nprwxadbyga8qxlrk892afcd2990zp5mr")) + (base32 "1m31y00sq2m76m1jiq4znws8gxbgkh5adklvqibxiz1b96vvwjk8")) (patches (search-patches "containerd-create-pid-file.patch")))) (build-system go-build-system) @@ -215,7 +215,12 @@ (define-public containerd (("DefaultRuntimeName: \"runc\"") (string-append "DefaultRuntimeName: \"" (search-input-file inputs "/sbin/runc") - "\""))) + "\"")) + ;; ContainerdConfig.Runtimes + (("\"runc\":") + (string-append "\"" + (search-input-file inputs "/sbin/runc") + "\":"))) (substitute* "vendor/github.com/containerd/go-runc/runc.go" (("DefaultCommand[ \t]*=.*") (string-append "DefaultCommand = \"" From patchwork Fri Aug 11 10:46:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 52738 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 1D52627BBE2; Fri, 11 Aug 2023 11:48:14 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 52B0327BBE9 for ; Fri, 11 Aug 2023 11:48:13 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qUPgh-0002S4-KI; Fri, 11 Aug 2023 06:48:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qUPgZ-0002OI-1D for guix-patches@gnu.org; Fri, 11 Aug 2023 06:48:04 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qUPgY-00038m-PS for guix-patches@gnu.org; Fri, 11 Aug 2023 06:48:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qUPgY-0000Qy-Ky for guix-patches@gnu.org; Fri, 11 Aug 2023 06:48:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64910] [PATCH v2 3/3] gnu: docker: Update to 20.10.25. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 11 Aug 2023 10:48:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64910 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64910@debbugs.gnu.org Cc: Hilton Chain Received: via spool by 64910-submit@debbugs.gnu.org id=B64910.16917508331453 (code B ref 64910); Fri, 11 Aug 2023 10:48:02 +0000 Received: (at 64910) by debbugs.gnu.org; 11 Aug 2023 10:47:13 +0000 Received: from localhost ([127.0.0.1]:45012 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qUPfl-0000NN-BY for submit@debbugs.gnu.org; Fri, 11 Aug 2023 06:47:13 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:40894) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qUPfj-0000NF-0Y for 64910@debbugs.gnu.org; Fri, 11 Aug 2023 06:47:11 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1691750824; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=XJX94Ke927jebUuZbHbTuIcfDuYk6oVgVSJx0TLCrFA=; b=nZ+uwxVjhsM37TUkx4epu38K77D96Q8Pf9DrBbCuzXzpJxhRVCcgCc2cA8rGE43OvwtlMb BKwz1lZ1ft4srjPQRY9g1WGC2Qt/Aucjd1+8zh046m4PAY8uPok7A3d84FpgikI6nW8XSg qxuC39h+49h2b9XRqDL1OWrgpIal40fGlaNxTiDrmV5p0t97tFPwkKk7rqZXMdLqwDSje7 bvWCXLAq9SVpTJkwRpEAtxG7WhPtK0JhCH9+Kt+mW7pGSCYg2b3n83qt7yRSg9yKIDB5pt oTR+yZU7Jgz5sC5ZYe42Pe3YtASBavyhlbPcyjVVovJJS3EyVRLWFnKn+NMB2Q== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space Date: Fri, 11 Aug 2023 18:46:29 +0800 Message-ID: <0a5220aced12ffbec1d7b09e97e50b7df5fe2d10.1691750473.git.hako@ultrarare.space> In-Reply-To: References: MIME-Version: 1.0 X-Spamd-Bar: -- X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches X-Patchwork-Original-From: Hilton Chain via Guix-patches via From: Hilton Chain Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/docker.scm (%docker-version): Update to 20.10.25. (docker-libnetwork): Update to 20.10-2.3f00484. (docker)[native-inputs]: Replace go with go-1.19. --- gnu/packages/docker.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index 3815824202..3b809feb67 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -54,7 +54,7 @@ (define-module (gnu packages docker) ;; Note - when changing Docker versions it is important to update the versions ;; of several associated packages (docker-libnetwork and go-sctp). -(define %docker-version "20.10.17") +(define %docker-version "20.10.25") (define-public python-docker (package @@ -264,9 +264,9 @@ (define docker-libnetwork ;; the branch that Docker uses, as can be seen in the 'vendor.conf' Docker ;; source file. NOTE - It is important that this version is kept in sync ;; with the version of Docker being used. - (let ((commit "f6ccccb1c082a432c2a5814aaedaca56af33d9ea") + (let ((commit "3f0048413d95802b9c6c836eba06bfc54f9dbd03") (version (version-major+minor %docker-version)) - (revision "1")) + (revision "2")) (package (name "docker-libnetwork") (version (git-version version revision commit)) @@ -279,7 +279,7 @@ (define docker-libnetwork (file-name (git-file-name name version)) (sha256 (base32 - "0nxpr0h0smv4n641g41vxibr5r85ixfcvs9cp3c4fc7zvrhjc49s")) + "185i5ji7dwkv41zmb8s3d7i5gg72wivcj1l4bhr1lb3a1vy2hcxc")) ;; Delete bundled ("vendored") free software source code. (modules '((guix build utils))) (snippet '(delete-file-recursively "vendor")))) @@ -330,7 +330,7 @@ (define-public docker (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0hn7fg717rggwk6dbicrwa7aglqp7dp0jp5rvn6p9gfcnrp2w97d")))) + (base32 "1q5vc6f5fzzxsvv1kwdky56fr1jiy9199m3vxqh4mz85qr067cmn")))) (build-system gnu-build-system) (arguments (list @@ -591,7 +591,7 @@ (define-public docker xz)) (native-inputs (list eudev ; TODO: Should be propagated by lvm2 (.pc -> .pc) - go gotestsum pkg-config)) + go-1.19 gotestsum pkg-config)) (synopsis "Container component library and daemon") (description "This package provides a framework to assemble specialized container systems. It includes components for orchestration, image @@ -612,7 +612,7 @@ (define-public docker-cli (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0ksicj4iqvgp9jabd4xmhkf3vax6dwn4f5dsr73bdqj4mf3ahav0")))) + (base32 "0qy35vvnl4lf9w6dr9n7yfqvzhzm7m3sl2ai275apbhygwgcsbss")))) (build-system go-build-system) (arguments `(#:import-path "github.com/docker/cli"