diff --git a/srcpkgs/usbguard/patches/gcc13.patch b/srcpkgs/usbguard/patches/gcc13.patch deleted file mode 100644 index 6b8f9841e64..00000000000 --- a/srcpkgs/usbguard/patches/gcc13.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 22b1e0897af977cc96af926c730ff948bd120bb5 Mon Sep 17 00:00:00 2001 -From: Sebastian Pipping -Date: Fri, 31 Mar 2023 09:39:49 +0200 -Subject: [PATCH] Fix build for GCC 13 + make GitHub Actions cover build with - GCC 13 (#586) - -* include missing - -gcc 13 moved some includes around and as a result 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 - -* docker.yml: Cover openSUSE Tumbleweed with GCC 13+ - -Based on scripts/docker/build_on_centos_8_2.Dockerfile . - ---------- - -Signed-off-by: Khem Raj -Co-authored-by: Khem Raj ---- - .github/workflows/docker.yml | 1 + - .../build_on_opensuse_tumbleweed.Dockerfile | 50 +++++++++++++++++++ - src/Library/Base64.cpp | 1 - - src/Library/Base64.hpp | 1 + - 4 files changed, 52 insertions(+), 1 deletion(-) - create mode 100644 scripts/docker/build_on_opensuse_tumbleweed.Dockerfile - -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 --#include - - 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 -+#include - #include - - namespace usbguard diff --git a/srcpkgs/usbguard/patches/musl.patch b/srcpkgs/usbguard/patches/musl.patch index cc219072059..1fb6eb0c92d 100644 --- a/srcpkgs/usbguard/patches/musl.patch +++ b/srcpkgs/usbguard/patches/musl.patch @@ -1,6 +1,6 @@ ---- a/src/CLI/usbguard.cpp 2019-06-13 11:51:53.787863657 +0000 -+++ b/src/CLI/usbguard.cpp 2019-08-23 01:52:34.233056882 +0000 -@@ -99,7 +97,7 @@ +--- a/src/CLI/usbguard.cpp 2024-06-06 10:35:56.000000000 -0400 ++++ b/src/CLI/usbguard.cpp 2025-04-27 13:50:32.469825634 -0400 +@@ -107,7 +107,7 @@ static int usbguard_cli(int argc, char* argv[]) { diff --git a/srcpkgs/usbguard/template b/srcpkgs/usbguard/template index 018b7f030fc..8f47f23d623 100644 --- a/srcpkgs/usbguard/template +++ b/srcpkgs/usbguard/template @@ -1,7 +1,7 @@ # Template file for 'usbguard' pkgname=usbguard -version=1.1.2 -revision=6 +version=1.1.3 +revision=1 build_style=gnu-configure configure_args="--with-crypto-library=sodium --with-bundled-catch --with-bundled-pegtl" conf_files="/etc/usbguard/*" @@ -16,7 +16,7 @@ license="GPL-2.0-or-later" homepage="https://usbguard.github.io" changelog="https://raw.githubusercontent.com/USBGuard/usbguard/main/CHANGELOG.md" distfiles="https://github.com/USBGuard/usbguard/releases/download/usbguard-$version/usbguard-$version.tar.gz" -checksum=dcf5c90f3f93030e04df1baeb8d388b678c40dd48b135ea12a7be7dee8944934 +checksum=707dad2938923202697f636c2b4e0be80f192242039a2af3fc7ac35d03f78551 post_install() { vsv usbguard