diff options
| author | prspkt <prspkt@protonmail.com> | 2018-04-12 16:14:43 +0000 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2018-04-13 05:55:03 +0000 |
| commit | d7e0f101d2cd387ecd11f80c72ef745739237070 (patch) | |
| tree | 4e2ee53eb29e289e12c306859518c0946da4bbd9 /main/btrfs-progs | |
| parent | 3de8c3684041a3a723035b5b3ec6abb52f076ac3 (diff) | |
| download | aports-d7e0f101d2cd387ecd11f80c72ef745739237070.tar.bz2 aports-d7e0f101d2cd387ecd11f80c72ef745739237070.tar.xz | |
main/btrfs-progs: upgrade to 4.16
Diffstat (limited to 'main/btrfs-progs')
| -rw-r--r-- | main/btrfs-progs/APKBUILD | 13 | ||||
| -rw-r--r-- | main/btrfs-progs/includes.patch | 2 | ||||
| -rw-r--r-- | main/btrfs-progs/musl-compat.patch | 2 | ||||
| -rw-r--r-- | main/btrfs-progs/rm-ext2_ext_attr_entry_check.patch | 14 |
4 files changed, 8 insertions, 23 deletions
diff --git a/main/btrfs-progs/APKBUILD b/main/btrfs-progs/APKBUILD index ada6fd1a4e..6bd4d950b2 100644 --- a/main/btrfs-progs/APKBUILD +++ b/main/btrfs-progs/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Łukasz Jendrysik <scadu@yandex.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=btrfs-progs -pkgver=4.15.1 +pkgver=4.16 pkgrel=0 pkgdesc="BTRFS filesystem utilities" url="https://btrfs.wiki.kernel.org" @@ -18,7 +18,6 @@ subpackages="$pkgname-doc $pkgname-dev $pkgname-bash-completion:completion:noarc source="https://www.kernel.org/pub/linux/kernel/people/kdave/$pkgname/$pkgname-v$pkgver.tar.xz includes.patch musl-compat.patch - rm-ext2_ext_attr_entry_check.patch " builddir="$srcdir/$pkgname-v$pkgver" @@ -39,7 +38,8 @@ build() { --mandir=/usr/share/man \ --localstatedir=/var \ --disable-backtrace \ - --disable-zstd + --disable-zstd \ + --disable-python make } @@ -71,7 +71,6 @@ extra() { rmdir "$subpkgdir"/usr/lib } -sha512sums="6e6a9799f6716bbf772d5f0c8069579815060db20d30807e12948e7274448bca09a12c385ea05a95afc23722d12067a8d99623ea0091dca8ae75ea646aa84b88 btrfs-progs-v4.15.1.tar.xz -9f726a9b29d3b03dc3318d176a407707bc2f91b57c4aa7d14ad5389b5494c8860fb7b3b65906272ad9ae4416bccefbaf21e58925d4b27aea0cbb255a82a99962 includes.patch -5c04ef0aa0390aa9b32fc8b8d3d0bfb16c61cb005eb70de8523f8eb709a2422960c1dea3ece11c7ae1442b538ea195b7eacba678a432e9bde7cb074392800af0 musl-compat.patch -3775878284b15ca4d4250bd0ff0429297e8914e5359133185c52f4454f83b43efcf36467f7190f8d6787c92f6a27556bb380c040fbb3192edde155b5cbbe4eee rm-ext2_ext_attr_entry_check.patch" +sha512sums="3d794f890a7772c27c285410892b9de4c0629f6de6cd96e42d1e25c9263dd519d14428eaba75a3595f2d03a1154ffbbfe6a02449d7527a2ab6a1911a8736358e btrfs-progs-v4.16.tar.xz +6a41cdb5dae1983ff0682e152a00007b9a5d03e835195ec4f6ff1005ffceea9178cee672ef1d03c029941d3764b021f6c49b3b82cc4fd383920bdf4faed88d2a includes.patch +056704aa07433e5ae3e5158c668aec7535318613f84cebd4c70237aa253e5585d529cb535203ec6578e3ad9fc9f863e1cf498bb30deeec2d6d557d9318d3e947 musl-compat.patch" diff --git a/main/btrfs-progs/includes.patch b/main/btrfs-progs/includes.patch index 8624cec83e..ac3f835664 100644 --- a/main/btrfs-progs/includes.patch +++ b/main/btrfs-progs/includes.patch @@ -2,7 +2,7 @@ diff --git a/bitops.h b/bitops.h index 323c571..7f30b06 100644 --- a/kernel-lib/bitops.h +++ b/kernel-lib/bitops.h -@@ -65,6 +65,9 @@ static inline unsigned long hweight_long(unsigned long w) +@@ -69,6 +65,9 @@ static inline unsigned long hweight_long(unsigned long w) } #define BITOP_WORD(nr) ((nr) / BITS_PER_LONG) diff --git a/main/btrfs-progs/musl-compat.patch b/main/btrfs-progs/musl-compat.patch index 424c59d901..511a268dba 100644 --- a/main/btrfs-progs/musl-compat.patch +++ b/main/btrfs-progs/musl-compat.patch @@ -1,7 +1,7 @@ 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 +@@ -679,13 +1208,19 @@ static int resolve_loop_device(const cha { int ret; FILE *f; diff --git a/main/btrfs-progs/rm-ext2_ext_attr_entry_check.patch b/main/btrfs-progs/rm-ext2_ext_attr_entry_check.patch deleted file mode 100644 index 403a51ff8c..0000000000 --- a/main/btrfs-progs/rm-ext2_ext_attr_entry_check.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/source-ext2.c b/source-ext2.c -index b1492c7..070126e 100644 ---- a/convert/source-ext2.c -+++ b/convert/source-ext2.c -@@ -422,8 +422,7 @@ static int ext2_xattr_check_entry(struct ext2_ext_attr_entry *entry, - { - size_t value_size = entry->e_value_size; - -- if (entry->e_value_block != 0 || value_size > size || -- entry->e_value_offs + value_size > size) -+ if (value_size > size || entry->e_value_offs + value_size > size) - return -EIO; - return 0; - } |