From 31db7d2062e4b720957b74c4ae30e2e509447f42 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@voidlinux.eu>
Date: Sun, 22 Nov 2015 09:27:26 +0100
Subject: [PATCH] btrfs-progs: update to 4.3.1.

---
 ...d_join-instead-of-pthread_tryjoin_np.patch | 11 ++++++++++
 srcpkgs/btrfs-progs/patches/musl-compat.patch | 22 +++++++++----------
 srcpkgs/btrfs-progs/template                  |  7 +++---
 3 files changed, 25 insertions(+), 15 deletions(-)
 create mode 100644 srcpkgs/btrfs-progs/patches/0001-use-pthread_join-instead-of-pthread_tryjoin_np.patch

diff --git a/srcpkgs/btrfs-progs/patches/0001-use-pthread_join-instead-of-pthread_tryjoin_np.patch b/srcpkgs/btrfs-progs/patches/0001-use-pthread_join-instead-of-pthread_tryjoin_np.patch
new file mode 100644
index 00000000000..5ea6daa16d4
--- /dev/null
+++ b/srcpkgs/btrfs-progs/patches/0001-use-pthread_join-instead-of-pthread_tryjoin_np.patch
@@ -0,0 +1,11 @@
+--- chunk-recover.c.orig
++++ chunk-recover.c
+@@ -883,7 +883,7 @@
+ 		for (i = 0; i < devidx; i++) {
+ 			if (dev_scans[i].bytenr == -1)
+ 				continue;
+-			ret = pthread_tryjoin_np(t_scans[i],
++			ret = pthread_join(t_scans[i],
+ 						 (void **)&t_rets[i]);
+ 			if (ret == EBUSY) {
+ 				all_done = 0;
diff --git a/srcpkgs/btrfs-progs/patches/musl-compat.patch b/srcpkgs/btrfs-progs/patches/musl-compat.patch
index dbe5466e56a..99b45ed4f24 100644
--- a/srcpkgs/btrfs-progs/patches/musl-compat.patch
+++ b/srcpkgs/btrfs-progs/patches/musl-compat.patch
@@ -1,6 +1,6 @@
---- utils.c
-+++ utils.c
-@@ -833,13 +833,19 @@
+--- utils.c	2015-11-20 01:15:32.227019383 +0100
++++ utils.c	2015-11-20 01:16:59.419971215 +0100
+@@ -1208,13 +1208,19 @@ static int resolve_loop_device(const cha
  {
  	int ret;
  	FILE *f;
@@ -12,12 +12,12 @@
  	if (!realpath(loop_dev, real_loop_dev))
  		return -errno;
 -	snprintf(p, PATH_MAX, "/sys/block/%s/loop/backing_file", strrchr(real_loop_dev, '/'));
-+	
-+        if (stat(real_loop_dev, &stat_buf) || !S_ISBLK(stat_buf.st_mode))
-+                return -errno;
 +
-+        snprintf(p, PATH_MAX, "/sys/dev/block/%d:%d/loop/backing_file",
-+                major(stat_buf.st_rdev), minor(stat_buf.st_rdev));
- 	if (!(f = fopen(p, "r")))
- 		return -errno;
- 
++	if (stat(real_loop_dev, &stat_buf) || !S_ISBLK(stat_buf.st_mode))
++		return -errno;
++
++	snprintf(p, PATH_MAX, "/sys/dev/block/%d:%d/loop/backing_file",
++		major(stat_buf.st_rdev), minor(stat_buf.st_rdev));
+ 	if (!(f = fopen(p, "r"))) {
+ 		if (errno == ENOENT)
+ 			/*
diff --git a/srcpkgs/btrfs-progs/template b/srcpkgs/btrfs-progs/template
index 69d1eb61607..17e4f187687 100644
--- a/srcpkgs/btrfs-progs/template
+++ b/srcpkgs/btrfs-progs/template
@@ -1,8 +1,7 @@
 # Template file for 'btrfs-progs'
 pkgname=btrfs-progs
-reverts=20141006.4.0.1_1
-version=4.1.2
-revision=2
+version=4.3.1
+revision=1
 wrksrc=${pkgname}-v${version}
 build_style=gnu-configure
 configure_args="--disable-backtrace"
@@ -13,7 +12,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="GPL-2"
 homepage="http://btrfs.wiki.kernel.org/"
 distfiles="${KERNEL_SITE}/kernel/people/kdave/${pkgname}/${pkgname}-v${version}.tar.xz"
-checksum=62db60c6a0868afb6302112cea54c756873bc30b826696b167ec03ecd61b2f12
+checksum=0cb5ff15deed01cdf5a77f3f61b7dc9d2cd6787bcf6b6b7dcef424d16e8afd3a
 
 pre_configure() {
 	NOCONFIGURE=1 ./autogen.sh