From 80cb27ee85ab007058f44668778771b71881d10f Mon Sep 17 00:00:00 2001
From: zhongjiawei <zhongjiawei1@huawei.com>
Date: Sat, 26 Jul 2025 10:32:05 +0800
Subject: [PATCH] docker:delete redundant characters to prevent make failure in
 golang 1.24

(cherry picked from commit f3b934577119a49fd8cd860afbbee96b3ee55c6d)
---
 VERSION-vendor                                |  2 +-
 docker.spec                                   |  8 ++-
 git-commit                                    |  2 +-
 ...dundant-characters-to-prevent-make-f.patch | 66 +++++++++++++++++++
 series.conf                                   |  1 +
 5 files changed, 76 insertions(+), 3 deletions(-)
 create mode 100644 patch/0286-docker-delete-redundant-characters-to-prevent-make-f.patch

diff --git a/VERSION-vendor b/VERSION-vendor
index bf31dd9..de2a4c0 100644
--- a/VERSION-vendor
+++ b/VERSION-vendor
@@ -1 +1 @@
-18.09.0.346
+18.09.0.347
diff --git a/docker.spec b/docker.spec
index dccec69..3b53737 100644
--- a/docker.spec
+++ b/docker.spec
@@ -1,6 +1,6 @@
 Name: docker-engine
 Version: 18.09.0
-Release: 346
+Release: 347
 Epoch: 2
 Summary: The open-source application container engine
 Group: Tools/Docker
@@ -225,6 +225,12 @@ fi
 %endif
 
 %changelog
+* Sat Jul 26 2025 zhongjiawei<zhongjiawei1@huawei.com> - 2:18.09.0-347
+- Type:bugfix
+- CVE:NA
+- SUG:NA
+- DESC:delete redundant characters to prevent make failure in golang 1.24
+
 * Sat Feb 22 2025 zhongjiawei<zhongjiawei1@huawei.com> - 2:18.09.0-346
 - Type:bugfix
 - CVE:NA
diff --git a/git-commit b/git-commit
index 5d01789..667c4f7 100644
--- a/git-commit
+++ b/git-commit
@@ -1 +1 @@
-270f89013d2ad9993ff863c5b5636cc1c9e17ae1
+c3120386ce3393748cef40b552f8db2fb4cdbe9a
diff --git a/patch/0286-docker-delete-redundant-characters-to-prevent-make-f.patch b/patch/0286-docker-delete-redundant-characters-to-prevent-make-f.patch
new file mode 100644
index 0000000..1f81f4d
--- /dev/null
+++ b/patch/0286-docker-delete-redundant-characters-to-prevent-make-f.patch
@@ -0,0 +1,66 @@
+From 35f9bdedd5d19afa21359e21e66e547a40490f67 Mon Sep 17 00:00:00 2001
+From: zhongjiawei <zhongjiawei1@huawei.com>
+Date: Sat, 26 Jul 2025 11:34:31 +0800
+Subject: [PATCH] docker:delete redundant characters to prevent make failure
+ in golang 1.24
+
+Reference:https://github.com/ugorji/go/commit/8286c2dc986535d23e3fad8d3e816b9dd1e5aea6
+
+---
+ .../vendor/github.com/ugorji/go/codec/gen.go     | 16 +++++++++-------
+ 1 file changed, 9 insertions(+), 7 deletions(-)
+
+diff --git a/components/engine/vendor/github.com/ugorji/go/codec/gen.go b/components/engine/vendor/github.com/ugorji/go/codec/gen.go
+index a075e7c0..9c597699 100644
+--- a/components/engine/vendor/github.com/ugorji/go/codec/gen.go
++++ b/components/engine/vendor/github.com/ugorji/go/codec/gen.go
+@@ -5,7 +5,7 @@ package codec
+ 
+ import (
+ 	"bytes"
+-	"encoding/base64"
++	"encoding/base32"
+ 	"errors"
+ 	"fmt"
+ 	"go/format"
+@@ -122,7 +122,11 @@ const (
+ var (
+ 	genAllTypesSamePkgErr  = errors.New("All types must be in the same package")
+ 	genExpectArrayOrMapErr = errors.New("unexpected type. Expecting array/map/slice")
+-	genBase64enc           = base64.NewEncoding("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789__")
++	// don't use base64, only 63 characters allowed in valid go identifiers
++	// ie ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_
++	//
++	// don't use numbers, as a valid go identifer must start with a letter.
++	genTypenameEnc  = base32.NewEncoding("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdef")
+ 	genQNameRegex          = regexp.MustCompile(`[A-Za-z_.]+`)
+ )
+ 
+@@ -1656,8 +1660,6 @@ func genMethodNameT(t reflect.Type, tRef reflect.Type) (n string) {
+ 				}
+ 			} else {
+ 				// best way to get the package name inclusive
+-				// return ptrPfx + strings.Replace(tstr, ".", "_", 1000)
+-				// return ptrPfx + genBase64enc.EncodeToString([]byte(tstr))
+ 				if t.Name() != "" && genQNameRegex.MatchString(tstr) {
+ 					return ptrPfx + strings.Replace(tstr, ".", "_", 1000)
+ 				} else {
+@@ -1668,12 +1670,12 @@ func genMethodNameT(t reflect.Type, tRef reflect.Type) (n string) {
+ 	}
+ }
+ 
+-// genCustomNameForType base64encodes the t.String() value in such a way
++// genCustomNameForType base32 encodes the t.String() value in such a way
+ // that it can be used within a function name.
+ func genCustomTypeName(tstr string) string {
+-	len2 := genBase64enc.EncodedLen(len(tstr))
++	len2 := genTypenameEnc.EncodedLen(len(tstr))
+ 	bufx := make([]byte, len2)
+-	genBase64enc.Encode(bufx, []byte(tstr))
++	genTypenameEnc.Encode(bufx, []byte(tstr))
+ 	for i := len2 - 1; i >= 0; i-- {
+ 		if bufx[i] == '=' {
+ 			len2--
+-- 
+2.33.0
+
diff --git a/series.conf b/series.conf
index 385915d..a3652ec 100644
--- a/series.conf
+++ b/series.conf
@@ -283,4 +283,5 @@ patch/0282-backport-fix-CVE-2024-36623.patch
 patch/0283-docker-check-containerd-sock-legality.patch
 patch/0284-docker-modify-hostconfig.json-perm-640.patch
 patch/0285-docker-change-rand-random-number-library-to-generate.patch
+patch/0286-docker-delete-redundant-characters-to-prevent-make-f.patch
 #end
-- 
Gitee