Compare commits
No commits in common. "c8" and "c9s" have entirely different histories.
|
|
@ -1,9 +1 @@
|
|||
b2620c36bd23ca699567fd4e4add039ee4375247 SOURCES/DBXUpdate-20100307-x64.cab
|
||||
dfdb1d0d42c1563ca63bd45c7e2ddc48cbfc5023 SOURCES/DBXUpdate-20140413-x64.cab
|
||||
a5f73c606abb93bf61625e4628d27a2cd460f162 SOURCES/DBXUpdate-20160809-x64.cab
|
||||
b5b2dc87daca1d3f8081a323290432c141aa405d SOURCES/DBXUpdate-20200729-aa64.cab
|
||||
3fb407561768a3a2f5fb49d7738b5e0650e70810 SOURCES/DBXUpdate-20200729-ia32.cab
|
||||
89db93c9d9d20f81791a262e817b99d8882c8bb0 SOURCES/DBXUpdate-20200729-x64.cab
|
||||
59006fd556faeacc8185075c8fe7826249a2da32 SOURCES/fwupd-1.7.8.tar.xz
|
||||
1a586c3634ef190e6128351ee60fd17d0e584f7c SOURCES/fwupd-efi-1.3.tar.xz
|
||||
a62a28924d26cd49b6441170795a237ba33ec192 SOURCES/libjcat-0.1.9.tar.xz
|
||||
a8c8f0cc046ecff12e425484bc5ec1eb7fe49e90 fwupd-1.9.13.tar.xz
|
||||
|
|
|
|||
|
|
@ -1,9 +1,104 @@
|
|||
SOURCES/DBXUpdate-20100307-x64.cab
|
||||
SOURCES/DBXUpdate-20140413-x64.cab
|
||||
SOURCES/DBXUpdate-20160809-x64.cab
|
||||
SOURCES/DBXUpdate-20200729-aa64.cab
|
||||
SOURCES/DBXUpdate-20200729-ia32.cab
|
||||
SOURCES/DBXUpdate-20200729-x64.cab
|
||||
SOURCES/fwupd-1.7.8.tar.xz
|
||||
SOURCES/fwupd-efi-1.3.tar.xz
|
||||
SOURCES/libjcat-0.1.9.tar.xz
|
||||
/fwupd-0.1.0.tar.xz
|
||||
/fwupd-0.1.1.tar.xz
|
||||
/fwupd-0.1.2.tar.xz
|
||||
/fwupd-0.1.3.tar.xz
|
||||
/fwupd-0.1.4.tar.xz
|
||||
/fwupd-0.1.5.tar.xz
|
||||
/fwupd-0.1.6.tar.xz
|
||||
/fwupd-0.5.0.tar.xz
|
||||
/fwupd-0.5.1.tar.xz
|
||||
/fwupd-0.5.2.tar.xz
|
||||
/fwupd-0.5.3.tar.xz
|
||||
/fwupd-0.5.4.tar.xz
|
||||
/fwupd-0.6.0.tar.xz
|
||||
/fwupd-0.6.1.tar.xz
|
||||
/fwupd-0.6.2.tar.xz
|
||||
/fwupd-0.6.3.tar.xz
|
||||
/fwupd-0.7.0.tar.xz
|
||||
/fwupd-0.7.1.tar.xz
|
||||
/fwupd-0.7.2.tar.xz
|
||||
/fwupd-0.7.3.tar.xz
|
||||
/fwupd-0.7.4.tar.xz
|
||||
/fwupd-0.7.5.tar.xz
|
||||
/fwupd-0.8.0.tar.xz
|
||||
/fwupd-0.8.1.tar.xz
|
||||
/fwupd-0.8.2.tar.xz
|
||||
/fwupd-0.9.2.tar.xz
|
||||
/fwupd-0.9.3.tar.xz
|
||||
/fwupd-0.9.4.tar.xz
|
||||
/fwupd-0.9.5.tar.xz
|
||||
/fwupd-0.9.6.tar.xz
|
||||
/fwupd-0.9.7.tar.xz
|
||||
/fwupd-1.0.0.tar.xz
|
||||
/fwupd-1.0.1.tar.xz
|
||||
/fwupd-1.0.2.tar.xz
|
||||
/fwupd-1.0.3.tar.xz
|
||||
/fwupd-1.0.4.tar.xz
|
||||
/fwupd-1.0.5.tar.xz
|
||||
/fwupd-1.0.6.tar.xz
|
||||
/fwupd-1.0.7.tar.xz
|
||||
/fwupd-1.0.8.tar.xz
|
||||
/fwupd-1.1.0.tar.xz
|
||||
/fwupd-1.1.1.tar.xz
|
||||
/fwupd-1.1.2.tar.xz
|
||||
/fwupd-1.1.3.tar.xz
|
||||
/fwupd-1.2.0.tar.xz
|
||||
/fwupd-1.2.1.tar.xz
|
||||
/fwupd-1.2.2.tar.xz
|
||||
/fwupd-1.2.3.tar.xz
|
||||
/fwupd-1.2.4.tar.xz
|
||||
/fwupd-1.2.5.tar.xz
|
||||
/fwupd-1.2.6.tar.xz
|
||||
/fwupd-1.2.7.tar.xz
|
||||
/fwupd-1.2.8.tar.xz
|
||||
/fwupd-1.2.9.tar.xz
|
||||
/fwupd-1.2.10.tar.xz
|
||||
/fwupd-1.3.2.tar.xz
|
||||
/fwupd-1.3.3.tar.xz
|
||||
/fwupd-1.3.4.tar.xz
|
||||
/fwupd-1.3.5.tar.xz
|
||||
/fwupd-1.3.6.tar.xz
|
||||
/fwupd-1.3.7.tar.xz
|
||||
/fwupd-1.3.8.tar.xz
|
||||
/fwupd-1.3.9.tar.xz
|
||||
/fwupd-1.4.0.tar.xz
|
||||
/fwupd-1.4.1.tar.xz
|
||||
/fwupd-1.4.2.tar.xz
|
||||
/fwupd-1.4.3.tar.xz
|
||||
/fwupd-1.4.4.tar.xz
|
||||
/fwupd-1.4.5.tar.xz
|
||||
/fwupd-1.4.6.tar.xz
|
||||
/fwupd-1.5.0.tar.xz
|
||||
/fwupd-1.5.1.tar.xz
|
||||
/fwupd-1.5.2.tar.xz
|
||||
/fwupd-1.5.3.tar.xz
|
||||
/fwupd-1.5.4.tar.xz
|
||||
/fwupd-1.5.5.tar.xz
|
||||
/fwupd-1.5.9.tar.xz
|
||||
/DBXUpdate-20100307-x64.cab
|
||||
/DBXUpdate-20140413-x64.cab
|
||||
/DBXUpdate-20160809-x64.cab
|
||||
/DBXUpdate-20200729-aa64.cab
|
||||
/DBXUpdate-20200729-ia32.cab
|
||||
/DBXUpdate-20200729-x64.cab
|
||||
/fwupd-1.7.1.tar.xz
|
||||
/fwupd-efi-1.1.tar.xz
|
||||
/fwupd-1.7.4.tar.xz
|
||||
/fwupd-1.7.9.tar.xz
|
||||
/fwupd-efi-1.3.tar.xz
|
||||
/DBXUpdate-20210429-x64.cab
|
||||
/DBXUpdate-20220812-aa64.cab
|
||||
/DBXUpdate-20220812-ia32.cab
|
||||
/DBXUpdate-20220812-x64.cab
|
||||
/fwupd-1.7.10.tar.xz
|
||||
/fwupd-efi-1.3.tar.xz
|
||||
/fwupd-efi-1.4.tar.xz
|
||||
/fwupd-1.8.10.tar.xz
|
||||
/fwupd-1.8.16.tar.xz
|
||||
/DBXUpdate-20230509-aa64.cab
|
||||
/DBXUpdate-20230509-ia32.cab
|
||||
/DBXUpdate-20230509-x64.cab
|
||||
/fwupd-1.9.10.tar.xz
|
||||
/fwupd-1.9.11.tar.xz
|
||||
/fwupd-1.9.12.tar.xz
|
||||
/fwupd-1.9.13.tar.xz
|
||||
|
|
|
|||
|
|
@ -0,0 +1,47 @@
|
|||
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
|
||||
|
|
@ -0,0 +1,91 @@
|
|||
From cfd61f6958a46d5e9687f87caf04c94680382a9f Mon Sep 17 00:00:00 2001
|
||||
From: Nicolas Frayer <nfrayer@redhat.com>
|
||||
Date: Wed, 1 Feb 2023 12:13:45 +0100
|
||||
Subject: [PATCH] generate_binary: Add NX COMPAT flag manually when genpeimg
|
||||
missing
|
||||
|
||||
When genpeimg or python3-pefile is missing, add the NX COMPAT flag
|
||||
manually by setting bit8 of the DllCharacteristics in the optional
|
||||
header, clear the TimeDateStamp and update the checksum.
|
||||
---
|
||||
efi/generate_binary.py | 50 ++++++++++++++++++++++++++++++++++++++++--
|
||||
1 file changed, 48 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/efi/generate_binary.py b/efi/generate_binary.py
|
||||
index 7b802e7..10ab0b3 100755
|
||||
--- a/efi/generate_binary.py
|
||||
+++ b/efi/generate_binary.py
|
||||
@@ -10,6 +10,13 @@
|
||||
import subprocess
|
||||
import sys
|
||||
import argparse
|
||||
+import os
|
||||
+import struct
|
||||
+
|
||||
+COFF_HDR_OFFSET = 0x80
|
||||
+OPTIONALHDR_CHECKSUM = COFF_HDR_OFFSET + 0x58
|
||||
+OPTIONALHDR_DLLCHARACTERISTICS = COFF_HDR_OFFSET + 0x5E
|
||||
+PEHEADER_TIMEDATASTAMP = COFF_HDR_OFFSET + 0x8
|
||||
|
||||
|
||||
def _run_objcopy(args):
|
||||
@@ -66,6 +73,27 @@ def _run_genpeimg(args):
|
||||
sys.exit(1)
|
||||
|
||||
|
||||
+def generate_checksum(data):
|
||||
+ checksum_offset: int = OPTIONALHDR_CHECKSUM
|
||||
+ checksum: int = 0
|
||||
+ remainder: int = len(data) % 4
|
||||
+ data_len: int = len(data) + ((4 - remainder) * (remainder != 0))
|
||||
+ for i in range(int(data_len / 4)):
|
||||
+ if i == int(checksum_offset / 4):
|
||||
+ continue
|
||||
+ if i + 1 == (int(data_len / 4)) and remainder:
|
||||
+ dword = struct.unpack("I", data[i * 4 :] + (b"\0" * (4 - remainder)))[0]
|
||||
+ else:
|
||||
+ dword = struct.unpack("I", data[i * 4 : i * 4 + 4])[0]
|
||||
+ checksum += dword
|
||||
+ if checksum >= 2**32:
|
||||
+ checksum = (checksum & 0xFFFFFFFF) + (checksum >> 32)
|
||||
+ checksum = (checksum & 0xFFFF) + (checksum >> 16)
|
||||
+ checksum = checksum + (checksum >> 16)
|
||||
+ checksum = checksum & 0xFFFF
|
||||
+ return checksum + len(data)
|
||||
+
|
||||
+
|
||||
def _add_nx_pefile(args):
|
||||
# unnecessary if we have genpeimg
|
||||
if args.genpeimg:
|
||||
@@ -73,8 +101,26 @@ def _add_nx_pefile(args):
|
||||
try:
|
||||
import pefile
|
||||
except ImportError:
|
||||
- print("Unable to add NX support to binaries without genpeimg or python3-pefile")
|
||||
- sys.exit(1)
|
||||
+ print("Adding NX support manually to the binary")
|
||||
+ with open(args.outfile, "r+b") as fh:
|
||||
+ buf = bytearray(fh.read(os.path.getsize(args.outfile)))
|
||||
+ fh.seek(0)
|
||||
+ DllCharacteristics = struct.unpack_from(
|
||||
+ "<H", buf, OPTIONALHDR_DLLCHARACTERISTICS
|
||||
+ )[0]
|
||||
+ DllCharacteristics |= 0x100
|
||||
+ struct.pack_into(
|
||||
+ "<H", buf, OPTIONALHDR_DLLCHARACTERISTICS, DllCharacteristics
|
||||
+ )
|
||||
+
|
||||
+ # set the timestamp to 0
|
||||
+ struct.pack_into("<I", buf, PEHEADER_TIMEDATASTAMP, 0x0)
|
||||
+
|
||||
+ # as we have set the NX COMPAT bit, regenerate the checksum
|
||||
+ struct.pack_into("<I", buf, OPTIONALHDR_CHECKSUM, generate_checksum(buf))
|
||||
+ fh.write(buf)
|
||||
+
|
||||
+ return
|
||||
|
||||
pe = pefile.PE(args.outfile)
|
||||
pe.OPTIONAL_HEADER.DllCharacteristics |= pefile.DLL_CHARACTERISTICS[
|
||||
--
|
||||
2.39.1
|
||||
|
||||
1111
SPECS/fwupd.spec
1111
SPECS/fwupd.spec
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,6 @@
|
|||
--- !Policy
|
||||
product_versions:
|
||||
- rhel-9
|
||||
decision_context: osci_compose_gate
|
||||
rules:
|
||||
- !PassingTestCaseRule {test_case_name: kernel-qe.kernel-ci.hardware-fwupd.tier0.functional}
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
SHA512 (fwupd-1.9.13.tar.xz) = 240e057e33e861a84638866a43a7cae33bc3f12d48d5cf2ad3f8bdfb92824057472d1981ac2145d2024f31727f8413c555ce907dea28f4f7232e4604e24703ab
|
||||
SHA512 (fwupd-efi-1.4.tar.xz) = c330409861a8c1e332a0d4fd49c54ef2c5bf7cdaca99d14de39b50fb35f0c490e9f7f7a4c9dd48181bd509cd358c43eb23659536aea93408c1fefb47629e4991
|
||||
SHA512 (DBXUpdate-20100307-x64.cab) = f8ad56cf015f4cdc5c305856ff1f7a8589c25a2a671708c61883f427f38eb9b6a7abd3f2c8d79ef9d5076222255e42585917f8705a2a4b13f860bad4e02ec409
|
||||
SHA512 (DBXUpdate-20140413-x64.cab) = 75771876a2309fa8ca083c2e76520173d434229b7cacf1e7636bd9b1bc4f871d745c348b9792bfb65fd9f40ef54c25bb427b1431151e817e7050b7829456731a
|
||||
SHA512 (DBXUpdate-20160809-x64.cab) = c27c564999ae84515540f1a598cd0fd9ef3a80cdfaaf439f1c4cb04eaee0e73074548b6d76c21ca3af1ba9c4c0625907e821582998eb5617e33ecd412e6c8a13
|
||||
SHA512 (DBXUpdate-20200729-aa64.cab) = 7a0cea13ed9b645fd9f1d5e3410a451d83643a75f5dc603272b0771b093f2c012f9a19419160403631c250cf64127ad2ce1c8fa2079b04064af73fe85b9add33
|
||||
SHA512 (DBXUpdate-20200729-ia32.cab) = 578ec9cccf2001b8bfa54b66809a1662269677050e74bd3225536fbd2be56a8162c48669bd16ea553723580195df1693a28dc01fc1cf62ff06e36a2c5568f74f
|
||||
SHA512 (DBXUpdate-20200729-x64.cab) = b8b195167d286a3f16aaa7c89149a0d5b4c8f53080e3265758b912f250fa655533c603359b7d1c989ebad6953ce443809b3317ec1d00f750326945ee0537e43b
|
||||
SHA512 (DBXUpdate-20210429-x64.cab) = 7bc5e7780d105da89da367fbde7c33427bed6c37752b0ae6933793dfe96121c87e49629f14c3b762fc138b10e5c5b6db821dbdc56039ab761e3dca977fc7f817
|
||||
SHA512 (DBXUpdate-20220812-aa64.cab) = 422ebd0b9d15a26ad12b98798229615a1f5e272a95993934de0cd9d4e4e75589b41eae6366b52b4e25e8766bd7cf74f95d220b719649b1f3864603e46c18c193
|
||||
SHA512 (DBXUpdate-20220812-ia32.cab) = 09094cc747f865e21fc815199d6ad5b6d3b1c9e19621497e3fe7cdfc4b96e144e721673bdff9ea6204dd465e8a8e2da1cc2b4a4badfd1f4f82c54eace11acb42
|
||||
SHA512 (DBXUpdate-20220812-x64.cab) = 03dde66a31241ccaa562c57bd9b6b824f2a6b5a1d10affe32ee5a0452056609c981f8f7633bfc65fd0c7da79455b071dd9e02b6af7c880fb1c4a6ffdf577bcdc
|
||||
SHA512 (DBXUpdate-20230509-aa64.cab) = 259f2373d6ab4cd031fe8b993825ba4cf922306afb3da1617d7b4e9d4ac918018b463135f58ace884a2ceec01789f3b2b31aaf63e63501503e4efbcf46ce567b
|
||||
SHA512 (DBXUpdate-20230509-ia32.cab) = e9983039fa5283bf8357c75874842d06ac76a36e90c76406ab864a2b76f557f9649e84be3eb20ab473486cd60a08847ece0ef4015145357969067561338a7977
|
||||
SHA512 (DBXUpdate-20230509-x64.cab) = b2893b431adc3b155335a07e035979a2bf08b7c06975bde7c5561f5e5c1d8ed55f337e7a4782e6ad5c4c50c286cf474a1be356991784c88c23315c467fca30bb
|
||||
Loading…
Reference in New Issue