commit: a43ee010d30c6df16bca8fd54ac4ee7237a8556b
parent 5a16a03f710622b2d095e65db31f85a14685b7c0
Author: Michael Forney <mforney@mforney.org>
Date: Sun, 23 Dec 2018 13:13:12 -0800
e2fsprogs: Update to 1.44.5
Diffstat:
4 files changed, 2 insertions(+), 271 deletions(-)
diff --git a/.gitmodules b/.gitmodules
@@ -33,7 +33,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/config.h b/pkg/e2fsprogs/config.h
@@ -78,7 +78,7 @@
#define HAVE_LIMITS_H 1
#define HAVE_LINUX_FALLOC_H 1
#define HAVE_LINUX_FD_H 1
-/* #undef HAVE_LINUX_FSMAP_H */
+#define HAVE_LINUX_FSMAP_H 1
#define HAVE_LINUX_LOOP_H 1
#define HAVE_LINUX_MAJOR_H 1
#define HAVE_LINUX_TYPES_H 1
diff --git a/pkg/e2fsprogs/patch/0001-Revert-Fix-compile-error-and-warnings-for-old-gcc-ve.patch b/pkg/e2fsprogs/patch/0001-Revert-Fix-compile-error-and-warnings-for-old-gcc-ve.patch
@@ -1,268 +0,0 @@
-From e076e3f3fa9f850ec62d6b6f8011f7cac13f98ea Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Tue, 21 Aug 2018 19:15:17 -0700
-Subject: [PATCH] Revert "Fix compile error and warnings for old gcc versions"
-
-This reverts commit fddc423dc6353552772969d70cec08e8378d8e57.
----
- debugfs/set_fields.c | 4 ----
- e2fsck/problem.c | 4 ----
- lib/ext2fs/ext4_acl.h | 4 ----
- lib/ext2fs/fiemap.h | 4 ----
- lib/ext2fs/hashmap.h | 4 ----
- lib/ext2fs/mmp.c | 4 ----
- lib/ext2fs/unix_io.c | 4 ----
- lib/uuid/gen_uuid.c | 4 ----
- misc/e2undo.c | 4 ----
- misc/filefrag.c | 4 ----
- misc/fuse2fs.c | 4 ----
- 11 files changed, 44 deletions(-)
-
-diff --git a/debugfs/set_fields.c b/debugfs/set_fields.c
-index e1e23a5d..65949060 100644
---- a/debugfs/set_fields.c
-+++ b/debugfs/set_fields.c
-@@ -75,10 +75,8 @@ static errcode_t parse_gd_csum(struct field_set_info *info, char *field, char *a
- static errcode_t parse_mmp_clear(struct field_set_info *info, char *field,
- char *arg);
-
--#if __GNUC_PREREQ (4, 6)
- #pragma GCC diagnostic push
- #pragma GCC diagnostic ignored "-Wmissing-field-initializers"
--#endif
-
- static struct field_set_info super_fields[] = {
- { "inodes_count", &set_sb.s_inodes_count, NULL, 4, parse_uint },
-@@ -291,9 +289,7 @@ static struct field_set_info mmp_fields[] = {
- { "checksum", &set_mmp.mmp_checksum, NULL, 4, parse_uint },
- { 0, 0, 0, 0 }
- };
--#if __GNUC_PREREQ (4, 6)
- #pragma GCC diagnostic pop
--#endif
-
- #ifdef UNITTEST
-
-diff --git a/e2fsck/problem.c b/e2fsck/problem.c
-index 0f603963..ddd8c1c4 100644
---- a/e2fsck/problem.c
-+++ b/e2fsck/problem.c
-@@ -99,10 +99,8 @@ static const char *preen_msg[] = {
- "", /* 20 */
- };
-
--#if __GNUC_PREREQ (4, 6)
- #pragma GCC diagnostic push
- #pragma GCC diagnostic ignored "-Wmissing-field-initializers"
--#endif
-
- static struct e2fsck_problem problem_table[] = {
-
-@@ -2094,9 +2092,7 @@ static struct latch_descr pr_latch_info[] = {
- { PR_LATCH_OPTIMIZE_EXT, PR_1E_OPTIMIZE_EXT_HEADER, PR_1E_OPTIMIZE_EXT_END },
- { -1, 0, 0 },
- };
--#if __GNUC_PREREQ (4, 6)
- #pragma GCC diagnostic pop
--#endif
-
- static struct e2fsck_problem *find_problem(problem_t code)
- {
-diff --git a/lib/ext2fs/ext4_acl.h b/lib/ext2fs/ext4_acl.h
-index 8d4d9745..1f5245de 100644
---- a/lib/ext2fs/ext4_acl.h
-+++ b/lib/ext2fs/ext4_acl.h
-@@ -50,13 +50,9 @@ typedef struct {
-
- typedef struct {
- __le32 a_version;
--#if __GNUC_PREREQ (4, 8)
- #pragma GCC diagnostic push
- #pragma GCC diagnostic ignored "-Wpedantic"
--#endif
- posix_acl_xattr_entry a_entries[0];
--#if __GNUC_PREREQ (4, 8)
- #pragma GCC diagnostic pop
--#endif
- } posix_acl_xattr_header;
-
-diff --git a/lib/ext2fs/fiemap.h b/lib/ext2fs/fiemap.h
-index 0d1072ac..5c851b24 100644
---- a/lib/ext2fs/fiemap.h
-+++ b/lib/ext2fs/fiemap.h
-@@ -31,14 +31,10 @@ struct fiemap {
- __u32 fm_mapped_extents;/* number of extents that were mapped (out) */
- __u32 fm_extent_count; /* size of fm_extents array (in) */
- __u32 fm_reserved;
--#if __GNUC_PREREQ (4, 8)
- #pragma GCC diagnostic push
- #pragma GCC diagnostic ignored "-Wpedantic"
--#endif
- struct fiemap_extent fm_extents[0]; /* array of mapped extents (out) */
--#if __GNUC_PREREQ (4, 8)
- #pragma GCC diagnostic pop
--#endif
- };
-
- #if defined(__linux__) && !defined(FS_IOC_FIEMAP)
-diff --git a/lib/ext2fs/hashmap.h b/lib/ext2fs/hashmap.h
-index 228f4395..be1e8a76 100644
---- a/lib/ext2fs/hashmap.h
-+++ b/lib/ext2fs/hashmap.h
-@@ -17,14 +17,10 @@ struct ext2fs_hashmap {
- struct ext2fs_hashmap_entry *next;
- struct ext2fs_hashmap_entry *list_next;
- struct ext2fs_hashmap_entry *list_prev;
--#if __GNUC_PREREQ (4, 8)
- #pragma GCC diagnostic push
- #pragma GCC diagnostic ignored "-Wpedantic"
--#endif
- } *entries[0];
--#if __GNUC_PREREQ (4, 8)
- #pragma GCC diagnostic pop
--#endif
- };
-
- struct ext2fs_hashmap *ext2fs_hashmap_create(
-diff --git a/lib/ext2fs/mmp.c b/lib/ext2fs/mmp.c
-index 2da935e0..0cf0d0da 100644
---- a/lib/ext2fs/mmp.c
-+++ b/lib/ext2fs/mmp.c
-@@ -34,12 +34,10 @@
- #define O_DIRECT 0
- #endif
-
--#if __GNUC_PREREQ (4, 6)
- #pragma GCC diagnostic push
- #ifndef CONFIG_MMP
- #pragma GCC diagnostic ignored "-Wunused-parameter"
- #endif
--#endif
-
- errcode_t ext2fs_mmp_read(ext2_filsys fs, blk64_t mmp_blk, void *buf)
- {
-@@ -467,6 +465,4 @@ mmp_error:
- return EXT2_ET_OP_NOT_SUPPORTED;
- #endif
- }
--#if __GNUC_PREREQ (4, 6)
- #pragma GCC diagnostic pop
--#endif
-diff --git a/lib/ext2fs/unix_io.c b/lib/ext2fs/unix_io.c
-index 7a4c9bf5..18a2e5f7 100644
---- a/lib/ext2fs/unix_io.c
-+++ b/lib/ext2fs/unix_io.c
-@@ -1127,10 +1127,8 @@ unimplemented:
- }
-
- /* parameters might not be used if OS doesn't support zeroout */
--#if __GNUC_PREREQ (4, 6)
- #pragma GCC diagnostic push
- #pragma GCC diagnostic ignored "-Wunused-parameter"
--#endif
- static errcode_t unix_zeroout(io_channel channel, unsigned long long block,
- unsigned long long count)
- {
-@@ -1197,9 +1195,7 @@ err:
- unimplemented:
- return EXT2_ET_UNIMPLEMENTED;
- }
--#if __GNUC_PREREQ (4, 6)
- #pragma GCC diagnostic pop
--#endif
-
- static struct struct_io_manager struct_unix_manager = {
- .magic = EXT2_ET_MAGIC_IO_MANAGER,
-diff --git a/lib/uuid/gen_uuid.c b/lib/uuid/gen_uuid.c
-index 01983634..43ecc8ae 100644
---- a/lib/uuid/gen_uuid.c
-+++ b/lib/uuid/gen_uuid.c
-@@ -484,12 +484,10 @@ static void close_all_fds(void)
- }
- #endif /* defined(USE_UUIDD) && defined(HAVE_SYS_UN_H) */
-
--#if __GNUC_PREREQ (4, 6)
- #pragma GCC diagnostic push
- #if !defined(USE_UUIDD) || !defined(HAVE_SYS_UN_H)
- #pragma GCC diagnostic ignored "-Wunused-parameter"
- #endif
--#endif
- /*
- * Try using the uuidd daemon to generate the UUID
- *
-@@ -572,9 +570,7 @@ fail:
- #endif
- return -1;
- }
--#if __GNUC_PREREQ (4, 6)
- #pragma GCC diagnostic pop
--#endif
-
- void uuid__generate_time(uuid_t out, int *num)
- {
-diff --git a/misc/e2undo.c b/misc/e2undo.c
-index 71991e05..05937383 100644
---- a/misc/e2undo.c
-+++ b/misc/e2undo.c
-@@ -81,14 +81,10 @@ struct undo_key_block {
- __le32 magic; /* KEYBLOCK_MAGIC number */
- __le32 crc; /* block checksum */
- __le64 reserved; /* zero */
--#if __GNUC_PREREQ (4, 8)
- #pragma GCC diagnostic push
- #pragma GCC diagnostic ignored "-Wpedantic"
--#endif
- struct undo_key keys[0]; /* keys, which come immediately after */
--#if __GNUC_PREREQ (4, 8)
- #pragma GCC diagnostic pop
--#endif
- };
-
- struct undo_key_info {
-diff --git a/misc/filefrag.c b/misc/filefrag.c
-index 56f84ed8..7f1c5bfc 100644
---- a/misc/filefrag.c
-+++ b/misc/filefrag.c
-@@ -535,10 +535,8 @@ int main(int argc, char**argv)
- char *end;
- blocksize = strtoul(optarg, &end, 0);
- if (end) {
--#if __GNUC_PREREQ (7, 0)
- #pragma GCC diagnostic push
- #pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
--#endif
- switch (end[0]) {
- case 'g':
- case 'G':
-@@ -555,9 +553,7 @@ int main(int argc, char**argv)
- default:
- break;
- }
--#if __GNUC_PREREQ (7, 0)
- #pragma GCC diagnostic pop
--#endif
- }
- } else { /* Allow -b without argument for compat. Remove
- * this eventually so "-b {blocksize}" works */
-diff --git a/misc/fuse2fs.c b/misc/fuse2fs.c
-index 5c73895e..056d34ec 100644
---- a/misc/fuse2fs.c
-+++ b/misc/fuse2fs.c
-@@ -118,14 +118,10 @@ typedef struct {
-
- typedef struct {
- u_int32_t a_version;
--#if __GNUC_PREREQ (4, 8)
- #pragma GCC diagnostic push
- #pragma GCC diagnostic ignored "-Wpedantic"
--#endif
- acl_ea_entry a_entries[0];
--#if __GNUC_PREREQ (4, 8)
- #pragma GCC diagnostic pop
--#endif
- } acl_ea_header;
-
- static inline size_t acl_ea_size(int count)
---
-2.18.0
-
diff --git a/pkg/e2fsprogs/rev b/pkg/e2fsprogs/rev
@@ -1 +1 @@
-13
+14
