diff mbox series

[meta-security,10/12] chkrootkit: fix building with gcc 15

Message ID 8a266d6df5118fc3be230931d2aa4534bfc9f8b2.1751647559.git.scott.murray@konsulko.com
State New
Headers show
Series Initial fixes for master branch | expand

Commit Message

Scott Murray July 4, 2025, 5:11 p.m. UTC 
Add a patch to fix building chkrootkit with gcc 15.

Signed-off-by: Scott Murray <scott.murray@konsulko.com>
---
 recipes-scanners/rootkits/chkrootkit_0.58b.bb |  5 ++-
 .../files/0001-Fix-building-with-gcc-15.patch | 39 +++++++++++++++++++
 2 files changed, 42 insertions(+), 2 deletions(-)
 create mode 100644 recipes-scanners/rootkits/files/0001-Fix-building-with-gcc-15.patch
diff mbox series

Patch

diff --git a/recipes-scanners/rootkits/chkrootkit_0.58b.bb b/recipes-scanners/rootkits/chkrootkit_0.58b.bb
index 0fcc55d..e5912fe 100644
--- a/recipes-scanners/rootkits/chkrootkit_0.58b.bb
+++ b/recipes-scanners/rootkits/chkrootkit_0.58b.bb
@@ -6,8 +6,9 @@  LICENSE = "BSD-2-Clause"
 LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=6db4d77fb8f0cc84d175e7a1211e4c13"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/c/${BPN}/${BPN}_${PV}.orig.tar.gz \
-           file://musl_fix.patch"
-
+           file://musl_fix.patch \
+           file://0001-Fix-building-with-gcc-15.patch \
+"
 SRC_URI[sha256sum] = "75ed2ace81f0fa3e9c3fb64dab0e8857ed59247ea755f5898416feb2c66807b9"
 
 inherit autotools-brokensep
diff --git a/recipes-scanners/rootkits/files/0001-Fix-building-with-gcc-15.patch b/recipes-scanners/rootkits/files/0001-Fix-building-with-gcc-15.patch
new file mode 100644
index 0000000..8c2a111
--- /dev/null
+++ b/recipes-scanners/rootkits/files/0001-Fix-building-with-gcc-15.patch
@@ -0,0 +1,39 @@ 
+From 9834ad9f0b8a10de22512772222a9c51014c750d Mon Sep 17 00:00:00 2001
+From: Scott Murray <scott.murray@konsulko.com>
+Date: Thu, 3 Jul 2025 18:11:24 -0400
+Subject: [PATCH] Fix building with gcc 15
+
+Fix read_status signature to avoid incompatible function pointer
+error with gcc 15.
+
+Upstream-Status: Inactive-Upstream [lastrelease: July 5, 2024]
+Signed-off-by: Scott Murray <scott.murray@konsulko.com>
+---
+ chklastlog.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/chklastlog.c b/chklastlog.c
+index 2fffd9e..1566c76 100644
+--- a/chklastlog.c
++++ b/chklastlog.c
+@@ -78,7 +78,7 @@ int main () { return 0; }
+ long total_wtmp_bytes_read=0;
+ size_t wtmp_file_size;
+ uid_t *uid;
+-void read_status();
++void read_status(int signum);
+ 
+ struct s_localpwd {
+      int numentries;
+@@ -214,7 +214,7 @@ int nonuser(struct utmp utmp_ent)
+ }
+ #endif
+ 
+-void read_status() {
++void read_status(int signum) {
+    double remaining_time;
+    static long last_total_bytes_read=0;
+    int diff;
+-- 
+2.50.0
+