btrfs-progs: update to 4.16.

Closes #13258.

Signed-off-by: Enno Boland <gottox@voidlinux.eu>
This commit is contained in:
maxice8 2018-04-07 00:32:05 -03:00 committed by Enno Boland
parent dac104c3e7
commit a33456345e
4 changed files with 36 additions and 26 deletions

View file

@ -1,14 +0,0 @@
diff --git a/convert/source-ext2.c b/convert/source-ext2.c
index b1492c78693d..070126ec38ec 100644
--- convert/source-ext2.c
+++ 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;
}

View file

@ -1,21 +1,25 @@
# Template file for 'btrfs-progs'
pkgname=btrfs-progs
version=4.15.1
revision=2
version=4.16
revision=1
wrksrc=${pkgname}-v${version}
build_style=gnu-configure
configure_args="--disable-backtrace"
hostmakedepends="asciidoc automake libtool pkg-config xmlto"
makedepends="acl-devel e2fsprogs-devel libzstd-devel lzo-devel"
hostmakedepends="asciidoc automake libtool pkg-config python3-setuptools xmlto"
makedepends="acl-devel e2fsprogs-devel libzstd-devel lzo-devel python3-devel"
checkdepends="acl-progs e2fsprogs util-linux"
short_desc="Btrfs filesystem utilities"
maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="GPL-2.0-only"
license="GPL-2.0-only, LGPL-3.0-or-later"
homepage="http://btrfs.wiki.kernel.org/"
distfiles="${KERNEL_SITE}/kernel/people/kdave/${pkgname}/${pkgname}-v${version}.tar.xz"
checksum=67102ac0d6795f368acc94efaca29b6626d972638790a4a0c9f89a27cd543f96
checksum=f3e0ec4864b7b89db1a6a36fa48bf8a9217117714a04b13c84d0fea1eac154b2
make_check_target="test"
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" python3-devel"
fi
pre_configure() {
NOCONFIGURE=1 ./autogen.sh
}
@ -41,17 +45,35 @@ post_install() {
}
libbtrfs_package() {
short_desc+=" - runtime library"
short_desc+=" - btrfs library"
pkg_install() {
vmove "usr/lib/*.so.*"
vmove "usr/lib/libbtrfs.so.*"
}
}
libbtrfs-devel_package() {
short_desc+=" - development files"
short_desc+=" - libbtrfs development files"
depends="libbtrfs>=${version}_${revision}"
pkg_install() {
vmove usr/include
vmove "usr/lib/*.a"
vmove "usr/lib/*.so"
vmove usr/include/btrfs
vmove usr/lib/libbtrfs.a
vmove usr/lib/libbtrfs.so
}
}
libbtrfsutil_package() {
short_desc+=" - btrfsutil library"
pkg_install() {
vmove "usr/lib/libbtrfsutil.so.*"
}
}
libbtrfsutil-devel_package() {
depends="libbtrfsutil-${version}_${revision}"
short_desc+=" - libbtrfsutil development files"
pkg_install() {
vmove usr/include/btrfsutil.h
vmove usr/lib/libbtrfsutil.a
vmove usr/lib/libbtrfsutil.so
}
}

1
srcpkgs/libbtrfsutil Symbolic link
View file

@ -0,0 +1 @@
btrfs-progs

1
srcpkgs/libbtrfsutil-devel Symbolic link
View file

@ -0,0 +1 @@
btrfs-progs