From 91ed4c40053e4f2ff9dd9a930abb9b29998747ee Mon Sep 17 00:00:00 2001
From: hgy59 <hpgy59@gmail.com>
Date: Thu, 28 Mar 2024 08:10:13 +0100
Subject: [PATCH] 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                          |  4 +-
 cross/aria2/digests                           |  6 +--
 cross/arp-scan/Makefile                       |  9 +++-
 cross/bind/Makefile                           | 45 ++++++++++++----
 cross/bind/PLIST                              | 12 +++++
 cross/bind/digests                            |  6 +--
 cross/bind_9.16/Makefile                      | 53 +++++++++++++++++++
 cross/bind_9.16/PLIST                         |  4 ++
 cross/bind_9.16/digests                       |  3 ++
 .../001-configure-test-for-ncursesw.patch     | 14 +++++
 cross/gensio/Makefile                         |  8 +--
 cross/gensio/PLIST                            | 19 ++++++-
 cross/gensio/digests                          |  6 +--
 .../001-disable-build-of-examples.patch       | 31 +++++++++++
 cross/gensio_2.6.8/Makefile                   | 37 +++++++++++++
 cross/gensio_2.6.8/PLIST                      |  3 ++
 cross/gensio_2.6.8/digests                    |  3 ++
 cross/inetutils/Makefile                      |  4 +-
 cross/inetutils/digests                       |  6 +--
 cross/libevent/Makefile                       |  2 +-
 cross/libpcap/Makefile                        |  7 +--
 cross/libpcap/PLIST                           |  2 +-
 cross/libpcap/digests                         |  6 +--
 .../001-pcap-linux_fix-undefined-symbol.patch | 17 ++++++
 cross/libpcap_1.9/Makefile                    | 20 +++++++
 cross/libpcap_1.9/PLIST                       |  3 ++
 cross/libpcap_1.9/digests                     |  3 ++
 cross/links/Makefile                          |  2 +-
 cross/nmap_7.92/Makefile                      |  2 +-
 cross/openssh/Makefile                        |  4 +-
 cross/openssh/digests                         |  6 +--
 cross/rsync/Makefile                          |  2 +-
 cross/screen/Makefile                         |  2 +-
 cross/screen/digests                          |  6 +--
 cross/ser2net/Makefile                        | 14 ++++-
 cross/ser2net/digests                         |  6 +--
 cross/socat/Makefile                          |  6 +--
 cross/socat/PLIST                             |  6 ++-
 cross/socat/digests                           |  6 +--
 cross/xxhash/Makefile                         |  6 +--
 cross/xxhash/PLIST                            |  2 +-
 cross/xxhash/digests                          |  6 +--
 cross/xxhash/patches/001-fix_Makefile.patch   | 53 +++++++++++++++++++
 diyspk/aria2/Makefile                         |  3 +-
 diyspk/autossh/Makefile                       |  5 +-
 diyspk/bind/Makefile                          | 15 ++++--
 diyspk/inetutils/Makefile                     |  2 +-
 diyspk/screen/Makefile                        |  4 +-
 diyspk/ser2net/Makefile                       |  2 +-
 diyspk/socat/Makefile                         |  5 +-
 diyspk/zstd/Makefile                          |  6 +--
 spk/synocli-net/Makefile                      | 18 ++++---
 52 files changed, 423 insertions(+), 99 deletions(-)
 create mode 100644 cross/bind_9.16/Makefile
 create mode 100644 cross/bind_9.16/PLIST
 create mode 100644 cross/bind_9.16/digests
 create mode 100644 cross/bind_9.16/patches/001-configure-test-for-ncursesw.patch
 create mode 100644 cross/gensio/patches/001-disable-build-of-examples.patch
 create mode 100644 cross/gensio_2.6.8/Makefile
 create mode 100644 cross/gensio_2.6.8/PLIST
 create mode 100644 cross/gensio_2.6.8/digests
 create mode 100644 cross/libpcap/patches/001-pcap-linux_fix-undefined-symbol.patch
 create mode 100644 cross/libpcap_1.9/Makefile
 create mode 100644 cross/libpcap_1.9/PLIST
 create mode 100644 cross/libpcap_1.9/digests
 create mode 100644 cross/xxhash/patches/001-fix_Makefile.patch

diff --git a/cross/aria2/Makefile b/cross/aria2/Makefile
index 9c5abd8ee4f..2f9530bcd0b 100644
--- a/cross/aria2/Makefile
+++ b/cross/aria2/Makefile
@@ -1,5 +1,5 @@
 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)
@@ -7,7 +7,7 @@ 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
diff --git a/cross/aria2/digests b/cross/aria2/digests
index b32d36f3a6c..917043428f7 100644
--- a/cross/aria2/digests
+++ b/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
diff --git a/cross/arp-scan/Makefile b/cross/arp-scan/Makefile
index cbea9a4193a..4b54deb9c34 100644
--- a/cross/arp-scan/Makefile
+++ b/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
diff --git a/cross/bind/Makefile b/cross/bind/Makefile
index ad52b4d001d..4301bb52c6c 100644
--- a/cross/bind/Makefile
+++ b/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
diff --git a/cross/bind/PLIST b/cross/bind/PLIST
index 2540bee974e..c4946240ba1 100644
--- a/cross/bind/PLIST
+++ b/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
diff --git a/cross/bind/digests b/cross/bind/digests
index 300914aea3f..02bef743f84 100644
--- a/cross/bind/digests
+++ b/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
diff --git a/cross/bind_9.16/Makefile b/cross/bind_9.16/Makefile
new file mode 100644
index 00000000000..c746ed55f8f
--- /dev/null
+++ b/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
diff --git a/cross/bind_9.16/PLIST b/cross/bind_9.16/PLIST
new file mode 100644
index 00000000000..2540bee974e
--- /dev/null
+++ b/cross/bind_9.16/PLIST
@@ -0,0 +1,4 @@
+bin:bin/arpaname
+bin:bin/delv
+bin:bin/dig
+bin:bin/mdig
diff --git a/cross/bind_9.16/digests b/cross/bind_9.16/digests
new file mode 100644
index 00000000000..a2651fb6502
--- /dev/null
+++ b/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
diff --git a/cross/bind_9.16/patches/001-configure-test-for-ncursesw.patch b/cross/bind_9.16/patches/001-configure-test-for-ncursesw.patch
new file mode 100644
index 00000000000..9287ad3e61c
--- /dev/null
+++ b/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;}
diff --git a/cross/gensio/Makefile b/cross/gensio/Makefile
index 734a6160956..8363580da6d 100644
--- a/cross/gensio/Makefile
+++ b/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
diff --git a/cross/gensio/PLIST b/cross/gensio/PLIST
index e927b2090d7..f96870bacc2 100644
--- a/cross/gensio/PLIST
+++ b/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
diff --git a/cross/gensio/digests b/cross/gensio/digests
index 94530029395..2224c305384 100644
--- a/cross/gensio/digests
+++ b/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
diff --git a/cross/gensio/patches/001-disable-build-of-examples.patch b/cross/gensio/patches/001-disable-build-of-examples.patch
new file mode 100644
index 00000000000..6bbc50f024a
--- /dev/null
+++ b/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
+ 
diff --git a/cross/gensio_2.6.8/Makefile b/cross/gensio_2.6.8/Makefile
new file mode 100644
index 00000000000..e12692f68e2
--- /dev/null
+++ b/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 
diff --git a/cross/gensio_2.6.8/PLIST b/cross/gensio_2.6.8/PLIST
new file mode 100644
index 00000000000..57b6271d5a2
--- /dev/null
+++ b/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
diff --git a/cross/gensio_2.6.8/digests b/cross/gensio_2.6.8/digests
new file mode 100644
index 00000000000..99cf6877a21
--- /dev/null
+++ b/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
diff --git a/cross/inetutils/Makefile b/cross/inetutils/Makefile
index 5c7861882fa..cd7e8729df5 100644
--- a/cross/inetutils/Makefile
+++ b/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.
diff --git a/cross/inetutils/digests b/cross/inetutils/digests
index 47403f092e8..60f077b3d28 100644
--- a/cross/inetutils/digests
+++ b/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
diff --git a/cross/libevent/Makefile b/cross/libevent/Makefile
index bb96c408770..00c9417ba50 100644
--- a/cross/libevent/Makefile
+++ b/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.
diff --git a/cross/libpcap/Makefile b/cross/libpcap/Makefile
index 23850310686..2189730cf24 100644
--- a/cross/libpcap/Makefile
+++ b/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
diff --git a/cross/libpcap/PLIST b/cross/libpcap/PLIST
index 657d142d0ef..2dc37b06742 100644
--- a/cross/libpcap/PLIST
+++ b/cross/libpcap/PLIST
@@ -1,3 +1,3 @@
 lnk:lib/libpcap.so
 lnk:lib/libpcap.so.1
-lib:lib/libpcap.so.1.9.1
+lib:lib/libpcap.so.1.10.4
diff --git a/cross/libpcap/digests b/cross/libpcap/digests
index e41c02adbca..bc3899a4c79 100644
--- a/cross/libpcap/digests
+++ b/cross/libpcap/digests
@@ -1,3 +1,3 @@
-libpcap-1.9.1.tar.gz SHA1 04d6e619defad5bb17af15f6d2304e79b649786c
-libpcap-1.9.1.tar.gz SHA256 635237637c5b619bcceba91900666b64d56ecb7be63f298f601ec786ce087094
-libpcap-1.9.1.tar.gz MD5 21af603d9a591c7d96a6457021d84e6c
+libpcap-1.10.4.tar.gz SHA1 818cbe70179c73eebfe1038854665f33aac64245
+libpcap-1.10.4.tar.gz SHA256 ed19a0383fad72e3ad435fd239d7cd80d64916b87269550159d20e47160ebe5f
+libpcap-1.10.4.tar.gz MD5 0322e28dd76cda8066bb6d00fee5969b
diff --git a/cross/libpcap/patches/001-pcap-linux_fix-undefined-symbol.patch b/cross/libpcap/patches/001-pcap-linux_fix-undefined-symbol.patch
new file mode 100644
index 00000000000..176e8e5716b
--- /dev/null
+++ b/cross/libpcap/patches/001-pcap-linux_fix-undefined-symbol.patch
@@ -0,0 +1,17 @@
+# 
+# avoid error: 'NETLINK_GENERIC' undeclared (first use in this function)
+# NETLINK_GENERIC is defined in linux/netlink.h
+# 
+# This error occurred for ARMv5 and PPC archs only,
+# but this patch does not harm other builds.
+#
+--- pcap-linux.c.orig	2023-04-07 16:15:01.000000000 +0000
++++ pcap-linux.c	2024-01-19 11:12:48.897128500 +0000
+@@ -93,6 +93,7 @@
+ #include <netinet/in.h>
+ #include <linux/if_ether.h>
+ #include <linux/if_arp.h>
++#include <linux/netlink.h>
+ #include <poll.h>
+ #include <dirent.h>
+ #include <sys/eventfd.h>
diff --git a/cross/libpcap_1.9/Makefile b/cross/libpcap_1.9/Makefile
new file mode 100644
index 00000000000..23850310686
--- /dev/null
+++ b/cross/libpcap_1.9/Makefile
@@ -0,0 +1,20 @@
+PKG_NAME = libpcap
+PKG_VERS = 1.9.1
+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 =
+
+HOMEPAGE = https://www.tcpdump.org/
+COMMENT  = Portable C/C++ library for network traffic capture.
+LICENSE  = BSD
+
+GNU_CONFIGURE = 1
+CONFIGURE_ARGS  = --with-pcap=linux
+ADDITIONAL_CFLAGS = -O
+
+include ../../mk/spksrc.cross-cc.mk
diff --git a/cross/libpcap_1.9/PLIST b/cross/libpcap_1.9/PLIST
new file mode 100644
index 00000000000..657d142d0ef
--- /dev/null
+++ b/cross/libpcap_1.9/PLIST
@@ -0,0 +1,3 @@
+lnk:lib/libpcap.so
+lnk:lib/libpcap.so.1
+lib:lib/libpcap.so.1.9.1
diff --git a/cross/libpcap_1.9/digests b/cross/libpcap_1.9/digests
new file mode 100644
index 00000000000..e41c02adbca
--- /dev/null
+++ b/cross/libpcap_1.9/digests
@@ -0,0 +1,3 @@
+libpcap-1.9.1.tar.gz SHA1 04d6e619defad5bb17af15f6d2304e79b649786c
+libpcap-1.9.1.tar.gz SHA256 635237637c5b619bcceba91900666b64d56ecb7be63f298f601ec786ce087094
+libpcap-1.9.1.tar.gz MD5 21af603d9a591c7d96a6457021d84e6c
diff --git a/cross/links/Makefile b/cross/links/Makefile
index 2252d5dc0c3..496e540f549 100644
--- a/cross/links/Makefile
+++ b/cross/links/Makefile
@@ -5,7 +5,7 @@ PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = http://links.twibright.com/download
 PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
 
-DEPENDS = cross/bzip2 cross/libevent cross/openssl cross/xz cross/zlib
+DEPENDS = cross/bzip2 cross/libevent cross/openssl3 cross/xz cross/zlib
 
 HOMEPAGE = http://links.twibright.com/
 COMMENT  = Links is a web browser running in text mode.
diff --git a/cross/nmap_7.92/Makefile b/cross/nmap_7.92/Makefile
index 38f32f46c35..bfc5a92180e 100644
--- a/cross/nmap_7.92/Makefile
+++ b/cross/nmap_7.92/Makefile
@@ -6,7 +6,7 @@ PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://nmap.org/dist
 PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
 
-DEPENDS = cross/libpcap cross/openssl
+DEPENDS = cross/libpcap_1.9 cross/openssl3
 
 HOMEPAGE = https://nmap.org/
 COMMENT  = Nmap ("Network Mapper") is a free and open source utility for network discovery and security auditing.
diff --git a/cross/openssh/Makefile b/cross/openssh/Makefile
index 82ca9f48158..a52146ed3e4 100644
--- a/cross/openssh/Makefile
+++ b/cross/openssh/Makefile
@@ -1,11 +1,11 @@
 PKG_NAME = openssh
-PKG_VERS = 9.3p1
+PKG_VERS = 9.6p1
 PKG_EXT = tar.gz
 PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://cdn.openbsd.org/pub/OpenBSD/OpenSSH/portable
 PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
 
-DEPENDS = cross/zlib cross/openssl
+DEPENDS = cross/zlib cross/openssl3
 
 HOMEPAGE = https://www.openssh.com/
 COMMENT  = Open source version of SSH connectivity tools.
diff --git a/cross/openssh/digests b/cross/openssh/digests
index 0cc3417133a..733c51e7e0e 100644
--- a/cross/openssh/digests
+++ b/cross/openssh/digests
@@ -1,3 +1,3 @@
-openssh-9.3p1.tar.gz SHA1 610959871bf8d6baafc3525811948f85b5dd84ab
-openssh-9.3p1.tar.gz SHA256 e9baba7701a76a51f3d85a62c383a3c9dcd97fa900b859bc7db114c1868af8a8
-openssh-9.3p1.tar.gz MD5 3430d5e6e71419e28f440a42563cb553
+openssh-9.6p1.tar.gz SHA1 de300d09ec79fdbf37de4e6672cce4161439f2c3
+openssh-9.6p1.tar.gz SHA256 910211c07255a8c5ad654391b40ee59800710dd8119dd5362de09385aa7a777c
+openssh-9.6p1.tar.gz MD5 5e90def5af3ffb27e149ca6fff12bef3
diff --git a/cross/rsync/Makefile b/cross/rsync/Makefile
index 970afa09759..cab6bbb4262 100755
--- a/cross/rsync/Makefile
+++ b/cross/rsync/Makefile
@@ -5,7 +5,7 @@ PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
 PKG_DIST_SITE = https://download.samba.org/pub/rsync/src
 PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 
-DEPENDS = cross/xxhash cross/openssl cross/lz4 cross/zstd
+DEPENDS = cross/xxhash cross/openssl3 cross/lz4 cross/zstd
 
 HOMEPAGE = https://rsync.samba.org/
 COMMENT  = Rsync is a fast and extraordinarily versatile file copying tool. It can copy locally, to/from another host over any remote shell, or to/from a remote rsync daemon. It offers a large number of options that control every aspect of its behavior and permit very flexible specification of the set of files to be copied. It is famous for its delta-transfer algorithm, which reduces the amount of data sent over the network by sending only the differences between the source files and the existing files in the destination. Rsync is widely used for backups and mirroring and as an improved copy command for everyday use. 
diff --git a/cross/screen/Makefile b/cross/screen/Makefile
index ae84c9b8b05..10ab66ff134 100644
--- a/cross/screen/Makefile
+++ b/cross/screen/Makefile
@@ -1,5 +1,5 @@
 PKG_NAME = screen
-PKG_VERS = 4.9.0
+PKG_VERS = 4.9.1
 PKG_EXT = tar.gz
 PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://ftp.gnu.org/gnu/screen
diff --git a/cross/screen/digests b/cross/screen/digests
index 73fe3adfa2e..6d77bc890fd 100644
--- a/cross/screen/digests
+++ b/cross/screen/digests
@@ -1,3 +1,3 @@
-screen-4.9.0.tar.gz SHA1 ef68bc9ca3b7dbbbf0f4f707c2afaf9ed67418b9
-screen-4.9.0.tar.gz SHA256 f9335281bb4d1538ed078df78a20c2f39d3af9a4e91c57d084271e0289c730f4
-screen-4.9.0.tar.gz MD5 b1ef8ed89134d335e614016634982b6d
+screen-4.9.1.tar.gz SHA1 8b0572957a6e4ed2e7e2dece525ff85d10a00eef
+screen-4.9.1.tar.gz SHA256 26cef3e3c42571c0d484ad6faf110c5c15091fbf872b06fa7aa4766c7405ac69
+screen-4.9.1.tar.gz MD5 9a9bdc956bd93e4f0cb9e48678889e26
diff --git a/cross/ser2net/Makefile b/cross/ser2net/Makefile
index 12b2d6e1a58..8ebc27fd3df 100644
--- a/cross/ser2net/Makefile
+++ b/cross/ser2net/Makefile
@@ -1,12 +1,14 @@
 PKG_NAME = ser2net
-PKG_VERS = 4.3.12
+PKG_VERS = 4.6.0
 PKG_EXT = tar.gz
 PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://github.com/cminyard/ser2net/archive
 PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
 
-DEPENDS = cross/gensio cross/libyaml
+DEPENDS = cross/libyaml
+
+OPTIONAL_DEPENDS = cross/gensio cross/gensio_2.6.8
 
 # cross/gensio
 UNSUPPORTED_ARCHS = $(OLD_PPC_ARCHS)
@@ -21,6 +23,14 @@ POST_INSTALL_TARGET = ser2net_post_install
 
 include ../../mk/spksrc.cross-cc.mk
 
+ifeq ($(findstring $(ARCH),$(ARMv5_ARCHS)),$(ARCH))
+DEPENDS += cross/gensio_2.6.8
+else ifeq ($(call version_lt, ${TCVERSION}, 6.0)$(call version_ge, ${TCVERSION}, 3.0),11)
+DEPENDS += cross/gensio_2.6.8
+else
+DEPENDS += cross/gensio
+endif
+
 .PHONY: ser2net_pre_configure
 ser2net_pre_configure:
 	$(RUN) ; ./reconf
diff --git a/cross/ser2net/digests b/cross/ser2net/digests
index b3177bbb78a..c14e9eac739 100644
--- a/cross/ser2net/digests
+++ b/cross/ser2net/digests
@@ -1,3 +1,3 @@
-ser2net-4.3.12.tar.gz SHA1 c664e4e5b854a7a0232321154343139902e9f3f7
-ser2net-4.3.12.tar.gz SHA256 40195025eeb17021bb7d525820b32beb50f8c3f65a75f3dfbb67079258d21796
-ser2net-4.3.12.tar.gz MD5 0fb3e98eb45c9a7ccb8cfde58835e64e
+ser2net-4.6.0.tar.gz SHA1 81c06fa85b219317d62de79d1e13749314697855
+ser2net-4.6.0.tar.gz SHA256 859ffa1e1f08b7bf13134016fed00acfee64c1cc376cc3e1739d2832fd33ef94
+ser2net-4.6.0.tar.gz MD5 519027a9ec1e9fbc5c7da8382b9645cb
diff --git a/cross/socat/Makefile b/cross/socat/Makefile
index 19782d26b15..01ae8e76a2c 100644
--- a/cross/socat/Makefile
+++ b/cross/socat/Makefile
@@ -1,14 +1,14 @@
 PKG_NAME = socat
-PKG_VERS = 1.7.4.4
+PKG_VERS = 1.8.0.0
 PKG_EXT = tar.bz2
 PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = http://www.dest-unreach.org/socat/download
 PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
 
-DEPENDS = cross/openssl
+DEPENDS = cross/openssl3
 
 HOMEPAGE = http://www.dest-unreach.org/socat/
-COMMENT  = socat - Multipurpose relay \(SOcket CAT)\. Socat is a command line based utility that establishes two bidirectional byte streams and transfers data between them. Because the streams can be constructed from a large set of different types of data sinks and sources, and because lots of address options may be applied to the streams, socat can be used for many different purposes.  
+COMMENT  = socat - Multipurpose relay \(SOcket CAT)\. Socat is a command line based utility that establishes two bidirectional byte streams and transfers data between them. Because the streams can be constructed from a large set of different types of data sinks and sources, and because lots of address options may be applied to the streams, socat can be used for many different purposes.
 LICENSE  = GPLv2
 
 GNU_CONFIGURE = 1
diff --git a/cross/socat/PLIST b/cross/socat/PLIST
index 1b0a43bb120..6eb1daf49ca 100644
--- a/cross/socat/PLIST
+++ b/cross/socat/PLIST
@@ -1,3 +1,7 @@
 bin:bin/filan
 bin:bin/procan
-bin:bin/socat
+lnk:bin/socat
+bin:bin/socat1
+rsc:bin/socat-broker.sh
+rsc:bin/socat-chain.sh
+rsc:bin/socat-mux.sh
diff --git a/cross/socat/digests b/cross/socat/digests
index cefc7a02051..91df8f2d94c 100644
--- a/cross/socat/digests
+++ b/cross/socat/digests
@@ -1,3 +1,3 @@
-socat-1.7.4.4.tar.bz2 SHA1 4f3e79f5d428a12284bd373c00e1f54760f0db0a
-socat-1.7.4.4.tar.bz2 SHA256 fbd42bd2f0e54a3af6d01bdf15385384ab82dbc0e4f1a5e153b3e0be1b6380ac
-socat-1.7.4.4.tar.bz2 MD5 a605d3779465f42c07fc507cfbfb08f9
+socat-1.8.0.0.tar.bz2 SHA1 45915619996db1159ea79a6a23ec3ae27db6eeb9
+socat-1.8.0.0.tar.bz2 SHA256 e1de683dd22ee0e3a6c6bbff269abe18ab0c9d7eb650204f125155b9005faca7
+socat-1.8.0.0.tar.bz2 MD5 51f9ecdf5d942d0a3c150ea400eb89ef
diff --git a/cross/xxhash/Makefile b/cross/xxhash/Makefile
index 7ae4fa02ed6..774dfe4cf8a 100644
--- a/cross/xxhash/Makefile
+++ b/cross/xxhash/Makefile
@@ -1,5 +1,5 @@
 PKG_NAME = xxHash
-PKG_VERS = 0.8.1
+PKG_VERS = 0.8.2
 PKG_EXT = tar.gz
 PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://github.com/Cyan4973/xxHash/archive
@@ -8,8 +8,8 @@ PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
 
 DEPENDS =
 
-HOMEPAGE = https://cyan4973.github.io/xxHash/
-COMMENT  = Extremely fast non-cryptographic hash algorithm.
+HOMEPAGE = https://xxhash.com/
+COMMENT  = xxHash is an extremely fast non-cryptographic hash algorithm, working at RAM speed limit. It is proposed in four flavors (XXH32, XXH64, XXH3_64bits and XXH3_128bits). The latest variant, XXH3, offers improved performance across the board, especially on small data.
 LICENSE  = 2-Clause BSD
 
 CONFIGURE_TARGET = nop
diff --git a/cross/xxhash/PLIST b/cross/xxhash/PLIST
index ef3a70cae8f..b4debee805a 100644
--- a/cross/xxhash/PLIST
+++ b/cross/xxhash/PLIST
@@ -4,4 +4,4 @@ lnk:bin/xxh64sum
 bin:bin/xxhsum
 lnk:lib/libxxhash.so
 lnk:lib/libxxhash.so.0
-lib:lib/libxxhash.so.0.8.1
+lib:lib/libxxhash.so.0.8.2
diff --git a/cross/xxhash/digests b/cross/xxhash/digests
index ac2f3cdf699..1fc59d83524 100644
--- a/cross/xxhash/digests
+++ b/cross/xxhash/digests
@@ -1,3 +1,3 @@
-xxHash-0.8.1.tar.gz SHA1 a92c9a9cfbef23e52f2d1b581cb9926c680d261d
-xxHash-0.8.1.tar.gz SHA256 3bb6b7d6f30c591dd65aaaff1c8b7a5b94d81687998ca9400082c739a690436c
-xxHash-0.8.1.tar.gz MD5 b67c587f5ff4894253da0095ba7ea393
+xxHash-0.8.2.tar.gz SHA1 8df702581ebc48a5e05be0f1ede6e1e9139e4da1
+xxHash-0.8.2.tar.gz SHA256 baee0c6afd4f03165de7a4e67988d16f0f2b257b51d0e3cb91909302a26a79c4
+xxHash-0.8.2.tar.gz MD5 a7628d7a4fd608a7573c5a3e2c856ea5
diff --git a/cross/xxhash/patches/001-fix_Makefile.patch b/cross/xxhash/patches/001-fix_Makefile.patch
new file mode 100644
index 00000000000..bd73c78355a
--- /dev/null
+++ b/cross/xxhash/patches/001-fix_Makefile.patch
@@ -0,0 +1,53 @@
+#
+# avoid the use of INSTALL_DIR variable to create directories for install targets
+# 
+--- Makefile.orig	2023-07-21 10:01:35.000000000 +0000
++++ Makefile	2024-01-20 08:47:46.077523039 +0000
+@@ -535,7 +535,7 @@
+ 
+ INSTALL_PROGRAM ?= $(INSTALL)
+ INSTALL_DATA    ?= $(INSTALL) -m 644
+-INSTALL_DIR     ?= $(INSTALL) -d -m 755
++CREATE_DIR      ?= $(INSTALL) -d -m 755
+ 
+ 
+ # Escape special symbols by putting each character into its separate class
+@@ -574,12 +574,12 @@
+ 
+ install_libxxhash.a: libxxhash.a
+ 	@echo Installing libxxhash.a
+-	$(Q)$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
++	$(Q)$(CREATE_DIR) $(DESTDIR)$(LIBDIR)
+ 	$(Q)$(INSTALL_DATA) libxxhash.a $(DESTDIR)$(LIBDIR)
+ 
+ install_libxxhash: libxxhash
+ 	@echo Installing libxxhash
+-	$(Q)$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
++	$(Q)$(CREATE_DIR) $(DESTDIR)$(LIBDIR)
+ 	$(Q)$(INSTALL_PROGRAM) $(LIBXXH) $(DESTDIR)$(LIBDIR)
+ 	$(Q)ln -sf $(LIBXXH) $(DESTDIR)$(LIBDIR)/libxxhash.$(SHARED_EXT_MAJOR)
+ 	$(Q)ln -sf $(LIBXXH) $(DESTDIR)$(LIBDIR)/libxxhash.$(SHARED_EXT)
+@@ -594,12 +594,12 @@
+ 
+ install_libxxhash.pc: libxxhash.pc
+ 	@echo Installing pkgconfig
+-	$(Q)$(INSTALL_DIR) $(DESTDIR)$(PKGCONFIGDIR)/
++	$(Q)$(CREATE_DIR) $(DESTDIR)$(PKGCONFIGDIR)/
+ 	$(Q)$(INSTALL_DATA) libxxhash.pc $(DESTDIR)$(PKGCONFIGDIR)/
+ 
+ install_xxhsum: xxhsum
+ 	@echo Installing xxhsum
+-	$(Q)$(INSTALL_DIR) $(DESTDIR)$(BINDIR)/
++	$(Q)$(CREATE_DIR) $(DESTDIR)$(BINDIR)/
+ 	$(Q)$(INSTALL_PROGRAM) xxhsum $(DESTDIR)$(BINDIR)/xxhsum
+ 	$(Q)ln -sf xxhsum $(DESTDIR)$(BINDIR)/xxh32sum
+ 	$(Q)ln -sf xxhsum $(DESTDIR)$(BINDIR)/xxh64sum
+@@ -607,7 +607,7 @@
+ 
+ install_man:
+ 	@echo Installing man pages
+-	$(Q)$(INSTALL_DIR) $(DESTDIR)$(MANDIR)/
++	$(Q)$(CREATE_DIR) $(DESTDIR)$(MANDIR)/
+ 	$(Q)$(INSTALL_DATA) $(MAN) $(DESTDIR)$(MANDIR)/xxhsum.1
+ 	$(Q)ln -sf xxhsum.1 $(DESTDIR)$(MANDIR)/xxh32sum.1
+ 	$(Q)ln -sf xxhsum.1 $(DESTDIR)$(MANDIR)/xxh64sum.1
diff --git a/diyspk/aria2/Makefile b/diyspk/aria2/Makefile
index b4ad0903124..40a4dfc21a9 100644
--- a/diyspk/aria2/Makefile
+++ b/diyspk/aria2/Makefile
@@ -1,5 +1,5 @@
 SPK_NAME = aria2
-SPK_VERS = 1.36.0
+SPK_VERS = 1.37.0
 SPK_REV = 1
 SPK_ICON = src/aria2.png
 
@@ -9,7 +9,6 @@ MAINTAINER = cnrat
 DESCRIPTION = aria2 is a lightweight multi-protocol and multi-source command-line download utility.
 DESCRIPTION_CHS = Aria2是一个命令行下运行、多协议、多来源下载工具（HTTP/HTTPS、FTP、BitTorrent、Metalink）。
 DISPLAY_NAME = Aria2
-CHANGELOG = "Initial package release."
 
 STARTABLE = no
 
diff --git a/diyspk/autossh/Makefile b/diyspk/autossh/Makefile
index 633538bbf69..833ecd3be80 100644
--- a/diyspk/autossh/Makefile
+++ b/diyspk/autossh/Makefile
@@ -1,9 +1,8 @@
 SPK_NAME = autossh
 SPK_VERS = 1.4g
-SPK_REV = 2
-CHANGELOG = "1. Update OpenSSL to v1.1.<br/>2. Update OpenSSH to v8.4."
+SPK_REV = 1
 
-DEPENDS = cross/$(SPK_NAME)
+DEPENDS = cross/autossh
 
 MAINTAINER = chrisellsworth
 DESCRIPTION = Automatically restart SSH sessions and tunnels. autossh is a program to start a copy of ssh and monitor it, restarting it as necessary should it die or stop passing traffic. The idea is from rstunnel (Reliable SSH Tunnel), but implemented in C.
diff --git a/diyspk/bind/Makefile b/diyspk/bind/Makefile
index 81e4e1fdb52..e387d2510ad 100644
--- a/diyspk/bind/Makefile
+++ b/diyspk/bind/Makefile
@@ -1,19 +1,24 @@
 SPK_NAME = bind
-SPK_VERS = 9.16.28
+SPK_VERS = 9.17.22
 SPK_REV = 1
 
-DEPENDS = cross/bind
-
 UNSUPPORTED_ARCHS = $(OLD_PPC_ARCHS)
 
+OPTIONAL_DEPENDS = cross/bind cross/bind_9.16
+
 MAINTAINER = SynoCommunity
-DESCRIPTION = BIND (Berkeley Internet Name Domain) is a complete, highly portable implementation of the DNS (Domain Name System) protocol.
+DESCRIPTION = BIND \(Berkeley Internet Name Domain\) is a complete, highly portable implementation of the DNS \(Domain Name System\) protocol.
 STARTABLE = no
 
 HOMEPAGE = https://www.isc.org/
 LICENSE = MPL 2.0
 
 SPK_COMMANDS = bin/arpaname bin/delv bin/dig bin/mdig
-SPK_COMMANDS += sbin/getcap sbin/getpcaps sbin/capsh sbin/setcap
 
 include ../../mk/spksrc.spk.mk
+
+ifeq ($(findstring $(ARCH),$(ARMv5_ARCHS)),$(ARCH))
+DEPENDS += cross/bind_9.16
+else
+DEPENDS += cross/bind
+endif
diff --git a/diyspk/inetutils/Makefile b/diyspk/inetutils/Makefile
index fa58fc701c3..c152e793cd4 100644
--- a/diyspk/inetutils/Makefile
+++ b/diyspk/inetutils/Makefile
@@ -1,5 +1,5 @@
 SPK_NAME = inetutils
-SPK_VERS = 2.2
+SPK_VERS = 2.5
 SPK_REV = 1
 
 DEPENDS = cross/inetutils
diff --git a/diyspk/screen/Makefile b/diyspk/screen/Makefile
index 445f40d19ca..3b4fee4b1aa 100644
--- a/diyspk/screen/Makefile
+++ b/diyspk/screen/Makefile
@@ -1,8 +1,8 @@
 SPK_NAME = screen
-SPK_VERS = 4.9.0
+SPK_VERS = 4.9.1
 SPK_REV = 1
 
-DEPENDS = cross/$(SPK_NAME)
+DEPENDS = cross/screen
 
 MAINTAINER = SynoCommunity
 DESCRIPTION = Screen is a full-screen window manager that multiplexes a physical terminal between several processes, typically interactive shells.
diff --git a/diyspk/ser2net/Makefile b/diyspk/ser2net/Makefile
index bd08406fc32..730456fd41e 100644
--- a/diyspk/ser2net/Makefile
+++ b/diyspk/ser2net/Makefile
@@ -1,5 +1,5 @@
 SPK_NAME = ser2net
-SPK_VERS = 4.3.12
+SPK_VERS = 4.6.0
 SPK_REV = 1
 SPK_ICON = src/ser2net.png
 
diff --git a/diyspk/socat/Makefile b/diyspk/socat/Makefile
index 9c3d8bfa9e4..478b9f7bc47 100644
--- a/diyspk/socat/Makefile
+++ b/diyspk/socat/Makefile
@@ -1,5 +1,5 @@
 SPK_NAME = socat
-SPK_VERS = 1.7.4.4
+SPK_VERS = 1.8.0.0
 SPK_REV = 1
 
 DEPENDS = cross/socat
@@ -13,6 +13,7 @@ STARTABLE = no
 HOMEPAGE = http://www.dest-unreach.org/socat/
 LICENSE = GPLv2
 
-SPK_COMMANDS = bin/socat bin/filan bin/procan
+SPK_COMMANDS = bin/socat bin/socat1 bin/filan bin/procan
+SPK_COMMANDS += bin/socat-broker.sh bin/socat-chain.sh bin/socat-mux.sh
 
 include ../../mk/spksrc.spk.mk
diff --git a/diyspk/zstd/Makefile b/diyspk/zstd/Makefile
index 89d1858bc21..afc0dad5c0e 100644
--- a/diyspk/zstd/Makefile
+++ b/diyspk/zstd/Makefile
@@ -1,5 +1,5 @@
 SPK_NAME = zstd
-SPK_VERS = 1.4.3
+SPK_VERS = 1.5.5
 SPK_REV = 1
 SPK_ICON = src/zstd.png
 
@@ -10,11 +10,9 @@ DESCRIPTION = Zstandard is a fast compression algorithm, providing high compress
 DISPLAY_NAME = Zstandard
 STARTABLE = no
 
-CHANGELOG = Initial package release
-
 HOMEPAGE = https://facebook.github.io/zstd/
 LICENSE  = GPLv2/BSD
 
-SPK_COMMANDS = bin/unzstd bin/zstdcat bin/zstdmt bin/zstd bin/zstdgrep bin/zstdless
+SPK_COMMANDS = bin/zstd bin/unzstd bin/zstdcat bin/zstdmt bin/zstdgrep bin/zstdless bin/zstd-frugal
 
 include ../../mk/spksrc.spk.mk
diff --git a/spk/synocli-net/Makefile b/spk/synocli-net/Makefile
index 0fa07166a0d..ba5479b2ca1 100644
--- a/spk/synocli-net/Makefile
+++ b/spk/synocli-net/Makefile
@@ -1,6 +1,6 @@
 SPK_NAME = synocli-net
-SPK_VERS = 2.3
-SPK_REV = 17
+SPK_VERS = 2.4
+SPK_REV = 18
 SPK_ICON = src/synocli-net.png
 
 DEPENDS = cross/screen cross/tmux cross/links cross/socat
@@ -10,14 +10,18 @@ DEPENDS += cross/etherwake
 DEPENDS += cross/inetutils
 DEPENDS += cross/netcat
 
-OPTIONAL_DEPENDS = cross/sshfs2 cross/sshfs3 cross/ser2net cross/bind cross/aria2 cross/nmap cross/nmap_7.92
+OPTIONAL_DEPENDS = cross/sshfs2 cross/sshfs3 cross/ser2net cross/bind cross/bind_9.16 cross/aria2 cross/nmap cross/nmap_7.92
 
 include ../../mk/spksrc.common.mk
 
 OPTIONAL_DESC =
 
 ifneq ($(findstring $(ARCH),$(OLD_PPC_ARCHS)),$(ARCH))
+ifeq ($(findstring $(ARCH),$(ARMv5_ARCHS)),$(ARCH))
+DEPENDS += cross/bind_9.16
+else
 DEPENDS += cross/bind
+endif
 OPTIONAL_DESC := $(OPTIONAL_DESC)", arpaname, delv, dig, mdig"
 DEPENDS += cross/ser2net
 OPTIONAL_DESC := $(OPTIONAL_DESC)", ser2net"
@@ -45,10 +49,10 @@ endif
 
 
 MAINTAINER = ymartin59
-DESCRIPTION = "SynoCli Network Tools provides a set of small command-line utilities: screen, tmux, socat, nmap, arp-scan, mtr \(My traceroute\), links, rsync, autossh \(including openssh, sftp and scp\), etherwake, telnet, whois, sshfs$(OPTIONAL_DESC)."
+DESCRIPTION = "SynoCli Network Tools provides a set of small command-line utilities: screen, tmux, socat, nmap, arp-scan, mtr \(My traceroute\), links, rsync, xxhsum, autossh \(including openssh, sftp and scp\), etherwake, telnet, whois, sshfs$(OPTIONAL_DESC)."
 DISPLAY_NAME = SynoCli Network Tools
 STARTABLE = no
-CHANGELOG = "1. Add netcat.<br/>2. Update openssl to v1.1.1u.<br/>3. Update nmap to v7.94 and include ncat (latest nmap for old ppc archs is v7.92).<br/>4. Update ser2net to v4.3.12."
+CHANGELOG = "1. Update aria2 to v1.37.0.<br/>2. Update bind to v9.17.22 (on ARMv5 v9.16.45).<br/>3. Update inetutils (telnet, whois) to v2.5.<br/>4. Update openssl to v3.1.5.<br/>5. Update openssh to v9.6p1.<br/>6. Update screen to v4.9.1.<br/>7. Update ser2net to v4.6.0.<br/>8. Update socat to v1.8.0.0.<br/>9. Add xxHsum tools, bundled with rsync."
 
 HOMEPAGE = https://github.com/SynoCommunity/spksrc/wiki/FAQ-SynoCliNet
 LICENSE  = Each tool is licensed under it\'s respective license.
@@ -61,8 +65,10 @@ SPK_COMMANDS += bin/links
 SPK_COMMANDS += bin/sshfs
 SPK_COMMANDS += bin/fusermount bin/fusermount3
 SPK_COMMANDS += sbin/mount.fuse sbin/mount.fuse3
-SPK_COMMANDS += bin/socat bin/procan bin/filan
+SPK_COMMANDS += bin/socat bin/socat1 bin/procan bin/filan
+SPK_COMMANDS += bin/socat-broker.sh bin/socat-chain.sh bin/socat-mux.sh
 SPK_COMMANDS += bin/rsync
+SPK_COMMANDS += bin/xxh128sum bin/xxh32sum bin/xxh64sum bin/xxhsum
 SPK_COMMANDS += bin/autossh
 SPK_COMMANDS += bin/scp bin/sftp bin/slogin bin/ssh bin/ssh-add bin/ssh-agent bin/ssh-keygen bin/ssh-keyscan
 SPK_COMMANDS += libexec/sftp-server libexec/ssh-keysign libexec/ssh-pkcs11-helper libexec/ssh-sk-helper