diff --git a/backport-CVE-2024-41110.patch b/0005-CVE-2024-41110.patch similarity index 100% rename from backport-CVE-2024-41110.patch rename to 0005-CVE-2024-41110.patch diff --git a/backport-tini.c-a-function-declaration-without-a-prototype-is.patch b/0006-tini.c-a-function-declaration-without-a-prototype-is.patch similarity index 100% rename from backport-tini.c-a-function-declaration-without-a-prototype-is.patch rename to 0006-tini.c-a-function-declaration-without-a-prototype-is.patch diff --git a/moby.spec b/moby.spec index 5edc000489a2900957de3061452b72dc50e1829b..71c58990f7095980e67bd6a2bf50847aae572f80 100644 --- a/moby.spec +++ b/moby.spec @@ -7,7 +7,7 @@ Name: docker Version: 25.0.3 -Release: 12 +Release: 13 Summary: The open-source application container engine License: ASL 2.0 URL: https://www.docker.com @@ -20,13 +20,12 @@ Source2: tini-0.19.0.tar.gz Source3: docker.service Source4: docker.socket Source5: docker.sysconfig -Patch0000: 0001-fix-cve-2024-29018.patch -Patch0001: 0002-fix-cve-2024-32473.patch -Patch0002: 0003-add-loongarch64-seccomp-support.patch -Patch0003: 0004-fix-docker-swarm-run-failed-for-loongarch64.patch - -Patch9000: backport-CVE-2024-41110.patch -Patch9001: backport-tini.c-a-function-declaration-without-a-prototype-is.patch +Patch0001: 0001-fix-cve-2024-29018.patch +Patch0002: 0002-fix-cve-2024-32473.patch +Patch0003: 0003-add-loongarch64-seccomp-support.patch +Patch0004: 0004-fix-docker-swarm-run-failed-for-loongarch64.patch +Patch0005: 0005-CVE-2024-41110.patch +Patch0006: 0006-tini.c-a-function-declaration-without-a-prototype-is.patch Requires: %{name}-engine = %{version}-%{release} Requires: %{name}-client = %{version}-%{release} @@ -91,13 +90,13 @@ Docker client binary and related utilities %prep %setup -q -n %{_source_client} %setup -q -T -n %{_source_engine} -b 1 -%patch 0000 -p1 %patch 0001 -p1 %patch 0002 -p1 %patch 0003 -p1 -%patch 9000 -p1 +%patch 0004 -p1 +%patch 0005 -p1 %setup -q -T -n %{_source_docker_init} -b 2 -%patch 9001 -p1 +%patch 0006 -p1 %build export GO111MODULE=off @@ -198,6 +197,9 @@ fi %systemd_postun_with_restart docker.service %changelog +* Tue Oct 29 2024 yaoguangzhong - 25.0.3-13 +- DESC:modify patch number + * Tue Oct 29 2024 yaoguangzhong - 25.0.3-12 - DESC:fix build warnings for moby.spec