From 68467d6ec2d6f0f0fa9cc1b4d91bba51ce34660dbb9046370718b2e3ebb5cf69 Mon Sep 17 00:00:00 2001 From: Robert Frohl Date: Tue, 1 Mar 2022 17:05:12 +0000 Subject: [PATCH] Accepting request 958318 from home:rfrohl:branches:hardware usbguard: enable dbus OBS-URL: https://build.opensuse.org/request/show/958318 OBS-URL: https://build.opensuse.org/package/show/hardware/usbguard?expand=0&rev=40 --- usbguard.changes | 5 +++++ usbguard.spec | 16 +++++++++++----- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/usbguard.changes b/usbguard.changes index 4c7f8e6..b0119d2 100644 --- a/usbguard.changes +++ b/usbguard.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Mar 1 16:31:24 UTC 2022 - Robert Frohl + +- Enable dbus support + ------------------------------------------------------------------- Fri Feb 25 10:43:56 UTC 2022 - Robert Frohl diff --git a/usbguard.spec b/usbguard.spec index 12b320e..4bbdc6d 100644 --- a/usbguard.spec +++ b/usbguard.spec @@ -112,7 +112,7 @@ autoreconf -i -s --no-recursive ./ --with-bundled-catch \ --with-bundled-pegtl \ --enable-systemd \ - --without-dbus \ + --with-dbus \ --disable-static make %{?_smp_mflags} @@ -142,16 +142,16 @@ install -p -m 644 scripts/usbguard-zsh-completion %{buildroot}%{_datadir}/zsh/si find %{buildroot} \( -name '*.la' -o -name '*.a' \) -delete %preun -%service_del_preun usbguard.service +%service_del_preun usbguard.service usbguard-dbus.service %post -%service_add_post usbguard.service +%service_add_post usbguard.service usbguard-dbus.service %postun -%service_del_postun usbguard.service +%service_del_postun usbguard.service usbguard-dbus.service %pre -%service_add_pre usbguard.service +%service_add_pre usbguard.service usbguard-dbus.service %post -n %{lname} -p /sbin/ldconfig %postun -n %{lname} -p /sbin/ldconfig @@ -163,17 +163,23 @@ find %{buildroot} \( -name '*.la' -o -name '*.a' \) -delete %dir %{_localstatedir}/log/usbguard %dir %{_sysconfdir}/usbguard %{_sbindir}/rcusbguard +%{_sbindir}/usbguard-dbus %dir %{_sysconfdir}/usbguard/IPCAccessControl.d %config(noreplace) %attr(0600,-,-) %{_sysconfdir}/usbguard/usbguard-daemon.conf %config(noreplace) %attr(0600,-,-) %{_sysconfdir}/usbguard/rules.conf %{_unitdir}/usbguard.service +%{_unitdir}/usbguard-dbus.service %{_mandir}/man8/usbguard-daemon.8%{?ext_man} +%{_mandir}/man8/usbguard-dbus.8%{?ext_man} %{_mandir}/man5/usbguard-daemon.conf.5%{?ext_man} %{_mandir}/man5/usbguard-rules.conf.5%{?ext_man} %{_datadir}/bash-completion/completions/usbguard %dir %{_datadir}/zsh %dir %{_datadir}/zsh/site-functions %{_datadir}/zsh/site-functions/_usbguard +%{_datadir}/dbus-1/system-services/org.usbguard1.service +%{_datadir}/dbus-1/system.d/org.usbguard1.conf +%{_datadir}/polkit-1/actions/org.usbguard1.policy %files -n %{lname} %license LICENSE