commit: d545550d4d2a92b6dfdfa3a20e4509c72e0ba9f3
parent 5a2f2d11116a20beffa1b278c4b56c07833f7b1d
Author: Michael Forney <mforney@mforney.org>
Date: Fri, 29 Jan 2021 14:01:15 -0800
e2fsprogs: Update to 1.45.7
Diffstat:
6 files changed, 3 insertions(+), 102 deletions(-)
diff --git a/.gitmodules b/.gitmodules
@@ -58,7 +58,6 @@
[submodule "pkg/e2fsprogs/src"]
path = pkg/e2fsprogs/src
url = https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git
- ignore = all
[submodule "pkg/efibootmgr/src"]
path = pkg/efibootmgr/src
url = https://github.com/rhinstaller/efibootmgr
diff --git a/pkg/e2fsprogs/gen.lua b/pkg/e2fsprogs/gen.lua
@@ -1,4 +1,4 @@
-set('version', '1.45.6')
+set('version', '1.45.7')
cflags{
'-std=c99', '-Wall',
'-Wno-address-of-packed-member', '-Wno-format-truncation', '-Wno-format-overflow',
@@ -23,7 +23,7 @@ build('cat', '$outdir/config.h', {
set('subst', {
'-e s,@E2FSPROGS_VERSION@,$version,',
'-e s,@E2FSPROGS_MONTH@,Jan,',
- '-e s,@E2FSPROGS_YEAR@,2020,',
+ '-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
@@ -1,29 +0,0 @@
-From 01d05e00694f0488236ac766a5fcfa37a17bec64 Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Sat, 4 Apr 2020 21:38:29 -0700
-Subject: [PATCH] libext2fs: avoid pointer arithmetic on `void *`
-
-The pointer operand to the binary `+` operator must be to a complete
-object type.
-
-Signed-off-by: Michael Forney <mforney@mforney.org>
----
- lib/ext2fs/csum.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/ext2fs/csum.c b/lib/ext2fs/csum.c
-index a7172580..54b53a3c 100644
---- a/lib/ext2fs/csum.c
-+++ b/lib/ext2fs/csum.c
-@@ -274,7 +274,7 @@ static errcode_t __get_dirent_tail(ext2_filsys fs,
- rec_len = translate(d->rec_len);
- }
-
-- if ((void *)d > ((void *)dirent + fs->blocksize))
-+ if ((char *)d > ((char *)dirent + fs->blocksize))
- return EXT2_ET_DIR_CORRUPTED;
- if (d != top)
- return EXT2_ET_DIR_NO_SPACE_FOR_CSUM;
---
-2.26.0
-
diff --git a/pkg/e2fsprogs/patch/0002-Fix-format-specifier-in-error-message.patch b/pkg/e2fsprogs/patch/0002-Fix-format-specifier-in-error-message.patch
@@ -1,25 +0,0 @@
-From b346ce6f199dccc18caf26d25473f1841c51007d Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Fri, 5 Jun 2020 01:27:30 -0700
-Subject: [PATCH] Fix format specifier in error message
-
----
- e2fsck/util.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/e2fsck/util.c b/e2fsck/util.c
-index d98b8e47..b0e01cc9 100644
---- a/e2fsck/util.c
-+++ b/e2fsck/util.c
-@@ -126,7 +126,7 @@ void *e2fsck_allocate_memory(e2fsck_t ctx, unsigned long size,
- printf("Allocating %u bytes for %s...\n", size, description);
- #endif
- if (ext2fs_get_memzero(size, &ret)) {
-- sprintf(buf, "Can't allocate %u bytes for %s\n",
-+ sprintf(buf, "Can't allocate %lu bytes for %s\n",
- size, description);
- fatal_error(ctx, buf);
- }
---
-2.27.0
-
diff --git a/pkg/e2fsprogs/patch/0003-Remove-unused-variables.patch b/pkg/e2fsprogs/patch/0003-Remove-unused-variables.patch
@@ -1,44 +0,0 @@
-From 6276beeab62b8dc949b8179f64738ea4958e4870 Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Fri, 5 Jun 2020 01:29:07 -0700
-Subject: [PATCH] Remove unused variables
-
----
- e2fsck/rehash.c | 2 +-
- lib/ext2fs/swapfs.c | 3 +--
- 2 files changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/e2fsck/rehash.c b/e2fsck/rehash.c
-index 1616d07a..b356b92d 100644
---- a/e2fsck/rehash.c
-+++ b/e2fsck/rehash.c
-@@ -109,7 +109,7 @@ static int fill_dir_block(ext2_filsys fs,
- void *priv_data)
- {
- struct fill_dir_struct *fd = (struct fill_dir_struct *) priv_data;
-- struct hash_entry *new_array, *ent;
-+ struct hash_entry *ent;
- struct ext2_dir_entry *dirent;
- char *dir;
- unsigned int offset, dir_offset, rec_len, name_len;
-diff --git a/lib/ext2fs/swapfs.c b/lib/ext2fs/swapfs.c
-index a3d5d16a..56e10c36 100644
---- a/lib/ext2fs/swapfs.c
-+++ b/lib/ext2fs/swapfs.c
-@@ -456,12 +456,11 @@ errcode_t ext2fs_dirent_swab_out2(ext2_filsys fs, char *buf,
- {
- errcode_t retval;
- char *p, *end;
-- unsigned int rec_len, left;
-+ unsigned int rec_len;
- struct ext2_dir_entry *dirent;
-
- p = buf;
- end = buf + size;
-- left = size;
- while (p < end) {
- dirent = (struct ext2_dir_entry *) p;
- retval = ext2fs_get_rec_len(fs, dirent, &rec_len);
---
-2.27.0
-
diff --git a/pkg/e2fsprogs/ver b/pkg/e2fsprogs/ver
@@ -1 +1 @@
-1.45.6 r2
+1.45.7 r0
