[ptxdist] [PATCH] nftables: Version bump. 1.0.4 -> 1.1.0

[ptxdist] [PATCH] nftables: Version bump. 1.0.4 -> 1.1.0

[Christian Melki]

Bunch of changes. 6 releases over two years.
https://www.netfilter.org/projects/nftables/files/changes-nftables-1.0.5.txt
https://www.netfilter.org/projects/nftables/files/changes-nftables-1.0.6.txt
https://www.netfilter.org/projects/nftables/files/changes-nftables-1.0.7.txt
https://www.netfilter.org/projects/nftables/files/changes-nftables-1.0.8.txt
https://www.netfilter.org/projects/nftables/files/changes-nftables-1.0.9.txt
https://www.netfilter.org/projects/nftables/files/changes-nftables-1.1.0.txt

* Project switched to xz tarballs.

* License updates. Added GPL2+ to a bunch of files.

* Remove deprecated option. No other options added.

Signed-off-by: Christian Melki <christian.melki@t2data.com>
---
 rules/nftables.make | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/rules/nftables.make b/rules/nftables.make
index e92e219d1..8703e8dac 100644
--- a/rules/nftables.make
+++ b/rules/nftables.make
@@ -14,15 +14,15 @@ PACKAGES-$(PTXCONF_NFTABLES) += nftables
 #
 # Paths and names
 #
-NFTABLES_VERSION	:= 1.0.4
-NFTABLES_MD5		:= dcc3c263e00903037cf86d74477a9519
+NFTABLES_VERSION	:= 1.1.0
+NFTABLES_MD5		:= 3082f7c9ad4b8dd1c9fb260ad82d1472
 NFTABLES		:= nftables-$(NFTABLES_VERSION)
-NFTABLES_SUFFIX		:= tar.bz2
+NFTABLES_SUFFIX		:= tar.xz
 NFTABLES_URL		:= http://ftp.netfilter.org/pub/nftables/$(NFTABLES).$(NFTABLES_SUFFIX)
 NFTABLES_SOURCE		:= $(SRCDIR)/$(NFTABLES).$(NFTABLES_SUFFIX)
 NFTABLES_DIR		:= $(BUILDDIR)/$(NFTABLES)
-NFTABLES_LICENSE	:= GPL-2.0-only
-NFTABLES_LICENSE_FILES	:= file://COPYING;md5=d1a78fdd879a263a5e0b42d1fc565e79
+NFTABLES_LICENSE	:= GPL-2.0-only AND GPL-2.0-or-later
+NFTABLES_LICENSE_FILES	:= file://COPYING;md5=81ec33bb3e47b460fc993ac768c74b62
 
 # ----------------------------------------------------------------------------
 # Prepare
@@ -36,7 +36,6 @@ NFTABLES_CONF_OPT	:= \
 	$(CROSS_AUTOCONF_USR) \
 	--$(call ptx/endis, PTXCONF_NFTABLES_DEBUG)-debug \
 	--disable-man-doc \
-	--disable-python \
 	--$(call ptx/wwo, PTXCONF_NFTABLES_MGMP)-mini-gmp \
 	--without-cli \
 	--without-xtables \
-- 
2.34.1

Re: [ptxdist] [APPLIED] nftables: Version bump. 1.0.4 -> 1.1.0

[Michael Olbrich]

Thanks, applied as 8f3e594c6ec0449f42cace26072907f603ad2ae2.

Michael

[sent from post-receive hook]

On Mon, 05 Aug 2024 08:49:44 +0200, Christian Melki <christian.melki@t2data.com> wrote:
> Bunch of changes. 6 releases over two years.
> https://www.netfilter.org/projects/nftables/files/changes-nftables-1.0.5.txt
> https://www.netfilter.org/projects/nftables/files/changes-nftables-1.0.6.txt
> https://www.netfilter.org/projects/nftables/files/changes-nftables-1.0.7.txt
> https://www.netfilter.org/projects/nftables/files/changes-nftables-1.0.8.txt
> https://www.netfilter.org/projects/nftables/files/changes-nftables-1.0.9.txt
> https://www.netfilter.org/projects/nftables/files/changes-nftables-1.1.0.txt
> 
> * Project switched to xz tarballs.
> 
> * License updates. Added GPL2+ to a bunch of files.
> 
> * Remove deprecated option. No other options added.
> 
> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> Message-Id: <20240718164517.1098403-1-christian.melki@t2data.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/nftables.make b/rules/nftables.make
> index e92e219d1c56..8703e8dac2d3 100644
> --- a/rules/nftables.make
> +++ b/rules/nftables.make
> @@ -14,15 +14,15 @@ PACKAGES-$(PTXCONF_NFTABLES) += nftables
>  #
>  # Paths and names
>  #
> -NFTABLES_VERSION	:= 1.0.4
> -NFTABLES_MD5		:= dcc3c263e00903037cf86d74477a9519
> +NFTABLES_VERSION	:= 1.1.0
> +NFTABLES_MD5		:= 3082f7c9ad4b8dd1c9fb260ad82d1472
>  NFTABLES		:= nftables-$(NFTABLES_VERSION)
> -NFTABLES_SUFFIX		:= tar.bz2
> +NFTABLES_SUFFIX		:= tar.xz
>  NFTABLES_URL		:= http://ftp.netfilter.org/pub/nftables/$(NFTABLES).$(NFTABLES_SUFFIX)
>  NFTABLES_SOURCE		:= $(SRCDIR)/$(NFTABLES).$(NFTABLES_SUFFIX)
>  NFTABLES_DIR		:= $(BUILDDIR)/$(NFTABLES)
> -NFTABLES_LICENSE	:= GPL-2.0-only
> -NFTABLES_LICENSE_FILES	:= file://COPYING;md5=d1a78fdd879a263a5e0b42d1fc565e79
> +NFTABLES_LICENSE	:= GPL-2.0-only AND GPL-2.0-or-later
> +NFTABLES_LICENSE_FILES	:= file://COPYING;md5=81ec33bb3e47b460fc993ac768c74b62
>  
>  # ----------------------------------------------------------------------------
>  # Prepare
> @@ -36,7 +36,6 @@ NFTABLES_CONF_OPT	:= \
>  	$(CROSS_AUTOCONF_USR) \
>  	--$(call ptx/endis, PTXCONF_NFTABLES_DEBUG)-debug \
>  	--disable-man-doc \
> -	--disable-python \
>  	--$(call ptx/wwo, PTXCONF_NFTABLES_MGMP)-mini-gmp \
>  	--without-cli \
>  	--without-xtables \