diff --git a/cross/arp-scan/Makefile b/cross/arp-scan/Makefile
index 4b54deb9c34..cbea9a4193a 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)
-OPTIONAL_DEPENDS = cross/libpcap cross/libpcap_1.9
+DEPENDS = cross/libpcap
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,13 +22,6 @@ 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/arp-scan/PLIST b/cross/arp-scan/PLIST
index f2869136a9b..7871eb0b48c 100644
--- a/cross/arp-scan/PLIST
+++ b/cross/arp-scan/PLIST
@@ -1,5 +1,4 @@
rsc:bin/arp-fingerprint
bin:bin/arp-scan
-rsc:bin/get-iab
-rsc:bin/get-oui
+rsc:etc/arp-scan/mac-vendor.txt
rsc:share/arp-scan
diff --git a/cross/bind/Makefile b/cross/bind/Makefile
index 4301bb52c6c..b1808554b2e 100644
--- a/cross/bind/Makefile
+++ b/cross/bind/Makefile
@@ -32,7 +32,6 @@ COMMENT = BIND (Berkeley Internet Name Domain) is a complete, highly portable i
LICENSE = MPL 2.0
GNU_CONFIGURE = 1
-PRE_CONFIGURE_TARGET = bind_pre_configure
PRE_COMPILE_TARGET = bind_pre_compile
ADDITIONAL_CFLAGS = -O2
@@ -48,12 +47,6 @@ CONFIGURE_ARGS += BUILD_LIBS="$(LIBS)"
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
diff --git a/cross/bind/patches/001-disable-l1-cache-runtime-check.patch b/cross/bind/patches/001-disable-l1-cache-runtime-check.patch
new file mode 100644
index 00000000000..32a7891ebbf
--- /dev/null
+++ b/cross/bind/patches/001-disable-l1-cache-runtime-check.patch
@@ -0,0 +1,26 @@
+# Disable L1 cache alignment runtime check
+#
+# on most Synology systems the sysconf function returns 0
+# instead of ISC_OS_CACHELINE_SIZE (64)
+# only on x64 systems the value is 64 (cpuinfo: "cache_alignment : 64")
+#
+# The first attempt was to disable the definition of HAVE_SYSCONF
+# by CONFIGURE_ARGS += ac_cv_func_sysconf=no, but this did not work
+# (HAVE_SYSCONF must be defined elsewhere)
+#
+# So far remove the runtime check for sysconf(_SC_LEVEL1_DCACHE_LINESIZE) only,
+# and keep the sysconf call to evaluate the number of cpus in os.c
+#
+--- lib/isc/os.c.orig 2022-01-12 12:04:23.274225500 +0100
++++ lib/isc/os.c 2024-10-14 23:18:34.813233430 +0200
+@@ -80,8 +80,8 @@
+ isc__os_initialize(void) {
+ ncpus_initialize();
+ #if defined(HAVE_SYSCONF) && defined(_SC_LEVEL1_DCACHE_LINESIZE)
+- long s = sysconf(_SC_LEVEL1_DCACHE_LINESIZE);
+- RUNTIME_CHECK((size_t)s == (size_t)ISC_OS_CACHELINE_SIZE);
++// long s = sysconf(_SC_LEVEL1_DCACHE_LINESIZE);
++// RUNTIME_CHECK((size_t)s == (size_t)ISC_OS_CACHELINE_SIZE);
+ #endif
+ }
+
diff --git a/cross/libpcap_1.9/Makefile b/cross/libpcap-1.9/Makefile
similarity index 76%
rename from cross/libpcap_1.9/Makefile
rename to cross/libpcap-1.9/Makefile
index 23850310686..d9bdbccdd43 100644
--- a/cross/libpcap_1.9/Makefile
+++ b/cross/libpcap-1.9/Makefile
@@ -6,6 +6,8 @@ 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
+# we use this version for ARMv5 since newer versions are not working (#6256)
+# we use this version for ARMv7L since versions > 1.10.4 fail to build
DEPENDS =
diff --git a/cross/libpcap_1.9/PLIST b/cross/libpcap-1.9/PLIST
similarity index 100%
rename from cross/libpcap_1.9/PLIST
rename to cross/libpcap-1.9/PLIST
diff --git a/cross/libpcap_1.9/digests b/cross/libpcap-1.9/digests
similarity index 100%
rename from cross/libpcap_1.9/digests
rename to cross/libpcap-1.9/digests
diff --git a/cross/libpcap-latest/Makefile b/cross/libpcap-latest/Makefile
new file mode 100644
index 00000000000..bc2dc8954b5
--- /dev/null
+++ b/cross/libpcap-latest/Makefile
@@ -0,0 +1,23 @@
+PKG_NAME = libpcap
+PKG_VERS = 1.10.5
+PKG_EXT = tar.xz
+PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
+PKG_DIST_SITE = https://www.tcpdump.org/release
+PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
+
+DEPENDS =
+
+# latest version for OLD_PPC_ARCHS and ARMv5 is 1.9.1
+UNSUPPORTED_ARCHS = $(OLD_PPC_ARCHS) $(ARMv5_ARCHS)
+# latest version for ARMv7L is 1.10.4
+UNSUPPORTED_ARCHS += $(ARMv7L_ARCHS)
+
+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/PLIST b/cross/libpcap-latest/PLIST
similarity index 60%
rename from cross/libpcap/PLIST
rename to cross/libpcap-latest/PLIST
index 2dc37b06742..2761a956178 100644
--- a/cross/libpcap/PLIST
+++ b/cross/libpcap-latest/PLIST
@@ -1,3 +1,3 @@
lnk:lib/libpcap.so
lnk:lib/libpcap.so.1
-lib:lib/libpcap.so.1.10.4
+lib:lib/libpcap.so.1.10.5
diff --git a/cross/libpcap-latest/digests b/cross/libpcap-latest/digests
new file mode 100644
index 00000000000..ffd60481b7d
--- /dev/null
+++ b/cross/libpcap-latest/digests
@@ -0,0 +1,3 @@
+libpcap-1.10.5.tar.xz SHA1 ac029ecbd003a4b9c181867a9c500ad2d79935e8
+libpcap-1.10.5.tar.xz SHA256 84fa89ac6d303028c1c5b754abff77224f45eca0a94eb1a34ff0aa9ceece3925
+libpcap-1.10.5.tar.xz MD5 3d67f8b17db94a00a05636616fb0489b
diff --git a/cross/libpcap/patches/001-pcap-linux_fix-undefined-symbol.patch b/cross/libpcap-latest/patches/001-pcap-linux_fix-undefined-symbol.patch
similarity index 100%
rename from cross/libpcap/patches/001-pcap-linux_fix-undefined-symbol.patch
rename to cross/libpcap-latest/patches/001-pcap-linux_fix-undefined-symbol.patch
diff --git a/cross/libpcap/Makefile b/cross/libpcap/Makefile
index 2189730cf24..0bba3e03316 100644
--- a/cross/libpcap/Makefile
+++ b/cross/libpcap/Makefile
@@ -1,21 +1,12 @@
-PKG_NAME = libpcap
-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)
+PKG_NAME = libpcap-main
-DEPENDS =
+OPTIONAL_DEPENDS = cross/libpcap-latest
+OPTIONAL_DEPENDS += cross/libpcap-1.9
-# latest version for OLD_PPC_ARCHS is 1.9.1
-UNSUPPORTED_ARCHS = $(OLD_PPC_ARCHS)
+include ../../mk/spksrc.main-depends.mk
-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
+ifeq ($(findstring $(ARCH),$(OLD_PPC_ARCHS) $(ARMv5_ARCHS) $(ARMv7L_ARCHS)),$(ARCH))
+DEPENDS = cross/libpcap-1.9
+else
+DEPENDS = cross/libpcap-latest
+endif
diff --git a/cross/libpcap/digests b/cross/libpcap/digests
deleted file mode 100644
index bc3899a4c79..00000000000
--- a/cross/libpcap/digests
+++ /dev/null
@@ -1,3 +0,0 @@
-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/nmap/PLIST b/cross/nmap/PLIST
index 0ea56bb5d2b..33b04726e2e 100644
--- a/cross/nmap/PLIST
+++ b/cross/nmap/PLIST
@@ -1,5 +1,4 @@
bin:bin/ncat
-rsc:bin/ndiff
bin:bin/nmap
bin:bin/nping
rsc:share/ncat
diff --git a/cross/nmap_7.92/Makefile b/cross/nmap_7.92/Makefile
index bfc5a92180e..920ddfc8a8c 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_1.9 cross/openssl3
+DEPENDS = cross/libpcap 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/nmap_7.92/PLIST b/cross/nmap_7.92/PLIST
index 0ea56bb5d2b..33b04726e2e 100644
--- a/cross/nmap_7.92/PLIST
+++ b/cross/nmap_7.92/PLIST
@@ -1,5 +1,4 @@
bin:bin/ncat
-rsc:bin/ndiff
bin:bin/nmap
bin:bin/nping
rsc:share/ncat
diff --git a/cross/socat/Makefile b/cross/socat/Makefile
index 01ae8e76a2c..dbd34dc843c 100644
--- a/cross/socat/Makefile
+++ b/cross/socat/Makefile
@@ -1,5 +1,5 @@
PKG_NAME = socat
-PKG_VERS = 1.8.0.0
+PKG_VERS = 1.8.0.1
PKG_EXT = tar.bz2
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = http://www.dest-unreach.org/socat/download
diff --git a/cross/socat/digests b/cross/socat/digests
index 91df8f2d94c..6c78a749968 100644
--- a/cross/socat/digests
+++ b/cross/socat/digests
@@ -1,3 +1,3 @@
-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
+socat-1.8.0.1.tar.bz2 SHA1 6cf8b255108fc6bd7ab67fed61e0b52b21150fc4
+socat-1.8.0.1.tar.bz2 SHA256 6a283565db7cf86292c6f70504c58abb03e29888adeed5a6c5f3457e803c1b81
+socat-1.8.0.1.tar.bz2 MD5 e53a6e8e8594ac87476fe4ae361bbcd1
diff --git a/diyspk/arp-scan/Makefile b/diyspk/arp-scan/Makefile
index 1b0280ccac1..074d658bf64 100644
--- a/diyspk/arp-scan/Makefile
+++ b/diyspk/arp-scan/Makefile
@@ -13,7 +13,7 @@ HOMEPAGE = http://www.royhills.co.uk/wiki/index.php/Arp-scan_User_Guide
LICENSE = MIT
SPK_COMMANDS = bin/arp-scan
-# perl scripts (work only when perl package is installed)
-SPK_COMMANDS += bin/arp-fingerprint bin/get-iab bin/get-oui
+# perl script (works only when perl package is installed)
+SPK_COMMANDS += bin/arp-fingerprint
include ../../mk/spksrc.spk.mk
diff --git a/diyspk/bind/Makefile b/diyspk/bind/Makefile
index e387d2510ad..9da9be23a4d 100644
--- a/diyspk/bind/Makefile
+++ b/diyspk/bind/Makefile
@@ -19,6 +19,7 @@ include ../../mk/spksrc.spk.mk
ifeq ($(findstring $(ARCH),$(ARMv5_ARCHS)),$(ARCH))
DEPENDS += cross/bind_9.16
+SPK_VERS = 9.16.45
else
DEPENDS += cross/bind
endif
diff --git a/diyspk/nmap/Makefile b/diyspk/nmap/Makefile
index d5eec25e57e..a7e8d01be9a 100644
--- a/diyspk/nmap/Makefile
+++ b/diyspk/nmap/Makefile
@@ -16,10 +16,11 @@ LICENSE = https://svn.nmap.org/nmap/LICENSE
include ../../mk/spksrc.archs.mk
ifeq ($(findstring $(ARCH),$(OLD_PPC_ARCHS)),$(ARCH))
DEPENDS = cross/nmap_7.92
+SPK_VERS = 7.92
else
DEPENDS = cross/nmap
endif
-SPK_COMMANDS = bin/ncat bin/nmap bin/nping bin/ndiff
+SPK_COMMANDS = bin/ncat bin/nmap bin/nping
include ../../mk/spksrc.spk.mk
diff --git a/diyspk/rsync/Makefile b/diyspk/rsync/Makefile
new file mode 100644
index 00000000000..1f5227a3a89
--- /dev/null
+++ b/diyspk/rsync/Makefile
@@ -0,0 +1,16 @@
+SPK_NAME = rsync
+SPK_VERS = 3.3.0
+SPK_REV = 1
+
+DEPENDS = cross/rsync_update
+
+MAINTAINER = SynoCommunity
+DESCRIPTION = 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.
+STARTABLE = no
+
+HOMEPAGE = https://rsync.samba.org/
+LICENSE = GPLv3
+
+SPK_COMMANDS = bin/rsync bin/rsync-ssl
+
+include ../../mk/spksrc.spk.mk
diff --git a/diyspk/socat/Makefile b/diyspk/socat/Makefile
index 478b9f7bc47..2be6e54b64e 100644
--- a/diyspk/socat/Makefile
+++ b/diyspk/socat/Makefile
@@ -1,5 +1,5 @@
SPK_NAME = socat
-SPK_VERS = 1.8.0.0
+SPK_VERS = 1.8.0.1
SPK_REV = 1
DEPENDS = cross/socat
diff --git a/spk/synocli-net/Makefile b/spk/synocli-net/Makefile
index ba5479b2ca1..8d6e625a7d0 100644
--- a/spk/synocli-net/Makefile
+++ b/spk/synocli-net/Makefile
@@ -1,6 +1,6 @@
SPK_NAME = synocli-net
SPK_VERS = 2.4
-SPK_REV = 18
+SPK_REV = 19
SPK_ICON = src/synocli-net.png
DEPENDS = cross/screen cross/tmux cross/links cross/socat
@@ -52,15 +52,15 @@ 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, xxhsum, autossh \(including openssh, sftp and scp\), etherwake, telnet, whois, sshfs$(OPTIONAL_DESC)."
DISPLAY_NAME = SynoCli Network Tools
STARTABLE = no
-CHANGELOG = "1. Update aria2 to v1.37.0.
2. Update bind to v9.17.22 (on ARMv5 v9.16.45).
3. Update inetutils (telnet, whois) to v2.5.
4. Update openssl to v3.1.5.
5. Update openssh to v9.6p1.
6. Update screen to v4.9.1.
7. Update ser2net to v4.6.0.
8. Update socat to v1.8.0.0.
9. Add xxHsum tools, bundled with rsync."
+CHANGELOG = "1. Update aria2 to v1.37.0.
2. Update bind to v9.17.22 (on ARMv5 v9.16.45).
3. Update inetutils (telnet, whois) to v2.5.
4. Update openssl to v3.1.7.
5. Update openssh to v9.6p1.
6. Update screen to v4.9.1.
7. Update ser2net to v4.6.0.
8. Update socat to v1.8.0.1.
9. Add xxHsum tools, bundled with rsync.
10. Fix nmap for ARMv5 archs."
HOMEPAGE = https://github.com/SynoCommunity/spksrc/wiki/FAQ-SynoCliNet
LICENSE = Each tool is licensed under it\'s respective license.
SPK_COMMANDS = bin/screen
SPK_COMMANDS += bin/tmux
-SPK_COMMANDS += bin/nmap bin/nping bin/ndiff bin/ncat
-SPK_COMMANDS += bin/arp-scan bin/arp-fingerprint bin/get-iab bin/get-oui
+SPK_COMMANDS += bin/nmap bin/nping bin/ncat
+SPK_COMMANDS += bin/arp-scan bin/arp-fingerprint
SPK_COMMANDS += bin/links
SPK_COMMANDS += bin/sshfs
SPK_COMMANDS += bin/fusermount bin/fusermount3