[kexec-tools] sync with the latest upstream releases

[Cong Wang]

commit e494189fbbb39d33e2fd71d3dc14b527ea4c30f9
Author: Cong Wang <xiyou.wangcong at gmail.com>
Date:   Sat Jan 21 12:20:35 2012 +0800

    sync with the latest upstream releases

 .gitignore                                         |    2 +
 kexec-tools-2.0.0-disable-kexec-test.patch         |   14 ----
 ...tools-2.0.0-makedumpfile-2.6.32-sparsemem.patch |   66 ----------------
 ...c-tools-2.0.0-makedumpfile-2.6.32-utsname.patch |   83 --------------------
 kexec-tools-2.0.0-makedumpfile-boption.patch       |   27 -------
 kexec-tools-2.0.0-makedumpfile-dynamic-build.patch |   12 ++--
 kexec-tools-2.0.2-purgatory-makefile.patch         |   12 ---
 kexec-tools.spec                                   |   24 ++----
 sources                                            |    2 +
 9 files changed, 17 insertions(+), 225 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7f41e2f..91751eb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,5 @@ kexec-tools-2.0.0.tar.bz2
 kexec-tools-po.tar.gz
 makedumpfile-1.3.5.tar.gz
 /kexec-tools-2.0.2.tar.bz2
+/kexec-tools-2.0.3.tar.bz2
+/makedumpfile-1.4.1.tar.gz
diff --git a/kexec-tools-2.0.0-makedumpfile-dynamic-build.patch b/kexec-tools-2.0.0-makedumpfile-dynamic-build.patch
index 6b2e2d2..727449e 100644
--- a/kexec-tools-2.0.0-makedumpfile-dynamic-build.patch
+++ b/kexec-tools-2.0.0-makedumpfile-dynamic-build.patch
@@ -1,11 +1,11 @@
---- kexec-tools-2.0.0/makedumpfile-1.3.5/Makefile.orig	2009-11-11 08:44:51.000000000 +0800
-+++ kexec-tools-2.0.0/makedumpfile-1.3.5/Makefile	2010-05-30 00:25:17.350869858 +0800
-@@ -32,7 +32,7 @@
+--- kexec-tools-2.0.1/makedumpfile-1.4.1/Makefile.orig	2009-11-11 08:44:51.000000000 +0800
++++ kexec-tools-2.0.1/makedumpfile-1.4.1/Makefile	2010-05-30 00:25:17.350869858 +0800
+@@ -38,7 +38,7 @@ $(OBJ_ARCH): $(SRC_ARCH)
  	$(CC) $(CFLAGS_ARCH) -c -o ./$@ ./$(@:.o=.c) 
  
- makedumpfile: $(SRC) $(OBJ_ARCH)
--	$(CC) $(CFLAGS) $(OBJ_ARCH) -o $@ $< -static -ldw -lelf -lz
-+	$(CC) $(CFLAGS) $(OBJ_ARCH) -o $@ $< -ldw -lelf -lz
+ makedumpfile: $(SRC) $(OBJ_PART) $(OBJ_ARCH)
+-	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJ_PART) $(OBJ_ARCH) -o $@ $< -static -ldw -lbz2 -lebl -ldl -lelf -lz
++	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJ_PART) $(OBJ_ARCH) -o $@ $< -ldw -lbz2 -lebl -ldl -lelf -lz
  	echo .TH MAKEDUMPFILE 8 \"$(DATE)\" \"makedumpfile v$(VERSION)\" \"Linux System Administrator\'s Manual\" > temp.8
  	grep -v "^.TH MAKEDUMPFILE 8" makedumpfile.8 >> temp.8
  	mv temp.8 makedumpfile.8
diff --git a/kexec-tools.spec b/kexec-tools.spec
index 31c1798..653823d 100644
--- a/kexec-tools.spec
+++ b/kexec-tools.spec
@@ -1,10 +1,10 @@
 Name: kexec-tools
-Version: 2.0.2
+Version: 2.0.3
 Release: 32%{?dist}
 License: GPLv2
 Group: Applications/System
 Summary: The kexec/kdump userspace component.
-Source0: http://www.kernel.org/pub/linux/kernel/people/horms/kexec-tools/%{name}-%{version}.tar.bz2
+Source0: http://kernel.org/pub/linux/utils/kernel/kexec/%{name}-%{version}.tar.bz2
 Source1: kdumpctl
 Source2: kdump.sysconfig
 Source3: kdump.sysconfig.x86_64
@@ -13,7 +13,7 @@ Source5: kdump.sysconfig.ppc64
 Source6: kdump.sysconfig.ia64
 Source7: mkdumprd
 Source8: kdump.conf
-Source9: http://downloads.sourceforge.net/project/makedumpfile/makedumpfile/1.3.5/makedumpfile-1.3.5.tar.gz
+Source9: http://downloads.sourceforge.net/project/makedumpfile/makedumpfile/1.4.1/makedumpfile-1.4.1.tar.gz
 Source10: kexec-kdump-howto.txt
 Source11: firstboot_kdump.py
 Source12: mkdumprd.8
@@ -71,12 +71,7 @@ Obsoletes: diskdumputils netdump
 #
 # Patches 601 onward are generic patches
 #
-Patch601: kexec-tools-2.0.0-disable-kexec-test.patch
-Patch602: kexec-tools-2.0.0-makedumpfile-dynamic-build.patch
-Patch603: kexec-tools-2.0.0-makedumpfile-2.6.32-utsname.patch
-Patch604: kexec-tools-2.0.0-makedumpfile-boption.patch
-Patch605: kexec-tools-2.0.0-makedumpfile-2.6.32-sparsemem.patch
-Patch606: kexec-tools-2.0.2-purgatory-makefile.patch
+Patch601: kexec-tools-2.0.0-makedumpfile-dynamic-build.patch
 
 %description
 kexec-tools provides /sbin/kexec binary that facilitates a new
@@ -93,11 +88,6 @@ tar -z -x -v -f %{SOURCE9}
 
 
 %patch601 -p1
-%patch602 -p1
-%patch603 -p1
-%patch604 -p1
-%patch605 -p1
-%patch606 -p1
 
 tar -z -x -v -f %{SOURCE13}
 
@@ -127,7 +117,7 @@ cp %{SOURCE10} .
 
 make
 %ifarch %{ix86} x86_64 ia64 ppc64
-make -C makedumpfile-1.3.5
+make -C makedumpfile-1.4.1
 %endif
 make -C kexec-tools-po
 
@@ -160,8 +150,8 @@ install -m 644 %{SOURCE15} $RPM_BUILD_ROOT%{_mandir}/man5/kdump.conf.5
 install -m 644 %{SOURCE16} $RPM_BUILD_ROOT%{_unitdir}/kdump.service
 
 %ifarch %{ix86} x86_64 ia64 ppc64
-install -m 755 makedumpfile-1.3.5/makedumpfile $RPM_BUILD_ROOT/sbin/makedumpfile
-install -m 644 makedumpfile-1.3.5/makedumpfile.8.gz $RPM_BUILD_ROOT/%{_mandir}/man8/makedumpfile.8.gz
+install -m 755 makedumpfile-1.4.1/makedumpfile $RPM_BUILD_ROOT/sbin/makedumpfile
+install -m 644 makedumpfile-1.4.1/makedumpfile.8.gz $RPM_BUILD_ROOT/%{_mandir}/man8/makedumpfile.8.gz
 %endif
 make -C kexec-tools-po install DESTDIR=$RPM_BUILD_ROOT
 %find_lang %{name}
diff --git a/sources b/sources
index c0cfe0f..64f8a23 100644
--- a/sources
+++ b/sources
@@ -3,3 +3,5 @@ d9f2ecd3c3307905f24130a25816e6cc  kexec-tools-2.0.0.tar.bz2
 e3a813bd6d7dace903a05c1296e20d57  makedumpfile-1.3.5.tar.gz
 8e359dd03731b93a2082bd37cc2a4a4c  kexec-tools-2.0.2.tar.bz2
 8b9e1ac8304c1f47f239a6225421ec4e  dracut-files.tbz2
+b3ced2097ce3981abba38ceedc84f939  kexec-tools-2.0.3.tar.bz2
+967f89bb947ca4db78f51beeaaee0bd8  makedumpfile-1.4.1.tar.gz