summaryrefslogtreecommitdiff
path: root/system
diff options
context:
space:
mode:
Diffstat (limited to 'system')
-rw-r--r--system/e2fsprogs/APKBUILD10
-rw-r--r--system/e2fsprogs/header-fix.patch9
2 files changed, 8 insertions, 11 deletions
diff --git a/system/e2fsprogs/APKBUILD b/system/e2fsprogs/APKBUILD
index 211cf9aa9..9a3679b33 100644
--- a/system/e2fsprogs/APKBUILD
+++ b/system/e2fsprogs/APKBUILD
@@ -1,12 +1,11 @@
# Contributor: Valery Kartel <valery.kartel@gmail.com>
# Maintainer:
pkgname=e2fsprogs
-pkgver=1.44.4
+pkgver=1.45.0
pkgrel=0
pkgdesc="Standard ext2/3/4 filesystem utilities"
url="http://e2fsprogs.sourceforge.net"
arch="all"
-options="!checkroot"
license="GPL-2.0-only AND LGPL-2.0-only AND MIT"
depends=""
depends_dev="util-linux-dev"
@@ -17,7 +16,6 @@ source="https://www.kernel.org/pub/linux/kernel/people/tytso/$pkgname/v$pkgver/$
"
build () {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -33,12 +31,10 @@ build () {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make -j1 LDCONFIG=: DESTDIR="$pkgdir" install install-libs
}
@@ -58,5 +54,5 @@ libcom_err() {
mv "$pkgdir"/lib/libcom_err* "$subpkgdir"/lib/
}
-sha512sums="52e39565dee30997b9c245b5d8791844067a903a570082f3a5ff9d9ef96624535322617bb21029056c88259fef46416eb1181bd7aec419e64fc021830887ec8f e2fsprogs-1.44.4.tar.xz
-583c9133ea9df1fdffd2ec3d0234fbb3f36d180172a34ab5d8572434841690a08f1e045e189dc7e46b9396f49d4bd696335ef8625a033f969e26799f9b5c8a5b header-fix.patch"
+sha512sums="208f0508dd355f29f9428758123e84d7f73d1a0bba4fcdc5abb561dc492ed1ab7e36ce369acde5c26e9efff0b980d75047d2d5910d3e49614cc68ec770dc9014 e2fsprogs-1.45.0.tar.xz
+e24dc45a68b0bd57cf4b8a90ecf35f48ded8731293750723c2cfe1e156ddcf747691452fb5aaf69858063dc467592341c8ff2445f924a6d9c62b8c1e1773625e header-fix.patch"
diff --git a/system/e2fsprogs/header-fix.patch b/system/e2fsprogs/header-fix.patch
index cc78a39d0..e3f4fe3b5 100644
--- a/system/e2fsprogs/header-fix.patch
+++ b/system/e2fsprogs/header-fix.patch
@@ -127,16 +127,17 @@
#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,7 @@
+@@ -75,7 +75,8 @@
static errcode_t parse_mmp_clear(struct field_set_info *info, char *field,
char *arg);
--#if __GNUC_PREREQ (4, 6)
-+#if defined(__GNUC__) && ((__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || __GNUC__ > 4)
+-#if __GNUC_PREREQ (4, 6) || defined(__clang__)
++#if defined(__GNUC__) && ((__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || __GNUC__ > 4) \
++ || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
#endif
-@@ -291,7 +291,7 @@
+@@ -291,7 +292,7 @@
{ "checksum", &set_mmp.mmp_checksum, NULL, 4, parse_uint },
{ 0, 0, 0, 0 }
};