[packages/usbguard] up to 1.1.3

atler atler at pld-linux.org
Fri Jun 7 11:45:13 CEST 2024


commit 8739a6b17b4d1a50bd7c0bfd1da832c2e777c475
Author: Jan Palus <atler at pld-linux.org>
Date:   Fri Jun 7 10:41:17 2024 +0200

    up to 1.1.3

 gcc13.patch   | 41 -----------------------------------------
 usbguard.spec |  9 ++++-----
 2 files changed, 4 insertions(+), 46 deletions(-)
---
diff --git a/usbguard.spec b/usbguard.spec
index 07cb9ab..967fb3f 100644
--- a/usbguard.spec
+++ b/usbguard.spec
@@ -5,19 +5,18 @@
 
 Summary:	Software framework for implementing USB device authorization policies
 Name:		usbguard
-Version:	1.1.2
+Version:	1.1.3
 Release:	1
 License:	GPL v2+
 Group:		Applications/System
 Source0:	https://github.com/USBGuard/usbguard/releases/download/%{name}-%{version}/usbguard-%{version}.tar.gz
-# Source0-md5:	3c9478e17bac575ff51b1d746e72f25c
-Patch0:		gcc13.patch
+# Source0-md5:	fc4d8d603cd6eecd8b6d0a50f492228e
 URL:		https://usbguard.github.io/
 BuildRequires:	PEGTL-devel
 BuildRequires:	asciidoc
 BuildRequires:	audit-libs-devel >= 2.7.7
 BuildRequires:	dbus-devel
-BuildRequires:	glib2-devel
+BuildRequires:	glib2-devel >= 1:2.46
 %ifnarch %arch_with_atomics64
 BuildRequires:	libatomic-devel
 %endif
@@ -38,6 +37,7 @@ BuildRequires:	rpmbuild(macros) >= 2.025
 BuildRequires:	umockdev-devel >= 0.8.0
 Requires:	%{name}-libs%{?_isa} = %{version}-%{release}
 Requires:	audit-libs >= 2.7.7
+Requires:	glib2 >= 1:2.46
 Requires:	libcap-ng >= 0.7.0
 Requires:	libseccomp >= 2.0.0
 %{?with_systemd:Requires:	systemd-units >= 38}
@@ -78,7 +78,6 @@ Static usbguard library.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %configure \
diff --git a/gcc13.patch b/gcc13.patch
deleted file mode 100644
index 7b93c51..0000000
--- a/gcc13.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 1da0cfbb9ae978822d961d8b22d8d5125c11247a Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem at gmail.com>
-Date: Thu, 26 Jan 2023 23:46:56 -0800
-Subject: [PATCH] include missing <cstdint>
-
-gcc 13 moved some includes around and as a result <cstdint> is no
-longer transitively included [1]. Explicitly include it for
-uint8_t.
-
-[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes
-
-Signed-off-by: Khem Raj <raj.khem at gmail.com>
----
- src/Library/Base64.cpp | 1 -
- src/Library/Base64.hpp | 1 +
- 2 files changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/Library/Base64.cpp b/src/Library/Base64.cpp
-index ddb28dce..0246a134 100644
---- a/src/Library/Base64.cpp
-+++ b/src/Library/Base64.cpp
-@@ -22,7 +22,6 @@
- 
- #include "Base64.hpp"
- #include <stdexcept>
--#include <cstdint>
- 
- namespace usbguard
- {
-diff --git a/src/Library/Base64.hpp b/src/Library/Base64.hpp
-index 0947f214..e0c745cb 100644
---- a/src/Library/Base64.hpp
-+++ b/src/Library/Base64.hpp
-@@ -23,6 +23,7 @@
- #endif
- 
- #include <string>
-+#include <cstdint>
- #include <cstddef>
- 
- namespace usbguard
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/usbguard.git/commitdiff/8739a6b17b4d1a50bd7c0bfd1da832c2e777c475



More information about the pld-cvs-commit mailing list