diff options
| author | prspkt <prspkt@protonmail.com> | 2018-03-18 06:34:57 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2018-03-26 19:06:32 +0000 |
| commit | cf73b1506002d7d10c6c846278e9f2871e083986 (patch) | |
| tree | f2d8138aca68e458f28ea5b5475651d3b174583e /main/btrfs-progs | |
| parent | cb048d0392e835d8e534a9fe278d18e2874df05f (diff) | |
| download | aports-cf73b1506002d7d10c6c846278e9f2871e083986.tar.bz2 aports-cf73b1506002d7d10c6c846278e9f2871e083986.tar.xz | |
main/btrfs-progs: upgrade to 4.15.1, clarify license
Diffstat (limited to 'main/btrfs-progs')
| -rw-r--r-- | main/btrfs-progs/APKBUILD | 17 | ||||
| -rw-r--r-- | main/btrfs-progs/includes.patch | 23 | ||||
| -rw-r--r-- | main/btrfs-progs/rm-ext2_ext_attr_entry_check.patch | 14 |
3 files changed, 24 insertions, 30 deletions
diff --git a/main/btrfs-progs/APKBUILD b/main/btrfs-progs/APKBUILD index 531ec68708..ada6fd1a4e 100644 --- a/main/btrfs-progs/APKBUILD +++ b/main/btrfs-progs/APKBUILD @@ -2,12 +2,12 @@ # Contributor: Łukasz Jendrysik <scadu@yandex.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=btrfs-progs -pkgver=4.15 +pkgver=4.15.1 pkgrel=0 pkgdesc="BTRFS filesystem utilities" -url="https://btrfs.wiki.kernel.org/" +url="https://btrfs.wiki.kernel.org" arch="all" -license="GPL-2.0" +license="GPL-2.0-or-later" depends="" depends_dev="linux-headers" makedepends="util-linux-dev bash attr-dev acl-dev e2fsprogs-dev zlib-dev @@ -17,7 +17,9 @@ subpackages="$pkgname-doc $pkgname-dev $pkgname-bash-completion:completion:noarc $pkgname-libs $pkgname-extra" source="https://www.kernel.org/pub/linux/kernel/people/kdave/$pkgname/$pkgname-v$pkgver.tar.xz includes.patch - musl-compat.patch" + musl-compat.patch + rm-ext2_ext_attr_entry_check.patch + " builddir="$srcdir/$pkgname-v$pkgver" prepare() { @@ -69,6 +71,7 @@ extra() { rmdir "$subpkgdir"/usr/lib } -sha512sums="7c80fb44c9747e51db89a1d1487e15a1163061b0e85e50a07f28368c1e9e1b32ee2a4f2b769514e1581d1410b7ae5cca8ccd44b5a4e95c32b95e10198aa4f13c btrfs-progs-v4.15.tar.xz -dae1b9a5c9d2e4d45938207e5fdd81fe5d8484bea4242f0a7a5ee9445ae723cfcdb3070f723cf5f2abc434c643a81f59049a1a112379e437bab78040ce4596fe includes.patch -5c04ef0aa0390aa9b32fc8b8d3d0bfb16c61cb005eb70de8523f8eb709a2422960c1dea3ece11c7ae1442b538ea195b7eacba678a432e9bde7cb074392800af0 musl-compat.patch" +sha512sums="6e6a9799f6716bbf772d5f0c8069579815060db20d30807e12948e7274448bca09a12c385ea05a95afc23722d12067a8d99623ea0091dca8ae75ea646aa84b88 btrfs-progs-v4.15.1.tar.xz +9f726a9b29d3b03dc3318d176a407707bc2f91b57c4aa7d14ad5389b5494c8860fb7b3b65906272ad9ae4416bccefbaf21e58925d4b27aea0cbb255a82a99962 includes.patch +5c04ef0aa0390aa9b32fc8b8d3d0bfb16c61cb005eb70de8523f8eb709a2422960c1dea3ece11c7ae1442b538ea195b7eacba678a432e9bde7cb074392800af0 musl-compat.patch +3775878284b15ca4d4250bd0ff0429297e8914e5359133185c52f4454f83b43efcf36467f7190f8d6787c92f6a27556bb380c040fbb3192edde155b5cbbe4eee rm-ext2_ext_attr_entry_check.patch" diff --git a/main/btrfs-progs/includes.patch b/main/btrfs-progs/includes.patch index a0b2c1aae9..8624cec83e 100644 --- a/main/btrfs-progs/includes.patch +++ b/main/btrfs-progs/includes.patch @@ -24,26 +24,3 @@ index bb03194e127e..28f832a2e625 100644 #include <stdint.h> #define ptr_to_u64(x) ((u64)(uintptr_t)x) ---- a/kernel-lib/rbtree.h -+++ b/kernel-lib/rbtree.h -@@ -38,6 +38,10 @@ - extern "C" { - #endif - -+#ifndef __always_inline -+#define __always_inline inline __attribute__((always_inline)) -+#endif -+ - struct rb_node { - unsigned long __rb_parent_color; - struct rb_node *rb_right; ---- a/convert/source-fs.h -+++ b/convert/source-fs.h -@@ -20,6 +20,7 @@ - #include "kerncompat.h" - #include <linux/kdev_t.h> - #include <pthread.h> -+#include <sys/types.h> - - #define CONV_IMAGE_SUBVOL_OBJECTID BTRFS_FIRST_FREE_OBJECTID - diff --git a/main/btrfs-progs/rm-ext2_ext_attr_entry_check.patch b/main/btrfs-progs/rm-ext2_ext_attr_entry_check.patch new file mode 100644 index 0000000000..403a51ff8c --- /dev/null +++ b/main/btrfs-progs/rm-ext2_ext_attr_entry_check.patch @@ -0,0 +1,14 @@ +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; + } |