1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
|
libsystemd is Linux-only, so replace with basu
--- CMakeLists.txt.orig 2021-12-22 12:17:31 UTC
+++ CMakeLists.txt
@@ -16,7 +16,7 @@ option(BUILD_LIBSYSTEMD "Build libsystemd static libra
if(NOT BUILD_LIBSYSTEMD)
find_package(PkgConfig REQUIRED)
- pkg_check_modules(Systemd IMPORTED_TARGET GLOBAL libsystemd>=236)
+ pkg_check_modules(Systemd IMPORTED_TARGET GLOBAL basu)
if(NOT TARGET PkgConfig::Systemd)
message(FATAL_ERROR "libsystemd of version at least 236 is required, but was not found "
"(if you have systemd in your OS, you may want to install package containing pkgconfig "
@@ -25,8 +25,7 @@ if(NOT BUILD_LIBSYSTEMD)
"and incorporate libsystemd as embedded library within sdbus-c++)")
endif()
add_library(Systemd::Libsystemd ALIAS PkgConfig::Systemd)
- string(REGEX MATCHALL "([0-9]+)" SYSTEMD_VERSION_LIST "${Systemd_VERSION}")
- list(GET SYSTEMD_VERSION_LIST 0 LIBSYSTEMD_VERSION)
+ set(LIBSYSTEMD_VERSION "239")
message(STATUS "Building with libsystemd v${LIBSYSTEMD_VERSION}")
else()
# Build static libsystemd library as an external project
--- src/Connection.cpp.orig 2021-10-25 07:02:37 UTC
+++ src/Connection.cpp
@@ -30,7 +30,7 @@
#include <sdbus-c++/Message.h>
#include <sdbus-c++/Error.h>
#include "ScopeGuard.h"
-#include <systemd/sd-bus.h>
+#include <basu/sd-bus.h>
#include <unistd.h>
#include <poll.h>
#include <sys/eventfd.h>
--- src/Connection.h.orig 2021-10-25 07:02:37 UTC
+++ src/Connection.h
@@ -32,7 +32,7 @@
#include "IConnection.h"
#include "ScopeGuard.h"
#include "ISdBus.h"
-#include <systemd/sd-bus.h>
+#include <basu/sd-bus.h>
#include <memory>
#include <thread>
#include <string>
--- src/Error.cpp.orig 2021-10-25 07:02:37 UTC
+++ src/Error.cpp
@@ -25,7 +25,7 @@
*/
#include <sdbus-c++/Error.h>
-#include <systemd/sd-bus.h>
+#include <basu/sd-bus.h>
#include "ScopeGuard.h"
namespace sdbus
--- src/Flags.cpp.orig 2021-10-25 07:02:37 UTC
+++ src/Flags.cpp
@@ -25,7 +25,7 @@
*/
#include <sdbus-c++/Flags.h>
-#include <systemd/sd-bus.h>
+#include <basu/sd-bus.h>
namespace sdbus
{
--- src/IConnection.h.orig 2022-08-09 07:50:33 UTC
+++ src/IConnection.h
@@ -28,7 +28,7 @@
#define SDBUS_CXX_INTERNAL_ICONNECTION_H_
#include <sdbus-c++/IConnection.h>
-#include <systemd/sd-bus.h>
+#include <basu/sd-bus.h>
#include <string>
#include <memory>
#include <functional>
--- src/ISdBus.h.orig 2021-10-25 07:02:37 UTC
+++ src/ISdBus.h
@@ -28,7 +28,7 @@
#ifndef SDBUS_CXX_ISDBUS_H
#define SDBUS_CXX_ISDBUS_H
-#include <systemd/sd-bus.h>
+#include <basu/sd-bus.h>
namespace sdbus::internal {
--- src/Message.cpp.orig 2021-10-25 07:02:37 UTC
+++ src/Message.cpp
@@ -31,7 +31,7 @@
#include "ISdBus.h"
#include "IConnection.h"
#include "ScopeGuard.h"
-#include <systemd/sd-bus.h>
+#include <basu/sd-bus.h>
#include <cassert>
namespace sdbus {
--- src/Object.cpp.orig 2021-10-25 07:02:37 UTC
+++ src/Object.cpp
@@ -34,7 +34,7 @@
#include "ScopeGuard.h"
#include "IConnection.h"
#include "VTableUtils.h"
-#include <systemd/sd-bus.h>
+#include <basu/sd-bus.h>
#include <utility>
#include <cassert>
--- src/Object.h.orig 2021-10-25 07:02:37 UTC
+++ src/Object.h
@@ -29,7 +29,7 @@
#include <sdbus-c++/IObject.h>
#include "IConnection.h"
-#include <systemd/sd-bus.h>
+#include <basu/sd-bus.h>
#include <string>
#include <map>
#include <vector>
--- src/Proxy.cpp.orig 2021-10-25 07:02:37 UTC
+++ src/Proxy.cpp
@@ -31,7 +31,7 @@
#include "sdbus-c++/IConnection.h"
#include "sdbus-c++/Error.h"
#include "ScopeGuard.h"
-#include <systemd/sd-bus.h>
+#include <basu/sd-bus.h>
#include <cassert>
#include <chrono>
#include <utility>
--- src/Proxy.h.orig 2021-10-25 07:02:37 UTC
+++ src/Proxy.h
@@ -29,7 +29,7 @@
#include <sdbus-c++/IProxy.h>
#include "IConnection.h"
-#include <systemd/sd-bus.h>
+#include <basu/sd-bus.h>
#include <string>
#include <memory>
#include <map>
--- src/SdBus.cpp.orig 2021-10-25 07:02:37 UTC
+++ src/SdBus.cpp
@@ -178,7 +178,8 @@ int SdBus::sd_bus_open_system(sd_bus **ret)
int SdBus::sd_bus_open_system_remote(sd_bus **ret, const char *host)
{
- return ::sd_bus_open_system_remote(ret, host);
+ // Removed in https://git.sr.ht/~emersion/basu/commit/01d33b244eb6
+ return -EOPNOTSUPP;
}
int SdBus::sd_bus_request_name(sd_bus *bus, const char *name, uint64_t flags)
--- src/Types.cpp.orig 2021-10-25 07:02:37 UTC
+++ src/Types.cpp
@@ -27,7 +27,7 @@
#include <sdbus-c++/Types.h>
#include <sdbus-c++/Error.h>
#include "MessageUtils.h"
-#include <systemd/sd-bus.h>
+#include <basu/sd-bus.h>
#include <cassert>
namespace sdbus {
--- src/Utils.h.orig 2022-08-09 07:50:33 UTC
+++ src/Utils.h
@@ -28,7 +28,7 @@
#define SDBUS_CXX_INTERNAL_UTILS_H_
#include <sdbus-c++/Error.h>
-#include <systemd/sd-bus.h>
+#include <basu/sd-bus.h>
#if LIBSYSTEMD_VERSION>=246
#define SDBUS_CHECK_OBJECT_PATH(_PATH) \
--- src/VTableUtils.c.orig 2021-10-25 07:02:37 UTC
+++ src/VTableUtils.c
@@ -25,7 +25,7 @@
*/
#include "VTableUtils.h"
-#include <systemd/sd-bus.h>
+#include <basu/sd-bus.h>
sd_bus_vtable createVTableStartItem(uint64_t flags)
{
--- src/VTableUtils.h.orig 2021-10-25 07:02:37 UTC
+++ src/VTableUtils.h
@@ -27,7 +27,7 @@
#ifndef SDBUS_CXX_INTERNAL_VTABLEUTILS_H_
#define SDBUS_CXX_INTERNAL_VTABLEUTILS_H_
-#include <systemd/sd-bus.h>
+#include <basu/sd-bus.h>
#include <stdbool.h>
#ifdef __cplusplus
--- tests/integrationtests/DBusStandardInterfacesTests.cpp.orig 2021-10-25 07:02:37 UTC
+++ tests/integrationtests/DBusStandardInterfacesTests.cpp
@@ -65,8 +65,8 @@ TEST_F(SdbusTestObject, AnswersMachineUuidViaPeerInter
// a non-systemd Linux), org.freedesktop.DBus.Peer.GetMachineId() will not work. To solve
// this, you can create /etc/machine-id yourself as symlink to /var/lib/dbus/machine-id,
// and then org.freedesktop.DBus.Peer.GetMachineId() will start to work.
- if (::access("/etc/machine-id", F_OK) == -1)
- GTEST_SKIP() << "/etc/machine-id file does not exist, GetMachineId() will not work";
+ if (::access("/var/lib/dbus/machine-id", F_OK) == -1)
+ GTEST_SKIP() << "/var/lib/dbus/machine-id file does not exist, GetMachineId() will not work";
ASSERT_NO_THROW(m_proxy->GetMachineId());
}
|
