forked from pool/e2fsprogs
- Updated to 1.42.3
- Fix a bug in the Unix I/O manager which could cause corruption of file systems with more than 16TB when e2fsprogs is compiled in 32-bit mode. - Improve the support for integrated quota files. - Fixed a regression introduced in 1.42.2 which would cause applications outside of e2fsprogs which did not pass the EXT2_FLAG_64BIT to crash. - Fix a bug which would cause mke2fs to fail creating the journal if /etc/mtab and /proc/mounts are missing. - Updated/fixed various man page. - Updated translations. - Added dependency of e2fsprogs package on particular versions of libext2fs and libcom_err to avoid problems with missing symbols Rev filesystems/29 Md5 d96667a862f6ad6f1cf11e66ac327b88 2012-05-23 21:39:30 jankara 122001
This commit is contained in:
parent
744a6f9779
commit
42b87fd47a
@ -1,7 +1,7 @@
|
|||||||
Index: e2fsck/Makefile.in
|
Index: e2fsck/Makefile.in
|
||||||
===================================================================
|
===================================================================
|
||||||
--- e2fsck/Makefile.in.orig 2012-03-23 14:15:37.000000000 +0100
|
--- e2fsck/Makefile.in.orig
|
||||||
+++ e2fsck/Makefile.in 2012-04-13 12:47:19.141499354 +0200
|
+++ e2fsck/Makefile.in
|
||||||
@@ -68,7 +68,7 @@ OBJS= crc32.o dict.o unix.o e2fsck.o sup
|
@@ -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 \
|
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 \
|
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
|
$(srcdir)/profile.h prof_err.h
|
||||||
Index: e2fsck/splash.c
|
Index: e2fsck/splash.c
|
||||||
===================================================================
|
===================================================================
|
||||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
--- /dev/null
|
||||||
+++ e2fsck/splash.c 2012-04-13 12:44:50.144165421 +0200
|
+++ e2fsck/splash.c
|
||||||
@@ -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
|
||||||
@ -134,8 +134,8 @@ Index: e2fsck/splash.c
|
|||||||
+
|
+
|
||||||
Index: e2fsck/splash.h
|
Index: e2fsck/splash.h
|
||||||
===================================================================
|
===================================================================
|
||||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
--- /dev/null
|
||||||
+++ e2fsck/splash.h 2012-04-13 12:44:50.144165421 +0200
|
+++ e2fsck/splash.h
|
||||||
@@ -0,0 +1,13 @@
|
@@ -0,0 +1,13 @@
|
||||||
+#ifndef _SPLASH_H
|
+#ifndef _SPLASH_H
|
||||||
+#define _SPLASH_H
|
+#define _SPLASH_H
|
||||||
@ -152,9 +152,9 @@ Index: e2fsck/splash.h
|
|||||||
+
|
+
|
||||||
Index: e2fsck/unix.c
|
Index: e2fsck/unix.c
|
||||||
===================================================================
|
===================================================================
|
||||||
--- e2fsck/unix.c.orig 2012-03-23 14:15:37.000000000 +0100
|
--- e2fsck/unix.c.orig
|
||||||
+++ e2fsck/unix.c 2012-04-13 12:48:05.260364377 +0200
|
+++ e2fsck/unix.c
|
||||||
@@ -54,6 +54,7 @@ extern int optind;
|
@@ -51,6 +51,7 @@ extern int optind;
|
||||||
#include "e2p/e2p.h"
|
#include "e2p/e2p.h"
|
||||||
#include "e2fsck.h"
|
#include "e2fsck.h"
|
||||||
#include "problem.h"
|
#include "problem.h"
|
||||||
@ -162,15 +162,15 @@ Index: e2fsck/unix.c
|
|||||||
#include "../version.h"
|
#include "../version.h"
|
||||||
|
|
||||||
/* Command line options */
|
/* Command line options */
|
||||||
@@ -1140,6 +1141,7 @@ int main (int argc, char *argv[])
|
@@ -1138,6 +1139,7 @@ int main (int argc, char *argv[])
|
||||||
int old_bitmaps;
|
|
||||||
__u32 features[3];
|
__u32 features[3];
|
||||||
char *cp;
|
char *cp;
|
||||||
|
int qtype; /* quota type */
|
||||||
+ struct splash_ops *sops;
|
+ struct splash_ops *sops;
|
||||||
|
|
||||||
clear_problem_context(&pctx);
|
clear_problem_context(&pctx);
|
||||||
sigcatcher_setup();
|
sigcatcher_setup();
|
||||||
@@ -1171,6 +1173,7 @@ int main (int argc, char *argv[])
|
@@ -1169,6 +1171,7 @@ int main (int argc, char *argv[])
|
||||||
exit(FSCK_ERROR);
|
exit(FSCK_ERROR);
|
||||||
}
|
}
|
||||||
reserve_stdio_fds();
|
reserve_stdio_fds();
|
||||||
@ -178,7 +178,7 @@ Index: e2fsck/unix.c
|
|||||||
|
|
||||||
set_up_logging(ctx);
|
set_up_logging(ctx);
|
||||||
if (ctx->logf) {
|
if (ctx->logf) {
|
||||||
@@ -1545,6 +1548,7 @@ print_unsupp_features:
|
@@ -1543,6 +1546,7 @@ print_unsupp_features:
|
||||||
fatal_error(ctx, 0);
|
fatal_error(ctx, 0);
|
||||||
check_if_skip(ctx);
|
check_if_skip(ctx);
|
||||||
check_resize_inode(ctx);
|
check_resize_inode(ctx);
|
||||||
|
@ -1,6 +1,8 @@
|
|||||||
--- lib/ext2fs/mmp.c.orig 2012-01-12 21:10:16.087185199 -0500
|
Index: lib/ext2fs/mmp.c
|
||||||
+++ lib/ext2fs/mmp.c 2012-01-12 21:59:56.987918809 -0500
|
===================================================================
|
||||||
@@ -25,6 +25,14 @@
|
--- lib/ext2fs/mmp.c.orig
|
||||||
|
+++ lib/ext2fs/mmp.c
|
||||||
|
@@ -27,6 +27,13 @@
|
||||||
#include "ext2fs/ext2_fs.h"
|
#include "ext2fs/ext2_fs.h"
|
||||||
#include "ext2fs/ext2fs.h"
|
#include "ext2fs/ext2fs.h"
|
||||||
|
|
||||||
@ -10,8 +12,7 @@
|
|||||||
+
|
+
|
||||||
+#include <string.h>
|
+#include <string.h>
|
||||||
+#include <stdio.h>
|
+#include <stdio.h>
|
||||||
+#include <unistd.h>
|
|
||||||
+
|
+
|
||||||
static int mmp_pagesize(void)
|
#ifndef O_DIRECT
|
||||||
{
|
#define O_DIRECT 0
|
||||||
#ifdef _SC_PAGESIZE
|
#endif
|
||||||
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:cbb0c696f3e1e3a3c2c415edcfa76c63e925c5fea46d0a307186746ced69f28e
|
|
||||||
size 39053
|
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:1d36fec5e34ac285f59dff3851d6f4ca9f0b964ddd7e8fe00f1f920b091cb8be
|
|
||||||
size 5753009
|
|
3
e2fsprogs-1.42.3.tar.gz
Normal file
3
e2fsprogs-1.42.3.tar.gz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:ad6a41be876fab94c2bd5d10f7a0871a5601bbaf9cd25c551c2af11c1c8d5436
|
||||||
|
size 5817248
|
@ -1,3 +1,22 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed May 23 20:49:09 UTC 2012 - jack@suse.cz
|
||||||
|
|
||||||
|
- Updated to 1.42.3
|
||||||
|
- Fix a bug in the Unix I/O manager which could cause corruption of file
|
||||||
|
systems with more than 16TB when e2fsprogs is compiled in 32-bit mode.
|
||||||
|
- Improve the support for integrated quota files.
|
||||||
|
- Fixed a regression introduced in 1.42.2 which would cause applications
|
||||||
|
outside of e2fsprogs which did not pass the EXT2_FLAG_64BIT to crash.
|
||||||
|
- Fix a bug which would cause mke2fs to fail creating the journal if
|
||||||
|
/etc/mtab and /proc/mounts are missing.
|
||||||
|
- Updated/fixed various man page.
|
||||||
|
- Updated translations.
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed May 23 11:12:42 UTC 2012 - jack@suse.cz
|
||||||
|
|
||||||
|
- Added dependency of e2fsprogs package on particular versions of libext2fs
|
||||||
|
and libcom_err to avoid problems with missing symbols
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri Apr 13 13:01:47 CEST 2012 - pth@suse.de
|
Fri Apr 13 13:01:47 CEST 2012 - pth@suse.de
|
||||||
|
|
||||||
|
@ -28,17 +28,17 @@ PreReq: %install_info_prereq
|
|||||||
Obsoletes: e2fsprogs-64bit
|
Obsoletes: e2fsprogs-64bit
|
||||||
%endif
|
%endif
|
||||||
#
|
#
|
||||||
Version: 1.42.2
|
Version: 1.42.3
|
||||||
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
|
||||||
|
Requires: libext2fs2 >= %{version}
|
||||||
|
Requires: libcom_err2 >= %{version}
|
||||||
Source: %{name}-%{version}.tar.gz
|
Source: %{name}-%{version}.tar.gz
|
||||||
Source2: README.SUSE
|
Source2: README.SUSE
|
||||||
Source3: baselibs.conf
|
Source3: baselibs.conf
|
||||||
#Added for 1.42.2. With next version either remove or update
|
|
||||||
Source4: e2fsprogs-1.42.2.de.po.bz2
|
|
||||||
#
|
#
|
||||||
# e2fsprogs patches
|
# e2fsprogs patches
|
||||||
#
|
#
|
||||||
@ -133,7 +133,6 @@ Development files for the com_err error message display library.
|
|||||||
%patch5
|
%patch5
|
||||||
%patch6
|
%patch6
|
||||||
cp %{SOURCE2} .
|
cp %{SOURCE2} .
|
||||||
bunzip2 -c %{S:4} > po/de.po
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
autoreconf --force --install
|
autoreconf --force --install
|
||||||
|
Loading…
Reference in New Issue
Block a user