Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package docker for openSUSE:Factory checked 
in at 2024-06-24 20:50:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/docker (Old)
 and      /work/SRC/openSUSE:Factory/.docker.new.18349 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "docker"

Mon Jun 24 20:50:54 2024 rev:146 rq:1182989 version:26.1.4_ce

Changes:
--------
--- /work/SRC/openSUSE:Factory/docker/docker.changes    2024-04-26 
23:26:59.888349756 +0200
+++ /work/SRC/openSUSE:Factory/.docker.new.18349/docker.changes 2024-06-24 
20:51:47.625020154 +0200
@@ -1,0 +2,26 @@
+Mon Jun 24 08:15:24 UTC 2024 - Aleksa Sarai <asa...@suse.com>
+
+- Rebase patches:
+ * 0001-SECRETS-daemon-allow-directory-creation-in-run-secre.patch
+ * 0002-SECRETS-SUSE-implement-SUSE-container-secrets.patch
+ * 0003-BUILD-SLE12-revert-graphdriver-btrfs-use-kernel-UAPI.patch
+ * 0004-bsc1073877-apparmor-clobber-docker-default-profile-o.patch
+ * 0005-SLE12-revert-apparmor-remove-version-conditionals-fr.patch
+- Fix BuildKit's symlink resolution logic to correctly handle non-lexical
+  symlinks. Backport of <https://github.com/moby/buildkit/pull/4896> and
+  <https://github.com/moby/buildkit/pull/5060>. bsc#1221916
+ + 0006-bsc1221916-update-to-patched-buildkit-version-to-fix.patch
+- Write volume options atomically so sudden system crashes won't result in
+  future Docker starts failing due to empty files. Backport of
+  <https://github.com/moby/moby/pull/48034>. bsc#1214855
+ + 0007-bsc1214855-volume-use-AtomicWriteFile-to-save-volume.patch
+
+-------------------------------------------------------------------
+Thu Jun  6 04:17:23 UTC 2024 - Aleksa Sarai <asa...@suse.com>
+
+- Update to Docker 26.1.4-ce. See upstream changelog online at
+  <https://docs.docker.com/engine/release-notes/26.1/#2614>
+- Rebase patches:
+  * cli-0001-docs-include-required-tools-in-source-tree.patch
+
+-------------------------------------------------------------------

Old:
----
  docker-26.1.0_ce_c8af8ebe4a89.tar.xz
  docker-cli-26.1.0_ce.tar.xz

New:
----
  0006-bsc1221916-update-to-patched-buildkit-version-to-fix.patch
  0007-bsc1214855-volume-use-AtomicWriteFile-to-save-volume.patch
  docker-26.1.4_ce_de5c9cf0b96e.tar.xz
  docker-cli-26.1.4_ce.tar.xz

BETA DEBUG BEGIN:
  New:  <https://github.com/moby/buildkit/pull/5060>. bsc#1221916
 + 0006-bsc1221916-update-to-patched-buildkit-version-to-fix.patch
- Write volume options atomically so sudden system crashes won't result in
  New:  <https://github.com/moby/moby/pull/48034>. bsc#1214855
 + 0007-bsc1214855-volume-use-AtomicWriteFile-to-save-volume.patch
BETA DEBUG END:

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ docker.spec ++++++
--- /var/tmp/diff_new_pack.a73ftV/_old  2024-06-24 20:51:48.473051153 +0200
+++ /var/tmp/diff_new_pack.a73ftV/_new  2024-06-24 20:51:48.477051299 +0200
@@ -32,9 +32,9 @@
 # helpfully injects into our build environment from the changelog). If you want
 # to generate a new git_commit_epoch, use this:
 #  $ date --date="$(git show --format=fuller --date=iso $COMMIT_ID | grep -oP 
'(?<=^CommitDate: ).*')" '+%s'
-%define real_version 26.1.0
-%define git_version c8af8ebe4a89
-%define git_commit_epoch 1713797114
+%define real_version 26.1.4
+%define git_version de5c9cf0b96e
+%define git_commit_epoch 1717583601
 
 Name:           docker
 Version:        %{real_version}_ce
@@ -71,6 +71,11 @@
 Patch201:       0004-bsc1073877-apparmor-clobber-docker-default-profile-o.patch
 # UPSTREAM: Revert of upstream patches to make apparmor work on SLE 12.
 Patch202:       0005-SLE12-revert-apparmor-remove-version-conditionals-fr.patch
+# UPSTREAM: Backport of <https://github.com/moby/buildkit/pull/4896> and
+#           <https://github.com/moby/buildkit/pull/5060>.
+Patch203:       0006-bsc1221916-update-to-patched-buildkit-version-to-fix.patch
+# UPSTREAM: Backport of <https://github.com/moby/moby/pull/48034>.
+Patch204:       0007-bsc1214855-volume-use-AtomicWriteFile-to-save-volume.patch
 # UPSTREAM: Backport of <https://github.com/docker/cli/pull/4228>.
 Patch900:       cli-0001-docs-include-required-tools-in-source-tree.patch
 BuildRequires:  audit
@@ -227,6 +232,10 @@
 %patch -P201 -p1
 # Solves apparmor issues on SLE-12, but okay for newer SLE versions too.
 %patch -P202 -p1
+# bsc#1221916
+%patch -P203 -p1
+# bsc#1214855
+%patch -P204 -p1
 
 %build
 %sysusers_generate_pre %{SOURCE160} %{name} %{name}.conf

++++++ 0001-SECRETS-daemon-allow-directory-creation-in-run-secre.patch ++++++
--- /var/tmp/diff_new_pack.a73ftV/_old  2024-06-24 20:51:48.497052030 +0200
+++ /var/tmp/diff_new_pack.a73ftV/_new  2024-06-24 20:51:48.501052176 +0200
@@ -1,7 +1,7 @@
-From 2b0fd7dedddd24c2e5d3e177d3b339eca5ac71fd Mon Sep 17 00:00:00 2001
+From dfdd2609d9c944b5e4fe68bfc3ac6f8c493e96b6 Mon Sep 17 00:00:00 2001
 From: Aleksa Sarai <asa...@suse.de>
 Date: Wed, 8 Mar 2017 12:41:54 +1100
-Subject: [PATCH 1/5] SECRETS: daemon: allow directory creation in /run/secrets
+Subject: [PATCH 1/7] SECRETS: daemon: allow directory creation in /run/secrets
 
 Since FileMode can have the directory bit set, allow a SecretStore
 implementation to return secrets that are actually directories. This is
@@ -69,6 +69,6 @@
                        return errors.Wrap(err, "error setting ownership for 
secret")
                }
 -- 
-2.44.0
+2.45.2
 
 

++++++ 0002-SECRETS-SUSE-implement-SUSE-container-secrets.patch ++++++
--- /var/tmp/diff_new_pack.a73ftV/_old  2024-06-24 20:51:48.529053200 +0200
+++ /var/tmp/diff_new_pack.a73ftV/_new  2024-06-24 20:51:48.533053346 +0200
@@ -1,7 +1,7 @@
-From bec7fac20974cadb313eaf23ef26dc828ee290aa Mon Sep 17 00:00:00 2001
+From a7422989a18870abd913b19673f025bd1b085750 Mon Sep 17 00:00:00 2001
 From: Aleksa Sarai <asa...@suse.de>
 Date: Wed, 8 Mar 2017 11:43:29 +1100
-Subject: [PATCH 2/5] SECRETS: SUSE: implement SUSE container secrets
+Subject: [PATCH 2/7] SECRETS: SUSE: implement SUSE container secrets
 
 This allows for us to pass in host credentials to a container, allowing
 for SUSEConnect to work with containers.
@@ -456,6 +456,6 @@
 +      return nil
 +}
 -- 
-2.44.0
+2.45.2
 
 

++++++ 0003-BUILD-SLE12-revert-graphdriver-btrfs-use-kernel-UAPI.patch ++++++
--- /var/tmp/diff_new_pack.a73ftV/_old  2024-06-24 20:51:48.545053785 +0200
+++ /var/tmp/diff_new_pack.a73ftV/_new  2024-06-24 20:51:48.553054077 +0200
@@ -1,7 +1,7 @@
-From 4acaea4383cbc5961175a4dfb95b56924376cdbc Mon Sep 17 00:00:00 2001
+From 5baf9eee37fccd7099c14e5da705a6d105500278 Mon Sep 17 00:00:00 2001
 From: Aleksa Sarai <asa...@suse.de>
 Date: Mon, 22 May 2023 15:44:54 +1000
-Subject: [PATCH 3/5] BUILD: SLE12: revert "graphdriver/btrfs: use kernel UAPI
+Subject: [PATCH 3/7] BUILD: SLE12: revert "graphdriver/btrfs: use kernel UAPI
  headers"
 
 This reverts commit 3208dcabdc8997340b255f5b880fef4e3f54580d.
@@ -42,6 +42,6 @@
  static void set_name_btrfs_ioctl_vol_args_v2(struct btrfs_ioctl_vol_args_v2* 
btrfs_struct, const char* value) {
      snprintf(btrfs_struct->name, BTRFS_SUBVOL_NAME_MAX, "%s", value);
 -- 
-2.44.0
+2.45.2
 
 

++++++ 0004-bsc1073877-apparmor-clobber-docker-default-profile-o.patch ++++++
--- /var/tmp/diff_new_pack.a73ftV/_old  2024-06-24 20:51:48.565054516 +0200
+++ /var/tmp/diff_new_pack.a73ftV/_new  2024-06-24 20:51:48.569054662 +0200
@@ -1,7 +1,7 @@
-From a924a0f12b7cb1655e0bdf3f40ae294982045749 Mon Sep 17 00:00:00 2001
+From 5df43b3c82b7c69dc09dd775098771f20ac2435c Mon Sep 17 00:00:00 2001
 From: Aleksa Sarai <asa...@suse.de>
 Date: Fri, 29 Jun 2018 17:59:30 +1000
-Subject: [PATCH 4/5] bsc1073877: apparmor: clobber docker-default profile on
+Subject: [PATCH 4/7] bsc1073877: apparmor: clobber docker-default profile on
  start
 
 In the process of making docker-default reloading far less expensive,
@@ -85,6 +85,6 @@
        }
  
 -- 
-2.44.0
+2.45.2
 
 

++++++ 0005-SLE12-revert-apparmor-remove-version-conditionals-fr.patch ++++++
--- /var/tmp/diff_new_pack.a73ftV/_old  2024-06-24 20:51:48.585055247 +0200
+++ /var/tmp/diff_new_pack.a73ftV/_new  2024-06-24 20:51:48.589055393 +0200
@@ -1,7 +1,7 @@
-From 7e422ce82b924b4d9e06c5f3277e6b235323122d Mon Sep 17 00:00:00 2001
+From deb42984d58de574bc2ca5857905ff68b57235c0 Mon Sep 17 00:00:00 2001
 From: Aleksa Sarai <asa...@suse.de>
 Date: Wed, 11 Oct 2023 21:19:12 +1100
-Subject: [PATCH 5/5] SLE12: revert "apparmor: remove version-conditionals from
+Subject: [PATCH 5/7] SLE12: revert "apparmor: remove version-conditionals from
  template"
 
 This reverts the following commits:
@@ -292,17 +292,18 @@
  }
  
 diff --git a/profiles/apparmor/template.go b/profiles/apparmor/template.go
-index cf8c34ce8af9..4ebd647e14e4 100644
+index 8dbc1b610288..2062aab1ac99 100644
 --- a/profiles/apparmor/template.go
 +++ b/profiles/apparmor/template.go
-@@ -23,12 +23,14 @@ profile {{.Name}} 
flags=(attach_disconnected,mediate_deleted) {
+@@ -23,6 +23,7 @@ profile {{.Name}} 
flags=(attach_disconnected,mediate_deleted) {
    capability,
    file,
    umount,
 +{{if ge .Version 208096}}
    # Host (privileged) processes may send signals to container processes.
    signal (receive) peer=unconfined,
-   # dockerd may send signals to container processes (for "docker kill").
+   # runc may send signals to container processes (for "docker stop").
+@@ -33,6 +34,7 @@ profile {{.Name}} 
flags=(attach_disconnected,mediate_deleted) {
    signal (receive) peer={{.DaemonProfile}},
    # Container processes may send signals amongst themselves.
    signal (send,receive) peer={{.Name}},
@@ -310,7 +311,7 @@
  
    deny @{PROC}/* w,   # deny write for all files directly in /proc (not in a 
subdir)
    # deny write to files not in /proc/<number>/** or /proc/sys/**
-@@ -49,7 +51,9 @@ profile {{.Name}} 
flags=(attach_disconnected,mediate_deleted) {
+@@ -53,7 +55,9 @@ profile {{.Name}} 
flags=(attach_disconnected,mediate_deleted) {
    deny /sys/devices/virtual/powercap/** rwklx,
    deny /sys/kernel/security/** rwklx,
  
@@ -321,6 +322,6 @@
  }
  `
 -- 
-2.44.0
+2.45.2
 
 

++++++ 0006-bsc1221916-update-to-patched-buildkit-version-to-fix.patch ++++++
++++ 891 lines (skipped)

++++++ 0007-bsc1214855-volume-use-AtomicWriteFile-to-save-volume.patch ++++++
>From 7159c13ee349a2e2edb5ed8b6793794bae9025fd Mon Sep 17 00:00:00 2001
From: Aleksa Sarai <cyp...@cyphar.com>
Date: Wed, 19 Jun 2024 16:30:49 +1000
Subject: [PATCH 7/7] bsc1214855: volume: use AtomicWriteFile to save volume
 options

If the system (or Docker) crashes while saivng the volume options, on
restart the daemon will error out when trying to read the options file
because it doesn't contain valid JSON.

In such a crash scenario, the new volume will be treated as though it
has the default options configuration. This is not ideal, but volumes
created on very old Docker versions (pre-1.11[1], circa 2016) do not
have opts.json and so doing some kind of cleanup when loading the volume
store (even if we take care to only delete empty volumes) could delete
existing volumes carried over from very old Docker versions that users
would not expect to disappear.

Ultimately, if a user creates a volume and the system crashes, a volume
that has the wrong config is better than Docker not being able to start.

[1]: commit b05b2370757d ("Support mount opts for `local` volume driver")

SUSE-Bugs: https://bugzilla.suse.com/show_bug.cgi?id=1214855
Signed-off-by: Aleksa Sarai <cyp...@cyphar.com>
---
 volume/local/local.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/volume/local/local.go b/volume/local/local.go
index 6e96aeea4189..4412f34a3da9 100644
--- a/volume/local/local.go
+++ b/volume/local/local.go
@@ -17,6 +17,7 @@ import (
        "github.com/docker/docker/daemon/names"
        "github.com/docker/docker/errdefs"
        "github.com/docker/docker/pkg/idtools"
+       "github.com/docker/docker/pkg/ioutils"
        "github.com/docker/docker/quota"
        "github.com/docker/docker/volume"
        "github.com/pkg/errors"
@@ -388,7 +389,7 @@ func (v *localVolume) saveOpts() error {
        if err != nil {
                return err
        }
-       err = os.WriteFile(filepath.Join(v.rootPath, "opts.json"), b, 0o600)
+       err = ioutils.AtomicWriteFile(filepath.Join(v.rootPath, "opts.json"), 
b, 0o600)
        if err != nil {
                return errdefs.System(errors.Wrap(err, "error while persisting 
volume options"))
        }
-- 
2.45.2


++++++ _service ++++++
--- /var/tmp/diff_new_pack.a73ftV/_old  2024-06-24 20:51:48.669058317 +0200
+++ /var/tmp/diff_new_pack.a73ftV/_new  2024-06-24 20:51:48.673058464 +0200
@@ -3,16 +3,16 @@
     <param name="url">https://github.com/moby/moby.git</param>
     <param name="scm">git</param>
     <param name="exclude">.git</param>
-    <param name="versionformat">26.1.0_ce_%h</param>
-    <param name="revision">v26.1.0</param>
+    <param name="versionformat">26.1.4_ce_%h</param>
+    <param name="revision">v26.1.4</param>
     <param name="filename">docker</param>
   </service>
   <service name="tar_scm" mode="manual">
     <param name="url">https://github.com/docker/cli.git</param>
     <param name="scm">git</param>
     <param name="exclude">.git</param>
-    <param name="versionformat">26.1.0_ce</param>
-    <param name="revision">v26.1.0</param>
+    <param name="versionformat">26.1.4_ce</param>
+    <param name="revision">v26.1.4</param>
     <param name="filename">docker-cli</param>
   </service>
   <service name="recompress" mode="manual">

++++++ cli-0001-docs-include-required-tools-in-source-tree.patch ++++++
--- /var/tmp/diff_new_pack.a73ftV/_old  2024-06-24 20:51:48.689059049 +0200
+++ /var/tmp/diff_new_pack.a73ftV/_new  2024-06-24 20:51:48.693059194 +0200
@@ -1,4 +1,4 @@
-From b58b0cfe39ec00365ef260ee5758eca9b4fac099 Mon Sep 17 00:00:00 2001
+From 17d56160e3b74d0378f071f538e2741dbf5372b6 Mon Sep 17 00:00:00 2001
 From: danishprakash <danish.prak...@suse.com>
 Date: Mon, 12 Feb 2024 18:07:06 +0530
 Subject: [PATCH] docs: include required tools in source tree
@@ -370,27 +370,27 @@
  mkdir -p docs/yaml
  set -x
 diff --git a/vendor.mod b/vendor.mod
-index 4c62fc143db7..c077944c94d3 100644
+index 3bc5ce327f0f..a654f78703d6 100644
 --- a/vendor.mod
 +++ b/vendor.mod
 @@ -11,6 +11,7 @@ require (
-       github.com/containerd/containerd v1.7.15
+       github.com/containerd/platforms v0.2.0
        github.com/creack/pty v1.1.21
        github.com/distribution/reference v0.5.0
 +      github.com/docker/cli-docs-tool v0.6.0
        github.com/docker/distribution v2.8.3+incompatible
-       github.com/docker/docker 
v26.0.1-0.20240422144514-c8af8ebe4a89+incompatible
+       github.com/docker/docker 
v26.1.4-0.20240605103321-de5c9cf0b96e+incompatible // 26.1 branch (v26.1.4-dev)
        github.com/docker/docker-credential-helpers v0.8.1
 @@ -53,6 +54,8 @@ require (
-       tags.cncf.io/container-device-interface v0.6.2
+       tags.cncf.io/container-device-interface v0.7.2
  )
  
 +require github.com/cpuguy83/go-md2man/v2 v2.0.3
 +
  require (
        github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // 
indirect
-       github.com/Microsoft/go-winio v0.6.1 // indirect
-@@ -82,6 +85,7 @@ require (
+       github.com/Microsoft/go-winio v0.6.2 // indirect
+@@ -83,6 +86,7 @@ require (
        github.com/prometheus/common v0.44.0 // indirect
        github.com/prometheus/procfs v0.12.0 // indirect
        github.com/rivo/uniseg v0.2.0 // indirect
@@ -398,25 +398,25 @@
        github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // 
indirect
        github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 
// indirect
        go.etcd.io/etcd/raft/v3 v3.5.6 // indirect
-@@ -97,4 +101,5 @@ require (
+@@ -96,4 +100,5 @@ require (
        google.golang.org/genproto/googleapis/rpc 
v0.0.0-20231016165738-49dd2c1f3d0b // indirect
        google.golang.org/grpc v1.60.1 // indirect
        google.golang.org/protobuf v1.33.0 // indirect
 +      gopkg.in/yaml.v3 v3.0.1 // indirect
  )
 diff --git a/vendor.sum b/vendor.sum
-index f89e8e9b45cf..7b2f888a10d6 100644
+index 6a31c9b2cf62..a0905e657c37 100644
 --- a/vendor.sum
 +++ b/vendor.sum
-@@ -44,6 +44,7 @@ github.com/containerd/containerd v1.7.15/go.mod 
h1:ISzRRTMF8EXNpJlTzyr2XMhN+j9K3
- github.com/containerd/log v0.1.0 
h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=
- github.com/containerd/log v0.1.0/go.mod 
h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo=
+@@ -46,6 +46,7 @@ github.com/containerd/log v0.1.0/go.mod 
h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3
+ github.com/containerd/platforms v0.2.0 
h1:clGNvVIcY3k39VJSYdFGohI1b3bP/eeBUVR5+XA28oo=
+ github.com/containerd/platforms v0.2.0/go.mod 
h1:XOM2BS6kN6gXafPLg80V6y/QUib+xoLyC3qVmHzibko=
  github.com/coreos/go-systemd/v22 v22.3.2/go.mod 
h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
 +github.com/cpuguy83/go-md2man/v2 v2.0.3 
h1:qMCsGGgs+MAzDFyp9LpAe1Lqy/fY/qCovCm0qnXZOBM=
  github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod 
h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
  github.com/creack/pty v1.1.9/go.mod 
h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
  github.com/creack/pty v1.1.21 h1:1/QdRyBaHHJP61QkWMXlOIBfsgdDeeKfK8SYVUWJKf0=
-@@ -54,6 +55,8 @@ github.com/davecgh/go-spew v1.1.1/go.mod 
h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
+@@ -56,6 +57,8 @@ github.com/davecgh/go-spew v1.1.1/go.mod 
h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
  github.com/denisenkom/go-mssqldb v0.0.0-20191128021309-1d7a30a10f73/go.mod 
h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU=
  github.com/distribution/reference v0.5.0 
h1:/FUIFXtfc/x2gpa5/VGfiGLuOIdYa1t65IKK2OFGvA0=
  github.com/distribution/reference v0.5.0/go.mod 
h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
@@ -425,7 +425,7 @@
  github.com/docker/distribution v2.7.1+incompatible/go.mod 
h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
  github.com/docker/distribution v2.8.3+incompatible 
h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk=
  github.com/docker/distribution v2.8.3+incompatible/go.mod 
h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
-@@ -239,6 +242,7 @@ github.com/rivo/uniseg v0.2.0 
h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY=
+@@ -241,6 +244,7 @@ github.com/rivo/uniseg v0.2.0 
h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY=
  github.com/rivo/uniseg v0.2.0/go.mod 
h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
  github.com/rogpeppe/go-internal v1.11.0 
h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
  github.com/rogpeppe/go-internal v1.11.0/go.mod 
h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
@@ -23326,13 +23326,13 @@
 +
 +}
 diff --git a/vendor/modules.txt b/vendor/modules.txt
-index a9627e8c2978..78ee69b33ab7 100644
+index 4e0448570ce9..577e9de880c6 100644
 --- a/vendor/modules.txt
 +++ b/vendor/modules.txt
-@@ -33,12 +33,20 @@ github.com/containerd/containerd/platforms
- # github.com/containerd/log v0.1.0
+@@ -33,12 +33,20 @@ github.com/containerd/log
+ # github.com/containerd/platforms v0.2.0
  ## explicit; go 1.20
- github.com/containerd/log
+ github.com/containerd/platforms
 +# github.com/cpuguy83/go-md2man/v2 v2.0.3
 +## explicit; go 1.11
 +github.com/cpuguy83/go-md2man/v2
@@ -23367,7 +23367,7 @@
  # github.com/spf13/pflag v1.0.5
  ## explicit; go 1.12
  github.com/spf13/pflag
-@@ -521,6 +533,9 @@ google.golang.org/protobuf/types/known/wrapperspb
+@@ -498,6 +510,9 @@ google.golang.org/protobuf/types/known/wrapperspb
  # gopkg.in/yaml.v2 v2.4.0
  ## explicit; go 1.15
  gopkg.in/yaml.v2
@@ -23378,6 +23378,6 @@
  ## explicit; go 1.17
  gotest.tools/v3/assert
 -- 
-2.44.0
+2.45.1
 
 

++++++ docker-26.1.0_ce_c8af8ebe4a89.tar.xz -> 
docker-26.1.4_ce_de5c9cf0b96e.tar.xz ++++++
/work/SRC/openSUSE:Factory/docker/docker-26.1.0_ce_c8af8ebe4a89.tar.xz 
/work/SRC/openSUSE:Factory/.docker.new.18349/docker-26.1.4_ce_de5c9cf0b96e.tar.xz
 differ: char 15, line 1

++++++ docker-cli-26.1.0_ce.tar.xz -> docker-cli-26.1.4_ce.tar.xz ++++++
++++ 22688 lines of diff (skipped)

Reply via email to