.efibootmgr.metadata

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

.gitignore

@@ -1 +1 @@
-SOURCES/efibootmgr-16.tar.bz2
+SOURCES/efibootmgr-18.tar.bz2

SOURCES/efibootmgr-16-efidp_format_device_path-argfix.patch

@@ -1,51 +0,0 @@
-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);

SPECS/efibootmgr.spec

@@ -1,10 +1,10 @@
 %define efivar_version 35-2
 
 Name: efibootmgr
-Version: 16
-Release: 12%{?dist}
+Version: 18
+Release: 8%{?dist}
 Summary: EFI Boot Manager
-License: GPLv2+
+License: GPL-2.0-or-later
 URL: https://github.com/rhboot/%{name}/
 
 BuildRequires: efi-srpm-macros >= 3-2
@@ -18,10 +18,9 @@ Requires: efi-filesystem
 ExclusiveArch: %{efi}
 
 Source0: https://github.com/rhboot/%{name}/releases/download/%{name}-%{version}/%{name}-%{version}.tar.bz2
+Source1: efibootmgr.patches
 
-# 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
+%include %{SOURCE1}
 
 %description
 %{name} displays and allows the user to edit the Intel Extensible
@@ -47,12 +46,46 @@ git config --local --add efibootmgr.efidir %{efi_vendor}
 %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
+* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com>
+- Bump release for October 2024 mass rebuild:
+  Resolves: RHEL-64018
 
-* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 16-11
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+* Fri Oct 25 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 18-7
+- Rebuilt for MSVSphere 10
+
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com>
+- Bump release for June 2024 mass rebuild
+
+* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org>
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org>
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Wed Dec 13 2023 Nicolas Frayer <nfrayer@redhat.com>
+- Migrate to SPDX license
+- Please refer to https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_2
+
+* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org>
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org>
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org>
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Thu Jul 07 2022 Robbie Harwood <rharwood@redhat.com> - 18-1
+- New upstream version (18)
+
+* Tue Jul 05 2022 Robbie Harwood <rharwood@redhat.com> - 17-1
+- New upstream version (17)
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 16-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 16-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 16-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild