diff --git a/.efibootmgr.metadata b/.efibootmgr.metadata index 91c1b59..53c54f5 100644 --- a/.efibootmgr.metadata +++ b/.efibootmgr.metadata @@ -1 +1 @@ -9dc7ca7b14a47fc178a5bb7b9c0a79cc05e2b272 SOURCES/efibootmgr-15.tar.bz2 +c28188c71a0e85c1c36dc89453847ff879651fa4 SOURCES/efibootmgr-17.tar.bz2 diff --git a/.gitignore b/.gitignore index c2eb4e4..bc747ea 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/efibootmgr-15.tar.bz2 +SOURCES/efibootmgr-17.tar.bz2 diff --git a/SOURCES/0001-RHEL-7.x-popt-doesn-t-have-popt.pc-work-around-its-a.patch b/SOURCES/0001-RHEL-7.x-popt-doesn-t-have-popt.pc-work-around-its-a.patch index 0e6d03a..6af36db 100644 --- a/SOURCES/0001-RHEL-7.x-popt-doesn-t-have-popt.pc-work-around-its-a.patch +++ b/SOURCES/0001-RHEL-7.x-popt-doesn-t-have-popt.pc-work-around-its-a.patch @@ -1,4 +1,4 @@ -From ad4f7b2b46aadb402dbfb1197151446d10c8ec6e Mon Sep 17 00:00:00 2001 +From 77604f4e9ca646f1b8234b5d223fb4c8e786c512 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 13 Mar 2017 15:33:54 -0400 Subject: [PATCH 1/2] RHEL 7.x popt doesn't have popt.pc, work around its @@ -12,7 +12,7 @@ Signed-off-by: Peter Jones 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/Makefile b/src/Makefile -index 258bac1..453ddad 100644 +index 258bac1c04a..453ddadfca2 100644 --- a/src/Makefile +++ b/src/Makefile @@ -21,15 +21,19 @@ ALL_SOURCES=$(EFIBOOTMGR_SOURCES) @@ -39,5 +39,5 @@ index 258bac1..453ddad 100644 deps : $(ALL_SOURCES) $(MAKE) -f $(TOPDIR)/Make.deps deps SOURCES="$(ALL_SOURCES)" SUBDIR_CFLAGS="$(SUBDIR_CFLAGS)" -- -2.9.3 +2.17.1 diff --git a/SOURCES/0002-Don-t-build-efibootdump-on-RHEL-7.4.patch b/SOURCES/0002-Don-t-build-efibootdump-on-RHEL-7.4.patch index e6f576f..185dd18 100644 --- a/SOURCES/0002-Don-t-build-efibootdump-on-RHEL-7.4.patch +++ b/SOURCES/0002-Don-t-build-efibootdump-on-RHEL-7.4.patch @@ -1,4 +1,4 @@ -From 09df652105eb466390c00b8599d777e6fed45c41 Mon Sep 17 00:00:00 2001 +From d67065dc8bbca6c7b921cf57d4a30e8c700b3a8e Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 13 Mar 2017 15:48:09 -0400 Subject: [PATCH 2/2] Don't build efibootdump on RHEL 7.4... @@ -14,7 +14,7 @@ Signed-off-by: Peter Jones 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/Makefile b/src/Makefile -index 453ddad..162f552 100644 +index 453ddadfca2..162f5526b3c 100644 --- a/src/Makefile +++ b/src/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/Make.defaults @@ -37,5 +37,5 @@ index 453ddad..162f552 100644 .PHONY : all deps clean install -- -2.9.3 +2.17.1 diff --git a/SOURCES/0003-make_linux_load_option-check-data_size-correctly.patch b/SOURCES/0003-make_linux_load_option-check-data_size-correctly.patch deleted file mode 100644 index b679be2..0000000 --- a/SOURCES/0003-make_linux_load_option-check-data_size-correctly.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 2e018c08b92c800961ec010a6a4eeb34e8f3faa0 Mon Sep 17 00:00:00 2001 -From: Peter Jones -Date: Tue, 9 May 2017 16:46:13 -0400 -Subject: [PATCH 3/4] make_linux_load_option(): check data_size correctly. - -Coverity noticed that we're not checking data_size for NULLness before -dereferencing it to pass the value to efi_loadopt_create(). So now we -pass a temporary variable and assign it only if it's non-NULL. - -Signed-off-by: Peter Jones ---- - src/efi.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/src/efi.c b/src/efi.c -index 8e2664e..cf4ada6 100644 ---- a/src/efi.c -+++ b/src/efi.c -@@ -397,7 +397,10 @@ make_linux_load_option(uint8_t **data, size_t *data_size, - } - } - -- needed = efi_loadopt_create(*data, *data_size, -+ size_t data_size_tmp = 0; -+ if (data_size) -+ data_size_tmp = *data_size; -+ needed = efi_loadopt_create(*data, data_size_tmp, - attributes, dp, needed, opts.label, - optional_data, optional_data_size); - if (dp) { --- -2.12.2 - diff --git a/SOURCES/0003-remove-extra-decl.patch b/SOURCES/0003-remove-extra-decl.patch new file mode 100644 index 0000000..90f83e0 --- /dev/null +++ b/SOURCES/0003-remove-extra-decl.patch @@ -0,0 +1,27 @@ +From 99b578501643377e0b1994b2a068b790d189d5ad Mon Sep 17 00:00:00 2001 +From: Peter Jones +Date: Wed, 13 Jun 2018 09:41:01 -0400 +Subject: [PATCH] remove extra decl + +Signed-off-by: Peter Jones +--- + src/efibootmgr.c | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/src/efibootmgr.c b/src/efibootmgr.c +index de38f01a186..4e1a6801515 100644 +--- a/src/efibootmgr.c ++++ b/src/efibootmgr.c +@@ -1536,9 +1536,6 @@ parse_opts(int argc, char **argv) + "invalid numeric value %s\n", + optarg); + } +- /* XXX efivar-36 accidentally doesn't have a public +- * header for this */ +- extern int efi_set_verbose(int verbosity, FILE *errlog); + efi_set_verbose(opts.verbose - 2, stderr); + break; + case 'V': +-- +2.17.1 + diff --git a/SPECS/efibootmgr.spec b/SPECS/efibootmgr.spec index 55a6c5b..ff36f81 100644 --- a/SPECS/efibootmgr.spec +++ b/SPECS/efibootmgr.spec @@ -1,8 +1,8 @@ -%define efivar_version 31-1 +%define efivar_version 36-4 Summary: EFI Boot Manager Name: efibootmgr -Version: 15 +Version: 17 Release: 2%{?dist} Group: System Environment/Base License: GPLv2+ @@ -21,7 +21,7 @@ Obsoletes: elilo <= 3.6-6 Source0: https://github.com/rhinstaller/%{name}/releases/download/%{name}-%{version}/%{name}-%{version}.tar.bz2 Patch0001: 0001-RHEL-7.x-popt-doesn-t-have-popt.pc-work-around-its-a.patch Patch0002: 0002-Don-t-build-efibootdump-on-RHEL-7.4.patch -Patch0003: 0003-make_linux_load_option-check-data_size-correctly.patch +Patch0003: 0003-remove-extra-decl.patch %global efidir %(eval echo $(grep ^ID= /etc/os-release | sed -e 's/^ID=//' -e 's/rhel/redhat/')) @@ -64,6 +64,18 @@ rm -rf %{buildroot} %doc README %changelog +* Wed Jun 13 2018 Peter Jones - 17-2 +- Try to make covscan actually complete the scan... + Related: rhbz#1570032 + Related: rhbz#1558937 + Related: rhbz#1520533 + +* Sun Jun 10 2018 Peter Jones - 17-1 +- Update to efibootmgr 17 + Related: rhbz#1570032 + Related: rhbz#1558937 + Resolves: rhbz#1520533 + * Tue May 09 2017 Peter Jones - 15-2 - Fix some coverity issues Related: rhbz#1380825