From d2fd2b169f3ac7321bf05c6d5ef361d1cd01ff4b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 22:47:38 +0000 Subject: [PATCH 01/17] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- usbguard-notifier.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usbguard-notifier.spec b/usbguard-notifier.spec index a3d2a18..6afc3b2 100644 --- a/usbguard-notifier.spec +++ b/usbguard-notifier.spec @@ -1,6 +1,6 @@ Name: usbguard-notifier Version: 0.0.6 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A tool for detecting usbguard policy and device presence changes License: GPLv2+ @@ -69,6 +69,9 @@ execstack -c %{buildroot}%{_bindir}/usbguard-notifier-cli %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 0.0.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Fri Jan 15 2021 Radovan Sroka - 0.0.6-3 - Rebuild with the usbguard 1.0.0 - soname bump From 61720a4b870cb5be286256b7b56d652780cad0a6 Mon Sep 17 00:00:00 2001 From: alakatos Date: Wed, 16 Jun 2021 07:24:50 +0200 Subject: [PATCH 02/17] Merge notifications after inserting a device resolves: rhbz#1972505 --- ...fier-rhbz1972505-merge-notifications.patch | 156 ++++++++++++++++++ usbguard-notifier.spec | 10 +- 2 files changed, 165 insertions(+), 1 deletion(-) create mode 100644 usbguard-notifier-rhbz1972505-merge-notifications.patch diff --git a/usbguard-notifier-rhbz1972505-merge-notifications.patch b/usbguard-notifier-rhbz1972505-merge-notifications.patch new file mode 100644 index 0000000..7e1719a --- /dev/null +++ b/usbguard-notifier-rhbz1972505-merge-notifications.patch @@ -0,0 +1,156 @@ +diff --git a/src/Notifier.cpp b/src/Notifier.cpp +index a98ca31..6653b93 100644 +--- a/src/Notifier.cpp ++++ b/src/Notifier.cpp +@@ -25,6 +25,7 @@ + #include + #include + #include ++#include + + #include + #include +@@ -41,6 +42,14 @@ Notifier::Notifier(const std::string& app_name) : + _ser.setFileName(path); + } + ++Notifier::~Notifier() ++{ ++ for (auto t : _countdownThreads) { ++ t->join(); ++ delete t; ++ } ++} ++ + void Notifier::DevicePolicyChanged( + uint32_t id, + usbguard::Rule::Target target_old, +@@ -53,6 +62,20 @@ void Notifier::DevicePolicyChanged( + + const std::string target_old_str = Rule::targetToString(target_old); + const std::string target_new_str = Rule::targetToString(target_new); ++ ++ DevicePresenceInfo info = getDevicePresenceObject(id); ++ if (info.isInitialized) { ++ if (info.target == target_old || ++ device_rule.substr(target_new_str.size()) == info.device_rule.substr(target_old_str.size())) { ++ info.target = target_new; ++ sendDevicePresenceNotification(info); ++ return; ++ } else { ++ NOTIFIER_LOG() << "DevicePolicyChanged and DevicePresenceChanged " << ++ "with same id do not share the same rule."; ++ } ++ } ++ + Rule rule = Rule::fromString(device_rule); + + std::ostringstream body; +@@ -70,7 +93,7 @@ void Notifier::DevicePolicyChanged( + } + + void Notifier::DevicePresenceChanged( +- uint32_t /*id*/, ++ uint32_t id, + usbguard::DeviceManager::EventType event, + usbguard::Rule::Target target, + const std::string& device_rule) +@@ -78,9 +101,41 @@ void Notifier::DevicePresenceChanged( + using namespace usbguard; + NOTIFIER_LOG() << "Device presence changed signal"; + +- const std::string event_str = DeviceManager::eventTypeToString(event); +- const std::string target_str = Rule::targetToString(target); +- Rule rule = Rule::fromString(device_rule); ++ _deviceNotifications.emplace(std::make_pair(id, DevicePresenceInfo(event, target, device_rule))); ++ std::thread* t = new std::thread( [this, id] { sendDevicePresenceCountdownCallback(id); } ); ++ _countdownThreads.push_back(t); ++} ++ ++Notifier::DevicePresenceInfo Notifier::getDevicePresenceObject(uint32_t id) ++{ ++ DevicePresenceInfo info; ++ _mtx.lock(); ++ auto it = _deviceNotifications.find(id); ++ if (it != _deviceNotifications.end()) { ++ info = it->second; ++ _deviceNotifications.erase(it); ++ } ++ _mtx.unlock(); ++ return info; ++} ++ ++void Notifier::sendDevicePresenceCountdownCallback(uint32_t id) ++{ ++ std::this_thread::sleep_for(std::chrono::milliseconds(_kMillisecondsDevicePolicyWait)); ++ ++ DevicePresenceInfo info = getDevicePresenceObject(id); ++ if (info.isInitialized) { ++ sendDevicePresenceNotification(info); ++ } ++} ++ ++void Notifier::sendDevicePresenceNotification(DevicePresenceInfo& info) ++{ ++ using namespace usbguard; ++ ++ const std::string event_str = DeviceManager::eventTypeToString(info.event); ++ const std::string target_str = Rule::targetToString(info.target); ++ Rule rule = Rule::fromString(info.device_rule); + + std::ostringstream body; + body << event_str << ' ' << rule.getName() << ": " << target_str; +diff --git a/src/Notifier.hpp b/src/Notifier.hpp +index 92f5c03..e420adb 100644 +--- a/src/Notifier.hpp ++++ b/src/Notifier.hpp +@@ -26,6 +26,9 @@ + #include + #include + ++#include ++#include ++ + namespace usbguardNotifier + { + +@@ -33,6 +36,7 @@ class Notifier : public usbguard::IPCClient + { + public: + explicit Notifier(const std::string& app_name); ++ ~Notifier(); + + void DevicePolicyChanged( + uint32_t id, +@@ -53,8 +57,31 @@ class Notifier : public usbguard::IPCClient + const std::string& value_new); + */ + private: ++ struct DevicePresenceInfo { ++ bool isInitialized = false; ++ usbguard::DeviceManager::EventType event; ++ usbguard::Rule::Target target; ++ std::string device_rule; ++ ++ DevicePresenceInfo(const usbguard::DeviceManager::EventType& e, ++ const usbguard::Rule::Target& t, ++ const std::string& r): isInitialized(true), event(e), target(t), device_rule(r) {} ++ ++ DevicePresenceInfo() : event(), target(), device_rule() {} ++ }; ++ ++ DevicePresenceInfo getDevicePresenceObject(uint32_t id); ++ ++ void sendDevicePresenceCountdownCallback(uint32_t id); ++ ++ void sendDevicePresenceNotification(DevicePresenceInfo& info); ++ + notify::Notify _lib; + Serializer _ser; ++ std::map _deviceNotifications; ++ std::mutex _mtx; ++ std::vector _countdownThreads; ++ const int _kMillisecondsDevicePolicyWait = 500; + }; + + } // namespace usbguardNotifier diff --git a/usbguard-notifier.spec b/usbguard-notifier.spec index 6afc3b2..4244061 100644 --- a/usbguard-notifier.spec +++ b/usbguard-notifier.spec @@ -1,6 +1,6 @@ Name: usbguard-notifier Version: 0.0.6 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A tool for detecting usbguard policy and device presence changes License: GPLv2+ @@ -20,6 +20,8 @@ BuildRequires: catch1-devel BuildRequires: execstack BuildRequires: systemd-rpm-macros +Patch0: usbguard-notifier-rhbz1972505-merge-notifications.patch + %description USBGuard Notifier software framework detects usbguard policy modifications as well as device presence changes and displays them as pop-up notifications. @@ -27,6 +29,8 @@ as well as device presence changes and displays them as pop-up notifications. %prep %setup -q +%patch0 -p1 -b .merge-notifications + %build mkdir -p ./m4 autoreconf -i -f -v --no-recursive ./ @@ -69,6 +73,10 @@ execstack -c %{buildroot}%{_bindir}/usbguard-notifier-cli %changelog +* Wed Jun 16 2021 Attila Lakatos - 0.0.6-5 +- Merge notifications when inserting a usb device + resolves: rhbz#1972505 + * Wed Jan 27 2021 Fedora Release Engineering - 0.0.6-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 7ca2fe417214e0bf75a851372a208066ec0a6c83 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 20:10:30 +0000 Subject: [PATCH 03/17] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- usbguard-notifier.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usbguard-notifier.spec b/usbguard-notifier.spec index 4244061..093e810 100644 --- a/usbguard-notifier.spec +++ b/usbguard-notifier.spec @@ -1,6 +1,6 @@ Name: usbguard-notifier Version: 0.0.6 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A tool for detecting usbguard policy and device presence changes License: GPLv2+ @@ -73,6 +73,9 @@ execstack -c %{buildroot}%{_bindir}/usbguard-notifier-cli %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 0.0.6-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Wed Jun 16 2021 Attila Lakatos - 0.0.6-5 - Merge notifications when inserting a usb device resolves: rhbz#1972505 From 7931e58a64fe47f2b6303878e690f52101162e6f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 03:39:38 +0000 Subject: [PATCH 04/17] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- usbguard-notifier.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usbguard-notifier.spec b/usbguard-notifier.spec index 093e810..7dae9eb 100644 --- a/usbguard-notifier.spec +++ b/usbguard-notifier.spec @@ -1,6 +1,6 @@ Name: usbguard-notifier Version: 0.0.6 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A tool for detecting usbguard policy and device presence changes License: GPLv2+ @@ -73,6 +73,9 @@ execstack -c %{buildroot}%{_bindir}/usbguard-notifier-cli %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 0.0.6-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering - 0.0.6-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 3c88d522fcb8e0708b36380386d50ff32aafd994 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 11:32:38 +0000 Subject: [PATCH 05/17] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- usbguard-notifier.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usbguard-notifier.spec b/usbguard-notifier.spec index 7dae9eb..fc5087e 100644 --- a/usbguard-notifier.spec +++ b/usbguard-notifier.spec @@ -1,6 +1,6 @@ Name: usbguard-notifier Version: 0.0.6 -Release: 7%{?dist} +Release: 8%{?dist} Summary: A tool for detecting usbguard policy and device presence changes License: GPLv2+ @@ -73,6 +73,9 @@ execstack -c %{buildroot}%{_bindir}/usbguard-notifier-cli %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 0.0.6-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Jan 22 2022 Fedora Release Engineering - 0.0.6-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 575482e8d482637c9ce66433e8596e4f2f240f8e Mon Sep 17 00:00:00 2001 From: alakatos Date: Tue, 20 Dec 2022 12:07:54 +0100 Subject: [PATCH 06/17] Rebase to 0.1.0 --- .gitignore | 1 + sources | 2 +- ...fier-rhbz1972505-merge-notifications.patch | 156 ------------------ usbguard-notifier.spec | 14 +- 4 files changed, 7 insertions(+), 166 deletions(-) delete mode 100644 usbguard-notifier-rhbz1972505-merge-notifications.patch diff --git a/.gitignore b/.gitignore index 76ea784..5257415 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /usbguard-notifier-0.0.5.tar.gz /usbguard-notifier-0.0.6.tar.gz +/usbguard-notifier-0.1.0.tar.gz diff --git a/sources b/sources index 4c0bd73..b790302 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (usbguard-notifier-0.0.6.tar.gz) = 25402ff336ed89c92a2c7824e97a25c59570f6240e2e9c97fd37dabc25ed49ebe7dc051982f4aaff181eb835677ec29cd4e4dfe9efc11f07583ff5cfb92630b0 +SHA512 (usbguard-notifier-0.1.0.tar.gz) = b3414dbbbc2877e6ad29c8848942f8266293d6d3ba861724a61198af85d6db4cf5f1b0d0eb4af2a973288737b7b03614e9ebe39d0287a06fbe66be9e1d39d84a diff --git a/usbguard-notifier-rhbz1972505-merge-notifications.patch b/usbguard-notifier-rhbz1972505-merge-notifications.patch deleted file mode 100644 index 7e1719a..0000000 --- a/usbguard-notifier-rhbz1972505-merge-notifications.patch +++ /dev/null @@ -1,156 +0,0 @@ -diff --git a/src/Notifier.cpp b/src/Notifier.cpp -index a98ca31..6653b93 100644 ---- a/src/Notifier.cpp -+++ b/src/Notifier.cpp -@@ -25,6 +25,7 @@ - #include - #include - #include -+#include - - #include - #include -@@ -41,6 +42,14 @@ Notifier::Notifier(const std::string& app_name) : - _ser.setFileName(path); - } - -+Notifier::~Notifier() -+{ -+ for (auto t : _countdownThreads) { -+ t->join(); -+ delete t; -+ } -+} -+ - void Notifier::DevicePolicyChanged( - uint32_t id, - usbguard::Rule::Target target_old, -@@ -53,6 +62,20 @@ void Notifier::DevicePolicyChanged( - - const std::string target_old_str = Rule::targetToString(target_old); - const std::string target_new_str = Rule::targetToString(target_new); -+ -+ DevicePresenceInfo info = getDevicePresenceObject(id); -+ if (info.isInitialized) { -+ if (info.target == target_old || -+ device_rule.substr(target_new_str.size()) == info.device_rule.substr(target_old_str.size())) { -+ info.target = target_new; -+ sendDevicePresenceNotification(info); -+ return; -+ } else { -+ NOTIFIER_LOG() << "DevicePolicyChanged and DevicePresenceChanged " << -+ "with same id do not share the same rule."; -+ } -+ } -+ - Rule rule = Rule::fromString(device_rule); - - std::ostringstream body; -@@ -70,7 +93,7 @@ void Notifier::DevicePolicyChanged( - } - - void Notifier::DevicePresenceChanged( -- uint32_t /*id*/, -+ uint32_t id, - usbguard::DeviceManager::EventType event, - usbguard::Rule::Target target, - const std::string& device_rule) -@@ -78,9 +101,41 @@ void Notifier::DevicePresenceChanged( - using namespace usbguard; - NOTIFIER_LOG() << "Device presence changed signal"; - -- const std::string event_str = DeviceManager::eventTypeToString(event); -- const std::string target_str = Rule::targetToString(target); -- Rule rule = Rule::fromString(device_rule); -+ _deviceNotifications.emplace(std::make_pair(id, DevicePresenceInfo(event, target, device_rule))); -+ std::thread* t = new std::thread( [this, id] { sendDevicePresenceCountdownCallback(id); } ); -+ _countdownThreads.push_back(t); -+} -+ -+Notifier::DevicePresenceInfo Notifier::getDevicePresenceObject(uint32_t id) -+{ -+ DevicePresenceInfo info; -+ _mtx.lock(); -+ auto it = _deviceNotifications.find(id); -+ if (it != _deviceNotifications.end()) { -+ info = it->second; -+ _deviceNotifications.erase(it); -+ } -+ _mtx.unlock(); -+ return info; -+} -+ -+void Notifier::sendDevicePresenceCountdownCallback(uint32_t id) -+{ -+ std::this_thread::sleep_for(std::chrono::milliseconds(_kMillisecondsDevicePolicyWait)); -+ -+ DevicePresenceInfo info = getDevicePresenceObject(id); -+ if (info.isInitialized) { -+ sendDevicePresenceNotification(info); -+ } -+} -+ -+void Notifier::sendDevicePresenceNotification(DevicePresenceInfo& info) -+{ -+ using namespace usbguard; -+ -+ const std::string event_str = DeviceManager::eventTypeToString(info.event); -+ const std::string target_str = Rule::targetToString(info.target); -+ Rule rule = Rule::fromString(info.device_rule); - - std::ostringstream body; - body << event_str << ' ' << rule.getName() << ": " << target_str; -diff --git a/src/Notifier.hpp b/src/Notifier.hpp -index 92f5c03..e420adb 100644 ---- a/src/Notifier.hpp -+++ b/src/Notifier.hpp -@@ -26,6 +26,9 @@ - #include - #include - -+#include -+#include -+ - namespace usbguardNotifier - { - -@@ -33,6 +36,7 @@ class Notifier : public usbguard::IPCClient - { - public: - explicit Notifier(const std::string& app_name); -+ ~Notifier(); - - void DevicePolicyChanged( - uint32_t id, -@@ -53,8 +57,31 @@ class Notifier : public usbguard::IPCClient - const std::string& value_new); - */ - private: -+ struct DevicePresenceInfo { -+ bool isInitialized = false; -+ usbguard::DeviceManager::EventType event; -+ usbguard::Rule::Target target; -+ std::string device_rule; -+ -+ DevicePresenceInfo(const usbguard::DeviceManager::EventType& e, -+ const usbguard::Rule::Target& t, -+ const std::string& r): isInitialized(true), event(e), target(t), device_rule(r) {} -+ -+ DevicePresenceInfo() : event(), target(), device_rule() {} -+ }; -+ -+ DevicePresenceInfo getDevicePresenceObject(uint32_t id); -+ -+ void sendDevicePresenceCountdownCallback(uint32_t id); -+ -+ void sendDevicePresenceNotification(DevicePresenceInfo& info); -+ - notify::Notify _lib; - Serializer _ser; -+ std::map _deviceNotifications; -+ std::mutex _mtx; -+ std::vector _countdownThreads; -+ const int _kMillisecondsDevicePolicyWait = 500; - }; - - } // namespace usbguardNotifier diff --git a/usbguard-notifier.spec b/usbguard-notifier.spec index fc5087e..bcb129e 100644 --- a/usbguard-notifier.spec +++ b/usbguard-notifier.spec @@ -1,6 +1,6 @@ Name: usbguard-notifier -Version: 0.0.6 -Release: 8%{?dist} +Version: 0.1.0 +Release: 1%{?dist} Summary: A tool for detecting usbguard policy and device presence changes License: GPLv2+ @@ -17,11 +17,8 @@ BuildRequires: librsvg2-devel BuildRequires: libnotify-devel BuildRequires: asciidoc BuildRequires: catch1-devel -BuildRequires: execstack BuildRequires: systemd-rpm-macros -Patch0: usbguard-notifier-rhbz1972505-merge-notifications.patch - %description USBGuard Notifier software framework detects usbguard policy modifications as well as device presence changes and displays them as pop-up notifications. @@ -29,8 +26,6 @@ as well as device presence changes and displays them as pop-up notifications. %prep %setup -q -%patch0 -p1 -b .merge-notifications - %build mkdir -p ./m4 autoreconf -i -f -v --no-recursive ./ @@ -50,8 +45,6 @@ make check %install make install INSTALL='install -p' DESTDIR=%{buildroot} -execstack -c %{buildroot}%{_bindir}/usbguard-notifier -execstack -c %{buildroot}%{_bindir}/usbguard-notifier-cli %post %systemd_user_post %{name}.service @@ -73,6 +66,9 @@ execstack -c %{buildroot}%{_bindir}/usbguard-notifier-cli %changelog +* Tue Dec 20 2022 Attila Lakatos - 0.1.0-1 +- Rebase to 0.1.0 + * Sat Jul 23 2022 Fedora Release Engineering - 0.0.6-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 197243d20e62bd5c72ac574357e3e9b1a6540673 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 05:57:51 +0000 Subject: [PATCH 07/17] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- usbguard-notifier.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usbguard-notifier.spec b/usbguard-notifier.spec index bcb129e..5e7de47 100644 --- a/usbguard-notifier.spec +++ b/usbguard-notifier.spec @@ -1,6 +1,6 @@ Name: usbguard-notifier Version: 0.1.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A tool for detecting usbguard policy and device presence changes License: GPLv2+ @@ -66,6 +66,9 @@ make install INSTALL='install -p' DESTDIR=%{buildroot} %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 0.1.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Tue Dec 20 2022 Attila Lakatos - 0.1.0-1 - Rebase to 0.1.0 From 184a9a509d43879ebf88e5cd0f97282581c7e482 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Tue, 24 Jan 2023 15:10:37 -0500 Subject: [PATCH 08/17] Fix build with GCC 13 --- 0001-gcc13.patch | 12 ++++++++++++ usbguard-notifier.spec | 3 +++ 2 files changed, 15 insertions(+) create mode 100644 0001-gcc13.patch diff --git a/0001-gcc13.patch b/0001-gcc13.patch new file mode 100644 index 0000000..791ed6b --- /dev/null +++ b/0001-gcc13.patch @@ -0,0 +1,12 @@ +diff --git a/src/Serializer.hpp b/src/Serializer.hpp +index c90a57e..d38991a 100644 +--- a/src/Serializer.hpp ++++ b/src/Serializer.hpp +@@ -20,6 +20,7 @@ + #ifndef SERIALIZER_HPP + #define SERIALIZER_HPP + ++#include + #include + #include + #include diff --git a/usbguard-notifier.spec b/usbguard-notifier.spec index 5e7de47..7e25efe 100644 --- a/usbguard-notifier.spec +++ b/usbguard-notifier.spec @@ -6,6 +6,8 @@ Summary: A tool for detecting usbguard policy and device presence changes License: GPLv2+ URL: https://github.com/Cropi/%{name} Source0: https://github.com/Cropi/usbguard-notifier/releases/download/%{name}-%{version}/%{name}-%{version}.tar.gz +# https://github.com/Cropi/usbguard-notifier/pull/74 +Patch0: 0001-gcc13.patch Requires: systemd @@ -25,6 +27,7 @@ as well as device presence changes and displays them as pop-up notifications. %prep %setup -q +%patch0 -p1 %build mkdir -p ./m4 From 0430052afd0b963fb18881b2a6286ba89d93338a Mon Sep 17 00:00:00 2001 From: alakatos Date: Wed, 31 May 2023 10:36:51 +0200 Subject: [PATCH 09/17] Update License tag for SPDX and fix deprecated %patchN --- usbguard-notifier.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usbguard-notifier.spec b/usbguard-notifier.spec index 7e25efe..9ffb375 100644 --- a/usbguard-notifier.spec +++ b/usbguard-notifier.spec @@ -3,7 +3,7 @@ Version: 0.1.0 Release: 2%{?dist} Summary: A tool for detecting usbguard policy and device presence changes -License: GPLv2+ +License: GPL-2.0-or-later URL: https://github.com/Cropi/%{name} Source0: https://github.com/Cropi/usbguard-notifier/releases/download/%{name}-%{version}/%{name}-%{version}.tar.gz # https://github.com/Cropi/usbguard-notifier/pull/74 @@ -27,7 +27,7 @@ as well as device presence changes and displays them as pop-up notifications. %prep %setup -q -%patch0 -p1 +%patch -P 0 -p1 %build mkdir -p ./m4 From e4ebf2c78717f5bce058c2c13ab60873f2331257 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 17:15:57 +0000 Subject: [PATCH 10/17] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- usbguard-notifier.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usbguard-notifier.spec b/usbguard-notifier.spec index 9ffb375..18d03f3 100644 --- a/usbguard-notifier.spec +++ b/usbguard-notifier.spec @@ -1,6 +1,6 @@ Name: usbguard-notifier Version: 0.1.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A tool for detecting usbguard policy and device presence changes License: GPL-2.0-or-later @@ -69,6 +69,9 @@ make install INSTALL='install -p' DESTDIR=%{buildroot} %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 0.1.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sat Jan 21 2023 Fedora Release Engineering - 0.1.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From e52eb71c2b371e8ff5a5a75352c754b4a921419f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 07:17:11 +0000 Subject: [PATCH 11/17] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- usbguard-notifier.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usbguard-notifier.spec b/usbguard-notifier.spec index 18d03f3..95ee5e4 100644 --- a/usbguard-notifier.spec +++ b/usbguard-notifier.spec @@ -1,6 +1,6 @@ Name: usbguard-notifier Version: 0.1.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A tool for detecting usbguard policy and device presence changes License: GPL-2.0-or-later @@ -69,6 +69,9 @@ make install INSTALL='install -p' DESTDIR=%{buildroot} %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 0.1.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jul 22 2023 Fedora Release Engineering - 0.1.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From f070fc95da2931b7ed97d9ebf01ec45033bf1468 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 08:24:56 +0000 Subject: [PATCH 12/17] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- usbguard-notifier.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usbguard-notifier.spec b/usbguard-notifier.spec index 95ee5e4..21474cd 100644 --- a/usbguard-notifier.spec +++ b/usbguard-notifier.spec @@ -1,6 +1,6 @@ Name: usbguard-notifier Version: 0.1.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A tool for detecting usbguard policy and device presence changes License: GPL-2.0-or-later @@ -69,6 +69,9 @@ make install INSTALL='install -p' DESTDIR=%{buildroot} %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 0.1.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat Jan 27 2024 Fedora Release Engineering - 0.1.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 9be11e87e02955724a3adaabdafceb89bed371d2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 13:56:04 +0000 Subject: [PATCH 13/17] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- usbguard-notifier.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usbguard-notifier.spec b/usbguard-notifier.spec index 21474cd..25344c7 100644 --- a/usbguard-notifier.spec +++ b/usbguard-notifier.spec @@ -1,6 +1,6 @@ Name: usbguard-notifier Version: 0.1.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A tool for detecting usbguard policy and device presence changes License: GPL-2.0-or-later @@ -69,6 +69,9 @@ make install INSTALL='install -p' DESTDIR=%{buildroot} %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 0.1.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Sat Jul 20 2024 Fedora Release Engineering - 0.1.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From df8129750ab856a7f9637269a46b6f34d82e90d3 Mon Sep 17 00:00:00 2001 From: Cropi Date: Thu, 24 Apr 2025 10:56:20 +0200 Subject: [PATCH 14/17] Rebase to 0.1.1 Remove catch dependency resolves: rhbz#2270438 --- .gitignore | 1 + remove-catch.patch | 366 +++++++++++++++++++++++++++++++++++++++++ sources | 2 +- usbguard-notifier.spec | 16 +- 4 files changed, 376 insertions(+), 9 deletions(-) create mode 100644 remove-catch.patch diff --git a/.gitignore b/.gitignore index 5257415..63f9fa8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /usbguard-notifier-0.0.5.tar.gz /usbguard-notifier-0.0.6.tar.gz /usbguard-notifier-0.1.0.tar.gz +/usbguard-notifier-0.1.1.tar.gz diff --git a/remove-catch.patch b/remove-catch.patch new file mode 100644 index 0000000..0f1a503 --- /dev/null +++ b/remove-catch.patch @@ -0,0 +1,366 @@ +diff --git a/Makefile.am b/Makefile.am +index 64f899e..3625717 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -20,7 +20,6 @@ + ACLOCAL_AMFLAGS = -I m4 + CLEANFILES = + +-SUBDIRS = src/Tests/ + bin_PROGRAMS = usbguard-notifier + if NOTIFIER_CLI_ENABLED + bin_PROGRAMS += \ +@@ -31,8 +30,7 @@ EXTRA_DIST = \ + src/BuildConfig.h.in \ + README.md \ + LICENSE \ +- CHANGELOG.md \ +- src/ThirdParty/Catch2/single_include/catch2 ++ CHANGELOG.md + + usbguard_notifier_SOURCES = \ + src/usbguard-icon.hpp \ +diff --git a/configure.ac b/configure.ac +index 3728e4c..a867ee6 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -127,31 +127,6 @@ AC_SUBST(SYSTEMD_UNIT_DIR, $systemd_unit_dir) + AC_DEFINE([SYSTEMD_SUPPORT_ENABLED], [1], [Enable systemd support int the project]) + AM_CONDITIONAL([SYSTEMD_SUPPORT_ENABLED], [test "x$systemd" = xyes ]) + +-# Catch C++ library +-AC_ARG_WITH([bundled-catch], AS_HELP_STRING([--with-bundled-catch], +- [Build using the bundled Catch library]), +- [with_bundled_catch=$withval], [with_bundled_catch=no]) +-if test "x$with_bundled_catch" = xyes; then +- catch_CFLAGS="-I\$(top_srcdir)/src/ThirdParty/Catch2/single_include/catch2" +- catch_LIBS="" +- AC_MSG_NOTICE([Using bundled Catch library]) +- catch_summary="bundled; $catch_CFLAGS $catch_LIBS" +-else +- SAVE_CPPFLAGS=$CPPFLAGS +- CPPFLAGS="-std=c++11 $CPPFLAGS -I/usr/include/catch" +- AC_LANG_PUSH([C++]) +- AC_CHECK_HEADER([catch.hpp], [], [AC_MSG_FAILURE(catch.hpp not found or not +- usable. Re-run with --with-bundled-catch to use the bundled library.)]) +- AC_LANG_POP +- catch_CFLAGS="-I/usr/include/catch" +- catch_LIBS="" +- CPPFLAGS=$SAVE_CPPFLAGS +- catch_summary="system-wide; +- $catch_CFLAGS $catch_LIBS" +-fi +-AC_SUBST([catch_CFLAGS]) +-AC_SUBST([catch_LIBS]) +- + CXXFLAGS_DEBUG="-g -O2" + AC_ARG_ENABLE( + [debug-build], +@@ -184,7 +159,6 @@ AM_CONDITIONAL([CUSTOM_USBGUARD_DEVEL_ENABLED], [test "x$custom_usbguard_devel_e + + AC_CONFIG_FILES([ + Makefile +- src/Tests/Makefile + ]) + + AC_OUTPUT +@@ -194,7 +168,6 @@ echo "============== MACROS =================" + echo " systemd: $systemd_unit_dir" + echo "" + echo "========== LINKER OPTIONS =============" +-echo " Catch: $catch_summary" + echo " libnotify: $libnotify_summary" + echo " libusbguard: $libusbguard_summary" + echo " librsvg: $librsvg_summary" +diff --git a/src/Tests/Makefile.am b/src/Tests/Makefile.am +deleted file mode 100644 +index 54c1765..0000000 +--- a/src/Tests/Makefile.am ++++ /dev/null +@@ -1,45 +0,0 @@ +-## +-## Copyright (C) 2019 Red Hat, Inc. +-## +-## 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 . +-## +-## Author(s): Zoltán Fridrich +-## +- +-AM_CPPFLAGS = \ +- -I$(top_srcdir)/src \ +- @catch_CFLAGS@ \ +- -fPIC +- +-EXTRA_DIST = \ +- $(top_srcdir)/src/ThirdParty/Catch2 +- +-TESTS_ENVIRONMENT = \ +- builddir=$(top_builddir) \ +- srcdir=$(top_srcdir) \ +- abs_top_srcdir=$(abs_top_srcdir) +- +-TESTS = \ +- test-unit +- +-check_PROGRAMS = \ +- test-unit +- +-test_unit_SOURCES=\ +- main.cpp \ +- Unit/test_notifier_cli.cpp \ +- ../NotifierCLI.hpp \ +- ../NotifierCLI.cpp \ +- ../Serializer.hpp \ +- ../Serializer.cpp +diff --git a/src/Tests/Unit/test_notifier_cli.cpp b/src/Tests/Unit/test_notifier_cli.cpp +deleted file mode 100644 +index d77cd71..0000000 +--- a/src/Tests/Unit/test_notifier_cli.cpp ++++ /dev/null +@@ -1,227 +0,0 @@ +-#include "NotifierCLI.hpp" +- +-#include +- +-using namespace usbguardNotifier; +- +-TEST_CASE("Notifier CLI", "[CLI]") +-{ +- SECTION("Construct empty") { +- CLI::map e; +- CLI cli(e); +- REQUIRE(cli.getDb().empty()); +- REQUIRE(cli.getIterator() == cli.getDb().cend()); +- } +- CLI::map db = { +- { 1, {}}, +- { 2, {}}, +- { 3, {}}, +- { 4, {}}, +- { 5, {}}, +- { 6, {}}, +- { 7, {}}, +- { 8, {}}, +- { 9, {}} +- }; +- CLI cli(db); +- +- SECTION("Construct non-empty") { +- REQUIRE(cli.getDb() == db); +- REQUIRE(cli.getIterator() == cli.getDb().cbegin()); +- } +- +- SECTION("Jump") { +- cli.jump("2"); +- REQUIRE(cli.getIterator() == db.find(2)); +- cli.jump("0"); +- REQUIRE(cli.getIterator() == db.find(2)); +- cli.jump("-1"); +- REQUIRE(cli.getIterator() == db.find(2)); +- cli.jump("10"); +- REQUIRE(cli.getIterator() == db.find(2)); +- cli.jump("9"); +- REQUIRE(cli.getIterator() == db.find(9)); +- cli.jump("9"); +- REQUIRE(cli.getIterator() == db.find(9)); +- cli.jump("1"); +- REQUIRE(cli.getIterator() == db.find(1)); +- } +- +- SECTION("Next") { +- cli.jump("1"); +- REQUIRE(cli.getIterator() == cli.getDb().cbegin()); +- +- cli.next(""); +- REQUIRE(cli.getIterator() == db.find(2)); +- cli.next(""); +- REQUIRE(cli.getIterator() == db.find(3)); +- cli.next(""); +- REQUIRE(cli.getIterator() == db.find(4)); +- cli.next(""); +- REQUIRE(cli.getIterator() == db.find(5)); +- cli.next(""); +- REQUIRE(cli.getIterator() == db.find(6)); +- cli.next(""); +- REQUIRE(cli.getIterator() == db.find(7)); +- cli.next(""); +- REQUIRE(cli.getIterator() == db.find(8)); +- cli.next(""); +- REQUIRE(cli.getIterator() == db.find(9)); +- cli.next(""); +- REQUIRE(cli.getIterator() == db.find(9)); +- } +- +- SECTION("Previous") { +- cli.jump("9"); +- REQUIRE(cli.getIterator() == cli.getDb().find(9)); +- +- cli.previous(""); +- REQUIRE(cli.getIterator() == db.find(8)); +- cli.previous(""); +- REQUIRE(cli.getIterator() == db.find(7)); +- cli.previous(""); +- REQUIRE(cli.getIterator() == db.find(6)); +- cli.previous(""); +- REQUIRE(cli.getIterator() == db.find(5)); +- cli.previous(""); +- REQUIRE(cli.getIterator() == db.find(4)); +- cli.previous(""); +- REQUIRE(cli.getIterator() == db.find(3)); +- cli.previous(""); +- REQUIRE(cli.getIterator() == db.find(2)); +- cli.previous(""); +- REQUIRE(cli.getIterator() == db.find(1)); +- cli.previous(""); +- REQUIRE(cli.getIterator() == db.find(1)); +- } +- +- SECTION("Execute - jump") { +- cli.execute("jump", "2"); +- REQUIRE(cli.getIterator() == db.find(2)); +- cli.execute("jump", "0"); +- REQUIRE(cli.getIterator() == db.find(2)); +- cli.execute("jump", "-1"); +- REQUIRE(cli.getIterator() == db.find(2)); +- cli.execute("jump", "10"); +- REQUIRE(cli.getIterator() == db.find(2)); +- cli.execute("jump", "9"); +- REQUIRE(cli.getIterator() == db.find(9)); +- cli.execute("jump", "9"); +- REQUIRE(cli.getIterator() == db.find(9)); +- cli.execute("jump", "1"); +- REQUIRE(cli.getIterator() == db.find(1)); +- } +- +- SECTION("Execute - next") { +- cli.execute("jump", "1"); +- REQUIRE(cli.getIterator() == cli.getDb().cbegin()); +- +- cli.execute("next", ""); +- REQUIRE(cli.getIterator() == db.find(2)); +- cli.execute("next", ""); +- REQUIRE(cli.getIterator() == db.find(3)); +- cli.execute("next", ""); +- REQUIRE(cli.getIterator() == db.find(4)); +- cli.execute("next", ""); +- REQUIRE(cli.getIterator() == db.find(5)); +- cli.execute("next", ""); +- REQUIRE(cli.getIterator() == db.find(6)); +- cli.execute("next", ""); +- REQUIRE(cli.getIterator() == db.find(7)); +- cli.execute("next", ""); +- REQUIRE(cli.getIterator() == db.find(8)); +- cli.execute("next", ""); +- REQUIRE(cli.getIterator() == db.find(9)); +- cli.execute("next", ""); +- REQUIRE(cli.getIterator() == db.find(9)); +- } +- +- SECTION("Execute - previous") { +- cli.execute("jump", "9"); +- REQUIRE(cli.getIterator() == cli.getDb().find(9)); +- +- cli.execute("previous", ""); +- REQUIRE(cli.getIterator() == db.find(8)); +- cli.execute("previous", ""); +- REQUIRE(cli.getIterator() == db.find(7)); +- cli.execute("previous", ""); +- REQUIRE(cli.getIterator() == db.find(6)); +- cli.execute("previous", ""); +- REQUIRE(cli.getIterator() == db.find(5)); +- cli.execute("previous", ""); +- REQUIRE(cli.getIterator() == db.find(4)); +- cli.execute("previous", ""); +- REQUIRE(cli.getIterator() == db.find(3)); +- cli.execute("previous", ""); +- REQUIRE(cli.getIterator() == db.find(2)); +- cli.execute("previous", ""); +- REQUIRE(cli.getIterator() == db.find(1)); +- cli.execute("previous", ""); +- REQUIRE(cli.getIterator() == db.find(1)); +- } +- +- SECTION("Execute short - j") { +- cli.execute("j", "2"); +- REQUIRE(cli.getIterator() == db.find(2)); +- cli.execute("j", "0"); +- REQUIRE(cli.getIterator() == db.find(2)); +- cli.execute("j", "-1"); +- REQUIRE(cli.getIterator() == db.find(2)); +- cli.execute("j", "10"); +- REQUIRE(cli.getIterator() == db.find(2)); +- cli.execute("j", "9"); +- REQUIRE(cli.getIterator() == db.find(9)); +- cli.execute("j", "9"); +- REQUIRE(cli.getIterator() == db.find(9)); +- cli.execute("j", "1"); +- REQUIRE(cli.getIterator() == db.find(1)); +- } +- +- SECTION("Execute short - n") { +- cli.execute("j", "1"); +- REQUIRE(cli.getIterator() == cli.getDb().cbegin()); +- +- cli.execute("n", ""); +- REQUIRE(cli.getIterator() == db.find(2)); +- cli.execute("n", ""); +- REQUIRE(cli.getIterator() == db.find(3)); +- cli.execute("n", ""); +- REQUIRE(cli.getIterator() == db.find(4)); +- cli.execute("n", ""); +- REQUIRE(cli.getIterator() == db.find(5)); +- cli.execute("n", ""); +- REQUIRE(cli.getIterator() == db.find(6)); +- cli.execute("n", ""); +- REQUIRE(cli.getIterator() == db.find(7)); +- cli.execute("n", ""); +- REQUIRE(cli.getIterator() == db.find(8)); +- cli.execute("n", ""); +- REQUIRE(cli.getIterator() == db.find(9)); +- cli.execute("n", ""); +- REQUIRE(cli.getIterator() == db.find(9)); +- } +- +- SECTION("Execute short - p") { +- cli.execute("j", "9"); +- REQUIRE(cli.getIterator() == cli.getDb().find(9)); +- +- cli.execute("p", ""); +- REQUIRE(cli.getIterator() == db.find(8)); +- cli.execute("p", ""); +- REQUIRE(cli.getIterator() == db.find(7)); +- cli.execute("p", ""); +- REQUIRE(cli.getIterator() == db.find(6)); +- cli.execute("p", ""); +- REQUIRE(cli.getIterator() == db.find(5)); +- cli.execute("p", ""); +- REQUIRE(cli.getIterator() == db.find(4)); +- cli.execute("p", ""); +- REQUIRE(cli.getIterator() == db.find(3)); +- cli.execute("p", ""); +- REQUIRE(cli.getIterator() == db.find(2)); +- cli.execute("p", ""); +- REQUIRE(cli.getIterator() == db.find(1)); +- cli.execute("p", ""); +- REQUIRE(cli.getIterator() == db.find(1)); +- } +-} +diff --git a/src/Tests/main.cpp b/src/Tests/main.cpp +deleted file mode 100644 +index b3143fb..0000000 +--- a/src/Tests/main.cpp ++++ /dev/null +@@ -1,2 +0,0 @@ +-#define CATCH_CONFIG_MAIN +-#include diff --git a/sources b/sources index b790302..f3e99eb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (usbguard-notifier-0.1.0.tar.gz) = b3414dbbbc2877e6ad29c8848942f8266293d6d3ba861724a61198af85d6db4cf5f1b0d0eb4af2a973288737b7b03614e9ebe39d0287a06fbe66be9e1d39d84a +SHA512 (usbguard-notifier-0.1.1.tar.gz) = 5540739301f4f4c83f7443b740cf7345be7928f3ed697878094dee1752eac7dedfab9eb652856bfa555be9bfa24687c4b74194afa022973848af13328f0ca1ba diff --git a/usbguard-notifier.spec b/usbguard-notifier.spec index 25344c7..497b675 100644 --- a/usbguard-notifier.spec +++ b/usbguard-notifier.spec @@ -1,13 +1,12 @@ Name: usbguard-notifier -Version: 0.1.0 -Release: 6%{?dist} +Version: 0.1.1 +Release: 1%{?dist} Summary: A tool for detecting usbguard policy and device presence changes License: GPL-2.0-or-later URL: https://github.com/Cropi/%{name} Source0: https://github.com/Cropi/usbguard-notifier/releases/download/%{name}-%{version}/%{name}-%{version}.tar.gz -# https://github.com/Cropi/usbguard-notifier/pull/74 -Patch0: 0001-gcc13.patch +Patch0: remove-catch.patch Requires: systemd @@ -18,7 +17,6 @@ BuildRequires: usbguard-devel BuildRequires: librsvg2-devel BuildRequires: libnotify-devel BuildRequires: asciidoc -BuildRequires: catch1-devel BuildRequires: systemd-rpm-macros %description @@ -37,14 +35,11 @@ export CXXFLAGS="$RPM_OPT_FLAGS" %configure \ --disable-silent-rules \ - --without-bundled-catch \ --enable-debug-build %set_build_flags make %{?_smp_mflags} -%check -make check %install make install INSTALL='install -p' DESTDIR=%{buildroot} @@ -69,6 +64,11 @@ make install INSTALL='install -p' DESTDIR=%{buildroot} %changelog +* Thu Apr 24 2025 Attila Lakatos - 0.1.1-1 +- Rebase to 0.1.1 +- Remove catch dependency + resolves: rhbz#2270438 + * Sun Jan 19 2025 Fedora Release Engineering - 0.1.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 6795657ee436bffee9fd0c924c017c0bbc2f43fc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 19:52:24 +0000 Subject: [PATCH 15/17] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- usbguard-notifier.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usbguard-notifier.spec b/usbguard-notifier.spec index 497b675..5651099 100644 --- a/usbguard-notifier.spec +++ b/usbguard-notifier.spec @@ -1,6 +1,6 @@ Name: usbguard-notifier Version: 0.1.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A tool for detecting usbguard policy and device presence changes License: GPL-2.0-or-later @@ -64,6 +64,9 @@ make install INSTALL='install -p' DESTDIR=%{buildroot} %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 0.1.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Thu Apr 24 2025 Attila Lakatos - 0.1.1-1 - Rebase to 0.1.1 - Remove catch dependency From 901ba1d8633dea0e9d7e35d8c4377b7c537728c8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 19:41:33 +0000 Subject: [PATCH 16/17] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- usbguard-notifier.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usbguard-notifier.spec b/usbguard-notifier.spec index 5651099..2c4b293 100644 --- a/usbguard-notifier.spec +++ b/usbguard-notifier.spec @@ -1,6 +1,6 @@ Name: usbguard-notifier Version: 0.1.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A tool for detecting usbguard policy and device presence changes License: GPL-2.0-or-later @@ -64,6 +64,9 @@ make install INSTALL='install -p' DESTDIR=%{buildroot} %changelog +* Sat Jan 17 2026 Fedora Release Engineering - 0.1.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Fri Jul 25 2025 Fedora Release Engineering - 0.1.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 719dcf843564ecdec891915e672eb213a4d278e8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 08:16:10 +0000 Subject: [PATCH 17/17] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- usbguard-notifier.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usbguard-notifier.spec b/usbguard-notifier.spec index 2c4b293..5996be7 100644 --- a/usbguard-notifier.spec +++ b/usbguard-notifier.spec @@ -1,6 +1,6 @@ Name: usbguard-notifier Version: 0.1.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A tool for detecting usbguard policy and device presence changes License: GPL-2.0-or-later @@ -64,6 +64,9 @@ make install INSTALL='install -p' DESTDIR=%{buildroot} %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 0.1.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Sat Jan 17 2026 Fedora Release Engineering - 0.1.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild