From 0d01b98601a09f95712139f4b52ba4160df46a46 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Thu, 4 Nov 2021 00:54:22 -0400 Subject: [PATCH] import efibootmgr-16-12.el9 --- .efibootmgr.metadata | 1 + .gitignore | 1 + ...r-16-efidp_format_device_path-argfix.patch | 51 +++++ SPECS/efibootmgr.spec | 199 ++++++++++++++++++ 4 files changed, 252 insertions(+) create mode 100644 .efibootmgr.metadata create mode 100644 .gitignore create mode 100644 SOURCES/efibootmgr-16-efidp_format_device_path-argfix.patch create mode 100644 SPECS/efibootmgr.spec diff --git a/.efibootmgr.metadata b/.efibootmgr.metadata new file mode 100644 index 0000000..562246f --- /dev/null +++ b/.efibootmgr.metadata @@ -0,0 +1 @@ +3b023978c27af2514606de2a6be11801d881b5a3 SOURCES/efibootmgr-16.tar.bz2 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..951ecc6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/efibootmgr-16.tar.bz2 diff --git a/SOURCES/efibootmgr-16-efidp_format_device_path-argfix.patch b/SOURCES/efibootmgr-16-efidp_format_device_path-argfix.patch new file mode 100644 index 0000000..15741e2 --- /dev/null +++ b/SOURCES/efibootmgr-16-efidp_format_device_path-argfix.patch @@ -0,0 +1,51 @@ +diff -r -u -x .git ../efibootmgr-16.orig/src/efibootdump.c ./src/efibootdump.c +--- ../efibootmgr-16.orig/src/efibootdump.c 2018-04-09 15:38:51.000000000 -0500 ++++ ./src/efibootdump.c 2020-08-06 15:27:27.679192698 -0500 +@@ -67,8 +67,8 @@ + text_path = alloca(text_path_len); + if (!text_path) + error(100, "Couldn't allocate memory"); +- rc = efidp_format_device_path(text_path, text_path_len, +- dp, pathlen); ++ rc = efidp_format_device_path((unsigned char *)text_path, ++ text_path_len, dp, pathlen); + if (rc < 0) { + printf(""); + return; +diff -r -u -x .git ../efibootmgr-16.orig/src/efibootmgr.c ./src/efibootmgr.c +--- ../efibootmgr-16.orig/src/efibootmgr.c 2018-04-09 15:38:51.000000000 -0500 ++++ ./src/efibootmgr.c 2020-08-06 15:27:12.433089400 -0500 +@@ -941,8 +941,8 @@ + pathlen = efi_loadopt_pathlen(load_option, + boot->data_size); + dp = efi_loadopt_path(load_option, boot->data_size); +- rc = efidp_format_device_path(text_path, text_path_len, +- dp, pathlen); ++ rc = efidp_format_device_path((unsigned char *)text_path, ++ text_path_len, dp, pathlen); + if (rc < 0) + error(18, "Could not parse device path"); + rc += 1; +@@ -952,8 +952,8 @@ + if (!text_path) + error(19, "Could not parse device path"); + +- rc = efidp_format_device_path(text_path, text_path_len, +- dp, pathlen); ++ rc = efidp_format_device_path((unsigned char *)text_path, ++ text_path_len, dp, pathlen); + if (rc < 0) + error(20, "Could not parse device path"); + printf("\t%s", text_path); +diff -r -u -x .git ../efibootmgr-16.orig/src/eficonman.c ./src/eficonman.c +--- ../efibootmgr-16.orig/src/eficonman.c 2018-04-09 15:38:51.000000000 -0500 ++++ ./src/eficonman.c 2020-08-06 15:08:19.614514403 -0500 +@@ -76,7 +76,7 @@ + dp = whole_dp; + while (dp) { + ssize_t sz, ssz; +- char *s = NULL; ++ unsigned char *s = NULL; + + if (efidp_is_multiinstance(dp)) { + sz = efidp_instance_size(dp); diff --git a/SPECS/efibootmgr.spec b/SPECS/efibootmgr.spec new file mode 100644 index 0000000..548cf1d --- /dev/null +++ b/SPECS/efibootmgr.spec @@ -0,0 +1,199 @@ +%define efivar_version 35-2 + +Name: efibootmgr +Version: 16 +Release: 12%{?dist} +Summary: EFI Boot Manager +License: GPLv2+ +URL: https://github.com/rhboot/%{name}/ + +BuildRequires: efi-srpm-macros >= 3-2 +BuildRequires: efi-filesystem +BuildRequires: git popt-devel +BuildRequires: efivar-libs >= %{efivar_version} +BuildRequires: efivar-devel >= %{efivar_version} +BuildRequires: gcc +BuildRequires: make +Requires: efi-filesystem +ExclusiveArch: %{efi} + +Source0: https://github.com/rhboot/%{name}/releases/download/%{name}-%{version}/%{name}-%{version}.tar.bz2 + +# Fixes to compiler errors manually cherry picked from upstream commit +# https://github.com/rhboot/efibootmgr/commit/e8ce9fecebd15adb4c60a0678d4c417afe06dde4 +Patch0: efibootmgr-16-efidp_format_device_path-argfix.patch + +%description +%{name} displays and allows the user to edit the Intel Extensible +Firmware Interface (EFI) Boot Manager variables. Additional +information about EFI can be found at https://uefi.org/. + +%prep +%autosetup -S git +git config --local --add efibootmgr.efidir %{efi_vendor} + +%build +%make_build CFLAGS='%{optflags}' LDFLAGS='%{build_ldflags}' + +%install +%make_install libdir=%{_libdir} bindir=%{_bindir} mandir=%{_mandir} \ + localedir=%{_datadir}/locale/ includedir=%{_includedir} \ + libexecdir=%{_libexecdir} datadir=%{_datadir} + +%files +%license COPYING +%{_sbindir}/* +%{_mandir}/*/*.?.gz +%doc README + +%changelog +* Mon Aug 09 2021 Mohan Boddu - 16-12 +- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags + Related: rhbz#1991688 + +* Thu Apr 15 2021 Mohan Boddu - 16-11 +- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 + +* Tue Jan 26 2021 Fedora Release Engineering - 16-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Thu Aug 06 2020 Merlin Mathesius - 16-9 +- FTBFS fixes for Rawhide and ELN + +* Sat Aug 01 2020 Fedora Release Engineering - 16-9 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Jul 27 2020 Fedora Release Engineering - 16-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Jan 28 2020 Fedora Release Engineering - 16-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Wed Jul 24 2019 Fedora Release Engineering - 16-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Thu Jan 31 2019 Fedora Release Engineering - 16-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Thu Jul 12 2018 Fedora Release Engineering - 16-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri May 04 2018 Peter Jones - 16-3 +- Rebuild for new efi-rpm-macros, now that it has settled down a bit. + +* Wed May 02 2018 Peter Jones - 16-2 +- Use %%{efi} and similar macros from efi-rpm-macros +- Use '%%autosetup -S git' now that it imports patches without rewriting + the commit message. +- Fix some URLs maybe. + +* Mon Apr 09 2018 Peter Jones - 16-1 +- efibootmgr 16 +- better coverity and clang-analyzer support +- better CI +- minor fixes + +* Tue Feb 27 2018 Peter Jones - 15-6 +- Rebuild against newer efivar. + +* Fri Feb 23 2018 Florian Weimer - 15-5 +- Use CFLAGS & LDFLAGS from redhat-rpm-config + +* Wed Feb 07 2018 Fedora Release Engineering - 15-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Wed Aug 02 2017 Fedora Release Engineering - 15-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 15-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Jul 08 2017 Peter Jones - 15-1 +- Update to efibootmgr 15 +- Make efibootmgr use EFIDIR / efibootmgr.efidir like fwupdate does +- make --loader default build-time configurable +- sanitize set_mirror()/get_mirror() +- Add support for parsing loader options as UCS2 +- GCC 7 fixes +- Don't use -fshort-wchar since we don't run on EFI machines. +- Also rebuild for efivar-31-1.fc26 to get symbol versioning right. + Resolves: rhbz#1468841 + +* Fri Feb 10 2017 Fedora Release Engineering - 14-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Wed Sep 28 2016 Peter Jones - 14-3 +- Rebuild for efivar-30-3, this time with the right library sonames. + +* Wed Sep 28 2016 Peter Jones - 14-2 +- Rebuild for efivar-30-2 + +* Tue Sep 27 2016 Peter Jones - 14-1 +- Update to efibootmgr 14 +- Remove "(hex)" from description of --delete-bootnum +- Fix a typo in the popt options +- Add README.md +- make efibootdump install by default +- Man page fixes +- Better compiler detection +- Don't use --default-symver in efibootmgr +- Make -flto part of the overrideable CFLAGS + +* Wed Aug 17 2016 Peter Jones - 13-2 +- Update to efibootmgr 13 +- Add support for --sysprep and --driver to support UEFI System Prep + Applications and UEFI Drivers. +- use efivar's error reporting facility, and show error traces when + "-v -v" is used. +- Still yet better error codes returned on failures. +- Add -m and -M to support Memory Address Range Mirroring. +- Add efibootdump, to examine Boot* variables found in tarballs in bug + reports and similar. +- miscellaneous bugfixes. + +* Thu Aug 11 2016 Peter Jones - 13-1 +- Update to version 13 +- add efibootdump +- use efivar's error reporting facility +- Add address range mirroring support +- lots of bug fixes + +* Wed Feb 03 2016 Fedora Release Engineering - 0.12-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Jun 17 2015 Fedora Release Engineering - 0.12-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Thu May 28 2015 Peter Jones - 0.12-1 +- Update to 0.12 +- use libefiboot and libefivar to make device paths and load options +- don't depend on -lz or -lpci any more + +* Tue Oct 21 2014 Peter Jones - 0.11.0-1 +- Fix "-n" and friends not being assigned/checked right sometimes from 0.10.0-1 +- Generate more archives to avoid people using github's, because they're just + bad. + +* Mon Oct 20 2014 Peter Jones - 0.10.0-1 +- Make -o parameter validation work better and be more informative +- Better exit values +- Fix a segfault with appending ascii arguments. + +* Tue Sep 09 2014 Peter Jones - 0.8.0-1 +- Release 0.8.0 + +* Mon Jan 13 2014 Peter Jones - 0.6.1-1 +- Release 0.6.1 + +* Mon Jan 13 2014 Jared Dominguez +- new home https://github.com/vathpela/efibootmgr + +* Thu Jan 3 2008 Matt Domsch 0.5.4-1 +- split efibootmgr into its own RPM for Fedora/RHEL. + +* Tue Aug 24 2004 Matt Domsch +- new home linux.dell.com + +* Fri May 18 2001 Matt Domsch +- See doc/ChangeLog