Accepting request 1190568 from Virtualization:containers

OBS-URL: https://build.opensuse.org/request/show/1190568 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/docker?expand=0&rev=147
2024-08-01 20:03:42 +00:00 · 2024-08-01 20:03:42 +00:00 · 3480afa22e
commit 3480afa22e
parent 5a65005d4a 2b14743f6e
15 changed files with 62 additions and 29 deletions
--- a/0001-SECRETS-daemon-allow-directory-creation-in-run-secre.patch
+++ b/0001-SECRETS-daemon-allow-directory-creation-in-run-secre.patch
@ -1,4 +1,4 @@
-From dfdd2609d9c944b5e4fe68bfc3ac6f8c493e96b6 Mon Sep 17 00:00:00 2001
+From ec53ee338835c4c1dc583695ac166f36bf3bac5c Mon Sep 17 00:00:00 2001
 From: Aleksa Sarai <asarai@suse.de>
 Date: Wed, 8 Mar 2017 12:41:54 +1100
 Subject: [PATCH 1/7] SECRETS: daemon: allow directory creation in /run/secrets
--- a/0002-SECRETS-SUSE-implement-SUSE-container-secrets.patch
+++ b/0002-SECRETS-SUSE-implement-SUSE-container-secrets.patch
@ -1,4 +1,4 @@
-From a7422989a18870abd913b19673f025bd1b085750 Mon Sep 17 00:00:00 2001
+From 759482e941bde2b67d39b52c803e3390555ff9e9 Mon Sep 17 00:00:00 2001
 From: Aleksa Sarai <asarai@suse.de>
 Date: Wed, 8 Mar 2017 11:43:29 +1100
 Subject: [PATCH 2/7] SECRETS: SUSE: implement SUSE container secrets
--- a/0003-BUILD-SLE12-revert-graphdriver-btrfs-use-kernel-UAPI.patch
+++ b/0003-BUILD-SLE12-revert-graphdriver-btrfs-use-kernel-UAPI.patch
@ -1,4 +1,4 @@
-From 5baf9eee37fccd7099c14e5da705a6d105500278 Mon Sep 17 00:00:00 2001
+From 983a57fd37dc8e42e9c4e4dfc72eb346a4385948 Mon Sep 17 00:00:00 2001
 From: Aleksa Sarai <asarai@suse.de>
 Date: Mon, 22 May 2023 15:44:54 +1000
 Subject: [PATCH 3/7] BUILD: SLE12: revert "graphdriver/btrfs: use kernel UAPI
--- a/0004-bsc1073877-apparmor-clobber-docker-default-profile-o.patch
+++ b/0004-bsc1073877-apparmor-clobber-docker-default-profile-o.patch
@ -1,4 +1,4 @@
-From 5df43b3c82b7c69dc09dd775098771f20ac2435c Mon Sep 17 00:00:00 2001
+From 8829bb8ec53399fd41dd6f46e2bad64e773e8eaa Mon Sep 17 00:00:00 2001
 From: Aleksa Sarai <asarai@suse.de>
 Date: Fri, 29 Jun 2018 17:59:30 +1000
 Subject: [PATCH 4/7] bsc1073877: apparmor: clobber docker-default profile on
--- a/0005-SLE12-revert-apparmor-remove-version-conditionals-fr.patch
+++ b/0005-SLE12-revert-apparmor-remove-version-conditionals-fr.patch
@ -1,4 +1,4 @@
-From deb42984d58de574bc2ca5857905ff68b57235c0 Mon Sep 17 00:00:00 2001
+From 24173cd6a2643e5e680e84920864f42ed43b6f28 Mon Sep 17 00:00:00 2001
 From: Aleksa Sarai <asarai@suse.de>
 Date: Wed, 11 Oct 2023 21:19:12 +1100
 Subject: [PATCH 5/7] SLE12: revert "apparmor: remove version-conditionals from
--- a/0006-bsc1221916-update-to-patched-buildkit-version-to-fix.patch
+++ b/0006-bsc1221916-update-to-patched-buildkit-version-to-fix.patch
@ -1,4 +1,4 @@
-From df2f4064006a11c299171a10a13d4d1f54a1e37f Mon Sep 17 00:00:00 2001
+From dd16d113b9215bf5b0b56c409e7272ce07525836 Mon Sep 17 00:00:00 2001
 From: Aleksa Sarai <cyphar@cyphar.com>
 Date: Tue, 7 May 2024 01:51:25 +1000
 Subject: [PATCH 6/7] bsc1221916: update to patched buildkit version to fix
--- a/0007-bsc1214855-volume-use-AtomicWriteFile-to-save-volume.patch
+++ b/0007-bsc1214855-volume-use-AtomicWriteFile-to-save-volume.patch
@ -1,4 +1,4 @@
-From 7159c13ee349a2e2edb5ed8b6793794bae9025fd Mon Sep 17 00:00:00 2001
+From 62035ba22a45bde6bed2da321e7ad954f5b461b4 Mon Sep 17 00:00:00 2001
 From: Aleksa Sarai <cyphar@cyphar.com>
 Date: Wed, 19 Jun 2024 16:30:49 +1000
 Subject: [PATCH 7/7] bsc1214855: volume: use AtomicWriteFile to save volume
--- a/8
+++ b/8
@ -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.4_ce_%h</param>
-    <param name="revision">v26.1.4</param>
+    <param name="versionformat">26.1.5_ce_%h</param>
+    <param name="revision">v26.1.5</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.4_ce</param>
-    <param name="revision">v26.1.4</param>
+    <param name="versionformat">26.1.5_ce</param>
+    <param name="revision">v26.1.5</param>
    <param name="filename">docker-cli</param>
  </service>
  <service name="recompress" mode="manual">
--- a/cli-0001-docs-include-required-tools-in-source-tree.patch
+++ b/cli-0001-docs-include-required-tools-in-source-tree.patch
@ -1,4 +1,4 @@
-From 17d56160e3b74d0378f071f538e2741dbf5372b6 Mon Sep 17 00:00:00 2001
+From 3701285f1cf678dda730e3f9a4860d74ca54057d Mon Sep 17 00:00:00 2001
 From: danishprakash <danish.prakash@suse.com>
 Date: Mon, 12 Feb 2024 18:07:06 +0530
 Subject: [PATCH] docs: include required tools in source tree
@ -23378,5 +23378,5 @@ index 4e0448570ce9..577e9de880c6 100644
 ## explicit; go 1.17
 gotest.tools/v3/assert
 -- 
-2.45.1
+2.45.2

--- a/docker-26.1.4_ce_de5c9cf0b96e.tar.xz
+++ b/docker-26.1.4_ce_de5c9cf0b96e.tar.xz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3a866c020abe705657cb373e692db7f1ad4ad547b9e25c7a557a06f4549a63c9
-size 9909596
--- a/docker-26.1.5_ce_411e817ddf71.tar.xz
+++ b/docker-26.1.5_ce_411e817ddf71.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e2d3862e95b45b04830bbce47827e07eceaa41761fa5182bd9b492621cbe8469
+size 9910176
--- a/docker-cli-26.1.4_ce.tar.xz
+++ b/docker-cli-26.1.4_ce.tar.xz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9a2b7ab7e665e9469fdd71bca1dd28ead5dc58dc9886f285f1fa75978ef5c078
-size 3971272
--- a/docker-cli-26.1.5_ce.tar.xz
+++ b/docker-cli-26.1.5_ce.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3723a617ed00e85117c3de2691e1aec6267020ee49fdb0db72c12981d0d26f9e
+size 3972080
--- a/docker.changes
+++ b/docker.changes
@ -1,20 +1,53 @@
+-------------------------------------------------------------------
+Wed Jul 31 05:28:09 UTC 2024 - Aleksa Sarai <asarai@suse.com>
+
+- Update to Docker 26.1.5-ce. See upstream changelog online at
+  <https://docs.docker.com/engine/release-notes/26.1/#2615>
+- This update includes a fix for CVE-2024-41110. bsc#1228324
+- 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
+  * 0006-bsc1221916-update-to-patched-buildkit-version-to-fix.patch
+  * 0007-bsc1214855-volume-use-AtomicWriteFile-to-save-volume.patch
+  * cli-0001-docs-include-required-tools-in-source-tree.patch
+
+-------------------------------------------------------------------
+Wed Jul 31 04:58:15 UTC 2024 - Aleksa Sarai <asarai@suse.com>
+
+[NOTE: This update was only ever released in SLES and Leap.]
+
+- Update to Docker 25.0.6-ce. See upstream changelog online at
+  <https://docs.docker.com/engine/release-notes/25.0/#2506>
+- This update includes a fix for CVE-2024-41110. bsc#1228324
+- 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
+  * 0006-bsc1221916-update-to-patched-buildkit-version-to-fix.patch
+  * 0007-bsc1214855-volume-use-AtomicWriteFile-to-save-volume.patch
+
 -------------------------------------------------------------------
 Mon Jun 24 08:15:24 UTC 2024 - Aleksa Sarai <asarai@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
+  * 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
+  + 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
+  + 0007-bsc1214855-volume-use-AtomicWriteFile-to-save-volume.patch

 -------------------------------------------------------------------
 Thu Jun  6 04:17:23 UTC 2024 - Aleksa Sarai <asarai@suse.com>
--- a/docker.spec
+++ b/docker.spec
@ -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.4
-%define git_version de5c9cf0b96e
-%define git_commit_epoch 1717583601
+%define real_version 26.1.5
+%define git_version 411e817ddf71
+%define git_commit_epoch 1721763388

 Name:           docker
 Version:        %{real_version}_ce