summaryrefslogtreecommitdiff
path: root/user/nftables
diff options
context:
space:
mode:
Diffstat (limited to 'user/nftables')
-rw-r--r--user/nftables/APKBUILD20
-rw-r--r--user/nftables/asciidoctor.patch4
2 files changed, 14 insertions, 10 deletions
diff --git a/user/nftables/APKBUILD b/user/nftables/APKBUILD
index fb6e7a0ff..56a056dee 100644
--- a/user/nftables/APKBUILD
+++ b/user/nftables/APKBUILD
@@ -1,21 +1,25 @@
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
# Contributor: Jakub Jirutka <jakub@jirutka.cz>
# Contributor: Francesco Colista <fcolista@alpinelinux.org>
-# Maintainer: Luis Ressel <aranea@aixah.de>
+# Contributor: Mira Ressel <aranea@aixah.de>
+# Maintainer:
pkgname=nftables
-pkgver=0.9.1
+pkgver=0.9.6
pkgrel=0
pkgdesc="Netfilter tables userspace tools"
url="https://netfilter.org/projects/nftables"
-options="!check" # no test suite
arch="all"
+options="!check" # No test suite.
license="GPL-2.0+ AND GPL-2.0"
-makedepends="asciidoctor bison flex gmp-dev libmnl-dev libnftnl-dev"
+depends=""
+makedepends="asciidoctor bison flex gmp-dev libmnl-dev libnftnl-dev
+ autoconf automake libtool"
subpackages="$pkgname-doc $pkgname-openrc"
source="https://netfilter.org/projects/nftables/files/$pkgname-$pkgver.tar.bz2
asciidoctor.patch
nftables.confd
- nftables.initd"
+ nftables.initd
+ "
prepare() {
default_prepare
@@ -24,7 +28,7 @@ prepare() {
build() {
# TODO: Man pages are massively broken with asciidoctor
- A2X=asciidoctor ./configure \
+ A2X=asciidoctor bash ./configure \
--build=$CBUILD \
--host=$CHOST \
--prefix=/usr \
@@ -43,7 +47,7 @@ package() {
install -Dm644 "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
}
-sha512sums="e14b75197ba3fea2a46c090450bf8b45b39fdc20db67bab1d6919c90128dee8ea8bbe9508e070f86b22ec70bcad8ab584fb89630a2240f09683137471c77d242 nftables-0.9.1.tar.bz2
-057786364c69fd3959bb5d38744829e56e91bddec3ff0e0b1c0bbbd818a7a49acb8077085e8eb8de88c155cfa6d8a34f1bdfb2ef27d73f3de11ec39d9fbbfe41 asciidoctor.patch
+sha512sums="ca6524ff1cb1e79d636afeb96f54e4699773e1cbda8e9a3ec5728f4d5b764c0df16b195cdcc0e304ae5643c8761b6b5a6685c737965a7415aec07aeb9f3dc5df nftables-0.9.6.tar.bz2
+282434bf685647ef823db610660c96c15bcf9eb694ab7f3e7d9a05b9ed77c572562d0eed4adda5d5adc579378e625f92762b945ac5d0f93f81900c9472382583 asciidoctor.patch
4eb1adf003dfcaad65c91af6ca88d91b7904c471aefae67e7d3c2f8e053e1ac196d3437a45d1fed5a855b876a0f1fc58a724e381d2acf1164d9120cadee73eef nftables.confd
58daafb012b7cd0248a7db6e10f6a667e683347aaea7eaa78cb88780272f334e00913cea3fd39a22a4a72acc27fabd101944b40916f4b534ddeb509bd0232017 nftables.initd"
diff --git a/user/nftables/asciidoctor.patch b/user/nftables/asciidoctor.patch
index 7a7ed0fd7..d290f6530 100644
--- a/user/nftables/asciidoctor.patch
+++ b/user/nftables/asciidoctor.patch
@@ -1,5 +1,5 @@
From ee7aad965b044bb555dc9fe27991c0e05f14e7dc Mon Sep 17 00:00:00 2001
-From: Luis Ressel <aranea@aixah.de>
+From: Mira 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
@@ -18,7 +18,7 @@ index 01e1af9..7776932 100644
man_MANS = nft.8 libnftables-json.5 libnftables.3
endif
--A2X_OPTS_MANPAGE = --doctype manpage --format manpage -D ${builddir}
+-A2X_OPTS_MANPAGE = -L --doctype manpage --format manpage -D ${builddir}
+A2X_OPTS_MANPAGE = --doctype manpage --backend manpage -D ${builddir}
ASCIIDOC_MAIN = nft.txt