summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--system/e2fsprogs/APKBUILD6
-rw-r--r--system/e2fsprogs/header-fix.patch29
2 files changed, 9 insertions, 26 deletions
diff --git a/system/e2fsprogs/APKBUILD b/system/e2fsprogs/APKBUILD
index 9a3679b33..c3e228d7d 100644
--- a/system/e2fsprogs/APKBUILD
+++ b/system/e2fsprogs/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Valery Kartel <valery.kartel@gmail.com>
# Maintainer:
pkgname=e2fsprogs
-pkgver=1.45.0
+pkgver=1.45.2
pkgrel=0
pkgdesc="Standard ext2/3/4 filesystem utilities"
url="http://e2fsprogs.sourceforge.net"
@@ -54,5 +54,5 @@ libcom_err() {
mv "$pkgdir"/lib/libcom_err* "$subpkgdir"/lib/
}
-sha512sums="208f0508dd355f29f9428758123e84d7f73d1a0bba4fcdc5abb561dc492ed1ab7e36ce369acde5c26e9efff0b980d75047d2d5910d3e49614cc68ec770dc9014 e2fsprogs-1.45.0.tar.xz
-e24dc45a68b0bd57cf4b8a90ecf35f48ded8731293750723c2cfe1e156ddcf747691452fb5aaf69858063dc467592341c8ff2445f924a6d9c62b8c1e1773625e header-fix.patch"
+sha512sums="50fdb7769c789fb143b2e4bd56e6b55eac8f84be5b7074008134fa56d980342c2307e62380f9ba6a8ab9bbc6bbf45b349aad540c8f239cf859706fd33e521e5e e2fsprogs-1.45.2.tar.xz
+34ca45c64a132bb4b507cd4ffb763c6d1b7979eccfed20f63417e514871b47639d32f2a3ecff090713c21a0f02ac503d5093960c80401d64081c592d01af279d header-fix.patch"
diff --git a/system/e2fsprogs/header-fix.patch b/system/e2fsprogs/header-fix.patch
index e3f4fe3b5..a2d0e661b 100644
--- a/system/e2fsprogs/header-fix.patch
+++ b/system/e2fsprogs/header-fix.patch
@@ -1,20 +1,3 @@
---- e2fsprogs-1.44.4/lib/ext2fs/hashmap.h.old 2018-10-22 22:12:54.700000000 +0000
-+++ e2fsprogs-1.44.4/lib/ext2fs/hashmap.h 2018-10-22 22:13:49.010000000 +0000
-@@ -17,12 +17,12 @@
- struct ext2fs_hashmap_entry *next;
- struct ext2fs_hashmap_entry *list_next;
- struct ext2fs_hashmap_entry *list_prev;
--#if __GNUC_PREREQ (4, 8)
-+#if defined(__GNUC__) && ((__GNUC__ == 4 && __GNUC_MINOR__ >= 8) || __GNUC__ > 4)
- #pragma GCC diagnostic push
- #pragma GCC diagnostic ignored "-Wpedantic"
- #endif
- } *entries[0];
--#if __GNUC_PREREQ (4, 8)
-+#if defined(__GNUC__) && ((__GNUC__ == 4 && __GNUC_MINOR__ >= 8) || __GNUC__ > 4)
- #pragma GCC diagnostic pop
- #endif
- };
--- e2fsprogs-1.44.4/misc/e2undo.c.old 2018-08-19 02:26:58.000000000 +0000
+++ e2fsprogs-1.44.4/misc/e2undo.c 2018-10-22 22:25:35.130000000 +0000
@@ -81,12 +81,12 @@
@@ -34,7 +17,7 @@
};
--- e2fsprogs-1.44.4/misc/filefrag.c.old 2018-08-19 02:26:58.000000000 +0000
+++ e2fsprogs-1.44.4/misc/filefrag.c 2018-10-22 22:26:04.730000000 +0000
-@@ -535,7 +535,7 @@
+@@ -537,7 +537,7 @@
char *end;
blocksize = strtoul(optarg, &end, 0);
if (end) {
@@ -43,7 +26,7 @@
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
#endif
-@@ -555,7 +555,7 @@
+@@ -557,7 +557,7 @@
default:
break;
}
@@ -88,7 +71,7 @@
} posix_acl_xattr_header;
--- e2fsprogs-1.44.4/lib/ext2fs/unix_io.c.old 2018-08-19 02:26:58.000000000 +0000
+++ e2fsprogs-1.44.4/lib/ext2fs/unix_io.c 2018-10-22 22:20:38.770000000 +0000
-@@ -1127,7 +1127,7 @@
+@@ -1152,7 +1152,7 @@
}
/* parameters might not be used if OS doesn't support zeroout */
@@ -97,7 +80,7 @@
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#endif
-@@ -1197,7 +1197,7 @@
+@@ -1204,7 +1204,7 @@
unimplemented:
return EXT2_ET_UNIMPLEMENTED;
}
@@ -127,7 +110,7 @@
#endif
--- e2fsprogs-1.44.4/debugfs/set_fields.c.old 2018-08-19 02:26:58.000000000 +0000
+++ e2fsprogs-1.44.4/debugfs/set_fields.c 2018-10-22 22:22:34.510000000 +0000
-@@ -75,7 +75,8 @@
+@@ -79,7 +79,8 @@
static errcode_t parse_mmp_clear(struct field_set_info *info, char *field,
char *arg);
@@ -137,7 +120,7 @@
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
#endif
-@@ -291,7 +292,7 @@
+@@ -296,7 +297,7 @@
{ "checksum", &set_mmp.mmp_checksum, NULL, 4, parse_uint },
{ 0, 0, 0, 0 }
};