From patchwork Mon Jun 7 06:07:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Stewart X-Patchwork-Id: 1488422 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Fz2wN41CMz9sRN for ; Mon, 7 Jun 2021 16:07:48 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id C0C754032E; Mon, 7 Jun 2021 06:07:45 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Fzg18nqHx_Bq; Mon, 7 Jun 2021 06:07:42 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 581C24035C; Mon, 7 Jun 2021 06:07:41 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 5D8E91BF328 for ; Mon, 7 Jun 2021 06:07:39 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 4D7DB834BA for ; Mon, 7 Jun 2021 06:07:39 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id mOhnbWg53Q4o for ; Mon, 7 Jun 2021 06:07:35 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-pf1-f175.google.com (mail-pf1-f175.google.com [209.85.210.175]) by smtp1.osuosl.org (Postfix) with ESMTPS id 30E6483267 for ; Mon, 7 Jun 2021 06:07:35 +0000 (UTC) Received: by mail-pf1-f175.google.com with SMTP id d16so12263695pfn.12 for ; Sun, 06 Jun 2021 23:07:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=I8aPpDyf0y3LOu6/AIT8OJ14xjRHpW9r67Ka/B16QHY=; b=MkW1Ww9XH//MWdY4Cmm02qJxFZ56buxanF9LRHtA+ikyTMC2vDXQ4NLtYyhdYElnAp /INgfMZILdP3CGzapZeM8pf5OByfIuchUDH617xjahdG8bzK2H1e7KjQoIW61FTMygak H14G8DtlMHZtnAonOZANmt8Wzu1K1xE5lrzKy8tFuAb+flClU7NdQ/lgIPCx0ZQ0eqTJ N/zuB33eS+Eof6Cx5uPQ824j3RQRPr4V1nIBnQHqwGA7R46xCxIqphhIRnxiSOMPxqmo d7dFg3073deWb3tpvy42L9xvZLdgGqe9wRN8t2kbiakECUMtCtQ78OQvuKoes90ydzhJ PvBA== X-Gm-Message-State: AOAM530AbhgsuLaANyRlNJhLxCX925p0A6OWsGn7LHnfx29w2wuVlq40 QqViCaz5Y/ZWen78CN1PjEhMr3SLRunkeg== X-Google-Smtp-Source: ABdhPJzv6cldst2RBtv2S2l+G9xu2fCdeXJ9Y6KAb6h7swdqx5dBQPptZIoHDcl9/ah/2HAJWh/bSg== X-Received: by 2002:a65:6114:: with SMTP id z20mr16459554pgu.249.1623046054048; Sun, 06 Jun 2021 23:07:34 -0700 (PDT) Received: from localhost.localdomain (ip68-6-75-212.sb.sd.cox.net. [68.6.75.212]) by smtp.gmail.com with ESMTPSA id v6sm7292341pfi.46.2021.06.06.23.07.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 06 Jun 2021 23:07:33 -0700 (PDT) From: Christian Stewart To: buildroot@buildroot.org Date: Sun, 6 Jun 2021 23:07:29 -0700 Message-Id: <20210607060730.1476825-1-christian@paral.in> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/2] package/docker-engine: bump version to 20.10.7 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Christian Stewart , "Yann E . MORIN" , Thomas Petazzoni Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Drop upstreamed patch fix-port-forwarding-with-ipv6. Upstream commit: d29a55c6c344a536089d6b1bcd92be9cdea20641 Signed-off-by: Christian Stewart Tested-by: Christian Stewart --- ...-port-forwarding-with-ipv6.disable-1.patch | 74 ------------------- package/docker-engine/docker-engine.hash | 2 +- package/docker-engine/docker-engine.mk | 2 +- 3 files changed, 2 insertions(+), 76 deletions(-) delete mode 100644 package/docker-engine/0001-fix-port-forwarding-with-ipv6.disable-1.patch diff --git a/package/docker-engine/0001-fix-port-forwarding-with-ipv6.disable-1.patch b/package/docker-engine/0001-fix-port-forwarding-with-ipv6.disable-1.patch deleted file mode 100644 index c5161ef0db..0000000000 --- a/package/docker-engine/0001-fix-port-forwarding-with-ipv6.disable-1.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 7b9c2905883df5171fda10a364a81b8c6176c8e2 Mon Sep 17 00:00:00 2001 -From: Akihiro Suda -Date: Mon, 26 Apr 2021 15:28:40 +0900 -Subject: [PATCH] fix port forwarding with ipv6.disable=1 - -Make `docker run -p 80:80` functional again on environments with kernel boot parameter `ipv6.disable=1`. - -Fix moby/moby issue 42288 - -Signed-off-by: Akihiro Suda -[Upstream: https://github.com/moby/libnetwork/pull/2635, - https://github.com/moby/moby/pull/42322] -[Rework path/drop test for docker-engine] -Signed-off-by: Peter Korsgaard ---- - vendor/github.com/docker/libnetwork/drivers/bridge/port_mapping.go | 31 +++++++++++++++++++++++++++++++ - 1 file changed, 35 insertions(+), 0 deletion(-) - -diff --git a/vendor/github.com/docker/libnetwork/drivers/bridge/port_mapping.go b/vendor/github.com/docker/libnetwork/drivers/bridge/port_mapping.go -index 946130ec..17bf36f9 100644 ---- a/vendor/github.com/docker/libnetwork/drivers/bridge/port_mapping.go -+++ b/vendor/github.com/docker/libnetwork/drivers/bridge/port_mapping.go -@@ -5,6 +5,7 @@ import ( - "errors" - "fmt" - "net" -+ "sync" - - "github.com/docker/libnetwork/types" - "github.com/ishidawataru/sctp" -@@ -50,6 +51,13 @@ func (n *bridgeNetwork) allocatePortsInternal(bindings []types.PortBinding, cont - bs = append(bs, bIPv4) - } - -+ // skip adding implicit v6 addr, when the kernel was booted with `ipv6.disable=1` -+ // https://github.com/moby/moby/issues/42288 -+ isV6Binding := c.HostIP != nil && c.HostIP.To4() == nil -+ if !isV6Binding && !IsV6Listenable() { -+ continue -+ } -+ - // Allocate IPv6 Port mappings - // If the container has no IPv6 address, allow proxying host IPv6 traffic to it - // by setting up the binding with the IPv4 interface if the userland proxy is enabled -@@ -211,3 +219,26 @@ func (n *bridgeNetwork) releasePort(bnd types.PortBinding) error { - - return portmapper.Unmap(host) - } -+ -+var ( -+ v6ListenableCached bool -+ v6ListenableOnce sync.Once -+) -+ -+// IsV6Listenable returns true when `[::1]:0` is listenable. -+// IsV6Listenable returns false mostly when the kernel was booted with `ipv6.disable=1` option. -+func IsV6Listenable() bool { -+ v6ListenableOnce.Do(func() { -+ ln, err := net.Listen("tcp6", "[::1]:0") -+ if err != nil { -+ // When the kernel was booted with `ipv6.disable=1`, -+ // we get err "listen tcp6 [::1]:0: socket: address family not supported by protocol" -+ // https://github.com/moby/moby/issues/42288 -+ logrus.Debugf("port_mapping: v6Listenable=false (%v)", err) -+ } else { -+ v6ListenableCached = true -+ ln.Close() -+ } -+ }) -+ return v6ListenableCached -+} --- -2.20.1 - diff --git a/package/docker-engine/docker-engine.hash b/package/docker-engine/docker-engine.hash index 6c55b9a9b9..d07ca33307 100644 --- a/package/docker-engine/docker-engine.hash +++ b/package/docker-engine/docker-engine.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 fd7f5571b1f64f26b5ca520a3e1fefb33c190f3732b931051c23a76bdba5000e docker-engine-20.10.6.tar.gz +sha256 b80142035de46904605fb7b8f18075cd94154f8c3d67ff346ea554d1e9d579b9 docker-engine-20.10.7.tar.gz sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index 10ecbf603a..372717775b 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_ENGINE_VERSION = 20.10.6 +DOCKER_ENGINE_VERSION = 20.10.7 DOCKER_ENGINE_SITE = $(call github,moby,moby,v$(DOCKER_ENGINE_VERSION)) DOCKER_ENGINE_LICENSE = Apache-2.0 From patchwork Mon Jun 7 06:07:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Stewart X-Patchwork-Id: 1488423 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Fz2wg4Km8z9sRN for ; Mon, 7 Jun 2021 16:08:03 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id AB7B140360; Mon, 7 Jun 2021 06:07:59 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id a3xPD3QyNqeZ; Mon, 7 Jun 2021 06:07:56 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 4D47240361; Mon, 7 Jun 2021 06:07:54 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 504A51BF328 for ; Mon, 7 Jun 2021 06:07:40 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 3EB71605EF for ; Mon, 7 Jun 2021 06:07:40 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id KC3OixqR5A_Q for ; Mon, 7 Jun 2021 06:07:36 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.173]) by smtp3.osuosl.org (Postfix) with ESMTPS id 20A4D605CC for ; Mon, 7 Jun 2021 06:07:36 +0000 (UTC) Received: by mail-pf1-f173.google.com with SMTP id z26so12291331pfj.5 for ; Sun, 06 Jun 2021 23:07:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=xWwN3B1+1RAm2sihVhJZPhQP3kquu0f20wTnVYjo1i0=; b=a3y+nlViLRHeBC7fLaPjhwYcSJuwB9qP5LjuYSUy+37b3CQfn0pH2UUoDX9YsT5Mt0 LeXVUe/QOs2z+eN5L5UDCLbGIXcveXXScjd64QJH+2dM2sqr79tr29MRr59qqsHH6QQg SIz3alellcUnYgEfL+msf2KL5DPUfsKx4ybHH65Rmif8uY8yPSRkGXvrZ8x0uoDy87o1 vShyGiZ0HEy+E00GhK0gXlAnF2nJ/OsqvNsj0l5oougX9z2tvYm52pjr6RryDwjfMMUm CtL3sdHw+2andRSeB9kDsOvOeuDqC9DynV77eRV6Xn+TqA3m8vArZEiKRMQzcRJD0rEo v5iA== X-Gm-Message-State: AOAM531FES+np2emlyNcQPttLE45mR+csCrL8r8v4Osz+Dxn2nkHi192 BmO7cZFZx4uehNHD11pJiSevOHqPmJE8pA== X-Google-Smtp-Source: ABdhPJx0j2XFwQ+bBJg4npHrcz+7FJDcCGeLYoTzVV48iL4eWiNi+ptQ2Lc1R4V/BH0xK6O4zsKPhQ== X-Received: by 2002:a65:458b:: with SMTP id o11mr16423301pgq.51.1623046055358; Sun, 06 Jun 2021 23:07:35 -0700 (PDT) Received: from localhost.localdomain (ip68-6-75-212.sb.sd.cox.net. [68.6.75.212]) by smtp.gmail.com with ESMTPSA id v6sm7292341pfi.46.2021.06.06.23.07.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 06 Jun 2021 23:07:35 -0700 (PDT) From: Christian Stewart To: buildroot@buildroot.org Date: Sun, 6 Jun 2021 23:07:30 -0700 Message-Id: <20210607060730.1476825-2-christian@paral.in> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210607060730.1476825-1-christian@paral.in> References: <20210607060730.1476825-1-christian@paral.in> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 2/2] package/docker-cli: bump version to 20.10.7 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Christian Stewart , "Yann E . MORIN" , Thomas Petazzoni Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Christian Stewart --- package/docker-cli/docker-cli.hash | 2 +- package/docker-cli/docker-cli.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/docker-cli/docker-cli.hash b/package/docker-cli/docker-cli.hash index bb3444c270..6d380c2fd8 100644 --- a/package/docker-cli/docker-cli.hash +++ b/package/docker-cli/docker-cli.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 eda53b96ab83a59502df2e5e00ab7ee867243259407ef454be55e695303c1113 docker-cli-20.10.6.tar.gz +sha256 0a7848b1b5031483de075433506d0448ddf834368d9c73770e453e0b89b49747 docker-cli-20.10.7.tar.gz sha256 2d81ea060825006fc8f3fe28aa5dc0ffeb80faf325b612c955229157b8c10dc0 LICENSE diff --git a/package/docker-cli/docker-cli.mk b/package/docker-cli/docker-cli.mk index 9c3690e4c3..24fd26a8c6 100644 --- a/package/docker-cli/docker-cli.mk +++ b/package/docker-cli/docker-cli.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_CLI_VERSION = 20.10.6 +DOCKER_CLI_VERSION = 20.10.7 DOCKER_CLI_SITE = $(call github,docker,cli,v$(DOCKER_CLI_VERSION)) DOCKER_CLI_LICENSE = Apache-2.0