Release 2.0.6-1

Signed-off-by: WANG Chao <chaowang@redhat.com>

.gitignore

@@ -15,3 +15,4 @@ makedumpfile-1.3.5.tar.gz
 /kexec-tools-po-20131224.tgz
 /makedumpfile-1.5.5.tar.gz
 /kexec-tools-2.0.5.tar.xz
+/kexec-tools-2.0.6.tar.xz

kexec-tools-2.0.5-i386-fix-build-failure-bzImage_support_efi_boot.patch

@@ -1,29 +0,0 @@
-From 9bcefc97bc6c03b6acc8c25f6b1d4e796521ea4c Mon Sep 17 00:00:00 2001
-From: Tony Jones <tonyj@suse.de>
-Date: Wed, 5 Feb 2014 14:32:18 -0800
-Subject: [PATCH 1/2] i386: fix build failure (bzImage_support_efi_boot)
-
-Commit 9c200a85de2245a850546fded96a1977b84ad24d referenced
-'bzImage_support_efi_boot' without matching 32-bit definition.
-
-Signed-off-by: Tony Jones <tonyj@suse.de>
-Signed-off-by: Simon Horman <horms@verge.net.au>
----
- kexec/arch/i386/kexec-bzImage.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/kexec/arch/i386/kexec-bzImage.c b/kexec/arch/i386/kexec-bzImage.c
-index fc1a54f..e7bc1d6 100644
---- a/kexec/arch/i386/kexec-bzImage.c
-+++ b/kexec/arch/i386/kexec-bzImage.c
-@@ -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)
- {
--- 
-1.8.5.3
-

kexec-tools-2.0.5-i386-fix-redefinition-error-for-e820entry.patch

@@ -1,36 +0,0 @@
-From 941fa1f6e31bc7cb1b014277de36b80425da7010 Mon Sep 17 00:00:00 2001
-From: Tony Jones <tonyj@suse.com>
-Date: Wed, 5 Feb 2014 14:38:07 -0800
-Subject: [PATCH 2/2] i386: fix redefinition error for e820entry
-
-At least on our systems, xenctrl.h defines (unguarded) struct e820entry
-Move the (guarded) definition in include/x86/x86-linux.h to below.
-
-Signed-off-by: Tony Jones <tonyj@suse.de>
-Signed-off-by: Simon Horman <horms@verge.net.au>
----
- kexec/arch/i386/crashdump-x86.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/kexec/arch/i386/crashdump-x86.c b/kexec/arch/i386/crashdump-x86.c
-index 53bd077..979c2bd 100644
---- a/kexec/arch/i386/crashdump-x86.c
-+++ b/kexec/arch/i386/crashdump-x86.c
-@@ -41,12 +41,13 @@
- #include "../../crashdump.h"
- #include "kexec-x86.h"
- #include "crashdump-x86.h"
--#include "x86-linux-setup.h"
- 
- #ifdef HAVE_LIBXENCTRL
- #include <xenctrl.h>
- #endif /* HAVE_LIBXENCTRL */
- 
-+#include "x86-linux-setup.h"
-+
- #include <x86/x86-linux.h>
- 
- extern struct arch_options_t arch_options;
--- 
-1.8.5.3
-

kexec-tools.spec

@@ -1,6 +1,6 @@
 Name: kexec-tools
-Version: 2.0.5
+Version: 2.0.6
-Release: 2%{?dist}
+Release: 1%{?dist}
 License: GPLv2
 Group: Applications/System
 Summary: The kexec/kdump userspace component
@@ -53,8 +53,6 @@ Obsoletes: diskdumputils netdump
 #
 # Patches 0 through 100 are meant for x86 kexec-tools enablement
 #
-Patch000: kexec-tools-2.0.5-i386-fix-build-failure-bzImage_support_efi_boot.patch
-Patch001: kexec-tools-2.0.5-i386-fix-redefinition-error-for-e820entry.patch
 
 #
 # Patches 101 through 200 are meant for x86_64 kexec-tools enablement
@@ -113,8 +111,6 @@ tar -z -x -v -f %{SOURCE19}
 %patch601 -p1
 %patch604 -p1
 %patch618 -p1
-%patch000 -p1
-%patch001 -p1
 %patch619 -p1
 
 tar -z -x -v -f %{SOURCE13}
@@ -335,6 +331,12 @@ done
 %endif
 
 %changelog
+* Wed Mar 26 2014 WANG Chao <chaowang@redhat.com> - 2.0.6-1
+- Rebase kexec-tools-2.0.6
+- fix an issue when dump path is mounted on nfs
+- vmcore-dmesg: stack smashing fix
+- get_ssh_size fix for localized df output
+
 * Mon Mar 10 2014 WANG Chao <chaowang@redhat.com> - 2.0.5-2
 - Warn about save vmcore patch mounted by another disk
 - Omit dracut resume module

sources

@@ -2,3 +2,4 @@ b48eb2726d602c1aa3abfd3739441f54  eppic_030413.tar.gz
 ba3710c36b287b6a61b2867b4c9b6478  kexec-tools-po-20131224.tgz
 70ff343bbe6657b69beb23458e3e0b98  makedumpfile-1.5.5.tar.gz
 e476990aa00e27a799a89b3c8f63e82b  kexec-tools-2.0.5.tar.xz
+9192e5b9fab094b90f481226d1ad5e74  kexec-tools-2.0.6.tar.xz