Rebase to 1.1.3

selinux package policy update
  Resolves: rhbz#2271330

.gitignore

@@ -22,3 +22,5 @@
 /usbguard-1.0.0.tar.gz
 /usbguard-1.1.0.tar.gz
 /usbguard-1.1.2.tar.gz
+/usbguard-1.1.3.tar.gz
+/usbguard-selinux-0.0.5.tar.gz

policykit-dbus-chat-selinux.patch

@@ -1,22 +0,0 @@
-diff -up ./usbguard-selinux-0.0.4/usbguard.te.policykit ./usbguard-selinux-0.0.4/usbguard.te
---- ./usbguard-selinux-0.0.4/usbguard.te.policykit	2022-03-15 10:32:21.002852930 +0100
-+++ ./usbguard-selinux-0.0.4/usbguard.te	2022-03-15 10:36:47.844040559 +0100
-@@ -99,9 +99,17 @@ logging_log_filetrans(usbguard_t, usbgua
- 
- logging_send_syslog_msg(usbguard_t)
- 
--dbus_system_domain(usbguard_t, usbguard_exec_t)
- usbguard_ipc_access(usbguard_t)
- 
-+optional_policy(`
-+	dbus_system_domain(usbguard_t, usbguard_exec_t)
-+
-+	optional_policy(`
-+		policykit_dbus_chat(usbguard_t)
-+	')
-+')
-+
-+
- tunable_policy(`usbguard_daemon_write_rules',`
- 	rw_files_pattern(usbguard_t, usbguard_rules_t, usbguard_rules_t)
- ')

sources

@@ -1,2 +1,2 @@
-SHA512 (usbguard-1.1.2.tar.gz) = 03b6dd026a0fe6a7a055208f09a56e2cc86985570388e33fde08671b8aa2d60ea4a0e59505e9646ddf50f42f5b6310d1b230379f9c26ec99c7ca736f3b4ad850
-SHA512 (usbguard-selinux-0.0.4.tar.gz) = b73b14396e40f847704511097bfed17c94b9b28cc70f3391a6effab763a315fe723aba37bb4c622d18ab691306c485fcd7632ccc8a837413f32c73cd9879c8b0
+SHA512 (usbguard-1.1.3.tar.gz) = 530bfea12ec8497c30d530c73f868207aad8b0e0e917cb7c7506f6148681a6a4ff12de5cddcfea458eb2b91ce8bb8b0e68d42e2590a4dc6b15f43c18f8256cf1
+SHA512 (usbguard-selinux-0.0.5.tar.gz) = 72b12e6a44dddfd863909f82e288170f935c4e941cb65678cd544fd0fa33ecce0a794c4b620dea9f496a45f2035d3b3b6dde662319db200eaff38e26999c4496

usbguard-gcc13.patch

@@ -1,12 +0,0 @@
-diff --git a/src/Library/Base64.hpp b/src/Library/Base64.hpp
-index 0947f21..aa76311 100644
---- a/src/Library/Base64.hpp
-+++ b/src/Library/Base64.hpp
-@@ -24,6 +24,7 @@
- 
- #include <string>
- #include <cstddef>
-+#include <cstdint>
- 
- namespace usbguard
- {

usbguard-selinux-audit-write.patch

@@ -1,12 +0,0 @@
-diff -up usbguard-1.1.0/usbguard-selinux-0.0.4/usbguard.te.orig usbguard-1.1.0/usbguard-selinux-0.0.4/usbguard.te
---- usbguard-1.1.0/usbguard-selinux-0.0.4/usbguard.te.orig	2023-07-27 10:41:25.540984667 +0200
-+++ usbguard-1.1.0/usbguard-selinux-0.0.4/usbguard.te	2023-07-27 10:41:59.970006413 +0200
-@@ -68,7 +68,7 @@ files_pid_file(usbguard_var_run_t)
- # Local policy
- #
- 
--allow usbguard_t self:capability { chown fowner };
-+allow usbguard_t self:capability { chown fowner audit_write };
- allow usbguard_t self:netlink_kobject_uevent_socket { bind create setopt read };
- allow usbguard_t self:netlink_audit_socket { nlmsg_relay create_netlink_socket_perms };
- 

usbguard.spec

@@ -1,17 +1,17 @@
 %global selinuxtype targeted
 %global moduletype contrib
-%define semodule_version 0.0.4
+%define semodule_version 0.0.5
 
 Name:           usbguard
-Version:        1.1.2
-Release:        2%{?dist}
+Version:        1.1.3
+Release:        1%{?dist}
 Summary:        A tool for implementing USB device usage policy
 License:        GPL-2.0-or-later
 ## Not installed
 # src/ThirdParty/Catch: Boost Software License - Version 1.0
 URL:            https://usbguard.github.io/
 Source0:        https://github.com/USBGuard/usbguard/releases/download/%{name}-%{version}/%{name}-%{version}.tar.gz
-Source1:        https://github.com/USBGuard/usbguard/releases/download/%{name}-selinux-%{semodule_version}/%{name}-selinux-%{semodule_version}.tar.gz
+Source1:        https://github.com/USBGuard/usbguard-selinux/archive/refs/tags/v%{semodule_version}.tar.gz#/%{name}-selinux-%{semodule_version}.tar.gz
 Source2:        usbguard-daemon.conf
 
 Requires: systemd
@@ -41,10 +41,6 @@ BuildRequires: audit-libs-devel
 BuildRequires: systemd
 
 Patch1: usbguard-revert-catch.patch
-Patch2: policykit-dbus-chat-selinux.patch
-# https://github.com/USBGuard/usbguard/pull/582
-Patch3: usbguard-gcc13.patch
-Patch4: usbguard-selinux-audit-write.patch
 
 %description
 The USBGuard software framework helps to protect your computer against rogue USB
@@ -107,9 +103,6 @@ daemon.
 %setup -q -D -T -a 1
 
 %patch -P 1 -p1 -b .catch
-%patch -P 2 -p1 -b .policykit
-%patch -P 3 -p1 -b .gcc13
-%patch -P 4 -p1
 
 # Remove bundled library sources before build
 rm -rf src/ThirdParty/{Catch,PEGTL}
@@ -232,6 +225,11 @@ fi
 
 
 %changelog
+* Fri Jun 07 2024 Attila Lakatos <alakatos@redhat.com> - 1.1.3-1
+- Rebase to 1.1.3
+- selinux package policy update
+Resolves: rhbz#2271330
+
 * Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild