Subject: [alpine-aports] [PATCH] main/btrfs-progs: update to 4.2.3

From: Stuart Cardall <[email-masked]>
Date: Tue, 3 Nov 2015 23:06:27 +0000

https://btrfs.wiki.kernel.org/index.php/Changelog#btrfs-progs_4.2.3_.28Oct_2015.29
---
 ...thread_join-instead-of-pthread_tryjoin_np.patch | 11 ++++++++
 main/btrfs-progs/APKBUILD                          | 33 ++++++++++++++++------
 2 files changed, 35 insertions(+), 9 deletions(-)
 create mode 100644 main/btrfs-progs/0001-use-pthread_join-instead-of-pthread_tryjoin_np.patch

diff --git a/main/btrfs-progs/0001-use-pthread_join-instead-of-pthread_tryjoin_np.patch b/main/btrfs-progs/0001-use-pthread_join-instead-of-pthread_tryjoin_np.patch
new file mode 100644
index 0000000..a19e07f
--- /dev/null
+++ b/main/btrfs-progs/0001-use-pthread_join-instead-of-pthread_tryjoin_np.patch
@@ -0,0 +1,11 @@
+--- btrfs-progs-v4.2.3/chunk-recover.c
++++ btrfs-progs-v4.2.3/chunk-recover.c.new
+@@ -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/main/btrfs-progs/APKBUILD b/main/btrfs-progs/APKBUILD
index 812310c..615b706 100644
--- a/main/btrfs-progs/APKBUILD
+++ b/main/btrfs-progs/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Łukasz Jendrysik <[email-masked]>
 # Maintainer: Natanael Copa <[email-masked]>
 pkgname=btrfs-progs
-pkgver=4.1.2
+pkgver=4.2.3
 pkgrel=0
 pkgdesc="Tools for the btrfs"
 url="https://btrfs.wiki.kernel.org/"
@@ -12,10 +12,12 @@ makedepends="util-linux-dev bash attr-dev acl-dev e2fsprogs-dev zlib-dev
 	lzo-dev asciidoc xmlto linux-headers
 	autoconf automake libtool"
 install=
-subpackages="$pkgname-doc $pkgname-dev"
+subpackages="$pkgname-doc $pkgname-dev $pkgname-bash-completion:completion"
 source="https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${pkgver}.tar.xz
 	includes.patch
-	musl-compat.patch"
+	musl-compat.patch
+	0001-use-pthread_join-instead-of-pthread_tryjoin_np.patch
+	"
 
 _builddir="$srcdir"/$pkgname-v$pkgver
 prepare() {
@@ -50,12 +52,25 @@ dev() {
 	mv "$pkgdir"/usr/lib/*.so* "$subpkgdir"/usr/lib
 }
 
-md5sums="f6655ea42682487e1beca6c33b787a22  btrfs-progs-v4.1.2.tar.xz
+completion() {
+        depends=""
+        pkgdesc="Bash completion script for $pkgname"
+        install_if="bash $pkgname=$pkgver-r$pkgrel"
+        arch="noarch"
+
+        install -Dm644 "$_builddir"/btrfs-completion \
+                "$subpkgdir"/usr/share/bash-completion/completions/btrfs
+}
+
+md5sums="d5de7d98db5e5a204ee3964ca22b71d5  btrfs-progs-v4.2.3.tar.xz
 a79fe97241a26ec2a4be9fc566fa8e29  includes.patch
-13aae8338d103c1bdfab26ee324cfe20  musl-compat.patch"
-sha256sums="62db60c6a0868afb6302112cea54c756873bc30b826696b167ec03ecd61b2f12  btrfs-progs-v4.1.2.tar.xz
+13aae8338d103c1bdfab26ee324cfe20  musl-compat.patch
+f8a34b011e83307b71ca62a319d70a49  0001-use-pthread_join-instead-of-pthread_tryjoin_np.patch"
+sha256sums="c3c1d13e0725e7991a786c39345506ecb343c28e632aa71d3a9ed06b37b6f33e  btrfs-progs-v4.2.3.tar.xz
 dc66938029c887fd29e69ce53f8acc8ac0f01fa49fede3b08c00f2f7acdb1f2a  includes.patch
-6ef4d5633aa715095610de3045187ba39daaf5518629eb4e6ef4e143fb486531  musl-compat.patch"
-sha512sums="dd159bcc3adb65efd4f612d75f5a6b30df8ad9fa06ef952dd03dac965256de37eab26f4cc2fb3840178403ccbb7368cae11638e27eadb9b1835b636c4b126e2e  btrfs-progs-v4.1.2.tar.xz
+6ef4d5633aa715095610de3045187ba39daaf5518629eb4e6ef4e143fb486531  musl-compat.patch
+e1264e4bbe910ee92a45d2a8afe60f812e986b68ccf153559c3e090031256bf5  0001-use-pthread_join-instead-of-pthread_tryjoin_np.patch"
+sha512sums="ffc159d4358eda616953a96cad3fd43e5f698d0b2f025c7cdadbaacf09fd5bb33f1eba29218b4467a8f7a94afd81e7ebcaf5668bc639905dc3e1f4653ae5c0c1  btrfs-progs-v4.2.3.tar.xz
 2040092c94096da283ca69ec0dd910ebd5329840df86e607226cc054e8b29112720c798b63f9630e35ed28c7c057bb433b09d8aec8df8c4793a6f1ecaa8be846  includes.patch
-c7634159e591bf969dad8fa51d48668c999de8efc8cb6ff26b7a047b27a8cd18b1a93494dbf6d584afcbc6e3f40ae98ea3a33d188ee16b06ad7eb564efccde9a  musl-compat.patch"
+c7634159e591bf969dad8fa51d48668c999de8efc8cb6ff26b7a047b27a8cd18b1a93494dbf6d584afcbc6e3f40ae98ea3a33d188ee16b06ad7eb564efccde9a  musl-compat.patch
+efce71c7cc550e79c02e886af7b0130dfbdac1b46061d7dca5f0f5a5c39ef46dd0f9ff9e4c33cf2a827e498e7b8c67f0e8c916f7e3097a386e4573e6ca9732c4  0001-use-pthread_join-instead-of-pthread_tryjoin_np.patch"
-- 
2.6.1

---
Unsubscribe:  [email-masked]
Help:         [email-masked]
---