diff mbox series

[meta-oe,27/36] mcelog: upgrade 198 -> 199

Message ID 1717664795-13902-27-git-send-email-wangmy@fujitsu.com
State Accepted
Headers show
Series [meta-oe,01/36] atkmm-2.36: upgrade 2.36.2 -> 2.36.3 | expand

Commit Message

Mingyu Wang (Fujitsu) June 6, 2024, 9:06 a.m. UTC 
From: Wang Mingyu <wangmy@fujitsu.com>

0001-server-Correct-prameter-type-for-connect-API.patch
removed since it's included in 199

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
 ...orrect-prameter-type-for-connect-API.patch | 43 -------------------
 .../mcelog/{mcelog_198.bb => mcelog_199.bb}   | 14 +++---
 2 files changed, 6 insertions(+), 51 deletions(-)
 delete mode 100644 meta-oe/recipes-support/mcelog/mcelog/0001-server-Correct-prameter-type-for-connect-API.patch
 rename meta-oe/recipes-support/mcelog/{mcelog_198.bb => mcelog_199.bb} (76%)
diff mbox series

Patch

diff --git a/meta-oe/recipes-support/mcelog/mcelog/0001-server-Correct-prameter-type-for-connect-API.patch b/meta-oe/recipes-support/mcelog/mcelog/0001-server-Correct-prameter-type-for-connect-API.patch
deleted file mode 100644
index 2f26f9ced..000000000
--- a/meta-oe/recipes-support/mcelog/mcelog/0001-server-Correct-prameter-type-for-connect-API.patch
+++ /dev/null
@@ -1,43 +0,0 @@ 
-From 0370e7a9fb0ca1b27d7b0897739e2a7cce8977ab Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sat, 11 May 2024 22:42:07 -0700
-Subject: [PATCH] server: Correct prameter type for connect() API
-
-connect() function expects the second argument to be point to sockaddr
-as per man sockaddr
-
-int connect (int, const struct sockaddr *, socklen_t);
-
-Fixes build failures with -Wincompatible-pointer-types when using GCC-14
-and musl
-
-Fixes
-| server.c: In function 'server_ping':
-| server.c:308:33: error: passing argument 2 of 'connect' from incompatible pointer type [-Wincompatible-pointer-types]
-|   308 |                 if (connect(fd, un, sizeof(struct sockaddr_un)) < 0)
-|       |                                 ^~
-|       |                                 |
-|       |                                 struct sockaddr_un *
-
-Upstream-Status: Submitted [ sent to contact@mcelog.org ]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- server.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/server.c b/server.c
-index 54c7d57..51b7d3a 100644
---- a/server.c
-+++ b/server.c
-@@ -305,7 +305,7 @@ static int server_ping(struct sockaddr_un *un)
- 	if (sigsetjmp(ping_timeout_ctx, 1) == 0) {
- 		ret = -1;
- 		alarm(initial_ping_timeout);
--		if (connect(fd, un, sizeof(struct sockaddr_un)) < 0)
-+		if (connect(fd, (const struct sockaddr *)un, sizeof(struct sockaddr_un)) < 0)
- 			goto cleanup;
- 		if (write(fd, PAIR("ping\n")) < 0)
- 			goto cleanup;
--- 
-2.45.0
-
diff --git a/meta-oe/recipes-support/mcelog/mcelog_198.bb b/meta-oe/recipes-support/mcelog/mcelog_199.bb
similarity index 76%
rename from meta-oe/recipes-support/mcelog/mcelog_198.bb
rename to meta-oe/recipes-support/mcelog/mcelog_199.bb
index 10b229319..0a48fc48c 100644
--- a/meta-oe/recipes-support/mcelog/mcelog_198.bb
+++ b/meta-oe/recipes-support/mcelog/mcelog_199.bb
@@ -5,14 +5,12 @@  and should run on all Linux systems that need error handling."
 HOMEPAGE = "https://mcelog.org/"
 SECTION = "System Environment/Base"
 
-SRC_URI = "\
-    git://git.kernel.org/pub/scm/utils/cpu/mce/mcelog.git;protocol=http;;branch=master \
-    file://0001-client-Include-string.h-form-mem-function-prototypes.patch \
-    file://0001-server-Correct-prameter-type-for-connect-API.patch \
-    file://run-ptest \
-"
-
-SRCREV = "ab58f07b9b1a4456fca0f5f41639d5cbecc80e36"
+SRC_URI = "git://git.kernel.org/pub/scm/utils/cpu/mce/mcelog.git;protocol=http;;branch=master \
+           file://0001-client-Include-string.h-form-mem-function-prototypes.patch \
+           file://run-ptest \
+           "
+
+SRCREV = "c17897deb52daab300c585a6a6c2456d062d80cf"
 
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263"