automatic import of docker

2 files changed, 83 insertions, 2 deletions

diff --git a/backport-tini.c-a-function-declaration-without-a-prototype-is.patch b/backport-tini.c-a-function-declaration-without-a-prototype-is.patch
new file mode 100644
index 0000000..f3a59ea
--- /dev/null
+++ b/backport-tini.c-a-function-declaration-without-a-prototype-is.patch
@@ -0,0 +1,72 @@
+From a49fdd374d6d9c047e35de8b82935cc4d837e678 Mon Sep 17 00:00:00 2001
+From: Jose Quaresma <jose.quaresma@foundries.io>
+Date: Fri, 23 Sep 2022 16:31:33 +0000
+Subject: [PATCH 1/2] tini.c: a function declaration without a prototype is
+ deprecated in all versions of C
+
+| /srv/oe/build/tmp-lmp/work/corei7-64-lmp-linux/tini/0.19.0-r0/git/src/tini.c:150:18: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
+| int isolate_child() {
+|                  ^
+|                   void
+| /srv/oe/build/tmp-lmp/work/corei7-64-lmp-linux/tini/0.19.0-r0/git/src/tini.c:395:14: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
+| int parse_env() {
+|              ^
+|               void
+| /srv/oe/build/tmp-lmp/work/corei7-64-lmp-linux/tini/0.19.0-r0/git/src/tini.c:416:24: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
+| int register_subreaper () {
+|                        ^
+|                         void
+| /srv/oe/build/tmp-lmp/work/corei7-64-lmp-linux/tini/0.19.0-r0/git/src/tini.c:434:19: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
+| void reaper_check () {
+|                   ^
+|                    void
+| 4 errors generated.
+
+Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io>
+---
+ src/tini.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/tini.c b/src/tini.c
+index 2c873f9..7914d3a 100644
+--- a/src/tini.c
++++ b/src/tini.c
+@@ -147,7 +147,7 @@ int restore_signals(const signal_configuration_t* const sigconf_ptr) {
+ 	return 0;
+ }
+ 
+-int isolate_child() {
++int isolate_child(void) {
+ 	// Put the child into a new process group.
+ 	if (setpgid(0, 0) < 0) {
+ 		PRINT_FATAL("setpgid failed: %s", strerror(errno));
+@@ -392,7 +392,7 @@ int parse_args(const int argc, char* const argv[], char* (**child_args_ptr_ptr)[
+ 	return 0;
+ }
+ 
+-int parse_env() {
++int parse_env(void) {
+ #if HAS_SUBREAPER
+ 	if (getenv(SUBREAPER_ENV_VAR) != NULL) {
+ 		subreaper++;
+@@ -413,7 +413,7 @@ int parse_env() {
+ 
+ 
+ #if HAS_SUBREAPER
+-int register_subreaper () {
++int register_subreaper (void) {
+ 	if (subreaper > 0) {
+ 		if (prctl(PR_SET_CHILD_SUBREAPER, 1)) {
+ 			if (errno == EINVAL) {
+@@ -431,7 +431,7 @@ int register_subreaper () {
+ #endif
+ 
+ 
+-void reaper_check () {
++void reaper_check (void) {
+ 	/* Check that we can properly reap zombies */
+ #if HAS_SUBREAPER
+ 	int bit = 0;
+-- 
+2.25.1
+
diff --git a/moby.spec b/moby.spec
index 08d0333..96f3ad5 100644
--- a/moby.spec
+++ b/moby.spec
@@ -23,6 +23,8 @@ Source5:  docker.sysconfig
 Patch0002:  0003-add-loongarch64-seccomp-support.patch
 Patch0003:  0004-fix-docker-swarm-run-failed-for-loongarch64.patch
 
+Patch9001:  backport-tini.c-a-function-declaration-without-a-prototype-is.patch
+
 Requires: %{name}-engine = %{version}-%{release}
 Requires: %{name}-client = %{version}-%{release}
 
@@ -89,6 +91,7 @@ Docker client binary and related utilities
 %patch -P0002 -p1
 %patch -P0003 -p1
 %setup -q -T -n %{_source_docker_init} -b 2
+%patch -P9001 -p1
 
 %build
 export GO111MODULE=off
@@ -189,8 +192,14 @@ fi
 %systemd_postun_with_restart docker.service
 
 %changelog
-* Thu Sep 12 2024 Funda Wang <fundawang@yeah.net> - 27.2.1-1
-- update to version 27.2.1
+* Sun Sep 22 2024 Funda Wang <fundawang@yeah.net> - 27.2.1-1
+- update to verison 27.2.1
+
+* Mon Sep 9 2024 tiberium <jinzhe.oerv@isrc.iscas.ac.cn> - 25.0.3-11
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC:backport upstream patch to solve -Wstrict-prototypes error
 
 * Fri Jul 26 2024 zhangxianting <zhangxianting@uniontechc.om> - 25.0.3-10
 - Type:CVE