docker: updated to version 20.10.23

docker/.signature

@@ -1,11 +1,10 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF3wtZ8CGyaqNn7ZU4mPNcRaJJXL0z7NPuxo+Qal1UByAlY8R+eqcYQXzKZBxjFeUfLNjgYhscMr2CGW3TfaCB3wI=
-SHA256 (Pkgfile) = ae8ff0dc22c9d799a5db84b032aa95f431fd47e44403fb6b7326c6d551a68b3e
+RWSagIOpLGJF3+J+vgtAbuol+DH338eZE3XRFBQaEHiDMIDkAuE1R35No07tBpFFm9IEB03qQQYR/7rb+x71bHUaEpT5ESveIw8=
+SHA256 (Pkgfile) = 1a35724e1c445e4e0a9a0fba240c96578a4b7842be468b101c036c68aa23af80
 SHA256 (.footprint) = ef891bf504df63f9b4413ecccd3a0ce6e4a71b1a42f22e9bb9c36a6a87a2c3fe
-SHA256 (moby-20.10.22.tar.gz) = ee0e2168e27ec87f1b0650e86af5d3e167a07fd2ff8c1ce3bb588f0b4f9a4658
-SHA256 (cli-20.10.22.tar.gz) = 84d71ac2b508b54e8df9f3ea425aa33e254fd3645fe9bad5619b98eaffb33408
-SHA256 (docker-man-pages-20.10.22.tar.xz) = 7b4ca06c18e06f33dc25e00ad5b52f7aba551aef99abe1403cf79d23e8558a0b
-SHA256 (libnetwork-dcdf8f1.tar.xz) = c31606b3ab192208cf284b68ea978ca303e8d30afef5af91d227c1bb8aaaa96a
+SHA256 (moby-20.10.23.tar.gz) = 61bb3f4f0c935ac9a719adbac69fca0d727b6b5c3eb889571e00b1cc3ff1e368
+SHA256 (cli-20.10.23.tar.gz) = 55563b87050ce7b9b2124a9b882fdef4fa17e23f431ad502c8227101d5e789fd
+SHA256 (docker-man-pages-20.10.23.tar.xz) = 3ed72fa5e7fe1b9540015058aac47477cdaf728957befe0f22f9d51471c34ec1
+SHA256 (libnetwork-05b93e0.tar.xz) = 111b82905eefb7a8dd5311c30777a5680c7b1ad9fb362fcb45ca3c88aefcaf97
 SHA256 (docker.rc) = 258ff4d10d199b2b847df07d22eac04bb8bd749a10af29d67111e53a8b81a46c
 SHA256 (docker.conf) = 51f264d548d6d3871d07670e7e5ba6414c3b4317dcc6d59cd7cc45dc1045659e
-SHA256 (btrfs-graphdriver.patch) = f3beff60e8dbdc768a2d632f3c861f4829e02b2695d085f66f423b2395cb3f90

docker/Pkgfile

@@ -3,24 +3,21 @@
 # Maintainer: Matt Housh, jaeger at crux dot ninja
 # Depends on: containerd runc btrfs-progs cgroupfs-mount
 
-# LIBNETWORK_COMMIT:=dcdf8f176d1e13ad719e913e796fb698d846de98
+# LIBNETWORK_COMMIT:=05b93e0d3a95952f70c113b0bc5bdb538d7afdd7
 
 name=docker
-version=20.10.22
+version=20.10.23
 release=1
 source=(https://github.com/moby/moby/archive/v${version}/moby-${version}.tar.gz \
     https://github.com/docker/cli/archive/v${version}/cli-${version}.tar.gz \
     http://jaeger.morpheus.net/linux/crux/files/$name-man-pages-$version.tar.xz \
-    http://jaeger.morpheus.net/linux/crux/files/libnetwork-dcdf8f1.tar.xz \
-    $name.rc $name.conf
-    btrfs-graphdriver.patch)
+    http://jaeger.morpheus.net/linux/crux/files/libnetwork-05b93e0.tar.xz \
+    $name.rc $name.conf)
 
 build() {
-    patch -p1 -d $SRC/moby-$version -i $SRC/btrfs-graphdriver.patch
-
     export GO111MODULE=auto
     export GOPATH=$SRC
-    export DOCKER_GITCOMMIT=42c8b31
+    export DOCKER_GITCOMMIT=6051f14
     export DOCKER_BUILDTAGS='seccomp'
     export DISABLE_WARN_OUTSIDE_CONTAINER=1
 
@@ -46,7 +43,7 @@ build() {
 
     (cd ..; \
         GOROOT=/usr/lib/go GOPATH=${PKGMK_WORK_DIR} go build -o $PKG/usr/bin/$name-proxy \
-            libnetwork-dcdf8f1/cmd/proxy)
+            libnetwork-05b93e0/cmd/proxy)
 
     for M in 1 5 8; do
         install -d -m 0755 $PKG/usr/share/man/man${M}

docker/btrfs-graphdriver.patch

@@ -1,36 +0,0 @@
-From ffbbe3d103b045c3f8ec5f74aa71b7a314fd57fe Mon Sep 17 00:00:00 2001
-From: Shengjing Zhu <zhsj@debian.org>
-Date: Thu, 29 Dec 2022 02:37:39 +0800
-Subject: [PATCH] daemon/graphdriver/btrfs: workaround field rename in
- btrfs-progs 6.1
-
-Closes: #44698
-
-Signed-off-by: Shengjing Zhu <zhsj@debian.org>
----
- daemon/graphdriver/btrfs/btrfs.go | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/daemon/graphdriver/btrfs/btrfs.go b/daemon/graphdriver/btrfs/btrfs.go
-index 720f1ab0cd43..f2f6bf9e975b 100644
---- a/daemon/graphdriver/btrfs/btrfs.go
-+++ b/daemon/graphdriver/btrfs/btrfs.go
-@@ -6,6 +6,9 @@ package btrfs // import "github.com/docker/docker/daemon/graphdriver/btrfs"
- /*
- #include <stdlib.h>
- #include <dirent.h>
-+
-+// keep struct field name compatible with btrfs-progs < 6.1.
-+#define max_referenced max_rfer
- #include <btrfs/ioctl.h>
- #include <btrfs/ctree.h>
- 
-@@ -395,7 +398,7 @@ func subvolLimitQgroup(path string, size uint64) error {
- 	defer closeDir(dir)
- 
- 	var args C.struct_btrfs_ioctl_qgroup_limit_args
--	args.lim.max_referenced = C.__u64(size)
-+	args.lim.max_rfer = C.__u64(size)
- 	args.lim.flags = C.BTRFS_QGROUP_LIMIT_MAX_RFER
- 	_, _, errno := unix.Syscall(unix.SYS_IOCTL, getDirFd(dir), C.BTRFS_IOC_QGROUP_LIMIT,
- 		uintptr(unsafe.Pointer(&args)))