Compare commits

...

No commits in common. "c8" and "c9-beta" have entirely different histories.
c8 ... c9-beta

4 changed files with 139 additions and 17 deletions

View File

@ -1 +1 @@
a02f0bb9e9131b7369fa4f6ea5e74c7f7e4c18c5 SOURCES/bolt-0.9.1.tar.gz 83ed78a718d611b314fd8a4ce32db3dc3c233301 SOURCES/bolt-0.9.10.tar.gz

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/bolt-0.9.1.tar.gz SOURCES/bolt-0.9.10.tar.gz

View File

@ -0,0 +1,31 @@
From 74eace0d89b63be92615364568ba36ad7d748477 Mon Sep 17 00:00:00 2001
From: Kate Hsuan <hpa@redhat.com>
Date: Tue, 14 Feb 2023 16:25:04 +0800
Subject: [PATCH] test: test-unix: skip unix domain socket test
Skip the test since we can't test unix domain socket in mock.
---
tests/test-unix.c | 7 -------
1 file changed, 7 deletions(-)
diff --git a/tests/test-unix.c b/tests/test-unix.c
index 98de3db..366488f 100644
--- a/tests/test-unix.c
+++ b/tests/test-unix.c
@@ -198,13 +198,6 @@ main (int argc, char **argv)
test_pid_is_alive,
NULL);
- g_test_add ("/common/unix/bolt_sd_notify",
- TestNotify,
- NULL,
- test_notify_setup,
- test_sd_notify,
- test_notify_teardown);
-
g_test_add ("/common/unix/sd_watchdog_enabled",
TestDummy,
NULL,
--
2.39.1

View File

@ -1,10 +1,21 @@
## START: Set by rpmautospec
## (rpmautospec version 0.6.5)
## RPMAUTOSPEC: autorelease, autochangelog
%define autorelease(e:s:pb:n) %{?-p:0.}%{lua:
release_number = 1;
base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}"));
print(release_number + base_release_number - 1);
}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}}
## END: Set by rpmautospec
Name: bolt Name: bolt
Version: 0.9.1 Version: 0.9.10
Release: 1%{?dist} Release: %autorelease
Summary: Thunderbolt device manager Summary: Thunderbolt device manager
License: LGPLv2+ License: LGPLv2+
URL: https://gitlab.freedesktop.org/bolt/bolt URL: https://gitlab.freedesktop.org/bolt/bolt
Source0: %{url}/-/archive/%{version}/%{name}-%{version}.tar.gz Source0: %{url}/-/archive/%{version}/%{name}-%{version}.tar.gz
Patch0: 0001-test-test-unix-skip-unix-domain-socket-test.patch
BuildRequires: gcc BuildRequires: gcc
BuildRequires: asciidoc BuildRequires: asciidoc
@ -12,10 +23,19 @@ BuildRequires: meson
BuildRequires: libudev-devel BuildRequires: libudev-devel
BuildRequires: pkgconfig(gio-2.0) BuildRequires: pkgconfig(gio-2.0)
BuildRequires: pkgconfig(libudev) BuildRequires: pkgconfig(libudev)
BuildRequires: pkgconfig(systemd)
BuildRequires: polkit-devel BuildRequires: polkit-devel
BuildRequires: systemd BuildRequires: systemd
%{?systemd_requires} %{?systemd_requires}
# for the integration test (optional)
%if 0%{?fedora} || 0%{?rhel} > 8
BuildRequires: pygobject3-devel
BuildRequires: python3-dbus
BuildRequires: python3-dbusmock
BuildRequires: umockdev-devel
%endif
%description %description
bolt is a system daemon to manage Thunderbolt devices via a D-BUS bolt is a system daemon to manage Thunderbolt devices via a D-BUS
API. Thunderbolt 3 introduced different security modes that require API. Thunderbolt 3 introduced different security modes that require
@ -28,11 +48,19 @@ authorized as soon as they are connected. A command line tool, called
boltctl, can be used to control the daemon and perform all the above boltctl, can be used to control the daemon and perform all the above
mentioned tasks. mentioned tasks.
%package tests
Summary: Test files for bolt
Requires: %{name}%{?_isa} = %{version}-%{release}
%description tests
Test files for bolt
%prep %prep
%autosetup -p1 %autosetup -p1
%build %build
%meson -Ddb-name=boltd sed -i "s/WatchdogSec=3min/#WatchdogSec=3min/g" data/bolt.service.in
%meson -Ddb-name=boltd -Dinstall-tests=true
%meson_build %meson_build
%check %check
@ -40,7 +68,6 @@ mentioned tasks.
%install %install
%meson_install %meson_install
install -m0755 -d $RPM_BUILD_ROOT%{_localstatedir}/lib/boltd
%post %post
%systemd_post %{name}.service %systemd_post %{name}.service
@ -67,25 +94,87 @@ install -m0755 -d $RPM_BUILD_ROOT%{_localstatedir}/lib/boltd
%{_mandir}/man8/boltd.8* %{_mandir}/man8/boltd.8*
%ghost %dir %{_localstatedir}/lib/boltd %ghost %dir %{_localstatedir}/lib/boltd
%files tests
%{_libexecdir}/installed-tests/bolt
%changelog %changelog
* Wed Jan 13 2021 Christian Kellner <ckellner@redhat.com> - 0.9.1-1 ## START: Generated by rpmautospec
- bolt 0.9 upstream release * Fri Oct 24 2025 Kate Hsuan <hpa@redhat.com> - 0.9.10-1
- Update to the upstream version 0.9.10
- Update to 0.9.10
- Fix bolt exits when opening an empty version file
- Fix a NULL syspath variable causes SIGSEGV
* Tue Mar 26 2024 Kate Hsuan <hpa@redhat.com> - 0.9.7-1
- Update to upstream release 0.9.7
- Support 'nopcie' security level
* Mon Jan 9 2023 Kate Hsuan <hpa@redhat.com> - 0.9.5-1
- New 0.9.5 upstream release
* Sat Feb 26 2022 Christian Kellner <christian@kellner.me> - 0.9.2-1
- New upstream release
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 0.9.1-4
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 0.9.1-3
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Tue Dec 1 2020 Christian Kellner <ckellner@redhat.com> - 0.9.1-1
- bolt 0.9.1 release
- Update description with less emphasis on Thunderbolt version - Update description with less emphasis on Thunderbolt version
* Mon Jun 15 2020 Christian Kellner <ckellner@redhat.com> - 0.9-1 * Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.9-3
- bolt 0.9 upstream release - Second attempt - Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Fri Jun 14 2019 Christian Kellner <ckellner@redhat.com> - 0.8-2 * Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.9-2
- Rebuilt for fixed gating.yaml (remove missing tier1 gate) - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Mon Jun 15 2020 Christian Kellner <ckellner@redhat.com> - 0.9-1
- bolt 0.9 release
Drop all patches (all merged upstream).
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.8-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Thu Jan 23 2020 Christian Kellner <christian@kellner.me> - 0.8-3
- Add patch to ignore uevents from wakeup devices. See upstream issue
https://gitlab.freedesktop.org/bolt/bolt/issues/156
- Add patch to fix BoltError not being a typedef.
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.8-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Thu Jun 13 2019 Christian Kellner <ckellner@redhat.com> - 0.8-1 * Thu Jun 13 2019 Christian Kellner <ckellner@redhat.com> - 0.8-1
- bolt 0.8 upstream release with pre-boot ACL and IOMMU support - bolt 0.8 release
D-Bus Configuration moved from sysconfdir to datadir D-Bus Configuration moved from sysconfdir to datadir.
Resolves: #1629715 Package new CHNAGELOG.md.
* Wed Jul 18 2018 Christian Kellner <ckellner@redhat.com> - 0.4-1 * Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.7-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Tue Jan 1 2019 Christian Kellner <gicmo@redhat.com> - 0.7-1
- bolt 0.7 release
* Wed Nov 28 2018 Christian Kellner <ckellner@redhat.com> - 0.6-1
- bolt 0.6 release
* Fri Sep 21 2018 Christian Kellner <ckellner@redhat.com> - 0.5-1
- bolt 0.5 release
- Remove forge macros again and use gitlab as authorative source
- Testing depedencies are now only pulled in on Fedora
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Mon May 28 2018 Christian Kellner <ckellner@redhat.com> - 0.4-1
- bolt 0.4 upstream release - bolt 0.4 upstream release
- Remove optional test dependencies
* Tue Apr 10 2018 Christian Kellner <ckellner@redhat.com> - 0.3-1 * Tue Apr 10 2018 Christian Kellner <ckellner@redhat.com> - 0.3-1
- bolt 0.3 upstream release - bolt 0.3 upstream release
@ -105,3 +194,5 @@ install -m0755 -d $RPM_BUILD_ROOT%{_localstatedir}/lib/boltd
* Thu Dec 14 2017 Christian Kellner <ckellner@redhat.com> - 0.1-1 * Thu Dec 14 2017 Christian Kellner <ckellner@redhat.com> - 0.1-1
- Initial upstream release - Initial upstream release
## END: Generated by rpmautospec