summaryrefslogtreecommitdiff
path: root/user
diff options
context:
space:
mode:
authorA. Wilcox <awilcox@wilcox-tech.com>2019-07-11 08:06:48 +0000
committerA. Wilcox <awilcox@wilcox-tech.com>2019-07-11 08:06:48 +0000
commit72ab059627edb1471059a163d54d339d6d6c7ff6 (patch)
treec2044c6c07238a2cea576746225000c577db2840 /user
parent4969941cb635f5937c05ca5dd535d90d82c9d8b3 (diff)
parentaf151792fa0ed6cc025d6ab062cbadf226a32041 (diff)
downloadpackages-72ab059627edb1471059a163d54d339d6d6c7ff6.tar.gz
packages-72ab059627edb1471059a163d54d339d6d6c7ff6.tar.bz2
packages-72ab059627edb1471059a163d54d339d6d6c7ff6.tar.xz
packages-72ab059627edb1471059a163d54d339d6d6c7ff6.zip
Merge nftables bumps into master
Bump libnftnl and nftables See merge request adelie/packages!277
Diffstat (limited to 'user')
-rw-r--r--user/libnftnl/APKBUILD4
-rw-r--r--user/nftables/APKBUILD16
-rw-r--r--user/nftables/asciidoctor.patch28
3 files changed, 42 insertions, 6 deletions
diff --git a/user/libnftnl/APKBUILD b/user/libnftnl/APKBUILD
index f2796b3ea..538c2ad0d 100644
--- a/user/libnftnl/APKBUILD
+++ b/user/libnftnl/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
# Maintainer: Luis Ressel <aranea@aixah.de>
pkgname=libnftnl
-pkgver=1.1.2
+pkgver=1.1.3
pkgrel=0
pkgdesc="Netfilter library providing interface to the nf_tables subsystem"
url="https://netfilter.org/projects/libnftnl"
@@ -30,4 +30,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="808e0efd2ff32a65cca1e6113cc29aece1335364b94ad87438d19b0887d0bd34de11942fa411e4105ef153f2cce862ded17ebc441c413b839ac506471e530569 libnftnl-1.1.2.tar.bz2"
+sha512sums="3fb96ea1a8bc9eb00fa2cf79f64cc9613250e8b97de6e90e440c7c44e92789e7c7fd603b7347bb02d9d74af725cf8fde5d2e435c5ffdcb784316c67b83ddf0fe libnftnl-1.1.3.tar.bz2"
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
+