diff options
| author |   Andrew Clemons <andrew.clemons@gmail.com> | 2023-01-28 08:17:08 +0900 |
|---|---|---|
| committer | Andrew Clemons <andrew.clemons@gmail.com> | 2023-01-28 09:30:35 +0900 |
| commit | e39c6cc60f97cbbadd68e26ab46beb7f7105d910 (patch) | |
| tree | 6f78efb438f0c25053152e3170655c047e8ee035 | |
| parent | 0a7d512d017e589d0f7f453ae91fddbefd8e2674 (diff) | |
| download | slackbuilds-e39c6cc60f97cbbadd68e26ab46beb7f7105d910.tar.gz slackbuilds-e39c6cc60f97cbbadd68e26ab46beb7f7105d910.tar.xz | |
system/docker: Updated for version 20.10.23.
Signed-off-by: Andrew Clemons <andrew.clemons@gmail.com>
| -rw-r--r-- | system/docker/44707.patch | 36 | ||||
| -rw-r--r-- | system/docker/docker.SlackBuild | 6 | ||||
| -rw-r--r-- | system/docker/docker.info | 6 |
3 files changed, 5 insertions, 43 deletions
diff --git a/system/docker/44707.patch b/system/docker/44707.patch deleted file mode 100644 index 39d72bcad0..0000000000 --- a/system/docker/44707.patch +++ /dev/null @@ -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))) diff --git a/system/docker/docker.SlackBuild b/system/docker/docker.SlackBuild index 1881fc4fd2..72c0b55ed6 100644 --- a/system/docker/docker.SlackBuild +++ b/system/docker/docker.SlackBuild @@ -26,8 +26,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=docker -VERSION=${VERSION:-20.10.22} -GITHASH=${GITHASH:-42c8b31} +VERSION=${VERSION:-20.10.23} +GITHASH=${GITHASH:-6051f14} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -66,8 +66,6 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -patch -p1 < $CWD/44707.patch - mkdir build mv vendor build/src ln -sf $TMP/$SRCNAM-$VERSION build/src/github.com/docker/docker diff --git a/system/docker/docker.info b/system/docker/docker.info index 6e677ce5cf..8149ffdc8b 100644 --- a/system/docker/docker.info +++ b/system/docker/docker.info @@ -1,10 +1,10 @@ PRGNAM="docker" -VERSION="20.10.22" +VERSION="20.10.23" HOMEPAGE="https://www.docker.com/products/container-runtime" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://github.com/moby/moby/archive/v20.10.22/moby-20.10.22.tar.gz" -MD5SUM_x86_64="4cb6d189768de032d395ec4c71b96694" +DOWNLOAD_x86_64="https://github.com/moby/moby/archive/v20.10.23/moby-20.10.23.tar.gz" +MD5SUM_x86_64="8d6af91abb68c0459001c4f98dd7ef63" REQUIRES="containerd docker-proxy tini" MAINTAINER="Audrius Kažukauskas" EMAIL="audrius@neutrino.lt" |