[packages/kexec-tools] - updated to 2.0.5 - added format patch (fixes build with -Werror=format-security) - added efi patch

[qboosh]

commit da5ba346528a1e1beedde1ab3b24b2bea98f2ca7
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Feb 8 07:42:41 2014 +0100

    - updated to 2.0.5
    - added format patch (fixes build with -Werror=format-security)
    - added efi patch (fixes x86 build after adding EFI support for x86_64)

 kexec-tools-efi.patch    | 10 ++++++++++
 kexec-tools-format.patch | 10 ++++++++++
 kexec-tools.spec         | 14 +++++++++-----
 3 files changed, 29 insertions(+), 5 deletions(-)
---
diff --git a/kexec-tools.spec b/kexec-tools.spec
index f920cf3..f387a96 100644
--- a/kexec-tools.spec
+++ b/kexec-tools.spec
@@ -7,15 +7,17 @@
 Summary:	Tool for starting new kernel without reboot
 Summary(pl.UTF-8):	Narzędzie pozwalające załadować nowe jądro bez konieczności restartu
 Name:		kexec-tools
-Version:	2.0.4
-Release:	3
+Version:	2.0.5
+Release:	1
 License:	GPL v2
 Group:		Applications/System
-Source0:	http://www.kernel.org/pub/linux/utils/kernel/kexec/%{name}-%{version}.tar.xz
-# Source0-md5:	d98f008504bea1ddc1a4bcea7de0454c
+Source0:	https://www.kernel.org/pub/linux/utils/kernel/kexec/%{name}-%{version}.tar.xz
+# Source0-md5:	e476990aa00e27a799a89b3c8f63e82b
 Source1:	kexec.init
 Source2:	kexec.sysconfig
-URL:		http://www.kernel.org/pub/linux/utils/kernel/kexec/
+Patch0:		%{name}-format.patch
+Patch1:		%{name}-efi.patch
+URL:		https://www.kernel.org/pub/linux/utils/kernel/kexec/
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	rpmbuild(macros) >= 1.228
 BuildRequires:	tar >= 1:1.22
@@ -44,6 +46,8 @@ działać na każdej architekturze.
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
 
 %build
 %{__autoconf}
diff --git a/kexec-tools-efi.patch b/kexec-tools-efi.patch
new file mode 100644
index 0000000..08aa3f7
--- /dev/null
+++ b/kexec-tools-efi.patch
@@ -0,0 +1,10 @@
+--- kexec-tools-2.0.5/kexec/arch/i386/kexec-bzImage.c.orig	2013-11-19 02:06:56.000000000 +0100
++++ kexec-tools-2.0.5/kexec/arch/i386/kexec-bzImage.c	2014-02-08 07:38:55.604858355 +0100
+@@ -40,6 +40,7 @@
+ #include <arch/options.h>
+ 
+ static const int probe_debug = 0;
++int bzImage_support_efi_boot = 0;
+ 
+ int bzImage_probe(const char *buf, off_t len)
+ {
diff --git a/kexec-tools-format.patch b/kexec-tools-format.patch
new file mode 100644
index 0000000..c7ebdbb
--- /dev/null
+++ b/kexec-tools-format.patch
@@ -0,0 +1,10 @@
+--- kexec-tools-2.0.5/kexec/arch/i386/kexec-elf-x86.c.orig	2013-11-19 02:06:56.000000000 +0100
++++ kexec-tools-2.0.5/kexec/arch/i386/kexec-elf-x86.c	2014-02-08 07:18:28.278243195 +0100
+@@ -299,6 +299,6 @@
+ 	free(command_line);
+ 	free(modified_cmdline);
+ 	if (error_msg)
+-		die(error_msg);
++		die("%s", error_msg);
+ 	return result;
+ }
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kexec-tools.git/commitdiff/da5ba346528a1e1beedde1ab3b24b2bea98f2ca7