[packages/nftables] up to 1.0.2

atler atler at pld-linux.org
Tue Feb 22 12:30:52 CET 2022


commit f227234b875672a76393ead6b4534f9032fa4930
Author: Jan Palus <atler at pld-linux.org>
Date:   Tue Feb 22 12:29:59 2022 +0100

    up to 1.0.2
    
    - upstream build to fix build

 build.patch   | 34 ++++++++++++++++++++++++++++++++++
 nftables.spec |  7 +++++--
 2 files changed, 39 insertions(+), 2 deletions(-)
---
diff --git a/nftables.spec b/nftables.spec
index 5fa9ed8..d7192c8 100644
--- a/nftables.spec
+++ b/nftables.spec
@@ -5,15 +5,16 @@
 Summary:	Administration tool for packet filtering and classification
 Summary(pl.UTF-8):	Narzędzie administracyjne do filtrowania i klasyfikacji pakietów
 Name:		nftables
-Version:	1.0.1
+Version:	1.0.2
 Release:	1
 License:	GPL v2
 Group:		Applications/Networking
 Source0:	https://netfilter.org/projects/nftables/files/%{name}-%{version}.tar.bz2
-# Source0-md5:	e3cf7011ee1e8e123c962446262de7cc
+# Source0-md5:	d5ed55350ce3040104cdcabb6d97b25a
 Source1:	%{name}.service
 Source2:	%{name}.conf
 Patch0:		%{name}-python.patch
+Patch1:		build.patch
 URL:		https://netfilter.org/projects/nftables/
 BuildRequires:	asciidoc
 BuildRequires:	autoconf >= 2.61
@@ -94,6 +95,7 @@ Wiązania Pythona do biblioteki libnftables.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__libtoolize}
@@ -103,6 +105,7 @@ Wiązania Pythona do biblioteki libnftables.
 %{__automake}
 %configure \
 	--disable-silent-rules \
+	--enable-static \
 	--with-cli=readline \
 	--with-json \
 	--with-xtables
diff --git a/build.patch b/build.patch
new file mode 100644
index 0000000..1660635
--- /dev/null
+++ b/build.patch
@@ -0,0 +1,34 @@
+From 18a08fb7f0443f8bde83393bd6f69e23a04246b3 Mon Sep 17 00:00:00 2001
+From: Pablo Neira Ayuso <pablo at 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 at 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
+
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/nftables.git/commitdiff/f227234b875672a76393ead6b4534f9032fa4930



More information about the pld-cvs-commit mailing list