From 34e41d6066f378b4c34f92b9f397272248b61e1e Mon Sep 17 00:00:00 2001
From: Daniel Kopecek <dkopecek@redhat.com>
Date: Sun, 7 Feb 2016 16:47:59 +0100
Subject: [PATCH] Update to usbguard-0.4

---
 .gitignore           |  1 +
 sources              |  2 +-
 usbguard-daemon.conf | 42 ++++++++++++++++++++++++++++++++++++++++++
 usbguard.spec        | 24 ++++++++++++++++++++++--
 4 files changed, 66 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 127d32a..4efb048 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /usbguard-0.3p3.tar.gz
+/usbguard-0.4.tar.gz
diff --git a/sources b/sources
index 4d1e291..5bed451 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-312b61483da7e41c3203249ef3b37df2  usbguard-0.3p3.tar.gz
+cdbfb66e672c0f5833f11fec05e20d61  usbguard-0.4.tar.gz
diff --git a/usbguard-daemon.conf b/usbguard-daemon.conf
index 3fcbe75..a6b2f2a 100644
--- a/usbguard-daemon.conf
+++ b/usbguard-daemon.conf
@@ -9,6 +9,48 @@
 #
 RuleFile=/etc/usbguard/rules.conf
 
+#
+# Implicit policy target.
+#
+# How to treat devices that don't match any rule in the
+# policy. One of:
+#
+# * allow  - authorize the device
+# * block  - block the device
+# * reject - remove the device
+#
+ImplicitPolicyTarget=block
+
+#
+# Present device policy.
+#
+# How to treat devices that are already connected when the
+# daemon starts. One of:
+#
+# * allow        - authorize every present device
+# * block        - deauthorize every present device
+# * reject       - remove every present device
+# * keep         - just sync the internal state and leave it
+# * apply-policy - evaluate the ruleset for every present
+#                  device
+#
+PresentDevicePolicy=keep
+
+#
+# Present controller policy.
+#
+# How to treat USB controllers that are already connected
+# when the daemon starts. One of:
+#
+# * allow        - authorize every present device
+# * block        - deauthorize every present device
+# * reject       - remove every present device
+# * keep         - just sync the internal state and leave it
+# * apply-policy - evaluate the ruleset for every present
+#                  device
+#
+PresentControllerPolicy=allow
+
 #!!! WARNING: It's good practice to set at least one of the !!!
 #!!!          two options bellow. If none of them are set,  !!!
 #!!!          the daemon will accept IPC connections from   !!!
diff --git a/usbguard.spec b/usbguard.spec
index 8ee37e1..22e9972 100644
--- a/usbguard.spec
+++ b/usbguard.spec
@@ -1,8 +1,8 @@
 %global _hardened_build 1
 
 Name:           usbguard
-Version:        0.3p3
-Release:        3%{?dist}
+Version:        0.4
+Release:        4%{?dist}
 Summary:        A tool for implementing USB device usage policy
 Group:          System Environment/Daemons
 License:        GPLv2+
@@ -43,6 +43,15 @@ Requires:       libstdc++-devel
 The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
 
+%package        tools
+Summary:        USBGuard Tools
+Group:          Applications/System
+Requires:       %{name} = %{version}-%{release}
+
+%description    tools
+The %{name}-tools package contains optional tools from the USBGuard
+software framework.
+
 %prep
 %setup -q
 # Remove bundled library sources before build
@@ -91,12 +100,14 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
 %license LICENSE
 %{_libdir}/*.so.*
 %{_sbindir}/usbguard-daemon
+%{_bindir}/usbguard
 %dir %{_sysconfdir}/usbguard
 %config(noreplace) %{_sysconfdir}/usbguard/usbguard-daemon.conf
 %{_unitdir}/usbguard.service
 %{_datadir}/man/man8/usbguard-daemon.8.gz
 %{_datadir}/man/man5/usbguard-daemon.conf.5.gz
 %{_datadir}/man/man5/usbguard-rules.conf.5.gz
+%{_datadir}/man/man1/usbguard.1.gz
 
 %files devel
 %defattr(-,root,root,-)
@@ -104,7 +115,16 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
 
+%files tools
+%defattr(-,root,root,-)
+%{_bindir}/usbguard-rule-parser
+
 %changelog
+* Sun Feb 07 2016 Daniel Kopecek <dkopecek@redhat.com> 0.4-4
+- Update to version 0.4
+- added usbguard CLI
+- added a tools subpackage with usbguard-rule-parser binary
+
 * Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.3p3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild