From patchwork Thu Apr 28 20:47:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "vasilii.smirnov--- via Guix-patches\" via" X-Patchwork-Id: 38996 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id AA9DD27BBEA; Thu, 28 Apr 2022 21:48:11 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 0C11927BBE9 for ; Thu, 28 Apr 2022 21:48:11 +0100 (BST) Received: from localhost ([::1]:33906 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nkB3a-0005ft-7V for patchwork@mira.cbaines.net; Thu, 28 Apr 2022 16:48:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37974) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nkB3S-0005fi-HM for guix-patches@gnu.org; Thu, 28 Apr 2022 16:48:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56226) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nkB3S-0001tn-7H for guix-patches@gnu.org; Thu, 28 Apr 2022 16:48:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nkB3S-0006sh-52 for guix-patches@gnu.org; Thu, 28 Apr 2022 16:48:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55176] [PATCH] gnu: nftables: Update to 1.0.2. Resent-From: kiasoc5@tutanota.com Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 28 Apr 2022 20:48:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 55176 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55176@debbugs.gnu.org X-Debbugs-Original-To: Guix Patches Received: via spool by submit@debbugs.gnu.org id=B.165117887526437 (code B ref -1); Thu, 28 Apr 2022 20:48:02 +0000 Received: (at submit) by debbugs.gnu.org; 28 Apr 2022 20:47:55 +0000 Received: from localhost ([127.0.0.1]:50123 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nkB3F-0006sE-0z for submit@debbugs.gnu.org; Thu, 28 Apr 2022 16:47:55 -0400 Received: from lists.gnu.org ([209.51.188.17]:42986) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nkB3D-0006s7-6S for submit@debbugs.gnu.org; Thu, 28 Apr 2022 16:47:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37960) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nkB3C-0005fM-T4 for guix-patches@gnu.org; Thu, 28 Apr 2022 16:47:46 -0400 Received: from w1.tutanota.de ([81.3.6.162]:43790) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nkB3A-0001tC-PW for guix-patches@gnu.org; Thu, 28 Apr 2022 16:47:46 -0400 Received: from w3.tutanota.de (unknown [192.168.1.164]) by w1.tutanota.de (Postfix) with ESMTP id DB92EFBF5EB for ; Thu, 28 Apr 2022 20:47:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1651178862; s=s1; d=tutanota.com; h=From:From:To:To:Subject:Subject:Content-Description:Content-ID:Content-Type:Content-Type:Content-Transfer-Encoding:Cc:Date:Date:In-Reply-To:MIME-Version:MIME-Version:Message-ID:Message-ID:Reply-To:References:Sender; bh=kD+3QVh+a6jGH850eTp0CxSNj3HZ7qF6Re7nIxrN8Ps=; b=fXRKaJImuQlTEhNM6uA4KhwTVOdHTuZFHlZyWf4+maorGYctuML5E3SLOdO8a7kM 3jXH1kHwI/7dD7qJO++ugAPHstCV0OH9zFA4KZrcyQi4LSSgPXxySma9KDPKEmTIWXI NqAvuJCf6Ne07oSHjG55gA0olnpSp0Hlq4geo01a9FMY5ESlNVEN/vYtF3JhJAKDS3M C+GdruV5WZxP+EC+iq/kJYb871nu0DWpE7K5NZ6O/OUpcS6lYpAFebnaM+aaP5k0Bna t/57tZfu6S2r+L9X33zY1/EBtaiJzLoF6F5CzbT6kYPPjqyEFR0uorIi3LGg3Fr+UOl Z7v5bhTWPA== Date: Thu, 28 Apr 2022 22:47:42 +0200 (CEST) Message-ID: MIME-Version: 1.0 Received-SPF: pass client-ip=81.3.6.162; envelope-from=kiasoc5@tutanota.com; helo=w1.tutanota.de X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: kiasoc5@tutanota.com X-ACL-Warn: , kiasoc5--- via Guix-patches X-Patchwork-Original-From: kiasoc5--- via Guix-patches via From: "vasilii.smirnov--- via Guix-patches\" via" X-getmail-retrieved-from-mailbox: Patches Patch is taken from upstream. https://git.netfilter.org/nftables/patch/?id=18a08fb7f0443f8bde83393bd6f69e23a04246b3 From 3a2a524a960cefdaaa2a9351f01fe81b7ab19ef0 Mon Sep 17 00:00:00 2001 From: kiasoc5 Date: Thu, 28 Apr 2022 16:41:10 -0400 Subject: [PATCH] gnu: nftables: Update to 1.0.2. * gnu/packages/patches/nftables-fix-makefile.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/linux.scm (nftables): Update to 1.0.2. [source]: Add patch. --- gnu/local.mk | 1 + gnu/packages/linux.scm | 21 +++++++++--- .../patches/nftables-fix-makefile.patch | 34 +++++++++++++++++++ 3 files changed, 52 insertions(+), 4 deletions(-) create mode 100644 gnu/packages/patches/nftables-fix-makefile.patch diff --git a/gnu/local.mk b/gnu/local.mk index 9bad87710c..4971bf84fa 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1528,6 +1528,7 @@ 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 c67b5922e6..64f192b2ad 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -7238,7 +7238,7 @@ (define-public libnftnl/fixed (define-public nftables (package (name "nftables") - (version "1.0.1") + (version "1.0.2") (source (origin (method url-fetch) @@ -7247,14 +7247,27 @@ (define-public nftables (string-append "https://www.nftables.org/projects/nftables" "/files/nftables-" version ".tar.bz2"))) (sha256 - (base32 "08x4xw0s5sap3q7jfr91v7mrkxrydi4dvsckw85ims0qb1ibmviw")))) + (base32 "00jcjn1pl7qyqpg8pd4yhlkys7wbj4vkzgg73n27nmplzips6a0b")) + (patches + (search-patches "nftables-fix-makefile.patch")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--disable-static" "--with-cli=readline" - "--with-json"))) + "--with-json") + #:phases + (modify-phases %standard-phases + (add-before 'configure 'autoreconf + (lambda _ + (invoke "autoreconf" "-fi")))))) (inputs (list gmp libmnl libnftnl readline jansson)) - (native-inputs (list pkg-config bison flex docbook2x)) + (native-inputs (list pkg-config + bison + flex + docbook2x + autoconf + automake + libtool)) (home-page "https://www.nftables.org") (synopsis "Userspace utility for Linux packet filtering") (description "nftables is the project that aims to replace the existing diff --git a/gnu/packages/patches/nftables-fix-makefile.patch b/gnu/packages/patches/nftables-fix-makefile.patch new file mode 100644 index 0000000000..1660635874 --- /dev/null +++ b/gnu/packages/patches/nftables-fix-makefile.patch @@ -0,0 +1,34 @@ +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 + base-commit: 882cacc1bb5be0df334dd7ce55b385a3a1678728 -- 2.36.0