aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakub Jirutka <jakub@jirutka.cz>2016-12-05 16:43:17 +0100
committerJakub Jirutka <jakub@jirutka.cz>2016-12-05 16:45:40 +0100
commit2dd76425f7b3b3e821ca2755da3e40952baacb8c (patch)
tree6dc7e3fe15d83e5774197175d6840d82db941cf7
parent0d4e026be7181aacdd22cb2dd1aa28b43d597f17 (diff)
downloadalpine_aports-2dd76425f7b3b3e821ca2755da3e40952baacb8c.tar.bz2
alpine_aports-2dd76425f7b3b3e821ca2755da3e40952baacb8c.tar.xz
alpine_aports-2dd76425f7b3b3e821ca2755da3e40952baacb8c.zip
main/btrfs-progs: upgrade to 4.8.5
-rw-r--r--main/btrfs-progs/APKBUILD14
-rw-r--r--main/btrfs-progs/includes.patch8
2 files changed, 11 insertions, 11 deletions
diff --git a/main/btrfs-progs/APKBUILD b/main/btrfs-progs/APKBUILD
index 9193ee2aeb..40816ef9d8 100644
--- a/main/btrfs-progs/APKBUILD
+++ b/main/btrfs-progs/APKBUILD
@@ -2,7 +2,7 @@
2# Contributor: Łukasz Jendrysik <scadu@yandex.com> 2# Contributor: Łukasz Jendrysik <scadu@yandex.com>
3# Maintainer: Natanael Copa <ncopa@alpinelinux.org> 3# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
4pkgname=btrfs-progs 4pkgname=btrfs-progs
5pkgver=4.7.3 5pkgver=4.8.5
6pkgrel=0 6pkgrel=0
7pkgdesc="BTRFS filesystem utilities" 7pkgdesc="BTRFS filesystem utilities"
8url="https://btrfs.wiki.kernel.org/" 8url="https://btrfs.wiki.kernel.org/"
@@ -69,12 +69,12 @@ extra() {
69 rmdir "$subpkgdir"/usr/lib 69 rmdir "$subpkgdir"/usr/lib
70} 70}
71 71
72md5sums="b2dc5175a721247d982be6d98e1e7525 btrfs-progs-v4.7.3.tar.xz 72md5sums="c2be5b040bd8605be7e98a907a043e45 btrfs-progs-v4.8.5.tar.xz
73a79fe97241a26ec2a4be9fc566fa8e29 includes.patch 7399a7512615927bbb983afe29c7f09813 includes.patch
74204ac1381fc0c373bc809d6a453615f2 musl-compat.patch" 74204ac1381fc0c373bc809d6a453615f2 musl-compat.patch"
75sha256sums="90cd6f0ce5a8bed5fcd6ea8a70d81de4a038163035d48a9ae0339bbf51df771c btrfs-progs-v4.7.3.tar.xz 75sha256sums="d247b1c022aca5def3415bfa51e00c566cce36660a3ee517d4b6a1af911a08ef btrfs-progs-v4.8.5.tar.xz
76dc66938029c887fd29e69ce53f8acc8ac0f01fa49fede3b08c00f2f7acdb1f2a includes.patch 76148785bbdf3d029ebd34fa3b8b248a92cf2866f117d3a3f1895cf81ea6c8b7e7 includes.patch
77fa678596c2979f929447f2fdface52823d9bea93d0f49d086ada07b7e57bae34 musl-compat.patch" 77fa678596c2979f929447f2fdface52823d9bea93d0f49d086ada07b7e57bae34 musl-compat.patch"
78sha512sums="2609bfa90483a14daf33b77f4f1560ca75de602ad3d4ce705a95f1aebbec016574db91b0287287622e49d199507c90243eb6739bb5719a5f99557f8f3e8e2c1a btrfs-progs-v4.7.3.tar.xz 78sha512sums="497c221fe329febc7cca777e347e8ab6ebb368070d35cb5122214bcf928eb2e7e854f7b0af5bc846f0d34ad84dfb33b372d24bf947ca0b15cb83291c390c664b btrfs-progs-v4.8.5.tar.xz
792040092c94096da283ca69ec0dd910ebd5329840df86e607226cc054e8b29112720c798b63f9630e35ed28c7c057bb433b09d8aec8df8c4793a6f1ecaa8be846 includes.patch 7996aa477d0879f1c94d51ce5cc8f31e8bc304a08788684b3837f96ba6aa622f94917f22c731f2e431fd10c84f3828bb16d6eb9a20ee128df5810a41d8df5e7aa4 includes.patch
805c04ef0aa0390aa9b32fc8b8d3d0bfb16c61cb005eb70de8523f8eb709a2422960c1dea3ece11c7ae1442b538ea195b7eacba678a432e9bde7cb074392800af0 musl-compat.patch" 805c04ef0aa0390aa9b32fc8b8d3d0bfb16c61cb005eb70de8523f8eb709a2422960c1dea3ece11c7ae1442b538ea195b7eacba678a432e9bde7cb074392800af0 musl-compat.patch"
diff --git a/main/btrfs-progs/includes.patch b/main/btrfs-progs/includes.patch
index 6836acb506..c3e4bc4097 100644
--- a/main/btrfs-progs/includes.patch
+++ b/main/btrfs-progs/includes.patch
@@ -1,7 +1,7 @@
1diff --git a/bitops.h b/bitops.h 1diff --git a/bitops.h b/bitops.h
2index 323c571..7f30b06 100644 2index 323c571..7f30b06 100644
3--- a/bitops.h 3--- a/kernel-lib/bitops.h
4+++ b/bitops.h 4+++ b/kernel-lib/bitops.h
5@@ -65,6 +65,9 @@ static inline unsigned long hweight_long(unsigned long w) 5@@ -65,6 +65,9 @@ static inline unsigned long hweight_long(unsigned long w)
6 } 6 }
7 7
@@ -24,8 +24,8 @@ index bb03194e127e..28f832a2e625 100644
24 #include <stdint.h> 24 #include <stdint.h>
25 25
26 #define ptr_to_u64(x) ((u64)(uintptr_t)x) 26 #define ptr_to_u64(x) ((u64)(uintptr_t)x)
27--- a/rbtree.h 27--- a/kernel-lib/rbtree.h
28+++ b/rbtree.h 28+++ b/kernel-lib/rbtree.h
29@@ -38,6 +38,10 @@ 29@@ -38,6 +38,10 @@
30 extern "C" { 30 extern "C" {
31 #endif 31 #endif