Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package usbguard for openSUSE:Factory checked in at 2025-06-05 20:35:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/usbguard (Old) and /work/SRC/openSUSE:Factory/.usbguard.new.19631 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "usbguard" Thu Jun 5 20:35:27 2025 rev:23 rq:1283050 version:1.1.3 Changes: -------- --- /work/SRC/openSUSE:Factory/usbguard/usbguard.changes 2024-06-07 15:04:30.646273300 +0200 +++ /work/SRC/openSUSE:Factory/.usbguard.new.19631/usbguard.changes 2025-06-05 20:37:48.861963088 +0200 @@ -1,0 +2,7 @@ +Wed Jun 4 20:14:00 UTC 2025 - mun...@googlemail.com + +- Add usbguard-protobuf-30.patch + * Adapt for protobuf 30.0 API changes + based on https://github.com/USBGuard/usbguard/pull/650 + +------------------------------------------------------------------- New: ---- usbguard-protobuf-30.patch BETA DEBUG BEGIN: New: - Add usbguard-protobuf-30.patch * Adapt for protobuf 30.0 API changes BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ usbguard.spec ++++++ --- /var/tmp/diff_new_pack.diG6u8/_old 2025-06-05 20:37:51.254062551 +0200 +++ /var/tmp/diff_new_pack.diG6u8/_new 2025-06-05 20:37:51.258062718 +0200 @@ -1,7 +1,7 @@ # # spec file for package usbguard # -# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2025 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -33,6 +33,8 @@ Source3: usbguard-daemon.conf Source4: usbguard-rpmlintrc Patch0: usbguard-pthread.patch +# PATCH-FIX-UPSTREAM usbguard-protobuf-30.patch -- based on PR 650 +Patch1: usbguard-protobuf-30.patch BuildRequires: asciidoc BuildRequires: audit-devel BuildRequires: autoconf @@ -152,8 +154,7 @@ %pre %service_add_pre usbguard.service usbguard-dbus.service -%post -n %{lname} -p /sbin/ldconfig -%postun -n %{lname} -p /sbin/ldconfig +%ldconfig_scriptlets -n %{lname} %files %doc README.adoc CHANGELOG.md ++++++ usbguard-protobuf-30.patch ++++++ >From 2838890f097fb2f5419523801e71e54905a7d1dd Mon Sep 17 00:00:00 2001 From: Christian Heusel <christ...@heusel.eu> Date: Tue, 11 Mar 2025 21:43:51 +0100 Subject: [PATCH] Adapt for protobuf 30.0 API changes Fixes https://github.com/USBGuard/usbguard/issues/649 Link: https://protobuf.dev/support/migration/ Signed-off-by: Christian Heusel <christ...@heusel.eu> --- src/Library/IPCClientPrivate.cpp | 2 +- src/Library/IPCClientPrivate.hpp | 2 +- src/Library/IPCServerPrivate.cpp | 6 +++--- src/Library/IPCServerPrivate.hpp | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Library/IPCClientPrivate.cpp b/src/Library/IPCClientPrivate.cpp index 6aa52013..452ecd41 100644 --- a/src/Library/IPCClientPrivate.cpp +++ b/src/Library/IPCClientPrivate.cpp @@ -225,7 +225,7 @@ namespace usbguard std::string payload; message.SerializeToString(&payload); struct qb_ipc_request_header hdr; - hdr.id = QB_IPC_MSG_USER_START + IPC::messageTypeNameToNumber(message.GetTypeName()); + hdr.id = QB_IPC_MSG_USER_START + IPC::messageTypeNameToNumber(std::string(message.GetTypeName())); hdr.size = sizeof hdr + payload.size(); struct iovec iov[2]; iov[0].iov_base = &hdr; diff --git a/src/Library/IPCClientPrivate.hpp b/src/Library/IPCClientPrivate.hpp index d92a1d47..a33022e2 100644 --- a/src/Library/IPCClientPrivate.hpp +++ b/src/Library/IPCClientPrivate.hpp @@ -84,7 +84,7 @@ namespace usbguard template<class T> void registerHandler(MessageHandler::HandlerType method) { - const uint32_t type_number = IPC::messageTypeNameToNumber(T::default_instance().GetTypeName()); + const uint32_t type_number = IPC::messageTypeNameToNumber(std::string(T::default_instance().GetTypeName())); _handlers.emplace(type_number, MessageHandler::create<T>(*this, method)); } diff --git a/src/Library/IPCServerPrivate.cpp b/src/Library/IPCServerPrivate.cpp index 548a7261..b976f025 100644 --- a/src/Library/IPCServerPrivate.cpp +++ b/src/Library/IPCServerPrivate.cpp @@ -311,7 +311,7 @@ namespace usbguard message->SerializeToString(&payload); struct qb_ipc_response_header hdr; struct iovec iov[2]; - hdr.id = QB_IPC_MSG_USER_START + IPC::messageTypeNameToNumber(message->GetTypeName()); + hdr.id = QB_IPC_MSG_USER_START + IPC::messageTypeNameToNumber(std::string(message->GetTypeName())); hdr.size = sizeof hdr + payload.size(); hdr.error = 0; iov[0].iov_base = &hdr; @@ -555,7 +555,7 @@ namespace usbguard std::string payload; message->SerializeToString(&payload); struct qb_ipc_response_header hdr = { }; - hdr.id = QB_IPC_MSG_USER_START + IPC::messageTypeNameToNumber(message->GetTypeName()); + hdr.id = QB_IPC_MSG_USER_START + IPC::messageTypeNameToNumber(std::string(message->GetTypeName())); hdr.size = sizeof hdr + payload.size(); hdr.error = 0; struct iovec iov[2]; @@ -563,7 +563,7 @@ namespace usbguard iov[0].iov_len = sizeof hdr; iov[1].iov_base = (void*)payload.data(); iov[1].iov_len = payload.size(); - qbIPCBroadcastData(iov, 2, messageTypeNameToAccessControlSection(message->GetTypeName())); + qbIPCBroadcastData(iov, 2, messageTypeNameToAccessControlSection(std::string(message->GetTypeName()))); iov[0].iov_base = nullptr; iov[1].iov_base = nullptr; } diff --git a/src/Library/IPCServerPrivate.hpp b/src/Library/IPCServerPrivate.hpp index 25f9ac38..3b3dcc51 100644 --- a/src/Library/IPCServerPrivate.hpp +++ b/src/Library/IPCServerPrivate.hpp @@ -134,7 +134,7 @@ namespace usbguard void registerHandler(MessageHandler::HandlerType method, IPCServer::AccessControl::Section section, IPCServer::AccessControl::Privilege privilege) { - const uint32_t type_number = IPC::messageTypeNameToNumber(T::default_instance().GetTypeName()); + const uint32_t type_number = IPC::messageTypeNameToNumber(std::string(T::default_instance().GetTypeName())); _handlers.emplace(type_number, MessageHandler::create<T>(*this, method, section, privilege)); }
