From 05ba57e006d8a986ca0182b4e0830b9807aa7a58 Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Thu, 15 Apr 2021 18:10:56 +0200 Subject: [PATCH] Bump Docker to 20.10.6 (#1328) Bump Docker to latest release 20.10.6. Also make sure to upgrade docker-proxy with various IPv6 releated features and fixes. --- .../0001-docker-add-AppArmor-support.patch | 10 +-- .../0002-network-manager-wpa_supplicant.patch | 16 ++-- buildroot-patches/0003-Fix-dhcp-client.patch | 12 +-- ...ware-Allow-to-deploy-multiple-firmwa.patch | 76 +++++++++++++++++++ ...rmware-add-RTL87XX-RTL88XX-Bluetooth.patch | 74 ++++++++++++++++++ ...ocker-engine-bump-version-to-20.10.6.patch | 39 ++++++++++ ...kage-runc-bump-to-version-1.0.0-rc93.patch | 39 ++++++++++ ...e-docker-cli-bump-version-to-20.10.6.patch | 39 ++++++++++ ...-proxy-bump-version-to-b3507428be5b.patch} | 29 +++---- buildroot/package/docker-cli/docker-cli.hash | 2 +- buildroot/package/docker-cli/docker-cli.mk | 2 +- .../package/docker-engine/docker-engine.hash | 2 +- .../package/docker-engine/docker-engine.mk | 2 +- .../package/docker-proxy/docker-proxy.hash | 2 +- .../package/docker-proxy/docker-proxy.mk | 2 +- buildroot/package/runc/runc.hash | 2 +- buildroot/package/runc/runc.mk | 2 +- 17 files changed, 310 insertions(+), 40 deletions(-) create mode 100644 buildroot-patches/0004-package-rpi-firmware-Allow-to-deploy-multiple-firmwa.patch create mode 100644 buildroot-patches/0005-package-linux-firmware-add-RTL87XX-RTL88XX-Bluetooth.patch create mode 100644 buildroot-patches/0006-package-docker-engine-bump-version-to-20.10.6.patch create mode 100644 buildroot-patches/0007-package-runc-bump-to-version-1.0.0-rc93.patch create mode 100644 buildroot-patches/0008-package-docker-cli-bump-version-to-20.10.6.patch rename buildroot-patches/{0004-docker-proxy-Bump-version.patch => 0009-package-docker-proxy-bump-version-to-b3507428be5b.patch} (58%) diff --git a/buildroot-patches/0001-docker-add-AppArmor-support.patch b/buildroot-patches/0001-docker-add-AppArmor-support.patch index b9923650c..0b0a4fe12 100644 --- a/buildroot-patches/0001-docker-add-AppArmor-support.patch +++ b/buildroot-patches/0001-docker-add-AppArmor-support.patch @@ -1,8 +1,8 @@ -From f8074c7dbf7966fd15edd897130825684abe05e9 Mon Sep 17 00:00:00 2001 -Message-Id: +From 9c98c07abbe9ee675ec588ad7c15f0285e8a0f07 Mon Sep 17 00:00:00 2001 +Message-Id: <9c98c07abbe9ee675ec588ad7c15f0285e8a0f07.1618500237.git.stefan@agner.ch> From: Pascal Vizeli Date: Mon, 13 Jan 2020 12:27:06 +0000 -Subject: [PATCH 1/5] docker: add AppArmor support +Subject: [PATCH 1/9] docker: add AppArmor support Signed-off-by: Pascal Vizeli Signed-off-by: Stefan Agner @@ -11,7 +11,7 @@ Signed-off-by: Stefan Agner 1 file changed, 5 insertions(+) diff --git a/package/docker-containerd/docker-containerd.mk b/package/docker-containerd/docker-containerd.mk -index 626889e5f4..7c74da708f 100644 +index e229d9cb54..e968518a69 100644 --- a/package/docker-containerd/docker-containerd.mk +++ b/package/docker-containerd/docker-containerd.mk @@ -30,6 +30,11 @@ DOCKER_CONTAINERD_DEPENDENCIES += libapparmor @@ -27,5 +27,5 @@ index 626889e5f4..7c74da708f 100644 DOCKER_CONTAINERD_DEPENDENCIES += libseccomp host-pkgconf DOCKER_CONTAINERD_TAGS += seccomp -- -2.30.1 +2.31.1 diff --git a/buildroot-patches/0002-network-manager-wpa_supplicant.patch b/buildroot-patches/0002-network-manager-wpa_supplicant.patch index 10723f9c3..91c9b1c62 100644 --- a/buildroot-patches/0002-network-manager-wpa_supplicant.patch +++ b/buildroot-patches/0002-network-manager-wpa_supplicant.patch @@ -1,10 +1,10 @@ -From b9f13255e5042fc4e8d64b73c2fccee6e7ca0674 Mon Sep 17 00:00:00 2001 -Message-Id: -In-Reply-To: -References: +From dc4191d1393e2d25e1270d6b7c60d780b52f6179 Mon Sep 17 00:00:00 2001 +Message-Id: +In-Reply-To: <9c98c07abbe9ee675ec588ad7c15f0285e8a0f07.1618500237.git.stefan@agner.ch> +References: <9c98c07abbe9ee675ec588ad7c15f0285e8a0f07.1618500237.git.stefan@agner.ch> From: Pascal Vizeli Date: Thu, 16 Apr 2020 14:32:45 +0000 -Subject: [PATCH 2/5] network-manager: wpa_supplicant +Subject: [PATCH 2/9] network-manager: wpa_supplicant Signed-off-by: Pascal Vizeli --- @@ -29,7 +29,7 @@ index 7d44768460..218dc860ff 100644 select BR2_PACKAGE_LIBNDP help diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk -index 4b2ade5b9b..ad170cbe6f 100644 +index 9402564cb4..79ae42e987 100644 --- a/package/network-manager/network-manager.mk +++ b/package/network-manager/network-manager.mk @@ -10,7 +10,7 @@ NETWORK_MANAGER_SOURCE = NetworkManager-$(NETWORK_MANAGER_VERSION).tar.xz @@ -40,7 +40,7 @@ index 4b2ade5b9b..ad170cbe6f 100644 + libgcrypt wpa_supplicant util-linux host-intltool readline libndp NETWORK_MANAGER_LICENSE = GPL-2.0+ (app), LGPL-2.1+ (libnm) NETWORK_MANAGER_LICENSE_FILES = COPYING COPYING.LGPL CONTRIBUTING - NETWORK_MANAGER_SELINUX_MODULES = networkmanager + NETWORK_MANAGER_CPE_ID_VENDOR = gnome -- -2.30.1 +2.31.1 diff --git a/buildroot-patches/0003-Fix-dhcp-client.patch b/buildroot-patches/0003-Fix-dhcp-client.patch index fff9948d0..cfbf4fd72 100644 --- a/buildroot-patches/0003-Fix-dhcp-client.patch +++ b/buildroot-patches/0003-Fix-dhcp-client.patch @@ -1,10 +1,10 @@ -From 0bc96a0b5c81a8c42de169e41ba4d2f65161701d Mon Sep 17 00:00:00 2001 -Message-Id: <0bc96a0b5c81a8c42de169e41ba4d2f65161701d.1614713774.git.stefan@agner.ch> -In-Reply-To: -References: +From 3ca46afd47a195d35bca247c75f02f3c95f1c1ef Mon Sep 17 00:00:00 2001 +Message-Id: <3ca46afd47a195d35bca247c75f02f3c95f1c1ef.1618500237.git.stefan@agner.ch> +In-Reply-To: <9c98c07abbe9ee675ec588ad7c15f0285e8a0f07.1618500237.git.stefan@agner.ch> +References: <9c98c07abbe9ee675ec588ad7c15f0285e8a0f07.1618500237.git.stefan@agner.ch> From: Pascal Vizeli Date: Thu, 16 Apr 2020 12:01:44 +0000 -Subject: [PATCH 3/5] Fix dhcp client +Subject: [PATCH 3/9] Fix dhcp client Signed-off-by: Pascal Vizeli --- @@ -26,5 +26,5 @@ index 988c7792dc..d8f331719a 100644 install-sbinPROGRAMS $(INSTALL) -m 0644 -D package/dhcp/dhclient.conf \ -- -2.30.1 +2.31.1 diff --git a/buildroot-patches/0004-package-rpi-firmware-Allow-to-deploy-multiple-firmwa.patch b/buildroot-patches/0004-package-rpi-firmware-Allow-to-deploy-multiple-firmwa.patch new file mode 100644 index 000000000..d56fa2458 --- /dev/null +++ b/buildroot-patches/0004-package-rpi-firmware-Allow-to-deploy-multiple-firmwa.patch @@ -0,0 +1,76 @@ +From d6d381417d7e1aa442b27a699e790572b2b233d2 Mon Sep 17 00:00:00 2001 +Message-Id: +In-Reply-To: <9c98c07abbe9ee675ec588ad7c15f0285e8a0f07.1618500237.git.stefan@agner.ch> +References: <9c98c07abbe9ee675ec588ad7c15f0285e8a0f07.1618500237.git.stefan@agner.ch> +From: Stefan Agner +Date: Mon, 8 Feb 2021 14:08:28 +0100 +Subject: [PATCH 4/9] package/rpi-firmware: Allow to deploy multiple firmware + files + +Add a new config option to allow a specific list of firmware files to be +deployed. This is useful if the system needs to decide at runtime which +firmware to use. + +Signed-off-by: Stefan Agner +--- + package/rpi-firmware/Config.in | 10 ++++++++++ + package/rpi-firmware/rpi-firmware.mk | 17 +++++++++++++++-- + 2 files changed, 25 insertions(+), 2 deletions(-) + +diff --git a/package/rpi-firmware/Config.in b/package/rpi-firmware/Config.in +index f5a25c5680..ce31ad46de 100644 +--- a/package/rpi-firmware/Config.in ++++ b/package/rpi-firmware/Config.in +@@ -58,8 +58,18 @@ config BR2_PACKAGE_RPI_FIRMWARE_CD + The cut-down firmware, for emergency situations, with only + features required to boot a Linux kernel. + ++config BR2_PACKAGE_RPI_FIRMWARE_CUSTOM_LIST ++ bool "deploy firmware files from list" ++ help ++ Deploy firmware files as listed. ++ + endchoice + ++config BR2_PACKAGE_RPI_FIRMWARE_LIST ++ string ++ default "start.elf start_x.elf start_cd.elf fixup.dat fixup_x.dat fixup_cd.dat" if BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI ++ default "start4.elf start4x.elf start4cd.elf fixup4.dat fixup4x.dat fixup4cd.dat" if BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4 ++ + config BR2_PACKAGE_RPI_FIRMWARE_BOOT + string + default "" if BR2_PACKAGE_RPI_FIRMWARE_DEFAULT && BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI +diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk +index f3d28ef825..58085a8ca8 100644 +--- a/package/rpi-firmware/rpi-firmware.mk ++++ b/package/rpi-firmware/rpi-firmware.mk +@@ -48,11 +48,24 @@ define RPI_FIRMWARE_INSTALL_BOOTCODE_BIN + endef + endif + ++ifeq ($(BR2_PACKAGE_RPI_FIRMWARE_CUSTOM_LIST),y) ++define RPI_FIRMWARE_INSTALL_FIRMWARE ++ $(foreach firmware,$(call qstrip,$(BR2_PACKAGE_RPI_FIRMWARE_LIST)), \ ++ $(INSTALL) -D -m 0644 $(@D)/boot/$(firmware) $(BINARIES_DIR)/rpi-firmware/$(firmware) ++ ) ++endef ++else ++define RPI_FIRMWARE_INSTALL_FIRMWARE ++ $(INSTALL) -D -m 0644 $(@D)/boot/start$(BR2_PACKAGE_RPI_FIRMWARE_BOOT).elf $(BINARIES_DIR)/rpi-firmware/start.elf ++ $(INSTALL) -D -m 0644 $(@D)/boot/fixup$(BR2_PACKAGE_RPI_FIRMWARE_BOOT).dat $(BINARIES_DIR)/rpi-firmware/fixup.dat ++endef ++endif ++ ++ + define RPI_FIRMWARE_INSTALL_IMAGES_CMDS + $(INSTALL) -D -m 0644 package/rpi-firmware/config.txt $(BINARIES_DIR)/rpi-firmware/config.txt + $(INSTALL) -D -m 0644 package/rpi-firmware/cmdline.txt $(BINARIES_DIR)/rpi-firmware/cmdline.txt +- $(INSTALL) -D -m 0644 $(@D)/boot/start$(BR2_PACKAGE_RPI_FIRMWARE_BOOT).elf $(BINARIES_DIR)/rpi-firmware/start.elf +- $(INSTALL) -D -m 0644 $(@D)/boot/fixup$(BR2_PACKAGE_RPI_FIRMWARE_BOOT).dat $(BINARIES_DIR)/rpi-firmware/fixup.dat ++ $(RPI_FIRMWARE_INSTALL_FIRMWARE) + $(RPI_FIRMWARE_INSTALL_BOOTCODE_BIN) + $(RPI_FIRMWARE_INSTALL_DTB) + $(RPI_FIRMWARE_INSTALL_DTB_OVERLAYS) +-- +2.31.1 + diff --git a/buildroot-patches/0005-package-linux-firmware-add-RTL87XX-RTL88XX-Bluetooth.patch b/buildroot-patches/0005-package-linux-firmware-add-RTL87XX-RTL88XX-Bluetooth.patch new file mode 100644 index 000000000..328437f3c --- /dev/null +++ b/buildroot-patches/0005-package-linux-firmware-add-RTL87XX-RTL88XX-Bluetooth.patch @@ -0,0 +1,74 @@ +From de154cd65e16420abc726bd25b5a35c70b81623f Mon Sep 17 00:00:00 2001 +Message-Id: +In-Reply-To: <9c98c07abbe9ee675ec588ad7c15f0285e8a0f07.1618500237.git.stefan@agner.ch> +References: <9c98c07abbe9ee675ec588ad7c15f0285e8a0f07.1618500237.git.stefan@agner.ch> +From: Stefan Agner +Date: Wed, 17 Mar 2021 14:48:43 +0100 +Subject: [PATCH 5/9] package/linux-firmware: add RTL87XX/RTL88XX Bluetooth + firmware + +Add firmware files for Realtek 87XX and 88XX Bluetooth chipsets. Those +are supported by the upstream Realtek Bluetooth driver CONFIG_BT_RTL. + +Signed-off-by: Stefan Agner +--- + package/linux-firmware/Config.in | 10 ++++++++++ + package/linux-firmware/linux-firmware.mk | 21 +++++++++++++++++++++ + 2 files changed, 31 insertions(+) + +diff --git a/package/linux-firmware/Config.in b/package/linux-firmware/Config.in +index a41310ff2a..ba3322fa18 100644 +--- a/package/linux-firmware/Config.in ++++ b/package/linux-firmware/Config.in +@@ -79,6 +79,16 @@ config BR2_PACKAGE_LINUX_FIRMWARE_AR3012_USB + help + Firmware files for Atheros bluetooth chipset AR3012 on USB. + ++config BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX_BT ++ bool "Realtek 87xx Bluetooth" ++ help ++ Realtek 8723a/8723b/8723bs/8723d/8723ds/8761a ++ ++config BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX_BT ++ bool "Realtek 88xx Bluetooth" ++ help ++ Realtek 8821a/8821c/8822b/8822cs/8822cu/8852au ++ + config BR2_PACKAGE_LINUX_FIRMWARE_TI_CC2560 + bool "TI CC2560" + help +diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk +index f23da171c6..9c512ab750 100644 +--- a/package/linux-firmware/linux-firmware.mk ++++ b/package/linux-firmware/linux-firmware.mk +@@ -64,6 +64,27 @@ LINUX_FIRMWARE_FILES += qca/rampatch_usb_00000302.bin qca/nvm_usb_00000302.bin + LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENSE.qcom + endif + ++# Realtek 87xx Bluetooth ++ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX_BT),y) ++LINUX_FIRMWARE_FILES += \ ++ rtl_bt/rtl8723a_fw.bin rtl_bt/rtl8723b_fw.bin \ ++ rtl_bt/rtl8723bs_config-OBDA8723.bin \ ++ rtl_bt/rtl8723bs_fw.bin rtl_bt/rtl8723d_config.bin \ ++ rtl_bt/rtl8723d_fw.bin rtl_bt/rtl8761a_fw.bin ++LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.rtlwifi_firmware.txt ++endif ++ ++# Realtek 88xx Bluetooth ++ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX_BT),y) ++LINUX_FIRMWARE_FILES += \ ++ rtl_bt/rtl8812ae_fw.bin rtl_bt/rtl8821a_fw.bin \ ++ rtl_bt/rtl8821c_config.bin rtl_bt/rtl8821c_fw.bin \ ++ rtl_bt/rtl8822b_config.bin rtl_bt/rtl8822b_fw.bin \ ++ rtl_bt/rtl8822cs_config.bin rtl_bt/rtl8822cs_fw.bin \ ++ rtl_bt/rtl8822cu_config.bin rtl_bt/rtl8822cu_fw.bin ++LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.rtlwifi_firmware.txt ++endif ++ + # rt2501/rt61 + ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT61),y) + LINUX_FIRMWARE_FILES += rt2561.bin rt2561s.bin rt2661.bin +-- +2.31.1 + diff --git a/buildroot-patches/0006-package-docker-engine-bump-version-to-20.10.6.patch b/buildroot-patches/0006-package-docker-engine-bump-version-to-20.10.6.patch new file mode 100644 index 000000000..182237d81 --- /dev/null +++ b/buildroot-patches/0006-package-docker-engine-bump-version-to-20.10.6.patch @@ -0,0 +1,39 @@ +From fd8fc4e0640965e06657782d324eef73f33ed745 Mon Sep 17 00:00:00 2001 +Message-Id: +In-Reply-To: <9c98c07abbe9ee675ec588ad7c15f0285e8a0f07.1618500237.git.stefan@agner.ch> +References: <9c98c07abbe9ee675ec588ad7c15f0285e8a0f07.1618500237.git.stefan@agner.ch> +From: Stefan Agner +Date: Thu, 15 Apr 2021 17:21:47 +0200 +Subject: [PATCH 6/9] package/docker-engine: bump version to 20.10.6 + +Signed-off-by: Stefan Agner +--- + package/docker-engine/docker-engine.hash | 2 +- + package/docker-engine/docker-engine.mk | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/package/docker-engine/docker-engine.hash b/package/docker-engine/docker-engine.hash +index 7e3ce6a5cf..6c55b9a9b9 100644 +--- a/package/docker-engine/docker-engine.hash ++++ b/package/docker-engine/docker-engine.hash +@@ -1,3 +1,3 @@ + # Locally calculated +-sha256 bcf651d75e5c80421e8cd3b0d47f3425e01047cf67aef0eda83b68776905a583 docker-engine-20.10.5.tar.gz ++sha256 fd7f5571b1f64f26b5ca520a3e1fefb33c190f3732b931051c23a76bdba5000e docker-engine-20.10.6.tar.gz + sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE +diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk +index d3f4d81572..c383ef8510 100644 +--- a/package/docker-engine/docker-engine.mk ++++ b/package/docker-engine/docker-engine.mk +@@ -4,7 +4,7 @@ + # + ################################################################################ + +-DOCKER_ENGINE_VERSION = 20.10.5 ++DOCKER_ENGINE_VERSION = 20.10.6 + DOCKER_ENGINE_SITE = $(call github,moby,moby,v$(DOCKER_ENGINE_VERSION)) + + DOCKER_ENGINE_LICENSE = Apache-2.0 +-- +2.31.1 + diff --git a/buildroot-patches/0007-package-runc-bump-to-version-1.0.0-rc93.patch b/buildroot-patches/0007-package-runc-bump-to-version-1.0.0-rc93.patch new file mode 100644 index 000000000..70a188508 --- /dev/null +++ b/buildroot-patches/0007-package-runc-bump-to-version-1.0.0-rc93.patch @@ -0,0 +1,39 @@ +From b169d34718e596e885c34b4fda9af4f85fbc5f1f Mon Sep 17 00:00:00 2001 +Message-Id: +In-Reply-To: <9c98c07abbe9ee675ec588ad7c15f0285e8a0f07.1618500237.git.stefan@agner.ch> +References: <9c98c07abbe9ee675ec588ad7c15f0285e8a0f07.1618500237.git.stefan@agner.ch> +From: Stefan Agner +Date: Thu, 15 Apr 2021 17:22:23 +0200 +Subject: [PATCH 7/9] package/runc: bump to version 1.0.0-rc93 + +Signed-off-by: Stefan Agner +--- + package/runc/runc.hash | 2 +- + package/runc/runc.mk | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/package/runc/runc.hash b/package/runc/runc.hash +index d792947d5f..0f9cfbbe9a 100644 +--- a/package/runc/runc.hash ++++ b/package/runc/runc.hash +@@ -1,3 +1,3 @@ + # Locally computed +-sha256 28378df983a3c586ed3ec8c76a774a9b10f36a0c323590a284b801cce95cc61f runc-1.0.0-rc92.tar.gz ++sha256 e42456078d2f76c925cdd656e4f423b918525d8188521de05e893b6bb473a6f8 runc-1.0.0-rc93.tar.gz + sha256 552a739c3b25792263f731542238b92f6f8d07e9a488eae27e6c4690038a8243 LICENSE +diff --git a/package/runc/runc.mk b/package/runc/runc.mk +index 14689bbde1..c5cb57bdc8 100644 +--- a/package/runc/runc.mk ++++ b/package/runc/runc.mk +@@ -5,7 +5,7 @@ + ################################################################################ + + RUNC_VERSION_MAJOR = 1.0.0 +-RUNC_VERSION_MINOR = rc92 ++RUNC_VERSION_MINOR = rc93 + RUNC_VERSION = $(RUNC_VERSION_MAJOR)-$(RUNC_VERSION_MINOR) + RUNC_SITE = $(call github,opencontainers,runc,v$(RUNC_VERSION)) + RUNC_LICENSE = Apache-2.0 +-- +2.31.1 + diff --git a/buildroot-patches/0008-package-docker-cli-bump-version-to-20.10.6.patch b/buildroot-patches/0008-package-docker-cli-bump-version-to-20.10.6.patch new file mode 100644 index 000000000..2aa971ed4 --- /dev/null +++ b/buildroot-patches/0008-package-docker-cli-bump-version-to-20.10.6.patch @@ -0,0 +1,39 @@ +From 6d3b66a8211a91ca74361a0a3393e9bc529009a1 Mon Sep 17 00:00:00 2001 +Message-Id: <6d3b66a8211a91ca74361a0a3393e9bc529009a1.1618500237.git.stefan@agner.ch> +In-Reply-To: <9c98c07abbe9ee675ec588ad7c15f0285e8a0f07.1618500237.git.stefan@agner.ch> +References: <9c98c07abbe9ee675ec588ad7c15f0285e8a0f07.1618500237.git.stefan@agner.ch> +From: Stefan Agner +Date: Thu, 15 Apr 2021 17:22:40 +0200 +Subject: [PATCH 8/9] package/docker-cli: bump version to 20.10.6 + +Signed-off-by: Stefan Agner +--- + 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 f4787062bb..bb3444c270 100644 +--- a/package/docker-cli/docker-cli.hash ++++ b/package/docker-cli/docker-cli.hash +@@ -1,3 +1,3 @@ + # Locally calculated +-sha256 4ba845f8c7e2e0a2ca1ec6589847159ca8d0d37b609f0e6f78def7a893b9b342 docker-cli-20.10.5.tar.gz ++sha256 eda53b96ab83a59502df2e5e00ab7ee867243259407ef454be55e695303c1113 docker-cli-20.10.6.tar.gz + sha256 2d81ea060825006fc8f3fe28aa5dc0ffeb80faf325b612c955229157b8c10dc0 LICENSE +diff --git a/package/docker-cli/docker-cli.mk b/package/docker-cli/docker-cli.mk +index d710bb2fee..8607070e17 100644 +--- a/package/docker-cli/docker-cli.mk ++++ b/package/docker-cli/docker-cli.mk +@@ -4,7 +4,7 @@ + # + ################################################################################ + +-DOCKER_CLI_VERSION = 20.10.5 ++DOCKER_CLI_VERSION = 20.10.6 + DOCKER_CLI_SITE = $(call github,docker,cli,v$(DOCKER_CLI_VERSION)) + + DOCKER_CLI_LICENSE = Apache-2.0 +-- +2.31.1 + diff --git a/buildroot-patches/0004-docker-proxy-Bump-version.patch b/buildroot-patches/0009-package-docker-proxy-bump-version-to-b3507428be5b.patch similarity index 58% rename from buildroot-patches/0004-docker-proxy-Bump-version.patch rename to buildroot-patches/0009-package-docker-proxy-bump-version-to-b3507428be5b.patch index 58421e3b5..79985a1b2 100644 --- a/buildroot-patches/0004-docker-proxy-Bump-version.patch +++ b/buildroot-patches/0009-package-docker-proxy-bump-version-to-b3507428be5b.patch @@ -1,28 +1,31 @@ -From 4264663b7fdb1379c10bd2b2844c32c617dfb9ec Mon Sep 17 00:00:00 2001 -Message-Id: <4264663b7fdb1379c10bd2b2844c32c617dfb9ec.1614713774.git.stefan@agner.ch> -In-Reply-To: -References: -From: Pascal Vizeli -Date: Thu, 7 May 2020 09:02:05 +0000 -Subject: [PATCH 4/5] docker-proxy: Bump version +From f69e0329ecb778a680a7337024f49eda79bab5b8 Mon Sep 17 00:00:00 2001 +Message-Id: +In-Reply-To: <9c98c07abbe9ee675ec588ad7c15f0285e8a0f07.1618500237.git.stefan@agner.ch> +References: <9c98c07abbe9ee675ec588ad7c15f0285e8a0f07.1618500237.git.stefan@agner.ch> +From: Stefan Agner +Date: Thu, 15 Apr 2021 17:22:59 +0200 +Subject: [PATCH 9/9] package/docker-proxy: bump version to b3507428be5b -Signed-off-by: Pascal Vizeli +Which is the version used by docker 20.10.6: +https://github.com/moby/moby/commit/88470052e7d42f3dc774442241fd6bab817876f6 + +Signed-off-by: Stefan Agner --- package/docker-proxy/docker-proxy.hash | 2 +- package/docker-proxy/docker-proxy.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/docker-proxy/docker-proxy.hash b/package/docker-proxy/docker-proxy.hash -index 58de697929..1416db4042 100644 +index 58de697929..13da06170c 100644 --- a/package/docker-proxy/docker-proxy.hash +++ b/package/docker-proxy/docker-proxy.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 866c8d196b9396a383b437b0d775476459ed7c11f527c4f6bbf1fd08524b461d docker-proxy-55685ba49593e67f5e1c8180539379b16736c25e.tar.gz -+sha256 2e1fdcc401a22d53103be6cfb5475c40af9f9a82a996ec6d508e0994dc2c5e4a docker-proxy-1ea375d2b54d2e914e41970a04553ad55ef39b62.tar.gz ++sha256 90a8dc84bc5d2d74dee0b2c3544f8786598ff85e9fc9f6a55a15b60b7cd78d63 docker-proxy-b3507428be5b458cb0e2b4086b13531fb0706e46.tar.gz sha256 cb5e8e7e5f4a3988e1063c142c60dc2df75605f4c46515e776e3aca6df976e14 LICENSE diff --git a/package/docker-proxy/docker-proxy.mk b/package/docker-proxy/docker-proxy.mk -index 6600b24ed9..d0e940db93 100644 +index 6600b24ed9..7270834119 100644 --- a/package/docker-proxy/docker-proxy.mk +++ b/package/docker-proxy/docker-proxy.mk @@ -4,8 +4,8 @@ @@ -31,11 +34,11 @@ index 6600b24ed9..d0e940db93 100644 -DOCKER_PROXY_VERSION = 55685ba49593e67f5e1c8180539379b16736c25e -DOCKER_PROXY_SITE = $(call github,docker,libnetwork,$(DOCKER_PROXY_VERSION)) -+DOCKER_PROXY_VERSION = 1ea375d2b54d2e914e41970a04553ad55ef39b62 ++DOCKER_PROXY_VERSION = b3507428be5b458cb0e2b4086b13531fb0706e46 +DOCKER_PROXY_SITE = $(call github,moby,libnetwork,$(DOCKER_PROXY_VERSION)) DOCKER_PROXY_LICENSE = Apache-2.0 DOCKER_PROXY_LICENSE_FILES = LICENSE -- -2.30.1 +2.31.1 diff --git a/buildroot/package/docker-cli/docker-cli.hash b/buildroot/package/docker-cli/docker-cli.hash index f4787062b..bb3444c27 100644 --- a/buildroot/package/docker-cli/docker-cli.hash +++ b/buildroot/package/docker-cli/docker-cli.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 4ba845f8c7e2e0a2ca1ec6589847159ca8d0d37b609f0e6f78def7a893b9b342 docker-cli-20.10.5.tar.gz +sha256 eda53b96ab83a59502df2e5e00ab7ee867243259407ef454be55e695303c1113 docker-cli-20.10.6.tar.gz sha256 2d81ea060825006fc8f3fe28aa5dc0ffeb80faf325b612c955229157b8c10dc0 LICENSE diff --git a/buildroot/package/docker-cli/docker-cli.mk b/buildroot/package/docker-cli/docker-cli.mk index d710bb2fe..8607070e1 100644 --- a/buildroot/package/docker-cli/docker-cli.mk +++ b/buildroot/package/docker-cli/docker-cli.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_CLI_VERSION = 20.10.5 +DOCKER_CLI_VERSION = 20.10.6 DOCKER_CLI_SITE = $(call github,docker,cli,v$(DOCKER_CLI_VERSION)) DOCKER_CLI_LICENSE = Apache-2.0 diff --git a/buildroot/package/docker-engine/docker-engine.hash b/buildroot/package/docker-engine/docker-engine.hash index 7e3ce6a5c..6c55b9a9b 100644 --- a/buildroot/package/docker-engine/docker-engine.hash +++ b/buildroot/package/docker-engine/docker-engine.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 bcf651d75e5c80421e8cd3b0d47f3425e01047cf67aef0eda83b68776905a583 docker-engine-20.10.5.tar.gz +sha256 fd7f5571b1f64f26b5ca520a3e1fefb33c190f3732b931051c23a76bdba5000e docker-engine-20.10.6.tar.gz sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE diff --git a/buildroot/package/docker-engine/docker-engine.mk b/buildroot/package/docker-engine/docker-engine.mk index d3f4d8157..c383ef851 100644 --- a/buildroot/package/docker-engine/docker-engine.mk +++ b/buildroot/package/docker-engine/docker-engine.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_ENGINE_VERSION = 20.10.5 +DOCKER_ENGINE_VERSION = 20.10.6 DOCKER_ENGINE_SITE = $(call github,moby,moby,v$(DOCKER_ENGINE_VERSION)) DOCKER_ENGINE_LICENSE = Apache-2.0 diff --git a/buildroot/package/docker-proxy/docker-proxy.hash b/buildroot/package/docker-proxy/docker-proxy.hash index 1416db404..13da06170 100644 --- a/buildroot/package/docker-proxy/docker-proxy.hash +++ b/buildroot/package/docker-proxy/docker-proxy.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 2e1fdcc401a22d53103be6cfb5475c40af9f9a82a996ec6d508e0994dc2c5e4a docker-proxy-1ea375d2b54d2e914e41970a04553ad55ef39b62.tar.gz +sha256 90a8dc84bc5d2d74dee0b2c3544f8786598ff85e9fc9f6a55a15b60b7cd78d63 docker-proxy-b3507428be5b458cb0e2b4086b13531fb0706e46.tar.gz sha256 cb5e8e7e5f4a3988e1063c142c60dc2df75605f4c46515e776e3aca6df976e14 LICENSE diff --git a/buildroot/package/docker-proxy/docker-proxy.mk b/buildroot/package/docker-proxy/docker-proxy.mk index d0e940db9..727083411 100644 --- a/buildroot/package/docker-proxy/docker-proxy.mk +++ b/buildroot/package/docker-proxy/docker-proxy.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_PROXY_VERSION = 1ea375d2b54d2e914e41970a04553ad55ef39b62 +DOCKER_PROXY_VERSION = b3507428be5b458cb0e2b4086b13531fb0706e46 DOCKER_PROXY_SITE = $(call github,moby,libnetwork,$(DOCKER_PROXY_VERSION)) DOCKER_PROXY_LICENSE = Apache-2.0 diff --git a/buildroot/package/runc/runc.hash b/buildroot/package/runc/runc.hash index d792947d5..0f9cfbbe9 100644 --- a/buildroot/package/runc/runc.hash +++ b/buildroot/package/runc/runc.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 28378df983a3c586ed3ec8c76a774a9b10f36a0c323590a284b801cce95cc61f runc-1.0.0-rc92.tar.gz +sha256 e42456078d2f76c925cdd656e4f423b918525d8188521de05e893b6bb473a6f8 runc-1.0.0-rc93.tar.gz sha256 552a739c3b25792263f731542238b92f6f8d07e9a488eae27e6c4690038a8243 LICENSE diff --git a/buildroot/package/runc/runc.mk b/buildroot/package/runc/runc.mk index 14689bbde..c5cb57bdc 100644 --- a/buildroot/package/runc/runc.mk +++ b/buildroot/package/runc/runc.mk @@ -5,7 +5,7 @@ ################################################################################ RUNC_VERSION_MAJOR = 1.0.0 -RUNC_VERSION_MINOR = rc92 +RUNC_VERSION_MINOR = rc93 RUNC_VERSION = $(RUNC_VERSION_MAJOR)-$(RUNC_VERSION_MINOR) RUNC_SITE = $(call github,opencontainers,runc,v$(RUNC_VERSION)) RUNC_LICENSE = Apache-2.0