pool/e2fsprogs
2
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Accepting request 241111 from filesystems

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/241111
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/e2fsprogs?expand=0&rev=84
This commit is contained in:
Stephan Kulow 2014-07-16 14:37:21 +00:00 committed by Git OBS Bridge
commit 7042afcc0d
7 changed files with 35 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
e2fsck.conf
View File

@ -1,4 +0,0 @@
[options]
# This will prevent e2fsck from stopping boot just because the clock is wrong
broken_system_clock = 1

18
e2fsprogs-1.41.1-splash_support.patch
View File

@ -2,7 +2,7 @@ Index: e2fsck/Makefile.in
===================================================================
--- e2fsck/Makefile.in.orig
+++ e2fsck/Makefile.in
@@ -69,7 +69,7 @@ OBJS= crc32.o dict.o unix.o e2fsck.o sup
@@ -61,7 +61,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 \
region.o revoke.o ea_refcount.o rehash.o profile.o prof_err.o \
@ -11,7 +11,7 @@ Index: e2fsck/Makefile.in
PROFILED_OBJS= profiled/dict.o profiled/unix.o profiled/e2fsck.o \
profiled/super.o profiled/pass1.o profiled/pass1b.o \
@@ -108,6 +108,7 @@ SRCS= $(srcdir)/e2fsck.c \
@@ -100,6 +100,7 @@ SRCS= $(srcdir)/e2fsck.c \
$(srcdir)/rehash.c \
$(srcdir)/region.c \
$(srcdir)/profile.c \
@ -19,10 +19,10 @@ Index: e2fsck/Makefile.in
$(srcdir)/sigcatcher.c \
$(srcdir)/logfile.c \
prof_err.c \
@@ -541,6 +542,7 @@ region.o: $(srcdir)/region.c $(top_build
$(srcdir)/profile.h prof_err.h $(top_srcdir)/lib/quota/mkquota.h \
$(top_srcdir)/lib/quota/quotaio.h $(top_srcdir)/lib/quota/dqblk_v2.h \
$(top_srcdir)/lib/quota/quotaio_tree.h $(top_srcdir)/lib/../e2fsck/dict.h
@@ -519,6 +520,7 @@ region.o: $(srcdir)/region.c $(top_build
$(srcdir)/profile.h prof_err.h $(top_srcdir)/lib/quota/quotaio.h \
$(top_srcdir)/lib/quota/dqblk_v2.h $(top_srcdir)/lib/quota/quotaio_tree.h \
$(top_srcdir)/lib/../e2fsck/dict.h
+splash.o: $(srcdir)/splash.c $(srcdir)/splash.h
profile.o: $(srcdir)/profile.c $(top_builddir)/lib/config.h \
$(top_builddir)/lib/dirpaths.h $(top_srcdir)/lib/et/com_err.h \
@ -162,7 +162,7 @@ Index: e2fsck/unix.c
#include "../version.h"
/* Command line options */
@@ -1169,6 +1170,7 @@ int main (int argc, char *argv[])
@@ -1177,6 +1178,7 @@ int main (int argc, char *argv[])
e2fsck_t ctx;
blk64_t orig_superblock;
struct problem_context pctx;
@ -170,7 +170,7 @@ Index: e2fsck/unix.c
int flags, run_result;
int journal_size;
int sysval, sys_page_size = 4096;
@@ -1207,6 +1209,7 @@ int main (int argc, char *argv[])
@@ -1215,6 +1217,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) {
@@ -1584,6 +1587,7 @@ print_unsupp_features:
@@ -1590,6 +1593,7 @@ print_unsupp_features:
fatal_error(ctx, 0);
check_if_skip(ctx);
check_resize_inode(ctx);

3
e2fsprogs-1.42.11.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4bd8a770b6925c3f4ec5dce82c55774e4566cd6f3ffb5805177e3c92c8910b76
size 6353078

3
e2fsprogs-1.42.9.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2f92ac06e92fa00f2ada3ee67dad012d74d685537527ad1241d82f2d041f2802
size 6069173

21
e2fsprogs.changes
View File

@ -1,3 +1,24 @@
-------------------------------------------------------------------
Tue Jul 15 15:52:16 UTC 2014 - jack@suse.cz
- Remove e2fsck.conf since we don't need the changed default anymore. e2fsck
handles this type of problems automatically now and broken_system_clock has
other undesired sideeffects like skipped periodic checks (bnc#866283)
-------------------------------------------------------------------
Tue Jul 15 15:43:06 UTC 2014 - jack@suse.cz
- Update to 1.42.11
* fix aborted journal replay in e2fsck with bigalloc
* make mke2fs refuse insane flex_bg sizes
* automatically fix last mount time and last write time in e2fsck
* fix mke2fs to properly create large filesystems on 32-bit systems
* mke2fs asks before wiping preexisting filesystem
* mke2fs can create filesystems with all metadata in the beginning
* fix resize2fs shrink operation in some corner cases
...
- Remove filefrag-print-shared-extent-flag.patch: Merged upstream
-------------------------------------------------------------------
Mon Apr 28 17:45:46 UTC 2014 - mfasheh@suse.com

12
e2fsprogs.spec
View File

@ -24,6 +24,7 @@ Name: e2fsprogs
Supplements: filesystem(ext2) filesystem(ext3) filesystem(ext4)
%endif
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libblkid-devel
BuildRequires: libuuid-devel
BuildRequires: pkg-config
@ -60,7 +61,7 @@ Conflicts: libcom_err2-mini
Conflicts: libcom_err-mini-devel
%endif
#
Version: 1.42.9
Version: 1.42.11
Release: 0
Summary: Utilities for the Second Extended File System
License: GPL-2.0
@ -71,12 +72,10 @@ Requires: libext2fs2 >= %{version}
Source: http://downloads.sourceforge.net/project/e2fsprogs/e2fsprogs/v%{version}/e2fsprogs-%{version}.tar.gz
Source2: README.SUSE
Source3: baselibs.conf
Source4: e2fsck.conf
#
# e2fsprogs patches
#
Patch1: e2fsprogs-1.41.1-splash_support.patch
Patch2: filefrag-print-shared-extent-flag.patch
# libcom_err patches
Patch3: libcom_err-compile_et_permissions.patch
Patch4: e2fsprogs-1.42-implicit_fortify_decl.patch
@ -190,7 +189,6 @@ Development files for the com_err error message display library.
%setup -q -n e2fsprogs-%{version}
# e2fsprogs patches
%patch1
%patch2 -p1
# libcom_err patches
%patch3 -p1
%patch4
@ -218,9 +216,6 @@ make -C po update-po
%install
make install install-libs DESTDIR=$RPM_BUILD_ROOT ELF_INSTALL_DIR=/%{_libdir}
# Let boot continue even if system clock is wrong
install -p -m 644 %{SOURCE4} %{buildroot}/etc/e2fsck.conf
%{find_lang} e2fsprogs
rm $RPM_BUILD_ROOT%{_libdir}/e2initrd_helper
@ -228,8 +223,6 @@ rm -f $RPM_BUILD_ROOT/%{_sbindir}/mkfs.ext4dev
rm -f $RPM_BUILD_ROOT/%{_sbindir}/fsck.ext4dev
rm -f $RPM_BUILD_ROOT/usr/share/man/man8/mkfs.ext4dev.8*
rm -f $RPM_BUILD_ROOT/usr/share/man/man8/fsck.ext4dev.8*
rm -v %{buildroot}%{_includedir}/quota/mkquota.h
rm -v %{buildroot}%{_libdir}/pkgconfig/quota.pc
# Need libext2fs.a for silo
find "%buildroot/%_libdir" -type f -name "*.a" \
@ -303,7 +296,6 @@ done
%files -f e2fsprogs.lang
%defattr(-, root, root)
%doc RELEASE-NOTES README
%config /etc/e2fsck.conf
%config /etc/mke2fs.conf
#UsrMerge
/sbin/badblocks

42
filefrag-print-shared-extent-flag.patch
View File

@ -1,42 +0,0 @@
From 6a14c51d612184f2c09c5b4148abb6afbb2e1fb0 Mon Sep 17 00:00:00 2001
From: Mark Fasheh <mfasheh@suse.de>
Date: Thu, 17 Apr 2014 14:31:56 -0700
Subject: filefrag: print shared extent flag
Filefrag doesn't catch and print the shared extent flag. Add this for
users of filefrag on file systems with shared extents (such as btrfs).
Signed-off-by: Mark Fasheh <mfasheh@suse.de>
---
lib/ext2fs/fiemap.h | 2 ++
misc/filefrag.c | 2 ++
2 files changed, 4 insertions(+)
diff --git a/lib/ext2fs/fiemap.h b/lib/ext2fs/fiemap.h
index 30bf555..895cd0b 100644
--- a/lib/ext2fs/fiemap.h
+++ b/lib/ext2fs/fiemap.h
@@ -64,5 +64,7 @@ struct fiemap {
#define FIEMAP_EXTENT_MERGED 0x00001000 /* File does not natively
* support extents. Result
* merged for efficiency. */
+#define FIEMAP_EXTENT_SHARED 0x00002000 /* Space shared with other
+ * files. */
#endif /* _LINUX_FIEMAP_H */
diff --git a/misc/filefrag.c b/misc/filefrag.c
index a050a22..929a33b 100644
--- a/misc/filefrag.c
+++ b/misc/filefrag.c
@@ -165,6 +165,8 @@ static void print_extent_info(struct fiemap_extent *fm_extent, int cur_ex,
strcat(flags, "unwritten,");
if (fm_extent->fe_flags & FIEMAP_EXTENT_MERGED)
strcat(flags, "merged,");
+ if (fm_extent->fe_flags & FIEMAP_EXTENT_SHARED)
+ strcat(flags, "shared,");
if (fm_extent->fe_logical + fm_extent->fe_length >= (__u64) st->st_size)
strcat(flags, "eof,");
--
1.8.4