e2fsprogs: update to version 1.47.4

Changelog: https://e2fsprogs.sourceforge.net/e2fsprogs-release.html#1.47.4

Signed-off-by: John Audia <therealgraysky@proton.me>
Link: https://github.com/openwrt/openwrt/pull/22415
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

diff --git a/package/utils/e2fsprogs/Makefile b/package/utils/e2fsprogs/Makefile
index f5bbe3800b37c01ed3bd93ae12e0b211baf2f93e..f7d0ee236e24da2504665d27d7afcd34605a6bb1 100644 (file)
--- a/package/utils/e2fsprogs/Makefile
+++ b/package/utils/e2fsprogs/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=e2fsprogs
-PKG_VERSION:=1.47.3
+PKG_VERSION:=1.47.4
 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:=857e6ef800feaa2bb4578fbc810214be5d3c88b072ea53c5384733a965737329
+PKG_HASH:=fd5bf388cbdbe006a3d3b318d983b2948382440acc85a87f1e7d108653e8db0b
 
 PKG_LICENSE:=GPL-2.0
 PKG_LICENSE_FILES:=NOTICE

diff --git a/package/utils/e2fsprogs/patches/010-configure-make-libmagic-optional-and-configurable.patch b/package/utils/e2fsprogs/patches/010-configure-make-libmagic-optional-and-configurable.patch
index 9424cceca1fc09a55929f6433372c6a163d72195..70514d57e9ebda9b9c14930422933dcfcc2655b5 100644 (file)
--- a/package/utils/e2fsprogs/patches/010-configure-make-libmagic-optional-and-configurable.patch
+++ b/package/utils/e2fsprogs/patches/010-configure-make-libmagic-optional-and-configurable.patch
@@ -18,7 +18,7 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
 
 --- a/configure
 +++ b/configure
-@@ -931,6 +931,7 @@ enable_rpath
+@@ -927,6 +927,7 @@ enable_rpath
  with_libiconv_prefix
  with_libintl_prefix
  enable_largefile
@@ -26,7 +26,7 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
  with_libarchive
  enable_fuse2fs
  enable_lto
-@@ -1650,6 +1651,7 @@ Optional Packages:
+@@ -1648,6 +1649,7 @@ Optional Packages:
    --without-libiconv-prefix     don't search for libiconv in includedir and libdir
    --with-libintl-prefix[=DIR]  search for libintl in DIR/include and DIR/lib
    --without-libintl-prefix     don't search for libintl in includedir and libdir
@@ -34,7 +34,7 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
    --without-libarchive    disable use of libarchive
    --with-multiarch=ARCH   specify the multiarch triplet
    --with-udev-rules-dir[=DIR]
-@@ -13736,7 +13738,155 @@ then :
+@@ -14053,7 +14055,155 @@ then :
  fi
  
  
@@ -191,7 +191,7 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
  printf %s "checking for magic_file in -lmagic... " >&6; }
  if test ${ac_cv_lib_magic_magic_file+y}
  then :
-@@ -13774,17 +13924,39 @@ printf "%s\n" "$ac_cv_lib_magic_magic_fi
+@@ -14099,17 +14249,39 @@ printf "%s\n" "$ac_cv_lib_magic_magic_fi
  if test "x$ac_cv_lib_magic_magic_file" = xyes
  then :
    MAGIC_LIB=-lmagic