packages/moby
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

backport upstream patch to fix function declaration without a prototype(-Wstrict-prototypes) error

Browse Source 
(cherry picked from commit 706f29a8b38a56229340cf43835efde46691f4fe)
This commit is contained in:
tiberium 2024-09-09 17:21:44 +08:00 committed by openeuler-sync-bot
parent 33b4195bc3
commit d7e1a30c68
2 changed files with 81 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
backport-tini.c-a-function-declaration-without-a-prototype-is.patch Normal file
View File

@ -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

10
moby.spec
View File

@ -7,7 +7,7 @@
Name: docker
Version: 25.0.3
Release: 10
Release: 11
Summary: The open-source application container engine
License: ASL 2.0
URL: https://www.docker.com
@ -26,6 +26,7 @@ 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
Requires: %{name}-engine = %{version}-%{release}
Requires: %{name}-client = %{version}-%{release}
@ -96,6 +97,7 @@ Docker client binary and related utilities
%patch0003 -p1
%patch9000 -p1
%setup -q -T -n %{_source_docker_init} -b 2
%patch9001 -p1
%build
export GO111MODULE=off
@ -196,6 +198,12 @@ fi
%systemd_postun_with_restart docker.service
%changelog
* 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
- ID:NA