aboutsummaryrefslogtreecommitdiffstats
path: root/package/utils
diff options
context:
space:
mode:
Diffstat (limited to 'package/utils')
-rw-r--r--package/utils/e2fsprogs/Makefile6
-rw-r--r--package/utils/e2fsprogs/patches/001-com_err_version.patch2
-rw-r--r--package/utils/e2fsprogs/patches/003-build-Add-SYSLIBS-to-e4crypt-linking.patch28
3 files changed, 4 insertions, 32 deletions
diff --git a/package/utils/e2fsprogs/Makefile b/package/utils/e2fsprogs/Makefile
index 3d64fab587..b131cdccac 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 62f1e08e71..c80896344b 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 dad71cf0b3..0000000000
--- 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 $@"