From adcf8965fd76b624a25969db323a4fe103cbd64e2edb6f8d552c2bafab7efb6b Mon Sep 17 00:00:00 2001 From: Aleksa Sarai Date: Thu, 9 Mar 2023 06:16:47 +0000 Subject: [PATCH 1/3] Accepting request 1070328 from home:cyphar:docker:CVE-2022-36109 Add CVE reference. OBS-URL: https://build.opensuse.org/request/show/1070328 OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=381 --- docker.changes | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker.changes b/docker.changes index 3fa7912..01ee29d 100644 --- a/docker.changes +++ b/docker.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Wed Feb 1 14:33:19 UTC 2023 - Dirk Müller -- update to 20.10.23-ce +- update to 20.10.23-ce. * see upstream changelog at https://docs.docker.com/engine/release-notes/#201023 - drop kubic flavor as kubic is EOL. this removes: @@ -12,6 +12,7 @@ Tue Dec 6 11:49:32 UTC 2022 - Aleksa Sarai - Update to Docker 20.10.21-ce. See upstream changelog online at . bsc#1206065 + bsc#1205375 CVE-2022-36109 - Rebase patches: * 0001-SECRETS-daemon-allow-directory-creation-in-run-secre.patch * 0002-SECRETS-SUSE-implement-SUSE-container-secrets.patch From 4da832e92cf3b35c6059656ca8bb7b1ceb2db2673ff1b78e02caa5545ccf21fa Mon Sep 17 00:00:00 2001 From: Aleksa Sarai Date: Tue, 14 Mar 2023 07:22:01 +0000 Subject: [PATCH 2/3] - Fix builds on SLE-12. OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=382 --- docker.changes | 5 +++++ docker.spec | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/docker.changes b/docker.changes index 01ee29d..93f60b5 100644 --- a/docker.changes +++ b/docker.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Mar 14 07:21:05 UTC 2023 - Aleksa Sarai + +- Fix builds on SLE-12. + ------------------------------------------------------------------- Wed Feb 1 14:33:19 UTC 2023 - Dirk Müller diff --git a/docker.spec b/docker.spec index 20ed0bc..06769c8 100644 --- a/docker.spec +++ b/docker.spec @@ -112,7 +112,13 @@ BuildRequires: go-go-md2man BuildRequires: pkgconfig(libsystemd) BuildRequires: sysuser-tools BuildRequires: golang(API) = 1.18 +%if 0%{?sle_version} == 120000 +# SLE-12's RPM doesn't support binary operations, and this feature isn't needed +# on SLE-12 anyway. +Requires: apparmor-parser +%else Requires: (apparmor-parser or container-selinux) +%endif Requires: ca-certificates-mozilla # The docker-proxy binary used to be in a separate package. We obsolete it, # since now docker-proxy is maintained as part of this package. From fd8d986a59586232ba1bf9b6e720bb3cd798fad47993c490cd45aaa83deadea3 Mon Sep 17 00:00:00 2001 From: Aleksa Sarai Date: Tue, 14 Mar 2023 09:10:56 +0000 Subject: [PATCH 3/3] Remove SLE-12 fix. OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=383 --- docker.changes | 5 ----- docker.spec | 6 ------ 2 files changed, 11 deletions(-) diff --git a/docker.changes b/docker.changes index 93f60b5..01ee29d 100644 --- a/docker.changes +++ b/docker.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Tue Mar 14 07:21:05 UTC 2023 - Aleksa Sarai - -- Fix builds on SLE-12. - ------------------------------------------------------------------- Wed Feb 1 14:33:19 UTC 2023 - Dirk Müller diff --git a/docker.spec b/docker.spec index 06769c8..20ed0bc 100644 --- a/docker.spec +++ b/docker.spec @@ -112,13 +112,7 @@ BuildRequires: go-go-md2man BuildRequires: pkgconfig(libsystemd) BuildRequires: sysuser-tools BuildRequires: golang(API) = 1.18 -%if 0%{?sle_version} == 120000 -# SLE-12's RPM doesn't support binary operations, and this feature isn't needed -# on SLE-12 anyway. -Requires: apparmor-parser -%else Requires: (apparmor-parser or container-selinux) -%endif Requires: ca-certificates-mozilla # The docker-proxy binary used to be in a separate package. We obsolete it, # since now docker-proxy is maintained as part of this package.