diff --git a/makedumpfile-1.5.5.tar.bz2 b/makedumpfile-1.5.5.tar.bz2 deleted file mode 100644 index bbf30ba..0000000 --- a/makedumpfile-1.5.5.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:233e206c84f36ceaf3e34711509c7502ef6ef759caa0895eecd07d85ddc24c01 -size 114268 diff --git a/makedumpfile-1.5.6.tar.bz2 b/makedumpfile-1.5.6.tar.bz2 new file mode 100644 index 0000000..1b80c5a --- /dev/null +++ b/makedumpfile-1.5.6.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a6dccd679b95bb8de044006ebb9bb8914e6ceb61f7595823db76b5c6cf54fd19 +size 119813 diff --git a/makedumpfile-coptflags.diff b/makedumpfile-coptflags.diff index 30239f8..f1a22cd 100644 --- a/makedumpfile-coptflags.diff +++ b/makedumpfile-coptflags.diff @@ -17,9 +17,9 @@ -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE # LDFLAGS = -L/usr/local/lib -I/usr/local/include -@@ -45,9 +45,9 @@ OBJ_PART = print_info.o dwarf_info.o elf +@@ -51,9 +51,9 @@ OBJ_PART=$(patsubst %.c,%.o,$(SRC_PART)) SRC_ARCH = arch/arm.c arch/x86.c arch/x86_64.c arch/ia64.c arch/ppc64.c arch/s390x.c arch/ppc.c - OBJ_ARCH = arch/arm.o arch/x86.o arch/x86_64.o arch/ia64.o arch/ppc64.o arch/s390x.o arch/ppc.o + OBJ_ARCH=$(patsubst %.c,%.o,$(SRC_ARCH)) -LIBS = -ldw -lbz2 -lebl -ldl -lelf -lz +LIBS = -ldw -lebl -lelf $(LIBS_STATIC) -Wl,-Bdynamic -ldl -lz $(LIBS_DYNAMIC) diff --git a/makedumpfile-fix-sprintf-append.patch b/makedumpfile-fix-sprintf-append.patch deleted file mode 100644 index 90f2234..0000000 --- a/makedumpfile-fix-sprintf-append.patch +++ /dev/null @@ -1,64 +0,0 @@ -From: Petr Tesarik -Subject: Fix string append in dump_log_entry() -References: bnc#865596 -Patch-mainline: not yet - -To quote the sprintf(3) man page: - - Some programs imprudently rely on code such as the following - - sprintf(buf, "%s some further text", buf); - - to append text to buf. However, the standards explicitly note that - the results are undefined if source and destination buffers overlap - when calling sprintf(), snprintf(), vsprintf(), and vsnprintf(). - Depending on the version of gcc(1) used, and the compiler options - employed, calls such as the above will not produce the expected results. - -It's also overkill to call sprintf() for something that can be done -with a simple assignment. - -Signed-off-by: Petr Tesarik ---- - makedumpfile.c | 15 ++++++++------- - 1 file changed, 8 insertions(+), 7 deletions(-) - ---- a/makedumpfile.c -+++ b/makedumpfile.c -@@ -3830,7 +3830,7 @@ reset_bitmap_of_free_pages(unsigned long - static int - dump_log_entry(char *logptr, int fp) - { -- char *msg, *p; -+ char *msg, *p, *bufp; - unsigned int i, text_len; - unsigned long long ts_nsec; - char buf[BUFSIZE]; -@@ -3845,20 +3845,21 @@ dump_log_entry(char *logptr, int fp) - - msg = logptr + SIZE(printk_log); - -- sprintf(buf, "[%5lld.%06ld] ", nanos, rem/1000); -+ bufp = buf; -+ bufp += sprintf(buf, "[%5lld.%06ld] ", nanos, rem/1000); - - for (i = 0, p = msg; i < text_len; i++, p++) { - if (*p == '\n') -- sprintf(buf, "%s.", buf); -+ *bufp++ = '.'; - else if (isprint(*p) || isspace(*p)) -- sprintf(buf, "%s%c", buf, *p); -+ *bufp++ = *p; - else -- sprintf(buf, "%s.", buf); -+ *bufp++ = '.'; - } - -- sprintf(buf, "%s\n", buf); -+ *bufp++ = '\n'; - -- if (write(info->fd_dumpfile, buf, strlen(buf)) < 0) -+ if (write(info->fd_dumpfile, buf, bufp - buf) < 0) - return FALSE; - else - return TRUE; diff --git a/makedumpfile-kernel-3.12-supported.patch b/makedumpfile-kernel-3.12-supported.patch deleted file mode 100644 index 1b7c68e..0000000 --- a/makedumpfile-kernel-3.12-supported.patch +++ /dev/null @@ -1,20 +0,0 @@ -From: Petr Tesarik -Subject: Mark kernel 3.12 as supported -Patch-mainline: not yet - -Signed-off-by: Petr Tesarik ---- - makedumpfile.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/makedumpfile.h -+++ b/makedumpfile.h -@@ -434,7 +434,7 @@ do { \ - #define KVER_MIN_SHIFT 16 - #define KERNEL_VERSION(x,y,z) (((x) << KVER_MAJ_SHIFT) | ((y) << KVER_MIN_SHIFT) | (z)) - #define OLDEST_VERSION KERNEL_VERSION(2, 6, 15)/* linux-2.6.15 */ --#define LATEST_VERSION KERNEL_VERSION(3, 11, 3)/* linux-3.11.3 */ -+#define LATEST_VERSION KERNEL_VERSION(3, 12, 0xffff)/* linux-3.12.x */ - - /* - * vmcoreinfo in /proc/vmcore diff --git a/makedumpfile.changes b/makedumpfile.changes index f5ad777..424e359 100644 --- a/makedumpfile.changes +++ b/makedumpfile.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Wed May 7 14:00:57 UTC 2014 - ptesarik@suse.cz + +- upgrade to makedumpfile-1.5.6 + o support for Linux 3.13 + o include sample eppic scripts + o eppic: Add support for module data structures + o ability to filter Xen Dom0 dumps + +- makedumpfile-fix-sprintf-append.patch: now upstream +- makedumpfile-kernel-3.12-supported.patch: now upstream + ------------------------------------------------------------------- Fri Mar 21 09:50:53 UTC 2014 - ptesarik@suse.cz diff --git a/makedumpfile.spec b/makedumpfile.spec index 302d299..48da7b4 100644 --- a/makedumpfile.spec +++ b/makedumpfile.spec @@ -39,7 +39,7 @@ BuildRequires: lzo-devel BuildRequires: snappy-devel %endif BuildRequires: xz-devel -Version: 1.5.5 +Version: 1.5.6 Release: 0 Summary: Partial kernel dump License: GPL-2.0 @@ -48,8 +48,6 @@ Url: https://sourceforge.net/projects/makedumpfile/ Source: %{name}-%{version}.tar.bz2 Source1: README.static Patch0: %{name}-coptflags.diff -Patch1: %{name}-fix-sprintf-append.patch -Patch2: %{name}-kernel-3.12-supported.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 ia64 ppc ppc64 ppc64le s390x %arm @@ -68,8 +66,6 @@ Authors: %prep %setup -q %patch0 -p1 -%patch1 -p1 -%patch2 -p1 %build LIBS_STATIC= @@ -102,6 +98,8 @@ mkdir -p $RPM_BUILD_ROOT%{_mandir}/man8 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man5 install -c -m 0644 makedumpfile.8 $RPM_BUILD_ROOT%{_mandir}/man8 install -c -m 0644 makedumpfile.conf.5 $RPM_BUILD_ROOT%{_mandir}/man5 +mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/eppic_scripts +install -c -m 644 -t $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/eppic_scripts/ eppic_scripts/* %clean [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT @@ -111,5 +109,7 @@ install -c -m 0644 makedumpfile.conf.5 $RPM_BUILD_ROOT%{_mandir}/man5 %doc README COPYING IMPLEMENTATION %doc %{_mandir}/man?/* /bin/* +%dir %{_datadir}/%{name}-%{version} +%{_datadir}/%{name}-%{version}/eppic_scripts/ %changelog