From 8f8ca4018a12a91b4b6bc97c25f8c07e8052761e Mon Sep 17 00:00:00 2001 From: HHJLKK <32214003+HHJLKK@users.noreply.github.com> Date: Fri, 1 Mar 2024 20:25:10 +0800 Subject: [PATCH] docker: update to version 25.0.3 (#776) --- utils/containerd/Makefile | 4 ++-- utils/docker/Makefile | 6 +++--- utils/dockerd/Makefile | 6 +++--- .../dockerd/patches/001-libdevmapper_name_fix.patch | 12 ------------ utils/runc/Makefile | 4 ++-- 5 files changed, 10 insertions(+), 22 deletions(-) delete mode 100644 utils/dockerd/patches/001-libdevmapper_name_fix.patch diff --git a/utils/containerd/Makefile b/utils/containerd/Makefile index 5d8f5e7f..6a26606e 100644 --- a/utils/containerd/Makefile +++ b/utils/containerd/Makefile @@ -1,14 +1,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=containerd -PKG_VERSION:=1.7.6 +PKG_VERSION:=1.7.13 PKG_RELEASE:=1 PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=LICENSE PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/containerd/containerd/tar.gz/v${PKG_VERSION}? -PKG_HASH:=084a62f78f96cb5fda02221425f14df09d3e0acd093e4d4b3527900e3ff94677 +PKG_HASH:=ae2b914bff0ddbb9b29d5fc689a51e1ce89ea4edfc4df9ae10517c6f5d2d5aaf PKG_MAINTAINER:=Gerard Ryan diff --git a/utils/docker/Makefile b/utils/docker/Makefile index 8973eb3d..d70c2135 100644 --- a/utils/docker/Makefile +++ b/utils/docker/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=docker -PKG_VERSION:=24.0.7 +PKG_VERSION:=25.0.3 PKG_RELEASE:=$(AUTORELEASE) PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=LICENSE @@ -10,8 +10,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_GIT_URL:=github.com/docker/cli PKG_GIT_REF:=v$(PKG_VERSION) PKG_SOURCE_URL:=https://codeload.$(PKG_GIT_URL)/tar.gz/$(PKG_GIT_REF)? -PKG_HASH:=72a54d131c28938221c81bd08364459fed9c71c093d4d615d324aaf31de6db1d -PKG_GIT_SHORT_COMMIT:=afdd53b # SHA1 used within the docker executables +PKG_HASH:=04ad0cea992a65db20cb1b0dbf6d1ce32c705ce879de51b22095fe8d28030815 +PKG_GIT_SHORT_COMMIT:=4debf41 # SHA1 used within the docker executables PKG_MAINTAINER:=Gerard Ryan diff --git a/utils/dockerd/Makefile b/utils/dockerd/Makefile index 30eb59f4..0840e95a 100644 --- a/utils/dockerd/Makefile +++ b/utils/dockerd/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dockerd -PKG_VERSION:=24.0.7 +PKG_VERSION:=25.0.3 PKG_RELEASE:=$(AUTORELEASE) PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=LICENSE @@ -10,8 +10,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_GIT_URL:=github.com/moby/moby PKG_GIT_REF:=v$(PKG_VERSION) PKG_SOURCE_URL:=https://codeload.$(PKG_GIT_URL)/tar.gz/$(PKG_GIT_REF)? -PKG_HASH:=16a2cb4cf4d314a070085e0df06e3a6bd9ec678d28715b64060af694fc9051d5 -PKG_GIT_SHORT_COMMIT:=311b9ff # SHA1 used within the docker executables +PKG_HASH:=4cdb516f5d6f5caf8b3bcf93c2962277ba727cfd2d1620176a3bb0cf153b3590 +PKG_GIT_SHORT_COMMIT:=f417435 # SHA1 used within the docker executables PKG_MAINTAINER:=Gerard Ryan diff --git a/utils/dockerd/patches/001-libdevmapper_name_fix.patch b/utils/dockerd/patches/001-libdevmapper_name_fix.patch deleted file mode 100644 index 8d5a7dca..00000000 --- a/utils/dockerd/patches/001-libdevmapper_name_fix.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/hack/make.sh -+++ b/hack/make.sh -@@ -98,7 +98,7 @@ fi - # functionality. We favour libdm_dlsym_deferred_remove over - # libdm_no_deferred_remove in dynamic cases because the binary could be shipped - # with a newer libdevmapper than the one it was built with. --if command -v gcc &> /dev/null && ! (echo -e '#include \nint main() { dm_task_deferred_remove(NULL); }' | gcc -xc - -o /dev/null $(${PKG_CONFIG} --libs devmapper 2> /dev/null) &> /dev/null); then -+if command -v gcc &> /dev/null && ! (echo -e '#include \nint main() { dm_task_deferred_remove(NULL); }' | gcc -xc - -o /dev/null $(${PKG_CONFIG} --libs libdevmapper 2> /dev/null) &> /dev/null); then - add_buildtag libdm dlsym_deferred_remove - fi - - diff --git a/utils/runc/Makefile b/utils/runc/Makefile index 8ab367b3..7a125962 100644 --- a/utils/runc/Makefile +++ b/utils/runc/Makefile @@ -1,14 +1,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=runc -PKG_VERSION:=1.1.9 +PKG_VERSION:=1.1.12 PKG_RELEASE:=1 PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=LICENSE PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/opencontainers/runc/tar.gz/v${PKG_VERSION}? -PKG_HASH:=509993674481aad7e14aedfb280e0eb160f3a34c0b77e2e98c4b3c0b1df76894 +PKG_HASH:=be31b07d6a54a8f234016501c300ad04b6c428c56588e7eca8c3b663308db208 PKG_MAINTAINER:=Gerard Ryan