mslacken/e2fsprogs
1
0
Fork 0
forked from pool/e2fsprogs
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to 1.42

Browse Source 
Rev filesystems/22 Md5 787d7eb03cbf1ac71bfe45d5b274f9b9 2012-01-16 19:28:03 jankara 100294
This commit is contained in:
OBS User jankara 2012-01-16 19:28:03 +00:00 committed by Git OBS Bridge
parent 72efe7b43b
commit fcf0c12c54
11 changed files with 199 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
dumpe2fs-add-man-page-warning-about-mounted-fil.patch
View File

@ -1,35 +0,0 @@
From d1c9b6ea5e3b473341650757726def797c616a84 Mon Sep 17 00:00:00 2001
From: Theodore Ts'o <tytso@mit.edu>
Date: Sat, 8 Oct 2011 13:50:10 -0400
Subject: [PATCH] dumpe2fs.8.in: add man page warning about mounted file systems
References: bnc#708243
This should be obvious, but apparently not to all users...
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Acked-by: Jan Kara <jack@suse.cz>
---
misc/dumpe2fs.8.in | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/misc/dumpe2fs.8.in b/misc/dumpe2fs.8.in
index c1dfcbd..a493789 100644
--- a/misc/dumpe2fs.8.in
+++ b/misc/dumpe2fs.8.in
@@ -23,10 +23,9 @@ prints the super block and blocks group information for the filesystem
present on
.I device.
.PP
-.B dumpe2fs
-is similar to Berkeley's
-.B dumpfs
-program for the BSD Fast File System.
+.B Note:
+When used with a mounted filesystem, the printed
+information may be old or inconsistent.
.SH OPTIONS
.TP
.B \-b
--
1.7.1

97
e2fsprogs-1.41.1-splash_support.patch
View File

@ -1,7 +1,43 @@
Index: e2fsck/splash.c diff -uNr e2fsprogs-1.42.orig/e2fsck/Makefile.in e2fsprogs-1.42/e2fsck/Makefile.in
=================================================================== --- e2fsprogs-1.42.orig/e2fsck/Makefile.in 2011-09-18 17:10:03.000000000 -0400
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ e2fsprogs-1.42/e2fsck/Makefile.in 2012-01-12 13:16:34.647198494 -0500
+++ e2fsck/splash.c 2010-04-19 13:46:32.808011099 +0200 @@ -68,7 +68,7 @@
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 \
- sigcatcher.o $(MTRACE_OBJ)
+ sigcatcher.o splash.o $(MTRACE_OBJ)
PROFILED_OBJS= profiled/dict.o profiled/unix.o profiled/e2fsck.o \
profiled/super.o profiled/pass1.o profiled/pass1b.o \
@@ -78,7 +78,7 @@
profiled/message.o profiled/problem.o profiled/quota.o \
profiled/recovery.o profiled/region.o profiled/revoke.o \
profiled/ea_refcount.o profiled/rehash.o profiled/profile.o \
- profiled/crc32.o profiled/prof_err.o profiled/sigcatcher.o
+ profiled/crc32.o profiled/prof_err.o profiled/sigcatcher.o
SRCS= $(srcdir)/e2fsck.c \
$(srcdir)/crc32.c \
@@ -106,6 +106,7 @@
$(srcdir)/rehash.c \
$(srcdir)/region.c \
$(srcdir)/profile.c \
+ $(srcdir)/splash.c \
$(srcdir)/sigcatcher.c \
prof_err.c \
$(srcdir)/quota.c \
@@ -487,6 +488,7 @@
$(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \
$(srcdir)/profile.h prof_err.h $(top_srcdir)/lib/quota/mkquota.h \
$(top_srcdir)/lib/quota/quota.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_srcdir)/lib/et/com_err.h $(srcdir)/profile.h prof_err.h
sigcatcher.o: $(srcdir)/sigcatcher.c $(top_builddir)/lib/config.h \
diff -uNr e2fsprogs-1.42.orig/e2fsck/splash.c e2fsprogs-1.42/e2fsck/splash.c
--- e2fsprogs-1.42.orig/e2fsck/splash.c 1969-12-31 19:00:00.000000000 -0500
+++ e2fsprogs-1.42/e2fsck/splash.c 2012-01-12 13:33:24.418574614 -0500
@@ -0,0 +1,100 @@ @@ -0,0 +1,100 @@
+/* +/*
+ * add support for switching the splash screen on boot + * add support for switching the splash screen on boot
@ -103,10 +139,9 @@ Index: e2fsck/splash.c
+ verbose = 1; + verbose = 1;
+} +}
+ +
Index: e2fsck/splash.h diff -uNr e2fsprogs-1.42.orig/e2fsck/splash.h e2fsprogs-1.42/e2fsck/splash.h
=================================================================== --- e2fsprogs-1.42.orig/e2fsck/splash.h 1969-12-31 19:00:00.000000000 -0500
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ e2fsprogs-1.42/e2fsck/splash.h 2012-01-12 13:33:24.418574614 -0500
+++ e2fsck/splash.h 2010-04-19 13:46:32.824003188 +0200
@@ -0,0 +1,13 @@ @@ -0,0 +1,13 @@
+#ifndef _SPLASH_H +#ifndef _SPLASH_H
+#define _SPLASH_H +#define _SPLASH_H
@ -121,38 +156,10 @@ Index: e2fsck/splash.h
+ +
+#endif /* _SPLASH_H */ +#endif /* _SPLASH_H */
+ +
Index: e2fsck/Makefile.in diff -uNr e2fsprogs-1.42.orig/e2fsck/unix.c e2fsprogs-1.42/e2fsck/unix.c
=================================================================== --- e2fsprogs-1.42.orig/e2fsck/unix.c 2011-11-14 10:55:54.000000000 -0500
--- e2fsck/Makefile.in.orig 2010-02-23 05:40:50.000000000 +0100 +++ e2fsprogs-1.42/e2fsck/unix.c 2012-01-12 13:20:01.726609643 -0500
+++ e2fsck/Makefile.in 2010-04-19 13:46:32.863915437 +0200 @@ -54,6 +54,7 @@
@@ -64,7 +64,7 @@ COMPILE_ET=$(top_builddir)/lib/et/compil
OBJS= crc32.o dict.o unix.o e2fsck.o super.o pass1.o pass1b.o pass2.o \
pass3.o pass4.o pass5.o journal.o badblocks.o util.o dirinfo.o \
dx_dirinfo.o ehandler.o problem.o message.o recovery.o region.o \
- revoke.o ea_refcount.o rehash.o profile.o prof_err.o $(MTRACE_OBJ)
+ revoke.o ea_refcount.o rehash.o profile.o prof_err.o splash.o $(MTRACE_OBJ)
PROFILED_OBJS= profiled/dict.o profiled/unix.o profiled/e2fsck.o \
profiled/super.o profiled/pass1.o profiled/pass1b.o \
@@ -102,6 +102,7 @@ SRCS= $(srcdir)/e2fsck.c \
$(srcdir)/rehash.c \
$(srcdir)/region.c \
$(srcdir)/profile.c \
+ $(srcdir)/splash.c \
prof_err.c \
$(MTRACE_SRC)
@@ -452,3 +453,5 @@ region.o: $(srcdir)/region.c $(srcdir)/e
profile.o: $(srcdir)/profile.c $(top_srcdir)/lib/et/com_err.h \
$(srcdir)/profile.h prof_err.h
prof_err.o: prof_err.c
+splash.o: splash.c splash.h
+
Index: e2fsck/unix.c
===================================================================
--- e2fsck/unix.c.orig 2010-03-15 05:14:12.000000000 +0100
+++ e2fsck/unix.c 2010-04-19 13:46:32.899004459 +0200
@@ -53,6 +53,7 @@ extern int optind;
#include "e2p/e2p.h" #include "e2p/e2p.h"
#include "e2fsck.h" #include "e2fsck.h"
#include "problem.h" #include "problem.h"
@ -160,15 +167,15 @@ Index: e2fsck/unix.c
#include "../version.h" #include "../version.h"
/* Command line options */ /* Command line options */
@@ -956,6 +957,7 @@ int main (int argc, char *argv[]) @@ -1108,6 +1109,7 @@
int sysval, sys_page_size = 4096; int old_bitmaps;
__u32 features[3]; __u32 features[3];
char *cp; char *cp;
+ struct splash_ops *sops; + struct splash_ops *sops;
clear_problem_context(&pctx); clear_problem_context(&pctx);
#ifdef MTRACE sigcatcher_setup();
@@ -985,6 +987,7 @@ int main (int argc, char *argv[]) @@ -1139,6 +1141,7 @@
exit(FSCK_ERROR); exit(FSCK_ERROR);
} }
reserve_stdio_fds(); reserve_stdio_fds();
@ -176,7 +183,7 @@ Index: e2fsck/unix.c
init_resource_track(&ctx->global_rtrack, NULL); init_resource_track(&ctx->global_rtrack, NULL);
if (!(ctx->options & E2F_OPT_PREEN) || show_version_only) if (!(ctx->options & E2F_OPT_PREEN) || show_version_only)
@@ -1304,6 +1307,7 @@ print_unsupp_features: @@ -1484,6 +1487,7 @@
fatal_error(ctx, 0); fatal_error(ctx, 0);
check_if_skip(ctx); check_if_skip(ctx);
check_resize_inode(ctx); check_resize_inode(ctx);

3
e2fsprogs-1.41.14.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6739d58ea6c38badea3133862f38419ab3c160e2ff00638d01d15292d9619af9
size 3993125

34
e2fsprogs-1.42-e2fsck_mmp.patch Normal file
View File

@ -0,0 +1,34 @@
commit 24c91184d6577271f7387962c90626c973389f00
Author: Theodore Ts'o <tytso@mit.edu>
Date: Fri Dec 16 15:36:40 2011 -0500
e2fsck: fix use of uninitialized value in the MMP code
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
diff --git a/e2fsck/pass1.c b/e2fsck/pass1.c
index 00e46d0..d225026 100644
--- a/e2fsck/pass1.c
+++ b/e2fsck/pass1.c
@@ -545,7 +545,7 @@ void e2fsck_pass1(e2fsck_t ctx)
int i;
__u64 max_sizes;
ext2_filsys fs = ctx->fs;
- ext2_ino_t ino;
+ ext2_ino_t ino = 0;
struct ext2_inode *inode;
ext2_inode_scan scan;
char *block_buf;
diff --git a/e2fsck/pass1b.c b/e2fsck/pass1b.c
index f7ce8e4..a9eecd2 100644
--- a/e2fsck/pass1b.c
+++ b/e2fsck/pass1b.c
@@ -267,7 +267,7 @@ struct process_block_struct {
static void pass1b(e2fsck_t ctx, char *block_buf)
{
ext2_filsys fs = ctx->fs;
- ext2_ino_t ino;
+ ext2_ino_t ino = 0;
struct ext2_inode inode;
ext2_inode_scan scan;
struct process_block_struct pb;

10
e2fsprogs-1.42-ext2fsh_implicit.patch Normal file
View File

@ -0,0 +1,10 @@
--- lib/ext2fs/ext2fs.h.orig 2012-01-12 21:38:40.769873730 -0500
+++ lib/ext2fs/ext2fs.h 2012-01-12 21:39:38.197155791 -0500
@@ -60,6 +60,7 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
+#include <unistd.h>
#ifndef __USE_XOPEN2K
/* If the "#define _XOPEN_SOURCE 600" didn't succeed in declaring

17
e2fsprogs-1.42-implicit_fortify_decl.patch Normal file
View File

@ -0,0 +1,17 @@
--- lib/ext2fs/mmp.c.orig 2012-01-12 21:10:16.087185199 -0500
+++ lib/ext2fs/mmp.c 2012-01-12 21:59:56.987918809 -0500
@@ -25,6 +25,14 @@
#include "ext2fs/ext2_fs.h"
#include "ext2fs/ext2fs.h"
+#if _BSD_SOURCE || _XOPEN_SOURCE >= 500
+#include <netdb.h>
+#endif
+
+#include <string.h>
+#include <stdio.h>
+#include <unistd.h>
+
static int mmp_pagesize(void)
{
#ifdef _SC_PAGESIZE

10
e2fsprogs-1.42-quotaio_implicit.patch Normal file
View File

@ -0,0 +1,10 @@
--- lib/quota/quotaio.c.orig 2012-01-12 20:39:27.146300136 -0500
+++ lib/quota/quotaio.c 2012-01-12 22:40:33.162462437 -0500
@@ -14,6 +14,7 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/file.h>
+#include <time.h>
#include "common.h"
#include "quotaio.h"

13
e2fsprogs-1.42-voidreturn_value_declared.patch Normal file
View File

@ -0,0 +1,13 @@
--- lib/quota/quotaio.c.orig 2012-01-12 20:39:27.146300136 -0500
+++ lib/quota/quotaio.c 2012-01-12 20:39:41.591119555 -0500
@@ -142,8 +142,8 @@
return err;
inode.i_dtime = fs->now ? fs->now : time(0);
- if (!ext2fs_inode_has_valid_blocks2(fs, &inode))
- return;
+ if (!(err = ext2fs_inode_has_valid_blocks2(fs, &inode)) )
+ return err;
ext2fs_block_iterate3(fs, ino, BLOCK_FLAG_READ_ONLY, NULL,
release_blocks_proc, NULL);

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

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:55b46db0cec3e2eb0e5de14494a88b01ff6c0500edf8ca8927cad6da7b5e4a46
size 5709827

38
e2fsprogs.changes
View File

@ -1,3 +1,41 @@
-------------------------------------------------------------------
Fri Jan 13 15:44:27 UTC 2012 - tabraham@novell.com
- removed dumpe2fs-add-man-page-warning-about-mounted-fil.patch
deprecated by this release
- refreshed e2fsprogs-1.41.1-splash_support.patch
- added several patches to fix warnings generated by the check_gcc_output
and rpmlint
- update to 1.42
* this release has support for file systems >16TB. online resize
requires kernel support which will hopefully be in kernel version
3.2. offline support is not yet available for >16TB, but will be
coming
* this release has support for clustered allocation, which reduces
the number of block (now cluster) bitmaps by allocating and
deallocating space in contiguous power-of-2 collections of blocks,
which are called clustered. This is a filesystem level feature
called 'bigalloc', which must be enabled when the filesystem is
inititally formatted. It is not backwards compatible with older
kernels.
* added support for the Multi-Mount Protection (MMP) feature
* The mke2fs and e2fsck programs now tries to use the punch hole command
as a "discard" when operating on normal files.
* The resize2fs program now has support for a new online resize ioctl
that can support file systems > 16TB, once it arrives in v3.x kernels.
* Added e4defrag tool which uses the EXT4_IOC_MOVE_EXT ioctl.
* Added support for journals larger than 2GB.
* Added internationalization support for libcom_err error table strings.
* Fixed various spelling mistakes found in various output strings found by
I18N translators.
* Update translations: French, Chinese, Germany, Indonesian, Swedish,
Vietnamese, Polish, Dutch, Czech. (Addresses Debian Bugs: #520985,
#620659)
* Updated/clarified man pages. (Addresses Debian Bugs: #639411, #642193,
#634883)
* various bug fixes and enhancements (see RELEASE-NOTES)
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Dec 20 20:23:14 UTC 2011 - coolo@suse.com Tue Dec 20 20:23:14 UTC 2011 - coolo@suse.com

30
e2fsprogs.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package e2fsprogs # spec file for package e2fsprogs
# #
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -15,6 +15,8 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via http://bugs.opensuse.org/
# #
Name: e2fsprogs Name: e2fsprogs
Supplements: filesystem(ext2) filesystem(ext3) filesystem(ext4) Supplements: filesystem(ext2) filesystem(ext3) filesystem(ext4)
BuildRequires: autoconf BuildRequires: autoconf
@ -27,13 +29,13 @@ PreReq: %install_info_prereq
Obsoletes: e2fsprogs-64bit Obsoletes: e2fsprogs-64bit
%endif %endif
# #
Version: 1.41.14 Version: 1.42
Release: 0 Release: 0
Summary: Utilities for the Second Extended File System Summary: Utilities for the Second Extended File System
License: GPL-2.0 License: GPL-2.0
Group: System/Filesystems Group: System/Filesystems
Url: http://e2fsprogs.sourceforge.net Url: http://e2fsprogs.sourceforge.net
Source: %{name}-%{version}.tar.bz2 Source: %{name}-%{version}.tar.gz
Source2: README.SUSE Source2: README.SUSE
Source3: baselibs.conf Source3: baselibs.conf
#Added for 1.41.14; can be removed with the next release #Added for 1.41.14; can be removed with the next release
@ -42,9 +44,13 @@ Source4: e2fsprogs-1.41.14.de.po.bz2
# e2fsprogs patches # e2fsprogs patches
# #
Patch1: e2fsprogs-1.41.1-splash_support.patch Patch1: e2fsprogs-1.41.1-splash_support.patch
Patch2: dumpe2fs-add-man-page-warning-about-mounted-fil.patch
# libcom_err patches # libcom_err patches
Patch3: libcom_err-compile_et_permissions.patch Patch2: libcom_err-compile_et_permissions.patch
Patch3: e2fsprogs-1.42-voidreturn_value_declared.patch
Patch4: e2fsprogs-1.42-implicit_fortify_decl.patch
Patch5: e2fsprogs-1.42-ext2fsh_implicit.patch
Patch6: e2fsprogs-1.42-quotaio_implicit.patch
Patch7: e2fsprogs-1.42-e2fsck_mmp.patch
# Do not suppress make commands # Do not suppress make commands
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -117,10 +123,14 @@ Development files for the com_err error message display library.
%prep %prep
%setup -q %setup -q
# e2fsprogs patches # e2fsprogs patches
%patch1 %patch1 -p1
%patch2 -p1
# libcom_err patches # libcom_err patches
%patch3 -p1 %patch2 -p1
%patch3
%patch4
%patch5
%patch6
%patch7 -p1
cp %{SOURCE2} . cp %{SOURCE2} .
bunzip2 -dc %{S:4} > po/de.po bunzip2 -dc %{S:4} > po/de.po
@ -155,6 +165,8 @@ rm -v %{buildroot}%{_libdir}/lib{com,e2p,ss}*.a
%else %else
rm -v %{buildroot}%{_libdir}/*.a rm -v %{buildroot}%{_libdir}/*.a
%endif %endif
rm -v %{buildroot}%{_includedir}/quota/mkquota.h
rm -v %{buildroot}%{_libdir}/pkgconfig/quota.pc
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
@ -201,6 +213,7 @@ rm -rf $RPM_BUILD_ROOT
/usr/sbin/mklost+found /usr/sbin/mklost+found
/usr/sbin/filefrag /usr/sbin/filefrag
/usr/sbin/e2freefrag /usr/sbin/e2freefrag
/usr/sbin/e4defrag
%{_infodir}/libext2fs.info.gz %{_infodir}/libext2fs.info.gz
%{_mandir}/man1/chattr.1.gz %{_mandir}/man1/chattr.1.gz
%{_mandir}/man1/lsattr.1.gz %{_mandir}/man1/lsattr.1.gz
@ -242,6 +255,7 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/libss.so %{_libdir}/libss.so
%_libdir/pkgconfig/com_err.pc %_libdir/pkgconfig/com_err.pc
%_libdir/pkgconfig/ss.pc %_libdir/pkgconfig/ss.pc
%_includedir/com_err.h
%_includedir/et %_includedir/et
%_includedir/ss %_includedir/ss
%_datadir/et %_datadir/et