diff --git a/.gitignore b/.gitignore index fafb250..4d3496d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /usbguard-0.5.10.tar.gz +/usbguard-0.5.11.tar.gz diff --git a/sources b/sources index e2df33c..5cd100d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -091530849272754092cf9de2e432ec86 usbguard-0.5.10.tar.gz +edd3cfef8bc1faf92ad050252586e534 usbguard-0.5.11.tar.gz diff --git a/usbguard-daemon.conf b/usbguard-daemon.conf index cf2fc0c..8fe701a 100644 --- a/usbguard-daemon.conf +++ b/usbguard-daemon.conf @@ -65,6 +65,7 @@ PresentControllerPolicy=keep # # IPCAllowedUsers=username1 username2 ... # +IPCAllowedUsers=root # # Groups allowed to use the IPC interface. @@ -75,3 +76,20 @@ PresentControllerPolicy=keep # IPCAllowedGroups=groupname1 groupname2 ... # IPCAllowedGroups=wheel + +# +# Generate device specific rules including the "via-port" +# attribute. +# +# This option modifies the behavior of the allowDevice +# action. When instructed to generate a permanent rule, +# the action can generate a port specific rule. Because +# some systems have unstable port numbering, the generated +# rule might not match the device after rebooting the system. +# +# If set to false, the generated rule will still contain +# the "parent-hash" attribute which also defines an association +# to the parent device. See usbguard-rules.conf(5) for more +# details. +# +DeviceRulesWithPort=false diff --git a/usbguard.spec b/usbguard.spec index 3171296..b85e862 100644 --- a/usbguard.spec +++ b/usbguard.spec @@ -1,15 +1,15 @@ %global _hardened_build 1 Name: usbguard -Version: 0.5.10 -Release: 2%{?dist} +Version: 0.5.11 +Release: 1%{?dist} Summary: A tool for implementing USB device usage policy Group: System Environment/Daemons License: GPLv2+ ## Not installed # src/ThirdParty/Catch: Boost Software License - Version 1.0 URL: https://dkopecek.github.io/usbguard -Source0: https://dkopecek.github.io/usbguard/dist/%{name}-%{version}.tar.gz +Source0: https://github.com/dkopecek/usbguard/releases/download/%{name}-%{version}/%{name}-%{version}.tar.gz Source1: usbguard-daemon.conf Requires: systemd @@ -20,12 +20,13 @@ Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig BuildRequires: libqb-devel -BuildRequires: libsodium-devel +BuildRequires: libgcrypt-devel BuildRequires: systemd systemd-devel BuildRequires: libstdc++-devel BuildRequires: json-static BuildRequires: spdlog-static -BuildRequires: qt5-qtbase-devel +BuildRequires: PEGTL-static +BuildRequires: qt5-qtbase-devel qt5-qtsvg-devel BuildRequires: dbus-glib-devel BuildRequires: dbus-devel BuildRequires: glib2-devel @@ -99,12 +100,13 @@ autoreconf -i -v --no-recursive ./ --enable-systemd \ --with-gui-qt5 \ --with-dbus \ - --with-polkit + --with-polkit \ + --with-crypto-library=gcrypt make %{?_smp_mflags} %check -make check || (cat src/Tests/test-suite.log && exit 1) +make check %install make install INSTALL='install -p' DESTDIR=%{buildroot} @@ -166,6 +168,7 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';' %{_datadir}/dbus-1/system.d/org.usbguard.conf %{_datadir}/polkit-1/actions/org.usbguard.policy %{_unitdir}/usbguard-dbus.service +%{_mandir}/man8/usbguard-dbus.8.gz %preun dbus %systemd_preun usbguard-dbus.service @@ -178,6 +181,10 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';' %changelog +* Sat Aug 13 2016 Daniel Kopeček 0.5.11-1 +- Update to 0.5.11 +- Use libgcrypt instead of libsodium for crypto + * Thu Jul 21 2016 Daniel Kopecek 0.5.10-2 - Adjust the default configuration to keep the authorization state of present controller devices.