Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>

> On 1 Aug 2021, at 17:13, Adolf Belka <adolf.belka(a)ipfire.org> wrote:
> 
> - Update from 1.44.4 to 1.46.3
> - Update of rootfile
> - Changelog from 1.44.4 to 1.46.3 is too long to display.
>   Full details can be found at http://e2fsprogs.sourceforge.net/e2fsprogs-release.html
>   Most of the 14 version updates have bug fixes in them.
> 
> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
> ---
> config/rootfiles/common/e2fsprogs | 38 ++++---------------------------
> lfs/e2fsprogs                     |  8 +++----
> 2 files changed, 9 insertions(+), 37 deletions(-)
> 
> diff --git a/config/rootfiles/common/e2fsprogs b/config/rootfiles/common/e2fsprogs
> index b3a5fe557..3230e32d8 100644
> --- a/config/rootfiles/common/e2fsprogs
> +++ b/config/rootfiles/common/e2fsprogs
> @@ -1,3 +1,4 @@
> +#etc/e2scrub.conf
> #etc/mke2fs.conf
> lib/libcom_err.so.2
> lib/libcom_err.so.2.1
> @@ -8,20 +9,18 @@ lib/libext2fs.so.2.4
> lib/libss.so.2
> lib/libss.so.2.0
> sbin/badblocks
> -sbin/blkid
> sbin/debugfs
> sbin/dumpe2fs
> sbin/e2fsck
> sbin/e2image
> sbin/e2label
> sbin/e2mmpstatus
> +sbin/e2scrub
> +sbin/e2scrub_all
> sbin/e2undo
> -sbin/findfs
> -sbin/fsck
> sbin/fsck.ext2
> sbin/fsck.ext3
> sbin/fsck.ext4
> -#sbin/logsave
> sbin/mke2fs
> sbin/mkfs.ext2
> sbin/mkfs.ext3
> @@ -32,10 +31,6 @@ usr/bin/chattr
> #usr/bin/compile_et
> usr/bin/lsattr
> #usr/bin/mk_cmds
> -usr/bin/uuidgen
> -#usr/include/blkid
> -#usr/include/blkid/blkid.h
> -#usr/include/blkid/blkid_types.h
> #usr/include/com_err.h
> #usr/include/e2p
> #usr/include/e2p/e2p.h
> @@ -56,8 +51,6 @@ usr/bin/uuidgen
> #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/libcom_err.a
> usr/lib/libcom_err.so
> @@ -67,20 +60,15 @@ usr/lib/libe2p.so
> usr/lib/libext2fs.so
> #usr/lib/libss.a
> usr/lib/libss.so
> -#usr/lib/libuuid.a
> -usr/lib/libuuid.so
> -#usr/lib/pkgconfig/blkid.pc
> #usr/lib/pkgconfig/com_err.pc
> #usr/lib/pkgconfig/e2p.pc
> #usr/lib/pkgconfig/ext2fs.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
> -usr/sbin/uuidd
> #usr/share/et
> #usr/share/et/et_c.awk
> #usr/share/et/et_h.awk
> @@ -89,27 +77,13 @@ usr/sbin/uuidd
> #usr/share/man/man1/compile_et.1
> #usr/share/man/man1/lsattr.1
> #usr/share/man/man1/mk_cmds.1
> -#usr/share/man/man1/uuidgen.1
> #usr/share/man/man3/com_err.3
> -#usr/share/man/man3/libblkid.3
> -#usr/share/man/man3/uuid.3
> -#usr/share/man/man3/uuid_clear.3
> -#usr/share/man/man3/uuid_compare.3
> -#usr/share/man/man3/uuid_copy.3
> -#usr/share/man/man3/uuid_generate.3
> -#usr/share/man/man3/uuid_generate_random.3
> -#usr/share/man/man3/uuid_generate_time.3
> -#usr/share/man/man3/uuid_is_null.3
> -#usr/share/man/man3/uuid_parse.3
> -#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/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
> #usr/share/man/man8/dumpe2fs.8
> #usr/share/man/man8/e2freefrag.8
> @@ -117,16 +91,15 @@ usr/sbin/uuidd
> #usr/share/man/man8/e2image.8
> #usr/share/man/man8/e2label.8
> #usr/share/man/man8/e2mmpstatus.8
> +#usr/share/man/man8/e2scrub.8
> +#usr/share/man/man8/e2scrub_all.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
> -#usr/share/man/man8/fsck.8
> #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/logsave.8
> #usr/share/man/man8/mke2fs.8
> #usr/share/man/man8/mkfs.ext2.8
> #usr/share/man/man8/mkfs.ext3.8
> @@ -134,7 +107,6 @@ usr/sbin/uuidd
> #usr/share/man/man8/mklost+found.8
> #usr/share/man/man8/resize2fs.8
> #usr/share/man/man8/tune2fs.8
> -#usr/share/man/man8/uuidd.8
> #usr/share/ss
> #usr/share/ss/ct_c.awk
> #usr/share/ss/ct_c.sed
> diff --git a/lfs/e2fsprogs b/lfs/e2fsprogs
> index bb005ae02..f417b77f4 100644
> --- a/lfs/e2fsprogs
> +++ b/lfs/e2fsprogs
> @@ -24,10 +24,10 @@
> 
> include Config
> 
> -VER      = 1.44.4
> +VER      = 1.46.3
> 
> THISAPP    = e2fsprogs-$(VER)
> -DL_FILE    = $(THISAPP).tar.gz
> +DL_FILE    = $(THISAPP).tar.xz
> DL_FROM    = $(URL_IPFIRE)
> DIR_APP    = $(DIR_SRC)/$(THISAPP)
> TARGET     = $(DIR_INFO)/$(THISAPP)
> @@ -40,7 +40,7 @@ objects = $(DL_FILE)
> 
> $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
> 
> -$(DL_FILE)_MD5 = 156e94a6169ca1fa3f0c6749ae5921b9
> +$(DL_FILE)_MD5 = ab7e15cafcd34681db907d3fcb395f95
> 
> 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) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
>    -mkdir -pv $(DIR_APP)/build
>    cd $(DIR_APP)/build && \
>        $(DIR_APP)/configure \
> -- 
> 2.32.0
>