From af151792fa0ed6cc025d6ab062cbadf226a32041 Mon Sep 17 00:00:00 2001
From: Luis Ressel <aranea@aixah.de>
Date: Tue, 9 Jul 2019 17:21:43 +0200
Subject: user/nftables: Bump to 0.9.1

---
 user/nftables/APKBUILD          | 16 ++++++++++++----
 user/nftables/asciidoctor.patch | 28 ++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 4 deletions(-)
 create mode 100644 user/nftables/asciidoctor.patch

(limited to 'user/nftables')

diff --git a/user/nftables/APKBUILD b/user/nftables/APKBUILD
index 13cd0a2a2..fb6e7a0ff 100644
--- a/user/nftables/APKBUILD
+++ b/user/nftables/APKBUILD
@@ -3,21 +3,28 @@
 # Contributor: Francesco Colista <fcolista@alpinelinux.org>
 # Maintainer: Luis Ressel <aranea@aixah.de>
 pkgname=nftables
-pkgver=0.9.0
+pkgver=0.9.1
 pkgrel=0
 pkgdesc="Netfilter tables userspace tools"
 url="https://netfilter.org/projects/nftables"
 options="!check" # no test suite
 arch="all"
 license="GPL-2.0+ AND GPL-2.0"
-makedepends="bison docbook2x flex gmp-dev libmnl-dev libnftnl-dev"
+makedepends="asciidoctor bison flex gmp-dev libmnl-dev libnftnl-dev"
 subpackages="$pkgname-doc $pkgname-openrc"
 source="https://netfilter.org/projects/nftables/files/$pkgname-$pkgver.tar.bz2
+	asciidoctor.patch
 	nftables.confd
 	nftables.initd"
 
+prepare() {
+	default_prepare
+	autoreconf -vif
+}
+
 build() {
-	DB2MAN=docbook2x-man ./configure \
+	# TODO: Man pages are massively broken with asciidoctor
+	A2X=asciidoctor ./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
@@ -36,6 +43,7 @@ package() {
 	install -Dm644 "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
 }
 
-sha512sums="ba08fd78d79f7df14a7a7d753e8be33f22d892672ad906672d938c66a8fbb0824fd1d083c173132b7d81dd5e3cdd7771364ec714662876cb71eb4f7ad4eaa59c  nftables-0.9.0.tar.bz2
+sha512sums="e14b75197ba3fea2a46c090450bf8b45b39fdc20db67bab1d6919c90128dee8ea8bbe9508e070f86b22ec70bcad8ab584fb89630a2240f09683137471c77d242  nftables-0.9.1.tar.bz2
+057786364c69fd3959bb5d38744829e56e91bddec3ff0e0b1c0bbbd818a7a49acb8077085e8eb8de88c155cfa6d8a34f1bdfb2ef27d73f3de11ec39d9fbbfe41  asciidoctor.patch
 4eb1adf003dfcaad65c91af6ca88d91b7904c471aefae67e7d3c2f8e053e1ac196d3437a45d1fed5a855b876a0f1fc58a724e381d2acf1164d9120cadee73eef  nftables.confd
 58daafb012b7cd0248a7db6e10f6a667e683347aaea7eaa78cb88780272f334e00913cea3fd39a22a4a72acc27fabd101944b40916f4b534ddeb509bd0232017  nftables.initd"
diff --git a/user/nftables/asciidoctor.patch b/user/nftables/asciidoctor.patch
new file mode 100644
index 000000000..7a7ed0fd7
--- /dev/null
+++ b/user/nftables/asciidoctor.patch
@@ -0,0 +1,28 @@
+From ee7aad965b044bb555dc9fe27991c0e05f14e7dc Mon Sep 17 00:00:00 2001
+From: Luis Ressel <aranea@aixah.de>
+Date: Tue, 9 Jul 2019 18:02:57 +0200
+Subject: [PATCH] We're using asciidoctor instead of a2x; adjust options
+ accordingly
+
+This needs more work; asciidoctor doesn't process nftables' asciidoc
+markup correctly.
+---
+ doc/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index 01e1af9..7776932 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -2,7 +2,7 @@ if BUILD_MAN
+ man_MANS = nft.8 libnftables-json.5 libnftables.3
+ endif
+ 
+-A2X_OPTS_MANPAGE = --doctype manpage --format manpage -D ${builddir}
++A2X_OPTS_MANPAGE = --doctype manpage --backend manpage -D ${builddir}
+ 
+ ASCIIDOC_MAIN = nft.txt
+ ASCIIDOC_INCLUDES = \
+-- 
+2.22.0
+
-- 
cgit v1.2.3-60-g2f50