aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2018-12-05 18:23:11 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2018-12-05 18:23:25 +0000
commit1da104d7a14ed33450a512bdc2b4d7a43484a48a (patch)
tree27f2cf8cd907ccfda268866f264fcd7cdb6ac429 /main
parentd5f0369a8bc736a04b0b0963865618047caee8f9 (diff)
downloadaports-1da104d7a14ed33450a512bdc2b4d7a43484a48a.tar.bz2
aports-1da104d7a14ed33450a512bdc2b4d7a43484a48a.tar.xz
main/xfsprogs: upgrade to 4.19.0
Diffstat (limited to 'main')
-rw-r--r--main/xfsprogs/APKBUILD10
-rw-r--r--main/xfsprogs/fix-mmap.patch32
2 files changed, 38 insertions, 4 deletions
diff --git a/main/xfsprogs/APKBUILD b/main/xfsprogs/APKBUILD
index 38bc7ac206..4cf39e8f36 100644
--- a/main/xfsprogs/APKBUILD
+++ b/main/xfsprogs/APKBUILD
@@ -1,16 +1,17 @@
# Contributor: Valery Kartel <valery.kartel@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=xfsprogs
-pkgver=4.17.0
-pkgrel=1
+pkgver=4.19.0
+pkgrel=0
pkgdesc="XFS filesystem utilities"
url="http://xfs.org/index.php/Main_Page"
arch="all"
license="LGPL"
-makedepends="linux-headers util-linux-dev bash gzip python3"
+makedepends="linux-headers attr-dev util-linux-dev bash gzip python3"
options="!check" # no test suite
subpackages="$pkgname-dev $pkgname-doc $pkgname-libs $pkgname-extra"
source="https://www.kernel.org/pub/linux/utils/fs/xfs/$pkgname/$pkgname-$pkgver.tar.gz
+ fix-mmap.patch
"
builddir="$srcdir/$pkgname-$pkgver"
@@ -49,4 +50,5 @@ extra() {
mv "$pkgdir"/usr "$subpkgdir"/
}
-sha512sums="19bdb9b1698b07d42c52976c17ac8dc95170e59bbd7d74e3d6faadd36cba88ed36a8b0c309052cab01ecb3a14e564b42ea982380b76922401be516d463476548 xfsprogs-4.17.0.tar.gz"
+sha512sums="48ffcdb60a3bd332d5a5837824eb629759ec2d9015b94ac7ee7eef1dab507b2663f3223efc7885cbbe6ef6d721521953d32327688abd7d01f00c66ac5f5c9d29 xfsprogs-4.19.0.tar.gz
+080161b211e20277e44f714961b36064536bb5cce72a6f93fef4996e296a3953d33c1a066ef371ccd5551622357105f9be9086ef917386f5d43f6a211b0bd7c9 fix-mmap.patch"
diff --git a/main/xfsprogs/fix-mmap.patch b/main/xfsprogs/fix-mmap.patch
new file mode 100644
index 0000000000..d0740f695b
--- /dev/null
+++ b/main/xfsprogs/fix-mmap.patch
@@ -0,0 +1,32 @@
+diff --git a/io/mmap.c b/io/mmap.c
+index f9383e5..12f3fff 100644
+--- a/io/mmap.c
++++ b/io/mmap.c
+@@ -4,10 +4,10 @@
+ * All Rights Reserved.
+ */
+
+-#include "command.h"
+-#include "input.h"
+ #include <sys/mman.h>
+ #include <signal.h>
++#include "command.h"
++#include "input.h"
+ #include "init.h"
+ #include "io.h"
+
+@@ -20,6 +20,14 @@ static cmdinfo_t mwrite_cmd;
+ 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;