.fwupd.metadata

@@ -11,9 +11,4 @@ d3ae610f5b6e602feded54eae8d67ddb7c60e64f SOURCES/DBXUpdate-20220812-aa64.cab
 46a42362cd34c0d103cf534ca431508d24715e51 SOURCES/DBXUpdate-20230509-aa64.cab
 23d9544ef0f9b39a76d258f6d4a4a54d8f7592b2 SOURCES/DBXUpdate-20230509-ia32.cab
 bc6a604b29918d67d5fef745ad4375ca3d43d05e SOURCES/DBXUpdate-20230509-x64.cab
-0abed3cf70b97366f77616b908af66f7b4ac6f1f SOURCES/fwupd-1.8.16.tar.xz
+d02a633a6d087224982e0d8b21376066be42e639 SOURCES/fwupd-1.9.19.tar.xz
-147b36f75fca288fd01d9ed4150866344d57df27 SOURCES/fwupd-efi-1.4.tar.xz
-4a07b56e28741884b86da6ac91f8f9929541a1e4 SOURCES/redhatsecureboot301.cer
-33e260486f5c12e47b72b90dfb779ca892f56c45 SOURCES/redhatsecureboot503.cer
-cf9230e69000076727e5b784ec871d22716dc5da SOURCES/redhatsecurebootca3.cer
-e6f506462069aa17d2e8610503635c20f3a995c3 SOURCES/redhatsecurebootca5.cer

.gitignore

@@ -11,9 +11,4 @@ SOURCES/DBXUpdate-20220812-x64.cab
 SOURCES/DBXUpdate-20230509-aa64.cab
 SOURCES/DBXUpdate-20230509-ia32.cab
 SOURCES/DBXUpdate-20230509-x64.cab
-SOURCES/fwupd-1.8.16.tar.xz
+SOURCES/fwupd-1.9.19.tar.xz
-SOURCES/fwupd-efi-1.4.tar.xz
-SOURCES/redhatsecureboot301.cer
-SOURCES/redhatsecureboot503.cer
-SOURCES/redhatsecurebootca3.cer
-SOURCES/redhatsecurebootca5.cer

SOURCES/0001-generate_binary-Add-NX-COMPAT-flag-manually-when-gen.patch

@@ -1,91 +0,0 @@
-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
-