summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--system/xfsprogs/APKBUILD8
-rw-r--r--system/xfsprogs/fix-mmap.patch17
2 files changed, 22 insertions, 3 deletions
diff --git a/system/xfsprogs/APKBUILD b/system/xfsprogs/APKBUILD
index f9547b09e..13c0448d2 100644
--- a/system/xfsprogs/APKBUILD
+++ b/system/xfsprogs/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Valery Kartel <valery.kartel@gmail.com>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=xfsprogs
-pkgver=4.17.0
-pkgrel=1
+pkgver=4.18.0
+pkgrel=0
pkgdesc="XFS filesystem utilities"
url="http://xfs.org/index.php/Main_Page"
arch="all"
@@ -11,6 +11,7 @@ license="GPL-1.0-only"
makedepends="attr-dev bash icu-dev libedit-dev linux-headers util-linux-dev"
subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $pkgname-libs"
source="https://www.kernel.org/pub/linux/utils/fs/xfs/$pkgname/$pkgname-$pkgver.tar.gz
+ fix-mmap.patch
no-utmp-header.patch
"
@@ -39,5 +40,6 @@ package() {
find "$pkgdir" -name *.la -delete
}
-sha512sums="19bdb9b1698b07d42c52976c17ac8dc95170e59bbd7d74e3d6faadd36cba88ed36a8b0c309052cab01ecb3a14e564b42ea982380b76922401be516d463476548 xfsprogs-4.17.0.tar.gz
+sha512sums="c3eac30155b9790e0ca064fb59b33a588c3909eb1a10966d0a9f4554354b8d09582a2874223c4d16bb782b40eecd32468cbfe66762d1d7257e79ddc27add40a8 xfsprogs-4.18.0.tar.gz
+c23d5dca744c4589ede517701fc8ea02f9b7a59568d907269048741806d2e6c9e56ed3493163d63dbf16193ff99471206548b25efcda18e3e5dff14eb38066d4 fix-mmap.patch
272bd64cf6aa3311edfea94c15167313a805bab3a659c231142a02cb7fd87b97c811ba68b1ef77bb5737b2e37defe6a41b234143b0951b13c251abab7186645b no-utmp-header.patch"
diff --git a/system/xfsprogs/fix-mmap.patch b/system/xfsprogs/fix-mmap.patch
new file mode 100644
index 000000000..be2704107
--- /dev/null
+++ b/system/xfsprogs/fix-mmap.patch
@@ -0,0 +1,17 @@
+--- xfsprogs-4.18.0/io/mmap.c.old 2018-08-24 20:17:05.000000000 +0000
++++ xfsprogs-4.18.0/io/mmap.c 2018-11-03 22:13:06.790000000 +0000
+@@ -20,6 +20,14 @@
+ static cmdinfo_t mremap_cmd;
+ #endif /* HAVE_MREMAP */
+
++#ifndef HAVE_MAP_SYNC
++#define MAP_SYNC 0
++#define MAP_SHARED_VALIDATE 0
++#else
++#include <asm-generic/mman.h>
++#include <asm-generic/mman-common.h>
++#endif /* HAVE_MAP_SYNC */
++
+ mmap_region_t *maptable;
+ int mapcount;
+ mmap_region_t *mapping;