Accepting request 876331 from home:cyphar:docker

- Update to Docker 20.10.5-ce. See upstream changelog in the packaged
  /usr/share/doc/packages/docker/CHANGELOG.md. bsc#1182947
- Update runc dependency to 1.0.0~rc93.
- Remove upstreamed patches:
  - cli-0001-Rename-bin-md2man-to-bin-go-md2man.patch
- Rebase patches:
  * 0001-SECRETS-daemon-allow-directory-creation-in-run-secre.patch
  * 0002-SECRETS-SUSE-implement-SUSE-container-secrets.patch
  * 0003-PRIVATE-REGISTRY-add-private-registry-mirror-support.patch
  * 0004-bsc1073877-apparmor-clobber-docker-default-profile-o.patch
- Switch version to use -ce suffix rather than _ce to avoid confusing other
  tools. boo#1182476

OBS-URL: https://build.opensuse.org/request/show/876331
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=359

0001-SECRETS-daemon-allow-directory-creation-in-run-secre.patch

@@ -1,4 +1,4 @@
-From 1edf7a140c843cc6db85cdea298db19fee316dcb Mon Sep 17 00:00:00 2001
+From 6a5d238a42b8adc5d29bbd9bd688aa1034f5cdfd 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/4] SECRETS: daemon: allow directory creation in /run/secrets
@@ -70,5 +70,5 @@ index 5521adbd2749..c103d9349c51 100644
  			return errors.Wrap(err, "error setting ownership for secret")
  		}
 -- 
-2.30.0
+2.30.1
 

0002-SECRETS-SUSE-implement-SUSE-container-secrets.patch

@@ -1,4 +1,4 @@
-From eaedebbcf735732c00e565ff6077f4374cc87519 Mon Sep 17 00:00:00 2001
+From bf083a6f80b204325673732944b53a447f9e4171 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/4] SECRETS: SUSE: implement SUSE container secrets
@@ -451,5 +451,5 @@ index 000000000000..9ee33adf7497
 +	return nil
 +}
 -- 
-2.30.0
+2.30.1
 

0003-PRIVATE-REGISTRY-add-private-registry-mirror-support.patch

@@ -1,4 +1,4 @@
-From aa173dd56730552524ab35d74acbe61709c732e2 Mon Sep 17 00:00:00 2001
+From 10d0381bf317221167af0930c552a8b27c7861a4 Mon Sep 17 00:00:00 2001
 From: Valentin Rothberg <vrothberg@suse.com>
 Date: Mon, 2 Jul 2018 13:37:34 +0200
 Subject: [PATCH 3/4] PRIVATE-REGISTRY: add private-registry mirror support
@@ -1142,5 +1142,5 @@ index 3e3a5b41ffbd..451a6f874bc1 100644
  
  	endpoints = []APIEndpoint{
 -- 
-2.30.0
+2.30.1
 

0004-bsc1073877-apparmor-clobber-docker-default-profile-o.patch

@@ -1,4 +1,4 @@
-From eb4e0b351b4bb229bfd5fd3ed57d3c35040265e0 Mon Sep 17 00:00:00 2001
+From 8cf5f05b8bcb5588bec92d5732e81f26fa632fce 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/4] bsc1073877: apparmor: clobber docker-default profile on
@@ -69,7 +69,7 @@ index dd581dc7dadb..5b14979cd4a3 100644
  	return nil
  }
 diff --git a/daemon/daemon.go b/daemon/daemon.go
-index 794ff9712d08..f9e727b348c5 100644
+index 3d8cca288010..62d3859cff8c 100644
 --- a/daemon/daemon.go
 +++ b/daemon/daemon.go
 @@ -855,8 +855,9 @@ func NewDaemon(ctx context.Context, config *config.Config, pluginStore *plugin.S
@@ -85,5 +85,5 @@ index 794ff9712d08..f9e727b348c5 100644
  	}
  
 -- 
-2.30.0
+2.30.1
 

_service

@@ -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">20.10.3_ce_%h</param>
+    <param name="versionformat">20.10.5_ce_%h</param>
-    <param name="revision">v20.10.3</param>
+    <param name="revision">v20.10.5</param>
     <param name="filename">docker</param>
   </service>
   <service name="tar_scm" mode="disabled">
     <param name="url">https://github.com/docker/cli.git</param>
     <param name="scm">git</param>
     <param name="exclude">.git</param>
-    <param name="versionformat">20.10.3_ce</param>
+    <param name="versionformat">20.10.5_ce</param>
-    <param name="revision">v20.10.3</param>
+    <param name="revision">v20.10.5</param>
     <param name="filename">docker-cli</param>
   </service>
   <service name="tar_scm" mode="disabled">

cli-0001-Rename-bin-md2man-to-bin-go-md2man.patch

@@ -1,59 +0,0 @@
-From 6e2607c6a68ecf1a7378133f22cb7192e2eb9d5b Mon Sep 17 00:00:00 2001
-From: Arnaud Rebillout <elboulangero@gmail.com>
-Date: Wed, 16 Dec 2020 10:19:43 +0700
-Subject: [PATCH] Rename bin/md2man to bin/go-md2man
-
-In the recent PR !2877, some code was added to check if md2man is
-already installed in the build environment. This is to cater to the
-needs of Linux distributions.
-
-However it turns out that Linux distributions install md2man as
-bin/go-md2man instead of bin/md2man, hence the PR !2877 doesn't help
-much.
-
-This commit fixes it by settling on using the binary name go-md2man.
-
-For reference, here the file list of the package go-md2man in several
-distributions:
-
-- Debian: <https://packages.debian.org/sid/amd64/go-md2man/filelist>
-- Ubuntu: <https://packages.ubuntu.com/hirsute/amd64/go-md2man/filelist>
-- Fedora: <https://fedora.pkgs.org/31/fedora-x86_64/golang-github-cpuguy83-md2man-2.0.0-0.4.20190624gitf79a8a8.fc31.x86_64.rpm.html>
-- ArchLinux: <https://www.archlinux.org/packages/community/x86_64/go-md2man/>
-
-Signed-off-by: Arnaud Rebillout <elboulangero@gmail.com>
----
- man/md2man-all.sh            | 2 +-
- scripts/docs/generate-man.sh | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/man/md2man-all.sh b/man/md2man-all.sh
-index eb0bc6366a27..46c7b8f08eae 100755
---- a/man/md2man-all.sh
-+++ b/man/md2man-all.sh
-@@ -18,5 +18,5 @@ for FILE in *.md; do
- 		continue
- 	fi
- 	mkdir -p "./man${num}"
--	md2man -in "$FILE" -out "./man${num}/${name}"
-+	go-md2man -in "$FILE" -out "./man${num}/${name}"
- done
-diff --git a/scripts/docs/generate-man.sh b/scripts/docs/generate-man.sh
-index 136ed1e00094..e312c87dd321 100755
---- a/scripts/docs/generate-man.sh
-+++ b/scripts/docs/generate-man.sh
-@@ -4,9 +4,9 @@ set -eu -o pipefail
- 
- mkdir -p ./man/man1
- 
--if ! command -v md2man &> /dev/null; then
-+if ! command -v go-md2man &> /dev/null; then
- 	# yay, go install creates a binary named "v2" ¯\_(ツ)_/¯
--	go build -o "/go/bin/md2man" ./vendor/github.com/cpuguy83/go-md2man/v2
-+	go build -o "/go/bin/go-md2man" ./vendor/github.com/cpuguy83/go-md2man/v2
- fi
- 
- # Generate man pages from cobra commands
--- 
-2.30.0
-

docker-20.10.3_ce_46229ca1d815.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:84fcc9d36db90c8b87a0b19d5846ade17e8dc4586e998e071c843fd8d43a0bef
-size 6481288

docker-20.10.5_ce_363e9a88a11b.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c4bf5efa9032ba23ac7a9d49d1820f0e1fbc789dfeb8c7cdb6d4909a242dc1a4
+size 6483364

docker-cli-20.10.3_ce.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a8526bdb466209ffd1c3ef41fcfccb9588b67d507d4444701398d6f7987f5f16
-size 4450316

docker-cli-20.10.5_ce.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a95986b5c90e357b76bbc2251cbd6da9c4adc3d689d84fe165922824e4118b16
+size 4452156

docker.changes

@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Wed Mar  3 00:49:58 UTC 2021 - Aleksa Sarai <asarai@suse.com>
+
+- Update to Docker 20.10.5-ce. See upstream changelog in the packaged
+  /usr/share/doc/packages/docker/CHANGELOG.md. bsc#1182947
+- Update runc dependency to 1.0.0~rc93.
+- Remove upstreamed patches:
+  - cli-0001-Rename-bin-md2man-to-bin-go-md2man.patch
+- Rebase patches:
+  * 0001-SECRETS-daemon-allow-directory-creation-in-run-secre.patch
+  * 0002-SECRETS-SUSE-implement-SUSE-container-secrets.patch
+  * 0003-PRIVATE-REGISTRY-add-private-registry-mirror-support.patch
+  * 0004-bsc1073877-apparmor-clobber-docker-default-profile-o.patch
+- Switch version to use -ce suffix rather than _ce to avoid confusing other
+  tools. boo#1182476
+
 -------------------------------------------------------------------
 Sun Feb 14 06:33:16 UTC 2021 - Aleksa Sarai <asarai@suse.com>
 

docker.spec

@@ -42,8 +42,8 @@
 # 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_version 46229ca1d815
+%define git_version 363e9a88a11b
-%define git_commit_epoch 1611869592
+%define git_commit_epoch 1614234438
 
 # We require a specific pin of libnetwork because it doesn't really do
 # versioning and minor version mismatches in libnetwork can break Docker
@@ -56,7 +56,10 @@
 %define proxy_builddir %{dist_builddir}/src/github.com/docker/libnetwork
 
 Name:           %{realname}%{name_suffix}
-Version:        20.10.3_ce
+Version:        20.10.5_ce
+# This "nice version" is so that docker --version gives a result that can be
+# parsed by other people. boo#1182476
+%define nice_version 20.10.5-ce
 Release:        0
 Summary:        The Moby-project Linux container runtime
 License:        Apache-2.0
@@ -89,8 +92,6 @@ Patch101:       0002-SECRETS-SUSE-implement-SUSE-container-secrets.patch
 Patch200:       0003-PRIVATE-REGISTRY-add-private-registry-mirror-support.patch
 # SUSE-BACKPORT: Backport of https://github.com/docker/docker/pull/37353. bsc#1073877 bsc#1099277
 Patch300:       0004-bsc1073877-apparmor-clobber-docker-default-profile-o.patch
-# SUSE-BACKPORT: Backport of https://github.com/docker/cli/pull/2888.
-Patch301:       cli-0001-Rename-bin-md2man-to-bin-go-md2man.patch
 BuildRequires:  audit
 BuildRequires:  bash-completion
 BuildRequires:  ca-certificates
@@ -117,7 +118,7 @@ Obsoletes:      docker-libnetwork%{name_suffix} < 0.7.0.2
 Provides:       docker-libnetwork%{name_suffix} = 0.7.0.2.%{version}
 # Required to actually run containers. We require the minimum version that is
 # pinned by Docker, but in order to avoid headaches we allow for updates.
-Requires:       runc >= 1.0.0~rc92
+Requires:       runc >= 1.0.0~rc93
 Requires:       containerd >= 1.4.3
 # Needed for --init support. We don't use "tini", we use our own implementation
 # which handles edge-cases better.
@@ -264,8 +265,6 @@ cp %{SOURCE103} .
 mkdir -p %{cli_builddir}
 pushd %{cli_builddir}
 xz -dc %{SOURCE1} | tar -xof - --strip-components=1
-# https://github.com/docker/cli/pull/2888
-%patch301 -p1
 popd
 
 # Extract the docker-libnetwork source in a subdir.
@@ -297,7 +296,7 @@ export BUILDFLAGS="-buildmode=pie"
 # Specify all of the versioning information. We use SOURCE_DATE_EPOCH if it's
 # been injected by rpmbuild, otherwise we use the hardcoded git_commit_epoch
 # generated above. boo#1064781
-export VERSION="$(cat ./VERSION 2>/dev/null || echo '%{version}')"
+export VERSION="%{nice_version}"
 export DOCKER_GITCOMMIT="%{git_version}"
 export GITCOMMIT="%{git_version}"
 export SOURCE_DATE_EPOCH="${SOURCE_DATE_EPOCH:-%{git_commit_epoch}}"