[kexec-tools] Rebase makedumpfile-1.5.6

[WANG Chao]

commit 39178b134640b495b89b9124925e19475c6489df
Author: WANG Chao <chaowang at redhat.com>
Date:   Mon Apr 28 21:52:15 2014 +0800

    Rebase makedumpfile-1.5.6
    
    Signed-off-by: WANG Chao <chaowang at redhat.com>

 .gitignore                                         |    1 +
 ....3-build-makedumpfile-eppic-shared-object.patch |   10 +-
 ...t-in-cyclic-bitmap-initialization-introdu.patch |  112 --------------------
 kexec-tools.spec                                   |   16 ++--
 sources                                            |    3 +-
 5 files changed, 14 insertions(+), 128 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 012ac17..b8a683f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ makedumpfile-1.3.5.tar.gz
 /makedumpfile-1.5.5.tar.gz
 /kexec-tools-2.0.5.tar.xz
 /kexec-tools-2.0.6.tar.xz
+/makedumpfile-1.5.6.tar.gz
diff --git a/kexec-tools-2.0.3-build-makedumpfile-eppic-shared-object.patch b/kexec-tools-2.0.3-build-makedumpfile-eppic-shared-object.patch
index 48d7f55..775511a 100644
--- a/kexec-tools-2.0.3-build-makedumpfile-eppic-shared-object.patch
+++ b/kexec-tools-2.0.3-build-makedumpfile-eppic-shared-object.patch
@@ -1,6 +1,6 @@
---- kexec-tools-2.0.3/makedumpfile-1.5.5/Makefile.orig
-+++ kexec-tools-2.0.3/makedumpfile-1.5.5/Makefile
-@@ -60,7 +60,7 @@ LIBS := -lsnappy $(LIBS)
+--- kexec-tools-2.0.6/makedumpfile-1.5.6/Makefile.orig
++++ kexec-tools-2.0.6/makedumpfile-1.5.6/Makefile
+@@ -66,7 +66,7 @@
  CFLAGS += -DUSESNAPPY
  endif
  
@@ -8,8 +8,8 @@
 +all: makedumpfile eppic_makedumpfile.so
  
  $(OBJ_PART): $(SRC_PART)
- 	$(CC) $(CFLAGS) -c -o ./$@ ./$(@:.o=.c) 
-@@ -80,7 +80,7 @@ makedumpfile: $(SRC) $(OBJ_PART) $(OBJ_A
+ 	$(CC) $(CFLAGS) -c -o ./$@ $(VPATH)$(@:.o=.c)
+@@ -87,7 +87,7 @@
  	gzip -c ./makedumpfile.conf.5 > ./makedumpfile.conf.5.gz
  
  eppic_makedumpfile.so: extension_eppic.c
diff --git a/kexec-tools.spec b/kexec-tools.spec
index f208cad..e165c54 100644
--- a/kexec-tools.spec
+++ b/kexec-tools.spec
@@ -12,7 +12,7 @@ Source4: kdump.sysconfig.i386
 Source5: kdump.sysconfig.ppc64
 Source7: mkdumprd
 Source8: kdump.conf
-Source9: http://downloads.sourceforge.net/project/makedumpfile/makedumpfile/1.5.5/makedumpfile-1.5.5.tar.gz
+Source9: http://downloads.sourceforge.net/project/makedumpfile/makedumpfile/1.5.6/makedumpfile-1.5.6.tar.gz
 Source10: kexec-kdump-howto.txt
 Source11: firstboot_kdump.py
 Source12: mkdumprd.8
@@ -75,7 +75,6 @@ ExcludeArch: aarch64
 #
 Patch601: kexec-tools-2.0.3-disable-kexec-test.patch
 Patch604: kexec-tools-2.0.3-build-makedumpfile-eppic-shared-object.patch
-Patch618: kexec-tools-2.0.4-makedumpfile-memset-in-cyclic-bitmap-initialization-introdu.patch
 Patch619: kexec-tools-2.0.5-vmcore-dmesg-stack-smashing-happend-in-extreme-case.patch
 
 %description
@@ -107,7 +106,6 @@ tar -z -x -v -f %{SOURCE19}
 
 %patch601 -p1
 %patch604 -p1
-%patch618 -p1
 %patch619 -p1
 
 tar -z -x -v -f %{SOURCE13}
@@ -132,7 +130,7 @@ cp %{SOURCE21} .
 make
 %ifarch %{ix86} x86_64 ppc64 s390x
 make -C eppic/libeppic
-make -C makedumpfile-1.5.5 LINKTYPE=dynamic USELZO=on USESNAPPY=on
+make -C makedumpfile-1.5.6 LINKTYPE=dynamic USELZO=on USESNAPPY=on
 %endif
 make -C kexec-tools-po
 
@@ -174,11 +172,11 @@ mkdir -p $RPM_BUILD_ROOT/usr/sbin
 install -m 755 %{SOURCE17} $RPM_BUILD_ROOT/usr/sbin/rhcrashkernel-param
 
 %ifarch %{ix86} x86_64 ppc64 s390x
-install -m 755 makedumpfile-1.5.5/makedumpfile $RPM_BUILD_ROOT/sbin/makedumpfile
-install -m 644 makedumpfile-1.5.5/makedumpfile.8.gz $RPM_BUILD_ROOT/%{_mandir}/man8/makedumpfile.8.gz
-install -m 644 makedumpfile-1.5.5/makedumpfile.conf.5.gz $RPM_BUILD_ROOT/%{_mandir}/man5/makedumpfile.conf.5.gz
-install -m 644 makedumpfile-1.5.5/makedumpfile.conf $RPM_BUILD_ROOT/%{_sysconfdir}/makedumpfile.conf.sample
-install -m 755 makedumpfile-1.5.5/eppic_makedumpfile.so $RPM_BUILD_ROOT/%{_libdir}/eppic_makedumpfile.so
+install -m 755 makedumpfile-1.5.6/makedumpfile $RPM_BUILD_ROOT/sbin/makedumpfile
+install -m 644 makedumpfile-1.5.6/makedumpfile.8.gz $RPM_BUILD_ROOT/%{_mandir}/man8/makedumpfile.8.gz
+install -m 644 makedumpfile-1.5.6/makedumpfile.conf.5.gz $RPM_BUILD_ROOT/%{_mandir}/man5/makedumpfile.conf.5.gz
+install -m 644 makedumpfile-1.5.6/makedumpfile.conf $RPM_BUILD_ROOT/%{_sysconfdir}/makedumpfile.conf.sample
+install -m 755 makedumpfile-1.5.6/eppic_makedumpfile.so $RPM_BUILD_ROOT/%{_libdir}/eppic_makedumpfile.so
 %endif
 make -C kexec-tools-po install DESTDIR=$RPM_BUILD_ROOT
 %find_lang %{name}
diff --git a/sources b/sources
index 83dbd0b..9af944a 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,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
+874990aedbdd28689a238917169852f8  makedumpfile-1.5.6.tar.gz