diff options
| author | Sören Tempel <soeren+git@soeren-tempel.net> | 2015-11-20 01:33:05 +0100 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-11-20 10:20:56 +0000 |
| commit | f5696a1e01713a5c108224923066a976ae34aba0 (patch) | |
| tree | 6068495bb4fa08132ba1ed20508fc05f4dcac146 /main/btrfs-progs | |
| parent | 159ebd69ecd27839f47799e3b81ea34621293918 (diff) | |
| download | aports-f5696a1e01713a5c108224923066a976ae34aba0.tar.bz2 aports-f5696a1e01713a5c108224923066a976ae34aba0.tar.xz | |
main/btrfs-progs: upgrade to 4.3.1
Diffstat (limited to 'main/btrfs-progs')
| -rw-r--r-- | main/btrfs-progs/APKBUILD | 14 | ||||
| -rw-r--r-- | main/btrfs-progs/musl-compat.patch | 23 |
2 files changed, 19 insertions, 18 deletions
diff --git a/main/btrfs-progs/APKBUILD b/main/btrfs-progs/APKBUILD index 98dda8b2e6..c004bcd099 100644 --- a/main/btrfs-progs/APKBUILD +++ b/main/btrfs-progs/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Łukasz Jendrysik <scadu@yandex.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=btrfs-progs -pkgver=4.3 +pkgver=4.3.1 pkgrel=0 pkgdesc="Tools for the btrfs" url="https://btrfs.wiki.kernel.org/" @@ -62,15 +62,15 @@ completion() { "$subpkgdir"/usr/share/bash-completion/completions/btrfs } -md5sums="2272dfcab5c7e19886485c771da43336 btrfs-progs-v4.3.tar.xz +md5sums="ae04b324a059482e4c7e9710043c4e93 btrfs-progs-v4.3.1.tar.xz a79fe97241a26ec2a4be9fc566fa8e29 includes.patch -13aae8338d103c1bdfab26ee324cfe20 musl-compat.patch +204ac1381fc0c373bc809d6a453615f2 musl-compat.patch f8a34b011e83307b71ca62a319d70a49 0001-use-pthread_join-instead-of-pthread_tryjoin_np.patch" -sha256sums="ab67b29f3de9d58771fd9b23d8feee366fd107c85e82fbdf17f5f0a5bd5ca59c btrfs-progs-v4.3.tar.xz +sha256sums="0cb5ff15deed01cdf5a77f3f61b7dc9d2cd6787bcf6b6b7dcef424d16e8afd3a btrfs-progs-v4.3.1.tar.xz dc66938029c887fd29e69ce53f8acc8ac0f01fa49fede3b08c00f2f7acdb1f2a includes.patch -6ef4d5633aa715095610de3045187ba39daaf5518629eb4e6ef4e143fb486531 musl-compat.patch +fa678596c2979f929447f2fdface52823d9bea93d0f49d086ada07b7e57bae34 musl-compat.patch e1264e4bbe910ee92a45d2a8afe60f812e986b68ccf153559c3e090031256bf5 0001-use-pthread_join-instead-of-pthread_tryjoin_np.patch" -sha512sums="8747ebe6f51220afb59376ba8d3200ef9337a3c84b5103cc69cdaa9dd2bd55787391109ae2bcba53921ce6b547d21eb5f939d00ad0e72301197cec5944e07b20 btrfs-progs-v4.3.tar.xz +sha512sums="661c7c05ee3527cc34f3aa08e88e252e6e836a86752f7e607e3f6dc0a9a861d3bc645a6fa0a5af5f6abfe4f3f2f7e193cffc2bb1c53595e0b7f99c3ff59daeff btrfs-progs-v4.3.1.tar.xz 2040092c94096da283ca69ec0dd910ebd5329840df86e607226cc054e8b29112720c798b63f9630e35ed28c7c057bb433b09d8aec8df8c4793a6f1ecaa8be846 includes.patch -c7634159e591bf969dad8fa51d48668c999de8efc8cb6ff26b7a047b27a8cd18b1a93494dbf6d584afcbc6e3f40ae98ea3a33d188ee16b06ad7eb564efccde9a musl-compat.patch +5c04ef0aa0390aa9b32fc8b8d3d0bfb16c61cb005eb70de8523f8eb709a2422960c1dea3ece11c7ae1442b538ea195b7eacba678a432e9bde7cb074392800af0 musl-compat.patch efce71c7cc550e79c02e886af7b0130dfbdac1b46061d7dca5f0f5a5c39ef46dd0f9ff9e4c33cf2a827e498e7b8c67f0e8c916f7e3097a386e4573e6ca9732c4 0001-use-pthread_join-instead-of-pthread_tryjoin_np.patch" diff --git a/main/btrfs-progs/musl-compat.patch b/main/btrfs-progs/musl-compat.patch index 63e6220007..424c59d901 100644 --- a/main/btrfs-progs/musl-compat.patch +++ b/main/btrfs-progs/musl-compat.patch @@ -1,6 +1,7 @@ ---- a/utils.c -+++ b/utils.c -@@ -833,13 +833,19 @@ +diff -upr btrfs-progs-v4.3.1.orig/utils.c btrfs-progs-v4.3.1/utils.c +--- btrfs-progs-v4.3.1.orig/utils.c 2015-11-20 01:15:32.227019383 +0100 ++++ btrfs-progs-v4.3.1/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 +13,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) + /* |