udate synocli-net tools (#5985)

* udate synocli-net tools
- Update aria2 to v1.37.0
- Update inetutils (telnet, whois) to v2.5
- Update screen to v4.9.1
- Update ser2net to v4.6.0
- Update socat to v1.8.0.0
- update openssh to v9.6p1
- update openssl to v3.1.4
- udpate cross/gensio to v2.8.2 (used by ser2net)
- update cross/libpcap to v1.10.4 (keep v1.9.1 for OLD_PPC_ARCHS)
- update xxHash to v0.8.2 and add xxHsum tools to path

* apply patch for libpcap for all archs

* cross/libevent: get rid of openssl 1.1.

* cross/bind: update to v9.16.45

- update cross/bind and patch configure to use readline (with ncursesw)

* fix ser2net for ARMv5 archs
- add cross/gensio_2.6.8 for compatibility with compiler of ARMv5 toolchains

* cross/xxhash: adjust the patch

* cross/arp-scan: fix build for OLD_PPC_ARCHS

* update bind to v9.17.22 (#5984)
- update bind to latest version without liburcu dependency
- tweak the build (needs libtool binary, requires installed libraries to build some tools)
- remove cross/liburcu (required for bind >= 9.18.x)
  - fails to build for evansport
  - not supported for aarch64 on DSM 6
- ARMv5 archs are limited to bind v9.16.x

cross/aria2/Makefile

@@ -1,13 +1,13 @@
 PKG_NAME = aria2
-PKG_VERS = 1.36.0
+PKG_VERS = 1.37.0
 PKG_EXT = tar.xz
 PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://github.com/aria2/aria2/releases/download/release-$(PKG_VERS)
 PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
 
 DEPENDS = cross/libssh2 cross/gnutls cross/libgcrypt cross/libexpat cross/c-ares cross/sqlite
 
-# archs with too old c++ compiler (c++ 11 is required)
+# A compiler with support for C++11 language features is required.
 UNSUPPORTED_ARCHS = $(ARMv5_ARCHS) $(OLD_PPC_ARCHS)
 
 include ../../mk/spksrc.common.mk

cross/aria2/digests

@@ -1,3 +1,3 @@
-aria2-1.36.0.tar.xz SHA1 cd2e5e69ae8382b03bf18619d501af8b73bee201
-aria2-1.36.0.tar.xz SHA256 58d1e7608c12404f0229a3d9a4953d0d00c18040504498b483305bcb3de907a5
-aria2-1.36.0.tar.xz MD5 f11ff410bbe00385b4a1b20d22aa2598
+aria2-1.37.0.tar.xz SHA1 5b38504efcec4668d91ff6fa8f8bb21325a71901
+aria2-1.37.0.tar.xz SHA256 60a420ad7085eb616cb6e2bdf0a7206d68ff3d37fb5a956dc44242eb2f79b66b
+aria2-1.37.0.tar.xz MD5 dd00565c2f671331735089e6b807ece0

cross/arp-scan/Makefile

@@ -6,7 +6,7 @@ PKG_DIST_SITE = https://github.com/royhills/arp-scan/archive
 PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
 
-DEPENDS = cross/libpcap
+OPTIONAL_DEPENDS = cross/libpcap cross/libpcap_1.9
 
 HOMEPAGE = https://www.royhills.co.uk/wiki/index.php/Arp-scan_User_Guide
 COMMENT  = Command-line tool for system discovery and fingerprinting. It constructs and sends ARP requests to the specified IP addresses, and displays any responses that are received. 
@@ -22,6 +22,13 @@ ADDITIONAL_CPPFLAGS = -O3
 
 include ../../mk/spksrc.cross-cc.mk
 
+ifeq ($(findstring $(ARCH),$(OLD_PPC_ARCHS)),$(ARCH))
+DEPENDS = cross/libpcap_1.9
+else
+DEPENDS = cross/libpcap
+endif
+
+
 .PHONY: arp-scan_pre_configure
 arp-scan_pre_configure:
 	$(RUN) autoreconf --install

cross/bind/Makefile

@@ -1,17 +1,23 @@
 PKG_NAME = bind
-PKG_VERS = 9.16.28
+PKG_VERS = 9.17.22
 PKG_EXT = tar.xz
 PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://downloads.isc.org/isc/bind9/$(PKG_VERS)
 PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
 
+# to update bind to >= 9.18.x is a mess
+# - depends on cross/liburcu (does not build for evansport, and aarch64 has compiler issue for DSM <7)
+
 DEPENDS = cross/libuv
-DEPENDS += cross/openssl cross/readline
+DEPENDS += cross/openssl3
+DEPENDS += cross/readline
 DEPENDS += cross/jemalloc
+DEPENDS += cross/libxml2
+DEPENDS += cross/nghttp2
 
 OPTIONAL_DEPENDS = cross/libcap cross/libcap_2.51
 
-# by cross/libuv and cross/libcap
+# by cross/libuv
 UNSUPPORTED_ARCHS = $(OLD_PPC_ARCHS)
 
 include ../../mk/spksrc.archs.mk
@@ -26,20 +32,37 @@ COMMENT  = BIND (Berkeley Internet Name Domain) is a complete, highly portable i
 LICENSE  = MPL 2.0
 
 GNU_CONFIGURE = 1
-CONFIGURE_ARGS  = --without-python
+PRE_CONFIGURE_TARGET = bind_pre_configure
+PRE_COMPILE_TARGET = bind_pre_compile
+
+ADDITIONAL_CFLAGS = -O2
+ADDITIONAL_CPPFLAGS = -O2
+
+CONFIGURE_ARGS  = --enable-full-report
 # needed for cross compile:
 CONFIGURE_ARGS += BUILD_CC="$(CC)"
-CONFIGURE_ARGS += BUILD_CFLAGS="$(CFLAGS)"
-CONFIGURE_ARGS += BUILD_CPPFLAGS="$(CPPFLAGS) -O"
+CONFIGURE_ARGS += BUILD_CFLAGS="$(CFLAGS) $(ADDITIONAL_CFLAGS)"
+CONFIGURE_ARGS += BUILD_CPPFLAGS="$(CPPFLAGS) $(ADDITIONAL_CPPFLAGS)"
 CONFIGURE_ARGS += BUILD_LDFLAGS="$(LDFLAGS)"
 CONFIGURE_ARGS += BUILD_LIBS="$(LIBS)"
 
-PRE_COMPILE_TARGET = bind_pre_compile
-
 include ../../mk/spksrc.cross-cc.mk
 
+.PHONY: bind_pre_configure
+bind_pre_configure:
+	@$(MSG) Install libtool binary
+	sudo apt-get update
+	sudo apt-get install -y libtool-bin
+
 .PHONY: bind_pre_compile
+# libns and libisccfg must be available in the install location at compile time
+# otherwise the compilation of some binaries (rndc, dig, tools, ...) fails
+# This is a workaround, since the solution with --rpath and --rpath-link did not work.
 bind_pre_compile:
-	@$(MSG) Build gen tool for host
-	# compile gen tool with host compiler to run in build environment
-	cd $(WORK_DIR)/$(PKG_DIR)/lib/dns; gcc -I../../lib/isc/include -o gen ./gen.c
+	@$(MSG) PRE-Compile start
+	@$(MSG) Compile and install required libraries first
+	@$(RUN) $(MAKE) -C lib
+	@$(RUN) cp -f lib/ns/.libs/libns*.so $(STAGING_INSTALL_PREFIX)/lib/
+	@$(RUN) cp -f lib/isccfg/.libs/libisccfg*.so $(STAGING_INSTALL_PREFIX)/lib/
+	@$(MSG) PRE-Compile done
+	@$(MSG) Continue with regular Compile

cross/bind/PLIST

@@ -2,3 +2,15 @@ bin:bin/arpaname
 bin:bin/delv
 bin:bin/dig
 bin:bin/mdig
+lnk:lib/libbind9-9.17.22.so
+lib:lib/libbind9.so
+lnk:lib/libdns-9.17.22.so
+lib:lib/libdns.so
+lnk:lib/libirs-9.17.22.so
+lib:lib/libirs.so
+lnk:lib/libisc-9.17.22.so
+lib:lib/libisc.so
+lnk:lib/libisccfg-9.17.22.so
+lib:lib/libisccfg.so
+lnk:lib/libns-9.17.22.so
+lib:lib/libns.so

cross/bind/digests

@@ -1,3 +1,3 @@
-bind-9.16.28.tar.xz SHA1 cb2c6d7201fedf5b9af8aef6f27eebb384b50d8f
-bind-9.16.28.tar.xz SHA256 332e34dcbd723a2569efbaf4e79b62e6d56c9abd5bb8411df01533f984d1a370
-bind-9.16.28.tar.xz MD5 a77ceb5d1b47d3b38bd55f4535acd614
+bind-9.17.22.tar.xz SHA1 bdcfe49571ce5d3235ac8fa6b526bcffbc7fd9da
+bind-9.17.22.tar.xz SHA256 4a4b5d6e8aaaf401565edba619b313a84413ea1cad708f02f7969309989676f8
+bind-9.17.22.tar.xz MD5 c847849597fee25f569dd9b84d9902c9

cross/bind_9.16/Makefile

@@ -0,0 +1,53 @@
+PKG_NAME = bind
+PKG_VERS = 9.16.45
+PKG_EXT = tar.xz
+PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
+PKG_DIST_SITE = https://downloads.isc.org/isc/bind9/$(PKG_VERS)
+PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
+
+# This is the latest version that builds for ARMv5 archs.
+
+DEPENDS = cross/libuv
+DEPENDS += cross/openssl3
+DEPENDS += cross/readline
+DEPENDS += cross/jemalloc
+DEPENDS += cross/libxml2
+
+OPTIONAL_DEPENDS = cross/libcap cross/libcap_2.51
+
+# by cross/libuv
+UNSUPPORTED_ARCHS = $(OLD_PPC_ARCHS)
+
+include ../../mk/spksrc.archs.mk
+ifeq ($(findstring $(ARCH),$(ARMv5_ARCHS)),$(ARCH))
+DEPENDS += cross/libcap_2.51
+else
+DEPENDS += cross/libcap
+endif
+
+HOMEPAGE = https://www.isc.org/
+COMMENT  = BIND (Berkeley Internet Name Domain) is a complete, highly portable implementation of the DNS (Domain Name System) protocol.
+LICENSE  = MPL 2.0
+
+GNU_CONFIGURE = 1
+PRE_COMPILE_TARGET = bind_pre_compile
+
+ADDITIONAL_CFLAGS = -O2
+ADDITIONAL_CPPFLAGS = -O2
+
+CONFIGURE_ARGS  = --without-python
+CONFIGURE_ARGS += --enable-full-report
+# needed for cross compile:
+CONFIGURE_ARGS += BUILD_CC="$(CC)"
+CONFIGURE_ARGS += BUILD_CFLAGS="$(CFLAGS) $(ADDITIONAL_CFLAGS)"
+CONFIGURE_ARGS += BUILD_CPPFLAGS="$(CPPFLAGS) $(ADDITIONAL_CPPFLAGS)"
+CONFIGURE_ARGS += BUILD_LDFLAGS="$(LDFLAGS)"
+CONFIGURE_ARGS += BUILD_LIBS="$(LIBS)"
+
+include ../../mk/spksrc.cross-cc.mk
+
+.PHONY: bind_pre_compile
+bind_pre_compile:
+	@$(MSG) Build gen tool for host
+	# compile gen tool with host compiler to run in build environment
+	cd $(WORK_DIR)/$(PKG_DIR)/lib/dns; gcc -I../../lib/isc/include -o gen ./gen.c

cross/bind_9.16/PLIST

@@ -0,0 +1,4 @@
+bin:bin/arpaname
+bin:bin/delv
+bin:bin/dig
+bin:bin/mdig

cross/bind_9.16/digests

@@ -0,0 +1,3 @@
+bind-9.16.45.tar.xz SHA1 8e8b41808f9c9a7938dfc9b065e566f12d0bc509
+bind-9.16.45.tar.xz SHA256 bacefa162e71d8e308d5372f6fc6b64e96947659f6ff4353198d8d782b26d66e
+bind-9.16.45.tar.xz MD5 450c7b97b1da0c28f73087a468b164fb

cross/bind_9.16/patches/001-configure-test-for-ncursesw.patch

@@ -0,0 +1,14 @@
+#
+# let configure find -lncursesw for readline
+#
+--- configure.orig	2022-04-11 15:28:12.000000000 +0000
++++ configure	2024-01-19 21:37:28.945316208 +0000
+@@ -19547,7 +19547,7 @@
+ 			READLINE_LIB="$readline"
+ 			break
+ 		fi
+-		for lib in -lterminfo -ltermcap -lncurses -lcurses
++		for lib in -lncursesw -lterminfo -ltermcap -lncurses -lcurses
+ 		do
+ 			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline with $readline $lib" >&5
+ $as_echo "$as_me: checking for readline with $readline $lib" >&6;}

cross/gensio/Makefile

@@ -1,5 +1,5 @@
 PKG_NAME = gensio
-PKG_VERS = 2.3.9
+PKG_VERS = 2.8.2
 PKG_EXT = tar.gz
 PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://github.com/cminyard/gensio/archive
@@ -13,14 +13,14 @@ LICENSE  = GPLv2
 # qoriq is the only PPC arch that is supported
 UNSUPPORTED_ARCHS = $(OLD_PPC_ARCHS)
 
-DEPENDS = cross/openssl
+DEPENDS = cross/openssl3
 
 GNU_CONFIGURE = 1
 PRE_CONFIGURE_TARGET = gensio_pre_configure
 
 CONFIGURE_ARGS  = --disable-static
-CONFIGURE_ARGS += --with-python=no
-CONFIGURE_ARGS += --with-swig=no
+CONFIGURE_ARGS += --without-python
+CONFIGURE_ARGS += --without-swig
 CONFIGURE_ARGS += --disable-doc
 
 include ../../mk/spksrc.cross-cc.mk

cross/gensio/PLIST

@@ -1,3 +1,18 @@
 lnk:lib/libgensio.so
-lnk:lib/libgensio.so.0 
-lib:lib/libgensio.so.0.0.0
+lnk:lib/libgensio.so.6
+lib:lib/libgensio.so.6.2.0
+lnk:lib/libgensiocpp.so
+lnk:lib/libgensiocpp.so.6
+lib:lib/libgensiocpp.so.6.2.0
+lnk:lib/libgensiomdns.so
+lnk:lib/libgensiomdns.so.6
+lib:lib/libgensiomdns.so.6.2.0
+lnk:lib/libgensiomdnscpp.so
+lnk:lib/libgensiomdnscpp.so.6
+lib:lib/libgensiomdnscpp.so.6.2.0
+lnk:lib/libgensioosh.so
+lnk:lib/libgensioosh.so.6
+lib:lib/libgensioosh.so.6.2.0
+lnk:lib/libgensiooshcpp.so
+lnk:lib/libgensiooshcpp.so.6
+lib:lib/libgensiooshcpp.so.6.2.0

cross/gensio/digests

@@ -1,3 +1,3 @@
-gensio-2.3.9.tar.gz SHA1 563df4e914ee1335199f22e7a2259f1fb30df361
-gensio-2.3.9.tar.gz SHA256 ff1ba0dad0f5b259b7452eaa4f1a18debe81f8010b9ff6dc8c75fddaee040fd9
-gensio-2.3.9.tar.gz MD5 296d99c4bab43c531cab6a44261c067c
+gensio-2.8.2.tar.gz SHA1 afffaf4d731c939d84cc517daa62f3e32fdc6b84
+gensio-2.8.2.tar.gz SHA256 5cac546afd3106abdfb3eaba6c7b9eae1015fa2e93d994bd9537fff33fa413dc
+gensio-2.8.2.tar.gz MD5 af61895b827b7a5cf481aa6e7cebe8ea

cross/gensio/patches/001-disable-build-of-examples.patch

@@ -0,0 +1,31 @@
+# disable build of examples
+# the build of examples fails to find libgensiomdns.so.6
+# so simply remove the examples subdir from Mafiles
+# 
+--- Makefile.am.orig	2023-11-30 23:04:46.000000000 +0000
++++ Makefile.am	2024-01-19 10:04:39.041933898 +0000
+@@ -2,12 +2,12 @@
+ ACLOCAL_AMFLAGS = -I m4
+
+ SUBDIRS = lib $(SWIG_DIR) $(CPLUSPLUS_DIR) include $(GLIB_DIR) $(TCL_DIR) \
+-	tests tools examples
++	tools
+ if INSTALL_DOC
+ SUBDIRS += man
+ endif
+
+-DIST_SUBDIRS = lib swig c++ include glib tcl tests tools examples man
++DIST_SUBDIRS = lib swig c++ include glib tcl tools man
+
+ EXTRA_DIST = README.rst reconf ISSUES TODO
+
+--- c++/Makefile.am.orig	2023-11-30 23:04:46.000000000 +0000
++++ c++/Makefile.am	2024-01-19 10:13:23.806611625 +0000
+@@ -1,4 +1,4 @@
+
+-SUBDIRS = include lib $(SWIG_CPP_DIR) tests examples
++SUBDIRS = include lib $(SWIG_CPP_DIR) tests
+
+-DIST_SUBDIRS = include lib swig tests examples
++DIST_SUBDIRS = include lib swig tests
+

cross/gensio_2.6.8/Makefile

@@ -0,0 +1,37 @@
+PKG_NAME = gensio
+PKG_VERS = 2.6.8
+PKG_EXT = tar.gz
+PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT)
+PKG_DIST_SITE = https://github.com/cminyard/gensio/archive
+PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
+PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
+
+DEPENDS = cross/openssl3
+
+# v2.6.8 is the latest version that is compatible with ARMv5_ARCHS
+
+# qoriq is the only PPC arch that is supported
+UNSUPPORTED_ARCHS = $(OLD_PPC_ARCHS)
+
+HOMEPAGE = https://github.com/cminyard/gensio
+COMMENT  = A library to abstract stream I/O like serial port, TCP, telnet, UDP, SSL, IPMI SOL, etc.
+LICENSE  = GPLv2
+
+GNU_CONFIGURE = 1
+PRE_CONFIGURE_TARGET = gensio_pre_configure
+
+CONFIGURE_ARGS  = --disable-static
+CONFIGURE_ARGS += --without-python
+CONFIGURE_ARGS += --without-swig
+CONFIGURE_ARGS += --disable-doc
+
+include ../../mk/spksrc.cross-cc.mk
+
+ifeq ($(findstring $(ARCH),$(PPC_ARCHS)),$(ARCH))
+# archs/toolchains without compatible RS485 support (linux serial.h)
+CONFIGURE_ARGS += ac_cv_have_decl_TIOCSRS485=no
+endif
+
+.PHONY: gensio_pre_configure
+gensio_pre_configure:
+	$(RUN) autoreconf -i 

cross/gensio_2.6.8/PLIST

@@ -0,0 +1,3 @@
+lnk:lib/libgensio.so
+lnk:lib/libgensio.so.4
+lib:lib/libgensio.so.4.1.0

cross/gensio_2.6.8/digests

@@ -0,0 +1,3 @@
+gensio-2.6.8.tar.gz SHA1 90741236bf0f0f59739dc0157b4808a1a492468a
+gensio-2.6.8.tar.gz SHA256 24efef7267636055a0f7274b32cc9186208252c28b752dccaa5fa1a79b2d1538
+gensio-2.6.8.tar.gz MD5 2eb551f2ca67355eb6bbe48514534dd4

cross/inetutils/Makefile

@@ -1,11 +1,11 @@
 PKG_NAME = inetutils
-PKG_VERS = 2.4
+PKG_VERS = 2.5
 PKG_EXT = tar.xz
 PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://ftp.gnu.org/gnu/inetutils
 PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
 
-DEPENDS  = cross/ncursesw
+DEPENDS = cross/ncursesw
 
 HOMEPAGE = https://www.gnu.org/software/inetutils/
 COMMENT  = GNU network utilities.

cross/inetutils/digests

@@ -1,3 +1,3 @@
-inetutils-2.4.tar.xz SHA1 df64dd4ea0e752a839dd51dd8a6a001c9c7d1e96
-inetutils-2.4.tar.xz SHA256 1789d6b1b1a57dfe2a7ab7b533ee9f5dfd9cbf5b59bb1bb3c2612ed08d0f68b2
-inetutils-2.4.tar.xz MD5 319d65bb5a6f1847c4810651f3b4ba74
+inetutils-2.5.tar.xz SHA1 fc9ffb87faa80d660c758b9d841679239b07b09a
+inetutils-2.5.tar.xz SHA256 87697d60a31e10b5cb86a9f0651e1ec7bee98320d048c0739431aac3d5764fb6
+inetutils-2.5.tar.xz MD5 9e5a6dfd2d794dc056a770e8ad4a9263

cross/libevent/Makefile

@@ -5,7 +5,7 @@ PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://github.com/libevent/libevent/releases/download/release-$(PKG_VERS)
 PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
 
-DEPENDS = cross/openssl
+DEPENDS = cross/openssl3
 
 HOMEPAGE = https://libevent.org
 COMMENT  = Event notification library.

cross/libpcap/Makefile

@@ -1,14 +1,15 @@
 PKG_NAME = libpcap
-PKG_VERS = 1.9.1
+PKG_VERS = 1.10.4
 PKG_EXT = tar.gz
 PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://www.tcpdump.org/release
 PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
 
-# this is the latests version that builds for OLD_PPC_ARCHS
-
 DEPENDS =
 
+# latest version for OLD_PPC_ARCHS is 1.9.1
+UNSUPPORTED_ARCHS = $(OLD_PPC_ARCHS)
+
 HOMEPAGE = https://www.tcpdump.org/
 COMMENT  = Portable C/C++ library for network traffic capture.
 LICENSE  = BSD