import CS fwupd-1.9.26-1.el9

.fwupd.metadata

@@ -11,7 +11,7 @@ d3ae610f5b6e602feded54eae8d67ddb7c60e64f SOURCES/DBXUpdate-20220812-aa64.cab
 46a42362cd34c0d103cf534ca431508d24715e51 SOURCES/DBXUpdate-20230509-aa64.cab
 23d9544ef0f9b39a76d258f6d4a4a54d8f7592b2 SOURCES/DBXUpdate-20230509-ia32.cab
 bc6a604b29918d67d5fef745ad4375ca3d43d05e SOURCES/DBXUpdate-20230509-x64.cab
-a8c8f0cc046ecff12e425484bc5ec1eb7fe49e90 SOURCES/fwupd-1.9.13.tar.xz
+3b454ddcc0b6c9a3a8d099617d2b93d6440fa81d SOURCES/fwupd-1.9.26.tar.xz
 147b36f75fca288fd01d9ed4150866344d57df27 SOURCES/fwupd-efi-1.4.tar.xz
 4a07b56e28741884b86da6ac91f8f9929541a1e4 SOURCES/redhatsecureboot301.cer
 33e260486f5c12e47b72b90dfb779ca892f56c45 SOURCES/redhatsecureboot503.cer

.gitignore

@@ -11,7 +11,7 @@ SOURCES/DBXUpdate-20220812-x64.cab
 SOURCES/DBXUpdate-20230509-aa64.cab
 SOURCES/DBXUpdate-20230509-ia32.cab
 SOURCES/DBXUpdate-20230509-x64.cab
-SOURCES/fwupd-1.9.13.tar.xz
+SOURCES/fwupd-1.9.26.tar.xz
 SOURCES/fwupd-efi-1.4.tar.xz
 SOURCES/redhatsecureboot301.cer
 SOURCES/redhatsecureboot503.cer

SOURCES/0001-Correctly-migrate-from-v2-to-database-schema-v10.patch

@@ -1,47 +0,0 @@
-From 6fc21ec8364babc2edc57d6a39ee44c1e72cc6b2 Mon Sep 17 00:00:00 2001
-From: Richard Hughes <richard@hughsie.com>
-Date: Sun, 18 Feb 2024 10:23:03 +0000
-Subject: [PATCH] Correctly migrate from v2 to database schema v10
-
-Artificially bump the schema version to v11 to ensure the migration is done.
-
-diff --git a/src/fu-history.c b/src/fu-history.c
-index 21a4fd3e8..3be03c3a7 100644
---- a/src/fu-history.c
-+++ b/src/fu-history.c
-@@ -21,7 +21,20 @@
- #include "fu-history.h"
- #include "fu-security-attr-common.h"
- 
--#define FU_HISTORY_CURRENT_SCHEMA_VERSION 10
-+/*
-+ * v1	legacy schema
-+ * v2	initial schema
-+ * v3	add checksum_device to history
-+ * v4	add protocol to history
-+ * v5	create table approved_firmware
-+ * v6	create table blocked_firmware
-+ * v7	create table hsi_history
-+ * v8	add release_id to history
-+ * v9	add appstream_id to history
-+ * v10	add version_format to history
-+ * v11	no changes, bumped due to bungled migration to v10
-+ */
-+#define FU_HISTORY_CURRENT_SCHEMA_VERSION 11
- 
- static void
- fu_history_finalize(GObject *object);
-@@ -466,11 +479,12 @@ fu_history_create_or_migrate(FuHistory *self, guint schema_ver, GError **error)
- 	case 8:
- 		if (!fu_history_migrate_database_v8(self, error))
- 			return FALSE;
--		break;
- 	/* fall through */
- 	case 9:
-+	case 10:
- 		if (!fu_history_migrate_database_v9(self, error))
- 			return FALSE;
-+		/* no longer fall through */
- 		break;
- 	default:
- 		/* this is probably okay, but return an error if we ever delete

SOURCES/0001-Revert-trivial-bump-libjcat-and-passim-deps.patch

@@ -0,0 +1,38 @@
+From 11a6f914ae27953c9070f6e4cd562a326e1cb60c Mon Sep 17 00:00:00 2001
+From: Richard Hughes <richard@hughsie.com>
+Date: Tue, 15 Oct 2024 14:27:08 +0100
+Subject: [PATCH] Revert "trivial: bump libjcat and passim deps"
+
+This reverts commit 774b87fed0c6addd49cdc65a3ecc24923f7c76ae.
+
+We can update the subproject, but we can't raise the deps in a stable branch
+otherwise we make it really hard to build for RHEL and Ubuntu LTS.
+---
+ meson.build | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 167e529d1..5047cab72 100644
+--- a/meson.build
++++ b/meson.build
+@@ -241,7 +241,7 @@ sqlite = dependency('sqlite3', required: get_option('sqlite'))
+ if sqlite.found()
+   conf.set('HAVE_SQLITE', '1')
+ endif
+-passim = dependency('passim', version: '>= 0.1.5', required: get_option('passim'), fallback: ['passim', 'passim_dep'])
++passim = dependency('passim', version: '>= 0.1.2', required: get_option('passim'), fallback: ['passim', 'passim_dep'])
+ if passim.found()
+   conf.set('HAVE_PASSIM', '1')
+ endif
+@@ -253,7 +253,7 @@ if libarchive.found()
+   endif
+ endif
+ endif
+-libjcat = dependency('jcat', version: '>= 0.2.0', fallback: ['libjcat', 'libjcat_dep'])
++libjcat = dependency('jcat', version: '>= 0.1.4', fallback: ['libjcat', 'libjcat_dep'])
+ libjsonglib = dependency('json-glib-1.0', version: '>= 1.6.0')
+ valgrind = dependency('valgrind', required: false)
+ libcurl = dependency('libcurl', version: '>= 7.62.0', required: get_option('curl'))
+-- 
+2.47.0
+

SPECS/fwupd.spec

@@ -48,15 +48,15 @@
 
 Summary:   Firmware update daemon
 Name:      fwupd
-Version:   1.9.13
+Version:   1.9.26
-Release:   2%{?dist}
+Release:   1%{?dist}
 License:   LGPLv2+
 URL:       https://github.com/fwupd/fwupd
 Source0:   http://people.freedesktop.org/~hughsient/releases/%{name}-%{version}.tar.xz
 Source2:   http://people.freedesktop.org/~hughsient/releases/fwupd-efi-1.4.tar.xz
 
 Patch101:  0001-generate_binary-Add-NX-COMPAT-flag-manually-when-gen.patch
-Patch102:  0001-Correctly-migrate-from-v2-to-database-schema-v10.patch
+Patch201:  0001-Revert-trivial-bump-libjcat-and-passim-deps.patch
 
 Source10:  http://people.redhat.com/rhughes/dbx/DBXUpdate-20100307-x64.cab
 Source11:  http://people.redhat.com/rhughes/dbx/DBXUpdate-20140413-x64.cab
@@ -196,7 +196,7 @@ can be flashed using flashrom. It is probably not required on servers.
 
 %prep
 %setup -q
-%patch102 -p1
+%patch201 -p1
 
 mkdir -p subprojects/fwupd-efi
 tar xfvs %{SOURCE2} -C subprojects/fwupd-efi --strip-components=1
@@ -318,7 +318,6 @@ done
 
 %postun
 %systemd_postun_with_restart fwupd.service fwupd-refresh.timer
-%systemd_postun_with_restart pesign.service
 
 %files -f %{name}.lang
 %doc README.md
@@ -326,7 +325,7 @@ done
 %config(noreplace)%{_sysconfdir}/fwupd/fwupd.conf
 %dir %{_libexecdir}/fwupd
 %{_libexecdir}/fwupd/fwupd
-%ifarch i686 x86_64
+%ifarch x86_64
 %{_libexecdir}/fwupd/fwupd-detect-cet
 %endif
 %{_libexecdir}/fwupd/fwupdoffline
@@ -358,7 +357,12 @@ done
 %{_datadir}/bash-completion/completions/fwupdmgr
 %{_datadir}/bash-completion/completions/fwupdtool
 %{_datadir}/fish/vendor_completions.d/fwupdmgr.fish
+%dir %{_datadir}/fwupd
+%dir %{_datadir}/fwupd/metainfo
 %{_datadir}/fwupd/metainfo/org.freedesktop.fwupd*.metainfo.xml
+%dir %{_datadir}/fwupd/remotes.d
+%dir %{_datadir}/fwupd/remotes.d/vendor
+%dir %{_datadir}/fwupd/remotes.d/vendor/firmware
 %{_datadir}/fwupd/remotes.d/vendor/firmware/README.md
 %{_datadir}/dbus-1/interfaces/org.freedesktop.fwupd.xml
 %{_datadir}/polkit-1/actions/org.freedesktop.fwupd.policy
@@ -453,6 +457,12 @@ done
 %endif
 
 %changelog
+* Tue Oct 15 2024 Richard Hughes <richard@hughsie.com> 1.9.26-1
+- Rebase to get hardware support for CERTPX-13842
+- Resolves: #RHEL-16637
+- Resolves: #RHEL-35373
+- Resolves: #RHEL-61930
+
 * Mon Feb 19 2024 Richard Hughes <richard@hughsie.com> 1.9.13-2
 - Fix upgrade from fwupd < v1.9.5
 - Resolves: #RHEL-15328