Update to release v29.1.4

- Resolves: rhbz#2428234 - Upstream fixes
Update to release v29.1.3
2026-01-09 09:17:36 -08:00 · 2025-12-12 13:24:46 -08:00 · 2025-12-02 14:59:34 -08:00 · 2025-11-24 14:50:38 -08:00 · 2025-11-22 11:17:36 -08:00 · 2025-11-18 07:26:42 -08:00
14 changed files with 1019 additions and 374 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,5 +1,202 @@
+# Ignore unpacked source directories
+/moby-*/
+/cli-*/
+
+# Ignore fedpkg mockbuild artifacts
+/results_*
+
 /2d0083d657f82c47044c8d3948ba434b622fe2fd.tar.gz
 /425e105d5a03fabd737a126ad93d62a9eeede87f.tar.gz
 /894b81a4b802e4eb2a91d1ce216b8817763c29fb.tar.gz
 /e7933d41e7b206756115aa9df5e0599fc5169742.tar.gz
 /fec3683b971d9c3ef73f284f176672c44b448662.tar.gz
+/0dd43dd87fd530113bf44c9bba9ad8b20ce4637f.tar.gz
+/7141c199a2edb2a90b778175f836f9dd2a22c95a.tar.gz
+/264bffcb88c1b6b7471c04e3c6b3f301233a544b.tar.gz
+/afacb8b7f0d8d4f9d2a8e8736e9c993e672b41f3.tar.gz
+/bf2bd42abc0a3734f12b5ec724e571434e42c669.tar.gz
+/2e24aed516bd5c836e11378bb457dd612aa868ed.tar.gz
+/42e35e61f352e527082521280d5ea3761f0dee50.tar.gz
+/4484c46d9d1a2d10b8fc662923ad586daeedb04f.tar.gz
+/026aabaa659832804b01754aaadd2c0f420c68b6.tar.gz
+/de40ad007797e0dcd8b7126f27bb87401d224240.tar.gz
+/moby-v20.10.5.tar.gz
+/cli-v20.10.5.tar.gz
+/moby-v20.10.6.tar.gz
+/cli-v20.10.6.tar.gz
+/moby-v20.10.7.tar.gz
+/cli-v20.10.7.tar.gz
+/cli-v20.10.8.tar.gz
+/moby-v20.10.8.tar.gz
+/cli-v20.10.9.tar.gz
+/moby-v20.10.9.tar.gz
+/cli-v20.10.10.tar.gz
+moby-v20.10.10.tar.gz
+/cli-v20.10.11.tar.gz
+/moby-v20.10.11.tar.gz
+/cli-v20.10.12.tar.gz
+/moby-v20.10.12.tar.gz
+/cli-20.10.12.tar.gz
+/moby-20.10.12.tar.gz
+/tini-de40ad0.tar.gz
+/cli-20.10.14.tar.gz
+/moby-20.10.14.tar.gz
+/cli-20.10.15.tar.gz
+/moby-20.10.15.tar.gz
+/cli-20.10.16.tar.gz
+/moby-20.10.16.tar.gz
+/cli-20.10.17.tar.gz
+/moby-20.10.17.tar.gz
+/cli-20.10.18.tar.gz
+/moby-20.10.18.tar.gz
+/cli-20.10.19.tar.gz
+/moby-20.10.19.tar.gz
+/cli-20.10.20.tar.gz
+/moby-20.10.20.tar.gz
+/cli-20.10.21.tar.gz
+/moby-20.10.21.tar.gz
+/cli-20.10.22.tar.gz
+/moby-20.10.22.tar.gz
+/moby-20.10.23.tar.gz
+/cli-20.10.23.tar.gz
+/moby-23.0.4.tar.gz
+/cli-23.0.4.tar.gz
+/tini-0b44d36.tar.gz
+/cli-24.0.5.tar.gz
+/moby-24.0.5.tar.gz
+/moby-26.0.0.tar.gz
+/moby-26.0.0-vendor.tar.bz2
+/moby-26.0.1.tar.gz
+/moby-26.0.1-vendor.tar.bz2
+/moby-26.1.0.tar.gz
+/moby-26.1.0-vendor.tar.bz2
+/moby-26.1.4.tar.gz
+/moby-26.1.4-vendor.tar.bz2
+/moby-27.1.1.tar.gz
+/cli-27.1.1.tar.gz
+/moby-27.1.1-vendor.tar.bz2
+/cli-27.1.1-vendor.tar.bz2
+/moby-27.1.2.tar.gz
+/cli-27.1.2.tar.gz
+/moby-27.1.2-vendor.tar.bz2
+/cli-27.1.2-vendor.tar.bz2
+/cli-27.2.0.tar.gz
+/cli-27.2.0-vendor.tar.bz2
+/moby-27.2.0.tar.gz
+/moby-27.2.0-vendor.tar.bz2
+/cli-27.2.1.tar.gz
+/cli-27.2.1-vendor.tar.bz2
+/moby-27.2.1.tar.gz
+/moby-27.2.1-vendor.tar.bz2
+/cli-27.3.1.tar.gz
+/cli-27.3.1-vendor.tar.bz2
+/moby-27.3.1.tar.gz
+/moby-27.3.1-vendor.tar.bz2
+/moby-27.4.0-rc.4-vendor.tar.bz2
+/moby-27.4.0-rc.4.tar.gz
+/cli-27.4.0-rc.4.tar.gz
+/cli-27.4.0-rc.4-vendor.tar.bz2
+/cli-27.4.0.tar.gz
+/cli-27.4.0-vendor.tar.bz2
+/moby-27.4.0.tar.gz
+/moby-27.4.0-vendor.tar.bz2
+/cli-27.4.1.tar.gz
+/cli-27.4.1-vendor.tar.bz2
+/moby-27.4.1.tar.gz
+/moby-27.4.1-vendor.tar.bz2
+/cli-27.5.0.tar.gz
+/cli-27.5.0-vendor.tar.bz2
+/moby-27.5.0.tar.gz
+/moby-27.5.0-vendor.tar.bz2
+/cli-27.5.1.tar.gz
+/cli-27.5.1-vendor.tar.bz2
+/moby-27.5.1.tar.gz
+/moby-27.5.1-vendor.tar.bz2
+/cli-28.0.0.tar.gz
+/cli-28.0.0-vendor.tar.bz2
+/moby-28.0.0.tar.gz
+/moby-28.0.0-vendor.tar.bz2
+/cli-28.0.1.tar.gz
+/cli-28.0.1-vendor.tar.bz2
+/moby-28.0.1.tar.gz
+/moby-28.0.1-vendor.tar.bz2
+/cli-28.0.2-vendor.tar.bz2
+/cli-28.0.2.tar.gz
+/moby-28.0.2-vendor.tar.bz2
+/moby-28.0.2.tar.gz
+/moby-28.0.4.tar.gz
+/moby-28.0.4-vendor.tar.bz2
+/cli-28.0.4.tar.gz
+/cli-28.0.4-vendor.tar.bz2
+/cli-28.1.1.tar.gz
+/cli-28.1.1-vendor.tar.bz2
+/moby-28.1.1.tar.gz
+/moby-28.1.1-vendor.tar.bz2
+/cli-28.2.1.tar.gz
+/cli-28.2.1-vendor.tar.bz2
+/moby-28.2.1.tar.gz
+/moby-28.2.1-vendor.tar.bz2
+/cli-28.2.2-vendor.tar.bz2
+/cli-28.2.2.tar.gz
+/moby-28.2.2-vendor.tar.bz2
+/moby-28.2.2.tar.gz
+/cli-28.3.0-vendor.tar.bz2
+/cli-28.3.0.tar.gz
+/moby-28.3.0-vendor.tar.bz2
+/moby-28.3.0.tar.gz
+/cli-28.3.1.tar.gz
+/cli-28.3.1-vendor.tar.bz2
+/moby-28.3.1.tar.gz
+/moby-28.3.1-vendor.tar.bz2
+/cli-28.3.2.tar.gz
+/cli-28.3.2-vendor.tar.bz2
+/moby-28.3.2.tar.gz
+/moby-28.3.2-vendor.tar.bz2
+/cli-28.3.3.tar.gz
+/cli-28.3.3-vendor.tar.bz2
+/moby-28.3.3.tar.gz
+/moby-28.3.3-vendor.tar.bz2
+/cli-28.4.0.tar.gz
+/cli-28.4.0-vendor.tar.bz2
+/moby-28.4.0.tar.gz
+/moby-28.4.0-vendor.tar.bz2
+/cli-28.5.1.tar.gz
+/cli-28.5.1-vendor.tar.bz2
+/moby-28.5.1.tar.gz
+/moby-28.5.1-vendor.tar.bz2
+/cli-28.5.2-vendor.tar.bz2
+/moby-28.5.2-vendor.tar.bz2
+/cli-28.5.2.tar.gz
+/moby-28.5.2.tar.gz
+/cli-29.0.0-vendor.tar.bz2
+/moby-docker-v29.0.0.tar.gz
+/moby-docker-v29.0.0-vendor.tar.bz2
+/cli-29.0.0.tar.gz
+/cli-29.0.1-vendor.tar.bz2
+/cli-29.0.1.tar.gz
+/moby-docker-v29.0.1.tar.gz
+/moby-docker-v29.0.1-vendor.tar.bz2
+/cli-29.0.2.tar.gz
+/cli-29.0.2-vendor.tar.bz2
+/moby-docker-v29.0.2.tar.gz
+/moby-docker-v29.0.2-vendor.tar.bz2
+/moby-docker-v29.0.3.tar.gz
+/moby-docker-v29.0.3-vendor.tar.bz2
+/cli-29.0.3.tar.gz
+/cli-29.0.3-vendor.tar.bz2
+/cli-29.0.4.tar.gz
+/cli-29.0.4-vendor.tar.bz2
+/moby-docker-v29.0.4.tar.gz
+/moby-docker-v29.0.4-vendor.tar.bz2
+/cli-29.1.2-vendor.tar.bz2
+/cli-29.1.2.tar.gz
+/moby-docker-v29.1.2-vendor.tar.bz2
+/moby-docker-v29.1.2.tar.gz
+/cli-29.1.3-vendor.tar.bz2
+/cli-29.1.3.tar.gz
+/moby-docker-v29.1.3-vendor.tar.bz2
+/moby-docker-v29.1.3.tar.gz
+/cli-29.1.4.tar.gz
+/cli-29.1.4-vendor.tar.bz2
+/moby-docker-v29.1.4.tar.gz
+/moby-docker-v29.1.4-vendor.tar.bz2
--- a/0001-systemd-adjust-docker.service-for-downstream.patch
+++ b/0001-systemd-adjust-docker.service-for-downstream.patch
@ -0,0 +1,34 @@
+From 5b6aae1885d02aa0a1ab0846834b86d87c989b79 Mon Sep 17 00:00:00 2001
+From: Maxwell G <maxwell@gtmx.me>
+Date: Fri, 15 Mar 2024 00:28:34 +0000
+Subject: [PATCH] systemd: adjust docker.service for downstream
+
+For now, we just enable selinux support and hardcode the paths for
+docker-proxy and docker-init.
+For `--init-path`, we use the tini-static binary directly instead of
+bundling tini in this package.
+---
+ contrib/init/systemd/docker.service | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/contrib/init/systemd/docker.service b/contrib/init/systemd/docker.service
+index d8c7867..e305616 100644
+--- a/contrib/init/systemd/docker.service
+++ b/contrib/init/systemd/docker.service
+@@ -10,7 +10,12 @@ Type=notify
+ # the default is not to use systemd for cgroups because the delegate issues still
+ # exists and systemd currently does not support the cgroup feature set required
+ # for containers run by docker
+-ExecStart=/usr/bin/dockerd -H fd:// --containerd=/run/containerd/containerd.sock
+ExecStart=/usr/bin/dockerd \
+    -H fd:// \
+    --containerd=/run/containerd/containerd.sock \
+    --selinux-enabled \
+    --userland-proxy-path /usr/bin/docker-proxy \
+    --init-path /usr/bin/tini-static
+ ExecReload=/bin/kill -s HUP $MAINPID
+ TimeoutStartSec=0
+ RestartSec=2
+-- 
+2.44.0
+
--- a/LICENSE.macros
+++ b/LICENSE.macros
@ -0,0 +1,10 @@
+MIT License
+
+Copyright (C) 2024 Maxwell G <maxwell@gtmx.me>
+Copyright (C) Fedora Project Authors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
--- a/README.md
+++ b/README.md
@ -1,3 +1,33 @@
 # moby-engine

-The moby-engine package
+The moby-engine package
+
+## Maintainer notes
+
+Follow these steps to build this package.
+
+1. Use your favorite git client to check out the repository if not already present.
+
+   ```
+   fedpkg clone moby-engine
+   ```
+
+1. Update the `%version0` macro in `moby-engine.spec` to the target version
+   using your preferred text editor.
+
+   ```
+   vim moby-engine.spec
+   ``` 
+
+1. Run `./mkvendor.sh` to download upstream source files and generate vendor archives.
+
+   ```
+   ./mkvendor.sh
+   ```
+
+1. Build and test the package locally.
+
+   ```
+   # fedpkg mockbuild example
+   fedpkg --release rawhide mockbuild
+   ```
--- a/277
+++ b/277
@ -0,0 +1,277 @@
+* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org>
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Sun Feb 11 2024 Maxwell G <maxwell@gtmx.me> - 24.0.5-4
+- Rebuild for golang 1.22.0
+
+* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org>
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org>
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Wed Aug 23 2023 LuK1337 <priv.luk@gmail.com> - 24.0.5-1
+- Update moby-engine to 24.0.5
+
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org>
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Sun Jan 29 2023 John Ghatas <john@johnghatas.com>
+- Update moby-engine to 23.0.4
+
+* Sun Jan 29 2023 Sérgio Basto <sergio@serjux.com>
+- Update moby-engine to 20.10.23
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org>
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Sun Jan 01 2023 Sérgio Basto <sergio@serjux.com>
+- Update moby-engine to 20.10.22
+
+* Wed Dec 14 2022 Dan Čermák <dan.cermak@cgc-instruments.com> - 20.10.21-1
+- Update to 20.10.21
+- Fix build, use libnetwork from golang-github-docker-0:22.06.0~beta
+
+* Thu Oct 20 2022 Jan Kuparinen <copperi@fedoraproject.org> - 20.10.20-1
+- Update to 20.10.20.
+- Mitigates CVE-2022-39253
+
+* Tue Oct 18 2022 Jan Kuparinen <copperi@fedoraproject.org> - 20.10.19-1
+- Update to 20.10.19.
+
+* Sat Sep 10 2022 Maxwell G <gotmax@e.email> - 20.10.18-1
+- Update to 20.10.18.
+- Mitigates CVE-2022-36109 / GHSA-rc4r-wh2q-q6c4
+
+* Tue Aug 30 2022 Luca BRUNO <lucab@lucabruno.net> - 20.10.17-8
+- Move 'docker' group creation logic to a sysusers.d fragment
+  Resolves: rhbz#1745936
+
+* Fri Aug 05 2022 Maxwell G <gotmax@e.email> - 20.10.17-7
+- Migrate to SPDX license identifiers
+- Generate debuginfo
+- Specfile improvements
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org>
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Tue Jul 19 2022 Maxwell G <gotmax@e.email> - 20.10.17-5
+- Rebuild for CVE-2022-{1705,32148,30631,30633,28131,30635,30632,30630,1962} in
+  golang
+
+* Mon Jul 04 2022 Maxwell G <gotmax@e.email> - 20.10.17-4
+- Only build on %%golang_arches (i.e. where golang is available).
+
+* Sun Jun 19 2022 Maxwell G <gotmax@e.email> - 20.10.17-3
+- Rebuilt for CVE-2022-1996, CVE-2022-24675, CVE-2022-28327, CVE-2022-27191,
+  CVE-2022-29526, CVE-2022-30629.
+
+* Sat Jun 11 2022 Maxwell G <gotmax@e.email> - 20.10.17-2
+- Rebuild for new golang-github-docker-libnetwork
+
+* Fri Jun 10 2022 Maxwell G <gotmax@e.email> - 20.10.17-1
+- Update to 20.10.17. Fixes rhbz#2095714.
+
+* Fri May 13 2022 Maxwell G <gotmax@e.email> - 20.10.16-1
+- Update to 20.10.16.
+
+* Sat May 07 2022 Maxwell G <gotmax@e.email> - 20.10.15-1
+- Update to 20.10.15 (rhbz#2082501).
+- Fix BUILDTAGS (rhbz#2082924).
+- Make non-binary subpackages noarch.
+
+* Mon Apr 11 2022 Maxwell G <gotmax@e.email> - 20.10.14-1
+- Update to 20.10.14. Fixes rhbz#2063052.
+- Mitigate CVE-2022-24769.
+
+* Mon Jan 31 2022 Maxwell G <gotmax@e.email> - 20.10.12-3
+- Fixes FTBFS. Closes rhbz#2046748.
+- Use %%gobuild instead of Makefile to build binaries
+- Add explanatory comments.
+- Normalize install commands
+- Make compliant with SourceURL Guidelines
+- Remove no longer necessary `ExcludeArch: ppc64`.
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 20.10.12-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Tue Jan 11 2022 Maxwell G <gotmax@e.email> - 20.10.12-1
+- Update to 20.10.12. Fixes rhbz#2032534.
+- Install zsh completions to the correct directory. Fixes rhbz#2038888.
+
+* Mon Nov 22 2021 Olivier Lemasle <o.lemasle@gmail.com> - 20.10-11-1
+- Update to upstream 20.10.11 (fixes rhbz#2024384)
+- Mitigates CVE-2021-41190 (fixes rhbz#2024940)
+
+* Fri Oct 29 2021 Maxwell G <gotmax@e.email> - 20.10.10-1
+- Update to 20.10.10 (fixes rhbz#2015385)
+- Update virtual provides
+
+* Fri Oct 08 2021 Maxwell G <gotmax@e.email> - 20.10.9-1
+- Update to 20.10.9 (fixes rhbz#2010508)
+- Patch seccomp policy to fix clone3() issue (fixes rhbz#2011523 and rhbz#1988199)
+
+* Sun Aug 15 2021 Olivier Lemasle <o.lemasle@gmail.com> - 20.10.8-1
+- Update to upstream 20.10.8 (fixes rhbz#1990148)
+- Fix seccomp support (fixes rhbz#1986092)
+
+* Sun Aug 15 2021 Dusty Mabe <dusty@dustymabe.com> - 20.10.7-3
+- Remove `Requires(post)` on firewalld-filesystem.
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 20.10.7-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Fri Jul 16 2021 Olivier Lemasle <o.lemasle@gmail.com> - 20.10.7-1
+- Update to upstream 20.10.7 (fixes rhbz#1967390)
+
+* Tue May 04 2021 Olivier Lemasle <o.lemasle@gmail.com> - 20.10.6-2
+- Add conflict with podman-docker
+
+* Tue Apr 20 2021 Olivier Lemasle <o.lemasle@gmail.com> - 20.10.6-1
+- Update to upstream 20.10.6 (#1948605)
+- Re-bundle moby dependencies to fix gRPC issues with Swarm
+  (https://github.com/coreos/fedora-coreos-tracker/issues/793)
+
+* Sun Mar 14 2021 Olivier Lemasle <o.lemasle@gmail.com> - 20.10.5-1
+- Update to latest upstream 20.10.5 - fixes #1903426
+- Upstream brings compatibility with cgroups v2 - fixes #1746355
+- Remove package moby-engine-vim (dockerfile.vim has been merged in upstream vim)
+- Remove firewalld docker zone, since dockerd can now communicate with firewalld - fixes #1852680
+- Build dockerd and docker-proxy from unbundled source packages
+- Remove fixed storage-driver (cf. https://src.fedoraproject.org/rpms/moby-engine/pull-request/6)
+
+* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 19.03.13-3.ce.git4484c46
+- Rebuilt for updated systemd-rpm-macros
+  See https://pagure.io/fesco/issue/2583.
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 19.03.13-2.ce.git4484c46
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Fri Oct 02 2020 Olivier Lemasle <o.lemasle@gmail.com> - 19.03.13-1.ce.git4484c46
+- Update to upstream 19.03.13 (#1837641)
+
+* Fri Oct 02 2020 Olivier Lemasle <o.lemasle@gmail.com> - 19.03.11-4.ce.git42e35e6
+- Fix FTBFS: adapt to change to CMake builds (#1864160)
+
+* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 19.03.11-3.ce.git42e35e6
+- Second attempt - Rebuilt for
+  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 19.03.11-2.ce.git42e35e6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Sun Jun 07 2020 Olivier Lemasle <o.lemasle@gmail.com> - 19.03.11-1.ce.git42e35e6
+- Update to upstream 19.03.11 to prevent CVE-2020-13401
+
+* Thu May 07 2020 Olivier Lemasle <o.lemasle@gmail.com> - 19.03.8-2.ce.gitafacb8b
+- Configure storage-driver explicitely (fixes #1832301)
+- Add firewalld zone: trust interface docker0, as firewalld now uses nftables
+  by default and docker communicates with iptables (fixes #1817022)
+
+* Mon Mar 16 2020 Olivier Lemasle <o.lemasle@gmail.com> - 19.03.8-1.ce.gitafacb8b
+- Update to latest upstream release - Docker CE 19.03.8
+- Prune unused BuildRequires
+
+* Sun Mar 8 2020 Olivier Lemasle <o.lemasle@gmail.com> - 19.03.7-2.ce.git7141c19
+- Add Conflicts with docker-ce-cli and Obsoletes docker-common
+
+* Sat Mar 7 2020 Olivier Lemasle <o.lemasle@gmail.com> - 19.03.7-1.ce.git7141c19
+- Update to latest upstream release - Docker CE 19.03.7
+- Add Epoch: 2 to Obsoletes for docker and docker-latest
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 18.09.8-3.ce.git0dd43dd
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 18.09.8-2.ce.git0dd43dd
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Thu Jul 18 2019 Olivier Lemasle <o.lemasle@gmail.com> - 18.09.8-1.ce.git0dd43dd
+- Update to latest upstream release - Docker CE 18.09.8
+
+* Sat Jul 13 2019 Olivier Lemasle <o.lemasle@gmail.com> - 18.09.7-5.ce.git2d0083d
+- Move docker-init and docker-proxy to /usr/libexec/docker
+- Update moby-engine-nano summary to follow guidelines
+
+* Sat Jul 13 2019 Olivier Lemasle <o.lemasle@gmail.com> - 18.09.7-4.ce.git2d0083d
+- Add nofile ulimit to default docker daemon options (#1715254, #1708115)
+
+* Fri Jul 12 2019 Olivier Lemasle <o.lemasle@gmail.com> - 18.09.7-3.ce.git2d0083d
+- rebuilt
+
+* Fri Jul 12 2019 Olivier Lemasle <o.lemasle@gmail.com> - 18.09.7-2.ce.git2d0083d
+- Depend on packaged versions "runc" and "containerd" instead of building them.
+
+* Thu Jun 27 2019 David Michael <dm0@redhat.com> - 18.09.7-1.ce.git2d0083d
+- Update docker-ce to commit 2d0083d (version 18.09.7).
+- Update runc to commit 425e105.
+- Update containerd to commit 894b81a (1.2.6).
+- Update docker-proxy to commit e7933d4.
+
+* Tue May 14 2019 David Michael <dm0@redhat.com> - 18.09.6-1.ce.git481bc77
+- Update docker-ce to commit 481bc77 (version 18.09.6).
+- Update docker-proxy to commit 872f0a8.
+- Obsolete and provide the docker and docker-latest packages. (#1700006)
+
+* Thu Apr 11 2019 David Michael <dm0@redhat.com> - 18.09.5-1.ce.gite8ff056
+- Update docker-ce to commit e8ff056 (version 18.09.5).
+- Update docker-runc to commit 2b18fe1.
+- Update docker-containerd to commit bb71b10 (version 1.2.5).
+- Update docker-proxy to commit 4725f21.
+- Report the correct engine version.
+- Install symlinks to unprefixed runc/containerd program names.
+
+* Thu Mar 28 2019 David Michael <dm0@redhat.com> - 18.06.3-2.ce.gitd7080c1
+- Conflict with docker-common. (#1693397)
+
+* Thu Feb 21 2019 David Michael <dm0@redhat.com> - 18.06.3-1.ce.gitd7080c1
+- Update docker-ce to commit d7080c1 (version 18.06.3).
+
+* Tue Feb 12 2019 David Michael <dm0@redhat.com> - 18.06.2-1.ce.git6d37f41
+- Update docker-ce to commit 6d37f41 (version 18.06.2).
+- Update docker-runc to commit a592beb.
+
+* Mon Feb 11 2019 David Michael <dm0@redhat.com> - 18.06.1-3.ce.gite68fc7a
+- Apply a runc patch for CVE-2019-5736.
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 18.06.1-2.ce.gite68fc7a
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Thu Nov 29 2018 David Michael <dm0@redhat.com> - 18.06.1-1.ce.gite68fc7a
+- Update docker-ce to commit e68fc7a (version 18.06.1).
+- Update docker-runc to commit 69663f0.
+- Update docker-containerd to commit 468a545 (version 1.1.2).
+- Update docker-proxy to commit 3ac297b.
+- Backport a fix for mounting named volumes.
+- Create a "docker" group for non-root Docker access.
+- Support systemd socket-activation.
+- Make runc and containerd commit IDs match their expected values.
+- Preserve containerd debuginfo.
+
+* Mon Nov 12 2018 Marcin Skarbek <rpm@skarbek.name> - 18.06.0-2.ce.git0ffa825
+- add configuration file
+- update service file
+
+* Sat Aug 18 2018 Lokesh Mandvekar <lsm5@fedoraproject.org> - 18.06.0-1.ce.git0ffa825
+- Resolves: #1539161 - first upload to Fedora
+- built docker-ce commit 0ffa825
+- built docker-runc commit ad0f5255
+- built docker-containerd commit a88b631
+- built docker-proxy commit a79d368
+- built docker-init commit fec3683
+
+* Tue Mar 20 2018 Lokesh Mandvekar <lsm5@fedoraproject.org> - 17.03.2-4.ce.gitf5ec1e2
+- correct some rpmlint errors
+
+* Wed Feb 21 2018 Lokesh Mandvekar <lsm5@fedoraproject.org> - 17.03.2-3.ce
+- docker-* symlinks to moby-* (RE: gh PR 34226)
+
+* Wed Feb 21 2018 Lokesh Mandvekar <lsm5@fedoraproject.org> - 17.03.2-2.ce
+- rename binaries as per upstream gh PR 34226
+
+* Fri Jan 26 2018 Lokesh Mandvekar <lsm5@fedoraproject.org> - 17.03.2-1
+- initial build
+- built moby commit f5ec1e2
+- built cli commit 4b61f56
+- built docker-runc commit 2d41c047
+- built docker-containerd commit 3addd84
+- built docker-proxy commit 7b2b1fe
--- a/cli_go-vendor-tools.toml
+++ b/cli_go-vendor-tools.toml
@ -0,0 +1,28 @@
+[licensing]
+detector = "trivy"
+exclude_files = [
+    "vendor/go.opentelemetry.io/otel/get_main_pkgs.sh",
+    "vendor/go.opentelemetry.io/otel/verify_examples.sh",
+    "vendor/google.golang.org/grpc/regenerate.sh",
+]
+
+[[licensing.licenses]]
+path = "vendor/github.com/google/shlex/COPYING"
+sha256sum = "cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30"
+expression = "Apache-2.0"
+[[licensing.licenses]]
+path = "vendor/github.com/moby/sys/symlink/LICENSE.APACHE"
+sha256sum = "e6abacaae15d29c132fc8688f098a3b9c89088bc434ea33992261e19e34e6723"
+expression = "Apache-2.0"
+[[licensing.licenses]]
+path = "vendor/github.com/moby/sys/symlink/LICENSE.BSD"
+sha256sum = "81205fa54813e578a0d361c671c21ae35ca5b1b575f39e82f5cdab68b8539a1d"
+expression = "BSD-3-Clause"
+
+[archive]
+pre_commands = [
+    # This project has a setup where go.mod and go.sum are not always present.
+    # We write those files manually.
+    ["cp", "-p", "vendor.mod", "go.mod"],
+    ["cp", "-p", "vendor.sum", "go.sum"],
+]
--- a/docker.service
+++ b/docker.service
@ -1,38 +0,0 @@
-[Unit]
-Description=Docker Application Container Engine
-Documentation=https://docs.docker.com
-After=docker.socket network-online.target firewalld.service
-Requires=docker.socket
-Wants=network-online.target
-
-[Service]
-Type=notify
-EnvironmentFile=-/etc/sysconfig/docker
-# the default is not to use systemd for cgroups because the delegate issues still
-# exists and systemd currently does not support the cgroup feature set required
-# for containers run by docker
-ExecStart=/usr/bin/dockerd \
-          --host=fd:// \
-          --exec-opt native.cgroupdriver=systemd \
-          $OPTIONS
-ExecReload=/bin/kill -s HUP $MAINPID
-# Having non-zero Limit*s causes performance problems due to accounting overhead
-# in the kernel. We recommend using cgroups to do container-local accounting.
-LimitNOFILE=infinity
-LimitNPROC=infinity
-LimitCORE=infinity
-# Uncomment TasksMax if your systemd version supports it.
-# Only systemd 226 and above support this version.
-#TasksMax=infinity
-TimeoutStartSec=0
-# set delegate yes so that systemd does not reset the cgroups of docker containers
-#Delegate=yes
-# kill only the docker process, not all processes in the cgroup
-KillMode=process
-# restart the docker process if it exits prematurely
-Restart=on-failure
-StartLimitBurst=3
-StartLimitInterval=60s
-
-[Install]
-WantedBy=multi-user.target
--- a/docker.sysconfig
+++ b/docker.sysconfig
@ -1,4 +0,0 @@
-# /etc/sysconfig/docker
-
-# Modify these options if you want to change the way the docker daemon runs
-OPTIONS='--selinux-enabled --log-driver=journald --live-restore --default-ulimit nofile=1024:1024'
--- a/engine_go-vendor-tools.toml
+++ b/engine_go-vendor-tools.toml
@ -0,0 +1,56 @@
+[licensing]
+detector = "trivy"
+exclude_files = [
+    "vendor/go.opentelemetry.io/otel/get_main_pkgs.sh",
+    "vendor/go.opentelemetry.io/otel/verify_examples.sh",
+    "vendor/google.golang.org/grpc/regenerate.sh",
+    "LICENSE.macros",
+]
+
+[[licensing.licenses]]
+path = "vendor/github.com/google/shlex/COPYING"
+sha256sum = "cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30"
+expression = "Apache-2.0"
+[[licensing.licenses]]
+path = "vendor/github.com/spdx/tools-golang/LICENSE.code"
+sha256sum = "e914fb1f3927226e04b0438e0b541b3c6e3c65de4d64aa8f5cdaa803f05448fd"
+expression = "Apache-2.0 OR GPL-2.0-or-later"
+[[licensing.licenses]]
+path = "internal/test/suite/testify.LICENSE"
+sha256sum = "dad2b0b2cc2dbdbf95ad5d800ef7588956e74dc2479014829d42be295125c25d"
+expression = "MIT"
+[[licensing.licenses]]
+path = "vendor/github.com/miekg/dns/COPYRIGHT"
+sha256sum = "66550c0ad5ca7ec1e08683e5f872cc45c741f311eee3b8ee484206ecbf9c740d"
+expression = "BSD-3-Clause"
+[[licensing.licenses]]
+path = "vendor/github.com/moby/sys/symlink/LICENSE.APACHE"
+sha256sum = "e6abacaae15d29c132fc8688f098a3b9c89088bc434ea33992261e19e34e6723"
+expression = "Apache-2.0"
+[[licensing.licenses]]
+path = "vendor/github.com/moby/sys/symlink/LICENSE.BSD"
+sha256sum = "81205fa54813e578a0d361c671c21ae35ca5b1b575f39e82f5cdab68b8539a1d"
+expression = "BSD-3-Clause"
+[[licensing.licenses]]
+path = "vendor/github.com/shibumi/go-pathspec/GO-LICENSE"
+sha256sum = "dd26a7abddd02e2d0aba97805b31f248ef7835d9e10da289b22e3b8ab78b324d"
+expression = "BSD-3-Clause"
+[[licensing.licenses]]
+path = "vendor/cyphar.com/go-pathrs/COPYING"
+sha256sum = "3f3d9e0024b1921b067d6f7f88deb4a60cbe7a78e76c64e3f1d7fc3b779b9d04"
+expression = "MPL-2.0"
+[[licensing.licenses]]
+path = "vendor/github.com/cyphar/filepath-securejoin/LICENSE.BSD"
+sha256sum = "26be8a79415737dfe8edf1be62e71afeb8c770ed5a5605a06270d5701830f47c"
+expression = "BSD-3-Clause"
+[[licensing.licenses]]
+path = "vendor/github.com/cyphar/filepath-securejoin/LICENSE.MPL-2.0"
+sha256sum = "3f3d9e0024b1921b067d6f7f88deb4a60cbe7a78e76c64e3f1d7fc3b779b9d04"
+expression = "BSD-3-Clause"
+[[licensing.licenses]]
+path = "vendor/go.yaml.in/yaml/v2/LICENSE.libyaml"
+sha256sum = "a94710b55e03b5285f77d048c5ba61bb9d6ee04a06c0eb90e68821e11b0c707a"
+expression = "MIT"
+[archive]
+[archive.dependency_overrides]
+"github.com/moby/policy-helpers" = "v0.0.0-20251120141729-4dd138b40f3e"
--- a/macros.moby
+++ b/macros.moby
@ -0,0 +1,5 @@
+# Copyright (C) 2024 Maxwell G <maxwell@gtmx.me>
+# Copyright (C) Fedora Project Authors
+# SPDX-License-Identifier: MIT
+
+%moby_cli_plugins_dir %{_libexecdir}/docker/cli-plugins
--- a/mkvendor.sh
+++ b/mkvendor.sh
@ -0,0 +1,41 @@
+#!/bin/bash
+# Copyright (C) 2024 Maxwell G <maxwell@gtmx.me>
+# SPDX-License-Identifier: MIT
+set -euo pipefail
+
+# Source0:        %{gosource0}
+# Source1:        %{archivename0}-vendor.tar.bz2
+# Source2:        %{gosource2}
+# Source3:        %{archivename2}-vendor.tar.bz2
+
+sources=()
+while read -r source; do
+    filename="$(awk '{print $2}' <<< "${source}" | awk -F '/' '{print $NF}')"
+    sources+=( "${filename}" )
+done < <(spectool --sources ./*.spec)
+
+set -x
+temp="$(mktemp -d)"
+trap 'rm -rf $temp' EXIT
+here="$(pwd)"
+
+# Retrieve remote sources
+spectool -g moby-engine.spec
+
+# (re)create vendor archives
+config="${here}/engine_go-vendor-tools.toml"
+go_vendor_archive create --config "${config}" --idempotent \
+    --output "${sources[1]}" "${sources[0]}"
+go_vendor_license --config "${config}" --path "moby-engine.spec" \
+    report expression --update-spec
+
+config="${here}/cli_go-vendor-tools.toml"
+go_vendor_archive create --config "${config}" --idempotent \
+    --output "${sources[3]}" "${sources[2]}"
+mkdir -p "${temp}/cli"
+cd "${temp}/cli"
+tar xf "${here}/${sources[2]}"
+cd ./*
+tar xf "${here}/${sources[3]}"
+expr="$(go_vendor_license --config "${config}" --path "." report expression)"
+sed -i -E "s|(\%global cli_license).*|\1 ${expr}|" "${here}/moby-engine.spec"
--- a/moby-engine-systemd-sysusers.conf
+++ b/moby-engine-systemd-sysusers.conf
@ -0,0 +1,2 @@
+#Type Name   ID
+g     docker -
--- a/moby-engine.spec
+++ b/moby-engine.spec
@ -1,385 +1,391 @@
-%global with_debug 0
+# This specfile is licensed under:
+# SPDX-FileCopyrightText: Fedora Project Authors
+# SPDX-FileCopyrightText: 2024 Maxwell G <maxwell@gtmx.me>
+# SPDX-License-Identifier: MIT
+# License Text: https://spdx.org/licenses/MIT.html

-%if 0%{?with_debug}
-%global _find_debuginfo_dwz_opts %{nil}
-%global _dwz_low_mem_die_limit 0
-%else
-%global debug_package %{nil}
-%endif
+# Generated by go2rpm 1.11.0
+%bcond_without check

-# binaries and unitfiles are currently called 'docker'
-# to match with upstream supplied packages
-%global origname docker
-%global newname moby
-%global service_name %{origname}
+# https://github.com/moby/moby
+%global goipath0        github.com/moby/moby
+# For rc, beta, alpha releases substitute tilde (~) for dash (-)
+# in version0. tag0 reverses the substitution
+# e.g.  global version0        27.4.0~rc.4
+%global version0        29.1.4
+%{lua:
+    local version0 = rpm.expand("%{version0}"):gsub("~", "-")
+    rpm.define("tag0 " .. "docker-v" .. version0)
+    rpm.define("distprefix0 %{nil}")
+    rpm.define("tag2 " .. "v" .. version0)
+}

-# moby / docker-ce / cli
-%global git_moby https://github.com/%{service_name}/%{service_name}-ce
-%global commit_moby 2d0083d657f82c47044c8d3948ba434b622fe2fd
-%global shortcommit_moby %(c=%{commit_moby}; echo ${c:0:7})
+# https://github.com/docker/cli
+%global goipath2        github.com/docker/cli
+%global version2        %{version0}

-# docker-proxy / libnetwork
-%global git_libnetwork https://github.com/%{service_name}/libnetwork
-%global commit_libnetwork e7933d41e7b206756115aa9df5e0599fc5169742
-%global shortcommit_libnetwork %(c=%{commit_libnetwork}; echo ${c:0:7})
+%gometa -L -a -f
+%global engine_dir ../%{topdir0}
+%global cli_dir ../%{topdir2}

-# tini
-%global git_tini https://github.com/krallin/tini
-%global commit_tini fec3683b971d9c3ef73f284f176672c44b448662
-%global shortcommit_tini %(c=%{commit_tini}; echo ${c:0:7})
-
-Name: %{newname}-engine
-Version: 18.09.7
-Release: 4.ce.git%{shortcommit_moby}%{?dist}
-Summary: The open-source application container engine
-License: ASL 2.0
-# no golang / go-md2man for ppc64
-ExcludeArch: ppc64
-Source0: %{git_moby}/archive/%{commit_moby}.tar.gz
-Source1: %{git_libnetwork}/archive/%{commit_libnetwork}.tar.gz
-Source2: %{git_tini}/archive/%{commit_tini}.tar.gz
-Source3: %{service_name}.service
-Source4: %{service_name}.sysconfig
-URL: https://www.%{origname}.com
-
-BuildRequires: btrfs-progs-devel
-BuildRequires: cmake
-BuildRequires: dep
-BuildRequires: device-mapper-devel
-BuildRequires: git
-BuildRequires: glibc-static
-BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang >= 1.6.2}
-BuildRequires: go-md2man
-BuildRequires: gpgme-devel
-BuildRequires: libassuan-devel
-BuildRequires: libseccomp-static >= 2.3.0
-BuildRequires: libtool-ltdl-devel
-BuildRequires: make
-BuildRequires: pkgconfig(audit)
-BuildRequires: pkgconfig(systemd)
-BuildRequires: sed
-BuildRequires: sqlite-devel
-
-# required packages on install
-Requires: container-selinux
-Requires: iptables
-Requires: systemd
-Requires: tar
-Requires: xz
-Requires: pigz
-Requires: runc
-Requires: containerd
-
-# Resolves: rhbz#1165615
-Requires: device-mapper-libs >= 1.02.90-1
-
-# Replace the old Docker packages
-Obsoletes: %{origname} < %{version}-%{release}
-Obsoletes: %{origname}-latest < %{version}-%{release}
-Provides: %{origname} = %{version}-%{release}
-Provides: %{origname}-latest = %{version}-%{release}
-
-# conflicting packages
-Conflicts: %{origname}
-Conflicts: %{origname}-latest
-Conflicts: %{origname}-common
-Conflicts: %{origname}-io
-Conflicts: %{origname}-engine-cs
-Conflicts: %{origname}-ce
-Conflicts: %{origname}-ee
-
-%description
+%global common_description %{expand:
 Docker is an open source project to build, ship and run any application as a
 lightweight container.

 Docker containers are both hardware-agnostic and platform-agnostic. This means
 they can run anywhere, from your laptop to the largest EC2 compute instance and
-everything in between - and they don't require you to use a particular
+everything in between — and they do not require you to use a particular
 language, framework or packaging system. That makes them great building blocks
 for deploying and scaling web apps, databases, and backend services without
 depending on a particular stack or provider.
+}

-%package fish-completion
-Summary: Fish completion files for %{name}
-Requires: %{name} = %{version}-%{release}
-Requires: fish
-Conflicts: %{service_name}-fish-completion
-Obsoletes: %{service_name}-fish-completion < %{version}-%{release}
-Provides: %{service_name}-fish-completion = %{version}-%{release}
+Name:           moby-engine
+Version:        %{version0}
+Release:        %autorelease
+Summary:        The open-source application container engine

-%description fish-completion
-This package installs %{summary}.
+# Generated with go-vendor-tools
+License:        Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0 AND (Apache-2.0 OR GPL-2.0-or-later)
+URL:            %{gourl}
+# We create our own vendor tarballs instead of using the built-in directoies.
+# This allows us to include the manpage build dependencies for docker-cli
+# and make any of our own changes to the deps included as necessary.
+Source0:        %{gosource0}
+Source1:        %{archivename0}-vendor.tar.bz2
+Source2:        %{gosource2}
+Source3:        %{archivename2}-vendor.tar.bz2

-%package vim
-Summary: Vim syntax highlighting files for %{name}
-Requires: %{name} = %{version}-%{release}
-Requires: vim
-Conflicts: %{service_name}-vim
-Obsoletes: %{service_name}-vim < %{version}-%{release}
-Provides: %{service_name}-vim = %{version}-%{release}
+Source100:      moby-engine-systemd-sysusers.conf
+Source101:      macros.moby
+Source102:      LICENSE.macros

-%description vim
-This package installs %{summary}.
+Source200:      engine_go-vendor-tools.toml
+Source201:      cli_go-vendor-tools.toml

-%package zsh-completion
-Summary: Zsh completion files for %{name}
-Requires: %{name} = %{version}-%{release}
-Requires: zsh
-Conflicts: %{service_name}-zsh-completion
-Obsoletes: %{service_name}-zsh-completion < %{version}-%{release}
-Provides: %{service_name}-zsh-completion = %{version}-%{release}
+# Patches 0-999 are for moby/moby
+Patch0:         0001-systemd-adjust-docker.service-for-downstream.patch
+
+# Patches 1000+ are for docker/cli
+# Patch1000:
+
+BuildRequires:  git-core
+BuildRequires:  go-vendor-tools
+BuildRequires:  make
+BuildRequires:  pkg-config
+BuildRequires:  systemd-devel
+BuildRequires:  /usr/bin/go-md2man
+BuildRequires:  nftables-devel
+
+
+# docker.service depends on containerd
+Requires:       containerd
+# The docker CLI is provided as a separate package
+Requires:       docker-cli = %{version}-%{release}
+# moby-filesystem owns the libexecdir/docker directory
+Requires:       moby-filesystem = %{version}-%{release}
+# tini-static is used as the docker-init binary
+Requires:       tini-static
+
+# Other runtime packages (sorted)
+Requires:       container-selinux
+Requires:       iptables
+Requires:       libseccomp
+Requires:       nftables
+Requires:       pigz
+Requires:       systemd
+Requires:       tar
+Requires:       xz
+
+# Provide docker name to help users who "dnf install docker"
+Provides:       docker = %{version}-%{release}
+
+# Conflict with upstream packages
+Conflicts:      docker-ce
+Conflicts:      docker-ee
+
+%description %{common_description}

-%description zsh-completion
-This package installs %{summary}.

 %package nano
-Summary: nano syntax highlighting files for Moby
-Requires: %{name} = %{version}-%{release}
-Requires: nano
+Summary:        GNU nano syntax highlighting files for Moby
+BuildArch:      noarch
+Requires:       nano
+Supplements:    moby-engine

-%description nano
+%description nano %{common_description}
 This package installs %{summary}.

+
+# We name this package docker-cli, as that's the name of the upstream project.
+# moby-engine is github.com/moby/moby.
+%package -n docker-cli
+Version:        %{forgeversion -z1}
+Summary:        The Docker CLI
+# Generated with go-vendor-tools
+%global cli_license Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND MIT
+License:        %{cli_license}
+Requires:       moby-filesystem = %{version}-%{release}
+# Recommend main moby-engine package with the docker daemon
+# We don't use a strict dependency, as it's possible to use the docker CLI with
+# a different host.
+Recommends:     moby-engine
+# docker buildx is the new supported way to run builds; docker build is deprecated.
+Recommends:     docker-buildx
+
+# Conflict with older moby-engine versions
+Conflicts:      moby-engine < %{version}-%{release}
+Conflicts:      moby-engine > %{version}-%{release}
+
+# Conflict with upstream packages
+Conflicts:      docker-ce-cli
+Conflicts:      docker-ee-cli
+# Conflict with podman-docker that also contains /usr/bin/docker
+Conflicts:      podman-docker
+
+# Obsolete old separate shell completions packages
+Obsoletes:      moby-engine-fish-completion < 24.0.5-6
+Obsoletes:      moby-engine-zsh-completion < 24.0.5-6
+
+%description -n docker-cli %{common_description}
+
+This package provides the Docker CLI.
+
+
+%package -n moby-filesystem
+Summary:        Filesystem package for the Moby/Docker stack
+License:        LicenseRef-Not-Copyrightable
+BuildArch:      noarch
+
+%description -n moby-filesystem %{common_description}
+
+This is the filesystem subpackage for the Moby/Docker stack.
+
+
+%package -n moby-rpm-macros
+Summary:        RPM Macros for the Moby/Docker stack
+License:        MIT
+BuildArch:      noarch
+
+%description -n moby-rpm-macros %{common_description}
+
+This package provides RPM macros for the Moby/Docker stack.
+
+
 %prep
-%autosetup -N -Sgit -n %{service_name}-ce-%{commit_moby}
+%goprep -a -A

-# untar libnetwork
-tar zxf %{SOURCE1}
+# moby-engine
+cd %{_builddir}/%{extractdir0}
+# Unpack vendor archive
+tar -xf %{S:1}
+# Apply patches 0-1000
+# Leave this here despite warnings so we can easily add and remove patches.
+%autopatch -M999 -p1
+cp -p %{S:100} %{S:101} %{S:102} .

-# untar tini
-tar zxf %{SOURCE2}
+# docker-cli
+cd %{cli_dir}
+# Unpack vendor archive
+tar -xf %{S:3}
+# Apply patches 1000+.
+# Leave this here despite warnings so we can easily add and remove patches.
+%autopatch -m1000 -p1
+# See comment in go-vendor-tools.toml
+rm -f man/go.mod

-# correct rpmlint errors for bash completion
-sed -i '/env bash/d' components/cli/contrib/completion/bash/docker
+
+%generate_buildrequires
+# moby-engine
+%go_vendor_license_buildrequires -c %{S:200}
+# docker-cli
+%go_vendor_license_buildrequires -c %{S:201}

 %build
-# build docker-proxy / libnetwork
-(
-        cd libnetwork-%{commit_libnetwork}
-        mkdir -p src/github.com/%{service_name}
-        ln -fns ../../.. src/github.com/%{service_name}/libnetwork
-        export GOPATH="${PWD}"
-        export LDFLAGS="-linkmode=external"
-        %gobuild -o %{service_name}-proxy github.com/%{service_name}/libnetwork/cmd/proxy
-)
+export GO_LDFLAGS="" GO_BUILDTAGS="" CGO_ENABLED=1
+%global gomodulesmode GO111MODULE=on

-# build tini
-(
-        cd tini-%{commit_tini}
-        %cmake .
-        make tini-static
-)
+# moby-engine
+cd %{engine_dir}
+# DOCKER_DEBUG: Ensure that all debuginfo is preserved
+BUILDFLAGS="%{gocompilerflags} -a -v" \
+CGO_CFLAGS="%{build_cflags}" \
+CGO_LDFLAGS="%{build_ldflags}" \
+DOCKER_BUILDTAGS="rpm_crashback journald" \
+DOCKER_GITCOMMIT=%{release} \
+DOCKER_DEBUG=1 \
+DOCKER_LDFLAGS=%{gobuild_ldflags_shescaped} \
+LDFLAGS=%{gobuild_ldflags_shescaped} \
+VERSION=%{version} \
+GOPATH=%{gobuilddir} \
+    bash -x ./hack/make.sh dynbinary

-# build engine
-(
-        cd components/engine
-        mkdir -p _build/src/github.com/%{service_name}
-        ln -fns ../../../.. _build/src/github.com/%{service_name}/%{service_name}
-        export DOCKER_BUILDTAGS="seccomp selinux"
-        export DOCKER_DEBUG=1
-        export DOCKER_GITCOMMIT=%{shortcommit_moby}
-        export GOPATH="${PWD}/_build"
-        export VERSION=%{version}
-        bash -x hack/make.sh dynbinary
-)
+# build man pages using Makefile in man subdirectory
+pushd man
+GO_MD2MAN=go-md2man %make_build all
+popd

-# build cli
-(
-        cd components/cli
-        mkdir -p src/github.com/%{service_name}
-        ln -fns ../../.. src/github.com/%{service_name}/cli
-        export DISABLE_WARN_OUTSIDE_CONTAINER=1
-        export GOPATH="${PWD}"
-        make VERSION=%{version} GITCOMMIT=%{shortcommit_moby} dynbinary
-        man/md2man-all.sh
-)
+# docker-cli
+cd %{cli_dir}
+%make_build dynbinary \
+    DISABLE_WARN_OUTSIDE_CONTAINER=1 \
+    GITCOMMIT=%{release} \
+    GO_BUILDTAGS="rpm_crashback" \
+    GO_LDFLAGS=%{gobuild_ldflags_shescaped} \
+    VERSION=%{version} \
+dynbinary manpages

 %install
-install -dp %{buildroot}%{_bindir}
-install -dp %{buildroot}%{_libexecdir}/%{service_name}
+# moby-engine
+cd %{engine_dir}
+# Install licenses
+%go_vendor_license_install -c %{S:200}
+# Install binaries
+install -Dpm 0755 bundles/dynbinary*/* -t %{buildroot}%{_bindir}
+# Install systemd configuration
+install -Dpm 0644 contrib/init/systemd/* -t %{buildroot}%{_unitdir}
+# Install sysusers config
+install -Dpm 0644 moby-engine-systemd-sysusers.conf %{buildroot}%{_sysusersdir}/moby-engine.conf
+install -Dpm 644 man/man8/*.8 -t %{buildroot}%{_mandir}/man8/

-# install binary
-install -p -m 755 components/cli/build/%{service_name} %{buildroot}%{_bindir}/%{service_name}
-install -p -m 755 components/engine/bundles/latest/dynbinary-daemon/%{service_name}d %{buildroot}%{_bindir}/%{service_name}d
+# docker-cli
+cd %{cli_dir}
+# Install licenses
+%go_vendor_license_install -c %{S:201}
+# Install docker-cli
+install -Dpm 0755 build/docker -t %{buildroot}%{_bindir}
+# Install shell completions
+install -Dpm 644 contrib/completion/bash/docker -t %{buildroot}%{bash_completions_dir}
+install -Dpm 644 contrib/completion/zsh/_docker -t %{buildroot}%{zsh_completions_dir}
+install -Dpm 644 contrib/completion/fish/docker.fish -t %{buildroot}%{fish_completions_dir}
+# Install manpages
+install -Dpm 644 man/man1/*.1 -t %{buildroot}%{_mandir}/man1/
+install -Dpm 644 man/man5/*.5 -t %{buildroot}%{_mandir}/man5/
+cd -

-# install proxy
-install -p -m 755 libnetwork-%{commit_libnetwork}/%{service_name}-proxy %{buildroot}%{_bindir}/%{service_name}-proxy
+# moby-filesystem
+mkdir -p %{buildroot}%{_libexecdir}/docker
+mkdir %{buildroot}%{_libexecdir}/docker/cli-plugins

-# install tini
-install -p -m 755 tini-%{commit_tini}/tini-static %{buildroot}%{_bindir}/%{service_name}-init
+# moby-rpm-macros
+install -Dpm 0644 macros.moby -t %{buildroot}%{_rpmmacrodir}

-# install udev rules
-install -dp %{buildroot}%{_prefix}/lib/udev/rules.d
-install -p -m 644 components/engine/contrib/udev/80-%{service_name}.rules %{buildroot}%{_usr}/lib/udev/rules.d/80-%{service_name}.rules
+%check
+export PATH="%{buildroot}%{_bindir}:${PATH}" TZ=utc

-# add init scripts
-install -dp %{buildroot}%{_unitdir}
-install -p -m 644 %{SOURCE3} %{buildroot}%{_unitdir}
-install -p -m 644 components/engine/contrib/init/systemd/docker.socket %{buildroot}%{_unitdir}
+# moby-engine
+cd %{engine_dir}
+%go_vendor_license_check -c %{S:200}

-# for additional args
-install -dp %{buildroot}%{_sysconfdir}/sysconfig
-install -p -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/sysconfig/%{service_name}
+# docker-cli
+cd %{cli_dir}
+%go_vendor_license_check -c %{S:201} %{cli_license}

-# add bash, zsh, and fish completions
-install -dp %{buildroot}%{_datadir}/bash-completion/completions
-install -dp %{buildroot}%{_datadir}/zsh/vendor-completions
-install -dp %{buildroot}%{_datadir}/fish/vendor_completions.d
-install -p -m 644 components/cli/contrib/completion/bash/%{service_name} %{buildroot}%{_datadir}/bash-completion/completions/%{service_name}
-install -p -m 644 components/cli/contrib/completion/zsh/_%{service_name} %{buildroot}%{_datadir}/zsh/vendor-completions/_%{service_name}
-install -p -m 644 components/cli/contrib/completion/fish/%{service_name}.fish %{buildroot}%{_datadir}/fish/vendor_completions.d/%{service_name}.fish
+%if %{with check}
+# moby-engine
+cd %{engine_dir}
+# Manually skip specific tests
+%global engine_ignores %{shrink:
+   %dnl assertion failed
+    -s "TestC8dSnapshotterWithUsernsRemap"
+    -s "TestSCTP4Proxy"
+    %dnl flaky test will fail on x86_64 - sometimes
+    -s "TestSCTP6Proxy"
+    %dnl Failed to enter netns: operation not permitted
+    %dnl -s "TestSCTP4ProxyNoListener"
+    %dnl -s "TestSCTP6ProxyNoListener"
+    %dnl possibly flaky test failing on ppc64le
+    %[ "%{_arch}" == "ppc64le" ? "-s TestSCTP6ProxyNoListener" : "" ]
+    %dnl network_proxy_linux_test.go:73: protocol not supported; fails in COPR rawhide
+    -s "TestIfaceAddrs"
+    %dnl failed to mount resolved path: operation not permitted
+    -s "TestJoinGoodSymlink"
+    -s "TestJoinWithSymlinkReplace"
+    -s "TestJoinCloseInvalidates"
+    %dnl Test timeout
+    -s "TestImageLoad"
+    %dnl doesn't provide the requested platform
+    -s "TestContentStoreForPull"
+    -s "TestManifestStore"
+    %dnl all with error is not nil: create tmp file
+    %[ "%{_arch}" == "s390x" ? "-s TestCloseRunningCommand" : "" ]
+    %dnl graphdriver tests require extra permissions
+    -t daemon/graphdriver
+    %dnl integration tests require a running docker daemon
+    -t integration
+    %dnl libnetwork tests cannot create netns in mock
+    -t daemon/libnetwork
+    %dnl integration-cli: we don't want to run integration tests or benchmarks
+    -d integration-cli
+}
+%gocheck2 -F %{engine_ignores}

-# install manpages
-install -dp %{buildroot}%{_mandir}/man{1,5,8}
-install -p -m 644 components/cli/man/man1/*.1 %{buildroot}%{_mandir}/man1
-install -p -m 644 components/cli/man/man5/*.5 %{buildroot}%{_mandir}/man5
-install -p -m 644 components/cli/man/man8/*.8 %{buildroot}%{_mandir}/man8
+# docker-cli
+cd %{cli_dir}
+%global cli_ignores %{shrink:
+    -s "TestInitializeFromClientHangs"
+    %dnl Needs network
+    -s "TestRunBuildFromGitHubSpecialCase"
+    %dnl Test is flaky
+    -s "TestConnectAndWait"
+    %dnl Test panics
+    -s "TestRunAttachTermination"
+    -s "TestRunPullTermination"
+    -s "TestUpgradePromptTermination"
+}
+%gocheck2 -F -t e2e %{cli_ignores}
+%endif

-# add vimfiles
-install -dp %{buildroot}%{_datadir}/vim/vimfiles/doc
-install -dp %{buildroot}%{_datadir}/vim/vimfiles/ftdetect
-install -dp %{buildroot}%{_datadir}/vim/vimfiles/syntax
-install -p -m 644 components/engine/contrib/syntax/vim/doc/%{service_name}file.txt %{buildroot}%{_datadir}/vim/vimfiles/doc/%{service_name}file.txt
-install -p -m 644 components/engine/contrib/syntax/vim/ftdetect/%{service_name}file.vim %{buildroot}%{_datadir}/vim/vimfiles/ftdetect/%{service_name}file.vim
-install -p -m 644 components/engine/contrib/syntax/vim/syntax/%{service_name}file.vim %{buildroot}%{_datadir}/vim/vimfiles/syntax/%{service_name}file.vim
-
-# add nano files
-install -dp %{buildroot}%{_datadir}/nano
-install -p -m 644 components/engine/contrib/syntax/nano/Dockerfile.nanorc %{buildroot}%{_datadir}/nano/Dockerfile.nanorc
-
-for cli_file in LICENSE MAINTAINERS NOTICE README.md; do
-    cp "components/cli/$cli_file" "cli-$cli_file"
-done
-
-%pre
-getent group %{service_name} >/dev/null || groupadd -r %{service_name} || :

 %post
-%systemd_post %{service_name}.service %{service_name}.socket
+%systemd_post docker.service docker.socket
+

 %preun
-%systemd_preun %{service_name}.service %{service_name}.socket
+%systemd_preun docker.service docker.socket
+

 %postun
-%systemd_postun_with_restart %{service_name}.service
+%systemd_postun_with_restart docker.service

-%files
-%license cli-LICENSE components/engine/LICENSE
-%doc components/engine/{AUTHORS,CHANGELOG.md,CONTRIBUTING.md,MAINTAINERS,NOTICE,README.md}
-%doc cli-MAINTAINERS cli-NOTICE cli-README.md
-%config(noreplace) %{_sysconfdir}/sysconfig/%{service_name}
-%{_bindir}/%{service_name}
-%{_bindir}/%{service_name}d
-%dir %{_libexecdir}/%{service_name}/
-%{_bindir}/%{service_name}-proxy
-%{_bindir}/%{service_name}-init
-%{_usr}/lib/udev/rules.d/80-%{service_name}.rules
-%{_unitdir}/%{service_name}.service
-%{_unitdir}/%{service_name}.socket
-%{_datadir}/bash-completion/completions/%{service_name}
-%{_mandir}/man1/*
-%{_mandir}/man5/*
-%{_mandir}/man8/*

-%files vim
-%dir %{_datadir}/vim/vimfiles/{doc,ftdetect,syntax}
-%{_datadir}/vim/vimfiles/doc/%{service_name}file.txt
-%{_datadir}/vim/vimfiles/ftdetect/%{service_name}file.vim
-%{_datadir}/vim/vimfiles/syntax/%{service_name}file.vim
+%files -f %{engine_dir}/%{go_vendor_license_filelist}
+%license %{engine_dir}/vendor/modules.txt
+%doc %{engine_dir}/README.md
+%{_bindir}/docker-proxy
+%{_bindir}/dockerd
+%{_sysusersdir}/moby-engine.conf
+%{_unitdir}/docker.service
+%{_unitdir}/docker.socket
+%{_mandir}/man8/dockerd.8*

-%files zsh-completion
-%dir %{_datadir}/zsh/vendor-completions/
-%{_datadir}/zsh/vendor-completions/_%{service_name}
-
-%files fish-completion
-%dir %{_datadir}/fish/vendor_completions.d
-%{_datadir}/fish/vendor_completions.d/%{service_name}.fish

 %files nano
-%dir %{_datadir}/nano
-%{_datadir}/nano/Dockerfile.nanorc
+%license %{engine_dir}/AUTHORS
+%license %{engine_dir}/LICENSE
+%license %{engine_dir}/NOTICE
+
+
+%files -n docker-cli -f %{cli_dir}/%{go_vendor_license_filelist}
+%license %{cli_dir}/vendor/modules.txt
+%doc %{cli_dir}/README.md
+%{_bindir}/docker
+%{_mandir}/man1/docker*.1*
+%{_mandir}/man5/{Dockerfile,docker-config-json}.5*
+%{bash_completions_dir}/docker
+%{fish_completions_dir}/docker.fish
+%{zsh_completions_dir}/_docker
+
+
+%files -n moby-filesystem
+%dir %{_libexecdir}/docker
+%dir %{_libexecdir}/docker/cli-plugins
+
+
+%files -n moby-rpm-macros
+%license %{engine_dir}/LICENSE.macros
+%{_rpmmacrodir}/macros.moby
+

 %changelog
-* Sat Jul 13 2019 Olivier Lemasle <o.lemasle@gmail.com> - 18.09.7-3.ce.git2d0083d
- Add nofile ulimit to default docker daemon options (#1715254, #1708115)
-
-* Fri Jul 12 2019 Olivier Lemasle <o.lemasle@gmail.com> - 18.09.7-4.ce.git2d0083d
- rebuilt
-
-* Fri Jul 12 2019 Olivier Lemasle <o.lemasle@gmail.com> - 18.09.7-2.ce.git2d0083d
- Depend on packaged versions "runc" and "containerd" instead of building them.
-
-* Thu Jun 27 2019 David Michael <dm0@redhat.com> - 18.09.7-1.ce.git2d0083d
- Update docker-ce to commit 2d0083d (version 18.09.7).
- Update runc to commit 425e105.
- Update containerd to commit 894b81a (1.2.6).
- Update docker-proxy to commit e7933d4.
-
-* Tue May 14 2019 David Michael <dm0@redhat.com> - 18.09.6-1.ce.git481bc77
- Update docker-ce to commit 481bc77 (version 18.09.6).
- Update docker-proxy to commit 872f0a8.
- Obsolete and provide the docker and docker-latest packages. (#1700006)
-
-* Thu Apr 11 2019 David Michael <dm0@redhat.com> - 18.09.5-1.ce.gite8ff056
- Update docker-ce to commit e8ff056 (version 18.09.5).
- Update docker-runc to commit 2b18fe1.
- Update docker-containerd to commit bb71b10 (version 1.2.5).
- Update docker-proxy to commit 4725f21.
- Report the correct engine version.
- Install symlinks to unprefixed runc/containerd program names.
-
-* Thu Mar 28 2019 David Michael <dm0@redhat.com> - 18.06.3-2.ce.gitd7080c1
- Conflict with docker-common. (#1693397)
-
-* Thu Feb 21 2019 David Michael <dm0@redhat.com> - 18.06.3-1.ce.gitd7080c1
- Update docker-ce to commit d7080c1 (version 18.06.3).
-
-* Tue Feb 12 2019 David Michael <dm0@redhat.com> - 18.06.2-1.ce.git6d37f41
- Update docker-ce to commit 6d37f41 (version 18.06.2).
- Update docker-runc to commit a592beb.
-
-* Mon Feb 11 2019 David Michael <dm0@redhat.com> - 18.06.1-3.ce.gite68fc7a
- Apply a runc patch for CVE-2019-5736.
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 18.06.1-2.ce.gite68fc7a
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Thu Nov 29 2018 David Michael <dm0@redhat.com> - 18.06.1-1.ce.gite68fc7a
- Update docker-ce to commit e68fc7a (version 18.06.1).
- Update docker-runc to commit 69663f0.
- Update docker-containerd to commit 468a545 (version 1.1.2).
- Update docker-proxy to commit 3ac297b.
- Backport a fix for mounting named volumes.
- Create a "docker" group for non-root Docker access.
- Support systemd socket-activation.
- Make runc and containerd commit IDs match their expected values.
- Preserve containerd debuginfo.
-
-* Mon Nov 12 2018 Marcin Skarbek <rpm@skarbek.name> - 18.06.0-2.ce.git0ffa825
- add configuration file
- update service file
-
-* Sat Aug 18 2018 Lokesh Mandvekar <lsm5@fedoraproject.org> - 18.06.0-1.ce.git0ffa825
- Resolves: #1539161 - first upload to Fedora
- built docker-ce commit 0ffa825
- built docker-runc commit ad0f5255
- built docker-containerd commit a88b631
- built docker-proxy commit a79d368
- built docker-init commit fec3683
-
-* Tue Mar 20 2018 Lokesh Mandvekar <lsm5@fedoraproject.org> - 17.03.2-4.ce.gitf5ec1e2
- correct some rpmlint errors
-
-* Wed Feb 21 2018 Lokesh Mandvekar <lsm5@fedoraproject.org> - 17.03.2-3.ce
- docker-* symlinks to moby-* (RE: gh PR 34226)
-
-* Wed Feb 21 2018 Lokesh Mandvekar <lsm5@fedoraproject.org> - 17.03.2-2.ce
- rename binaries as per upstream gh PR 34226
-
-* Fri Jan 26 2018 Lokesh Mandvekar <lsm5@fedoraproject.org> - 17.03.2-1
- initial build
- built moby commit f5ec1e2
- built cli commit 4b61f56
- built docker-runc commit 2d41c047
- built docker-containerd commit 3addd84
- built docker-proxy commit 7b2b1fe
+%autochangelog
--- a/7
+++ b/7
@ -1,3 +1,4 @@
-SHA512 (2d0083d657f82c47044c8d3948ba434b622fe2fd.tar.gz) = 4403f06f387663603876dc5bb38d32cf5aa554e3642aa4c164c0071390d1957f843a39f87459edb1ba5ec31e664207c83b56caef9b60172fcfefbfca052f7454
-SHA512 (e7933d41e7b206756115aa9df5e0599fc5169742.tar.gz) = 0a833510df0029999bfc05c23445a58a8b2ff165c0fb2fd5c411498d1e89b5b1990d2778b32346dd2b6d61c166ff707c6277a5d1937db6345c77d3825eb59875
-SHA512 (fec3683b971d9c3ef73f284f176672c44b448662.tar.gz) = ee46d21467f8bacb4e8be72f5dfcbb23c1964286e90b4b3d3bf67dbbf79a337968ac8a0042a8191e329a65398b20ea160aae3ae5ef20ee03ebae11c2083d7621
+SHA512 (cli-29.1.4.tar.gz) = 517b3976e740aef1e40e7cc90d3792f3ef2a13fc3d5dd3e41126451bc938a43c37c1c7ff36de8b47aa7870d0c8dd4efa124639cf505626b339a87ffdb25c8a79
+SHA512 (cli-29.1.4-vendor.tar.bz2) = 6147c6ad55e3c65c45afa3d9cc01cee7bc92da4d709cb4ccd91dfc97db8f6d459fb089f3cd02464b35ac5e78552f971c8c7a20870eab5ce9543d7d2e66347ac7
+SHA512 (moby-docker-v29.1.4.tar.gz) = 53a46ddce7363c7cf74b07a928f195af6fd646524154170a90a5303ea39ad7d79980eff94568ed84c242a381c467b0613bd1f9344f6cdce89fba6a6f4e95defd
+SHA512 (moby-docker-v29.1.4-vendor.tar.bz2) = 8ca3d92590f86cd24bba61356646ac20a5cecc6aab1fe23c110f7edb1d86734f8631360580bdb4ff250c373f1ae02b5c37ccbbc90380d5e9f7e9b95be575dbb4