aboutsummaryrefslogtreecommitdiffstats
path: root/main/btrfs-progs
diff options
context:
space:
mode:
authorEivind Uggedal <eivind@uggedal.com>2014-08-27 07:23:28 +0000
committerEivind Uggedal <eivind@uggedal.com>2014-08-27 07:23:28 +0000
commit4e109ac04b9fccfc6d6bba44a5091ebb1c237db1 (patch)
tree3556f16e37802ce20e5bef8fa7e2b23110ca75b3 /main/btrfs-progs
parentc319d38800544e9fc70a53e97f8586d911d9acc7 (diff)
downloadaports-4e109ac04b9fccfc6d6bba44a5091ebb1c237db1.tar.bz2
aports-4e109ac04b9fccfc6d6bba44a5091ebb1c237db1.tar.xz
main/btrfs-progs: upgrade to 3.16
Diffstat (limited to 'main/btrfs-progs')
-rw-r--r--main/btrfs-progs/APKBUILD16
-rw-r--r--main/btrfs-progs/includes.patch8
2 files changed, 12 insertions, 12 deletions
diff --git a/main/btrfs-progs/APKBUILD b/main/btrfs-progs/APKBUILD
index 9ad8309361..cfed9a8809 100644
--- a/main/btrfs-progs/APKBUILD
+++ b/main/btrfs-progs/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=btrfs-progs
-pkgver=3.14.2
-pkgrel=1
+pkgver=3.16
+pkgrel=0
pkgdesc="Tools for the btrfs"
url="https://btrfs.wiki.kernel.org/"
arch="all"
@@ -40,12 +40,12 @@ dev() {
mv "$pkgdir"/usr/lib/*.so* "$subpkgdir"/usr/lib
}
-md5sums="18dadb86a668c3fe26b2bcb57bbdf59e btrfs-progs-v3.14.2.tar.xz
-e6e23724e95b3684631385c0f2898cad includes.patch
+md5sums="26035e2ff30513dfeeb2538cacf954b2 btrfs-progs-v3.16.tar.xz
+51609651140dff3766b00d356b05175b includes.patch
13aae8338d103c1bdfab26ee324cfe20 musl-compat.patch"
-sha256sums="70e1d0ca887bfa5062dc74cc5d4556c19adb08453fbfa57edae6802d9c917793 btrfs-progs-v3.14.2.tar.xz
-e4a7f8b749f11e5b7074c014a169cee83c73a7a06f53e3f9ba18e3b7d433e027 includes.patch
+sha256sums="9a7651df6c0430b75fa0637519ca5be29a756684dada241b4398007ae3cb0b5e btrfs-progs-v3.16.tar.xz
+22db993d733e763d55684a58b5aa3757d555c16a9178381bb83acec7abf0eca1 includes.patch
6ef4d5633aa715095610de3045187ba39daaf5518629eb4e6ef4e143fb486531 musl-compat.patch"
-sha512sums="02f0cf7581b41143707769e53debecfdd3f5a1dd717530c33d4a657b09feafd73bb43408516a58fb6d2754365803018673321c7c1898b81bb36194f05a0d8955 btrfs-progs-v3.14.2.tar.xz
-64d9ae9dd3c080a69f80fcd2986f096b881bbfb7c415abfbf7538b334a926da440c4098014a3d8f87a862524c21bc6654a98b5afde3939cefd40b8b4708f9ca1 includes.patch
+sha512sums="dd1f4bc13e62623792121d0f2a2a388be85bae4eec4abc348e0d21949fefa58863e7bf56515dd57022c312ee02d2fa76cc7b1a1c2d78a36532961b22b410a4db btrfs-progs-v3.16.tar.xz
+816482d72d6f6b1dc10ad01858f6d38ad7593e35167000844024cce50cfd3f54d53de0341b66efe912b0f0140c60cb51665843bde1779efb6f65a53bdc20fecb includes.patch
c7634159e591bf969dad8fa51d48668c999de8efc8cb6ff26b7a047b27a8cd18b1a93494dbf6d584afcbc6e3f40ae98ea3a33d188ee16b06ad7eb564efccde9a musl-compat.patch"
diff --git a/main/btrfs-progs/includes.patch b/main/btrfs-progs/includes.patch
index ae69dae492..393399a999 100644
--- a/main/btrfs-progs/includes.patch
+++ b/main/btrfs-progs/includes.patch
@@ -12,8 +12,8 @@ index 323c571..7f30b06 100644
/**
* __ffs - find first bit in word.
-diff --git a/kerncompat.h b/kerncompat.h
-index 1fc2b34..e7d3ca5 100644
+diff --git a/kerncompat.h.orig b/kerncompat.h
+index bb03194e127e..28f832a2e625 100644
--- a/kerncompat.h
+++ b/kerncompat.h
@@ -28,6 +28,7 @@
@@ -21,6 +21,6 @@ index 1fc2b34..e7d3ca5 100644
#include <stddef.h>
#include <linux/types.h>
+#include <linux/limits.h>
+ #include <stdint.h>
- #ifndef READ
- #define READ 0
+ #define ptr_to_u64(x) ((u64)(uintptr_t)x)