.efibootmgr.metadata

@@ -1 +1 @@
-3b023978c27af2514606de2a6be11801d881b5a3 SOURCES/efibootmgr-16.tar.bz2
+3b023978c27af2514606de2a6be11801d881b5a3 efibootmgr-16.tar.bz2

.gitignore

@@ -1 +1,6 @@
-SOURCES/efibootmgr-16.tar.bz2
+clog
+.build*.log
+*.rpm
+*.tar.*
+.build*.log
+efibootmgr-*/

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("<bad device path>");
+ 		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);

efibootmgr.spec

@@ -1,63 +1,93 @@
-%define efivar_version 35-1
+%define efivar_version 35-2
 
-Summary: EFI Boot Manager
 Name: efibootmgr
 Version: 16
-Release: 1%{?dist}
-Group: System Environment/Base
+Release: 12%{?dist}
+Summary: EFI Boot Manager
 License: GPLv2+
-URL: http://github.com/rhinstaller/%{name}/
-BuildRequires: git, popt-devel
+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}
-# EFI/UEFI don't exist on PPC
-ExclusiveArch: %{ix86} x86_64 aarch64 arm
+BuildRequires: gcc
+BuildRequires: make
+Requires: efi-filesystem
+ExclusiveArch: %{efi}
 
-# for RHEL / Fedora when efibootmgr was part of the elilo package
-Conflicts: elilo <= 3.6-6
-Obsoletes: elilo <= 3.6-6
+Source0: https://github.com/rhboot/%{name}/releases/download/%{name}-%{version}/%{name}-%{version}.tar.bz2
 
-Source0: https://github.com/rhinstaller/%{name}/releases/download/%{name}-%{version}/%{name}-%{version}.tar.bz2
-
-%global efidir %(eval echo $(grep ^ID= /etc/os-release | sed -e 's/^ID=//' -e 's/rhel/redhat/'))
+# 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
-http://developer.intel.com/technology/efi/efi.htm and http://uefi.org/.
+information about EFI can be found at https://uefi.org/.
 
 %prep
-%setup -q
-git init
-git config user.email "example@example.com"
-git config user.name "RHEL Ninjas"
-git add .
-git commit -a -q -m "%{version} baseline."
-git am %{patches} </dev/null
-git config --unset user.email
-git config --unset user.name
+%autosetup -S git
+git config --local --add efibootmgr.efidir %{efi_vendor}
 
 %build
-make %{?_smp_mflags} CFLAGS='%{optflags}' LDFLAGS='%{build_ldflags}' \
-  EFIDIR=%{efidir}
+%make_build CFLAGS='%{optflags}' LDFLAGS='%{build_ldflags}'
 
 %install
-rm -rf %{buildroot}
-%make_install EFIDIR=%{efidir} libdir=%{_libdir} \
-       bindir=%{_bindir} mandir=%{_mandir} localedir=%{_datadir}/locale/ \
-       includedir=%{_includedir} libexecdir=%{_libexecdir} \
-       datadir=%{_datadir}
+%make_install libdir=%{_libdir} bindir=%{_bindir} mandir=%{_mandir} \
+	      localedir=%{_datadir}/locale/ includedir=%{_includedir} \
+	      libexecdir=%{_libexecdir} datadir=%{_datadir}
 
 %files
-%defattr(-,root,root,-)
-%{!?_licensedir:%global license %%doc}
 %license COPYING
 %{_sbindir}/*
 %{_mandir}/*/*.?.gz
 %doc README
-    
+
 %changelog
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 16-12
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
+
+* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 16-11
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 16-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Thu Aug 06 2020 Merlin Mathesius <mmathesi@redhat.com> - 16-9
+- FTBFS fixes for Rawhide and ELN
+
+* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 16-9
+- Second attempt - Rebuilt for
+  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 16-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 16-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 16-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 16-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 16-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Fri May 04 2018 Peter Jones <pjones@redhat.com> - 16-3
+- Rebuild for new efi-rpm-macros, now that it has settled down a bit.
+
+* Wed May 02 2018 Peter Jones <pjones@redhat.com> - 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 <pjones@redhat.com> - 16-1
 - efibootmgr 16
 - better coverity and clang-analyzer support

sources

@@ -0,0 +1 @@
+SHA512 (efibootmgr-16.tar.bz2) = 936318c7163c07b716f89be3d830957d9db68ba1b059223f7ea3d9eafe0dbf1c91b9aee096f5aed70955c6052c3b8547295c0a47f17cdf43788259d87d1990b9