[PR PATCH] fwupd-efi & gnu-efi-libs update

[PR PATCH] fwupd-efi & gnu-efi-libs update

[dataCobra]

[-- Attachment #1: Type: text/plain, Size: 635 bytes --]

There is a new pull request by dataCobra against master on the void-packages repository

https://github.com/dataCobra/void-packages fwupd-efi
https://github.com/void-linux/void-packages/pull/52397

fwupd-efi & gnu-efi-libs update
#### Testing the changes
- I tested the changes in this PR: **NO**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - x86_64-musl
  - i686

@dkwo are you able to test this?

A patch file from https://github.com/void-linux/void-packages/pull/52397.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fwupd-efi-52397.patch --]
[-- Type: text/x-diff, Size: 7013 bytes --]

From 46608189de04fb1362573f6aa5c5a982fb46f86a Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Sat, 28 Sep 2024 14:25:45 +0200
Subject: [PATCH 1/2] gnu-efi-libs: update to 3.0.18.

---
 srcpkgs/gnu-efi-libs/patches/riscv64.patch | 22 ----------------------
 srcpkgs/gnu-efi-libs/template              |  4 ++--
 2 files changed, 2 insertions(+), 24 deletions(-)
 delete mode 100644 srcpkgs/gnu-efi-libs/patches/riscv64.patch

diff --git a/srcpkgs/gnu-efi-libs/patches/riscv64.patch b/srcpkgs/gnu-efi-libs/patches/riscv64.patch
deleted file mode 100644
index eb10d1bb176c66..00000000000000
--- a/srcpkgs/gnu-efi-libs/patches/riscv64.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-riscv64: adjust type definitions
-
-CHAR8 needs to be defined while BOOLEAN should be removed
-here to prevent typedef conflicts
-
-Source: https://sourceforge.net/p/gnu-efi/code/ci/1de509497826faa0ad84b82f5e2c3d21ee613459/
----
---- a/inc/riscv64/efibind.h	2023-05-02 13:51:45.000000000 +0200
-+++ -	2024-02-16 17:14:57.455180520 +0100
-@@ -32,11 +32,9 @@
- typedef int16_t                 INT16;
- typedef uint8_t                 UINT8;
- typedef int8_t                  INT8;
-+typedef char                    CHAR8;
- typedef wchar_t                 CHAR16;
- #define WCHAR                   CHAR16
--#ifndef BOOLEAN
--typedef uint8_t                 BOOLEAN;
--#endif
- #undef VOID
- typedef void                    VOID;
- typedef int64_t                 INTN;
diff --git a/srcpkgs/gnu-efi-libs/template b/srcpkgs/gnu-efi-libs/template
index 5c25df7ef5b3d5..c47d33046f2020 100644
--- a/srcpkgs/gnu-efi-libs/template
+++ b/srcpkgs/gnu-efi-libs/template
@@ -1,7 +1,7 @@
 # Template file for 'gnu-efi-libs'
 pkgname=gnu-efi-libs
 reverts="3.0w_1" # Not an actual revert, xbps considers 3.0w higher than 3.0.8
-version=3.0.17
+version=3.0.18
 revision=1
 makedepends="pciutils-devel"
 short_desc="Library for building UEFI Applications using GNU toolchain"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://sourceforge.net/projects/gnu-efi/"
 distfiles="${SOURCEFORGE_SITE}/gnu-efi/gnu-efi-${version}.tar.bz2"
-checksum=7807e903349343a7a142ebb934703a2872235e89688cf586c032b0a1087bcaf4
+checksum=7f212c96ee66547eeefb531267b641e5473d7d8529f0bd8ccdefd33cf7413f5c
 nostrip=yes
 
 # If we are cross-building we need to pass the cross-compilation triplet

From ca917da43b011ee99f761b8b876ff0d33080b026 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Sat, 28 Sep 2024 14:26:32 +0200
Subject: [PATCH 2/2] fwupd-efi: update to 1.7.

---
 srcpkgs/fwupd-efi/patches/cc-as-ld.patch | 78 ------------------------
 srcpkgs/fwupd-efi/template               |  6 +-
 2 files changed, 3 insertions(+), 81 deletions(-)
 delete mode 100644 srcpkgs/fwupd-efi/patches/cc-as-ld.patch

diff --git a/srcpkgs/fwupd-efi/patches/cc-as-ld.patch b/srcpkgs/fwupd-efi/patches/cc-as-ld.patch
deleted file mode 100644
index 67092dd0fb6792..00000000000000
--- a/srcpkgs/fwupd-efi/patches/cc-as-ld.patch
+++ /dev/null
@@ -1,78 +0,0 @@
---- a/meson.build
-+++ b/meson.build
-@@ -9,7 +9,6 @@
- conf.set_quoted('PACKAGE_VERSION', meson.project_version())
- 
- cc = meson.get_compiler('c')
--ld = cc.get_linker_id()
- objcopy = find_program('objcopy')
- objcopy_version = run_command(objcopy, '--version').stdout().split('\n')[0].split(' ')[-1]
- 
---- a/efi/generate_binary.py
-+++ b/efi/generate_binary.py
-@@ -29,9 +29,9 @@
-         "-j",
-         ".rodata",
-         "-j",
-+        ".areloc",
-+        "-j",
-         ".rel*",
--        "--section-alignment",
--        "512",
-         args.infile,
-         args.outfile,
-     ]
---- a/efi/meson.build
-+++ b/efi/meson.build
-@@ -72,6 +72,11 @@
-         coff_header_in_crt0 = false
- endif
- 
-+# For NX compat, we must ensure we have .note.GNU-stack
-+if run_command('grep', '-q', '.note.GNU-stack', join_paths(efi_crtdir, arch_crt), check: false).returncode() != 0
-+    error('Cannot find NX section in @0@, update to gnu-efi 3.0.15+'.format(join_paths(efi_crtdir, arch_crt)))
-+endif
-+
- # older objcopy for Aarch64 and ARM32 are not EFI capable.
- # Use 'binary' instead, and add required symbols manually.
- if host_cpu == 'arm' or (host_cpu == 'aarch64' and (objcopy_version.version_compare ('< 2.38') or coff_header_in_crt0))
-@@ -95,7 +100,6 @@
- # is the system crt0 for arm and aarch64 new enough to know about SBAT?
- if objcopy_manualsymbols
-   if get_option('efi_sbat_distro_id') != ''
--    arch_crt_source = 'crt0-efi-@0@.S'.format(gnu_efi_path_arch)
-     cmd = run_command('grep', '-q', 'sbat', join_paths(efi_crtdir, arch_crt))
-     if cmd.returncode() != 0
-       warning('Cannot find SBAT section in @0@, using local copy'.format(join_paths(efi_crtdir, arch_crt)))
-@@ -163,6 +167,12 @@
-                '-L', efi_libdir,
-                join_paths(efi_crtdir, arch_crt)]
- 
-+if host_cpu == 'aarch64'
-+# Don't use 64KiB pages
-+  efi_ldflags += ['-z', 'common-page-size=4096']
-+  efi_ldflags += ['-z', 'max-page-size=4096']
-+endif
-+
- if objcopy_manualsymbols
-   # older objcopy for Aarch64 and ARM32 are not EFI capable.
-   # Use 'binary' instead, and add required symbols manually.
-@@ -223,11 +233,16 @@
-   fwupd_so_deps += [o_crt0]
- endif
- 
-+efi_cc_ldflags = []
-+foreach flag : efi_ldflags
-+  efi_cc_ldflags += ['-Wl,' + flag]
-+endforeach
-+
- so = custom_target('fwup.so',
-                    input : [o_file1, o_file2, o_file3, o_file4, o_file5],
-                    output : 'fwup.so',
--                   command : [ld, '-o', '@OUTPUT@'] +
--                             efi_ldflags + ['@INPUT@'] +
-+                   command : [cc.cmd_array(), '-nostdlib', '-o', '@OUTPUT@'] +
-+                             efi_cc_ldflags + ['@INPUT@'] +
-                              ['-lefi', '-lgnuefi', libgcc_file_name],
-                    depends: fwupd_so_deps)
- 
diff --git a/srcpkgs/fwupd-efi/template b/srcpkgs/fwupd-efi/template
index 2d811f6165f51f..7397d725f7474e 100644
--- a/srcpkgs/fwupd-efi/template
+++ b/srcpkgs/fwupd-efi/template
@@ -1,6 +1,6 @@
 # Template file for 'fwupd-efi'
 pkgname=fwupd-efi
-version=1.4
+version=1.7
 revision=1
 archs="x86_64* i686* arm* aarch64*"
 build_style=meson
@@ -8,11 +8,11 @@ build_helper="gir"
 configure_args="-Defi-includedir=${XBPS_CROSS_BASE}/usr/include/efi
  -Defi-ldsdir=${XBPS_CROSS_BASE}/usr/lib
  -Defi-libdir=${XBPS_CROSS_BASE}/usr/lib"
-hostmakedepends="efivar python3-pefile"
+hostmakedepends="efivar python3-pefile cmake pkg-config"
 makedepends="libefivar-devel gnu-efi-libs"
 short_desc="EFI Application used by uefi-capsule plugin in fwupd"
 maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/fwupd/fwupd-efi"
 distfiles="https://github.com/fwupd/fwupd-efi/archive/refs/tags/${version}.tar.gz"
-checksum=b1f5fe72e16d4e2f4c616da416dc93bd79331057336208465da37bafe8f8f83d
+checksum=96d4fc45467159b2664ce86ee7d5030e265fdb4d4a4d774080654d2f5b1561ff

Re: fwupd-efi & gnu-efi-libs update

[dkwo]

[-- Attachment #1: Type: text/plain, Size: 280 bytes --]

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/52397#issuecomment-2380655801

Comment:
does this require a firmware update to be tested?
if so, no firmware updates for my laptop for a while.
can it be tested with fwupd itself?

Re: fwupd-efi & gnu-efi-libs update

[dataCobra]

[-- Attachment #1: Type: text/plain, Size: 304 bytes --]

New comment by dataCobra on void-packages repository

https://github.com/void-linux/void-packages/pull/52397#issuecomment-2380656313

Comment:
You can use `fwupdmgr reinstall` to try to trigger a reinstall event for your current firmware.

That is at least what one of the maintainers suggested to me.

Re: fwupd-efi & gnu-efi-libs update

[dkwo]

[-- Attachment #1: Type: text/plain, Size: 282 bytes --]

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/52397#issuecomment-2395103703

Comment:
Sorry, I'm not interested in testing.
Also, can you please remove my name from maintainer field,
as I have not been using this for some time?

Re: fwupd-efi & gnu-efi-libs update

[dataCobra]

[-- Attachment #1: Type: text/plain, Size: 172 bytes --]

New comment by dataCobra on void-packages repository

https://github.com/void-linux/void-packages/pull/52397#issuecomment-2404242382

Comment:
The package is now orphaned.

Re: [PR PATCH] [Updated] fwupd-efi & gnu-efi-libs update

[dataCobra]

[-- Attachment #1: Type: text/plain, Size: 779 bytes --]

There is an updated pull request by dataCobra against master on the void-packages repository

https://github.com/dataCobra/void-packages fwupd-efi
https://github.com/void-linux/void-packages/pull/52397

fwupd-efi & gnu-efi-libs update
#### Testing the changes
- I tested the changes in this PR: **NO**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - x86_64-musl
  - i686
  - aarch64 (cross)
  - armv7l (cross)

@dkwo are you able to test this?

Edit: Are revbumps necessary for the packages that include gnu-efi-libs in their dependencies?

A patch file from https://github.com/void-linux/void-packages/pull/52397.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fwupd-efi-52397.patch --]
[-- Type: text/x-diff, Size: 7067 bytes --]

From 8060be23872b047009cd9d17b4c1cc39ffe17a32 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Sat, 28 Sep 2024 14:25:45 +0200
Subject: [PATCH 1/2] gnu-efi-libs: update to 3.0.18.

---
 srcpkgs/gnu-efi-libs/patches/riscv64.patch | 22 ----------------------
 srcpkgs/gnu-efi-libs/template              |  4 ++--
 2 files changed, 2 insertions(+), 24 deletions(-)
 delete mode 100644 srcpkgs/gnu-efi-libs/patches/riscv64.patch

diff --git a/srcpkgs/gnu-efi-libs/patches/riscv64.patch b/srcpkgs/gnu-efi-libs/patches/riscv64.patch
deleted file mode 100644
index eb10d1bb176c66..00000000000000
--- a/srcpkgs/gnu-efi-libs/patches/riscv64.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-riscv64: adjust type definitions
-
-CHAR8 needs to be defined while BOOLEAN should be removed
-here to prevent typedef conflicts
-
-Source: https://sourceforge.net/p/gnu-efi/code/ci/1de509497826faa0ad84b82f5e2c3d21ee613459/
----
---- a/inc/riscv64/efibind.h	2023-05-02 13:51:45.000000000 +0200
-+++ -	2024-02-16 17:14:57.455180520 +0100
-@@ -32,11 +32,9 @@
- typedef int16_t                 INT16;
- typedef uint8_t                 UINT8;
- typedef int8_t                  INT8;
-+typedef char                    CHAR8;
- typedef wchar_t                 CHAR16;
- #define WCHAR                   CHAR16
--#ifndef BOOLEAN
--typedef uint8_t                 BOOLEAN;
--#endif
- #undef VOID
- typedef void                    VOID;
- typedef int64_t                 INTN;
diff --git a/srcpkgs/gnu-efi-libs/template b/srcpkgs/gnu-efi-libs/template
index 5c25df7ef5b3d5..c47d33046f2020 100644
--- a/srcpkgs/gnu-efi-libs/template
+++ b/srcpkgs/gnu-efi-libs/template
@@ -1,7 +1,7 @@
 # Template file for 'gnu-efi-libs'
 pkgname=gnu-efi-libs
 reverts="3.0w_1" # Not an actual revert, xbps considers 3.0w higher than 3.0.8
-version=3.0.17
+version=3.0.18
 revision=1
 makedepends="pciutils-devel"
 short_desc="Library for building UEFI Applications using GNU toolchain"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://sourceforge.net/projects/gnu-efi/"
 distfiles="${SOURCEFORGE_SITE}/gnu-efi/gnu-efi-${version}.tar.bz2"
-checksum=7807e903349343a7a142ebb934703a2872235e89688cf586c032b0a1087bcaf4
+checksum=7f212c96ee66547eeefb531267b641e5473d7d8529f0bd8ccdefd33cf7413f5c
 nostrip=yes
 
 # If we are cross-building we need to pass the cross-compilation triplet

From b2c5d8c00e5e9e090b52fd71c9e2da9073e039e1 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Thu, 10 Oct 2024 09:02:32 +0200
Subject: [PATCH 2/2] fwupd-efi: update to 1.7, orphan.

---
 srcpkgs/fwupd-efi/patches/cc-as-ld.patch | 78 ------------------------
 srcpkgs/fwupd-efi/template               |  8 +--
 2 files changed, 4 insertions(+), 82 deletions(-)
 delete mode 100644 srcpkgs/fwupd-efi/patches/cc-as-ld.patch

diff --git a/srcpkgs/fwupd-efi/patches/cc-as-ld.patch b/srcpkgs/fwupd-efi/patches/cc-as-ld.patch
deleted file mode 100644
index 67092dd0fb6792..00000000000000
--- a/srcpkgs/fwupd-efi/patches/cc-as-ld.patch
+++ /dev/null
@@ -1,78 +0,0 @@
---- a/meson.build
-+++ b/meson.build
-@@ -9,7 +9,6 @@
- conf.set_quoted('PACKAGE_VERSION', meson.project_version())
- 
- cc = meson.get_compiler('c')
--ld = cc.get_linker_id()
- objcopy = find_program('objcopy')
- objcopy_version = run_command(objcopy, '--version').stdout().split('\n')[0].split(' ')[-1]
- 
---- a/efi/generate_binary.py
-+++ b/efi/generate_binary.py
-@@ -29,9 +29,9 @@
-         "-j",
-         ".rodata",
-         "-j",
-+        ".areloc",
-+        "-j",
-         ".rel*",
--        "--section-alignment",
--        "512",
-         args.infile,
-         args.outfile,
-     ]
---- a/efi/meson.build
-+++ b/efi/meson.build
-@@ -72,6 +72,11 @@
-         coff_header_in_crt0 = false
- endif
- 
-+# For NX compat, we must ensure we have .note.GNU-stack
-+if run_command('grep', '-q', '.note.GNU-stack', join_paths(efi_crtdir, arch_crt), check: false).returncode() != 0
-+    error('Cannot find NX section in @0@, update to gnu-efi 3.0.15+'.format(join_paths(efi_crtdir, arch_crt)))
-+endif
-+
- # older objcopy for Aarch64 and ARM32 are not EFI capable.
- # Use 'binary' instead, and add required symbols manually.
- if host_cpu == 'arm' or (host_cpu == 'aarch64' and (objcopy_version.version_compare ('< 2.38') or coff_header_in_crt0))
-@@ -95,7 +100,6 @@
- # is the system crt0 for arm and aarch64 new enough to know about SBAT?
- if objcopy_manualsymbols
-   if get_option('efi_sbat_distro_id') != ''
--    arch_crt_source = 'crt0-efi-@0@.S'.format(gnu_efi_path_arch)
-     cmd = run_command('grep', '-q', 'sbat', join_paths(efi_crtdir, arch_crt))
-     if cmd.returncode() != 0
-       warning('Cannot find SBAT section in @0@, using local copy'.format(join_paths(efi_crtdir, arch_crt)))
-@@ -163,6 +167,12 @@
-                '-L', efi_libdir,
-                join_paths(efi_crtdir, arch_crt)]
- 
-+if host_cpu == 'aarch64'
-+# Don't use 64KiB pages
-+  efi_ldflags += ['-z', 'common-page-size=4096']
-+  efi_ldflags += ['-z', 'max-page-size=4096']
-+endif
-+
- if objcopy_manualsymbols
-   # older objcopy for Aarch64 and ARM32 are not EFI capable.
-   # Use 'binary' instead, and add required symbols manually.
-@@ -223,11 +233,16 @@
-   fwupd_so_deps += [o_crt0]
- endif
- 
-+efi_cc_ldflags = []
-+foreach flag : efi_ldflags
-+  efi_cc_ldflags += ['-Wl,' + flag]
-+endforeach
-+
- so = custom_target('fwup.so',
-                    input : [o_file1, o_file2, o_file3, o_file4, o_file5],
-                    output : 'fwup.so',
--                   command : [ld, '-o', '@OUTPUT@'] +
--                             efi_ldflags + ['@INPUT@'] +
-+                   command : [cc.cmd_array(), '-nostdlib', '-o', '@OUTPUT@'] +
-+                             efi_cc_ldflags + ['@INPUT@'] +
-                              ['-lefi', '-lgnuefi', libgcc_file_name],
-                    depends: fwupd_so_deps)
- 
diff --git a/srcpkgs/fwupd-efi/template b/srcpkgs/fwupd-efi/template
index 2d811f6165f51f..ecc1931b31b49a 100644
--- a/srcpkgs/fwupd-efi/template
+++ b/srcpkgs/fwupd-efi/template
@@ -1,6 +1,6 @@
 # Template file for 'fwupd-efi'
 pkgname=fwupd-efi
-version=1.4
+version=1.7
 revision=1
 archs="x86_64* i686* arm* aarch64*"
 build_style=meson
@@ -8,11 +8,11 @@ build_helper="gir"
 configure_args="-Defi-includedir=${XBPS_CROSS_BASE}/usr/include/efi
  -Defi-ldsdir=${XBPS_CROSS_BASE}/usr/lib
  -Defi-libdir=${XBPS_CROSS_BASE}/usr/lib"
-hostmakedepends="efivar python3-pefile"
+hostmakedepends="efivar python3-pefile cmake pkg-config"
 makedepends="libefivar-devel gnu-efi-libs"
 short_desc="EFI Application used by uefi-capsule plugin in fwupd"
-maintainer="dkwo <nicolopiazzalunga@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/fwupd/fwupd-efi"
 distfiles="https://github.com/fwupd/fwupd-efi/archive/refs/tags/${version}.tar.gz"
-checksum=b1f5fe72e16d4e2f4c616da416dc93bd79331057336208465da37bafe8f8f83d
+checksum=96d4fc45467159b2664ce86ee7d5030e265fdb4d4a4d774080654d2f5b1561ff

Re: [PR PATCH] [Updated] fwupd-efi & gnu-efi-libs update

[dataCobra]

[-- Attachment #1: Type: text/plain, Size: 779 bytes --]

There is an updated pull request by dataCobra against master on the void-packages repository

https://github.com/dataCobra/void-packages fwupd-efi
https://github.com/void-linux/void-packages/pull/52397

fwupd-efi & gnu-efi-libs update
#### Testing the changes
- I tested the changes in this PR: **NO**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - x86_64-musl
  - i686
  - aarch64 (cross)
  - armv7l (cross)

@dkwo are you able to test this?

Edit: Are revbumps necessary for the packages that include gnu-efi-libs in their dependencies?

A patch file from https://github.com/void-linux/void-packages/pull/52397.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fwupd-efi-52397.patch --]
[-- Type: text/x-diff, Size: 7068 bytes --]

From 8060be23872b047009cd9d17b4c1cc39ffe17a32 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Sat, 28 Sep 2024 14:25:45 +0200
Subject: [PATCH 1/2] gnu-efi-libs: update to 3.0.18.

---
 srcpkgs/gnu-efi-libs/patches/riscv64.patch | 22 ----------------------
 srcpkgs/gnu-efi-libs/template              |  4 ++--
 2 files changed, 2 insertions(+), 24 deletions(-)
 delete mode 100644 srcpkgs/gnu-efi-libs/patches/riscv64.patch

diff --git a/srcpkgs/gnu-efi-libs/patches/riscv64.patch b/srcpkgs/gnu-efi-libs/patches/riscv64.patch
deleted file mode 100644
index eb10d1bb176c66..00000000000000
--- a/srcpkgs/gnu-efi-libs/patches/riscv64.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-riscv64: adjust type definitions
-
-CHAR8 needs to be defined while BOOLEAN should be removed
-here to prevent typedef conflicts
-
-Source: https://sourceforge.net/p/gnu-efi/code/ci/1de509497826faa0ad84b82f5e2c3d21ee613459/
----
---- a/inc/riscv64/efibind.h	2023-05-02 13:51:45.000000000 +0200
-+++ -	2024-02-16 17:14:57.455180520 +0100
-@@ -32,11 +32,9 @@
- typedef int16_t                 INT16;
- typedef uint8_t                 UINT8;
- typedef int8_t                  INT8;
-+typedef char                    CHAR8;
- typedef wchar_t                 CHAR16;
- #define WCHAR                   CHAR16
--#ifndef BOOLEAN
--typedef uint8_t                 BOOLEAN;
--#endif
- #undef VOID
- typedef void                    VOID;
- typedef int64_t                 INTN;
diff --git a/srcpkgs/gnu-efi-libs/template b/srcpkgs/gnu-efi-libs/template
index 5c25df7ef5b3d5..c47d33046f2020 100644
--- a/srcpkgs/gnu-efi-libs/template
+++ b/srcpkgs/gnu-efi-libs/template
@@ -1,7 +1,7 @@
 # Template file for 'gnu-efi-libs'
 pkgname=gnu-efi-libs
 reverts="3.0w_1" # Not an actual revert, xbps considers 3.0w higher than 3.0.8
-version=3.0.17
+version=3.0.18
 revision=1
 makedepends="pciutils-devel"
 short_desc="Library for building UEFI Applications using GNU toolchain"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://sourceforge.net/projects/gnu-efi/"
 distfiles="${SOURCEFORGE_SITE}/gnu-efi/gnu-efi-${version}.tar.bz2"
-checksum=7807e903349343a7a142ebb934703a2872235e89688cf586c032b0a1087bcaf4
+checksum=7f212c96ee66547eeefb531267b641e5473d7d8529f0bd8ccdefd33cf7413f5c
 nostrip=yes
 
 # If we are cross-building we need to pass the cross-compilation triplet

From 0b6bbe304faa88766368149ae42a68ca9cc4aead Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Thu, 10 Oct 2024 09:17:28 +0200
Subject: [PATCH 2/2] fwupd-efi: update to 1.7, orphan.

---
 srcpkgs/fwupd-efi/patches/cc-as-ld.patch | 78 ------------------------
 srcpkgs/fwupd-efi/template               |  8 +--
 2 files changed, 4 insertions(+), 82 deletions(-)
 delete mode 100644 srcpkgs/fwupd-efi/patches/cc-as-ld.patch

diff --git a/srcpkgs/fwupd-efi/patches/cc-as-ld.patch b/srcpkgs/fwupd-efi/patches/cc-as-ld.patch
deleted file mode 100644
index 67092dd0fb6792..00000000000000
--- a/srcpkgs/fwupd-efi/patches/cc-as-ld.patch
+++ /dev/null
@@ -1,78 +0,0 @@
---- a/meson.build
-+++ b/meson.build
-@@ -9,7 +9,6 @@
- conf.set_quoted('PACKAGE_VERSION', meson.project_version())
- 
- cc = meson.get_compiler('c')
--ld = cc.get_linker_id()
- objcopy = find_program('objcopy')
- objcopy_version = run_command(objcopy, '--version').stdout().split('\n')[0].split(' ')[-1]
- 
---- a/efi/generate_binary.py
-+++ b/efi/generate_binary.py
-@@ -29,9 +29,9 @@
-         "-j",
-         ".rodata",
-         "-j",
-+        ".areloc",
-+        "-j",
-         ".rel*",
--        "--section-alignment",
--        "512",
-         args.infile,
-         args.outfile,
-     ]
---- a/efi/meson.build
-+++ b/efi/meson.build
-@@ -72,6 +72,11 @@
-         coff_header_in_crt0 = false
- endif
- 
-+# For NX compat, we must ensure we have .note.GNU-stack
-+if run_command('grep', '-q', '.note.GNU-stack', join_paths(efi_crtdir, arch_crt), check: false).returncode() != 0
-+    error('Cannot find NX section in @0@, update to gnu-efi 3.0.15+'.format(join_paths(efi_crtdir, arch_crt)))
-+endif
-+
- # older objcopy for Aarch64 and ARM32 are not EFI capable.
- # Use 'binary' instead, and add required symbols manually.
- if host_cpu == 'arm' or (host_cpu == 'aarch64' and (objcopy_version.version_compare ('< 2.38') or coff_header_in_crt0))
-@@ -95,7 +100,6 @@
- # is the system crt0 for arm and aarch64 new enough to know about SBAT?
- if objcopy_manualsymbols
-   if get_option('efi_sbat_distro_id') != ''
--    arch_crt_source = 'crt0-efi-@0@.S'.format(gnu_efi_path_arch)
-     cmd = run_command('grep', '-q', 'sbat', join_paths(efi_crtdir, arch_crt))
-     if cmd.returncode() != 0
-       warning('Cannot find SBAT section in @0@, using local copy'.format(join_paths(efi_crtdir, arch_crt)))
-@@ -163,6 +167,12 @@
-                '-L', efi_libdir,
-                join_paths(efi_crtdir, arch_crt)]
- 
-+if host_cpu == 'aarch64'
-+# Don't use 64KiB pages
-+  efi_ldflags += ['-z', 'common-page-size=4096']
-+  efi_ldflags += ['-z', 'max-page-size=4096']
-+endif
-+
- if objcopy_manualsymbols
-   # older objcopy for Aarch64 and ARM32 are not EFI capable.
-   # Use 'binary' instead, and add required symbols manually.
-@@ -223,11 +233,16 @@
-   fwupd_so_deps += [o_crt0]
- endif
- 
-+efi_cc_ldflags = []
-+foreach flag : efi_ldflags
-+  efi_cc_ldflags += ['-Wl,' + flag]
-+endforeach
-+
- so = custom_target('fwup.so',
-                    input : [o_file1, o_file2, o_file3, o_file4, o_file5],
-                    output : 'fwup.so',
--                   command : [ld, '-o', '@OUTPUT@'] +
--                             efi_ldflags + ['@INPUT@'] +
-+                   command : [cc.cmd_array(), '-nostdlib', '-o', '@OUTPUT@'] +
-+                             efi_cc_ldflags + ['@INPUT@'] +
-                              ['-lefi', '-lgnuefi', libgcc_file_name],
-                    depends: fwupd_so_deps)
- 
diff --git a/srcpkgs/fwupd-efi/template b/srcpkgs/fwupd-efi/template
index 2d811f6165f51f..75a40c82847b13 100644
--- a/srcpkgs/fwupd-efi/template
+++ b/srcpkgs/fwupd-efi/template
@@ -1,6 +1,6 @@
 # Template file for 'fwupd-efi'
 pkgname=fwupd-efi
-version=1.4
+version=1.7
 revision=1
 archs="x86_64* i686* arm* aarch64*"
 build_style=meson
@@ -8,11 +8,11 @@ build_helper="gir"
 configure_args="-Defi-includedir=${XBPS_CROSS_BASE}/usr/include/efi
  -Defi-ldsdir=${XBPS_CROSS_BASE}/usr/lib
  -Defi-libdir=${XBPS_CROSS_BASE}/usr/lib"
-hostmakedepends="efivar python3-pefile"
+hostmakedepends="efivar python3-pefile cmake pkg-config"
 makedepends="libefivar-devel gnu-efi-libs"
 short_desc="EFI Application used by uefi-capsule plugin in fwupd"
-maintainer="dkwo <nicolopiazzalunga@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/fwupd/fwupd-efi"
 distfiles="https://github.com/fwupd/fwupd-efi/archive/refs/tags/${version}.tar.gz"
-checksum=b1f5fe72e16d4e2f4c616da416dc93bd79331057336208465da37bafe8f8f83d
+checksum=96d4fc45467159b2664ce86ee7d5030e265fdb4d4a4d774080654d2f5b1561ff

Re: [PR PATCH] [Closed]: fwupd-efi & gnu-efi-libs update

[dataCobra]

[-- Attachment #1: Type: text/plain, Size: 617 bytes --]

There's a closed pull request on the void-packages repository

fwupd-efi & gnu-efi-libs update
https://github.com/void-linux/void-packages/pull/52397

Description:
#### Testing the changes
- I tested the changes in this PR: **NO**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - x86_64-musl
  - i686
  - aarch64 (cross)
  - armv7l (cross)

@dkwo are you able to test this?

Edit: Are revbumps necessary for the packages that include gnu-efi-libs in their dependencies?

Re: fwupd-efi & gnu-efi-libs update

[dataCobra]

[-- Attachment #1: Type: text/plain, Size: 241 bytes --]

New comment by dataCobra on void-packages repository

https://github.com/void-linux/void-packages/pull/52397#issuecomment-2405208444

Comment:
I close this PR in favor of a complete PR https://github.com/void-linux/void-packages/pull/52372.