From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 14 Jan 2022 14:02:29 +0100 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1n8MDt-0023Ej-6c for lore@lore.pengutronix.de; Fri, 14 Jan 2022 14:02:29 +0100 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1n8MDs-0000iH-8g; Fri, 14 Jan 2022 14:02:28 +0100 Received: from mail.thorsis.com ([92.198.35.195]) by metis.ext.pengutronix.de with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1n8MDO-0000i8-Qw for ptxdist@pengutronix.de; Fri, 14 Jan 2022 14:02:00 +0100 Received: from localhost (localhost [127.0.0.1]) by mail.thorsis.com (Postfix) with ESMTP id 962CB99 for ; Fri, 14 Jan 2022 14:01:57 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mail.thorsis.com Received: from mail.thorsis.com ([127.0.0.1]) by localhost (mail.thorsis.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id aVvzGiOqhxmP for ; Fri, 14 Jan 2022 14:01:53 +0100 (CET) Received: by mail.thorsis.com (Postfix, from userid 109) id E9E451C61; Fri, 14 Jan 2022 14:01:52 +0100 (CET) Received: from adahl by ada.ifak-system.com with local (Exim 4.92) (envelope-from ) id 1n8MDF-0002Mm-Ed for ptxdist@pengutronix.de; Fri, 14 Jan 2022 14:01:49 +0100 From: Alexander Dahl To: ptxdist@pengutronix.de Date: Fri, 14 Jan 2022 14:01:49 +0100 Message-Id: <20220114130149.9053-1-ada@thorsis.com> X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-2.6 required=4.0 tests=AWL,BAYES_00,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Subject: [ptxdist] [PATCH v2] nftables: version bump 0.8.3 -> 1.0.1 X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false Patch is part of upstream since 0.8.4 and can be removed here. Signed-off-by: Alexander Dahl --- Notes: v2: - Also remove old patch (M. Olbrich) ...enable-xtables-when-without-xtables-.patch | 32 ------------------- patches/nftables-0.8.3/autogen.sh | 1 - patches/nftables-0.8.3/series | 4 --- rules/nftables.make | 10 +++--- 4 files changed, 6 insertions(+), 41 deletions(-) delete mode 100644 patches/nftables-0.8.3/0001-configure-don-t-enable-xtables-when-without-xtables-.patch delete mode 120000 patches/nftables-0.8.3/autogen.sh delete mode 100644 patches/nftables-0.8.3/series diff --git a/patches/nftables-0.8.3/0001-configure-don-t-enable-xtables-when-without-xtables-.patch b/patches/nftables-0.8.3/0001-configure-don-t-enable-xtables-when-without-xtables-.patch deleted file mode 100644 index 2b5ff1bf5..000000000 --- a/patches/nftables-0.8.3/0001-configure-don-t-enable-xtables-when-without-xtables-.patch +++ /dev/null @@ -1,32 +0,0 @@ -From: Florian Westphal -Date: Wed, 4 Apr 2018 13:53:28 +0200 -Subject: [PATCH] configure: don't enable xtables when --without-xtables is - passed - -AC_ARG_WITH runs this when EITHER --with-foo or --without-foo is given, -so use 'withval'. - -After this patch: -./configure -> xtables off -./configure --with-xtables -> xtables on -./configure --without-xtables -> xtables off (was on). - -Reported-by: Alexander Dahl -Signed-off-by: Florian Westphal ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 2d0b1b939a18..74e721cd4691 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -99,7 +99,7 @@ AM_CONDITIONAL([BUILD_CLI], [test "x$with_cli" != xno]) - - AC_ARG_WITH([xtables], [AS_HELP_STRING([--with-xtables], - [Use libxtables for iptables interaction)])], -- [with_libxtables=yes], [with_libxtables=no]) -+ [with_libxtables=$withval], [with_libxtables=no]) - AS_IF([test "x$with_libxtables" != xno], [ - PKG_CHECK_MODULES([XTABLES], [xtables >= 1.6.1]) - AC_DEFINE([HAVE_LIBXTABLES], [1], [0]) diff --git a/patches/nftables-0.8.3/autogen.sh b/patches/nftables-0.8.3/autogen.sh deleted file mode 120000 index 9f8a4cb7d..000000000 --- a/patches/nftables-0.8.3/autogen.sh +++ /dev/null @@ -1 +0,0 @@ -../autogen.sh \ No newline at end of file diff --git a/patches/nftables-0.8.3/series b/patches/nftables-0.8.3/series deleted file mode 100644 index d4fe1dc34..000000000 --- a/patches/nftables-0.8.3/series +++ /dev/null @@ -1,4 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -0001-configure-don-t-enable-xtables-when-without-xtables-.patch -# 12321dad8667c00b553d2c9b76ee6dd3 - git-ptx-patches magic diff --git a/rules/nftables.make b/rules/nftables.make index 542071d2c..aaf170e37 100644 --- a/rules/nftables.make +++ b/rules/nftables.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_NFTABLES) += nftables # # Paths and names # -NFTABLES_VERSION := 0.8.3 -NFTABLES_MD5 := a604501c10a302fa417410b16f293d2c +NFTABLES_VERSION := 1.0.1 +NFTABLES_MD5 := e3cf7011ee1e8e123c962446262de7cc NFTABLES := nftables-$(NFTABLES_VERSION) NFTABLES_SUFFIX := tar.bz2 NFTABLES_URL := http://ftp.netfilter.org/pub/nftables/$(NFTABLES).$(NFTABLES_SUFFIX) @@ -36,10 +36,11 @@ NFTABLES_CONF_OPT := \ $(CROSS_AUTOCONF_USR) \ --$(call ptx/endis, PTXCONF_NFTABLES_DEBUG)-debug \ --disable-man-doc \ - --disable-pdf-doc \ + --disable-python \ --$(call ptx/wwo, PTXCONF_NFTABLES_MGMP)-mini-gmp \ --without-cli \ - --without-xtables + --without-xtables \ + --without-json # ---------------------------------------------------------------------------- # Target-Install @@ -56,6 +57,7 @@ $(STATEDIR)/nftables.targetinstall: @$(call install_copy, nftables, 0, 0, 0755, -, /usr/sbin/nft) @$(call install_alternative, nftables, 0, 0, 0755, /etc/nftables.conf) + @$(call install_lib, nftables, 0, 0, 0644, libnftables) ifdef PTXCONF_NFTABLES_STARTSCRIPT @$(call install_alternative, nftables, 0, 0, 0755, /etc/init.d/nftables) base-commit: b90da4e990ee000187617533ebdc1efbdc3ce9ba -- 2.30.2 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de