Skip to contentSkip to conversation

package/usbguard: bump to version 1.1.4

PATCH Superseded Michael Nosthoff via buildroot 1 participant 2 messages Sep 10, 2025 – Sep 13, 2025

v1 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/usbguard: bump to version 1.1.4

- brings compatibility with protobuf v30.0+
- drop upstreamed patch

Changelog:
https://github.com/USBGuard/usbguard/releases/tag/usbguard-1.1.4
https://github.com/USBGuard/usbguard/releases/tag/usbguard-1.1.3

---
 ...tHub-Actions-cover-build-with-GCC-13.patch | 114 ------------------
 package/usbguard/usbguard.hash                |   4 +-
 package/usbguard/usbguard.mk                  |   2 +-
 3 files changed, 3 insertions(+), 117 deletions(-)
 delete mode 100644 package/usbguard/0001-Fix-build-for-GCC-13-make-GitHub-Actions-cover-build-with-GCC-13.patch
package/usbguard/0001-Fix-build-for-GCC-13-make-GitHub-Actions-cover-build-with-GCC-13.patch deleted +0 -114
deleted file mode 100644
index 415b8e1dd1..0000000000
@@ -1,114 +0,0 @@
-From 22b1e0897af977cc96af926c730ff948bd120bb5 Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <[email protected]>
-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 <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 <[email protected]>
-
-* docker.yml: Cover openSUSE Tumbleweed with GCC 13+
-
-Based on scripts/docker/build_on_centos_8_2.Dockerfile .
-
----------
-
-Signed-off-by: Khem Raj <[email protected]>
-Co-authored-by: Khem Raj <[email protected]>
-Upstream: https://github.com/USBGuard/usbguard/commit/22b1e0897af977cc96af926c730ff948bd120bb5
-Signed-off-by: Fabrice Fontaine <[email protected]>
----
- .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/scripts/docker/build_on_opensuse_tumbleweed.Dockerfile b/scripts/docker/build_on_opensuse_tumbleweed.Dockerfile
-new file mode 100644
-index 00000000..d0993d8c
---- /dev/null
-+++ b/scripts/docker/build_on_opensuse_tumbleweed.Dockerfile
-@@ -0,0 +1,50 @@
-+##
-+## Copyright (c) 2023 Sebastian Pipping <[email protected]>
-+##
-+## This program is free software; you can redistribute it and/or modify
-+## it under the terms of the GNU General Public License as published by
-+## the Free Software Foundation; either version 2 of the License, or
-+## (at your option) any later version.
-+##
-+## This program is distributed in the hope that it will be useful,
-+## but WITHOUT ANY WARRANTY; without even the implied warranty of
-+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+## GNU General Public License for more details.
-+##
-+## You should have received a copy of the GNU General Public License
-+## along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+
-+FROM opensuse/tumbleweed:latest
-+RUN zypper --non-interactive install dnf rpm-repos-openSUSE-Tumbleweed \
-+        && \
-+    dnf install -y \
-+            asciidoc \
-+            autoconf \
-+            automake \
-+            dbus-1-glib-devel \
-+            diffutils \
-+            file \
-+            gcc-c++ \
-+            git \
-+            libgcrypt-devel \
-+            libqb-devel \
-+            libsodium-devel \
-+            libtool \
-+            libxslt \
-+            make \
-+            polkit-devel \
-+            protobuf-devel
-+ADD usbguard.tar usbguard/
-+ADD catch.tar usbguard/src/ThirdParty/Catch/
-+ADD pegtl.tar usbguard/src/ThirdParty/PEGTL/
-+WORKDIR usbguard
-+RUN git init &>/dev/null && ./autogen.sh
-+RUN ./configure --with-bundled-catch --with-bundled-pegtl || ! cat config.log
-+RUN make dist
-+RUN tar xf usbguard-*.tar.gz
-+RUN mv -v usbguard-*.*.*/ usbguard-release/
-+RUN mkdir usbguard-release/build/
-+WORKDIR usbguard-release/build/
-+RUN ../configure --with-bundled-catch --with-bundled-pegtl || ! cat config.log
-+RUN bash -c 'set -o pipefail; make V=1 "-j$(nproc)" |& tee build.log'
-+RUN ! grep -F 'include file not found' build.log
-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
package/usbguard/usbguard.hash +2 -2
index 6c10dc9d3e..10eab07f95 100644
@@ -1,5 +1,5 @@
-# From https://github.com/USBGuard/usbguard/releases/download/usbguard-1.1.2/usbguard-1.1.2.tar.gz.sum
-sha256  dcf5c90f3f93030e04df1baeb8d388b678c40dd48b135ea12a7be7dee8944934  usbguard-1.1.2.tar.gz
+# From https://github.com/USBGuard/usbguard/releases/download/usbguard-1.1.4/usbguard-1.1.4.tar.gz.sum
+sha256  7d76b75e779e3c9e6c2fc10e7389dfa34056864c9f0c6eaca722687b7e75893c  usbguard-1.1.4.tar.gz
 
 # Locally calculated
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  LICENSE
package/usbguard/usbguard.mk +1 -1
index 4a5028f509..5f6672d44a 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-USBGUARD_VERSION = 1.1.2
+USBGUARD_VERSION = 1.1.4
 USBGUARD_SITE = https://github.com/USBGuard/usbguard/releases/download/usbguard-$(USBGUARD_VERSION)
 USBGUARD_LICENSE = GPL-2.0+
 USBGUARD_LICENSE_FILES = LICENSE
Signature · 6 lines
2.43.0

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#1 lore raw
Quoted 8 lines · Michael Nosthoff via buildroot

- brings compatibility with protobuf v30.0+
- drop upstreamed patch

Changelog:
https://github.com/USBGuard/usbguard/releases/tag/usbguard-1.1.4
https://github.com/USBGuard/usbguard/releases/tag/usbguard-1.1.3

Applied to master, thanks.
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot