dockerd: Update to 25.0.3

Signed-off-by: Gerard Ryan <G.M0N3Y.2503@gmail.com>

diff --git a/utils/dockerd/Makefile b/utils/dockerd/Makefile
index fb09299036b44f0501cadb70386397297e111e8f..5c2d545e9d88fda07b39dde6249044590934c996 100644 (file)
--- a/utils/dockerd/Makefile
+++ b/utils/dockerd/Makefile
@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dockerd
-PKG_VERSION:=24.0.5
+PKG_VERSION:=25.0.3
 PKG_RELEASE:=1
 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:=837d7d667fb64508bf6e53cb5915b4b5ef356599294ffdd5ca8678168230cb38
-PKG_GIT_SHORT_COMMIT:=a61e2b4 # SHA1 used within the docker executables
+PKG_HASH:=4cdb516f5d6f5caf8b3bcf93c2962277ba727cfd2d1620176a3bb0cf153b3590
+PKG_GIT_SHORT_COMMIT:=f417435 # SHA1 used within the docker executables
 
 PKG_MAINTAINER:=Gerard Ryan <G.M0N3Y.2503@gmail.com>
 

diff --git a/utils/dockerd/patches/001-libdevmapper_name_fix.patch b/utils/dockerd/patches/001-libdevmapper_name_fix.patch
deleted file mode 100644 (file)
index 8070090..0000000
--- a/utils/dockerd/patches/001-libdevmapper_name_fix.patch
+++ /dev/null
@@ -1,11 +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 <libdevmapper.h>\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 <libdevmapper.h>\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
-