Signed-off-by: Marcel Lorenz marcel.lorenz@ipfire.org

--- config/rootfiles/common/e2fsprogs | 4 ++++ lfs/e2fsprogs | 17 +++++++++++------ 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/config/rootfiles/common/e2fsprogs b/config/rootfiles/common/e2fsprogs index 9622e6c..ba4f00a 100644 --- a/config/rootfiles/common/e2fsprogs +++ b/config/rootfiles/common/e2fsprogs @@ -1,4 +1,5 @@ #etc/mke2fs.conf +#etc/mke2fs.conf.e2fsprogs-new lib/libblkid.so.1 lib/libblkid.so.1.0 lib/libcom_err.so.2 @@ -114,6 +115,9 @@ usr/sbin/uuidd #usr/share/man/man3/uuid_unparse.3 #usr/share/man/man5/e2fsck.conf.5 #usr/share/man/man5/mke2fs.conf.5 +#usr/share/man/man5/ext2.5 +#usr/share/man/man5/ext3.5 +#usr/share/man/man5/ext4.5 #usr/share/man/man8/badblocks.8 #usr/share/man/man8/blkid.8 #usr/share/man/man8/debugfs.8 diff --git a/lfs/e2fsprogs b/lfs/e2fsprogs index dff6393..d93e421 100644 --- a/lfs/e2fsprogs +++ b/lfs/e2fsprogs @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2016 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@

include Config

-VER = 1.42.6 +VER = 1.42.13

THISAPP = e2fsprogs-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE)

$(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = 9e444c240c1001b3292d108fbad0f49c +$(DL_FILE)_MD5 = bc759fc62666786f5436e2075beb3265

install : $(TARGET)

@@ -71,10 +71,15 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) $(DIR_SRC)/e2fsprogs-build && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) cd $(DIR_SRC) && mkdir build - cd $(DIR_SRC)/build && $(DIR_APP)/configure --prefix=/usr --with-root-prefix="" \ - --enable-elf-shlibs --disable-evms --disable-nls + cd $(DIR_SRC)/build && $(DIR_APP)/configure \ + --prefix=/usr \ + --with-root-prefix="" \ + --enable-elf-shlibs \ + --disable-evms \ + --disable-nls cd $(DIR_SRC)/build && make $(MAKETUNING) cd $(DIR_SRC)/build && make install cd $(DIR_SRC)/build && make install-libs - @rm -rf $(DIR_APP) $(DIR_SRC)/e2fsprogs-build + chmod -v u+w /usr/lib/{libcom_err,libe2p,libext2fs,libss}.a + @rm -rf $(DIR_APP) $(DIR_SRC)/e2fsprogs-build $(DIR_SRC)/build @$(POSTBUILD)