e2fsprogs: Update to 1.46.4

5 files changed, 14 insertions, 44 deletions

diff --git a/pkg/e2fsprogs/gen.lua b/pkg/e2fsprogs/gen.lua
index a4f91f66..4c1a3101 100644
--- a/pkg/e2fsprogs/gen.lua
+++ b/pkg/e2fsprogs/gen.lua
@@ -1,4 +1,4 @@
-set('version', '1.46.2')
+set('version', '1.46.4')
 cflags{
 	'-std=c99', '-Wall',
         '-Wno-address-of-packed-member', '-Wno-format-truncation',
@@ -23,7 +23,7 @@ build('cat', '$outdir/config.h', {
 
 set('subst', {
 	'-e s,@E2FSPROGS_VERSION@,$version,',
-	'-e s,@E2FSPROGS_MONTH@,Feb,',
+	'-e s,@E2FSPROGS_MONTH@,Aug,',
 	'-e s,@E2FSPROGS_YEAR@,2021,',
 	'-e s,@JDEV@,,',
 })
diff --git a/pkg/e2fsprogs/patch/0001-libext2fs-avoid-pointer-arithmetic-on-void.patch b/pkg/e2fsprogs/patch/0001-libext2fs-avoid-pointer-arithmetic-on-void.patch
deleted file mode 100644
index d27dac82..00000000
--- a/pkg/e2fsprogs/patch/0001-libext2fs-avoid-pointer-arithmetic-on-void.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From e659aeb8ee69392cba017fc306cdea20c8c97b70 Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Tue, 2 Mar 2021 14:24:01 -0800
-Subject: [PATCH] libext2fs: avoid pointer arithmetic on `void *`
-
-The pointer operand to the + operator must be to a complete object
-type.
-
-Signed-off-by: Michael Forney <mforney@mforney.org>
----
- e2fsck/recovery.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/e2fsck/recovery.c b/e2fsck/recovery.c
-index 25744f08..3c5a37e9 100644
---- a/e2fsck/recovery.c
-+++ b/e2fsck/recovery.c
-@@ -179,7 +179,7 @@ static int jbd2_descriptor_block_csum_verify(journal_t *j, void *buf)
- 	if (!jbd2_journal_has_csum_v2or3(j))
- 		return 1;
- 
--	tail = (struct jbd2_journal_block_tail *)(buf + j->j_blocksize -
-+	tail = (struct jbd2_journal_block_tail *)((char *)buf + j->j_blocksize -
- 			sizeof(struct jbd2_journal_block_tail));
- 	provided = tail->t_checksum;
- 	tail->t_checksum = 0;
--- 
-2.32.0
-
diff --git a/pkg/e2fsprogs/patch/0002-libsupport-remove-unused-sort_r-definition.patch b/pkg/e2fsprogs/patch/0001-libsupport-remove-unused-sort_r-definition.patch
index c15dfe26..6ac9f3f3 100644
--- a/pkg/e2fsprogs/patch/0002-libsupport-remove-unused-sort_r-definition.patch
+++ b/pkg/e2fsprogs/patch/0001-libsupport-remove-unused-sort_r-definition.patch
@@ -1,4 +1,4 @@
-From 6a898554d5862f7cffbd674b0e1c690c6c8e83e4 Mon Sep 17 00:00:00 2001
+From 24a0e8d916019160c1fe186ccfb9843d00a5ddde Mon Sep 17 00:00:00 2001
 From: Michael Forney <mforney@mforney.org>
 Date: Tue, 2 Mar 2021 15:47:20 -0800
 Subject: [PATCH] libsupport: remove unused sort_r definition
@@ -9,29 +9,28 @@ On any linux (including linux-musl), sort_r is defined in terms of
 qsort_r, so a compiler that does not support inlining may still
 emit a reference to qsort_r.
 ---
- lib/support/sort_r.h | 120 ++-----------------------------------------
- 1 file changed, 3 insertions(+), 117 deletions(-)
+ lib/support/sort_r.h | 119 +------------------------------------------
+ 1 file changed, 2 insertions(+), 117 deletions(-)
 
 diff --git a/lib/support/sort_r.h b/lib/support/sort_r.h
-index dc17e8af..4c4ebf3b 100644
+index 3292a26a..08f496d4 100644
 --- a/lib/support/sort_r.h
 +++ b/lib/support/sort_r.h
-@@ -22,20 +22,11 @@ void sort_r(void *base, size_t nel, size_t width,
+@@ -22,20 +22,10 @@ void sort_r(void *base, size_t nel, size_t width,
  
  */
  
 -#define _SORT_R_INLINE inline
 -
--#if (defined __APPLE__ || defined __MACH__ || defined __DARWIN__ || \
--     defined __FreeBSD__ || defined __DragonFly__)
--#  define _SORT_R_BSD
--#elif (defined _GNU_SOURCE || defined __gnu_hurd__ || defined __GNU__ || \
+-#if (defined __gnu_hurd__ || defined __GNU__ || \
 -       defined __linux__ || defined __MINGW32__ || defined __GLIBC__)
 -#  define _SORT_R_LINUX
+-#elif (defined __APPLE__ || defined __MACH__ || defined __DARWIN__ || \
+-     defined __FreeBSD__ || defined __DragonFly__)
+-#  define _SORT_R_BSD
 -#elif (defined _WIN32 || defined _WIN64 || defined __WINDOWS__)
 -#  define _SORT_R_WINDOWS
 -#  undef _SORT_R_INLINE
-+
 +#if (defined _WIN32 || defined _WIN64 || defined __WINDOWS__)
  #  define _SORT_R_INLINE __inline
  #else
@@ -40,7 +39,7 @@ index dc17e8af..4c4ebf3b 100644
  #endif
  
  #if (defined NESTED_QSORT && NESTED_QSORT == 0)
-@@ -211,111 +202,6 @@ static _SORT_R_INLINE void sort_r_simple(void *base, size_t nel, size_t w,
+@@ -211,111 +201,6 @@ static _SORT_R_INLINE void sort_r_simple(void *base, size_t nel, size_t w,
    }
  }
  
@@ -153,5 +152,5 @@ index dc17e8af..4c4ebf3b 100644
  
  #endif /* SORT_R_H_ */
 -- 
-2.30.0
+2.32.0
 
diff --git a/pkg/e2fsprogs/src b/pkg/e2fsprogs/src
-Subproject 67f2b54667e65cf5a478fcea8b85722be9ee6e8
+Subproject 2dfad18d8b5c5afa76001ef6a25700dcf2b7411
diff --git a/pkg/e2fsprogs/ver b/pkg/e2fsprogs/ver
index 5e9dccbf..48fdce46 100644
--- a/pkg/e2fsprogs/ver
+++ b/pkg/e2fsprogs/ver
@@ -1 +1 @@
-1.46.2 r0
+1.46.4 r0