From 09251f96ec2ccfb23380595f9e8201c887b2d1fb Mon Sep 17 00:00:00 2001 From: Christian Kellner Date: Mon, 15 Jun 2020 20:53:17 +0200 Subject: [PATCH 1/3] bolt 0.9 release Drop all patches, all included in the new upstream release. --- .gitignore | 1 + bolt-error-typedef.patch | 27 ---------------------- bolt.spec | 10 ++++---- sources | 2 +- wakeup-uevents.patch | 50 ---------------------------------------- 5 files changed, 8 insertions(+), 82 deletions(-) delete mode 100644 bolt-error-typedef.patch delete mode 100644 wakeup-uevents.patch diff --git a/.gitignore b/.gitignore index 7b697d4..75c1226 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ tests/source/ /bolt-0.6.tar.gz /bolt-0.7.tar.gz /bolt-0.8.tar.gz +/bolt-0.9.tar.gz diff --git a/bolt-error-typedef.patch b/bolt-error-typedef.patch deleted file mode 100644 index f982608..0000000 --- a/bolt-error-typedef.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 5a739574608e5190816b3efd22e75f214c5fe4c4 Mon Sep 17 00:00:00 2001 -From: Christian Kellner -Date: Thu, 23 Jan 2020 19:07:05 +0100 -Subject: [PATCH] common: fix BoltError to be a typedef - -It was always meant to be a typedef not a (tentative) definition -of a global variable. ---- - common/bolt-error.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/common/bolt-error.h b/common/bolt-error.h -index 569da46..0486964 100644 ---- a/common/bolt-error.h -+++ b/common/bolt-error.h -@@ -36,7 +36,7 @@ G_BEGIN_DECLS - * - * Error codes used inside Bolt. - */ --enum { -+typedef enum { - BOLT_ERROR_FAILED = 0, - BOLT_ERROR_UDEV, - BOLT_ERROR_NOKEY, --- -2.24.1 - diff --git a/bolt.spec b/bolt.spec index d068918..30700b0 100644 --- a/bolt.spec +++ b/bolt.spec @@ -1,12 +1,10 @@ Name: bolt -Version: 0.8 -Release: 4%{?dist} +Version: 0.9 +Release: 1%{?dist} Summary: Thunderbolt device manager License: LGPLv2+ URL: https://gitlab.freedesktop.org/bolt/bolt Source0: %{url}/-/archive/%{version}/%{name}-%{version}.tar.gz -Patch0: wakeup-uevents.patch -Patch1: bolt-error-typedef.patch BuildRequires: gcc BuildRequires: asciidoc @@ -78,6 +76,10 @@ mentioned tasks. %ghost %dir %{_localstatedir}/lib/boltd %changelog +* Mon Jun 15 2020 Christian Kellner - 0.9-1 +- bolt 0.9 release + Drop all patches (all merged upstream). + * Tue Jan 28 2020 Fedora Release Engineering - 0.8-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 1e80b94..0889dd9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (bolt-0.8.tar.gz) = 0fdbc026178a4ca6a8c53aa46933d1c411eb04e350955f8b10c7faff814576d0796dd28e56b968648e549c79cf5fa13d43970d797595af0f66457abaef8ace09 +SHA512 (bolt-0.9.tar.gz) = 427e9ad95a8d018dd22326cc4b458fc9149b001d3aa6e4bb8e4047eaf6c3cf04a4dc3be9396049734dc0bd54f990b3bce31b6eef4031e3b671a6202a588cfe78 diff --git a/wakeup-uevents.patch b/wakeup-uevents.patch deleted file mode 100644 index a10d420..0000000 --- a/wakeup-uevents.patch +++ /dev/null @@ -1,50 +0,0 @@ -From ea3e3e30eb3ce76f6a0ae816a0f35809872f4edf Mon Sep 17 00:00:00 2001 -From: Christian Kellner -Date: Mon, 13 Jan 2020 17:38:47 +0100 -Subject: [PATCH] manager: ignore wakeup device uevents for probing - -The probing detection code should ignore wakeup device uevents -because these virtual devices can be added (and removed) without -and correspondence to any physical thunderbolt device (un-)plug -events. ---- - boltd/bolt-manager.c | 16 ++++++++++++++++ - 1 file changed, 16 insertions(+) - -diff --git a/boltd/bolt-manager.c b/boltd/bolt-manager.c -index 877c008..c8b60da 100644 ---- a/boltd/bolt-manager.c -+++ b/boltd/bolt-manager.c -@@ -2043,6 +2043,16 @@ device_is_thunderbolt_root (struct udev_device *dev) - bolt_streq (driver, "thunderbolt"); - } - -+static gboolean -+device_is_wakeup (struct udev_device *dev) -+{ -+ const char *subsys; -+ -+ subsys = udev_device_get_subsystem (dev); -+ -+ return bolt_streq (subsys, "wakeup"); -+} -+ - static gboolean - probing_add_root (BoltManager *mgr, - struct udev_device *dev) -@@ -2080,6 +2090,12 @@ manager_probing_device_added (BoltManager *mgr, - if (syspath == NULL) - return; - -+ /* ignore events for wakeup devices which get removed -+ * and added at random time without any connection to -+ * any physical thunderbolt device */ -+ if (device_is_wakeup (dev)) -+ return; -+ - roots = mgr->probing_roots; - for (guint i = 0; i < roots->len; i++) - { --- -2.24.1 - From 1bddd4bc8294c8573fd49f516e78fae739a3e22e Mon Sep 17 00:00:00 2001 From: Christian Kellner Date: Mon, 15 Jun 2020 22:39:25 +0200 Subject: [PATCH 2/3] ci: gate also on rawhide Also, drop the `dist.depcheck`, which is not available anymore. --- gating.yaml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gating.yaml b/gating.yaml index d71584a..f2c6454 100644 --- a/gating.yaml +++ b/gating.yaml @@ -3,4 +3,10 @@ product_versions: - fedora-* decision_context: bodhi_update_push_testing rules: - - !PassingTestCaseRule {test_case_name: dist.depcheck} + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} +--- !Policy +product_versions: + - fedora-* +decision_context: bodhi_update_push_stable +rules: + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} From 9328211ca1b096554bd71942d84d839ed037b9de Mon Sep 17 00:00:00 2001 From: Christian Kellner Date: Tue, 1 Dec 2020 14:04:01 +0100 Subject: [PATCH 3/3] bolt 0.9.1 release The upstream release 0.9.1 is a bugfix release to address issues with integrated thunderbolt on Ice Lake. Reword the description with with less emphasis on Thunderbolt version, since bolt is also responsible for USB4 and Thunderbolt 4. --- .gitignore | 1 + bolt.spec | 10 +++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 75c1226..bdf0f30 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ tests/source/ /bolt-0.7.tar.gz /bolt-0.8.tar.gz /bolt-0.9.tar.gz +/bolt-0.9.1.tar.gz diff --git a/bolt.spec b/bolt.spec index 30700b0..48c047e 100644 --- a/bolt.spec +++ b/bolt.spec @@ -1,5 +1,5 @@ Name: bolt -Version: 0.9 +Version: 0.9.1 Release: 1%{?dist} Summary: Thunderbolt device manager License: LGPLv2+ @@ -26,8 +26,8 @@ BuildRequires: umockdev-devel %endif %description -bolt is a system daemon to manage thunderbolt 3 devices via a D-BUS -API. Thunderbolt 3 features different security modes that require +bolt is a system daemon to manage Thunderbolt devices via a D-BUS +API. Thunderbolt 3 introduced different security modes that require devices to be authorized before they can be used. The D-Bus API can be used to list devices, enroll them (authorize and store them in the local database) and forget them again (remove previously enrolled @@ -76,6 +76,10 @@ mentioned tasks. %ghost %dir %{_localstatedir}/lib/boltd %changelog +* Tue Dec 1 2020 Christian Kellner - 0.9.1-1 +- bolt 0.9.1 release +- Update description with less emphasis on Thunderbolt version + * Mon Jun 15 2020 Christian Kellner - 0.9-1 - bolt 0.9 release Drop all patches (all merged upstream). diff --git a/sources b/sources index 0889dd9..5d19504 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (bolt-0.9.tar.gz) = 427e9ad95a8d018dd22326cc4b458fc9149b001d3aa6e4bb8e4047eaf6c3cf04a4dc3be9396049734dc0bd54f990b3bce31b6eef4031e3b671a6202a588cfe78 +SHA512 (bolt-0.9.1.tar.gz) = c925c290de75d3fa2dfb9e86b2f14ea39279b3f2ab6bebeced72a7853c901d44de02157d684534af2b54edd3a2e0b2ba61e889579ab1b192f99e98a2d73685d9