Hello community, here is the log from the commit of package makedumpfile for openSUSE:Factory checked in at Fri Sep 24 01:01:00 CEST 2010. -------- --- makedumpfile/makedumpfile.changes 2010-02-28 12:02:51.000000000 +0100 +++ /mounts/work_src_done/STABLE/makedumpfile/makedumpfile.changes 2010-09-22 10:58:50.000000000 +0200 @@ -1,0 +2,20 @@ +Wed Sep 22 08:13:48 UTC 2010 - ptesarik@novell.com + +- Update to 1.3.6 + * Features + o Use TMPDIR environment variable for temporary files + o Add linux-2.6.32 - 2.6.34 support + * Bugfixes + o Fix buffer overflow when writing dh->signature + o handle !SPARSEMEM_EX properly + * Code Cleanup + o Fix 'struct kdump_sub_header' member in IMPLEMENTATION + o fix typo in IMPLEMENTATION + o add maintainers + o add TMPDIR description + o add .gitignore file + o makedumpfile: works on 2.6.32 + o the initialization method is operated if it is possible +- makedumpfile-fix-buffer-overflow.diff: dropped (upstream). + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- makedumpfile-1.3.5.tar.bz2 makedumpfile-fix-buffer-overflow.diff New: ---- makedumpfile-1.3.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ makedumpfile.spec ++++++ --- /var/tmp/diff_new_pack.y39dOu/_old 2010-09-24 01:00:46.000000000 +0200 +++ /var/tmp/diff_new_pack.y39dOu/_new 2010-09-24 01:00:46.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package makedumpfile (Version 1.3.5) +# spec file for package makedumpfile (Version 1.3.6) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -26,14 +26,13 @@ BuildRequires: libdw-devel libdw1 libelf-devel libelf0 libelf1 %endif License: GPLv2+ -Version: 1.3.5 +Version: 1.3.6 Release: 1 Summary: Partial kernel dump Group: System/Kernel Url: https://sourceforge.net/projects/makedumpfile/ Source: %{name}-%{version}.tar.bz2 Patch0: %{name}-coptflags.diff -Patch1: %{name}-fix-buffer-overflow.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 ia64 ppc64 @@ -52,7 +51,6 @@ %prep %setup -q %patch0 -p1 -%patch1 -p1 %build make COPTFLAGS="$RPM_OPT_FLAGS" ++++++ makedumpfile-1.3.5.tar.bz2 -> makedumpfile-1.3.6.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/makedumpfile-1.3.5/.gitignore new/makedumpfile-1.3.6/.gitignore --- old/makedumpfile-1.3.5/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/makedumpfile-1.3.6/.gitignore 2010-06-22 02:58:12.000000000 +0200 @@ -0,0 +1,80 @@ +# +# NOTE! Don't add files that are generated in specific +# subdirectories here. Add them in the ".gitignore" file +# in that subdirectory instead. +# +# NOTE! Please use 'git ls-files -i --exclude-standard' +# command after changing this file, to see if there are +# any tracked files which get ignored after the change. +# +# Normal rules +# +.* +*.o +*.o.* +*.a +*.s +*.ko +*.so +*.so.dbg +*.mod.c +*.i +*.lst +*.symtypes +*.order +modules.builtin +*.elf +*.bin +*.gz +*.bz2 +*.lzma +*.lzo +*.patch +*.gcno + +# +# Top-level generic files +# +/tags +/TAGS +/linux +/vmlinux +/vmlinuz +/System.map +/Module.markers +/Module.symvers + +# +# git files that we don't want to ignore even it they are dot-files +# +!.gitignore +!.mailmap + +# +# Generated include files +# +include/config +include/linux/version.h +include/generated + +# stgit generated dirs +patches-* + +# quilt's files +patches +series + +# cscope files +cscope.* +ncscope.* + +# gnu global files +GPATH +GRTAGS +GSYMS +GTAGS + +*.orig +*~ +\#*# +makedumpfile diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/makedumpfile-1.3.5/IMPLEMENTATION new/makedumpfile-1.3.6/IMPLEMENTATION --- old/makedumpfile-1.3.5/IMPLEMENTATION 2008-09-04 09:31:58.000000000 +0200 +++ new/makedumpfile-1.3.6/IMPLEMENTATION 2010-06-22 02:58:12.000000000 +0200 @@ -56,7 +56,7 @@ }; - sub header - The sub header of the kdump compressed format is orignal. This header + The sub header of the kdump compressed format is original. This header has the member phys_base and dump_level. The member phys_base is for an x86_64 relocatable kernel, and the member dump_level has '-d' option's value of makedumpfile command. @@ -64,6 +64,11 @@ struct kdump_sub_header { unsigned long phys_base; int dump_level; /* header_version 1 and later */ + int split; /* header_version 2 and later */ + unsigned long start_pfn; /* header_version 2 and later */ + unsigned long end_pfn; /* header_version 2 and later */ + off_t offset_vmcoreinfo;/* header_version 3 and later */ + unsigned long size_vmcoreinfo; /* header_version 3 and later */ }; - 1st-bitmap diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/makedumpfile-1.3.5/Makefile new/makedumpfile-1.3.6/Makefile --- old/makedumpfile-1.3.5/Makefile 2009-11-11 01:44:51.000000000 +0100 +++ new/makedumpfile-1.3.6/Makefile 2010-06-22 02:58:12.000000000 +0200 @@ -1,7 +1,7 @@ # makedumpfile -VERSION=1.3.5 -DATE=11 November 2009 +VERSION=1.3.6 +DATE=25 June 2010 CC = gcc CFLAGS = -g -O2 -Wall -D_FILE_OFFSET_BITS=64 \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/makedumpfile-1.3.5/README new/makedumpfile-1.3.6/README --- old/makedumpfile-1.3.5/README 2009-11-11 01:44:51.000000000 +0100 +++ new/makedumpfile-1.3.6/README 2010-06-22 02:58:12.000000000 +0200 @@ -63,7 +63,10 @@ 2.6.28 | OK | ** | -- | | | ** | OK | -- | OK | OK | OK | 2.6.29 | OK | ** | -- | | | ** | OK | -- | OK | OK | OK | 2.6.30 | OK | ** | -- | | | ** | OK | -- | OK | OK | OK | - 2.6.31 | OK | ** | -- | | | ** | | -- | | OK | OK | + 2.6.31 | OK | ** | -- | | | ** | | -- | OK | OK | OK | + 2.6.32 | OK | ** | -- | | | ** | | -- | OK | OK | | + 2.6.33 | OK | ** | -- | | | ** | | -- | OK | OK | | + 2.6.34 | OK | ** | -- | | | ** | | -- | OK | OK | | OK : Support. -- : Not support. @@ -139,5 +142,8 @@ If finding some bugs, please send the information to the following: Ken'ichi Ohmichi <oomichi@mxs.nes.nec.co.jp> Masaki Tachibana <tachibana@mxm.nes.nec.co.jp> + Minoru Usui <usui@mxm.nes.nec.co.jp> + Masayuki Igawa <igawa@mxs.nes.nec.co.jp> + Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp> kexec-ml <kexec@lists.infradead.org> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/makedumpfile-1.3.5/makedumpfile.8 new/makedumpfile-1.3.6/makedumpfile.8 --- old/makedumpfile-1.3.5/makedumpfile.8 2009-11-11 01:44:51.000000000 +0100 +++ new/makedumpfile-1.3.6/makedumpfile.8 2010-06-22 02:58:12.000000000 +0200 @@ -1,4 +1,4 @@ -.TH MAKEDUMPFILE 8 "11 November 2009" "makedumpfile v1.3.5" "Linux System Administrator's Manual" +.TH MAKEDUMPFILE 8 "25 June 2010" "makedumpfile v1.3.6" "Linux System Administrator's Manual" .SH NAME makedumpfile \- make a small dumpfile of kdump .SH SYNOPSIS @@ -453,6 +453,18 @@ \fB\-v\fR Show the version of makedumpfile. +.SH ENVIRONMENT VARIABLES + +.TP 8 +.B TMPDIR +This environment variable is for a temporary memory bitmap file. +If your machine has a lots of memory and you use tmpfs on /tmp, makedumpfile +can fail for a little memory in the 2nd kernel because makedumpfile makes a +very large temporary memory bitmap file in this case. To avoid this failure, +you can set a TMPDIR environment variable. If you do not set a TMPDIR +environment variable, makedumpfile uses /tmp directory for a temporary +bitmap file as a default. + .SH DIAGNOSTICS makedumpfile exits with the following value. .TP diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/makedumpfile-1.3.5/makedumpfile.c new/makedumpfile-1.3.6/makedumpfile.c --- old/makedumpfile-1.3.5/makedumpfile.c 2009-11-11 01:44:51.000000000 +0100 +++ new/makedumpfile-1.3.6/makedumpfile.c 2010-06-22 02:58:12.000000000 +0200 @@ -933,14 +933,21 @@ open_dump_bitmap(void) { int i, fd; + char *tmpname; - if ((info->name_bitmap - = (char *)malloc(sizeof(FILENAME_BITMAP))) == NULL) { + tmpname = getenv("TMPDIR"); + if (!tmpname) + tmpname = "/tmp"; + + if ((info->name_bitmap = (char *)malloc(sizeof(FILENAME_BITMAP) + + strlen(tmpname) + 1)) == NULL) { ERRMSG("Can't allocate memory for the filename. %s\n", strerror(errno)); return FALSE; } - strcpy(info->name_bitmap, FILENAME_BITMAP); + strcpy(info->name_bitmap, tmpname); + strcat(info->name_bitmap, "/"); + strcat(info->name_bitmap, FILENAME_BITMAP); if ((fd = mkstemp(info->name_bitmap)) < 0) { ERRMSG("Can't open the bitmap file(%s). %s\n", info->name_bitmap, strerror(errno)); @@ -3547,9 +3554,6 @@ { unsigned long addr; - if (!is_kvaddr(mem_sec[SECTION_NR_TO_ROOT(nr)])) - return NOT_KV_ADDR; - if (is_sparsemem_extreme()) addr = mem_sec[SECTION_NR_TO_ROOT(nr)] + (nr & SECTION_ROOT_MASK()) * SIZE(mem_section); @@ -3772,6 +3776,8 @@ int initial(void) { + int debug_info = FALSE; + if (!(vt.mem_flags & MEMORY_XEN) && info->flag_exclude_xen_dom) { MSG("'-X' option is disable,"); MSG("because %s is not Xen's memory core image.\n", info->name_memory); @@ -3803,6 +3809,7 @@ if (!read_vmcoreinfo()) return FALSE; close_vmcoreinfo(); + debug_info = TRUE; /* * Get the debug information for analysis from the kernel file */ @@ -3818,6 +3825,8 @@ if (!get_srcfile_info()) return FALSE; + + debug_info = TRUE; } else { /* * Check whether /proc/vmcore contains vmcoreinfo, @@ -3847,6 +3856,7 @@ if (!read_vmcoreinfo_from_vmcore(info->offset_vmcoreinfo, info->size_vmcoreinfo, FALSE)) return FALSE; + debug_info = TRUE; } if (!get_value_for_old_linux()) @@ -3863,31 +3873,25 @@ if (!get_max_mapnr()) return FALSE; - if ((info->max_dump_level <= DL_EXCLUDE_ZERO) && !info->flag_dmesg) { - /* - * The debugging information is unnecessary, because the memory - * management system will not be analazed. - */ - if (!get_mem_map_without_mm()) + if (debug_info) { + if (!get_machdep_info()) return FALSE; - else - return TRUE; - } - - if (!get_machdep_info()) - return FALSE; - if (!check_release()) - return FALSE; + if (!check_release()) + return FALSE; - if (!get_versiondep_info()) - return FALSE; + if (!get_versiondep_info()) + return FALSE; - if (!get_numnodes()) - return FALSE; + if (!get_numnodes()) + return FALSE; - if (!get_mem_map()) - return FALSE; + if (!get_mem_map()) + return FALSE; + } else { + if (!get_mem_map_without_mm()) + return FALSE; + } return TRUE; } @@ -5454,7 +5458,7 @@ /* * Write common header */ - strcpy(dh->signature, KDUMP_SIGNATURE); + strncpy(dh->signature, KDUMP_SIGNATURE, strlen(KDUMP_SIGNATURE)); dh->header_version = 3; dh->block_size = info->page_size; dh->sub_hdr_size = sizeof(kh) + info->size_vmcoreinfo; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/makedumpfile-1.3.5/makedumpfile.h new/makedumpfile-1.3.6/makedumpfile.h --- old/makedumpfile-1.3.5/makedumpfile.h 2009-11-11 01:44:51.000000000 +0100 +++ new/makedumpfile-1.3.6/makedumpfile.h 2010-06-22 02:58:12.000000000 +0200 @@ -230,7 +230,7 @@ #define BUFSIZE_FGETS (1500) #define BUFSIZE_BITMAP (4096) #define PFN_BUFBITMAP (BITPERBYTE*BUFSIZE_BITMAP) -#define FILENAME_BITMAP "/tmp/kdump_bitmapXXXXXX" +#define FILENAME_BITMAP "kdump_bitmapXXXXXX" #define FILENAME_STDOUT "STDOUT" /* @@ -449,7 +449,7 @@ #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(2, 6, 31)/* linux-2.6.31 */ +#define LATEST_VERSION KERNEL_VERSION(2, 6, 34)/* linux-2.6.34 */ /* * vmcoreinfo in /proc/vmcore diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/makedumpfile-1.3.5/makedumpfile.spec new/makedumpfile-1.3.6/makedumpfile.spec --- old/makedumpfile-1.3.5/makedumpfile.spec 2009-11-11 01:44:51.000000000 +0100 +++ new/makedumpfile-1.3.6/makedumpfile.spec 2010-06-22 02:58:12.000000000 +0200 @@ -1,6 +1,6 @@ Name: makedumpfile Summary: makedumpfile package -Version: 1.3.5 +Version: 1.3.6 Release: 1 Group: Applications/Text License: GPL ++++++ makedumpfile-coptflags.diff ++++++ --- /var/tmp/diff_new_pack.y39dOu/_old 2010-09-24 01:00:46.000000000 +0200 +++ /var/tmp/diff_new_pack.y39dOu/_new 2010-09-24 01:00:46.000000000 +0200 @@ -5,7 +5,7 @@ --- a/Makefile +++ b/Makefile @@ -4,10 +4,10 @@ VERSION=1.3.5 - DATE=11 November 2009 + DATE=25 June 2010 CC = gcc -CFLAGS = -g -O2 -Wall -D_FILE_OFFSET_BITS=64 \ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org