diff --git a/package/utils/e2fsprogs/Makefile b/package/utils/e2fsprogs/Makefile index 5bac11e7ca..3ceb7b5c84 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.47.2 +PKG_VERSION:=1.47.3 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:=08242e64ca0e8194d9c1caad49762b19209a06318199b63ce74ae4ef2d74e63c +PKG_HASH:=857e6ef800feaa2bb4578fbc810214be5d3c88b072ea53c5384733a965737329 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 9b3c25f14c..9424cceca1 100644 --- 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 --- a/configure +++ b/configure -@@ -930,6 +930,7 @@ enable_rpath +@@ -931,6 +931,7 @@ enable_rpath with_libiconv_prefix with_libintl_prefix enable_largefile @@ -26,7 +26,7 @@ Signed-off-by: Christian Marangi with_libarchive enable_fuse2fs enable_lto -@@ -1647,6 +1648,7 @@ Optional Packages: +@@ -1650,6 +1651,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 --without-libarchive disable use of libarchive --with-multiarch=ARCH specify the multiarch triplet --with-udev-rules-dir[=DIR] -@@ -13690,7 +13692,155 @@ then : +@@ -13736,7 +13738,155 @@ then : fi @@ -191,7 +191,7 @@ Signed-off-by: Christian Marangi printf %s "checking for magic_file in -lmagic... " >&6; } if test ${ac_cv_lib_magic_magic_file+y} then : -@@ -13728,17 +13878,39 @@ printf "%s\n" "$ac_cv_lib_magic_magic_fi +@@ -13774,17 +13924,39 @@ printf "%s\n" "$ac_cv_lib_magic_magic_fi if test "x$ac_cv_lib_magic_magic_file" = xyes then : MAGIC_LIB=-lmagic @@ -237,7 +237,7 @@ Signed-off-by: Christian Marangi --- a/configure.ac +++ b/configure.ac -@@ -1295,12 +1295,59 @@ SOCKET_LIB='' +@@ -1297,12 +1297,59 @@ SOCKET_LIB='' AC_CHECK_LIB(socket, socket, [SOCKET_LIB=-lsocket]) AC_SUBST(SOCKET_LIB) dnl