Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package docker for openSUSE:Factory checked in at 2026-02-26 18:50:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/docker (Old) and /work/SRC/openSUSE:Factory/.docker.new.29461 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "docker" Thu Feb 26 18:50:17 2026 rev:183 rq:1333974 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/docker/docker.changes 2025-11-28 16:51:22.006330616 +0100 +++ /work/SRC/openSUSE:Factory/.docker.new.29461/docker.changes 2026-02-26 18:50:27.130022531 +0100 @@ -1,0 +2,48 @@ +Tue Feb 17 07:22:29 UTC 2026 - Thomas Blume <[email protected]> + +- Fix package from immutable mode (jsc#PED-14748) + * Migrate /var/lib/docker creation to docker.tmpfiles +- Replace obsolete packageand syntax with newer syntax + +------------------------------------------------------------------- +Thu Feb 5 09:47:18 UTC 2026 - Valentin Lefebvre <[email protected]> + +- Update to Docker 29.2.1. See upstream changelog online at + <https://docs.docker.com/engine/release-notes/29/#2921> +- Rebased patches: + * 0001-SECRETS-SUSE-always-clear-our-internal-secrets.patch + * 0002-SECRETS-daemon-allow-directory-creation-in-run-secre.patch + * 0003-SECRETS-SUSE-implement-SUSE-container-secrets.patch + * 0004-BUILD-SLE12-revert-graphdriver-btrfs-use-kernel-UAPI.patch + * 0005-bsc1073877-apparmor-clobber-docker-default-profile-o.patch + * 0006-SLE12-revert-apparmor-remove-version-conditionals-fr.patch + * cli-0001-openSUSE-point-users-to-docker-buildx-package.patch + * cli-0002-SECRETS-SUSE-default-to-DOCKER_BUILDKIT-0-for-docker.patch + +------------------------------------------------------------------- +Fri Jan 30 09:44:27 UTC 2026 - Valentin Lefebvre <[email protected]> + +- Update to docker-buildx v0.31.1. Upstream changelog: + <https://github.com/docker/buildx/releases/tag/v0.31.1> + +------------------------------------------------------------------- +Wed Jan 28 08:42:34 UTC 2026 - Valentin Lefebvre <[email protected]> + +- Update to Docker 29.2.0. See upstream changelog online at + <https://docs.docker.com/engine/release-notes/29/#2920> + Fix CVE-2025-67499 (bsc#255500) +- Update to buildx 0.31.0. See upstream changelog online at + <https://github.com/docker/buildx/releases/tag/v0.31.0> +- Rebased patches: + * 0001-SECRETS-SUSE-always-clear-our-internal-secrets.patch + * 0002-SECRETS-daemon-allow-directory-creation-in-run-secre.patch + * 0003-SECRETS-SUSE-implement-SUSE-container-secrets.patch + * 0004-BUILD-SLE12-revert-graphdriver-btrfs-use-kernel-UAPI.patch + * 0005-bsc1073877-apparmor-clobber-docker-default-profile-o.patch + * 0006-SLE12-revert-apparmor-remove-version-conditionals-fr.patch + * cli-0001-openSUSE-point-users-to-docker-buildx-package.patch + * cli-0002-SECRETS-SUSE-default-to-DOCKER_BUILDKIT-0-for-docker.patch +- Build of buildx moved from Makefile to go build to not use + Dockerfile. + +------------------------------------------------------------------- Old: ---- docker-28.5.1_ce_f8215cc26.tar.xz docker-buildx-0.29.0.tar.xz docker-cli-28.5.1_ce.tar.xz New: ---- docker-29.2.1_ce_6bc6209b88.tar.xz docker-buildx-0.31.1.tar.xz docker-cli-29.2.1_ce.tar.xz docker.tmpfiles ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ docker.spec ++++++ --- /var/tmp/diff_new_pack.EVJ6Ca/_old 2026-02-26 18:50:28.578082918 +0100 +++ /var/tmp/diff_new_pack.EVJ6Ca/_new 2026-02-26 18:50:28.582083085 +0100 @@ -53,8 +53,8 @@ %endif # MANUAL: This needs to be updated with every docker update. -%define docker_real_version 28.5.1 -%define docker_git_version f8215cc26 +%define docker_real_version 29.2.1 +%define docker_git_version 6bc6209b88 %define docker_version %{docker_real_version}_ce # This "nice version" is so that docker --version gives a result that can be # parsed by other people. boo#1182476 @@ -62,7 +62,7 @@ %if %{with buildx} # MANUAL: This needs to be updated with every docker-buildx update. -%define buildx_version 0.29.0 +%define buildx_version 0.31.1 %endif # Used when generating the "build" information for Docker version. The value of @@ -70,7 +70,7 @@ # 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 git_commit_epoch 1759890872 +%define git_commit_epoch 1770050380 Name: docker%{flavour} Version: %{docker_version} @@ -91,6 +91,9 @@ Source140: docker-audit.rules Source150: docker-daemon.json Source160: docker.sysusers +%if 0%{?suse_version} >= 1500 +Source170: docker.tmpfiles +%endif # docker-integration-tests-devel Source900: docker-integration.sh # NOTE: All of these patches are maintained in <https://github.com/suse/docker> @@ -126,8 +129,9 @@ BuildRequires: sqlite3-devel BuildRequires: sysuser-tools BuildRequires: zsh -BuildRequires: golang(API) = 1.24 +BuildRequires: golang(API) >= 1.25 BuildRequires: pkgconfig(libsystemd) +BuildRequires: pkgconfig(libnftables) %if %{with apparmor} %if 0%{?suse_version} >= 1500 # This conditional only works on rpm>=4.13, which SLE 12 doesn't have. But we @@ -277,7 +281,12 @@ Group: System/Shells Requires: %{name} = %{docker_version} Requires: bash-completion +#obsolete packageand (see https://en.opensuse.org/RPM_Boolean_Dependencies) +%if 0%{?suse_version} && 0%{?suse_version} < 1500 Supplements: packageand(%{name}:bash-completion) +%else +Supplements: (%{name} and bash-completion) +%endif BuildArch: noarch # docker-stable cannot be used alongside docker. %if "%{name}" == "docker-stable" @@ -296,7 +305,12 @@ Group: System/Shells Requires: %{name} = %{docker_version} Requires: zsh +#obsolete packageand (see https://en.opensuse.org/RPM_Boolean_Dependencies) +%if 0%{?suse_version} && 0%{?suse_version} < 1500 Supplements: packageand(%{name}:zsh) +%else +Supplements: (%{name} and zsh) +%endif BuildArch: noarch # docker-stable cannot be used alongside docker. %if "%{name}" == "docker-stable" @@ -315,7 +329,12 @@ Group: System/Shells Requires: %{name} = %{docker_version} Requires: fish +#obsolete packageand (see https://en.opensuse.org/RPM_Boolean_Dependencies) +%if 0%{?suse_version} && 0%{?suse_version} < 1500 Supplements: packageand(%{name}:fish) +%else +Supplements: (%{name} and fish) +%endif BuildArch: noarch # docker-stable cannot be used alongside docker. %if "%{name}" == "docker-stable" @@ -394,9 +413,6 @@ ################### pushd "%{docker_builddir}" -# use go module for build -cp {vendor,go}.mod -cp {vendor,go}.sum ./hack/make.sh dynbinary # dockerd man page GO_MD2MAN=go-md2man make -C ./man/ @@ -434,12 +450,19 @@ ################### pushd "%{buildx_builddir}" -make \ - CGO_ENABLED=1 \ - VERSION="%{buildx_version}" \ - REVISION="v%{buildx_version}" \ - GO_EXTRA_FLAGS="-buildmode=pie" \ - build +# From https://github.com/docker/buildx/commit/2012e4de355304c3fb590157722e6b5b3f266876 +# Build options has been moved to Dockerfile. Replicate only the build part: +export GO_EXTRA_FLAGS="-buildmode=pie" +export PKG="github.com/docker/buildx" +export LD_FLAGS="-s -w -X ${PKG}/version.Version=%{buildx_version}" +export LD_FLAGS="${LD_FLAGS} -X ${PKG}/version.Revision=v%{buildx_version}" +export LD_FLAGS="${LD_FLAGS} -X ${PKG}/version.Package=${PKG}" +go build \ + -mod vendor \ + -trimpath \ + ${GO_EXTRA_FLAGS} \ + -ldflags "${LD_FLAGS}" \ + -o ./bin/build/docker-buildx ./cmd/buildx popd %endif @@ -461,8 +484,14 @@ install -D -m0755 %{buildx_builddir}/bin/build/docker-buildx %{buildroot}/usr/lib/docker/cli-plugins/docker-buildx %endif +%if 0%{?suse_version} && 0%{?suse_version} < 1500 # /var/lib/docker install -d %{buildroot}/%{_localstatedir}/lib/docker +%else +mkdir -p %{buildroot}%{_tmpfilesdir} +install -m 0644 %{SOURCE170} %{buildroot}%{_tmpfilesdir}/docker.conf +%endif + # daemon.json config file install -D -m0644 %{SOURCE150} %{buildroot}%{_sysconfdir}/docker/daemon.json %if %{with suseconnect} @@ -554,7 +583,13 @@ %{_bindir}/dockerd %{_bindir}/docker-proxy %{_sbindir}/rcdocker + +%if 0%{?suse_version} && 0%{?suse_version} < 1500 %dir %{_localstatedir}/lib/docker/ +%else +%ghost %attr(0750,root,root) %{_localstatedir}/lib/docker +%{_tmpfilesdir}/docker.conf +%endif %dir /usr/lib/docker %dir /usr/lib/docker/cli-plugins ++++++ 0001-SECRETS-SUSE-always-clear-our-internal-secrets.patch ++++++ --- /var/tmp/diff_new_pack.EVJ6Ca/_old 2026-02-26 18:50:28.618084586 +0100 +++ /var/tmp/diff_new_pack.EVJ6Ca/_new 2026-02-26 18:50:28.622084753 +0100 @@ -1,4 +1,4 @@ -From 8d12a0ed33fc4e099c59b4d977b2ce18cdc600e1 Mon Sep 17 00:00:00 2001 +From af161197d670f21ea70d7d5603f48325b2599c78 Mon Sep 17 00:00:00 2001 From: Aleksa Sarai <[email protected]> Date: Wed, 4 Jun 2025 15:01:37 +1000 Subject: [PATCH 1/6] SECRETS: SUSE: always clear our internal secrets @@ -31,7 +31,7 @@ create mode 100644 daemon/suse_secrets.go diff --git a/daemon/start.go b/daemon/start.go -index a914a0fe3145..0930ff91d1a2 100644 +index f09bca316a..262d66e731 100644 --- a/daemon/start.go +++ b/daemon/start.go @@ -146,6 +146,16 @@ func (daemon *Daemon) containerStart(ctx context.Context, daemonCfg *configStore @@ -53,7 +53,7 @@ return err diff --git a/daemon/suse_secrets.go b/daemon/suse_secrets.go new file mode 100644 -index 000000000000..b8f3d9f9c094 +index 0000000000..711daa80aa --- /dev/null +++ b/daemon/suse_secrets.go @@ -0,0 +1,44 @@ @@ -79,9 +79,9 @@ +import ( + "strings" + -+ "github.com/docker/docker/container" ++ "github.com/moby/moby/v2/daemon/container" + -+ swarmtypes "github.com/docker/docker/api/types/swarm" ++ swarmtypes "github.com/moby/moby/api/types/swarm" + + "github.com/sirupsen/logrus" +) @@ -102,6 +102,6 @@ + c.SecretReferences = without +} -- -2.51.0 +2.52.0 ++++++ 0002-SECRETS-daemon-allow-directory-creation-in-run-secre.patch ++++++ --- /var/tmp/diff_new_pack.EVJ6Ca/_old 2026-02-26 18:50:28.638085420 +0100 +++ /var/tmp/diff_new_pack.EVJ6Ca/_new 2026-02-26 18:50:28.642085587 +0100 @@ -1,4 +1,4 @@ -From c12e6960ee87d7944001e22f0ce3ada72a6a9cea Mon Sep 17 00:00:00 2001 +From 5702fa803ecc6b58f243a008cd4487f00f4db763 Mon Sep 17 00:00:00 2001 From: Aleksa Sarai <[email protected]> Date: Wed, 8 Mar 2017 12:41:54 +1100 Subject: [PATCH 2/6] SECRETS: daemon: allow directory creation in /run/secrets @@ -14,7 +14,7 @@ 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/daemon/container_operations_unix.go b/daemon/container_operations_unix.go -index f6d9449609b7..520b7f80f162 100644 +index 146025ff89..2d76615341 100644 --- a/daemon/container_operations_unix.go +++ b/daemon/container_operations_unix.go @@ -3,6 +3,7 @@ @@ -25,15 +25,15 @@ "context" "fmt" "os" -@@ -21,6 +22,7 @@ import ( - "github.com/docker/docker/libnetwork/drivers/bridge" - "github.com/docker/docker/pkg/process" - "github.com/docker/docker/pkg/stringid" +@@ -22,6 +23,7 @@ import ( + "github.com/moby/moby/v2/daemon/network" + "github.com/moby/moby/v2/errdefs" + "github.com/moby/moby/v2/pkg/process" + "github.com/moby/go-archive" "github.com/moby/sys/mount" "github.com/moby/sys/user" "github.com/opencontainers/selinux/go-selinux/label" -@@ -325,9 +327,6 @@ func (daemon *Daemon) setupSecretDir(ctr *container.Container) (setupErr error) +@@ -329,9 +331,6 @@ func (daemon *Daemon) setupSecretDir(ctr *container.Container) (setupErr error) if err != nil { return errors.Wrap(err, "unable to get secret from secret store") } @@ -43,7 +43,7 @@ uid, err := strconv.Atoi(s.File.UID) if err != nil { -@@ -338,6 +337,24 @@ func (daemon *Daemon) setupSecretDir(ctr *container.Container) (setupErr error) +@@ -342,6 +341,24 @@ func (daemon *Daemon) setupSecretDir(ctr *container.Container) (setupErr error) return err } @@ -69,6 +69,6 @@ return errors.Wrap(err, "error setting ownership for secret") } -- -2.51.0 +2.52.0 ++++++ 0003-SECRETS-SUSE-implement-SUSE-container-secrets.patch ++++++ --- /var/tmp/diff_new_pack.EVJ6Ca/_old 2026-02-26 18:50:28.654086087 +0100 +++ /var/tmp/diff_new_pack.EVJ6Ca/_new 2026-02-26 18:50:28.662086421 +0100 @@ -1,4 +1,4 @@ -From 915d237a25cc9639de24ad3e36f3d299be137e8a Mon Sep 17 00:00:00 2001 +From 8c409465480e03d99671295bea7ce756e2af422d Mon Sep 17 00:00:00 2001 From: Aleksa Sarai <[email protected]> Date: Wed, 8 Mar 2017 11:43:29 +1100 Subject: [PATCH 3/6] SECRETS: SUSE: implement SUSE container secrets @@ -18,11 +18,11 @@ Signed-off-by: Aleksa Sarai <[email protected]> --- daemon/start.go | 5 + - daemon/suse_secrets.go | 438 +++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 443 insertions(+) + daemon/suse_secrets.go | 439 +++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 444 insertions(+) diff --git a/daemon/start.go b/daemon/start.go -index 0930ff91d1a2..02d2f8429c19 100644 +index 262d66e731..1a646728cb 100644 --- a/daemon/start.go +++ b/daemon/start.go @@ -156,6 +156,11 @@ func (daemon *Daemon) containerStart(ctx context.Context, daemonCfg *configStore @@ -38,10 +38,10 @@ if err != nil { return err diff --git a/daemon/suse_secrets.go b/daemon/suse_secrets.go -index b8f3d9f9c094..5ab96651080b 100644 +index 711daa80aa..91d7993086 100644 --- a/daemon/suse_secrets.go +++ b/daemon/suse_secrets.go -@@ -18,15 +18,378 @@ +@@ -18,15 +18,379 @@ package daemon import ( @@ -56,11 +56,12 @@ "strings" + "syscall" - "github.com/docker/docker/container" -+ "github.com/docker/docker/pkg/rootless" + "github.com/moby/moby/v2/daemon/container" ++ "github.com/moby/moby/v2/daemon/internal/rootless" - swarmtypes "github.com/docker/docker/api/types/swarm" + swarmtypes "github.com/moby/moby/api/types/swarm" + "github.com/moby/go-archive" ++ "github.com/moby/go-archive/compression" + swarmexec "github.com/moby/swarmkit/v2/agent/exec" + swarmapi "github.com/moby/swarmkit/v2/api" + "github.com/moby/sys/user" @@ -195,7 +196,7 @@ + // directory and add dir as an IncludeFiles specifically so that we + // preserve the name of the directory itself. + tarStream, err := archive.TarWithOptions(path, &archive.TarOptions{ -+ Compression: archive.Uncompressed, ++ Compression: compression.None, + IncludeSourceDir: true, + }) + if err != nil { @@ -420,7 +421,7 @@ // clearSuseSecrets removes any SecretReferences which were added by us // explicitly (this is detected by checking that the prefix has a 'suse_' // prefix, which is a prefix that cannot exist for normal swarm secrets). See -@@ -42,3 +405,78 @@ func (daemon *Daemon) clearSuseSecrets(c *container.Container) { +@@ -42,3 +406,78 @@ func (daemon *Daemon) clearSuseSecrets(c *container.Container) { } c.SecretReferences = without } @@ -500,6 +501,6 @@ + return nil +} -- -2.51.0 +2.52.0 ++++++ 0004-BUILD-SLE12-revert-graphdriver-btrfs-use-kernel-UAPI.patch ++++++ --- /var/tmp/diff_new_pack.EVJ6Ca/_old 2026-02-26 18:50:28.674086921 +0100 +++ /var/tmp/diff_new_pack.EVJ6Ca/_new 2026-02-26 18:50:28.682087255 +0100 @@ -1,4 +1,4 @@ -From c078332b3a52f0e220fd19f476c30dee50f7c1e3 Mon Sep 17 00:00:00 2001 +From 564fe2272a9cd62199a5be4ce59c24f2b54c6a18 Mon Sep 17 00:00:00 2001 From: Aleksa Sarai <[email protected]> Date: Mon, 22 May 2023 15:44:54 +1000 Subject: [PATCH 4/6] BUILD: SLE12: revert "graphdriver/btrfs: use kernel UAPI @@ -16,7 +16,7 @@ 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/daemon/graphdriver/btrfs/btrfs.go b/daemon/graphdriver/btrfs/btrfs.go -index fa0cb3ed25d8..871f6b3f8c1f 100644 +index 5f6ead6c7e..ab45a3cec1 100644 --- a/daemon/graphdriver/btrfs/btrfs.go +++ b/daemon/graphdriver/btrfs/btrfs.go @@ -4,17 +4,12 @@ package btrfs @@ -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.51.0 +2.52.0 ++++++ 0005-bsc1073877-apparmor-clobber-docker-default-profile-o.patch ++++++ --- /var/tmp/diff_new_pack.EVJ6Ca/_old 2026-02-26 18:50:28.698087922 +0100 +++ /var/tmp/diff_new_pack.EVJ6Ca/_new 2026-02-26 18:50:28.710088423 +0100 @@ -1,4 +1,4 @@ -From e9aff2856f7b827ebb6964b5fd33fc51e2b6f0ec Mon Sep 17 00:00:00 2001 +From 67bda5dd1f491f42fc72bb834b213643474c3425 Mon Sep 17 00:00:00 2001 From: Aleksa Sarai <[email protected]> Date: Fri, 29 Jun 2018 17:59:30 +1000 Subject: [PATCH 5/6] bsc1073877: apparmor: clobber docker-default profile on @@ -22,7 +22,7 @@ 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/daemon/apparmor_default.go b/daemon/apparmor_default.go -index a1048e303c1e..e087f6b9265f 100644 +index a1048e303c..e087f6b926 100644 --- a/daemon/apparmor_default.go +++ b/daemon/apparmor_default.go @@ -23,6 +23,15 @@ func DefaultApparmorProfile() string { @@ -54,7 +54,7 @@ return nil } diff --git a/daemon/apparmor_default_unsupported.go b/daemon/apparmor_default_unsupported.go -index 37974bbb9778..095aa728a7a8 100644 +index 37974bbb97..095aa728a7 100644 --- a/daemon/apparmor_default_unsupported.go +++ b/daemon/apparmor_default_unsupported.go @@ -2,6 +2,10 @@ @@ -69,10 +69,10 @@ return nil } diff --git a/daemon/daemon.go b/daemon/daemon.go -index 2e0a36eb102b..f28c6e061fa9 100644 +index a5bd3c9f78..f621a1529a 100644 --- a/daemon/daemon.go +++ b/daemon/daemon.go -@@ -878,8 +878,9 @@ func NewDaemon(ctx context.Context, config *config.Config, pluginStore *plugin.S +@@ -940,8 +940,9 @@ func NewDaemon(ctx context.Context, config *config.Config, pluginStore *plugin.S log.G(ctx).Warnf("Failed to configure golang's threads limit: %v", err) } @@ -85,6 +85,6 @@ } -- -2.51.0 +2.52.0 ++++++ 0006-SLE12-revert-apparmor-remove-version-conditionals-fr.patch ++++++ --- /var/tmp/diff_new_pack.EVJ6Ca/_old 2026-02-26 18:50:28.726089090 +0100 +++ /var/tmp/diff_new_pack.EVJ6Ca/_new 2026-02-26 18:50:28.730089257 +0100 @@ -1,4 +1,4 @@ -From d4db647a40c0c8992dc2eeb862e8bafaff58cca3 Mon Sep 17 00:00:00 2001 +From 87e85bb7f050dd02d95100347a040dce7c52be3a Mon Sep 17 00:00:00 2001 From: Aleksa Sarai <[email protected]> Date: Wed, 11 Oct 2023 21:19:12 +1100 Subject: [PATCH 6/6] SLE12: revert "apparmor: remove version-conditionals from @@ -26,7 +26,7 @@ create mode 100644 pkg/aaparser/aaparser.go diff --git a/contrib/apparmor/main.go b/contrib/apparmor/main.go -index 899d8378edae..93f98cbd20e5 100644 +index 899d8378ed..13caa8245e 100644 --- a/contrib/apparmor/main.go +++ b/contrib/apparmor/main.go @@ -6,9 +6,13 @@ import ( @@ -34,7 +34,7 @@ "path" "text/template" + -+ "github.com/docker/docker/pkg/aaparser" ++ "github.com/moby/moby/v2/pkg/aaparser" ) -type profileData struct{} @@ -69,7 +69,7 @@ log.Fatalf("executing template failed: %v", err) } diff --git a/contrib/apparmor/template.go b/contrib/apparmor/template.go -index 58afcbe845ee..e6d0b6d37c58 100644 +index 58afcbe845..e6d0b6d37c 100644 --- a/contrib/apparmor/template.go +++ b/contrib/apparmor/template.go @@ -20,9 +20,11 @@ profile /usr/bin/docker (attach_disconnected, complain) { @@ -158,7 +158,7 @@ /usr/bin/xz rm, diff --git a/pkg/aaparser/aaparser.go b/pkg/aaparser/aaparser.go new file mode 100644 -index 000000000000..89b48b2dba58 +index 0000000000..89b48b2dba --- /dev/null +++ b/pkg/aaparser/aaparser.go @@ -0,0 +1,86 @@ @@ -249,7 +249,7 @@ + return numericVersion, nil +} diff --git a/vendor/github.com/moby/profiles/apparmor/apparmor.go b/vendor/github.com/moby/profiles/apparmor/apparmor.go -index 445eed64e979..871b1f7d63c2 100644 +index 445eed64e9..060a482289 100644 --- a/vendor/github.com/moby/profiles/apparmor/apparmor.go +++ b/vendor/github.com/moby/profiles/apparmor/apparmor.go @@ -11,10 +11,14 @@ import ( @@ -257,7 +257,7 @@ "strings" "text/template" + -+ "github.com/docker/docker/pkg/aaparser" ++ "github.com/moby/moby/v2/pkg/aaparser" ) -// profileDirectory is the file store for apparmor profiles and macros. @@ -292,7 +292,7 @@ } diff --git a/vendor/github.com/moby/profiles/apparmor/template.go b/vendor/github.com/moby/profiles/apparmor/template.go -index 2ebcc218a702..682425f71e64 100644 +index 2ebcc218a7..682425f71e 100644 --- a/vendor/github.com/moby/profiles/apparmor/template.go +++ b/vendor/github.com/moby/profiles/apparmor/template.go @@ -22,6 +22,7 @@ profile {{.Name}} flags=(attach_disconnected,mediate_deleted) { @@ -322,6 +322,6 @@ } ` -- -2.51.0 +2.52.0 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.EVJ6Ca/_old 2026-02-26 18:50:28.806092427 +0100 +++ /var/tmp/diff_new_pack.EVJ6Ca/_new 2026-02-26 18:50:28.810092593 +0100 @@ -3,24 +3,24 @@ <param name="url">https://github.com/moby/moby.git</param> <param name="scm">git</param> <param name="exclude">.git</param> - <param name="versionformat">28.5.1_ce_%h</param> - <param name="revision">v28.5.1</param> + <param name="versionformat">29.2.1_ce_%h</param> + <param name="revision">docker-v29.2.1</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">28.5.1_ce</param> - <param name="revision">v28.5.1</param> + <param name="versionformat">29.2.1_ce</param> + <param name="revision">v29.2.1</param> <param name="filename">docker-cli</param> </service> <service name="tar_scm" mode="manual"> <param name="url">https://github.com/docker/buildx.git</param> <param name="scm">git</param> <param name="exclude">.git</param> - <param name="versionformat">0.29.0</param> - <param name="revision">v0.29.0</param> + <param name="versionformat">0.31.1</param> + <param name="revision">v0.31.1</param> <param name="filename">docker-buildx</param> </service> <service name="recompress" mode="manual"> ++++++ cli-0001-openSUSE-point-users-to-docker-buildx-package.patch ++++++ --- /var/tmp/diff_new_pack.EVJ6Ca/_old 2026-02-26 18:50:28.838093761 +0100 +++ /var/tmp/diff_new_pack.EVJ6Ca/_new 2026-02-26 18:50:28.842093928 +0100 @@ -1,4 +1,4 @@ -From d5cf64f9cb8b5382a4f87700a80a0bc2c8d3185e Mon Sep 17 00:00:00 2001 +From 2afac7bccbc69a5e8f5f45734bde0b3999727799 Mon Sep 17 00:00:00 2001 From: Aleksa Sarai <[email protected]> Date: Mon, 1 Sep 2025 16:05:24 +1000 Subject: [PATCH 1/2] openSUSE: point users to docker-buildx package @@ -13,7 +13,7 @@ 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/docker/builder.go b/cmd/docker/builder.go -index 00fc1b40f1ab..ff3becd1c9e7 100644 +index d6d74919b..3fc465f86 100644 --- a/cmd/docker/builder.go +++ b/cmd/docker/builder.go @@ -20,7 +20,7 @@ @@ -40,6 +40,6 @@ ) -- -2.51.0 +2.52.0 ++++++ cli-0002-SECRETS-SUSE-default-to-DOCKER_BUILDKIT-0-for-docker.patch ++++++ --- /var/tmp/diff_new_pack.EVJ6Ca/_old 2026-02-26 18:50:28.866094928 +0100 +++ /var/tmp/diff_new_pack.EVJ6Ca/_new 2026-02-26 18:50:28.874095262 +0100 @@ -1,4 +1,4 @@ -From fbc4c8b4ac9f5ba5604fb2987fe53648fc63a009 Mon Sep 17 00:00:00 2001 +From 77df1215a7951471696f85397a569920a6c60dbe Mon Sep 17 00:00:00 2001 From: Aleksa Sarai <[email protected]> Date: Fri, 15 Aug 2025 19:55:53 +1000 Subject: [PATCH 2/2] SECRETS: SUSE: default to DOCKER_BUILDKIT=0 for "docker @@ -34,7 +34,7 @@ 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/cmd/docker/builder.go b/cmd/docker/builder.go -index ff3becd1c9e7..bfbaf566148c 100644 +index 3fc465f86..60f2a8e9a 100644 --- a/cmd/docker/builder.go +++ b/cmd/docker/builder.go @@ -23,9 +23,19 @@ @@ -94,6 +94,6 @@ } return args, osargs, nil, nil -- -2.51.0 +2.52.0 ++++++ docker-28.5.1_ce_f8215cc26.tar.xz -> docker-29.2.1_ce_6bc6209b88.tar.xz ++++++ /work/SRC/openSUSE:Factory/docker/docker-28.5.1_ce_f8215cc26.tar.xz /work/SRC/openSUSE:Factory/.docker.new.29461/docker-29.2.1_ce_6bc6209b88.tar.xz differ: char 15, line 1 ++++++ docker-buildx-0.29.0.tar.xz -> docker-buildx-0.31.1.tar.xz ++++++ /work/SRC/openSUSE:Factory/docker/docker-buildx-0.29.0.tar.xz /work/SRC/openSUSE:Factory/.docker.new.29461/docker-buildx-0.31.1.tar.xz differ: char 15, line 1 ++++++ docker-cli-28.5.1_ce.tar.xz -> docker-cli-29.2.1_ce.tar.xz ++++++ ++++ 240060 lines of diff (skipped) ++++++ docker.tmpfiles ++++++ d /var/lib/docker 0750 root root -
