From d34a0c90b1738f744e5314ab2238581532ce1880ee3215540e1d42bc2fd8d48e Mon Sep 17 00:00:00 2001 From: Aleksa Sarai Date: Thu, 20 Dec 2018 11:15:30 +0000 Subject: [PATCH 1/4] Accepting request 660128 from home:clee:branches:Virtualization:containers - Update go requirements to >= go1.10.6 to fix * bsc#1118897 CVE-2018-16873 go#29230 cmd/go: remote command execution during "go get -u" * bsc#1118898 CVE-2018-16874 go#29231 cmd/go: directory traversal in "go get" via curly braces in import paths * bsc#1118899 CVE-2018-16875 go#29233 crypto/x509: CPU denial of service OBS-URL: https://build.opensuse.org/request/show/660128 OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=276 --- docker.changes | 10 ++++++++++ docker.spec | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/docker.changes b/docker.changes index 584012e..52e6d2a 100644 --- a/docker.changes +++ b/docker.changes @@ -1,4 +1,14 @@ ------------------------------------------------------------------- +Wed Dec 19 19:28:47 UTC 2018 - clee@suse.com + +- Update go requirements to >= go1.10.6 to fix + * bsc#1118897 CVE-2018-16873 + go#29230 cmd/go: remote command execution during "go get -u" + * bsc#1118898 CVE-2018-16874 + go#29231 cmd/go: directory traversal in "go get" via curly braces in import paths + * bsc#1118899 CVE-2018-16875 + go#29233 crypto/x509: CPU denial of service +------------------------------------------------------------------- Tue Dec 18 10:10:06 UTC 2018 - Aleksa Sarai - Handle build breakage due to missing 'export GOPATH' (caused by resolution of diff --git a/docker.spec b/docker.spec index 9ce6b2f..da3d284 100644 --- a/docker.spec +++ b/docker.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # nodebuginfo From 03396c1701259a29cb24073323d890aab7fe5f9c25e1fcd07111da8528c6295e Mon Sep 17 00:00:00 2001 From: Aleksa Sarai Date: Thu, 20 Dec 2018 11:23:52 +0000 Subject: [PATCH 2/4] Accepting request 660267 from home:cyphar:docker_changelog Minor changelog update. OBS-URL: https://build.opensuse.org/request/show/660267 OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=277 --- docker.changes | 5 +++-- docker.spec | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/docker.changes b/docker.changes index 52e6d2a..218596d 100644 --- a/docker.changes +++ b/docker.changes @@ -7,7 +7,8 @@ Wed Dec 19 19:28:47 UTC 2018 - clee@suse.com * bsc#1118898 CVE-2018-16874 go#29231 cmd/go: directory traversal in "go get" via curly braces in import paths * bsc#1118899 CVE-2018-16875 - go#29233 crypto/x509: CPU denial of service + go#29233 crypto/x509: CPU denial of service + ------------------------------------------------------------------- Tue Dec 18 10:10:06 UTC 2018 - Aleksa Sarai @@ -69,7 +70,7 @@ Fri Aug 24 08:17:41 UTC 2018 - asarai@suse.com ------------------------------------------------------------------- Wed Aug 22 09:54:57 UTC 2018 - asarai@suse.com -- Upgrade to docker-ce v18.06.1-ce. bsc#1102522 bsc#1113313 +- Upgrade to docker-ce v18.06.1-ce. bsc#1102522 bsc#1113313 bsc#1118990 Upstream changelog: https://github.com/docker/docker-ce/releases/tag/v18.06.1-ce - Remove patches that were merged upstream: diff --git a/docker.spec b/docker.spec index da3d284..9ce6b2f 100644 --- a/docker.spec +++ b/docker.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # # nodebuginfo From 1ca932a40c1d301651f313b23ae3415880c2f81e6d951fec3c5544bd36838d0e Mon Sep 17 00:00:00 2001 From: Aleksa Sarai Date: Tue, 25 Dec 2018 17:14:49 +0000 Subject: [PATCH 3/4] Correct changelog entry for bsc#1118990 OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=279 --- docker.changes | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker.changes b/docker.changes index 218596d..33a000c 100644 --- a/docker.changes +++ b/docker.changes @@ -30,7 +30,7 @@ Thu Nov 29 09:41:11 UTC 2018 - Aleksa Sarai - Update docker.service to match upstream and avoid rlimit problems. bsc#1112980 - Upgrade to Docker 18.09.0-ce. See upstream changelog in the packaged - /usr/share/doc/packages/docker/CHANGELOG.md. boo#1115464 + /usr/share/doc/packages/docker/CHANGELOG.md. boo#1115464 bsc#1118990 - Add revert of an upstream patch to fix docker-* handling. + packaging-0001-revert-Remove-docker-prefix-for-containerd-and-runc-.patch - Rebase patches: @@ -70,7 +70,7 @@ Fri Aug 24 08:17:41 UTC 2018 - asarai@suse.com ------------------------------------------------------------------- Wed Aug 22 09:54:57 UTC 2018 - asarai@suse.com -- Upgrade to docker-ce v18.06.1-ce. bsc#1102522 bsc#1113313 bsc#1118990 +- Upgrade to docker-ce v18.06.1-ce. bsc#1102522 bsc#1113313 Upstream changelog: https://github.com/docker/docker-ce/releases/tag/v18.06.1-ce - Remove patches that were merged upstream: From c1766786ba9bfc22a6022e0034d6bae477b650fe879738a251259b9883421cbd Mon Sep 17 00:00:00 2001 From: Jordi Massaguer Date: Fri, 11 Jan 2019 11:01:27 +0000 Subject: [PATCH 4/4] Accepting request 664598 from home:sgrunert - Disable leap based builds for kubic flavor. bsc#1121412 OBS-URL: https://build.opensuse.org/request/show/664598 OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=280 --- docker.changes | 7 +++++-- docker.spec | 6 +++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/docker.changes b/docker.changes index 33a000c..bb05463 100644 --- a/docker.changes +++ b/docker.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jan 11 09:57:32 UTC 2019 - Sascha Grunert + +- Disable leap based builds for kubic flavor. bsc#1121412 + ------------------------------------------------------------------- Wed Dec 19 19:28:47 UTC 2018 - clee@suse.com @@ -3322,5 +3327,3 @@ Wed Apr 10 10:31:11 UTC 2013 - fcastelli@suse.com Tue Apr 9 08:24:33 UTC 2013 - fcastelli@suse.com - create initial package using version 0.1.3 from git commit 0767916adedb01 - - diff --git a/docker.spec b/docker.spec index 9ce6b2f..1528765 100644 --- a/docker.spec +++ b/docker.spec @@ -1,7 +1,7 @@ # # spec file for package docker # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -158,6 +158,10 @@ Provides: %{realname} = %{version} Provides: cri-runtime # No i586 Kubernetes, so docker-kubic must not be built for i586 also ExcludeArch: i586 +# Disable leap based builds for kubic flavor (bsc#1121412) +%if 0%{?suse_version} == 1500 && 0%{?is_opensuse} +ExclusiveArch: do_not_build +%endif %endif %description