nftables: update to 1.0.2.

This commit is contained in:
Leah Neukirchen 2022-02-25 16:43:48 +01:00
parent 274967fd28
commit 441e6874a0
2 changed files with 41 additions and 4 deletions

View file

@ -0,0 +1,34 @@
From 18a08fb7f0443f8bde83393bd6f69e23a04246b3 Mon Sep 17 00:00:00 2001
From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Tue, 22 Feb 2022 00:56:36 +0100
Subject: examples: compile with `make check' and add AM_CPPFLAGS
Compile examples via `make check' like libnftnl does. Use AM_CPPFLAGS to
specify local headers via -I.
Unfortunately, `make distcheck' did not catch this compile time error in
my system, since it was using the nftables/libnftables.h file of the
previous nftables release.
Fixes: 5b364657a35f ("build: missing SUBIRS update")
Fixes: caf2a6ad2d22 ("examples: add libnftables example program")
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
examples/Makefile.am | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/examples/Makefile.am b/examples/Makefile.am
index c972170d..3b8b0b67 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -1,4 +1,6 @@
-noinst_PROGRAMS = nft-buffer \
+check_PROGRAMS = nft-buffer \
nft-json-file
+AM_CPPFLAGS = -I$(top_srcdir)/include
+
LDADD = $(top_builddir)/src/libnftables.la
--
cgit v1.2.3

View file

@ -1,18 +1,22 @@
# Template file for 'nftables'
pkgname=nftables
version=1.0.1
version=1.0.2
revision=1
build_style=gnu-configure
configure_args="--sbindir=/usr/bin --with-json --with-python-bin=/bin/python3
--with-cli=readline"
hostmakedepends="python3 asciidoc docbook2x flex pkg-config"
hostmakedepends="python3 asciidoc docbook2x flex pkg-config automake libtool"
makedepends="gmp-devel jansson-devel libmnl-devel libnftnl-devel readline-devel"
short_desc="Netfilter nftables userspace tools"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-2.0-only"
homepage="http://netfilter.org/projects/nftables/"
distfiles="http://www.netfilter.org/projects/${pkgname}/files/${pkgname}-${version}.tar.bz2"
checksum=3ceeba625818e81a0be293e9dd486c3ef799ebd92165270f1e57e9a201efa423
checksum=0b28a36ffcf4567b841de7bd3f37918b1fed27859eb48bdec51e1f7a83954c02
post_extract() {
autoreconf -fi
}
post_install() {
vsv nftables
@ -32,7 +36,6 @@ libnftables-devel_package() {
vmove usr/include
vmove usr/lib/pkgconfig
vmove "usr/lib/*.so"
vmove "usr/lib/*.a"
vmove usr/share/man/man3
}
}