From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Sat, 29 Jan 2022 11:15:20 +0000 (+0100)
Subject: e2fsprogs: Update to version 1.46.5
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=8c2445a0e4f2f5b7bcccc5f7e47b8cc831cac86c;p=openwrt%2Fstaging%2Frmilecki.git

e2fsprogs: Update to version 1.46.5

The sizes of the ipk changed on MIPS 24Kc like this:
  8788 badblocks_1.45.6-2_mips_24kc.ipk
  8861 badblocks_1.46.5-1_mips_24kc.ipk

  3652 chattr_1.45.6-2_mips_24kc.ipk
  3657 chattr_1.46.5-1_mips_24kc.ipk

 58128 debugfs_1.45.6-2_mips_24kc.ipk
 60279 debugfs_1.46.5-1_mips_24kc.ipk

  8551 dumpe2fs_1.45.6-2_mips_24kc.ipk
  8567 dumpe2fs_1.46.5-1_mips_24kc.ipk

  4797 e2freefrag_1.45.6-2_mips_24kc.ipk
  4791 e2freefrag_1.46.5-1_mips_24kc.ipk

159790 e2fsprogs_1.45.6-2_mips_24kc.ipk
168212 e2fsprogs_1.46.5-1_mips_24kc.ipk

  7083 e4crypt_1.45.6-2_mips_24kc.ipk
  7134 e4crypt_1.46.5-1_mips_24kc.ipk

  5749 filefrag_1.45.6-2_mips_24kc.ipk
  6233 filefrag_1.46.5-1_mips_24kc.ipk

  4361 libcomerr0_1.45.6-2_mips_24kc.ipk
  4355 libcomerr0_1.46.5-1_mips_24kc.ipk

168040 libext2fs2_1.45.6-2_mips_24kc.ipk
174209 libext2fs2_1.46.5-1_mips_24kc.ipk

  8514 libss2_1.45.6-2_mips_24kc.ipk
  8613 libss2_1.46.5-1_mips_24kc.ipk

  3148 lsattr_1.45.6-2_mips_24kc.ipk
  3227 lsattr_1.46.5-1_mips_24kc.ipk

 22530 resize2fs_1.45.6-2_mips_24kc.ipk
 22909 resize2fs_1.46.5-1_mips_24kc.ipk

 33315 tune2fs_1.45.6-2_mips_24kc.ipk
 34511 tune2fs_1.46.5-1_mips_24kc.ipk

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---

diff --git a/package/utils/e2fsprogs/Makefile b/package/utils/e2fsprogs/Makefile
index 3d64fab587d..b131cdccac5 100644
--- a/package/utils/e2fsprogs/Makefile
+++ b/package/utils/e2fsprogs/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=e2fsprogs
-PKG_VERSION:=1.45.6
-PKG_RELEASE:=2
+PKG_VERSION:=1.46.5
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@KERNEL/linux/kernel/people/tytso/e2fsprogs/v$(PKG_VERSION)/
-PKG_HASH:=ffa7ae6954395abdc50d0f8605d8be84736465afc53b8938ef473fcf7ff44256
+PKG_HASH:=2f16c9176704cf645dc69d5b15ff704ae722d665df38b2ed3cfc249757d8d81e
 
 PKG_LICENSE:=GPL-2.0
 PKG_LICENSE_FILES:=NOTICE
diff --git a/package/utils/e2fsprogs/patches/001-com_err_version.patch b/package/utils/e2fsprogs/patches/001-com_err_version.patch
index 62f1e08e71d..c80896344bd 100644
--- a/package/utils/e2fsprogs/patches/001-com_err_version.patch
+++ b/package/utils/e2fsprogs/patches/001-com_err_version.patch
@@ -1,6 +1,6 @@
 --- a/lib/et/Makefile.in
 +++ b/lib/et/Makefile.in
-@@ -25,8 +25,8 @@ SHARE_FILES= et_c.awk et_h.awk
+@@ -26,8 +26,8 @@ SHARE_FILES= et_c.awk et_h.awk
  LIBRARY= libcom_err
  LIBDIR= et
  
diff --git a/package/utils/e2fsprogs/patches/003-build-Add-SYSLIBS-to-e4crypt-linking.patch b/package/utils/e2fsprogs/patches/003-build-Add-SYSLIBS-to-e4crypt-linking.patch
deleted file mode 100644
index dad71cf0b33..00000000000
--- a/package/utils/e2fsprogs/patches/003-build-Add-SYSLIBS-to-e4crypt-linking.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From e33ecf1595e390b2657018442c68ae824b3e13b4 Mon Sep 17 00:00:00 2001
-From: Hauke Mehrtens <hauke@hauke-m.de>
-Date: Tue, 15 Dec 2020 23:58:53 +0100
-Subject: [PATCH e2fsprogs] build: Add SYSLIBS to e4crypt linking
-
-The $(SYSLIBS) was missing when linking the e4crypt application. This is
-available in the e4crypt.profiled variant, so I assume this was just
-missing in the normal variant and is not left out intentionally.
-
-This fixes building e2fsprogrs with -fsanitize=undefined in the global
-CFLAGS nad LDFLAGS.
-
-Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
----
- misc/Makefile.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/misc/Makefile.in
-+++ b/misc/Makefile.in
-@@ -242,7 +242,7 @@ e4defrag: $(E4DEFRAG_OBJS) $(DEPLIBS)
- e4crypt: $(E4CRYPT_OBJS) $(DEPLIBS) $(DEPSTATIC_LIBUUID)
- 	$(E) "	LD $@"
- 	$(Q) $(CC) $(ALL_LDFLAGS) -o e4crypt $(E4CRYPT_OBJS) \
--		$(LIBUUID) $(LIBS)
-+		$(LIBUUID) $(LIBS) $(SYSLIBS)
- 
- e4defrag.profiled: $(E4DEFRAG_OBJS) $(PROFILED_DEPLIBS)
- 	$(E) "	LD $@"