From bfebd3d3fec36937f4f85eefbf2292e91cecece6 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 7 Oct 2017 14:26:38 +0200
Subject: [PATCH] apk-tools: update to 2.8.0.
Use bundled libfetch, it's newer than the one Void has.
---
srcpkgs/apk-tools/patches/vfs.patch | 11 -----------
srcpkgs/apk-tools/template | 10 +++-------
2 files changed, 3 insertions(+), 18 deletions(-)
delete mode 100644 srcpkgs/apk-tools/patches/vfs.patch
diff --git a/srcpkgs/apk-tools/patches/vfs.patch b/srcpkgs/apk-tools/patches/vfs.patch
deleted file mode 100644
index 3dfb15b77fd..00000000000
--- a/srcpkgs/apk-tools/patches/vfs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/database.c.orig
-+++ src/database.c
-@@ -26,6 +26,8 @@
- #include <sys/wait.h>
- #include <sys/stat.h>
- #include <sys/mount.h>
-+#include <sys/statvfs.h>
-+#include <sys/sysmacros.h>
- #include <linux/magic.h>
-
- #include "apk_defines.h"
diff --git a/srcpkgs/apk-tools/template b/srcpkgs/apk-tools/template
index 0ed8e739d1e..a7bafd01903 100644
--- a/srcpkgs/apk-tools/template
+++ b/srcpkgs/apk-tools/template
@@ -1,23 +1,19 @@
# Template file for 'apk-tools'
pkgname=apk-tools
-version=2.7.2
+version=2.8.0
revision=1
build_style=gnu-makefile
make_build_args="LUAAPK="
hostmakedepends="pkg-config"
-makedepends="libressl-devel zlib-devel libfetch-devel"
+makedepends="libressl-devel zlib-devel"
short_desc="Alpine Package Keeper (Alpine package manager)"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-2"
homepage="http://git.alpinelinux.org/cgit/apk-tools"
distfiles="http://git.alpinelinux.org/cgit/${pkgname}/snapshot/${pkgname}-${version}.tar.bz2"
-checksum=7e6b8ccd1c4573b90dd835f19836f2514a10ec7d83923a1585f44100fa122592
+checksum=e7f63e88f5f8338b2607c0099ae3c2d91d4fd5ac45969d026570878003e8629e
CFLAGS=-Wno-error
-post_extract() {
- sed -i 's,/usr/lib/libfetch.a,-lfetch,g' src/Makefile
-}
-
do_install() {
vbin src/apk
}