Escape rpm macros mentioned in changelog section

Resolves: #1527956

.gitignore

@@ -10,3 +10,5 @@
 /dkopecek-usbguard-522c34c.tar.gz
 /dkopecek-usbguard-e528ff6.tar.gz
 /usbguard-0.7.0.tar.gz
+/usbguard-0.7.1.tar.gz
+/usbguard-0.7.2.tar.gz

sources

@@ -1 +1 @@
-SHA512 (usbguard-0.7.0.tar.gz) = e0a63457011379f50cc5eb14516bb1b6192d5710c81e7fa9042b67c481514158811e761e982ad16a9b1fcae62c58e68574910da1a98be3a07e6c99f69d5c03c4
+SHA512 (usbguard-0.7.2.tar.gz) = 2b2e0e2cb93f22c2e4111b4afe4e0d81e198e4540a6260f3f376bdd6dc4b5d062f3c20708f458ea5992b77742685c59e7e965ef42af49891547170ebb3f8cd61

usbguard-0.6.3-disable-cast-align-warning.patch

@@ -1,13 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 6727391..51cef14 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -24,7 +24,7 @@ COMMON_WARNING_FLAGS+=" -Wall"
- COMMON_WARNING_FLAGS+=" -Wextra"
- COMMON_WARNING_FLAGS+=" -Wformat=2"
- COMMON_WARNING_FLAGS+=" -Wredundant-decls"
--COMMON_WARNING_FLAGS+=" -Wcast-align"
-+#COMMON_WARNING_FLAGS+=" -Wcast-align"
- COMMON_WARNING_FLAGS+=" -Wmissing-declarations"
- COMMON_WARNING_FLAGS+=" -Wmissing-include-dirs"
- COMMON_WARNING_FLAGS+=" -Wmissing-format-attribute"

usbguard-0.7.0-disable-unused-parameter-warning.patch

@@ -1,13 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 090e69c..b8fb47f 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -291,7 +291,7 @@ pkginclude_HEADERS=\
- #  void AddDescriptorImpl() {
- #       ^~~~~~~~~~~~~~~~~
- #```
--%.pb.lo : CXXFLAGS += -Wno-missing-declarations
-+%.pb.lo : CXXFLAGS += -Wno-missing-declarations -Wno-unused-parameter
- 
- %.pb.cc %.pb.h: %.proto
- 	$(MKDIR_P) $(top_builddir)/src/Library/IPC

usbguard-daemon.conf

@@ -51,6 +51,48 @@ PresentDevicePolicy=apply-policy
 #
 PresentControllerPolicy=keep
 
+#
+# Inserted device policy.
+#
+# How to treat USB devices that are already connected
+# *after* the daemon starts. One of:
+#
+# * block        - deauthorize every present device
+# * reject       - remove every present device
+# * apply-policy - evaluate the ruleset for every present
+#                  device
+#
+InsertedDevicePolicy=apply-policy
+
+#
+# Restore controller device state.
+#
+# The USBGuard daemon modifies some attributes of controller
+# devices like the default authorization state of new child device
+# instances. Using this setting, you can controll whether the
+# daemon will try to restore the attribute values to the state
+# before modificaton on shutdown.
+#
+# SECURITY CONSIDERATIONS: If set to true, the USB authorization
+# policy could be bypassed by performing some sort of attack on the
+# daemon (via a local exploit or via a USB device) to make it shutdown
+# and restore to the operating-system default state (known to be permissive).
+#
+RestoreControllerDeviceState=false
+
+#
+# Device manager backend
+#
+# Which device manager backend implementation to use. One of:
+#
+# * uevent - Netlink based implementation which uses sysfs to scan for present
+#            devices and an uevent netlink socket for receiving USB device
+#            related events.
+# * dummy  - A dummy device manager which simulates several devices and device
+#            events. Useful for testing.
+#
+DeviceManagerBackend=uevent
+
 #!!! 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   !!!
@@ -77,6 +119,24 @@ IPCAllowedUsers=root
 #
 IPCAllowedGroups=wheel
 
+#
+# IPC access control definition files path.
+#
+# The files at this location will be interpreted by the daemon
+# as access control definition files. The (base)name of a file
+# should be in the form:
+#
+#   [user][:<group>]
+#
+# and should contain lines in the form:
+#
+#   <section>=[privilege] ...
+#
+# This way each file defines who is able to connect to the IPC
+# bus and what privileges he has.
+#
+IPCAccessControlFiles=/etc/usbguard/IPCAccessControl.d/
+
 #
 # Generate device specific rules including the "via-port"
 # attribute.
@@ -94,7 +154,20 @@ IPCAllowedGroups=wheel
 #
 DeviceRulesWithPort=false
 
+#
+# USBGuard Audit events log backend
+#
+# One of:
+#
+# * FileAudit - Log audit events into a file specified by
+#               AuditFilePath setting (see below)
+# * LinuxAudit - Log audit events using the Linux Audit
+#                subsystem (using audit_log_user_message)
+#
+AuditBackend=FileAudit
+
 #
 # USBGuard audit events log file path.
 #
 AuditFilePath=/var/log/usbguard/usbguard-audit.log
+

usbguard.spec

@@ -4,15 +4,15 @@
 %define with_dbus    1
 
 Name:           usbguard
-Version:        0.7.0
-Release:        6%{?dist}
+Version:        0.7.2
+Release:        2%{?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://github.com/dkopecek/usbguard/releases/download/%{name}-%{version}/%{name}-%{version}.tar.gz
+URL:            https://usbguard.github.io/
+Source0:        https://github.com/USBGuard/usbguard/releases/download/%{name}-%{version}/%{name}-%{version}.tar.gz
 Source1:        usbguard-daemon.conf
 
 Requires: systemd
@@ -30,6 +30,8 @@ BuildRequires: PEGTL-static
 BuildRequires: catch-devel
 BuildRequires: autoconf automake libtool
 BuildRequires: bash-completion
+BuildRequires: asciidoctor
+BuildRequires: audit-libs-devel
 # For `pkg-config systemd` only
 BuildRequires: systemd
 
@@ -46,13 +48,6 @@ BuildRequires: libxslt
 BuildRequires: libxml2
 %endif
 
-%if 0%{?fedora}
-BuildRequires: pandoc
-%endif
-
-Patch0: usbguard-0.6.3-disable-cast-align-warning.patch
-Patch1: usbguard-0.7.0-disable-unused-parameter-warning.patch
-
 %description
 The USBGuard software framework helps to protect your computer against rogue USB
 devices by implementing basic whitelisting/blacklisting capabilities based on
@@ -112,9 +107,6 @@ a D-Bus interface to the USBGuard daemon component.
 # Remove bundled library sources before build
 rm -rf src/ThirdParty/{Catch,PEGTL}
 
-%patch0 -p1
-%patch1 -p1
-
 %build
 mkdir -p ./m4
 autoreconf -i -v --no-recursive ./
@@ -133,8 +125,7 @@ autoreconf -i -v --no-recursive ./
     --without-dbus \
     --without-polkit \
 %endif
-    --with-crypto-library=gcrypt \
-    --enable-werror
+    --with-crypto-library=gcrypt
 
 make %{?_smp_mflags}
 
@@ -146,6 +137,7 @@ make install INSTALL='install -p' DESTDIR=%{buildroot}
 
 # Overwrite configuration with distribution defaults
 mkdir -p %{buildroot}%{_sysconfdir}/usbguard
+mkdir -p %{buildroot}%{_sysconfdir}/usbguard/IPCAccessControl.d
 install -p -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/usbguard/usbguard-daemon.conf
 
 # Cleanup
@@ -164,7 +156,7 @@ find %{buildroot} \( -name '*.la' -o -name '*.a' \) -exec rm -f {} ';'
 
 %files
 %defattr(-,root,root,-)
-%doc README.md CHANGELOG.md
+%doc README.adoc CHANGELOG.md
 %license LICENSE
 %{_libdir}/*.so.*
 %{_sbindir}/usbguard-daemon
@@ -225,6 +217,21 @@ find %{buildroot} \( -name '*.la' -o -name '*.a' \) -exec rm -f {} ';'
 %endif
 
 %changelog
+* Tue Jan 23 2018 Daniel Kopeček <dkopecek@redhat.com> - 0.7.2-2
+- Escape rpm macros mentioned in changelog section
+
+* Tue Jan 23 2018 Daniel Kopeček <dkopecek@redhat.com> - 0.7.2-1
+- Update to 0.7.2
+- Don't use --enable-werror downstream
+- Removed patches related to compiler warnings
+
+* Wed Dec 06 2017 Daniel Kopeček <dkopecek@redhat.com> - 0.7.1-1
+- Update to 0.7.1
+
+* Mon Oct 16 2017 Daniel Kopeček <dkopecek@redhat.com> 0.7.0-7
+- Fix enumeration timeout on kernel >= 4.13
+  Resolves: rhbz#1499052
+
 * Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
 
@@ -319,7 +326,7 @@ find %{buildroot} \( -name '*.la' -o -name '*.a' \) -exec rm -f {} ';'
 
 * Tue Apr 14 2015 Daniel Kopecek <dkopecek@redhat.com> 0.3p3-1
 - Update to version 0.3p3
-- added %check section
+- added %%check section
 - removed explicit -devel requires on systemd, libqb and
   libsodium devel files
 - added -devel requires on libstdc++-devel