[Buildroot] [PATCH 1/1] package/netstat-nat: bump version to 2a

[Buildroot] [PATCH 1/1] package/netstat-nat: bump version to 2a

[Bernd Kuhls]

Debian experienced the same build error we are seeing at our
autobuilders: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1066719

In September 2024 a new maintainer took over the Debian package
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1066719#10
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1066719#15
https://tracker.debian.org/news/1567008/accepted-netstat-nat-2-1-source-into-unstable/

Switch to the new site https://sr.ht/~nabijaczleweli/netstat-nat-ng/
which not only provides:

"The git history includes imports of all historical tarballs
 (https://web.archive.org/web/20180104143740/http://www.tweegy.nl/projects/netstat-nat/),
 with the changelog distributed in the tags.
 The tags also have contributors added, if credited in the 1.4.10 README
 (they were not credited contemporaneously)."

but many other commits, some require changes to the buildroot package:

- move license file to LICENSES/GPL-2.0-or-later.txt
https://git.sr.ht/~nabijaczleweli/netstat-nat-ng/commit/3df46bf64d86d8639663f0e63f5e981d855ab2fa

- removed autotools
https://git.sr.ht/~nabijaczleweli/netstat-nat-ng/commit/480fc0794c34a7d71ccb80eb5dd149c413fbe6fd

- fix "string_search" build error
https://git.sr.ht/~nabijaczleweli/netstat-nat-ng/commit/2d90b4e3bd3a7d640218634d9c5bd6369cd52cfe

Fixes:
http://autobuild.buildroot.net/results/244/244956839ae82dff7948b34d6627cd52f430c538/

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
 package/netstat-nat/Config.in        |  4 ++--
 package/netstat-nat/netstat-nat.hash |  4 ++--
 package/netstat-nat/netstat-nat.mk   | 18 ++++++++++++++----
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/package/netstat-nat/Config.in b/package/netstat-nat/Config.in
index 6afcf89e3b..6ea7e7f6a7 100644
--- a/package/netstat-nat/Config.in
+++ b/package/netstat-nat/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_NETSTAT_NAT
 	bool "netstat-nat"
 	help
-	  Displays NAT connections
+	  List/filter ongoing connections with NAT-specific decoding
 
-	  http://tweegy.nl/projects/netstat-nat/
+	  https://sr.ht/~nabijaczleweli/netstat-nat-ng
diff --git a/package/netstat-nat/netstat-nat.hash b/package/netstat-nat/netstat-nat.hash
index 7530b8a09f..7b22f23832 100644
--- a/package/netstat-nat/netstat-nat.hash
+++ b/package/netstat-nat/netstat-nat.hash
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256  e945faa283a49f33af15de915a949c9273a230fc17154925364c547adab676ca  netstat-nat-1.4.10.tar.gz
-sha256  91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad  COPYING
+sha256  8a61b0c4df8adde2eff87b126c065ff17f2acb4dadf7da31ea478606457d9037  2a.tar.gz
+sha256  91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad  LICENSES/GPL-2.0-or-later.txt
diff --git a/package/netstat-nat/netstat-nat.mk b/package/netstat-nat/netstat-nat.mk
index 0d16579a6a..7e954bb456 100644
--- a/package/netstat-nat/netstat-nat.mk
+++ b/package/netstat-nat/netstat-nat.mk
@@ -4,9 +4,19 @@
 #
 ################################################################################
 
-NETSTAT_NAT_VERSION = 1.4.10
-NETSTAT_NAT_SITE = http://tweegy.nl/download
+NETSTAT_NAT_VERSION = 2a
+NETSTAT_NAT_SOURCE = $(NETSTAT_NAT_VERSION).tar.gz
+NETSTAT_NAT_SITE = https://git.sr.ht/~nabijaczleweli/netstat-nat-ng/archive
 NETSTAT_NAT_LICENSE = GPL-2.0+
-NETSTAT_NAT_LICENSE_FILES = COPYING
+NETSTAT_NAT_LICENSE_FILES = LICENSES/GPL-2.0-or-later.txt
 
-$(eval $(autotools-package))
+define NETSTAT_NAT_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)
+endef
+
+define NETSTAT_NAT_INSTALL_TARGET_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) DESTDIR=$(TARGET_DIR) PREFIX=/usr \
+		-C $(@D) install
+endef
+
+$(eval $(generic-package))
-- 
2.39.5

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/1] package/netstat-nat: bump version to 2a

[Thomas Petazzoni via buildroot]

Hello Bernd,

On Thu, 31 Oct 2024 20:38:09 +0100
Bernd Kuhls <bernd@kuhls.net> wrote:

> diff --git a/package/netstat-nat/netstat-nat.mk b/package/netstat-nat/netstat-nat.mk
> index 0d16579a6a..7e954bb456 100644
> --- a/package/netstat-nat/netstat-nat.mk
> +++ b/package/netstat-nat/netstat-nat.mk
> @@ -4,9 +4,19 @@
>  #
>  ################################################################################
>  
> -NETSTAT_NAT_VERSION = 1.4.10
> -NETSTAT_NAT_SITE = http://tweegy.nl/download
> +NETSTAT_NAT_VERSION = 2a
> +NETSTAT_NAT_SOURCE = $(NETSTAT_NAT_VERSION).tar.gz
> +NETSTAT_NAT_SITE = https://git.sr.ht/~nabijaczleweli/netstat-nat-ng/archive

Could you switch to Git download instead? Indeed we're not sure those
tarballs are stable, and a tarball named 2a.tar.gz isn't exactly nice.

> -$(eval $(autotools-package))

So they are switching back from autotools to a hand-written Makefile...
not really an improvement, but OK.

Thomas
-- 
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/1] package/netstat-nat: bump version to 2a

[Bernd Kuhls]

Am Thu, 31 Oct 2024 20:58:35 +0100 schrieb Thomas Petazzoni via buildroot:

>> +NETSTAT_NAT_SOURCE = $(NETSTAT_NAT_VERSION).tar.gz
>> +NETSTAT_NAT_SITE = https://git.sr.ht/~nabijaczleweli/netstat-nat-ng/
archive
> 
> Could you switch to Git download instead? Indeed we're not sure those
> tarballs are stable, and a tarball named 2a.tar.gz isn't exactly nice.

Hi Thomas,

quoting the project homepage https://sr.ht/~nabijaczleweli/netstat-nat-ng/

"Release tarballs [...] are thus available on the refs listing/tag page"

From that refs page https://git.sr.ht/~nabijaczleweli/netstat-nat-ng/refs, 
which looks to me as providing release versions, I took the tarball which
has this, indeed, weird filename. Clicking the link in Firefox provides 
"netstat-nat-ng-2a.tar.gz" however and with wget you would need
"--content-disposition" to receive the full filename.

Having the option to download an upstream-provided tarball I would like to 
stick to it. Would it be possible, even optionally, to add "--content-
disposition" when wget is used for downlaods?

Regards, Bernd

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot