rpms
/
e2fsprogs
7
0
Fork 1
Code Issues Pull Requests Releases Activity

* Mon Jan 28 2008 Eric Sandeen <esandeen@redhat.com> 1.40.5-1 

- New upstream version, drop several now-upstream patches.
This commit is contained in:
Eric Sandeen 2008-01-30 04:11:16 +00:00
parent db8a1a45dc
commit 2daa78db47
10 changed files with 42 additions and 532 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cvsignore
View File

@ -1 +1 @@
e2fsprogs-1.40.4.tar.gz
e2fsprogs-1.40.5.tar.gz

23
e2fsprogs-1.39-blkid-devmapper.patch
View File

@ -1,23 +0,0 @@
--- e2fsprogs-1.39/configure.in.dm 2006-04-08 21:36:21.000000000 -0400
+++ e2fsprogs-1.39/configure.in 2006-07-06 14:11:32.000000000 -0400
@@ -494,11 +494,15 @@
AC_DEFINE(HAVE_DEVMAPPER)
echo "Enabling device-mapper support"
- DEVMAPPER_REQ='libselinux libsepol'
- DEVMAPPER_PC_LIBS='-ldevmapper'
- DEVMAPPER_LIBS='-ldevmapper -lselinux -lsepol -lpthread'
- STATIC_DEVMAPPER_LIBS='/usr/lib/libdevmapper.a /usr/lib/libselinux.a /usr/lib/libsepol.a -lpthread'
-
+ PKG_PROG_PKG_CONFIG()
+
+ AC_CHECK_LIB(devmapper, dm_tree_create,
+ [DEVMAPPER_LIBS=`$PKG_CONFIG --libs devmapper`;
+ STATIC_DEVMAPPER_LIBS=`$PKG_CONFIG --static --libs devmapper`;
+ DEVMAPPER_REQ="devmapper";
+ DEVMAPPER_PC_LIBS="-ldevmapper"],
+ [AC_MSG_ERROR([device-mapper library not found])],
+ [$DEVMAPPER_LIBS])
fi]
,
echo "Disabling device-mapper support by default"

253
e2fsprogs-1.39-mkinstalldirs.patch
View File

@ -1,253 +0,0 @@
--- e2fsprogs-1.39/debugfs/Makefile.in.mkinstalldirs 2006-12-25 23:04:27.000000000 +0100
+++ e2fsprogs-1.39/debugfs/Makefile.in 2006-12-25 23:04:27.000000000 +0100
@@ -48,8 +48,8 @@
@$(SUBSTITUTE_UPTIME) $(srcdir)/debugfs.8.in debugfs.8
installdirs:
- @echo " MKINSTALLDIRS $(root_sbindir) $(man8dir)"
- @$(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \
+ @echo " MKDIR_P $(root_sbindir) $(man8dir)"
+ @$(MKDIR_P) $(DESTDIR)$(root_sbindir) \
$(DESTDIR)$(man8dir)
install: $(PROGS) $(MANPAGES) installdirs
--- e2fsprogs-1.39/intl/Makefile.in.mkinstalldirs 2005-09-06 11:40:14.000000000 +0200
+++ e2fsprogs-1.39/intl/Makefile.in 2006-12-25 23:04:27.000000000 +0100
@@ -39,8 +39,8 @@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
+MKDIR_P = @MKDIR_P@
+mkdir_p = @MKDIR_P@
l = @INTL_LIBTOOL_SUFFIX_PREFIX@
--- e2fsprogs-1.39/po/Makefile.in.in.mkinstalldirs 2006-12-25 23:04:27.000000000 +0100
+++ e2fsprogs-1.39/po/Makefile.in.in 2006-12-25 23:04:27.000000000 +0100
@@ -25,11 +25,10 @@
datadir = @datadir@
localedir = $(datadir)/locale
gettextsrcdir = $(datadir)/gettext/po
+mkdir_p = @MKDIR_P@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
GMSGFMT = @GMSGFMT@
MSGFMT = @MSGFMT@
@@ -148,7 +147,7 @@
install-exec:
install-data: install-data-@USE_NLS@
if test "$(PACKAGE)" = "gettext-tools"; then \
- $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
+ $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
for file in $(DISTFILES.common) Makevars.template; do \
$(INSTALL_DATA) $(srcdir)/$$file \
$(DESTDIR)$(gettextsrcdir)/$$file; \
@@ -161,13 +160,13 @@
fi
install-data-no: all
install-data-yes: all
- $(mkinstalldirs) $(DESTDIR)$(datadir)
+ $(mkdir_p) $(DESTDIR)$(datadir)
@catalogs='$(CATALOGS)'; \
for cat in $$catalogs; do \
cat=`basename $$cat`; \
lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
dir=$(localedir)/$$lang/LC_MESSAGES; \
- $(mkinstalldirs) $(DESTDIR)$$dir; \
+ $(mkdir_p) $(DESTDIR)$$dir; \
if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \
$(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \
echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \
@@ -207,19 +206,19 @@
installdirs-exec:
installdirs-data: installdirs-data-@USE_NLS@
if test "$(PACKAGE)" = "gettext-tools"; then \
- $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
+ $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
else \
: ; \
fi
installdirs-data-no:
installdirs-data-yes:
- $(mkinstalldirs) $(DESTDIR)$(datadir)
+ $(mkdir_p) $(DESTDIR)$(datadir)
@catalogs='$(CATALOGS)'; \
for cat in $$catalogs; do \
cat=`basename $$cat`; \
lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
dir=$(localedir)/$$lang/LC_MESSAGES; \
- $(mkinstalldirs) $(DESTDIR)$$dir; \
+ $(mkdir_p) $(DESTDIR)$$dir; \
for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
if test -n "$$lc"; then \
if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
--- e2fsprogs-1.39/misc/Makefile.in.mkinstalldirs 2006-12-25 23:04:27.000000000 +0100
+++ e2fsprogs-1.39/misc/Makefile.in 2006-12-25 23:04:27.000000000 +0100
@@ -246,8 +246,8 @@ filefrag.8: $(DEP_SUBSTITUTE) $(srcdir)/
@$(SUBSTITUTE_UPTIME) $(srcdir)/filefrag.8.in filefrag.8
installdirs:
- @echo " MKINSTALLDIRS $(sbindir) $(root_sbindir) $(bindir) $(man1dir) $(man8dir) $(libdir) $(root_sysconfdir)"
- @$(MKINSTALLDIRS) $(DESTDIR)$(sbindir) \
+ @echo " MKDIR_P $(sbindir) $(root_sbindir) $(bindir) $(man1dir) $(man8dir) $(libdir) $(root_sysconfdir)"
+ @$(MKDIR_P) $(DESTDIR)$(sbindir) \
$(DESTDIR)$(root_sbindir) $(DESTDIR)$(bindir) \
$(DESTDIR)$(man1dir) $(DESTDIR)$(man8dir) \
$(DESTDIR)$(man1dir) $(DESTDIR)$(man5dir) \
--- e2fsprogs-1.39/e2fsck/Makefile.in.mkinstalldirs 2006-12-25 23:04:27.000000000 +0100
+++ e2fsprogs-1.39/e2fsck/Makefile.in 2006-12-25 23:04:27.000000000 +0100
@@ -172,8 +172,8 @@
@$(SUBSTITUTE_UPTIME) $(srcdir)/e2fsck.conf.5.in e2fsck.conf.5
installdirs:
- @echo " MKINSTALLDIRS $(root_sbindir) $(man8dir)"
- @$(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \
+ @echo " MKDIR_P $(root_sbindir) $(man8dir)"
+ @$(MKDIR_P) $(DESTDIR)$(root_sbindir) \
$(DESTDIR)$(man8dir) $(DESTDIR)$(man5dir)
install: $(PROGS) $(MANPAGES) installdirs
--- e2fsprogs-1.39/doc/Makefile.in.mkinstalldirs 2005-09-06 11:40:13.000000000 +0200
+++ e2fsprogs-1.39/doc/Makefile.in 2006-12-25 23:04:27.000000000 +0100
@@ -20,8 +20,8 @@
install-doc-libs:
@$(RM) -rf $(DESTDIR)$(infodir)/libext2fs.info*
- @echo " MKINSTALLDIRS $(infodir)"
- @$(MKINSTALLDIRS) $(DESTDIR)$(infodir)
+ @echo " MKDIR_P $(infodir)"
+ @$(MKDIR_P) $(DESTDIR)$(infodir)
@for i in libext2fs.info* ; do \
echo " INSTALL_DATA $(infodir)/$$i" ; \
$(INSTALL_DATA) $$i $(DESTDIR)$(infodir)/$$i ; \
--- e2fsprogs-1.39/resize/Makefile.in.mkinstalldirs 2006-03-18 00:46:41.000000000 +0100
+++ e2fsprogs-1.39/resize/Makefile.in 2006-12-25 23:04:27.000000000 +0100
@@ -57,8 +57,8 @@
@$(CC) $(ALL_LDFLAGS) -o test_extent $(TEST_EXTENT_OBJS) $(LIBS)
installdirs:
- @echo " MKINSTALLDIRS $(root_sbindir) $(man8dir)"
- @$(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \
+ @echo " MKDIR_P $(root_sbindir) $(man8dir)"
+ @$(MKDIR_P) $(DESTDIR)$(root_sbindir) \
$(DESTDIR)$(man8dir)
install: $(PROGS) $(MANPAGES) installdirs
--- e2fsprogs-1.39/MCONFIG.in.mkinstalldirs 2006-12-25 23:04:27.000000000 +0100
+++ e2fsprogs-1.39/MCONFIG.in 2006-12-25 23:04:27.000000000 +0100
@@ -62,7 +62,7 @@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-MKINSTALLDIRS = @MKINSTALLDIRS@
+MKDIR_P = @MKDIR_P@
#
# Library definitions
--- e2fsprogs-1.39/lib/blkid/Makefile.in.mkinstalldirs 2006-12-25 23:04:27.000000000 +0100
+++ e2fsprogs-1.39/lib/blkid/Makefile.in 2006-12-25 23:04:27.000000000 +0100
@@ -142,8 +142,8 @@
@cd $(top_builddir); CONFIG_FILES=lib/blkid/blkid.pc ./config.status
installdirs::
- @echo " MKINSTALLDIRS $(libdir) $(includedir)/blkid /etc/blkid"
- @$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
+ @echo " MKDIR_P $(libdir) $(includedir)/blkid /etc/blkid"
+ @$(MKDIR_P) $(DESTDIR)$(libdir) \
$(DESTDIR)$(includedir)/blkid $(DESTDIR)$(libdir)/pkgconfig \
$(DESTDIR)/etc/blkid
--- e2fsprogs-1.39/lib/et/Makefile.in.mkinstalldirs 2005-12-30 04:19:32.000000000 +0100
+++ e2fsprogs-1.39/lib/et/Makefile.in 2006-12-25 23:04:27.000000000 +0100
@@ -74,8 +74,8 @@
$(TAGS) $(SRCS)
installdirs::
- @echo " MKINSTALLDIRS $(libdir) $(includedir)/et $(datadir)/et $(bindir) $(man1dir) $(man3dir)"
- @$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
+ @echo " MKDIR_P $(libdir) $(includedir)/et $(datadir)/et $(bindir) $(man1dir) $(man3dir)"
+ @$(MKDIR_P) $(DESTDIR)$(libdir) \
$(DESTDIR)$(includedir)/et $(DESTDIR)$(datadir)/et \
$(DESTDIR)$(bindir) $(DESTDIR)$(man1dir) \
$(DESTDIR)$(man3dir) $(DESTDIR)$(libdir)/pkgconfig
--- e2fsprogs-1.39/lib/uuid/Makefile.in.mkinstalldirs 2005-12-30 04:19:32.000000000 +0100
+++ e2fsprogs-1.39/lib/uuid/Makefile.in 2006-12-25 23:04:27.000000000 +0100
@@ -126,8 +126,8 @@
@cd $(top_builddir); CONFIG_FILES=lib/uuid/uuid.pc ./config.status
installdirs::
- @echo " MKINSTALLDIRS $(libdir) $(includedir)/uuid $(man3dir)"
- @$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
+ @echo " MKDIR_P $(libdir) $(includedir)/uuid $(man3dir)"
+ @$(MKDIR_P) $(DESTDIR)$(libdir) \
$(DESTDIR)$(includedir)/uuid $(DESTDIR)$(man3dir) \
$(DESTDIR)$(libdir)/pkgconfig
--- e2fsprogs-1.39/lib/ext2fs/Makefile.in.mkinstalldirs 2006-04-09 04:02:02.000000000 +0200
+++ e2fsprogs-1.39/lib/ext2fs/Makefile.in 2006-12-25 23:04:27.000000000 +0100
@@ -236,8 +236,8 @@
LD_LIBRARY_PATH=$(LIB) DYLD_LIBRARY_PATH=$(LIB) ./tst_types
installdirs::
- @echo " MKINSTALLDIRS $(libdir) $(includedir)/ext2fs"
- @$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
+ @echo " MKDIR_P $(libdir) $(includedir)/ext2fs"
+ @$(MKDIR_P) $(DESTDIR)$(libdir) \
$(DESTDIR)$(includedir)/ext2fs $(DESTDIR)$(libdir)/pkgconfig
install:: all $(HFILES) $(HFILES_IN) installdirs ext2fs.pc
--- e2fsprogs-1.39/lib/Makefile.elf-lib.mkinstalldirs 2006-12-25 23:31:27.000000000 +0100
+++ e2fsprogs-1.39/lib/Makefile.elf-lib 2006-12-25 23:31:28.000000000 +0100
@@ -33,8 +33,8 @@
@$(LN) ../$(ELF_LIB) ../$(ELF_SONAME)
installdirs-elf-lib::
- @echo " MKINSTALLDIRS $(ELF_INSTALL_DIR) $(libdir)"
- @$(MKINSTALLDIRS) $(DESTDIR)$(ELF_INSTALL_DIR) \
+ @echo " MKDIR_P $(ELF_INSTALL_DIR) $(libdir)"
+ @$(MKDIR_P) $(DESTDIR)$(ELF_INSTALL_DIR) \
$(DESTDIR)$(libdir)
installdirs:: installdirs-elf-lib
--- e2fsprogs-1.39/lib/e2p/Makefile.in.mkinstalldirs 2006-12-25 23:04:27.000000000 +0100
+++ e2fsprogs-1.39/lib/e2p/Makefile.in 2006-12-25 23:04:27.000000000 +0100
@@ -73,8 +73,8 @@
./tst_ostype
installdirs::
- @echo " MKINSTALLDIRS $(libdir) $(includedir)/e2p"
- @$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
+ @echo " MKDIR_P $(libdir) $(includedir)/e2p"
+ @$(MKDIR_P) $(DESTDIR)$(libdir) \
$(DESTDIR)$(includedir)/e2p $(DESTDIR)$(libdir)/pkgconfig
install:: all installdirs
--- e2fsprogs-1.39/lib/ss/Makefile.in.mkinstalldirs 2005-12-30 04:19:32.000000000 +0100
+++ e2fsprogs-1.39/lib/ss/Makefile.in 2006-12-25 23:04:27.000000000 +0100
@@ -125,8 +125,8 @@
@cd $(top_builddir); CONFIG_FILES=lib/ss/ss.pc ./config.status
installdirs::
- @echo " MKINSTALLDIRS $(libdir) $(includedir)/ss $(datadir)/ss $(bindir)"
- @$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
+ @echo " MKDIR_P $(libdir) $(includedir)/ss $(datadir)/ss $(bindir)"
+ @$(MKDIR_P) $(DESTDIR)$(libdir) \
$(DESTDIR)$(includedir)/ss $(DESTDIR)$(datadir)/ss \
$(DESTDIR)$(bindir) $(DESTDIR)$(libdir)/pkgconfig
--- e2fsprogs-1.39/configure.in.mkinstalldirs 2006-12-25 23:04:27.000000000 +0100
+++ e2fsprogs-1.39/configure.in 2006-12-25 23:04:27.000000000 +0100
@@ -550,6 +550,7 @@
AC_CHECK_TOOL(RANLIB, ranlib, :)
AC_CHECK_TOOL(STRIP, strip, :)
AC_PROG_INSTALL
+AC_PROG_MKDIR_P
# See if we need a separate native compiler.
if test $cross_compiling = no; then
BUILD_CC="$CC"

79
e2fsprogs-1.40.4-big-inodes.patch
View File

@ -1,79 +0,0 @@
Index: e2fsprogs-1.40.4/misc/mke2fs.conf
===================================================================
--- e2fsprogs-1.40.4.orig/misc/mke2fs.conf
+++ e2fsprogs-1.40.4/misc/mke2fs.conf
@@ -1,15 +1,19 @@
[defaults]
base_features = sparse_super,filetype,resize_inode,dir_index
blocksize = 4096
- inode_ratio = 8192
+ inode_size = 256
+ inode_ratio = 16384
[fs_types]
small = {
blocksize = 1024
+ inode_size = 128
inode_ratio = 4096
}
floppy = {
blocksize = 1024
+ inode_size = 128
+ inode_ratio = 8192
}
news = {
inode_ratio = 4096
Index: e2fsprogs-1.40.4/tests/m_large_file/expect.1
===================================================================
--- e2fsprogs-1.40.4.orig/tests/m_large_file/expect.1
+++ e2fsprogs-1.40.4/tests/m_large_file/expect.1
@@ -1,3 +1,4 @@
+Warning: 256-byte inodes not usable on older systems
Filesystem label=
OS type: Linux
Block size=4096 (log=2)
@@ -20,7 +21,7 @@ Pass 2: Checking directory structure
Pass 3: Checking directory connectivity
Pass 4: Checking reference counts
Pass 5: Checking group summary information
-test_filesys: 11/64 files (9.1% non-contiguous), 15/16384 blocks
+test_filesys: 11/64 files (9.1% non-contiguous), 17/16384 blocks
Exit status is 0
Filesystem volume name: <none>
@@ -35,7 +36,7 @@ Filesystem OS type: Linux
Inode count: 64
Block count: 16384
Reserved block count: 819
-Free blocks: 16369
+Free blocks: 16367
Free inodes: 53
First block: 0
Block size: 4096
@@ -44,13 +45,13 @@ Reserved GDT blocks: 3
Blocks per group: 32768
Fragments per group: 32768
Inodes per group: 64
-Inode blocks per group: 2
+Inode blocks per group: 4
Mount count: 0
Check interval: 15552000 (6 months)
Reserved blocks uid: 0
Reserved blocks gid: 0
First inode: 11
-Inode size: 128
+Inode size: 256
Default directory hash: tea
@@ -58,7 +59,7 @@ Group 0: (Blocks 0-16383)
Primary superblock at 0, Group descriptors at 1-1
Reserved GDT blocks at 2-4
Block bitmap at 5 (+5), Inode bitmap at 6 (+6)
- Inode table at 7-8 (+7)
- 16369 free blocks, 53 free inodes, 2 directories
- Free blocks: 15-16383
+ Inode table at 7-10 (+7)
+ 16367 free blocks, 53 free inodes, 2 directories
+ Free blocks: 17-16383
Free inodes: 12-64

82
e2fsprogs-1.40.4-blkid-ext4dev.patch
View File

@ -1,82 +0,0 @@
Index: e2fsprogs-1.40.4/lib/blkid/probe.c
===================================================================
--- e2fsprogs-1.40.4.orig/lib/blkid/probe.c
+++ e2fsprogs-1.40.4/lib/blkid/probe.c
@@ -148,6 +148,38 @@ static void get_ext2_info(blkid_dev dev,
set_uuid(dev, es->s_uuid, 0);
}
+static int probe_ext4(struct blkid_probe *probe,
+ struct blkid_magic *id __BLKID_ATTR((unused)),
+ unsigned char *buf)
+{
+ struct ext2_super_block *es;
+ es = (struct ext2_super_block *)buf;
+
+ /* Distinguish between jbd and ext2/3/4 fs */
+ if (blkid_le32(es->s_feature_incompat) &
+ EXT3_FEATURE_INCOMPAT_JOURNAL_DEV)
+ return -BLKID_ERR_PARAM;
+
+ /* Distinguish between ext3/4 and ext2 */
+ if (!(blkid_le32(es->s_feature_compat) &
+ EXT3_FEATURE_COMPAT_HAS_JOURNAL))
+ return -BLKID_ERR_PARAM;
+
+ /* Distinguish between ext4 and ext3 */
+ if (!(blkid_le32(es->s_feature_ro_compat) &
+ EXT4_FEATURES_RO_COMPAT) &&
+ !(blkid_le32(es->s_feature_incompat) &
+ EXT4_FEATURES_INCOMPAT))
+ return -BLKID_ERR_PARAM;
+
+ get_ext2_info(probe->dev, buf);
+
+ if ((es->s_feature_compat & EXT3_FEATURE_COMPAT_HAS_JOURNAL) &&
+ !uuid_is_null(es->s_journal_uuid))
+ set_uuid(probe->dev, es->s_journal_uuid, "EXT_JOURNAL");
+
+ return 0;
+}
static int probe_ext3(struct blkid_probe *probe,
struct blkid_magic *id __BLKID_ATTR((unused)),
unsigned char *buf)
@@ -833,6 +865,7 @@ static struct blkid_magic type_array[] =
{ "oracleasm", 0, 32, 8, "ORCLDISK", probe_oracleasm },
{ "ntfs", 0, 3, 8, "NTFS ", probe_ntfs },
{ "jbd", 1, 0x38, 2, "\123\357", probe_jbd },
+ { "ext4dev", 1, 0x38, 2, "\123\357", probe_ext4 },
{ "ext3", 1, 0x38, 2, "\123\357", probe_ext3 },
{ "ext2", 1, 0x38, 2, "\123\357", probe_ext2 },
{ "reiserfs", 8, 0x34, 8, "ReIsErFs", probe_reiserfs },
Index: e2fsprogs-1.40.4/lib/blkid/probe.h
===================================================================
--- e2fsprogs-1.40.4.orig/lib/blkid/probe.h
+++ e2fsprogs-1.40.4/lib/blkid/probe.h
@@ -88,6 +88,26 @@ struct ext2_super_block {
#define EXT3_FEATURE_INCOMPAT_RECOVER 0x00000004
#define EXT3_FEATURE_INCOMPAT_JOURNAL_DEV 0x00000008
+#define EXT4_FEATURE_RO_COMPAT_HUGE_FILE 0x0008
+#define EXT4_FEATURE_RO_COMPAT_GDT_CSUM 0x0010
+#define EXT4_FEATURE_RO_COMPAT_DIR_NLINK 0x0020
+#define EXT4_FEATURE_RO_COMPAT_EXTRA_ISIZE 0x0040
+
+#define EXT4_FEATURE_INCOMPAT_EXTENTS 0x0040 /* extents support */
+#define EXT4_FEATURE_INCOMPAT_64BIT 0x0080
+#define EXT4_FEATURE_INCOMPAT_MMP 0x0100
+#define EXT4_FEATURE_INCOMPAT_FLEX_BG 0x0200
+
+#define EXT4_FEATURES_RO_COMPAT (EXT4_FEATURE_RO_COMPAT_HUGE_FILE| \
+ EXT4_FEATURE_RO_COMPAT_GDT_CSUM| \
+ EXT4_FEATURE_RO_COMPAT_DIR_NLINK| \
+ EXT4_FEATURE_RO_COMPAT_EXTRA_ISIZE)
+
+#define EXT4_FEATURES_INCOMPAT (EXT4_FEATURE_INCOMPAT_EXTENTS| \
+ EXT4_FEATURE_INCOMPAT_64BIT| \
+ EXT4_FEATURE_INCOMPAT_MMP| \
+ EXT4_FEATURE_INCOMPAT_FLEX_BG)
+
struct xfs_super_block {
unsigned char xs_magic[4];
__u32 xs_blocksize;

13
e2fsprogs-1.40.4-no-static-e2fsck.patch
View File

@ -1,13 +0,0 @@
Index: e2fsprogs-1.40.4/e2fsck/Makefile.in
===================================================================
--- e2fsprogs-1.40.4.orig/e2fsck/Makefile.in
+++ e2fsprogs-1.40.4/e2fsck/Makefile.in
@@ -104,7 +104,7 @@ SRCS= $(srcdir)/e2fsck.c \
prof_err.c \
$(MTRACE_SRC)
-all:: profiled $(PROGS) e2fsck.static e2fsck.shared $(MANPAGES) $(FMANPAGES)
+all:: profiled $(PROGS) e2fsck.@E2FSCK_TYPE@ $(MANPAGES) $(FMANPAGES)
@PROFILE_CMT@all:: e2fsck.profiled

58
e2fsprogs-1.40.4-sb_feature_check_ignore.patch
View File

@ -1,41 +1,35 @@
Index: e2fsprogs-1.40.4/e2fsck/super.c
Index: e2fsprogs-1.40.5/e2fsck/super.c
===================================================================
--- e2fsprogs-1.40.4.orig/e2fsck/super.c
+++ e2fsprogs-1.40.4/e2fsck/super.c
@@ -814,10 +814,32 @@ int check_backup_super_block(e2fsck_t ct
--- e2fsprogs-1.40.5.orig/e2fsck/super.c
+++ e2fsprogs-1.40.5/e2fsck/super.c
@@ -793,7 +793,11 @@ void check_super_block(e2fsck_t ctx)
* unfortunately, we shouldn't ignore it since if it's not set in the
* backup, the extended attributes in the filesystem will be stripped
* away.
+ *
+ * Well, I'm still going that route for now, 'til I do something
+ * better. Full-fsck after a fresh install is just no good. -ERS
*/
+#define FEATURE_COMPAT_IGNORE (EXT2_FEATURE_COMPAT_EXT_ATTR)
#define FEATURE_RO_COMPAT_IGNORE (EXT2_FEATURE_RO_COMPAT_LARGE_FILE| \
EXT4_FEATURE_RO_COMPAT_DIR_NLINK)
#define FEATURE_INCOMPAT_IGNORE (EXT3_FEATURE_INCOMPAT_EXTENTS)
@@ -837,6 +841,9 @@ int check_backup_super_block(e2fsck_t ct
continue;
}
-#define SUPER_DIFFERENT(x) (fs->super->x != tfs->super->x)
- if (SUPER_DIFFERENT(s_feature_compat) ||
- SUPER_DIFFERENT(s_feature_incompat) ||
- SUPER_DIFFERENT(s_feature_ro_compat) ||
+ /*
+ * A few flags are set on the fly by the kernel, but
+ * only in the primary superblock. They are safe
+ * to copy even if they differ.
+ */
+
+#define FEATURE_COMPAT_IGNORE (EXT2_FEATURE_COMPAT_EXT_ATTR)
+#define FEATURE_RO_COMPAT_IGNORE (EXT2_FEATURE_RO_COMPAT_LARGE_FILE| \
+ EXT4_FEATURE_RO_COMPAT_DIR_NLINK)
+#define FEATURE_INCOMPAT_IGNORE (EXT3_FEATURE_INCOMPAT_EXTENTS)
+
+#define SUPER_COMPAT_DIFFERENT(x) \
+ (( fs->super->x & ~FEATURE_COMPAT_IGNORE) != \
+ (tfs->super->x & ~FEATURE_COMPAT_IGNORE))
+#define SUPER_INCOMPAT_DIFFERENT(x) \
+ (( fs->super->x & ~FEATURE_INCOMPAT_IGNORE) != \
+ (tfs->super->x & ~FEATURE_INCOMPAT_IGNORE))
+#define SUPER_RO_COMPAT_DIFFERENT(x) \
+ (( fs->super->x & ~FEATURE_RO_COMPAT_IGNORE) != \
+ (tfs->super->x & ~FEATURE_RO_COMPAT_IGNORE))
+#define SUPER_DIFFERENT(x) \
+ (fs->super->x != tfs->super->x)
+
#define SUPER_INCOMPAT_DIFFERENT(x) \
(( fs->super->x & ~FEATURE_INCOMPAT_IGNORE) != \
(tfs->super->x & ~FEATURE_INCOMPAT_IGNORE))
@@ -846,7 +853,7 @@ int check_backup_super_block(e2fsck_t ct
#define SUPER_DIFFERENT(x) \
(fs->super->x != tfs->super->x)
- if (SUPER_DIFFERENT(s_feature_compat) ||
+ if (SUPER_COMPAT_DIFFERENT(s_feature_compat) ||
+ SUPER_INCOMPAT_DIFFERENT(s_feature_incompat) ||
+ SUPER_RO_COMPAT_DIFFERENT(s_feature_ro_compat) ||
SUPER_INCOMPAT_DIFFERENT(s_feature_incompat) ||
SUPER_RO_COMPAT_DIFFERENT(s_feature_ro_compat) ||
SUPER_DIFFERENT(s_blocks_count) ||
SUPER_DIFFERENT(s_inodes_count) ||
memcmp(fs->super->s_uuid, tfs->super->s_uuid,

18
e2fsprogs-1.40.4-uuidd-tidy.patch
View File

@ -1,18 +0,0 @@
Index: e2fsprogs-1.39/misc/uuidd.8.in
===================================================================
--- e2fsprogs-1.39.orig/misc/uuidd.8.in
+++ e2fsprogs-1.39/misc/uuidd.8.in
@@ -64,11 +64,11 @@ UUID's.
.TP
.BI \-p " pidfile"
Specify the pathname where the pid file should be written. By default,
-the pid file is written to /var/run/uuidd.pid.
+the pid file is written to /var/lib/libuuid/uuidd.pid.
.TP
.BI \-s " socketpath"
Specify the pathname used for the unix-domain socket used by uuidd. By
-qdefault, the pathname used is /var/run/uuidd.sock. This is primarily
+default, the pathname used is /var/lib/libuuid/request. This is primarily
for debugging purposes, since the pathname is hard-coded in the libuuid
library.
.TP

44
e2fsprogs.spec
View File

@ -3,8 +3,8 @@
Summary: Utilities for managing the second and third extended (ext2/ext3) filesystems
Name: e2fsprogs
Version: 1.40.4
Release: 7%{?dist}
Version: 1.40.5
Release: 1%{?dist}
# License based on upstream-modified COPYING file,
# which clearly states "V2" intent.
License: GPLv2
@ -13,21 +13,14 @@ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
Source1: ext2_types-wrapper.h
Source2: blkid_types-wrapper.h
Source3: uuidd.init
Patch1: e2fsprogs-1.39-blkid-devmapper.patch
Patch2: e2fsprogs-1.38-etcblkid.patch
Patch3: e2fsprogs-1.39-mkinstalldirs.patch
Patch4: e2fsprogs-1.40.4-uuidd-tidy.patch
Patch5: e2fsprogs-1.40.4-sb_feature_check_ignore.patch
Patch6: e2fsprogs-1.40.4-blkid-ext4dev.patch
Patch7: e2fsprogs-1.40.4-no-static-e2fsck.patch
Patch8: e2fsprogs-1.40.4-big-inodes.patch
Patch1: e2fsprogs-1.38-etcblkid.patch
Patch2: e2fsprogs-1.40.4-sb_feature_check_ignore.patch
Url: http://e2fsprogs.sourceforge.net/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: e2fsprogs-libs = %{version}-%{release}, device-mapper
BuildRequires: gettext, texinfo, autoconf, automake >= 1.10, libselinux-devel
BuildRequires: libsepol-devel, gettext-devel, pkgconfig
BuildRequires: device-mapper-devel gawk
BuildRequires: pkgconfig, texinfo, libselinux-devel
BuildRequires: libsepol-devel, device-mapper-devel
%description
The e2fsprogs package contains a number of utilities for creating,
@ -92,27 +85,15 @@ SMP systems.
%prep
%setup -q -n e2fsprogs-%{version}
# look at device mapper devices
%patch1 -p1 -b .dm
# put blkid.tab in /etc/blkid/
%patch2 -p1 -b .etcblkid
# Fix for newer autoconf (#220715)
%patch3 -p1 -b .mkinstalldirs
# uuidd manpage tidyup
%patch4 -p1 -b .uuidd-tidy
%patch1 -p1 -b .etcblkid
# ignore some flag differences on primary/backup sb feature checks
%patch5 -p1 -b .featurecheck
# teach blkid about ext4dev, for now
%patch6 -p1 -b .ext4-blkid
# completely clobber e2fsck.static build
%patch7 -p1 -b .e2fsck-static
# make 256-byte inodes in most cases
%patch8 -p1 -b .biginodes
# mildly unsafe but 'til I get something better, avoid full fsck
# after an selinux install...
%patch2 -p1 -b .featurecheck
%build
aclocal
autoconf
%configure --enable-elf-shlibs --enable-nls --disable-e2initrd-helper --enable-blkid-devmapper --enable-blkid-selinux --enable-dynamic-e2fsck
%configure --enable-elf-shlibs --enable-nls --disable-e2initrd-helper --enable-blkid-devmapper --enable-blkid-selinux
make %{?_smp_mflags}
%install
@ -297,6 +278,9 @@ fi
%dir %attr(2775, uuidd, uuidd) /var/lib/libuuid
%changelog
* Mon Jan 28 2008 Eric Sandeen <esandeen@redhat.com> 1.40.5-1
- New upstream version, drop several now-upstream patches.
* Thu Jan 24 2008 Eric Sandeen <sandeen@redhat.com> 1.40.4-7
- Fix sb flag comparisons properly this time (#428893)
- Make 256-byte inodes for the [default] mkfs case.

2
sources
View File

@ -1 +1 @@
124d744bdf9d443591eb8193c085944b e2fsprogs-1.40.4.tar.gz
69e55eaf543acfab8e2eb8ba2883d8cd e2fsprogs-1.40.5.tar.gz