X Tutup
Skip to content

Commit 798c486

Browse files
zonquezonque
committed
remove bus-proxyd
As kdbus won't land in the anticipated way, the bus-proxy is not needed in its current form. It can be resurrected at any time thanks to the history, but for now, let's remove it from the sources. If we'll have a similar tool in the future, it will look quite differently anyway. Note that stdio-bridge is still available. It was restored from a version prior to f252ff17, and refactored to make use of the current APIs.
1 parent 736ffec commit 798c486

30 files changed

+303
-4731
lines changed

‎.gitignore‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@
5959
/systemd-binfmt
6060
/systemd-bootchart
6161
/systemd-bootx64.efi
62-
/systemd-bus-proxyd
6362
/systemd-cat
6463
/systemd-cgls
6564
/systemd-cgroups-agent
@@ -157,7 +156,6 @@
157156
/test-bus-match
158157
/test-bus-objects
159158
/test-bus-policy
160-
/test-bus-proxy
161159
/test-bus-server
162160
/test-bus-signature
163161
/test-bus-zero-copy

‎Makefile-man.am‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,6 @@ MANPAGES += \
9898
man/systemd-analyze.1 \
9999
man/systemd-ask-password-console.service.8 \
100100
man/systemd-ask-password.1 \
101-
man/systemd-bus-proxyd.8 \
102-
man/systemd-bus-proxyd.service.8 \
103101
man/systemd-cat.1 \
104102
man/systemd-cgls.1 \
105103
man/systemd-cgtop.1 \
@@ -421,7 +419,6 @@ MANPAGES_ALIAS += \
421419
man/systemd-ask-password-console.path.8 \
422420
man/systemd-ask-password-wall.path.8 \
423421
man/systemd-ask-password-wall.service.8 \
424-
man/systemd-bus-proxyd.socket.8 \
425422
man/systemd-fsck-root.service.8 \
426423
man/systemd-fsck.8 \
427424
man/systemd-hibernate-resume.8 \
@@ -751,7 +748,6 @@ man/system.conf.d.5: man/systemd-system.conf.5
751748
man/systemd-ask-password-console.path.8: man/systemd-ask-password-console.service.8
752749
man/systemd-ask-password-wall.path.8: man/systemd-ask-password-console.service.8
753750
man/systemd-ask-password-wall.service.8: man/systemd-ask-password-console.service.8
754-
man/systemd-bus-proxyd.socket.8: man/systemd-bus-proxyd.service.8
755751
man/systemd-fsck-root.service.8: man/systemd-fsck@.service.8
756752
man/systemd-fsck.8: man/systemd-fsck@.service.8
757753
man/systemd-hibernate-resume.8: man/systemd-hibernate-resume@.service.8
@@ -1571,9 +1567,6 @@ man/systemd-ask-password-wall.path.html: man/systemd-ask-password-console.servic
15711567
man/systemd-ask-password-wall.service.html: man/systemd-ask-password-console.service.html
15721568
$(html-alias)
15731569

1574-
man/systemd-bus-proxyd.socket.html: man/systemd-bus-proxyd.service.html
1575-
$(html-alias)
1576-
15771570
man/systemd-fsck-root.service.html: man/systemd-fsck@.service.html
15781571
$(html-alias)
15791572

@@ -2581,8 +2574,6 @@ EXTRA_DIST += \
25812574
man/systemd-backlight@.service.xml \
25822575
man/systemd-binfmt.service.xml \
25832576
man/systemd-bootchart.xml \
2584-
man/systemd-bus-proxyd.service.xml \
2585-
man/systemd-bus-proxyd.xml \
25862577
man/systemd-cat.xml \
25872578
man/systemd-cgls.xml \
25882579
man/systemd-cgtop.xml \

‎Makefile.am‎

Lines changed: 2 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,6 @@ rootlibexec_PROGRAMS = \
411411
systemd-ac-power \
412412
systemd-sysctl \
413413
systemd-sleep \
414-
systemd-bus-proxyd \
415414
systemd-socket-proxyd \
416415
systemd-update-done
417416

@@ -1488,7 +1487,6 @@ tests += \
14881487
test-ratelimit \
14891488
test-condition \
14901489
test-uid-range \
1491-
test-bus-policy \
14921490
test-locale-util \
14931491
test-execute \
14941492
test-copy \
@@ -1961,14 +1959,11 @@ test_unaligned_SOURCES = \
19611959
test_tables_SOURCES = \
19621960
src/test/test-tables.c \
19631961
src/shared/test-tables.h \
1964-
src/bus-proxyd/bus-xml-policy.c \
1965-
src/bus-proxyd/bus-xml-policy.h \
19661962
src/journal/journald-server.c \
19671963
src/journal/journald-server.h
19681964

19691965
test_tables_CPPFLAGS = \
1970-
$(AM_CPPFLAGS) \
1971-
-I$(top_srcdir)/src/bus-proxyd
1966+
$(AM_CPPFLAGS)
19721967

19731968
test_tables_CFLAGS = \
19741969
$(AM_CFLAGS) \
@@ -2209,13 +2204,6 @@ test_conf_parser_SOURCES = \
22092204
test_conf_parser_LDADD = \
22102205
libshared.la
22112206

2212-
test_bus_policy_SOURCES = \
2213-
src/bus-proxyd/test-bus-xml-policy.c
2214-
2215-
test_bus_policy_LDADD = \
2216-
libbus-proxy-core.la \
2217-
libshared.la
2218-
22192207
test_af_list_SOURCES = \
22202208
src/test/test-af-list.c
22212209

@@ -2980,59 +2968,12 @@ systemd_run_LDADD = \
29802968
libshared.la
29812969

29822970
# ------------------------------------------------------------------------------
2983-
noinst_LTLIBRARIES += \
2984-
libbus-proxy-core.la
2985-
2986-
libbus_proxy_core_la_SOURCES = \
2987-
src/bus-proxyd/bus-xml-policy.c \
2988-
src/bus-proxyd/bus-xml-policy.h \
2989-
src/bus-proxyd/driver.c \
2990-
src/bus-proxyd/driver.h \
2991-
src/bus-proxyd/proxy.c \
2992-
src/bus-proxyd/proxy.h \
2993-
src/bus-proxyd/synthesize.c \
2994-
src/bus-proxyd/synthesize.h
2995-
2996-
libbus_proxy_core_la_LIBADD = \
2997-
libshared.la
2998-
2999-
systemd_bus_proxyd_SOURCES = \
3000-
src/bus-proxyd/bus-proxyd.c
3001-
3002-
systemd_bus_proxyd_LDADD = \
3003-
libbus-proxy-core.la \
3004-
libshared.la
3005-
30062971
systemd_stdio_bridge_SOURCES = \
3007-
src/bus-proxyd/stdio-bridge.c
2972+
src/stdio-bridge/stdio-bridge.c
30082973

30092974
systemd_stdio_bridge_LDADD = \
3010-
libbus-proxy-core.la \
30112975
libshared.la
30122976

3013-
nodist_systemunit_DATA += \
3014-
units/systemd-bus-proxyd.service
3015-
3016-
dist_systemunit_DATA += \
3017-
units/systemd-bus-proxyd.socket
3018-
3019-
nodist_userunit_DATA += \
3020-
units/user/systemd-bus-proxyd.service
3021-
3022-
dist_userunit_DATA += \
3023-
units/user/systemd-bus-proxyd.socket
3024-
3025-
EXTRA_DIST += \
3026-
units/systemd-bus-proxyd.service.m4.in \
3027-
units/user/systemd-bus-proxyd.service.in
3028-
3029-
if HAVE_SMACK
3030-
bus-proxyd-set-cap-hook:
3031-
-$(SETCAP) cap_mac_admin+ei $(DESTDIR)$(rootlibexecdir)/systemd-bus-proxyd
3032-
3033-
INSTALL_EXEC_HOOKS += bus-proxyd-set-cap-hook
3034-
endif
3035-
30362977
# ------------------------------------------------------------------------------
30372978
systemd_tty_ask_password_agent_SOURCES = \
30382979
src/tty-ask-password-agent/tty-ask-password-agent.c
@@ -3195,7 +3136,6 @@ tests += \
31953136
test-bus-cleanup \
31963137
test-bus-server \
31973138
test-bus-match \
3198-
test-bus-proxy \
31993139
test-bus-kernel \
32003140
test-bus-kernel-bloom \
32013141
test-bus-zero-copy \
@@ -3288,12 +3228,6 @@ test_bus_match_SOURCES = \
32883228
test_bus_match_LDADD = \
32893229
libshared.la
32903230

3291-
test_bus_proxy_SOURCES = \
3292-
src/libsystemd/sd-bus/test-bus-proxy.c
3293-
3294-
test_bus_proxy_LDADD = \
3295-
libshared.la
3296-
32973231
test_bus_kernel_SOURCES = \
32983232
src/libsystemd/sd-bus/test-bus-kernel.c
32993233

‎README‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -200,9 +200,6 @@ USERS AND GROUPS:
200200
Similarly, the name resolution daemon requires the
201201
"systemd-resolve" system user and group to exist.
202202

203-
Similarly, the kdbus dbus1 proxy daemon requires the
204-
"systemd-bus-proxy" system user and group to exist.
205-
206203
Similarly, the coredump support requires the
207204
"systemd-coredump" system user and group to exist.
208205

‎TODO‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -321,10 +321,6 @@ Features:
321321
- path escaping
322322
- update systemd.special(7) to mention that dbus.socket is only about the compatibility socket now
323323
- test bloom filter generation indexes
324-
- bus-proxy: when passing messages from kdbus, make sure we properly
325-
handle the case where a large number of fds is appended that we
326-
cannot pass into sendmsg() of the AF_UNIX sokcet (which only accepts
327-
253 messages)
328324
- kdbus: introduce a concept of "send-only" connections
329325
- kdbus: add counter for refused unicast messages that is passed out via the RECV ioctl. SImilar to the counter for dropped multicast messages we already have.
330326

‎man/busctl.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -473,7 +473,6 @@ o "/org/freedesktop/systemd1/job/42684"</programlisting>
473473
<ulink url="http://freedesktop.org/wiki/Software/dbus">D-Bus</ulink>,
474474
<citerefentry><refentrytitle>sd-bus</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
475475
<citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
476-
<citerefentry><refentrytitle>systemd-bus-proxyd</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
477476
<citerefentry><refentrytitle>machinectl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
478477
<citerefentry project='die-net'><refentrytitle>wireshark</refentrytitle><manvolnum>1</manvolnum></citerefentry>
479478
</para>

‎man/systemd-bus-proxyd.service.xml‎

Lines changed: 0 additions & 80 deletions
This file was deleted.

0 commit comments

Comments
 (0)
X Tutup