From 98801f3cfbfc46febcc52824e2f422d8b4abd416 Mon Sep 17 00:00:00 2001 From: OBS User jankara Date: Thu, 27 Jun 2013 14:23:56 +0000 Subject: [PATCH] Update to 1.42.8 Rev filesystems/48 Md5 5b3103b56a6caebebef45c4a5719a166 2013-06-27 14:23:56 jankara 181173 --- e2fsprogs-1.42.7.tar.gz | 3 -- e2fsprogs-1.42.8.tar.gz | 3 ++ e2fsprogs.changes | 16 +++++++++ e2fsprogs.spec | 10 +----- e2p-Fix-s-handling-in-parse_num_blocks2.patch | 33 ------------------- ...turn-value-in-ext2fs_test_block_bitm.patch | 29 ---------------- ...Provide-prototype-for-ext2fs_symlink.patch | 33 ------------------- ...c_check-should-have-return-type-void.patch | 26 --------------- 8 files changed, 20 insertions(+), 133 deletions(-) delete mode 100644 e2fsprogs-1.42.7.tar.gz create mode 100644 e2fsprogs-1.42.8.tar.gz delete mode 100644 e2p-Fix-s-handling-in-parse_num_blocks2.patch delete mode 100644 libext2fs-Fix-return-value-in-ext2fs_test_block_bitm.patch delete mode 100644 libext2fs-Provide-prototype-for-ext2fs_symlink.patch delete mode 100644 resize-bigalloc_check-should-have-return-type-void.patch diff --git a/e2fsprogs-1.42.7.tar.gz b/e2fsprogs-1.42.7.tar.gz deleted file mode 100644 index 516f94d..0000000 --- a/e2fsprogs-1.42.7.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dc6501b2e75d205e425196d753d92b129c568525d8aad08085c0aa69ee9e7345 -size 5981006 diff --git a/e2fsprogs-1.42.8.tar.gz b/e2fsprogs-1.42.8.tar.gz new file mode 100644 index 0000000..2664971 --- /dev/null +++ b/e2fsprogs-1.42.8.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b984aaf1fe888d6a4cf8c2e8d397207879599b5368f1d33232c1ec9d68d00c97 +size 5990116 diff --git a/e2fsprogs.changes b/e2fsprogs.changes index 3116e12..146a92e 100644 --- a/e2fsprogs.changes +++ b/e2fsprogs.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Thu Jun 27 10:54:12 UTC 2013 - jack@suse.cz + +- update to 1.42.8 + * e2fsck: detect and fix invalid extents at leaf block tails + * e2fsck: allow checking ro root fs with external journal + * fix offline resizing of fs with flex_bg && !resize_inode + * fix resize2fs to not leave bitmaps beyond fs end + * fixed e2image for large (>32-bit) filesystems + * debugfs fixes +- Removed upstreamed patches: + e2p-Fix-s-handling-in-parse_num_blocks2.patch + resize-bigalloc_check-should-have-return-type-void.patch + libext2fs-Fix-return-value-in-ext2fs_test_block_bitm.patch + libext2fs-Provide-prototype-for-ext2fs_symlink.patch + ------------------------------------------------------------------- Tue Feb 26 18:02:26 UTC 2013 - jack@suse.cz diff --git a/e2fsprogs.spec b/e2fsprogs.spec index c557708..3441aa6 100644 --- a/e2fsprogs.spec +++ b/e2fsprogs.spec @@ -40,7 +40,7 @@ Requires: %install_info_prereq Obsoletes: e2fsprogs-64bit %endif # -Version: 1.42.7 +Version: 1.42.8 Release: 0 Summary: Utilities for the Second Extended File System License: GPL-2.0 @@ -56,10 +56,6 @@ 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 @@ -141,10 +137,6 @@ 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 deleted file mode 100644 index a0d430a..0000000 --- a/e2p-Fix-s-handling-in-parse_num_blocks2.patch +++ /dev/null @@ -1,33 +0,0 @@ -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 deleted file mode 100644 index 6f3de45..0000000 --- a/libext2fs-Fix-return-value-in-ext2fs_test_block_bitm.patch +++ /dev/null @@ -1,29 +0,0 @@ -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 deleted file mode 100644 index a414490..0000000 --- a/libext2fs-Provide-prototype-for-ext2fs_symlink.patch +++ /dev/null @@ -1,33 +0,0 @@ -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 deleted file mode 100644 index 8b707ce..0000000 --- a/resize-bigalloc_check-should-have-return-type-void.patch +++ /dev/null @@ -1,26 +0,0 @@ -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 -