From 0d39d65c0e0ced4e130718f39ed8b262605134b7 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 15 Apr 2026 10:43:44 -0700 Subject: [PATCH] systemd-netlogd: Upgrade to 1.4.5 release Fix build on 32-bit with 64-bit time_t Fix build with C23 on For full details: https://github.com/systemd/systemd-netlogd/releases/tag/v1.4.5 Signed-off-by: Khem Raj --- ...tness-for-pointer-variables-to-refer.patch | 60 +++++++++++++++++++ ...logd_1.4.4.bb => systemd-netlogd_1.4.5.bb} | 6 +- 2 files changed, 64 insertions(+), 2 deletions(-) create mode 100644 meta-oe/recipes-support/systemd-netlogd/systemd-netlogd/0001-Fix-const-correctness-for-pointer-variables-to-refer.patch rename meta-oe/recipes-support/systemd-netlogd/{systemd-netlogd_1.4.4.bb => systemd-netlogd_1.4.5.bb} (83%) diff --git a/meta-oe/recipes-support/systemd-netlogd/systemd-netlogd/0001-Fix-const-correctness-for-pointer-variables-to-refer.patch b/meta-oe/recipes-support/systemd-netlogd/systemd-netlogd/0001-Fix-const-correctness-for-pointer-variables-to-refer.patch new file mode 100644 index 0000000000..190baff606 --- /dev/null +++ b/meta-oe/recipes-support/systemd-netlogd/systemd-netlogd/0001-Fix-const-correctness-for-pointer-variables-to-refer.patch @@ -0,0 +1,60 @@ +From 515e23b37ad1400bfb73797771c4f0fd78655328 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 15 Apr 2026 10:52:05 -0700 +Subject: [PATCH] Fix const-correctness for pointer variables to referred + strings + +Mark pointer variables 'e' as 'const char *' in +config_parse_netlog_remote_address,file_in_same_dir, and +socket_address_parse, since they point to memory they do not +own or modify. + +Upstream-Status: Submitted [https://github.com/systemd/systemd-netlogd/pull/148] +Signed-off-by: Khem Raj +--- + src/netlog/netlog-conf.c | 2 +- + src/share/path-util.c | 3 ++- + src/share/socket-util.c | 3 ++- + 3 files changed, 5 insertions(+), 3 deletions(-) + +diff --git a/src/netlog/netlog-conf.c b/src/netlog/netlog-conf.c +index a4cf0da..59bdd23 100644 +--- a/src/netlog/netlog-conf.c ++++ b/src/netlog/netlog-conf.c +@@ -22,7 +22,7 @@ int config_parse_netlog_remote_address(const char *unit, + void *data, + void *userdata) { + Manager *m = userdata; +- char *e; ++ const char *e; + int r; + + assert(filename); +diff --git a/src/share/path-util.c b/src/share/path-util.c +index dda7ec6..ad6f24a 100644 +--- a/src/share/path-util.c ++++ b/src/share/path-util.c +@@ -327,7 +327,8 @@ bool path_is_safe(const char *p) { + } + + char *file_in_same_dir(const char *path, const char *filename) { +- char *e, *ret; ++ const char *e; ++ char *ret; + size_t k; + + assert(path); +diff --git a/src/share/socket-util.c b/src/share/socket-util.c +index ae33338..5a6284b 100644 +--- a/src/share/socket-util.c ++++ b/src/share/socket-util.c +@@ -33,7 +33,8 @@ + #include "util.h" + + int socket_address_parse(SocketAddress *a, const char *s) { +- char *e, *n; ++ const char *e; ++ char *n; + unsigned u; + int r; + diff --git a/meta-oe/recipes-support/systemd-netlogd/systemd-netlogd_1.4.4.bb b/meta-oe/recipes-support/systemd-netlogd/systemd-netlogd_1.4.5.bb similarity index 83% rename from meta-oe/recipes-support/systemd-netlogd/systemd-netlogd_1.4.4.bb rename to meta-oe/recipes-support/systemd-netlogd/systemd-netlogd_1.4.5.bb index 019098fdf7..c52940ec70 100644 --- a/meta-oe/recipes-support/systemd-netlogd/systemd-netlogd_1.4.4.bb +++ b/meta-oe/recipes-support/systemd-netlogd/systemd-netlogd_1.4.5.bb @@ -3,8 +3,10 @@ SUMMARY = "Forwards messages from the journal to other hosts over the network us LICENSE = "LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c" -SRC_URI = "git://github.com/systemd/systemd-netlogd.git;protocol=https;branch=main" -SRCREV = "b03cc3b1a75048c7cf19467d8918a4b7320767e6" +SRC_URI = "git://github.com/systemd/systemd-netlogd.git;protocol=https;branch=main;tag=v${PV} \ + file://0001-Fix-const-correctness-for-pointer-variables-to-refer.patch \ + " +SRCREV = "20534091417686d1185acb3f29e93944d8663c4b" inherit meson systemd pkgconfig useradd features_check