diff --git a/e2fsprogs-1.41.1-splash_support.patch b/e2fsprogs-1.41.1-splash_support.patch index 9a7d81e..a6f102c 100644 --- a/e2fsprogs-1.41.1-splash_support.patch +++ b/e2fsprogs-1.41.1-splash_support.patch @@ -1,7 +1,7 @@ Index: e2fsck/Makefile.in =================================================================== ---- e2fsck/Makefile.in.orig 2012-06-04 18:49:33.000000000 +0200 -+++ e2fsck/Makefile.in 2012-06-14 09:50:56.344425761 +0200 +--- e2fsck/Makefile.in.orig ++++ e2fsck/Makefile.in @@ -68,7 +68,7 @@ OBJS= crc32.o dict.o unix.o e2fsck.o sup pass3.o pass4.o pass5.o journal.o badblocks.o util.o dirinfo.o \ dx_dirinfo.o ehandler.o problem.o message.o quota.o recovery.o \ @@ -29,8 +29,8 @@ Index: e2fsck/Makefile.in $(srcdir)/profile.h prof_err.h Index: e2fsck/splash.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ e2fsck/splash.c 2012-06-14 09:50:21.834048298 +0200 +--- /dev/null ++++ e2fsck/splash.c @@ -0,0 +1,100 @@ +/* + * add support for switching the splash screen on boot @@ -91,7 +91,7 @@ Index: e2fsck/splash.c + written = write(fd, msg, size); + if (written != size) { + if (verbose) -+ printf("size = %i, written = %i\n", size, written); ++ printf("size = %zd, written = %zd\n", size, written); + } + + close(fd); @@ -134,8 +134,8 @@ Index: e2fsck/splash.c + Index: e2fsck/splash.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ e2fsck/splash.h 2012-06-14 09:50:21.834048298 +0200 +--- /dev/null ++++ e2fsck/splash.h @@ -0,0 +1,13 @@ +#ifndef _SPLASH_H +#define _SPLASH_H @@ -152,8 +152,8 @@ Index: e2fsck/splash.h + Index: e2fsck/unix.c =================================================================== ---- e2fsck/unix.c.orig 2012-06-12 04:12:50.000000000 +0200 -+++ e2fsck/unix.c 2012-06-14 09:50:21.834048298 +0200 +--- e2fsck/unix.c.orig ++++ e2fsck/unix.c @@ -51,6 +51,7 @@ extern int optind; #include "e2p/e2p.h" #include "e2fsck.h" @@ -162,15 +162,15 @@ Index: e2fsck/unix.c #include "../version.h" /* Command line options */ -@@ -1141,6 +1142,7 @@ int main (int argc, char *argv[]) - __u32 features[3]; - char *cp; - int qtype; /* quota type */ +@@ -1165,6 +1166,7 @@ int main (int argc, char *argv[]) + e2fsck_t ctx; + blk_t orig_superblock; + struct problem_context pctx; + struct splash_ops *sops; - - clear_problem_context(&pctx); - sigcatcher_setup(); -@@ -1172,6 +1174,7 @@ int main (int argc, char *argv[]) + int flags, run_result; + int journal_size; + int sysval, sys_page_size = 4096; +@@ -1203,6 +1205,7 @@ int main (int argc, char *argv[]) exit(FSCK_ERROR); } reserve_stdio_fds(); @@ -178,7 +178,7 @@ Index: e2fsck/unix.c set_up_logging(ctx); if (ctx->logf) { -@@ -1548,6 +1551,7 @@ print_unsupp_features: +@@ -1577,6 +1580,7 @@ print_unsupp_features: fatal_error(ctx, 0); check_if_skip(ctx); check_resize_inode(ctx); diff --git a/e2fsprogs-1.42.6.tar.gz b/e2fsprogs-1.42.6.tar.gz deleted file mode 100644 index e355ef2..0000000 --- a/e2fsprogs-1.42.6.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:726b5919edeaee5b077d7a5b602284f1453ea31cf499efa433af26c679b667a5 -size 5920183 diff --git a/e2fsprogs-1.42.7.tar.gz b/e2fsprogs-1.42.7.tar.gz new file mode 100644 index 0000000..47d9958 --- /dev/null +++ b/e2fsprogs-1.42.7.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dc6501b2e75d205e425196d753d92b129c568525d8aad08085c0aa69ee9e7345 +size 5981006 diff --git a/e2fsprogs.changes b/e2fsprogs.changes index a67397c..737fcb7 100644 --- a/e2fsprogs.changes +++ b/e2fsprogs.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Mon Feb 25 16:01:07 UTC 2013 - jack@suse.cz + +- Fix compilation warnings by patches: + e2p-Fix-s-handling-in-parse_num_blocks2.patch + libext2fs-Fix-return-value-in-ext2fs_test_block_bitm.patch + libext2fs-Provide-prototype-for-ext2fs_symlink.patch + resize-bigalloc_check-should-have-return-type-void.patch + +------------------------------------------------------------------- +Fri Feb 22 15:46:21 UTC 2013 - jack@suse.cz + +- update to 1.42.7 + * Fix various off-line resizing bugs + * New filefrag options to improve output formatting + * mke2fs improvements for bigalloc filesystems + * Fix e2fsck to properly detect corruption of internal extent tree nodes + * Improve CPU efficiency of e2fsck + * Various debugfs improvements + ... +- refreshed e2fsprogs-1.41.1-splash_support.patch + ------------------------------------------------------------------- Fri Feb 8 12:49:06 UTC 2013 - fcrozat@suse.com diff --git a/e2fsprogs.spec b/e2fsprogs.spec index aa95945..a26dd82 100644 --- a/e2fsprogs.spec +++ b/e2fsprogs.spec @@ -31,7 +31,7 @@ PreReq: %install_info_prereq Obsoletes: e2fsprogs-64bit %endif # -Version: 1.42.6 +Version: 1.42.7 Release: 0 Summary: Utilities for the Second Extended File System License: GPL-2.0 @@ -47,6 +47,10 @@ Source4: e2fsck.conf # e2fsprogs patches # Patch1: e2fsprogs-1.41.1-splash_support.patch +Patch6: e2p-Fix-s-handling-in-parse_num_blocks2.patch +Patch7: libext2fs-Fix-return-value-in-ext2fs_test_block_bitm.patch +Patch8: libext2fs-Provide-prototype-for-ext2fs_symlink.patch +Patch9: resize-bigalloc_check-should-have-return-type-void.patch # libcom_err patches Patch2: libcom_err-compile_et_permissions.patch Patch4: e2fsprogs-1.42-implicit_fortify_decl.patch @@ -128,6 +132,10 @@ Development files for the com_err error message display library. %setup -q # e2fsprogs patches %patch1 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 +%patch9 -p1 # libcom_err patches %patch2 -p1 %patch4 diff --git a/e2p-Fix-s-handling-in-parse_num_blocks2.patch b/e2p-Fix-s-handling-in-parse_num_blocks2.patch new file mode 100644 index 0000000..ed4b912 --- /dev/null +++ b/e2p-Fix-s-handling-in-parse_num_blocks2.patch @@ -0,0 +1,33 @@ +From fbe898cc01b25a68fa77f8ba9b41b70c9f4e4692 Mon Sep 17 00:00:00 2001 +From: Jan Kara +Date: Mon, 25 Feb 2013 15:57:48 +0100 +Subject: [PATCH 1/4] e2p: Fix 's' handling in parse_num_blocks2() + +parse_num_blocks2() wrongly did: + num << 1; +when log_block_size < 0. That is obviously wrong as such statement has +no effect (and the compiler properly warns about it). Callers expect +returned value to be in bytes when log_block_size < 0 so fix the +statement accordingly. + +Signed-off-by: Jan Kara +--- + lib/e2p/parse_num.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/lib/e2p/parse_num.c b/lib/e2p/parse_num.c +index cb0dc5b..e8d6283 100644 +--- a/lib/e2p/parse_num.c ++++ b/lib/e2p/parse_num.c +@@ -42,7 +42,7 @@ unsigned long long parse_num_blocks2(const char *arg, int log_block_size) + break; + case 's': + if (log_block_size < 0) +- num << 1; ++ num <<= 9; + else + num >>= (1+log_block_size); + break; +-- +1.7.1 + diff --git a/libext2fs-Fix-return-value-in-ext2fs_test_block_bitm.patch b/libext2fs-Fix-return-value-in-ext2fs_test_block_bitm.patch new file mode 100644 index 0000000..e1fca6d --- /dev/null +++ b/libext2fs-Fix-return-value-in-ext2fs_test_block_bitm.patch @@ -0,0 +1,29 @@ +From 00a3c713fd9b910f23428178f5272ca7ca24f025 Mon Sep 17 00:00:00 2001 +From: Jan Kara +Date: Mon, 25 Feb 2013 16:13:19 +0100 +Subject: [PATCH 2/4] libext2fs: Fix return value in ext2fs_test_block_bitmap_range2() + +We used return without a return value in +ext2fs_test_block_bitmap_range2() despite the fuction returns int. + +Signed-off-by: Jan Kara +--- + lib/ext2fs/gen_bitmap64.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/lib/ext2fs/gen_bitmap64.c b/lib/ext2fs/gen_bitmap64.c +index 42a97d4..44ac499 100644 +--- a/lib/ext2fs/gen_bitmap64.c ++++ b/lib/ext2fs/gen_bitmap64.c +@@ -658,7 +658,7 @@ int ext2fs_test_block_bitmap_range2(ext2fs_block_bitmap bmap, + if ((block < bmap->start) || (block+num-1 > bmap->end)) { + ext2fs_warn_bitmap(EXT2_ET_BAD_BLOCK_TEST, block, + bmap->description); +- return; ++ return EINVAL; + } + + return bmap->bitmap_ops->test_clear_bmap_extent(bmap, block, num); +-- +1.7.1 + diff --git a/libext2fs-Provide-prototype-for-ext2fs_symlink.patch b/libext2fs-Provide-prototype-for-ext2fs_symlink.patch new file mode 100644 index 0000000..043e6ba --- /dev/null +++ b/libext2fs-Provide-prototype-for-ext2fs_symlink.patch @@ -0,0 +1,33 @@ +From dd67bbc2f5ae1bf5eb14c2ee56368f28195a2474 Mon Sep 17 00:00:00 2001 +From: Jan Kara +Date: Mon, 25 Feb 2013 16:49:02 +0100 +Subject: [PATCH 3/4] libext2fs: Provide prototype for ext2fs_symlink() + +New function ext2fs_symlink() doesn't have a prototype in ext2fs.h and +thus debugfs compilation gives warning: + +debugfs.c:2219:2: warning: implicit declaration of function 'ext2fs_symlink' + +Signed-off-by: Jan Kara +--- + lib/ext2fs/ext2fs.h | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +diff --git a/lib/ext2fs/ext2fs.h b/lib/ext2fs/ext2fs.h +index 7139b4d..cd59473 100644 +--- a/lib/ext2fs/ext2fs.h ++++ b/lib/ext2fs/ext2fs.h +@@ -1449,6 +1449,10 @@ errcode_t ext2fs_link(ext2_filsys fs, ext2_ino_t dir, const char *name, + errcode_t ext2fs_unlink(ext2_filsys fs, ext2_ino_t dir, const char *name, + ext2_ino_t ino, int flags); + ++/* symlink.c */ ++errcode_t ext2fs_symlink(ext2_filsys fs, ext2_ino_t parent, ext2_ino_t ino, ++ const char *name, char *target); ++ + /* mmp.c */ + errcode_t ext2fs_mmp_read(ext2_filsys fs, blk64_t mmp_blk, void *buf); + errcode_t ext2fs_mmp_write(ext2_filsys fs, blk64_t mmp_blk, void *buf); +-- +1.7.1 + diff --git a/resize-bigalloc_check-should-have-return-type-void.patch b/resize-bigalloc_check-should-have-return-type-void.patch new file mode 100644 index 0000000..c962402 --- /dev/null +++ b/resize-bigalloc_check-should-have-return-type-void.patch @@ -0,0 +1,26 @@ +From 2892bd7a8074d020f5c62f9daeee9cea3883c0de Mon Sep 17 00:00:00 2001 +From: Jan Kara +Date: Mon, 25 Feb 2013 16:51:48 +0100 +Subject: [PATCH 4/4] resize: bigalloc_check() should have return type void + +Signed-off-by: Jan Kara +--- + resize/main.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/resize/main.c b/resize/main.c +index 4cbfe69..b648a15 100644 +--- a/resize/main.c ++++ b/resize/main.c +@@ -147,7 +147,7 @@ static void determine_fs_stride(ext2_filsys fs) + #endif + } + +-static bigalloc_check(ext2_filsys fs, int force) ++static void bigalloc_check(ext2_filsys fs, int force) + { + if (!force && EXT2_HAS_RO_COMPAT_FEATURE(fs->super, + EXT4_FEATURE_RO_COMPAT_BIGALLOC)) { +-- +1.7.1 +