Signed-off-by: Marcel Lorenz marcel.lorenz@ipfire.org --- config/rootfiles/common/e2fsprogs | 23 ++++++++--------------- lfs/e2fsprogs | 8 ++++---- 2 files changed, 12 insertions(+), 19 deletions(-)
diff --git a/config/rootfiles/common/e2fsprogs b/config/rootfiles/common/e2fsprogs index ba4f00a9f..db5375b35 100644 --- a/config/rootfiles/common/e2fsprogs +++ b/config/rootfiles/common/e2fsprogs @@ -1,5 +1,4 @@ -#etc/mke2fs.conf -#etc/mke2fs.conf.e2fsprogs-new +etc/mke2fs.conf lib/libblkid.so.1 lib/libblkid.so.1.0 lib/libcom_err.so.2 @@ -25,19 +24,17 @@ sbin/fsck sbin/fsck.ext2 sbin/fsck.ext3 sbin/fsck.ext4 -sbin/fsck.ext4dev -#sbin/logsave +sbin/logsave sbin/mke2fs sbin/mkfs.ext2 sbin/mkfs.ext3 sbin/mkfs.ext4 -sbin/mkfs.ext4dev sbin/resize2fs sbin/tune2fs usr/bin/chattr -#usr/bin/compile_et +usr/bin/compile_et usr/bin/lsattr -#usr/bin/mk_cmds +usr/bin/mk_cmds usr/bin/uuidgen #usr/include/blkid #usr/include/blkid/blkid.h @@ -58,14 +55,12 @@ usr/bin/uuidgen #usr/include/ext2fs/ext3_extents.h #usr/include/ext2fs/qcow2.h #usr/include/ext2fs/tdb.h -#usr/include/quota -#usr/include/quota/mkquota.h #usr/include/ss #usr/include/ss/ss.h #usr/include/ss/ss_err.h #usr/include/uuid #usr/include/uuid/uuid.h -#usr/lib/e2initrd_helper +usr/lib/e2initrd_helper #usr/lib/libblkid.a usr/lib/libblkid.so #usr/lib/libcom_err.a @@ -74,7 +69,6 @@ usr/lib/libcom_err.so usr/lib/libe2p.so #usr/lib/libext2fs.a usr/lib/libext2fs.so -#usr/lib/libquota.a #usr/lib/libss.a usr/lib/libss.so #usr/lib/libuuid.a @@ -83,10 +77,10 @@ usr/lib/libuuid.so #usr/lib/pkgconfig/com_err.pc #usr/lib/pkgconfig/e2p.pc #usr/lib/pkgconfig/ext2fs.pc -#usr/lib/pkgconfig/quota.pc #usr/lib/pkgconfig/ss.pc #usr/lib/pkgconfig/uuid.pc usr/sbin/e2freefrag +usr/sbin/e4crypt usr/sbin/e4defrag usr/sbin/filefrag usr/sbin/mklost+found @@ -114,10 +108,10 @@ usr/sbin/uuidd #usr/share/man/man3/uuid_time.3 #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/man5/mke2fs.conf.5 #usr/share/man/man8/badblocks.8 #usr/share/man/man8/blkid.8 #usr/share/man/man8/debugfs.8 @@ -127,6 +121,7 @@ usr/sbin/uuidd #usr/share/man/man8/e2image.8 #usr/share/man/man8/e2label.8 #usr/share/man/man8/e2undo.8 +#usr/share/man/man8/e4crypt.8 #usr/share/man/man8/e4defrag.8 #usr/share/man/man8/filefrag.8 #usr/share/man/man8/findfs.8 @@ -134,13 +129,11 @@ usr/sbin/uuidd #usr/share/man/man8/fsck.ext2.8 #usr/share/man/man8/fsck.ext3.8 #usr/share/man/man8/fsck.ext4.8 -#usr/share/man/man8/fsck.ext4dev.8 #usr/share/man/man8/logsave.8 #usr/share/man/man8/mke2fs.8 #usr/share/man/man8/mkfs.ext2.8 #usr/share/man/man8/mkfs.ext3.8 #usr/share/man/man8/mkfs.ext4.8 -#usr/share/man/man8/mkfs.ext4dev.8 #usr/share/man/man8/mklost+found.8 #usr/share/man/man8/resize2fs.8 #usr/share/man/man8/tune2fs.8 diff --git a/lfs/e2fsprogs b/lfs/e2fsprogs index 90e28ac07..afd541ff0 100644 --- a/lfs/e2fsprogs +++ b/lfs/e2fsprogs @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2016 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2017 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.13 +VER = 1.43.6
THISAPP = e2fsprogs-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = bc759fc62666786f5436e2075beb3265 +$(DL_FILE)_MD5 = 94fb7105284474a71cf5dd0e03b92661
install : $(TARGET)
@@ -69,7 +69,7 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) $(DIR_SRC)/e2fsprogs-build && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) -mkdir -pv $(DIR_APP)/build cd $(DIR_APP)/build && \ $(DIR_APP)/configure \