Skip to content

Commit 4d8b0bb

Browse files
committed
Merge remote-tracking branch 'origin/pr/634'
* origin/pr/634: sys-log: fix dependecies & merge `read_log_backend_feature` into `open_log_backend` sys-log: use qubesdb lib directly sys-log: backends sys-log: use link instead of script sys-log: reformat whitespaces sys-log: use qubes name checker from qubes-pure sys-log: use sanitization from qubes-pure sys-log: alpha Pull request description: A simple and efficient log sanitizer, ready to work with rsyslog first step in: QubesOS/qubes-issues/issues/830 requires: QubesOS/qubes-linux-utils/pull/136
2 parents 8a74a7d + 8e0e481 commit 4d8b0bb

6 files changed

Lines changed: 334 additions & 4 deletions

File tree

debian/control

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ Build-Depends:
1717
pkg-config,
1818
python3,
1919
python3-setuptools,
20+
qubesdb-dev,
2021
quilt,
2122
shared-mime-info,
2223
xserver-xorg-dev,

debian/qubes-core-agent.install

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ etc/qubes-rpc/qubes.Filecopy
1717
etc/qubes-rpc/qubes.GetAppmenus
1818
etc/qubes-rpc/qubes.GetImageRGBA
1919
etc/qubes-rpc/qubes.InstallUpdatesGUI
20+
etc/qubes-rpc/qubes.Log
2021
etc/qubes-rpc/qubes.OpenInVM
2122
etc/qubes-rpc/qubes.OpenURL
2223
etc/qubes-rpc/qubes.PostInstall
@@ -197,6 +198,7 @@ usr/lib/qubes/update-proxy-configs
197198
usr/lib/qubes/upgrades-installed-check
198199
usr/lib/qubes/upgrades-status-notify
199200
usr/lib/qubes/vm-file-editor
201+
usr/lib/qubes/vm-log
200202
usr/lib/qubes/xdg-icon
201203
usr/lib/qubes/set-default-text-editor
202204
usr/share/glib-2.0/schemas/*

qubes-rpc/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@ qfile-agent-dvm
66
qfile-unpacker
77
qopen-in-vm
88
vm-file-editor
9+
vm-log
910
tar2qfile

qubes-rpc/Makefile

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ LDLIBS := -lqubes-rpc-filecopy -lqubes-pure
1717

1818
.PHONY: all clean install
1919

20-
all: vm-file-editor qopen-in-vm qfile-agent qfile-unpacker tar2qfile qubes-fs-tree-check bin-qfile-unpacker
20+
all: vm-file-editor vm-log qopen-in-vm qfile-agent qfile-unpacker tar2qfile qubes-fs-tree-check bin-qfile-unpacker
2121

2222
ifdef DEVEL_BUILD
2323
# Ensure that these programs can find their shared libraries,
2424
# even when installed in e.g. a TemplateBasedVM to somewhere other
2525
# than /usr.
26-
vm-file-editor qopen-in-vm qfile-agent qfile-unpacker tar2qfile qubes-fs-tree-check: LDFLAGS += '-Wl,-rpath,$$ORIGIN/../../$$LIB'
26+
vm-file-editor vm-log qopen-in-vm qfile-agent qfile-unpacker tar2qfile qubes-fs-tree-check: LDFLAGS += '-Wl,-rpath,$$ORIGIN/../../$$LIB'
2727
# This is installed in /usr/bin, not /usr/lib/qubes, so it needs a different rpath.
2828
bin-qfile-unpacker: LDFLAGS += '-Wl,-rpath,$$ORIGIN/../$$LIB'
2929
endif
@@ -33,13 +33,15 @@ bin-qfile-unpacker: qfile-unpacker.o gui-fatal.o
3333
qubes-fs-tree-check: LDLIBS := -lqubes-pure
3434
qubes-fs-tree-check: qubes-fs-tree-check.o
3535
vm-file-editor: vm-file-editor.o
36+
vm-log: LDLIBS += -lqubesdb
37+
vm-log: vm-log.o
3638
qopen-in-vm: qopen-in-vm.o gui-fatal.o
3739
qfile-agent: qfile-agent.o gui-fatal.o
3840
qfile-unpacker: qfile-unpacker.o gui-fatal.o
3941
tar2qfile: tar2qfile.o gui-fatal.o
4042

4143
clean:
42-
-$(RM) -- qopen-in-vm qfile-agent qfile-unpacker tar2qfile vm-file-editor qubes-fs-tree-check bin-qfile-unpacker *.o
44+
-$(RM) -- qopen-in-vm qfile-agent qfile-unpacker tar2qfile vm-file-editor vm-log qubes-fs-tree-check bin-qfile-unpacker *.o
4345

4446
install:
4547
install -d $(DESTDIR)$(BINDIR)
@@ -61,7 +63,7 @@ install:
6163
prepare-suspend resize-rootfs \
6264
qfile-agent qopen-in-vm qrun-in-vm qubes-sync-clock \
6365
tar2qfile vm-file-editor xdg-icon qvm-template-repo-query \
64-
qubes-fs-tree-check
66+
qubes-fs-tree-check vm-log
6567
# Install qfile-unpacker as SUID, because it will fail to receive
6668
# files from other vm.
6769
install -t $(DESTDIR)$(QUBESLIBDIR) -m 4755 qfile-unpacker
@@ -96,6 +98,7 @@ install:
9698
qubes.TemplateSearch \
9799
qubes.TemplateDownload
98100
$(LN) qubes.VMExec $(DESTDIR)$(QUBESRPCCMDDIR)/qubes.VMExecGUI
101+
$(LN) $(QUBESLIBDIR)/vm-log $(DESTDIR)$(QUBESRPCCMDDIR)/qubes.Log
99102
$(LN) /dev/tcp/127.0.0.1 $(DESTDIR)$(QUBESRPCCMDDIR)/qubes.ConnectTCP
100103
$(LN) /dev/tcp/127.0.0.1/8082 $(DESTDIR)$(QUBESRPCCMDDIR)/qubes.UpdatesProxy
101104
for config in *.config; do \

0 commit comments

Comments
 (0)