[packages/docker-ce] up to 28.0.1

[atler]

commit eb7661d9b4d42b534962e0219c27a859d8ba0098
Author: Jan Palus <atler at pld-linux.org>
Date:   Wed Feb 26 19:48:13 2025 +0100

    up to 28.0.1

 docker-ce.spec       |   8 ++--
 setsockopt-x86.patch | 102 ---------------------------------------------------
 2 files changed, 3 insertions(+), 107 deletions(-)
---
diff --git a/docker-ce.spec b/docker-ce.spec
index c097467..6a64365 100644
--- a/docker-ce.spec
+++ b/docker-ce.spec
@@ -1,17 +1,16 @@
 Summary:	Docker CE: the open-source application container engine
 Name:		docker-ce
-Version:	28.0.0
-Release:	2
+Version:	28.0.1
+Release:	1
 License:	Apache v2.0
 Group:		Applications/System
 # https://github.com/moby/moby/releases
 Source0:	https://github.com/moby/moby/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5:	15697ab63191af73ade7bc8e4a5e9808
+# Source0-md5:	57f86595d3dddc6541ca24acaf7c519c
 Source1:	dockerd.sh
 Source2:	docker.init
 Source3:	docker.sysconfig
 Patch0:		systemd.patch
-Patch1:		setsockopt-x86.patch
 URL:		https://www.docker.com/
 BuildRequires:	golang >= 1.21
 BuildRequires:	linux-libc-headers >= 7:4.12
@@ -70,7 +69,6 @@ databases.
 %prep
 %setup -q -n moby-%{version}
 %patch -P0 -p1
-%patch -P1 -p1
 
 %build
 export VERSION=%{version}
diff --git a/setsockopt-x86.patch b/setsockopt-x86.patch
deleted file mode 100644
index 23240d7..0000000
--- a/setsockopt-x86.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-From 73f2a5336d8af70e6676d2bea2b321ea62fbfe26 Mon Sep 17 00:00:00 2001
-From: Albin Kerouanton <albinker at gmail.com>
-Date: Sun, 23 Feb 2025 11:24:50 +0100
-Subject: [PATCH] libnet/d/bridge: fix compilation on i386
-
-On i386, Linux doesn't provide direct socket syscall but instead
-multiplexes them through the socketcall syscall (see `man 2 socketcall`).
-This commit fixes compilation for i386 by wrapping the offending syscall
-in a new function that uses the socketcall syscall on i386, and
-the `setsockopt` syscall on other archs.
-
-Signed-off-by: Albin Kerouanton <albinker at gmail.com>
----
- .../drivers/bridge/port_mapping_linux.go      | 10 +--------
- .../drivers/bridge/port_mapping_linux_386.go  | 21 +++++++++++++++++++
- .../bridge/port_mapping_linux_others.go       | 21 +++++++++++++++++++
- 3 files changed, 43 insertions(+), 9 deletions(-)
- create mode 100644 libnetwork/drivers/bridge/port_mapping_linux_386.go
- create mode 100644 libnetwork/drivers/bridge/port_mapping_linux_others.go
-
-diff --git a/libnetwork/drivers/bridge/port_mapping_linux.go b/libnetwork/drivers/bridge/port_mapping_linux.go
-index d4c5e46056c69..285d2a3b00563 100644
---- a/libnetwork/drivers/bridge/port_mapping_linux.go
-+++ b/libnetwork/drivers/bridge/port_mapping_linux.go
-@@ -13,7 +13,6 @@ import (
- 	"slices"
- 	"strconv"
- 	"syscall"
--	"unsafe"
- 
- 	"github.com/containerd/log"
- 	"github.com/docker/docker/libnetwork/iptables"
-@@ -675,14 +674,7 @@ func bindSCTP(cfg portBindingReq, port int) (_ portBinding, retErr error) {
- 		syscall.SetsockoptInt(sd, syscall.IPPROTO_IPV6, syscall.IPV6_V6ONLY, 1)
- 	}
- 
--	options := sctp.InitMsg{NumOstreams: sctp.SCTP_MAX_STREAM}
--	if _, _, errno := syscall.Syscall6(syscall.SYS_SETSOCKOPT,
--		uintptr(sd),
--		sctp.SOL_SCTP,
--		sctp.SCTP_INITMSG,
--		uintptr(unsafe.Pointer(&options)), // #nosec G103 -- Ignore "G103: Use of unsafe calls should be audited"
--		unsafe.Sizeof(options),
--		0); errno != 0 {
-+	if errno := setSCTPInitMsg(sd, sctp.InitMsg{NumOstreams: sctp.SCTP_MAX_STREAM}); errno != 0 {
- 		return portBinding{}, errno
- 	}
- 
-diff --git a/libnetwork/drivers/bridge/port_mapping_linux_386.go b/libnetwork/drivers/bridge/port_mapping_linux_386.go
-new file mode 100644
-index 0000000000000..4c7ece4030d1a
---- /dev/null
-+++ b/libnetwork/drivers/bridge/port_mapping_linux_386.go
-@@ -0,0 +1,21 @@
-+package bridge
-+
-+import (
-+	"syscall"
-+	"unsafe"
-+
-+	"github.com/ishidawataru/sctp"
-+)
-+
-+const sysSetsockopt = 14 // See https://elixir.bootlin.com/linux/v6.13.3/source/include/uapi/linux/net.h#L40
-+
-+func setSCTPInitMsg(sd int, options sctp.InitMsg) syscall.Errno {
-+	_, _, errno := syscall.Syscall6(syscall.SYS_SOCKETCALL, // See `man 2 socketcall`
-+		sysSetsockopt,
-+		uintptr(sd),
-+		sctp.SOL_SCTP,
-+		sctp.SCTP_INITMSG,
-+		uintptr(unsafe.Pointer(&options)), // #nosec G103 -- Ignore "G103: Use of unsafe calls should be audited"
-+		unsafe.Sizeof(options))
-+	return errno
-+}
-diff --git a/libnetwork/drivers/bridge/port_mapping_linux_others.go b/libnetwork/drivers/bridge/port_mapping_linux_others.go
-new file mode 100644
-index 0000000000000..d94ad0e54ad17
---- /dev/null
-+++ b/libnetwork/drivers/bridge/port_mapping_linux_others.go
-@@ -0,0 +1,21 @@
-+//go:build linux && !386
-+
-+package bridge
-+
-+import (
-+	"syscall"
-+	"unsafe"
-+
-+	"github.com/ishidawataru/sctp"
-+)
-+
-+func setSCTPInitMsg(sd int, options sctp.InitMsg) syscall.Errno {
-+	_, _, errno := syscall.Syscall6(syscall.SYS_SETSOCKOPT,
-+		uintptr(sd),
-+		sctp.SOL_SCTP,
-+		sctp.SCTP_INITMSG,
-+		uintptr(unsafe.Pointer(&options)), // #nosec G103 -- Ignore "G103: Use of unsafe calls should be audited"
-+		unsafe.Sizeof(options),
-+		0)
-+	return errno
-+}
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/docker-ce.git/commitdiff/eb7661d9b4d42b534962e0219c27a859d8ba0098