From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Alexander Dahl <ada@thorsis.com>
Subject: Re: [ptxdist] [APPLIED] nftables: version bump 0.8.3 -> 1.0.1
Date: Fri, 21 Jan 2022 15:24:21 +0100 [thread overview]
Message-ID: <20220121142421.2136425-1-m.olbrich@pengutronix.de> (raw)
In-Reply-To: <20220114130149.9053-1-ada@thorsis.com>
Thanks, applied as ec876750da47b6939e77d66fd36b267773716222.
Michael
[sent from post-receive hook]
On Fri, 21 Jan 2022 15:24:20 +0100, Alexander Dahl <ada@thorsis.com> wrote:
> Patch is part of upstream since 0.8.4 and can be removed here.
>
> Signed-off-by: Alexander Dahl <ada@thorsis.com>
> Message-Id: <20220114130149.9053-1-ada@thorsis.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> 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 2b5ff1bf5f0b..000000000000
> --- 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 <fw@strlen.de>
> -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 <ada@thorsis.com>
> -Signed-off-by: Florian Westphal <fw@strlen.de>
> ----
> - 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 9f8a4cb7ddcb..000000000000
> --- 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 d4fe1dc34063..000000000000
> --- 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 542071d2c367..aaf170e371bd 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)
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
prev parent reply other threads:[~2022-01-21 14:24 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-14 13:01 [ptxdist] [PATCH v2] " Alexander Dahl
2022-01-21 14:24 ` Michael Olbrich [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220121142421.2136425-1-m.olbrich@pengutronix.de \
--to=m.olbrich@pengutronix.de \
--cc=ada@thorsis.com \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox