From 3783a7b8e47eec3ab60f5d4a6db47c4795e021f6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 5 Jun 2022 02:00:02 +0200 Subject: gnu: nftables: Update to 1.0.4. * gnu/packages/linux.scm (nftables): Update to 1.0.4. [source]: Remove patch. * gnu/packages/patches/nftables-fix-makefile.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/linux.scm | 6 ++--- gnu/packages/patches/nftables-fix-makefile.patch | 34 ------------------------ 3 files changed, 2 insertions(+), 39 deletions(-) delete mode 100644 gnu/packages/patches/nftables-fix-makefile.patch diff --git a/gnu/local.mk b/gnu/local.mk index bed213b87c..26866bc807 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1527,7 +1527,6 @@ dist_patch_DATA = \ %D%/packages/patches/netsurf-system-utf8proc.patch \ %D%/packages/patches/netsurf-y2038-tests.patch \ %D%/packages/patches/netsurf-longer-test-timeout.patch \ - %D%/packages/patches/nftables-fix-makefile.patch \ %D%/packages/patches/nhc98-c-update.patch \ %D%/packages/patches/nix-dont-build-html-doc.diff \ %D%/packages/patches/nfs4-acl-tools-0.3.7-fixpaths.patch \ diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index ee31ee95a3..23a6088020 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -7287,7 +7287,7 @@ used by nftables.") (define-public nftables (package (name "nftables") - (version "1.0.2") + (version "1.0.4") (source (origin (method url-fetch) @@ -7296,9 +7296,7 @@ used by nftables.") (string-append "https://www.nftables.org/projects/nftables" "/files/nftables-" version ".tar.bz2"))) (sha256 - (base32 "00jcjn1pl7qyqpg8pd4yhlkys7wbj4vkzgg73n27nmplzips6a0b")) - (patches - (search-patches "nftables-fix-makefile.patch")))) + (base32 "0ddsdj6zs78hndffl3iikpa1wzjxcpmr3xqcq4la71gnl7zb2zwj")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--disable-static" diff --git a/gnu/packages/patches/nftables-fix-makefile.patch b/gnu/packages/patches/nftables-fix-makefile.patch deleted file mode 100644 index 1660635874..0000000000 --- a/gnu/packages/patches/nftables-fix-makefile.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 18a08fb7f0443f8bde83393bd6f69e23a04246b3 Mon Sep 17 00:00:00 2001 -From: Pablo Neira Ayuso -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 ---- - 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 - -- cgit v1.2.3