pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
basu: update patches, working package
Module Name: pkgsrc-wip
Committed By: kikadf <kikadf.01%gmail.com@localhost>
Pushed By: kikadf
Date: Tue Feb 3 15:04:43 2026 +0100
Changeset: e370d41f32409986a08f4643f42e93061d297b3a
Modified Files:
basu/Makefile
basu/distinfo
basu/patches/patch-src_basic_alloc-util.h
basu/patches/patch-src_basic_fileio.h
basu/patches/patch-src_basic_log.h
basu/patches/patch-src_basic_macro.h
basu/patches/patch-src_basic_memfd-util.c
basu/patches/patch-src_basic_missing.h
basu/patches/patch-src_basic_socket-util.c
basu/patches/patch-src_basic_socket-util.h
basu/patches/patch-src_busctl_busctl.c
basu/patches/patch-src_libsystemd_sd-bus_bus-dump.c
basu/patches/patch-src_libsystemd_sd-bus_bus-gvariant.c
basu/patches/patch-src_libsystemd_sd-bus_bus-message.h
basu/patches/patch-src_libsystemd_sd-bus_bus-protocol.h
basu/patches/patch-src_libsystemd_sd-bus_bus-socket.c
basu/patches/patch-src_libsystemd_sd-bus_bus-track.c
basu/patches/patch-src_libsystemd_sd-bus_test-bus-chat.c
basu/patches/patch-src_libsystemd_sd-bus_test-bus-creds.c
basu/patches/patch-src_libsystemd_sd-bus_test-bus-objects.c
basu/patches/patch-src_libsystemd_sd-bus_test-bus-server.c
basu/patches/patch-src_test_tests.c
Added Files:
basu/patches/patch-src_libsystemd_libsystemd.sym
Removed Files:
basu/patches/patch-src_libsystemd_sd-bus_bus-control.c
Log Message:
basu: update patches, working package
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=e370d41f32409986a08f4643f42e93061d297b3a
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
basu/Makefile | 3 +
basu/distinfo | 42 ++++-----
basu/patches/patch-src_basic_alloc-util.h | 4 +-
basu/patches/patch-src_basic_fileio.h | 5 +-
basu/patches/patch-src_basic_log.h | 35 +++++--
basu/patches/patch-src_basic_macro.h | 2 +-
basu/patches/patch-src_basic_memfd-util.c | 9 +-
basu/patches/patch-src_basic_missing.h | 2 +-
basu/patches/patch-src_basic_socket-util.c | 54 ++++++++---
basu/patches/patch-src_basic_socket-util.h | 13 ++-
basu/patches/patch-src_busctl_busctl.c | 102 ++++++++++-----------
basu/patches/patch-src_libsystemd_libsystemd.sym | 16 ++++
.../patch-src_libsystemd_sd-bus_bus-control.c | 37 --------
.../patches/patch-src_libsystemd_sd-bus_bus-dump.c | 12 +--
.../patch-src_libsystemd_sd-bus_bus-gvariant.c | 2 +-
.../patch-src_libsystemd_sd-bus_bus-message.h | 4 +-
.../patch-src_libsystemd_sd-bus_bus-protocol.h | 10 +-
.../patch-src_libsystemd_sd-bus_bus-socket.c | 102 ++++++++++-----------
.../patch-src_libsystemd_sd-bus_bus-track.c | 4 +-
.../patch-src_libsystemd_sd-bus_test-bus-chat.c | 74 +++++++--------
.../patch-src_libsystemd_sd-bus_test-bus-creds.c | 4 +-
.../patch-src_libsystemd_sd-bus_test-bus-objects.c | 6 +-
.../patch-src_libsystemd_sd-bus_test-bus-server.c | 14 +--
basu/patches/patch-src_test_tests.c | 19 ++--
24 files changed, 296 insertions(+), 279 deletions(-)
diffs:
diff --git a/basu/Makefile b/basu/Makefile
index b32e88143c..15c90ef09c 100644
--- a/basu/Makefile
+++ b/basu/Makefile
@@ -17,6 +17,9 @@ REPLACE_PYTHON= src/basic/generate-gperfs.py
MESON_ARGS+= -Daudit=disabled
MESON_ARGS+= -Dlibcap=disabled
+#CFLAGS+= -O0 -g
+#INSTALL_UNSTRIPPED= yes
+
.include "../../devel/meson/build.mk"
.include "../../lang/python/application.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/basu/distinfo b/basu/distinfo
index 30a2daf005..769e2176c1 100644
--- a/basu/distinfo
+++ b/basu/distinfo
@@ -3,24 +3,24 @@ $NetBSD$
BLAKE2s (v0.2.1.tar.gz) = f7b340b81f7fb9952b58129cb7dd95da20d7f3f8d9a3b11003360fc943e51bd7
SHA512 (v0.2.1.tar.gz) = b1f6a35e4d93d099c5c92a8ea68f8a93429a614f1a63de7346e256437525bee5b87c1a5ad2e0dad2ff0bdc88b525cf1931f048e032bd1f1ff007b4d5eee90c59
Size (v0.2.1.tar.gz) = 239042 bytes
-SHA1 (patch-src_basic_alloc-util.h) = bbbd00e70f84e6f328e718b5c95c945f49922481
-SHA1 (patch-src_basic_fileio.h) = ed0f1440c13e386a82a9acc602bbc389ff64ab1a
-SHA1 (patch-src_basic_log.h) = a8c5cbbaeaeecc81ee7d437313a3651ccf2be8b1
-SHA1 (patch-src_basic_macro.h) = a331b499ce569794e74006c5f225f4c01121bea0
-SHA1 (patch-src_basic_memfd-util.c) = e780781cc1e38f9c307617636357a163d9a6f53f
-SHA1 (patch-src_basic_missing.h) = 6dfc3cddb6351f31cc221944258cff170ca48a07
-SHA1 (patch-src_basic_socket-util.c) = 451367c75e6bccc261cf04371b7e2cc75b0bb133
-SHA1 (patch-src_basic_socket-util.h) = cd07541cb99dae48eaf91b1edb665a052593bf79
-SHA1 (patch-src_busctl_busctl.c) = 8bd3902c2ff873ed8311adb562c2694251dec98a
-SHA1 (patch-src_libsystemd_sd-bus_bus-control.c) = beca00b1d0c808de36c4f22d0e4e4147d6e6f19a
-SHA1 (patch-src_libsystemd_sd-bus_bus-dump.c) = a07384f7caf96a9621658857dfc821275d0ccaf8
-SHA1 (patch-src_libsystemd_sd-bus_bus-gvariant.c) = e50838d9e6865522d14dff561e275c0edeec2c7f
-SHA1 (patch-src_libsystemd_sd-bus_bus-message.h) = 6002d9aecadfbbc33c49a8b68495e6fe3dd4c124
-SHA1 (patch-src_libsystemd_sd-bus_bus-protocol.h) = ec7e709e2f56d740350e46ffbce108bfea164cf3
-SHA1 (patch-src_libsystemd_sd-bus_bus-socket.c) = 59e702c71002e82b233506b38a547a503ce9b3ec
-SHA1 (patch-src_libsystemd_sd-bus_bus-track.c) = 809900a598aa4a9f7010b710790827cbdd6fdb50
-SHA1 (patch-src_libsystemd_sd-bus_test-bus-chat.c) = 9b7cf431f83d53d477d56ef79a2bea6432926556
-SHA1 (patch-src_libsystemd_sd-bus_test-bus-creds.c) = c525fb22653ca7dca6b65f9db116a5736be4b5e3
-SHA1 (patch-src_libsystemd_sd-bus_test-bus-objects.c) = 3b1e88450802bf88efbd0bb92693aff27eb8bc9d
-SHA1 (patch-src_libsystemd_sd-bus_test-bus-server.c) = 2d300dc54b927b153dd8d81bb6d12362c9b6dab4
-SHA1 (patch-src_test_tests.c) = 700e0c2d63d66a9859b0c7dcfc55e9704d8e8770
+SHA1 (patch-src_basic_alloc-util.h) = 7ada7a5df59b1f1ec2751a7bcb50b26f0368feae
+SHA1 (patch-src_basic_fileio.h) = 6398bbead3c315fbfc6a7ec3bb7bda22a4a10d1b
+SHA1 (patch-src_basic_log.h) = 7bd42dd43f6ae2c4ccce8b1c76f0fb346d0aa33f
+SHA1 (patch-src_basic_macro.h) = 796666644ac3fb1a7b3e5d314a15dd74467b3f55
+SHA1 (patch-src_basic_memfd-util.c) = a300bdcf4df7edaa07f3469389174330e639b967
+SHA1 (patch-src_basic_missing.h) = 39f30fbf35bd429390bbb90a62f9ca45c2c86040
+SHA1 (patch-src_basic_socket-util.c) = 7f037f0d1f2092acb287fb1c7e8186d7a07a7d0e
+SHA1 (patch-src_basic_socket-util.h) = 6ff848ab3063f705d693e40d24e157077afcb7d7
+SHA1 (patch-src_busctl_busctl.c) = b431ae6b65a0f65b63b9ce69d1912c34fd6f9f8f
+SHA1 (patch-src_libsystemd_libsystemd.sym) = 17f312781b9f1bc95e855ee05c4874e1c8d9a2c9
+SHA1 (patch-src_libsystemd_sd-bus_bus-dump.c) = 0c8eeafcca6f1d2d9ff7da3bf207aa6efc376404
+SHA1 (patch-src_libsystemd_sd-bus_bus-gvariant.c) = eda28f53d11995d62c398e345c9c8df8e77a347f
+SHA1 (patch-src_libsystemd_sd-bus_bus-message.h) = 7a42f1dae88e72369f63a38c0eb2fd6b533a9ed3
+SHA1 (patch-src_libsystemd_sd-bus_bus-protocol.h) = a1313ce260ad3d70455ead5fc62e076e555c5e73
+SHA1 (patch-src_libsystemd_sd-bus_bus-socket.c) = 6fcd97ecfb443c4e6093c5cafc252c994f0dfffc
+SHA1 (patch-src_libsystemd_sd-bus_bus-track.c) = 8d4aa978177845ba56b4e7431a7a492283693f87
+SHA1 (patch-src_libsystemd_sd-bus_test-bus-chat.c) = 30e8d7e8db8fa8a8f172796933f1e0fe756af91a
+SHA1 (patch-src_libsystemd_sd-bus_test-bus-creds.c) = 70453efa597f96f4638d13b79ae96641a8c16bcd
+SHA1 (patch-src_libsystemd_sd-bus_test-bus-objects.c) = ef83e5763f7b950ded42927832fec12b43c9b536
+SHA1 (patch-src_libsystemd_sd-bus_test-bus-server.c) = 515cb87965d54c35ec97fb125aed9ef056af711b
+SHA1 (patch-src_test_tests.c) = 6f29b5eea228b3ee6106135e8153e31cdbd21a40
diff --git a/basu/patches/patch-src_basic_alloc-util.h b/basu/patches/patch-src_basic_alloc-util.h
index b3134b2583..f40ff9a4d5 100644
--- a/basu/patches/patch-src_basic_alloc-util.h
+++ b/basu/patches/patch-src_basic_alloc-util.h
@@ -1,8 +1,8 @@
$NetBSD$
-* NetBSD support
+* Add NetBSD support
---- src/basic/alloc-util.h.orig 2022-12-16 10:13:02.000000000 +0000
+--- src/basic/alloc-util.h.orig 2022-12-16 11:13:02.000000000 +0100
+++ src/basic/alloc-util.h
@@ -38,7 +38,7 @@ static inline void *mfree(void *memory)
0; \
diff --git a/basu/patches/patch-src_basic_fileio.h b/basu/patches/patch-src_basic_fileio.h
index 3f24307bff..ffb8327118 100644
--- a/basu/patches/patch-src_basic_fileio.h
+++ b/basu/patches/patch-src_basic_fileio.h
@@ -2,16 +2,15 @@ $NetBSD$
* NetBSD hasn't ferror_unlocked()
---- src/basic/fileio.h.orig 2025-12-11 13:03:38.102655025 +0000
+--- src/basic/fileio.h.orig 2022-12-16 11:13:02.000000000 +0100
+++ src/basic/fileio.h
-@@ -3,6 +3,10 @@
+@@ -3,6 +3,9 @@
#include <stddef.h>
#include <stdio.h>
+#ifdef __NetBSD__
+#define ferror_unlocked(fp) ferror(fp)
+#endif
-+
int read_one_line_file(const char *fn, char **line);
int read_full_file(const char *fn, char **contents, size_t *size);
diff --git a/basu/patches/patch-src_basic_log.h b/basu/patches/patch-src_basic_log.h
index 84fa83ab03..9ca4139357 100644
--- a/basu/patches/patch-src_basic_log.h
+++ b/basu/patches/patch-src_basic_log.h
@@ -2,17 +2,32 @@ $NetBSD$
* On NetBSD %m is only allowed in syslog(3) like functions
---- src/basic/log.h.orig 2022-12-16 10:13:02.000000000 +0000
+--- src/basic/log.h.orig 2022-12-16 11:13:02.000000000 +0100
+++ src/basic/log.h
-@@ -103,3 +103,11 @@ void log_assert_failed_return_realm(
- #define log_error_errno(error, ...) log_full_errno(LOG_ERR, error, __VA_ARGS__)
+@@ -97,9 +97,22 @@ void log_assert_failed_return_realm(
+ #define log_warning(...) log_full(LOG_WARNING, __VA_ARGS__)
+ #define log_error(...) log_full(LOG_ERR, __VA_ARGS__)
- #define log_oom() log_oom_internal(LOG_REALM, __FILE__, __LINE__, __func__)
-+
-+#ifdef __NetBSD__
-+#include <string.h>
-+#include <errno.h>
-+#define LOG_ERR_FMT(fmt, err, ...) fmt ": %s", ##__VA_ARGS__, strerror(-(err))
+-/* Logging triggered by an errno-like error */
+-#define log_debug_errno(error, ...) log_full_errno(LOG_DEBUG, error, __VA_ARGS__)
+-#define log_notice_errno(error, ...) log_full_errno(LOG_NOTICE, error, __VA_ARGS__)
+-#define log_error_errno(error, ...) log_full_errno(LOG_ERR, error, __VA_ARGS__)
++/* Logging triggered by an errno-like error
++ * On NetBSD %m is only allowed in syslog(3) like functions */
++#if defined(__NetBSD__)
++#define log_debug_errno(error, fmt, ...) \
++ log_full_errno(LOG_DEBUG, error, fmt ": %s", ##__VA_ARGS__, strerror(-(error)))
++#define log_notice_errno(error, fmt, ...) \
++ log_full_errno(LOG_NOTICE, error, fmt ": %s", ##__VA_ARGS__, strerror(-(error)))
++#define log_error_errno(error, fmt, ...) \
++ log_full_errno(LOG_ERR, error, fmt ": %s", ##__VA_ARGS__, strerror(-(error)))
+#else
-+#define LOG_ERR_FMT(fmt, err, ...) fmt ": %m", ##__VA_ARGS__
++#define log_debug_errno(error, fmt, ...) \
++ log_full_errno(LOG_DEBUG, error, fmt ": %m", ##__VA_ARGS__)
++#define log_notice_errno(error, fmt, ...) \
++ log_full_errno(LOG_NOTICE, error, fmt ": %m", ##__VA_ARGS__)
++#define log_error_errno(error, fmt, ...) \
++ log_full_errno(LOG_ERR, error, fmt ": %m", ##__VA_ARGS__)
+#endif
+
+ #define log_oom() log_oom_internal(LOG_REALM, __FILE__, __LINE__, __func__)
diff --git a/basu/patches/patch-src_basic_macro.h b/basu/patches/patch-src_basic_macro.h
index 073c9abb37..086da5b667 100644
--- a/basu/patches/patch-src_basic_macro.h
+++ b/basu/patches/patch-src_basic_macro.h
@@ -2,7 +2,7 @@ $NetBSD$
* Use custom macros
---- src/basic/macro.h.orig 2022-12-16 10:13:02.000000000 +0000
+--- src/basic/macro.h.orig 2022-12-16 11:13:02.000000000 +0100
+++ src/basic/macro.h
@@ -70,7 +70,7 @@
#define ALIGN4(l) (((l) + 3) & ~3)
diff --git a/basu/patches/patch-src_basic_memfd-util.c b/basu/patches/patch-src_basic_memfd-util.c
index 92ecf5fdf1..b725701cd8 100644
--- a/basu/patches/patch-src_basic_memfd-util.c
+++ b/basu/patches/patch-src_basic_memfd-util.c
@@ -2,14 +2,17 @@ $NetBSD$
* F_ADD_SEALS available since NetBSD-11
---- src/basic/memfd-util.c.orig 2025-12-11 16:20:23.258634161 +0000
+--- src/basic/memfd-util.c.orig 2022-12-16 11:13:02.000000000 +0100
+++ src/basic/memfd-util.c
-@@ -9,7 +9,7 @@
+@@ -7,9 +7,10 @@
+
+ #include "alloc-util.h"
#include "memfd-util.h"
++#include "missing.h"
int memfd_set_sealed(int fd) {
-#if defined(__FreeBSD__) && __FreeBSD__ < 13
-+#if (defined(__FreeBSD__) && __FreeBSD__ < 13) || (defined(__NetBSD__) && __NetBSD__ < 11)
++#if defined(__FreeBSD__) && __FreeBSD__ < 13 || (defined(__NetBSD__) && __NetBSD__ < 11)
return 0;
#else
int r;
diff --git a/basu/patches/patch-src_basic_missing.h b/basu/patches/patch-src_basic_missing.h
index e58cdefb86..a499cffe56 100644
--- a/basu/patches/patch-src_basic_missing.h
+++ b/basu/patches/patch-src_basic_missing.h
@@ -2,7 +2,7 @@ $NetBSD$
* Define unknown errnos
---- src/basic/missing.h.orig 2022-12-16 10:13:02.000000000 +0000
+--- src/basic/missing.h.orig 2022-12-16 11:13:02.000000000 +0100
+++ src/basic/missing.h
@@ -70,10 +70,24 @@
#define TASK_COMM_LEN 16
diff --git a/basu/patches/patch-src_basic_socket-util.c b/basu/patches/patch-src_basic_socket-util.c
index b80f85d76e..4b17163179 100644
--- a/basu/patches/patch-src_basic_socket-util.c
+++ b/basu/patches/patch-src_basic_socket-util.c
@@ -1,24 +1,48 @@
$NetBSD$
-* ucred is unpcpid on NetBSD
+* NetBSD support
+* Fix getpeercred on NetBSD
---- src/basic/socket-util.c.orig 2022-12-16 10:13:02.000000000 +0000
+--- src/basic/socket-util.c.orig 2022-12-16 11:13:02.000000000 +0100
+++ src/basic/socket-util.c
-@@ -63,8 +63,13 @@ int getpeercred(int fd, struct ucred *uc
- return -EIO;
+@@ -8,6 +8,8 @@
+ #ifdef __FreeBSD__
+ #include <sys/ucred.h>
+ #include <sys/un.h>
++#elif defined(__NetBSD__)
++#include <sys/un.h>
+ #endif
- /* Check if the data is actually useful and not suppressed due to namespacing issues */
-+#ifdef __NetBSD__
-+ if (!pid_is_valid(u.unp_pid))
-+ return -ENODATA;
-+#else
- if (!pid_is_valid(u.pid))
- return -ENODATA;
-+#endif
+ int fd_inc_sndbuf(int fd, size_t n) {
+@@ -47,6 +49,27 @@ int getpeercred(int fd, struct ucred *uc
+ };
- /* Note that we don't check UID/GID here, as namespace translation works differently there: instead of
- * receiving in "invalid" user/group we get the overflow UID/GID. */
-@@ -75,7 +80,7 @@ int getpeercred(int fd, struct ucred *uc
+ *ucred = u;
++#elif defined(__NetBSD__)
++ struct unpcbid cred;
++ socklen_t len = sizeof(cred);
++
++ assert(fd >= 0);
++ assert(ucred);
++
++ if (getsockopt(fd, 0, LOCAL_PEEREID, &cred, &len) == -1) {
++ return -errno;
++ }
++
++ struct ucred u = {
++ .pid = -1,
++ .uid = cred.unp_euid,
++ .gid = cred.unp_egid,
++ };
++
++ if (len != sizeof(cred))
++ return -EIO;
++
++ *ucred = u;
+ #else
+ socklen_t n = sizeof(struct ucred);
+ struct ucred u;
+@@ -75,7 +98,7 @@ int getpeercred(int fd, struct ucred *uc
}
int getpeersec(int fd, char **ret) {
diff --git a/basu/patches/patch-src_basic_socket-util.h b/basu/patches/patch-src_basic_socket-util.h
index f6eccd5703..c279c0dda1 100644
--- a/basu/patches/patch-src_basic_socket-util.h
+++ b/basu/patches/patch-src_basic_socket-util.h
@@ -1,16 +1,19 @@
$NetBSD$
-* Use unpcbid as ucred on NetBSD
+* Use own ucred struct on NetBSD
---- src/basic/socket-util.h.orig 2022-12-16 10:13:02.000000000 +0000
+--- src/basic/socket-util.h.orig 2022-12-16 11:13:02.000000000 +0100
+++ src/basic/socket-util.h
-@@ -29,6 +29,9 @@ struct ucred {
+@@ -29,6 +29,12 @@ struct ucred {
uint32_t uid;
uint32_t gid;
};
+#elif defined(__NetBSD__)
-+#define ucred unpcbid
-+#define SO_PEERCRED LOCAL_PEEREID
++struct ucred {
++ pid_t pid;
++ uid_t uid;
++ gid_t gid;
++};
#endif
int fd_inc_sndbuf(int fd, size_t n);
diff --git a/basu/patches/patch-src_busctl_busctl.c b/basu/patches/patch-src_busctl_busctl.c
index cd44f75b51..38bbfec9ba 100644
--- a/basu/patches/patch-src_busctl_busctl.c
+++ b/basu/patches/patch-src_busctl_busctl.c
@@ -2,19 +2,19 @@ $NetBSD$
* Fix logging, on NetBSD %m is only allowed in syslog(3) like function
---- src/busctl/busctl.c.orig 2025-12-11 12:22:33.149441917 +0000
+--- src/busctl/busctl.c.orig 2022-12-16 11:13:02.000000000 +0100
+++ src/busctl/busctl.c
@@ -57,11 +57,11 @@ static usec_t arg_timeout = 0;
#define NAME_IS_ACTIVATABLE INT_TO_PTR(2)
static int bus_log_parse_error(int r) {
- return log_error_errno(r, "Failed to parse bus message: %m");
-+ return log_error_errno(r, LOG_ERR_FMT("Failed to parse bus message", r));
++ return log_error_errno(r, "Failed to parse bus message");
}
static int bus_log_create_error(int r) {
- return log_error_errno(r, "Failed to create bus message: %m");
-+ return log_error_errno(r, LOG_ERR_FMT("Failed to create bus message", r));
++ return log_error_errno(r, "Failed to create bus message");
}
static int acquire_bus(bool set_monitor, sd_bus **ret) {
@@ -23,39 +23,39 @@ $NetBSD$
r = sd_bus_new(&bus);
if (r < 0)
- return log_error_errno(r, "Failed to allocate bus: %m");
-+ return log_error_errno(r, LOG_ERR_FMT("Failed to allocate bus", r));
++ return log_error_errno(r, "Failed to allocate bus");
if (set_monitor) {
r = sd_bus_set_monitor(bus, true);
if (r < 0)
- return log_error_errno(r, "Failed to set monitor mode: %m");
-+ return log_error_errno(r, LOG_ERR_FMT("Failed to set monitor mode", r));
++ return log_error_errno(r, "Failed to set monitor mode");
r = sd_bus_negotiate_creds(bus, true, _SD_BUS_CREDS_ALL);
if (r < 0)
- return log_error_errno(r, "Failed to enable credentials: %m");
-+ return log_error_errno(r, LOG_ERR_FMT("Failed to enable credentials", r));
++ return log_error_errno(r, "Failed to enable credentials");
r = sd_bus_negotiate_timestamp(bus, true);
if (r < 0)
- return log_error_errno(r, "Failed to enable timestamps: %m");
-+ return log_error_errno(r, LOG_ERR_FMT("Failed to enable timestamps", r));
++ return log_error_errno(r, "Failed to enable timestamps");
r = sd_bus_negotiate_fds(bus, true);
if (r < 0)
- return log_error_errno(r, "Failed to enable fds: %m");
-+ return log_error_errno(r, LOG_ERR_FMT("Failed to enable fds", r));
++ return log_error_errno(r, "Failed to enable fds");
}
r = sd_bus_set_bus_client(bus, true);
if (r < 0)
- return log_error_errno(r, "Failed to set bus client: %m");
-+ return log_error_errno(r, LOG_ERR_FMT("Failed to set bus client", r));
++ return log_error_errno(r, "Failed to set bus client");
r = sd_bus_set_watch_bind(bus, arg_watch_bind);
if (r < 0)
- return log_error_errno(r, "Failed to set watch-bind setting to '%s': %m", yes_no(arg_watch_bind));
-+ return log_error_errno(r, LOG_ERR_FMT("Failed to set watch-bind setting to '%s'", r, yes_no(arg_watch_bind)));
++ return log_error_errno(r, "Failed to set watch-bind setting to '%s'", yes_no(arg_watch_bind));
if (arg_address)
r = sd_bus_set_address(bus, arg_address);
@@ -64,12 +64,12 @@ $NetBSD$
}
if (r < 0)
- return log_error_errno(r, "Failed to set address: %m");
-+ return log_error_errno(r, LOG_ERR_FMT("Failed to set address", r));
++ return log_error_errno(r, "Failed to set address");
r = sd_bus_start(bus);
if (r < 0)
- return log_error_errno(r, "Failed to connect to bus: %m");
-+ return log_error_errno(r, LOG_ERR_FMT("Failed to connect to bus", r));
++ return log_error_errno(r, "Failed to connect to bus");
*ret = TAKE_PTR(bus);
@@ -78,7 +78,7 @@ $NetBSD$
r = sd_bus_list_names(bus, (arg_acquired || arg_unique) ? &acquired : NULL, arg_activatable ? &activatable : NULL);
if (r < 0)
- return log_error_errno(r, "Failed to list names: %m");
-+ return log_error_errno(r, LOG_ERR_FMT("Failed to list names", r));
++ return log_error_errno(r, "Failed to list names");
names = hashmap_new(&string_hash_ops);
if (!names)
@@ -87,7 +87,7 @@ $NetBSD$
r = hashmap_put(names, *i, NAME_IS_ACQUIRED);
if (r < 0)
- return log_error_errno(r, "Failed to add to hashmap: %m");
-+ return log_error_errno(r, LOG_ERR_FMT("Failed to add to hashmap", r));
++ return log_error_errno(r, "Failed to add to hashmap");
}
STRV_FOREACH(i, activatable) {
@@ -96,7 +96,7 @@ $NetBSD$
r = hashmap_put(names, *i, NAME_IS_ACTIVATABLE);
if (r < 0 && r != -EEXIST)
- return log_error_errno(r, "Failed to add to hashmap: %m");
-+ return log_error_errno(r, LOG_ERR_FMT("Failed to add to hashmap", r));
++ return log_error_errno(r, "Failed to add to hashmap");
}
merged = new(char*, hashmap_size(names) + 1);
@@ -105,7 +105,7 @@ $NetBSD$
r = sd_bus_list_names(bus, &names, NULL);
if (r < 0)
- return log_error_errno(r, "Failed to get name list: %m");
-+ return log_error_errno(r, LOG_ERR_FMT("Failed to get name list", r));
++ return log_error_errno(r, "Failed to get name list");
STRV_FOREACH(i, names) {
int q;
@@ -114,7 +114,7 @@ $NetBSD$
r = sd_bus_get_unique_name(bus, &unique_name);
if (r < 0)
- return log_error_errno(r, "Failed to get unique name: %m");
-+ return log_error_errno(r, LOG_ERR_FMT("Failed to get unique name", r));
++ return log_error_errno(r, "Failed to get unique name");
log_info("Monitoring bus message stream.");
@@ -123,7 +123,7 @@ $NetBSD$
r = sd_bus_process(bus, &m);
if (r < 0)
- return log_error_errno(r, "Failed to process bus: %m");
-+ return log_error_errno(r, LOG_ERR_FMT("Failed to process bus", r));
++ return log_error_errno(r, "Failed to process bus");
if (!is_monitor) {
const char *name;
@@ -132,7 +132,7 @@ $NetBSD$
r = sd_bus_message_read(m, "s", &name);
if (r < 0)
- return log_error_errno(r, "Failed to read lost name: %m");
-+ return log_error_errno(r, LOG_ERR_FMT("Failed to read lost name", r));
++ return log_error_errno(r, "Failed to read lost name");
if (streq(name, unique_name))
is_monitor = true;
@@ -141,7 +141,7 @@ $NetBSD$
r = sd_bus_wait(bus, (uint64_t) -1);
if (r < 0)
- return log_error_errno(r, "Failed to wait for bus: %m");
-+ return log_error_errno(r, LOG_ERR_FMT("Failed to wait for bus", r));
++ return log_error_errno(r, "Failed to wait for bus");
}
}
@@ -150,7 +150,7 @@ $NetBSD$
if (r < 0)
- return log_error_errno(r, "Failed to get credentials: %m");
-+ return log_error_errno(r, LOG_ERR_FMT("Failed to get credentials", r));
++ return log_error_errno(r, "Failed to get credentials");
bus_creds_dump(creds, NULL, false);
return 0;
@@ -159,7 +159,7 @@ $NetBSD$
r = parse_boolean(v);
if (r < 0)
- return log_error_errno(r, "Failed to parse '%s' as boolean: %m", v);
-+ return log_error_errno(r, LOG_ERR_FMT("Failed to parse '%s' as boolean", r, v));
++ return log_error_errno(r, "Failed to parse '%s' as boolean", v);
r = sd_bus_message_append_basic(m, t, &r);
break;
@@ -168,7 +168,7 @@ $NetBSD$
r = safe_atou8(v, &z);
if (r < 0)
- return log_error_errno(r, "Failed to parse '%s' as byte (unsigned 8bit integer): %m", v);
-+ return log_error_errno(r, LOG_ERR_FMT("Failed to parse '%s' as byte (unsigned 8bit integer)", r, v));
++ return log_error_errno(r, "Failed to parse '%s' as byte (unsigned 8bit integer)", v);
r = sd_bus_message_append_basic(m, t, &z);
break;
@@ -177,7 +177,7 @@ $NetBSD$
r = safe_atoi16(v, &z);
if (r < 0)
- return log_error_errno(r, "Failed to parse '%s' as signed 16bit integer: %m", v);
-+ return log_error_errno(r, LOG_ERR_FMT("Failed to parse '%s' as signed 16bit integer", r, v));
++ return log_error_errno(r, "Failed to parse '%s' as signed 16bit integer", v);
r = sd_bus_message_append_basic(m, t, &z);
break;
@@ -186,7 +186,7 @@ $NetBSD$
r = safe_atou16(v, &z);
if (r < 0)
- return log_error_errno(r, "Failed to parse '%s' as unsigned 16bit integer: %m", v);
-+ return log_error_errno(r, LOG_ERR_FMT("Failed to parse '%s' as unsigned 16bit integer", r, v));
++ return log_error_errno(r, "Failed to parse '%s' as unsigned 16bit integer", v);
r = sd_bus_message_append_basic(m, t, &z);
break;
@@ -195,7 +195,7 @@ $NetBSD$
r = safe_atoi32(v, &z);
if (r < 0)
- return log_error_errno(r, "Failed to parse '%s' as signed 32bit integer: %m", v);
-+ return log_error_errno(r, LOG_ERR_FMT("Failed to parse '%s' as signed 32bit integer", r, v));
++ return log_error_errno(r, "Failed to parse '%s' as signed 32bit integer", v);
r = sd_bus_message_append_basic(m, t, &z);
break;
@@ -204,7 +204,7 @@ $NetBSD$
r = safe_atou32(v, &z);
if (r < 0)
- return log_error_errno(r, "Failed to parse '%s' as unsigned 32bit integer: %m", v);
-+ return log_error_errno(r, LOG_ERR_FMT("Failed to parse '%s' as unsigned 32bit integer", r, v));
++ return log_error_errno(r, "Failed to parse '%s' as unsigned 32bit integer", v);
r = sd_bus_message_append_basic(m, t, &z);
break;
@@ -213,7 +213,7 @@ $NetBSD$
r = safe_atoi64(v, &z);
if (r < 0)
- return log_error_errno(r, "Failed to parse '%s' as signed 64bit integer: %m", v);
-+ return log_error_errno(r, LOG_ERR_FMT("Failed to parse '%s' as signed 64bit integer", r, v));
++ return log_error_errno(r, "Failed to parse '%s' as signed 64bit integer", v);
r = sd_bus_message_append_basic(m, t, &z);
break;
@@ -222,7 +222,7 @@ $NetBSD$
r = safe_atou64(v, &z);
if (r < 0)
- return log_error_errno(r, "Failed to parse '%s' as unsigned 64bit integer: %m", v);
-+ return log_error_errno(r, LOG_ERR_FMT("Failed to parse '%s' as unsigned 64bit integer", r, v));
++ return log_error_errno(r, "Failed to parse '%s' as unsigned 64bit integer", v);
r = sd_bus_message_append_basic(m, t, &z);
break;
@@ -231,7 +231,7 @@ $NetBSD$
r = safe_atod(v, &z);
if (r < 0)
- return log_error_errno(r, "Failed to parse '%s' as double precision floating point: %m", v);
-+ return log_error_errno(r, LOG_ERR_FMT("Failed to parse '%s' as double precision floating point", r, v));
++ return log_error_errno(r, "Failed to parse '%s' as double precision floating point", v);
r = sd_bus_message_append_basic(m, t, &z);
break;
@@ -240,12 +240,12 @@ $NetBSD$
r = safe_atou32(v, &n);
if (r < 0)
- return log_error_errno(r, "Failed to parse '%s' number of array entries: %m", v);
-+ return log_error_errno(r, LOG_ERR_FMT("Failed to parse '%s' number of array entries", r, v));
++ return log_error_errno(r, "Failed to parse '%s' number of array entries", v);
r = signature_element_length(signature, &k);
if (r < 0)
- return log_error_errno(r, "Invalid array signature: %m");
-+ return log_error_errno(r, LOG_ERR_FMT("Invalid array signature", r));
++ return log_error_errno(r, "Invalid array signature");
{
unsigned i;
@@ -254,7 +254,7 @@ $NetBSD$
r = signature_element_length(signature, &k);
if (r < 0)
- return log_error_errno(r, "Invalid struct/dict entry signature: %m");
-+ return log_error_errno(r, LOG_ERR_FMT("Invalid struct/dict entry signature", r));
++ return log_error_errno(r, "Invalid struct/dict entry signature");
{
char s[k-1];
@@ -263,7 +263,7 @@ $NetBSD$
r = json_variant_new_unsigned(&v, b);
if (r < 0)
- return log_error_errno(r, "Failed to transform byte: %m");
-+ return log_error_errno(r, LOG_ERR_FMT("Failed to transform byte", r));
++ return log_error_errno(r, "Failed to transform byte");
break;
}
@@ -272,7 +272,7 @@ $NetBSD$
r = json_variant_new_boolean(&v, b);
if (r < 0)
- return log_error_errno(r, "Failed to transform boolean: %m");
-+ return log_error_errno(r, LOG_ERR_FMT("Failed to transform boolean", r));
++ return log_error_errno(r, "Failed to transform boolean");
break;
}
@@ -281,7 +281,7 @@ $NetBSD$
r = json_variant_new_integer(&v, b);
if (r < 0)
- return log_error_errno(r, "Failed to transform int16: %m");
-+ return log_error_errno(r, LOG_ERR_FMT("Failed to transform int16", r));
++ return log_error_errno(r, "Failed to transform int16");
break;
}
@@ -290,7 +290,7 @@ $NetBSD$
r = json_variant_new_unsigned(&v, b);
if (r < 0)
- return log_error_errno(r, "Failed to transform uint16: %m");
-+ return log_error_errno(r, LOG_ERR_FMT("Failed to transform uint16", r));
++ return log_error_errno(r, "Failed to transform uint16");
break;
}
@@ -299,7 +299,7 @@ $NetBSD$
r = json_variant_new_integer(&v, b);
if (r < 0)
- return log_error_errno(r, "Failed to transform int32: %m");
-+ return log_error_errno(r, LOG_ERR_FMT("Failed to transform int32", r));
++ return log_error_errno(r, "Failed to transform int32");
break;
}
@@ -308,7 +308,7 @@ $NetBSD$
r = json_variant_new_unsigned(&v, b);
if (r < 0)
- return log_error_errno(r, "Failed to transform uint32: %m");
-+ return log_error_errno(r, LOG_ERR_FMT("Failed to transform uint32", r));
++ return log_error_errno(r, "Failed to transform uint32");
break;
}
@@ -317,7 +317,7 @@ $NetBSD$
r = json_variant_new_integer(&v, b);
if (r < 0)
- return log_error_errno(r, "Failed to transform int64: %m");
-+ return log_error_errno(r, LOG_ERR_FMT("Failed to transform int64", r));
++ return log_error_errno(r, "Failed to transform int64");
break;
}
@@ -326,7 +326,7 @@ $NetBSD$
r = json_variant_new_unsigned(&v, b);
if (r < 0)
- return log_error_errno(r, "Failed to transform uint64: %m");
-+ return log_error_errno(r, LOG_ERR_FMT("Failed to transform uint64", r));
++ return log_error_errno(r, "Failed to transform uint64");
break;
}
@@ -335,7 +335,7 @@ $NetBSD$
r = json_variant_new_real(&v, d);
if (r < 0)
- return log_error_errno(r, "Failed to transform double: %m");
-+ return log_error_errno(r, LOG_ERR_FMT("Failed to transform double", r));
++ return log_error_errno(r, "Failed to transform double");
break;
}
@@ -344,7 +344,7 @@ $NetBSD$
r = json_variant_new_string(&v, s);
if (r < 0)
- return log_error_errno(r, "Failed to transform double: %m");
-+ return log_error_errno(r, LOG_ERR_FMT("Failed to transform double", r));
++ return log_error_errno(r, "Failed to transform double");
break;
}
@@ -353,7 +353,7 @@ $NetBSD$
r = json_variant_new_null(&v);
if (r < 0)
- return log_error_errno(r, "Failed to transform fd: %m");
-+ return log_error_errno(r, LOG_ERR_FMT("Failed to transform fd", r));
++ return log_error_errno(r, "Failed to transform fd");
break;
@@ -362,7 +362,7 @@ $NetBSD$
r = sd_bus_send(bus, m, NULL);
if (r < 0)
- return log_error_errno(r, "Failed to send message: %m");
-+ return log_error_errno(r, LOG_ERR_FMT("Failed to send message", r));
++ return log_error_errno(r, "Failed to send message");
return 0;
}
@@ -371,7 +371,7 @@ $NetBSD$
r = parse_boolean(optarg);
if (r < 0)
- return log_error_errno(r, "Failed to parse --expect-reply= parameter '%s': %m", optarg);
-+ return log_error_errno(r, LOG_ERR_FMT("Failed to parse --expect-reply= parameter '%s'", r, optarg));
++ return log_error_errno(r, "Failed to parse --expect-reply= parameter '%s'", optarg);
arg_expect_reply = r;
break;
@@ -380,7 +380,7 @@ $NetBSD$
r = parse_boolean(optarg);
if (r < 0)
- return log_error_errno(r, "Failed to parse --auto-start= parameter '%s': %m", optarg);
-+ return log_error_errno(r, LOG_ERR_FMT("Failed to parse --auto-start= parameter '%s'", r, optarg));
++ return log_error_errno(r, "Failed to parse --auto-start= parameter '%s'", optarg);
arg_auto_start = r;
break;
@@ -389,7 +389,7 @@ $NetBSD$
r = parse_boolean(optarg);
if (r < 0)
- return log_error_errno(r, "Failed to parse --allow-interactive-authorization= parameter '%s': %m", optarg);
-+ return log_error_errno(r, LOG_ERR_FMT("Failed to parse --allow-interactive-authorization= parameter '%s'", r, optarg));
++ return log_error_errno(r, "Failed to parse --allow-interactive-authorization= parameter '%s'", optarg);
arg_allow_interactive_authorization = r;
break;
@@ -398,7 +398,7 @@ $NetBSD$
r = parse_sec(optarg, &arg_timeout);
if (r < 0)
- return log_error_errno(r, "Failed to parse --timeout= parameter '%s': %m", optarg);
-+ return log_error_errno(r, LOG_ERR_FMT("Failed to parse --timeout= parameter '%s'", r, optarg));
++ return log_error_errno(r, "Failed to parse --timeout= parameter '%s'", optarg);
break;
@@ -406,7 +406,7 @@ $NetBSD$
r = parse_boolean(optarg);
if (r < 0)
- return log_error_errno(r, "Failed to parse --augment-creds= parameter '%s': %m", optarg);
-+ return log_error_errno(r, LOG_ERR_FMT("Failed to parse --augment-creds= parameter '%s'", r, optarg));
++ return log_error_errno(r, "Failed to parse --augment-creds= parameter '%s'", optarg);
arg_augment_creds = r;
break;
@@ -415,7 +415,7 @@ $NetBSD$
r = parse_boolean(optarg);
if (r < 0)
- return log_error_errno(r, "Failed to parse --watch-bind= parameter '%s': %m", optarg);
-+ return log_error_errno(r, LOG_ERR_FMT("Failed to parse --watch-bind= parameter '%s'", r, optarg));
++ return log_error_errno(r, "Failed to parse --watch-bind= parameter '%s'", optarg);
arg_watch_bind = r;
break;
diff --git a/basu/patches/patch-src_libsystemd_libsystemd.sym b/basu/patches/patch-src_libsystemd_libsystemd.sym
new file mode 100644
index 0000000000..c91e9fef03
--- /dev/null
+++ b/basu/patches/patch-src_libsystemd_libsystemd.sym
@@ -0,0 +1,16 @@
+$NetBSD$
+
+* Drop unused symbols from version script (from upstream)
+
+--- src/libsystemd/libsystemd.sym.orig 2022-12-16 11:13:02.000000000 +0100
++++ src/libsystemd/libsystemd.sym
+@@ -72,9 +72,6 @@ global:
+ sd_bus_get_current_message;
+ sd_bus_get_current_handler;
+ sd_bus_get_current_userdata;
+- sd_bus_attach_event;
+- sd_bus_detach_event;
+- sd_bus_get_event;
+ sd_bus_add_filter;
+ sd_bus_add_match;
+ sd_bus_add_object;
diff --git a/basu/patches/patch-src_libsystemd_sd-bus_bus-control.c b/basu/patches/patch-src_libsystemd_sd-bus_bus-control.c
deleted file mode 100644
index ec698104c7..0000000000
--- a/basu/patches/patch-src_libsystemd_sd-bus_bus-control.c
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD$
-
-* On NetBSD ucred is unpcbid
-
---- src/libsystemd/sd-bus/bus-control.c.orig 2025-12-11 10:18:56.189627357 +0000
-+++ src/libsystemd/sd-bus/bus-control.c
-@@ -743,6 +743,22 @@ _public_ int sd_bus_get_owner_creds(sd_b
- return -ENOMEM;
-
- if (bus->ucred_valid) {
-+#if defined(__NetBSD__)
-+ if (pid_is_valid(bus->ucred.unp_pid)) {
-+ pid = c->pid = bus->ucred.unp_pid;
-+ c->mask |= SD_BUS_CREDS_PID & mask;
-+ }
-+
-+ if (uid_is_valid(bus->ucred.unp_euid)) {
-+ c->euid = bus->ucred.unp_euid;
-+ c->mask |= SD_BUS_CREDS_EUID & mask;
-+ }
-+
-+ if (gid_is_valid(bus->ucred.unp_egid)) {
-+ c->egid = bus->ucred.unp_egid;
-+ c->mask |= SD_BUS_CREDS_EGID & mask;
-+ }
-+#else
- if (pid_is_valid(bus->ucred.pid)) {
- pid = c->pid = bus->ucred.pid;
- c->mask |= SD_BUS_CREDS_PID & mask;
-@@ -757,6 +773,7 @@ _public_ int sd_bus_get_owner_creds(sd_b
- c->egid = bus->ucred.gid;
- c->mask |= SD_BUS_CREDS_EGID & mask;
- }
-+#endif
- }
-
- if (do_label) {
diff --git a/basu/patches/patch-src_libsystemd_sd-bus_bus-dump.c b/basu/patches/patch-src_libsystemd_sd-bus_bus-dump.c
index d25d158db0..80badcf70f 100644
--- a/basu/patches/patch-src_libsystemd_sd-bus_bus-dump.c
+++ b/basu/patches/patch-src_libsystemd_sd-bus_bus-dump.c
@@ -2,14 +2,14 @@ $NetBSD$
* Fix logging, on NetBSD %m is only allowed in syslog(3) like function
---- src/libsystemd/sd-bus/bus-dump.c.orig 2025-12-11 10:50:35.716500038 +0000
+--- src/libsystemd/sd-bus/bus-dump.c.orig 2022-12-16 11:13:02.000000000 +0100
+++ src/libsystemd/sd-bus/bus-dump.c
@@ -121,7 +121,7 @@ int bus_message_dump(sd_bus_message *m,
r = sd_bus_message_rewind(m, !(flags & BUS_MESSAGE_DUMP_SUBTREE_ONLY));
if (r < 0)
- return log_error_errno(r, "Failed to rewind: %m");
-+ return log_error_errno(r, LOG_ERR_FMT("Failed to rewind", r));
++ return log_error_errno(r, "Failed to rewind");
if (!(flags & BUS_MESSAGE_DUMP_SUBTREE_ONLY)) {
_cleanup_free_ char *prefix = NULL;
@@ -18,7 +18,7 @@ $NetBSD$
r = sd_bus_message_peek_type(m, &type, &contents);
if (r < 0)
- return log_error_errno(r, "Failed to peek type: %m");
-+ return log_error_errno(r, LOG_ERR_FMT("Failed to peek type", r));
++ return log_error_errno(r, "Failed to peek type");
if (r == 0) {
if (level <= 1)
@@ -27,7 +27,7 @@ $NetBSD$
r = sd_bus_message_exit_container(m);
if (r < 0)
- return log_error_errno(r, "Failed to exit container: %m");
-+ return log_error_errno(r, LOG_ERR_FMT("Failed to exit container", r));
++ return log_error_errno(r, "Failed to exit container");
level--;
@@ -36,7 +36,7 @@ $NetBSD$
r = sd_bus_message_enter_container(m, type, contents);
if (r < 0)
- return log_error_errno(r, "Failed to enter container: %m");
-+ return log_error_errno(r, LOG_ERR_FMT("Failed to enter container", r));
++ return log_error_errno(r, "Failed to enter container");
if (type == SD_BUS_TYPE_ARRAY)
fprintf(f, "%sARRAY \"%s\" {\n", prefix, contents);
@@ -45,7 +45,7 @@ $NetBSD$
r = sd_bus_message_read_basic(m, type, &basic);
if (r < 0)
- return log_error_errno(r, "Failed to get basic: %m");
-+ return log_error_errno(r, LOG_ERR_FMT("Failed to get basic", r));
++ return log_error_errno(r, "Failed to get basic");
assert(r > 0);
diff --git a/basu/patches/patch-src_libsystemd_sd-bus_bus-gvariant.c b/basu/patches/patch-src_libsystemd_sd-bus_bus-gvariant.c
index 4636828406..8b5380aba1 100644
--- a/basu/patches/patch-src_libsystemd_sd-bus_bus-gvariant.c
+++ b/basu/patches/patch-src_libsystemd_sd-bus_bus-gvariant.c
@@ -2,7 +2,7 @@ $NetBSD$
* NetBSD support
---- src/libsystemd/sd-bus/bus-gvariant.c.orig 2022-12-16 10:13:02.000000000 +0000
+--- src/libsystemd/sd-bus/bus-gvariant.c.orig 2022-12-16 11:13:02.000000000 +0100
+++ src/libsystemd/sd-bus/bus-gvariant.c
@@ -2,6 +2,8 @@
diff --git a/basu/patches/patch-src_libsystemd_sd-bus_bus-message.h b/basu/patches/patch-src_libsystemd_sd-bus_bus-message.h
index 8d7328dca3..af72933a07 100644
--- a/basu/patches/patch-src_libsystemd_sd-bus_bus-message.h
+++ b/basu/patches/patch-src_libsystemd_sd-bus_bus-message.h
@@ -1,8 +1,8 @@
$NetBSD$
-* Add NetBSD support
+* NetBSD support
---- src/libsystemd/sd-bus/bus-message.h.orig 2022-12-16 10:13:02.000000000 +0000
+--- src/libsystemd/sd-bus/bus-message.h.orig 2022-12-16 11:13:02.000000000 +0100
+++ src/libsystemd/sd-bus/bus-message.h
@@ -3,6 +3,8 @@
diff --git a/basu/patches/patch-src_libsystemd_sd-bus_bus-protocol.h b/basu/patches/patch-src_libsystemd_sd-bus_bus-protocol.h
index 20662fdc8f..19215850d1 100644
--- a/basu/patches/patch-src_libsystemd_sd-bus_bus-protocol.h
+++ b/basu/patches/patch-src_libsystemd_sd-bus_bus-protocol.h
@@ -1,17 +1,17 @@
$NetBSD$
-* Add NetBSD support
+* NetBSD support
---- src/libsystemd/sd-bus/bus-protocol.h.orig 2022-12-16 10:13:02.000000000 +0000
+--- src/libsystemd/sd-bus/bus-protocol.h.orig 2022-12-16 11:13:02.000000000 +0100
+++ src/libsystemd/sd-bus/bus-protocol.h
@@ -46,7 +46,9 @@ enum {
_BUS_INVALID_ENDIAN = 0,
BUS_LITTLE_ENDIAN = 'l',
BUS_BIG_ENDIAN = 'B',
-#if (defined(__FreeBSD__) && _BYTE_ORDER == _BIG_ENDIAN) || (defined(__linux__) && __BYTE_ORDER == __BIG_ENDIAN)
-+#if (defined(__FreeBSD__) && _BYTE_ORDER == _BIG_ENDIAN) \
-+ || (defined(__NetBSD__) && _BYTE_ORDER == _BIG_ENDIAN) \
-+ || (defined(__linux__) && __BYTE_ORDER == __BIG_ENDIAN)
++#if (defined(__FreeBSD__) && _BYTE_ORDER == _BIG_ENDIAN) || \
++ (defined(__linux__) && __BYTE_ORDER == __BIG_ENDIAN) || \
++ (defined(__NetBSD__) && _BYTE_ORDER == _BIG_ENDIAN)
BUS_NATIVE_ENDIAN = BUS_BIG_ENDIAN,
BUS_REVERSE_ENDIAN = BUS_LITTLE_ENDIAN
#else
diff --git a/basu/patches/patch-src_libsystemd_sd-bus_bus-socket.c b/basu/patches/patch-src_libsystemd_sd-bus_bus-socket.c
index 4809379ab9..dba93ecae3 100644
--- a/basu/patches/patch-src_libsystemd_sd-bus_bus-socket.c
+++ b/basu/patches/patch-src_libsystemd_sd-bus_bus-socket.c
@@ -1,8 +1,10 @@
$NetBSD$
-* On NetBSD ucred is unpcbid
+* Fix logging, on NetBSD %m is only allowed in syslog(3) like function
+* sendmsg() with a SOL_SOCKET/SCM_CREDS message EINVAL on NetBSD
---- src/libsystemd/sd-bus/bus-socket.c.orig 2022-12-16 10:13:02.000000000 +0000
+
+--- src/libsystemd/sd-bus/bus-socket.c.orig 2022-12-16 11:13:02.000000000 +0100
+++ src/libsystemd/sd-bus/bus-socket.c
@@ -20,6 +20,11 @@
#include "user-util.h"
@@ -16,76 +18,72 @@ $NetBSD$
#define SNDBUF_SIZE (8*1024*1024)
static void iovec_advance(struct iovec iov[], unsigned *idx, size_t size) {
-@@ -129,6 +134,9 @@ static int bus_socket_write_null_byte(sd
+@@ -119,6 +124,9 @@ bool bus_socket_auth_needs_write(sd_bus
+ }
+
+ static int bus_socket_write_null_byte(sd_bus *b) {
++ struct msghdr mh;
++ zero(mh);
++
+ #if defined(__linux__)
+ #define SOCKET_CRED_OPTION SCM_CREDENTIALS
+ struct ucred creds;
+@@ -129,19 +137,20 @@ static int bus_socket_write_null_byte(sd
#elif defined(__FreeBSD__)
#define SOCKET_CRED_OPTION SCM_CREDS
struct cmsgcred creds = { 0 };
+#elif defined(__NetBSD__)
-+#define SOCKET_CRED_OPTION SCM_CREDS
-+ struct unpcbid creds = { 0 };
++ mh.msg_control = NULL;
++ mh.msg_controllen = 0;
#else
#error auth not implemented for this OS
#endif
-@@ -344,8 +352,13 @@ static int verify_external_token(sd_bus
-
- /* We ignore the passed value if anonymous authentication is
- * on anyway. */
-+#if defined(__NetBSD__)
-+ if (!b->anonymous_auth && u != b->ucred.unp_euid)
-+ return 0;
-+#else
- if (!b->anonymous_auth && u != b->ucred.uid)
- return 0;
-+#endif
- return 1;
- }
-@@ -537,6 +550,19 @@ static int bus_socket_process_creds(sd_b
- b->ucred.gid = creds.cmcred_gid;
- b->ucred_valid = true;
- return 0;
-+#elif defined(__NetBSD__)
-+ if (cmsg->cmsg_level != SOL_SOCKET ||
-+ cmsg->cmsg_type != SCM_CREDS) {
-+ return -ENOSYS;
-+ }
-+ struct unpcbid creds;
-+ memcpy(&creds, CMSG_DATA(cmsg), sizeof(struct unpcbid));
-+
-+ b->ucred.unp_pid = creds.unp_pid;
-+ b->ucred.unp_euid = creds.unp_euid;
-+ b->ucred.unp_egid = creds.unp_egid;
-+ b->ucred_valid = true;
-+ return 0;
- #else
- return -ENOSYS;
- #endif
-@@ -556,6 +582,8 @@ static int bus_socket_read_auth(sd_bus *
- char creds[CMSG_SPACE(sizeof(struct ucred))];
- #elif defined(__FreeBSD__)
- char creds[CMSG_SPACE(sizeof(struct cmsgcred))];
-+#elif defined(__NetBSD__)
-+ char creds[CMSG_SPACE(sizeof(struct unpcbid))];
- #endif
++#if !defined(__NetBSD__)
+ union {
+ struct cmsghdr hdr;
+ uint8_t buf[CMSG_SPACE(sizeof(creds))];
} control;
+ memset(control.buf, 0, sizeof(control.buf));
-@@ -617,7 +645,7 @@ static int bus_socket_read_auth(sd_bus *
+- struct msghdr mh;
+- zero(mh);
+-
+ mh.msg_control = control.buf;
+ mh.msg_controllen = sizeof(control.buf);
+
+@@ -150,6 +159,7 @@ static int bus_socket_write_null_byte(sd
+ cmsgp->cmsg_level = SOL_SOCKET;
+ cmsgp->cmsg_type = SOCKET_CRED_OPTION;
+ memcpy(CMSG_DATA(cmsgp), &creds, sizeof(creds));
++#endif
+
+ struct iovec iov;
+ mh.msg_iov = &iov;
+@@ -617,7 +627,7 @@ static int bus_socket_read_auth(sd_bus *
log_debug("Got unexpected auxiliary data with level=%d and type=%d",
cmsg->cmsg_level, cmsg->cmsg_type);
else if (r < 0)
- log_error_errno(r, "Could not process credentials: %m");
-+ log_error_errno(r, LOG_ERR_FMT("Could not process credentials", r));
++ log_error_errno(r, "Could not process credentials");
}
r = bus_socket_auth_verify(b);
-@@ -658,15 +686,15 @@ static void bus_get_peercred(sd_bus *b)
+@@ -650,7 +660,7 @@ static void bus_get_peercred(sd_bus *b)
+ int optval = 1;
+ r = setsockopt(b->output_fd, SOL_SOCKET, SO_PASSCRED, &optval, sizeof(optval));
+ if (r < 0)
+- log_debug_errno(r, "Failed to set SO_PASSCRED: %m");
++ log_debug_errno(r, "Failed to set SO_PASSCRED");
+ #endif
+ /* Get the peer for socketpair() sockets */
+@@ -659,14 +669,14 @@ static void bus_get_peercred(sd_bus *b)
/* Get the SELinux context of the peer */
r = getpeersec(b->input_fd, &b->label);
-- if (r < 0 && !IN_SET(r, -EOPNOTSUPP, -ENOPROTOOPT))
+ if (r < 0 && !IN_SET(r, -EOPNOTSUPP, -ENOPROTOOPT))
- log_debug_errno(r, "Failed to determine peer security context: %m");
-+ if (r < 0 && !IN_SET(r, -EOPNOTSUPP, -ENOPROTOOPT))
-+ log_debug_errno(r, LOG_ERR_FMT("Failed to determine peer security context", r));
++ log_debug_errno(r, "Failed to determine peer security context");
/* Get the list of auxiliary groups of the peer */
r = getpeergroups(b->input_fd, &b->groups);
@@ -93,7 +91,7 @@ $NetBSD$
b->n_groups = (size_t) r;
else if (!IN_SET(r, -EOPNOTSUPP, -ENOPROTOOPT))
- log_debug_errno(r, "Failed to determine peer's group list: %m");
-+ log_debug_errno(r, LOG_ERR_FMT("Failed to determine peer's group list", r));
++ log_debug_errno(r, "Failed to determine peer's group list");
}
static int bus_socket_start_auth_client(sd_bus *b) {
diff --git a/basu/patches/patch-src_libsystemd_sd-bus_bus-track.c b/basu/patches/patch-src_libsystemd_sd-bus_bus-track.c
index 88788e7813..f1cbdf48a6 100644
--- a/basu/patches/patch-src_libsystemd_sd-bus_bus-track.c
+++ b/basu/patches/patch-src_libsystemd_sd-bus_bus-track.c
@@ -2,14 +2,14 @@ $NetBSD$
* Fix logging, on NetBSD %m is only allowed in syslog(3) like function
---- src/libsystemd/sd-bus/bus-track.c.orig 2025-12-11 10:48:49.464837646 +0000
+--- src/libsystemd/sd-bus/bus-track.c.orig 2022-12-16 11:13:02.000000000 +0100
+++ src/libsystemd/sd-bus/bus-track.c
@@ -373,7 +373,7 @@ void bus_track_dispatch(sd_bus_track *tr
r = track->handler(track, track->userdata);
if (r < 0)
- log_debug_errno(r, "Failed to process track handler: %m");
-+ log_debug_errno(r, LOG_ERR_FMT("Failed to process track handler", r));
++ log_debug_errno(r, "Failed to process track handler");
else if (r == 0)
bus_track_add_to_queue(track);
diff --git a/basu/patches/patch-src_libsystemd_sd-bus_test-bus-chat.c b/basu/patches/patch-src_libsystemd_sd-bus_test-bus-chat.c
index ba263a2570..23f1ab46c5 100644
--- a/basu/patches/patch-src_libsystemd_sd-bus_test-bus-chat.c
+++ b/basu/patches/patch-src_libsystemd_sd-bus_test-bus-chat.c
@@ -2,14 +2,14 @@ $NetBSD$
* Fix logging, on NetBSD %m is only allowed in syslog(3) like function
---- src/libsystemd/sd-bus/test-bus-chat.c.orig 2025-12-11 11:56:24.257167499 +0000
+--- src/libsystemd/sd-bus/test-bus-chat.c.orig 2022-12-16 11:13:02.000000000 +0100
+++ src/libsystemd/sd-bus/test-bus-chat.c
@@ -30,7 +30,7 @@ static int object_callback(sd_bus_messag
r = sd_bus_reply_method_return(m, NULL);
if (r < 0)
- return log_error_errno(r, "Failed to send reply: %m");
-+ return log_error_errno(r, LOG_ERR_FMT("Failed to send reply", r));
++ return log_error_errno(r, "Failed to send reply");
return 1;
}
@@ -18,21 +18,21 @@ $NetBSD$
r = sd_bus_open_user_with_description(&bus, "my bus!");
if (r < 0) {
- log_error_errno(r, "Failed to connect to user bus: %m");
-+ log_error_errno(r, LOG_ERR_FMT("Failed to connect to user bus", r));
++ log_error_errno(r, "Failed to connect to user bus");
goto fail;
}
r = sd_bus_get_bus_id(bus, &id);
if (r < 0) {
- log_error_errno(r, "Failed to get server ID: %m");
-+ log_error_errno(r, LOG_ERR_FMT("Failed to get server ID", r));
++ log_error_errno(r, "Failed to get server ID");
goto fail;
}
r = sd_bus_get_unique_name(bus, &unique);
if (r < 0) {
- log_error_errno(r, "Failed to get unique name: %m");
-+ log_error_errno(r, LOG_ERR_FMT("Failed to get unique name", r));
++ log_error_errno(r, "Failed to get unique name");
goto fail;
}
@@ -41,28 +41,28 @@ $NetBSD$
r = sd_bus_request_name(bus, "org.freedesktop.systemd.test", 0);
if (r < 0) {
- log_error_errno(r, "Failed to acquire name: %m");
-+ log_error_errno(r, LOG_ERR_FMT("Failed to acquire name", r));
++ log_error_errno(r, "Failed to acquire name");
goto fail;
}
r = sd_bus_add_fallback(bus, NULL, "/foo/bar", object_callback, NULL);
if (r < 0) {
- log_error_errno(r, "Failed to add object: %m");
-+ log_error_errno(r, LOG_ERR_FMT("Failed to add object", r));
++ log_error_errno(r, "Failed to add object");
goto fail;
}
r = sd_bus_match_signal(bus, NULL, NULL, NULL, "foo.bar", "Notify", match_callback, NULL);
if (r < 0) {
- log_error_errno(r, "Failed to request match: %m");
-+ log_error_errno(r, LOG_ERR_FMT("Failed to request match", r));
++ log_error_errno(r, "Failed to request match");
goto fail;
}
r = sd_bus_add_match(bus, NULL, "type='signal',interface='org.freedesktop.DBus',member='NameOwnerChanged'", match_callback, NULL);
if (r < 0) {
- log_error_errno(r, "Failed to add match: %m");
-+ log_error_errno(r, LOG_ERR_FMT("Failed to add match", r));
++ log_error_errno(r, "Failed to add match");
goto fail;
}
@@ -71,7 +71,7 @@ $NetBSD$
r = sd_bus_process(bus, &m);
if (r < 0) {
- log_error_errno(r, "Failed to process requests: %m");
-+ log_error_errno(r, LOG_ERR_FMT("Failed to process requests", r));
++ log_error_errno(r, "Failed to process requests");
goto fail;
}
@@ -79,7 +79,7 @@ $NetBSD$
r = sd_bus_wait(bus, (uint64_t) -1);
if (r < 0) {
- log_error_errno(r, "Failed to wait: %m");
-+ log_error_errno(r, LOG_ERR_FMT("Failed to wait", r));
++ log_error_errno(r, "Failed to wait");
goto fail;
}
@@ -88,7 +88,7 @@ $NetBSD$
r = sd_bus_message_read(m, "s", &hello);
if (r < 0) {
- log_error_errno(r, "Failed to get parameter: %m");
-+ log_error_errno(r, LOG_ERR_FMT("Failed to get parameter", r));
++ log_error_errno(r, "Failed to get parameter");
goto fail;
}
@@ -97,7 +97,7 @@ $NetBSD$
r = sd_bus_reply_method_return(m, "s", lowercase);
if (r < 0) {
- log_error_errno(r, "Failed to send reply: %m");
-+ log_error_errno(r, LOG_ERR_FMT("Failed to send reply", r));
++ log_error_errno(r, "Failed to send reply");
goto fail;
}
} else if (sd_bus_message_is_method_call(m, "org.freedesktop.systemd.test", "ExitClient1")) {
@@ -105,7 +105,7 @@ $NetBSD$
r = sd_bus_reply_method_return(m, NULL);
if (r < 0) {
- log_error_errno(r, "Failed to send reply: %m");
-+ log_error_errno(r, LOG_ERR_FMT("Failed to send reply", r));
++ log_error_errno(r, "Failed to send reply");
goto fail;
}
@@ -114,7 +114,7 @@ $NetBSD$
r = sd_bus_reply_method_return(m, NULL);
if (r < 0) {
- log_error_errno(r, "Failed to send reply: %m");
-+ log_error_errno(r, LOG_ERR_FMT("Failed to send reply", r));
++ log_error_errno(r, "Failed to send reply");
goto fail;
}
@@ -123,7 +123,7 @@ $NetBSD$
r = sd_bus_reply_method_return(m, NULL);
if (r < 0) {
- log_error_errno(r, "Failed to send reply: %m");
-+ log_error_errno(r, LOG_ERR_FMT("Failed to send reply", r));
++ log_error_errno(r, "Failed to send reply");
goto fail;
}
@@ -132,7 +132,7 @@ $NetBSD$
r = sd_bus_message_read(m, "h", &fd);
if (r < 0) {
- log_error_errno(r, "Failed to get parameter: %m");
-+ log_error_errno(r, LOG_ERR_FMT("Failed to get parameter", r));
++ log_error_errno(r, "Failed to get parameter");
goto fail;
}
@@ -140,7 +140,7 @@ $NetBSD$
if (write(fd, &x, 1) < 0) {
- log_error_errno(errno, "Failed to write to fd: %m");
-+ log_error_errno(errno, LOG_ERR_FMT("Failed to write to fd", r));
++ log_error_errno(errno, "Failed to write to fd");
safe_close(fd);
goto fail;
}
@@ -148,7 +148,7 @@ $NetBSD$
r = sd_bus_reply_method_return(m, NULL);
if (r < 0) {
- log_error_errno(r, "Failed to send reply: %m");
-+ log_error_errno(r, LOG_ERR_FMT("Failed to send reply", r));
++ log_error_errno(r, "Failed to send reply");
goto fail;
}
@@ -157,7 +157,7 @@ $NetBSD$
&SD_BUS_ERROR_MAKE_CONST(SD_BUS_ERROR_UNKNOWN_METHOD, "Unknown method."));
if (r < 0) {
- log_error_errno(r, "Failed to send reply: %m");
-+ log_error_errno(r, LOG_ERR_FMT("Failed to send reply", r));
++ log_error_errno(r, "Failed to send reply");
goto fail;
}
}
@@ -166,7 +166,7 @@ $NetBSD$
r = sd_bus_open_user(&bus);
if (r < 0) {
- log_error_errno(r, "Failed to connect to user bus: %m");
-+ log_error_errno(r, LOG_ERR_FMT("Failed to connect to user bus", r));
++ log_error_errno(r, "Failed to connect to user bus");
goto finish;
}
@@ -175,14 +175,14 @@ $NetBSD$
"HELLO");
if (r < 0) {
- log_error_errno(r, "Failed to issue method call: %m");
-+ log_error_errno(r, LOG_ERR_FMT("Failed to issue method call", r));
++ log_error_errno(r, "Failed to issue method call");
goto finish;
}
r = sd_bus_message_read(reply, "s", &hello);
if (r < 0) {
- log_error_errno(r, "Failed to get string: %m");
-+ log_error_errno(r, LOG_ERR_FMT("Failed to get string", r));
++ log_error_errno(r, "Failed to get string");
goto finish;
}
@@ -190,7 +190,7 @@ $NetBSD$
if (pipe2(pp, O_CLOEXEC|O_NONBLOCK) < 0) {
- log_error_errno(errno, "Failed to allocate pipe: %m");
-+ log_error_errno(errno, LOG_ERR_FMT("Failed to allocate pipe", errno));
++ log_error_errno(errno, "Failed to allocate pipe");
r = -errno;
goto finish;
}
@@ -199,7 +199,7 @@ $NetBSD$
pp[1]);
if (r < 0) {
- log_error_errno(r, "Failed to issue method call: %m");
-+ log_error_errno(r, LOG_ERR_FMT("Failed to issue method call", r));
++ log_error_errno(r, "Failed to issue method call");
goto finish;
}
@@ -208,7 +208,7 @@ $NetBSD$
"ExitClient1");
if (r < 0)
- log_error_errno(r, "Failed to allocate method call: %m");
-+ log_error_errno(r, LOG_ERR_FMT("Failed to allocate method call", r));
++ log_error_errno(r, "Failed to allocate method call");
else
sd_bus_send(bus, q, NULL);
@@ -217,7 +217,7 @@ $NetBSD$
bool *x = userdata;
- log_error_errno(sd_bus_message_get_errno(m), "Quit callback: %m");
-+ log_error_errno(sd_bus_message_get_errno(m), LOG_ERR_FMT("Quit callback", sd_bus_message_get_errno(m)));
++ log_error_errno(sd_bus_message_get_errno(m), "Quit callback");
*x = 1;
return 1;
@@ -226,7 +226,7 @@ $NetBSD$
r = sd_bus_open_user(&bus);
if (r < 0) {
- log_error_errno(r, "Failed to connect to user bus: %m");
-+ log_error_errno(r, LOG_ERR_FMT("Failed to connect to user bus", r));
++ log_error_errno(r, "Failed to connect to user bus");
goto finish;
}
@@ -235,7 +235,7 @@ $NetBSD$
"Foobar");
if (r < 0) {
- log_error_errno(r, "Failed to allocate method call: %m");
-+ log_error_errno(r, LOG_ERR_FMT("Failed to allocate method call", r));
++ log_error_errno(r, "Failed to allocate method call");
goto finish;
}
@@ -244,7 +244,7 @@ $NetBSD$
"Notify");
if (r < 0) {
- log_error_errno(r, "Failed to allocate signal: %m");
-+ log_error_errno(r, LOG_ERR_FMT("Failed to allocate signal", r));
++ log_error_errno(r, "Failed to allocate signal");
goto finish;
}
@@ -253,7 +253,7 @@ $NetBSD$
"GetMachineId");
if (r < 0) {
- log_error_errno(r, "Failed to allocate method call: %m");
-+ log_error_errno(r, LOG_ERR_FMT("Failed to allocate method call", r));
++ log_error_errno(r, "Failed to allocate method call");
goto finish;
}
@@ -262,7 +262,7 @@ $NetBSD$
r = sd_bus_message_read(reply, "s", &mid);
if (r < 0) {
- log_error_errno(r, "Failed to parse machine ID: %m");
-+ log_error_errno(r, LOG_ERR_FMT("Failed to parse machine ID", r));
++ log_error_errno(r, "Failed to parse machine ID");
goto finish;
}
@@ -271,7 +271,7 @@ $NetBSD$
"Slow");
if (r < 0) {
- log_error_errno(r, "Failed to allocate method call: %m");
-+ log_error_errno(r, LOG_ERR_FMT("Failed to allocate method call", r));
++ log_error_errno(r, "Failed to allocate method call");
goto finish;
}
@@ -280,7 +280,7 @@ $NetBSD$
"Slow");
if (r < 0) {
- log_error_errno(r, "Failed to allocate method call: %m");
-+ log_error_errno(r, LOG_ERR_FMT("Failed to allocate method call", r));
++ log_error_errno(r, "Failed to allocate method call");
goto finish;
}
@@ -289,14 +289,14 @@ $NetBSD$
r = sd_bus_process(bus, NULL);
if (r < 0) {
- log_error_errno(r, "Failed to process requests: %m");
-+ log_error_errno(r, LOG_ERR_FMT("Failed to process requests", r));
++ log_error_errno(r, "Failed to process requests");
goto finish;
}
if (r == 0) {
r = sd_bus_wait(bus, (uint64_t) -1);
if (r < 0) {
- log_error_errno(r, "Failed to wait: %m");
-+ log_error_errno(r, LOG_ERR_FMT("Failed to wait", r));
++ log_error_errno(r, "Failed to wait");
goto finish;
}
}
@@ -305,7 +305,7 @@ $NetBSD$
"ExitClient2");
if (r < 0) {
- log_error_errno(r, "Failed to allocate method call: %m");
-+ log_error_errno(r, LOG_ERR_FMT("Failed to allocate method call", r));
++ log_error_errno(r, "Failed to allocate method call");
goto finish;
}
diff --git a/basu/patches/patch-src_libsystemd_sd-bus_test-bus-creds.c b/basu/patches/patch-src_libsystemd_sd-bus_test-bus-creds.c
index cb256c2425..1de9f5412c 100644
--- a/basu/patches/patch-src_libsystemd_sd-bus_test-bus-creds.c
+++ b/basu/patches/patch-src_libsystemd_sd-bus_test-bus-creds.c
@@ -2,14 +2,14 @@ $NetBSD$
* Fix logging, on NetBSD %m is only allowed in syslog(3) like function
---- src/libsystemd/sd-bus/test-bus-creds.c.orig 2025-12-11 12:18:32.959056564 +0000
+--- src/libsystemd/sd-bus/test-bus-creds.c.orig 2022-12-16 11:13:02.000000000 +0100
+++ src/libsystemd/sd-bus/test-bus-creds.c
@@ -14,7 +14,7 @@ int main(int argc, char *argv[]) {
test_setup_logging(LOG_DEBUG);
r = sd_bus_creds_new_from_pid(&creds, 0, _SD_BUS_CREDS_ALL);
- log_full_errno(r < 0 ? LOG_ERR : LOG_DEBUG, r, "sd_bus_creds_new_from_pid: %m");
-+ log_full_errno(r < 0 ? LOG_ERR : LOG_DEBUG, r, LOG_ERR_FMT("sd_bus_creds_new_from_pid", r));
++ log_full_errno(r < 0 ? LOG_ERR : LOG_DEBUG, r, "sd_bus_creds_new_from_pid");
assert_se(r >= 0);
bus_creds_dump(creds, NULL, true);
diff --git a/basu/patches/patch-src_libsystemd_sd-bus_test-bus-objects.c b/basu/patches/patch-src_libsystemd_sd-bus_test-bus-objects.c
index 42fb5969c0..6539c3da7a 100644
--- a/basu/patches/patch-src_libsystemd_sd-bus_test-bus-objects.c
+++ b/basu/patches/patch-src_libsystemd_sd-bus_test-bus-objects.c
@@ -2,14 +2,14 @@ $NetBSD$
* Fix logging, on NetBSD %m is only allowed in syslog(3) like function
---- src/libsystemd/sd-bus/test-bus-objects.c.orig 2025-12-11 12:20:54.789852232 +0000
+--- src/libsystemd/sd-bus/test-bus-objects.c.orig 2022-12-16 11:13:02.000000000 +0100
+++ src/libsystemd/sd-bus/test-bus-objects.c
@@ -247,14 +247,14 @@ static void *server(void *p) {
r = sd_bus_process(bus, NULL);
if (r < 0) {
- log_error_errno(r, "Failed to process requests: %m");
-+ log_error_errno(r, LOG_ERR_FMT("Failed to process requests", r));
++ log_error_errno(r, "Failed to process requests");
goto fail;
}
@@ -17,7 +17,7 @@ $NetBSD$
r = sd_bus_wait(bus, (uint64_t) -1);
if (r < 0) {
- log_error_errno(r, "Failed to wait: %m");
-+ log_error_errno(r, LOG_ERR_FMT("Failed to wait", r));
++ log_error_errno(r, "Failed to wait");
goto fail;
}
diff --git a/basu/patches/patch-src_libsystemd_sd-bus_test-bus-server.c b/basu/patches/patch-src_libsystemd_sd-bus_test-bus-server.c
index 2cf03dbf16..ed8a939c3b 100644
--- a/basu/patches/patch-src_libsystemd_sd-bus_test-bus-server.c
+++ b/basu/patches/patch-src_libsystemd_sd-bus_test-bus-server.c
@@ -2,14 +2,14 @@ $NetBSD$
* Fix logging, on NetBSD %m is only allowed in syslog(3) like function
---- src/libsystemd/sd-bus/test-bus-server.c.orig 2025-12-11 11:23:13.067603048 +0000
+--- src/libsystemd/sd-bus/test-bus-server.c.orig 2022-12-16 11:13:02.000000000 +0100
+++ src/libsystemd/sd-bus/test-bus-server.c
@@ -39,14 +39,14 @@ static void *server(void *p) {
r = sd_bus_process(bus, &m);
if (r < 0) {
- log_error_errno(r, "Failed to process requests: %m");
-+ log_error_errno(r, LOG_ERR_FMT("Failed to process requests", r));
++ log_error_errno(r, "Failed to process requests");
goto fail;
}
@@ -17,7 +17,7 @@ $NetBSD$
r = sd_bus_wait(bus, (uint64_t) -1);
if (r < 0) {
- log_error_errno(r, "Failed to wait: %m");
-+ log_error_errno(r, LOG_ERR_FMT("Failed to wait", r));
++ log_error_errno(r, "Failed to wait");
goto fail;
}
@@ -26,7 +26,7 @@ $NetBSD$
r = sd_bus_message_new_method_return(m, &reply);
if (r < 0) {
- log_error_errno(r, "Failed to allocate return: %m");
-+ log_error_errno(r, LOG_ERR_FMT("Failed to allocate return", r));
++ log_error_errno(r, "Failed to allocate return");
goto fail;
}
@@ -35,7 +35,7 @@ $NetBSD$
&SD_BUS_ERROR_MAKE_CONST(SD_BUS_ERROR_UNKNOWN_METHOD, "Unknown method."));
if (r < 0) {
- log_error_errno(r, "Failed to allocate return: %m");
-+ log_error_errno(r, LOG_ERR_FMT("Failed to allocate return", r));
++ log_error_errno(r, "Failed to allocate return");
goto fail;
}
}
@@ -44,7 +44,7 @@ $NetBSD$
r = sd_bus_send(bus, reply, NULL);
if (r < 0) {
- log_error_errno(r, "Failed to send reply: %m");
-+ log_error_errno(r, LOG_ERR_FMT("Failed to send reply", r));
++ log_error_errno(r, "Failed to send reply");
goto fail;
}
}
@@ -53,7 +53,7 @@ $NetBSD$
"Exit");
if (r < 0)
- return log_error_errno(r, "Failed to allocate method call: %m");
-+ return log_error_errno(r, LOG_ERR_FMT("Failed to allocate method call", r));
++ return log_error_errno(r, "Failed to allocate method call");
r = sd_bus_call(bus, m, 0, &error, &reply);
if (r < 0)
diff --git a/basu/patches/patch-src_test_tests.c b/basu/patches/patch-src_test_tests.c
index 438baac4b8..821483bdba 100644
--- a/basu/patches/patch-src_test_tests.c
+++ b/basu/patches/patch-src_test_tests.c
@@ -1,17 +1,11 @@
$NetBSD$
-* Add NetBSD support
+* NetBSD support
* Fix logging, on NetBSD %m is only allowed in syslog(3) like function
---- src/test/tests.c.orig 2022-12-16 10:13:02.000000000 +0000
+--- src/test/tests.c.orig 2022-12-16 11:13:02.000000000 +0100
+++ src/test/tests.c
-@@ -1,12 +1,13 @@
- /* SPDX-License-Identifier: LGPL-2.1+ */
-
- #include <stdlib.h>
-+#include <string.h>
- #include <util.h>
-
+@@ -6,7 +6,7 @@
#include "env-util.h"
#include "tests.h"
@@ -20,13 +14,12 @@ $NetBSD$
#define program_invocation_short_name getprogname()
#endif
-@@ -22,7 +23,7 @@ int log_tests_skipped(const char *messag
+@@ -22,7 +22,7 @@ int log_tests_skipped(const char *messag
}
int log_tests_skipped_errno(int r, const char *message) {
- log_notice_errno(r, "%s: %s, skipping tests: %m",
-- program_invocation_short_name, message);
-+ log_notice_errno(r, LOG_ERR_FMT("%s: %s, skipping tests", r,
-+ program_invocation_short_name, message));
++ log_notice_errno(r, "%s: %s, skipping tests",
+ program_invocation_short_name, message);
return EXIT_TEST_SKIP;
}
Home |
Main Index |
Thread Index |
Old Index