From 3a59cc310831ef6856fdb015da1d927d9250ab4f Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Thu, 25 Jan 2007 17:03:11 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/e2fsprogs?expand=0&rev=5 --- e2fsprogs-1.39-check_fs_open-in-dump_unused.patch | 14 ++++++++++++++ e2fsprogs.changes | 5 +++++ e2fsprogs.spec | 6 +++++- 3 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 e2fsprogs-1.39-check_fs_open-in-dump_unused.patch diff --git a/e2fsprogs-1.39-check_fs_open-in-dump_unused.patch b/e2fsprogs-1.39-check_fs_open-in-dump_unused.patch new file mode 100644 index 0000000..9df4056 --- /dev/null +++ b/e2fsprogs-1.39-check_fs_open-in-dump_unused.patch @@ -0,0 +1,14 @@ +diff -upNr e2fsprogs-1.38.orig/debugfs/unused.c e2fsprogs-1.38/debugfs/unused.c +--- e2fsprogs-1.38.orig/debugfs/unused.c 2006-09-23 13:55:27.000000000 -0500 ++++ e2fsprogs-1.38/debugfs/unused.c 2006-09-23 13:56:14.000000000 -0500 +@@ -31,6 +31,10 @@ void do_dump_unused(int argc EXT2FS_ATTR + unsigned int i; + errcode_t retval; + ++ if (common_args_process(argc, argv, 1, 1, ++ "dump_unused", "", 0)) ++ return; ++ + for (blk=current_fs->super->s_first_data_block; + blk < current_fs->super->s_blocks_count; blk++) { + if (ext2fs_test_block_bitmap(current_fs->block_map,blk)) diff --git a/e2fsprogs.changes b/e2fsprogs.changes index 08e0ad3..c4b7757 100644 --- a/e2fsprogs.changes +++ b/e2fsprogs.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jan 25 13:05:11 CET 2007 - mkoenig@suse.de + +- fix segfault in debugfs when using without open fs [#238140] + ------------------------------------------------------------------- Mon Jan 22 17:16:53 CET 2007 - mkoenig@suse.de diff --git a/e2fsprogs.spec b/e2fsprogs.spec index 5b42b03..7e38231 100644 --- a/e2fsprogs.spec +++ b/e2fsprogs.spec @@ -19,7 +19,7 @@ Obsoletes: ext2fs PreReq: %install_info_prereq Autoreqprov: on Version: 1.39+1.40_WIP_20061114 -Release: 2 +Release: 3 Summary: Utilities for the Second Extended File System URL: http://e2fsprogs.sourceforge.net Source: %{name}-%{version}.tar.bz2 @@ -41,6 +41,7 @@ Patch14: e2fsprogs-1.39-cleanup.patch Patch15: e2fsprogs-1.39-uuid_duplicates.patch Patch16: e2fsprogs-1.39-resize2fs_manpage.patch Patch17: e2fsprogs-strncat.patch +Patch18: e2fsprogs-1.39-check_fs_open-in-dump_unused.patch # libcom_err patches Patch30: libcom_err-no-static-buffer.patch Patch31: libcom_err-no-init_error_table.patch @@ -116,6 +117,7 @@ Authors: %patch15 -p1 %patch16 %patch17 -p1 +%patch18 -p1 # libcom_err patches %patch30 -p1 %patch31 -p1 @@ -242,6 +244,8 @@ rm -rf $RPM_BUILD_ROOT %postun -n libcom_err -p /sbin/ldconfig %changelog -n e2fsprogs +* Thu Jan 25 2007 - mkoenig@suse.de +- fix segfault in debugfs when using without open fs [#238140] * Mon Jan 22 2007 - mkoenig@suse.de - don't chmod -w headers in compile_et to avoid build problems with some packages