diff --git a/sbsigntools-binutils.patch b/sbsigntools-binutils.patch deleted file mode 100644 index 9658db1..0000000 --- a/sbsigntools-binutils.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up sbsigntools-0.9.5/tests/Makefile.am.orig sbsigntools-0.9.5/tests/Makefile.am ---- sbsigntools-0.9.5/tests/Makefile.am.orig 2025-10-03 10:20:11.676718647 +0200 -+++ sbsigntools-0.9.5/tests/Makefile.am 2025-10-03 10:20:40.506763759 +0200 -@@ -18,7 +18,7 @@ if TEST_BINARY_FORMAT - EFILDFLAGS = --defsym=EFI_SUBSYSTEM=0x0a - FORMAT = -O binary - else --FORMAT = --target=efi-app-$(EFI_ARCH:x64=x86_64) -+FORMAT = --output-target=efi-app-$(EFI_ARCH:x64=x86_64) - endif - check_DATA = $(test_key) $(test_cert) - check_SCRIPTS = test-wrapper.sh diff --git a/sbsigntools-unused-var.patch b/sbsigntools-unused-var.patch deleted file mode 100644 index 38356ab..0000000 --- a/sbsigntools-unused-var.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -up sbsigntools-0.9.5/src/image.c.orig sbsigntools-0.9.5/src/image.c ---- sbsigntools-0.9.5/src/image.c.orig 2023-05-05 12:56:50.000000000 +0200 -+++ sbsigntools-0.9.5/src/image.c 2026-02-20 21:09:30.332942432 +0100 -@@ -512,17 +512,14 @@ int image_hash_sha256(struct image *imag - { - struct region *region; - SHA256_CTX ctx; -- int rc, i, n; -+ int rc, i; - - rc = SHA256_Init(&ctx); - if (!rc) - return -1; - -- n = 0; -- - for (i = 0; i < image->n_checksum_regions; i++) { - region = &image->checksum_regions[i]; -- n += region->size; - #if 0 - printf("sum region: 0x%04lx -> 0x%04lx [0x%04x bytes]\n", - region->data - image->buf, diff --git a/sbsigntools.spec b/sbsigntools.spec index 2c3ba43..92d885e 100644 --- a/sbsigntools.spec +++ b/sbsigntools.spec @@ -3,7 +3,7 @@ Name: sbsigntools Version: 0.9.5 -Release: 16%{?dist} +Release: 10%{?dist} Summary: Signing utility for UEFI secure boot # Most source code is GPL-3.0-or-later, except: # LicenseRef-Fedora-Public-Domain: @@ -41,12 +41,8 @@ Patch1: %{name}-gnuefi.patch Patch2: %{name}-no-wchar_t.patch # revert addition of openssl engine support Patch3: %{name}-no-openssl-engines.patch -# avoid wrong --target option usage that's been fixed in recent binutils -Patch4: %{name}-binutils.patch -# remove unused variable -Patch5: %{name}-unused-var.patch # same as gnu-efi -ExclusiveArch: x86_64 aarch64 %{arm} %{ix86} riscv64 +ExclusiveArch: x86_64 aarch64 %{arm} %{ix86} BuildRequires: make BuildRequires: automake BuildRequires: binutils-devel @@ -58,6 +54,10 @@ BuildRequires: libuuid-devel BuildRequires: openssl %endif BuildRequires: openssl-devel +%if 0%{?fedora} >= 41 +# https://fedoraproject.org/wiki/Changes/OpensslDeprecateEngine +BuildRequires: openssl-devel-engine +%endif Provides: bundled(ccan-array_size) Provides: bundled(ccan-build_assert) Provides: bundled(ccan-check_type) @@ -84,9 +84,10 @@ Tools to add signatures to EFI binaries and Drivers. %patch -p 1 -P 0 %patch -p 1 -P 1 %patch -p 1 -P 2 +%if %{defined el10} +# EL10 disables openssl engines %patch -p 1 -P 3 -%patch -p 1 -P 4 -%patch -p 1 -P 5 +%endif %build ./autogen.sh @@ -118,27 +119,6 @@ make check %{_mandir}/man1/sbverify.1.* %changelog -* Fri Jul 17 2026 Fedora Release Engineering - 0.9.5-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild - -* Fri Jun 12 2026 Yaakov Selkowitz - 0.9.5-15 -- Rebuilt for openssl 4.0 - -* Fri Feb 20 2026 Dominik Mierzejewski - 0.9.5-15 -- fix build with GCC16 (resolves rhbz#2435092) - -* Sat Jan 17 2026 Fedora Release Engineering - 0.9.5-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Fri Dec 12 2025 Marcin Juszkiewicz - 0.9.5-13 -- enable RISC-V 64-bit architecture - -* Fri Oct 03 2025 Dominik Mierzejewski - 0.9.5-12 -- avoid wrong --target option usage that was fixed in recent binutils - -* Fri Jul 25 2025 Fedora Release Engineering - 0.9.5-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - * Thu Apr 10 2025 Carl George - 0.9.5-10 - Remove openssl engine support on EL10