From 9ffe0698abb440f4305393fa1f1aebdb7871c529 Mon Sep 17 00:00:00 2001
From: hgy59 <hpgy59@gmail.com>
Date: Sat, 23 Sep 2023 10:36:01 +0200
Subject: [PATCH] synocli-file: update tools (#5897)

* synocli-file: update tools
- Replace exa by eza v0.13.0 (#5895)
- Update dos2unix to v 7.5.1.
- Update file to v5.45. and add native/file to build independent of installed version (#5780)
- Update jdupes to v1.27.3.
- Update less to v643.
- Update Midnight Commander to v4.8.30.
- Update mg v3.7.
- Update ncdu to v1.19.
- Update rhash to v1.4.4.
- Update tree to v2.1.1.

* fix native/file
- works with static build only
- cleanup cross/file/Makefile

* further updates:
- Update fzf to v0.42.0
- Update micro to v2.0.12
- Update rmlint to v2.10.2
- avoid update of nnn to v4.9
---
 cross/bat/Makefile                            |  5 ++---
 cross/dos2unix/Makefile                       |  2 +-
 cross/dos2unix/digests                        |  6 +++---
 cross/exa/PLIST                               |  1 -
 cross/exa/digests                             |  3 ---
 cross/{exa => eza}/Makefile                   | 11 +++++-----
 cross/eza/PLIST                               |  1 +
 cross/eza/digests                             |  3 +++
 cross/file/Makefile                           | 11 ++++++----
 cross/file/digests                            |  6 +++---
 .../001-force-use-of-native-file.patch        | 14 +++++++++++++
 cross/fzf/Makefile                            |  2 +-
 cross/fzf/digests                             |  6 +++---
 cross/jdupes/Makefile                         |  2 +-
 cross/jdupes/digests                          |  6 +++---
 cross/jdupes/patches/001-use-std-gnu99.patch  |  8 +++----
 cross/less/Makefile                           |  2 +-
 cross/less/digests                            |  6 +++---
 cross/mc/Makefile                             |  2 +-
 cross/mc/digests                              |  6 +++---
 cross/mg/Makefile                             |  2 +-
 cross/mg/digests                              |  6 +++---
 cross/micro/Makefile                          |  8 +++----
 cross/micro/digests                           |  6 +++---
 cross/ncdu/Makefile                           |  2 +-
 cross/ncdu/digests                            |  6 +++---
 cross/nnn/Makefile                            | 11 ++++++++++
 cross/rhash/Makefile                          |  2 +-
 cross/rhash/PLIST                             |  7 ++++---
 cross/rhash/digests                           |  6 +++---
 cross/rmlint/Makefile                         |  2 +-
 cross/rmlint/digests                          |  6 +++---
 .../patches/001-scons-pkg-config-libdir.patch | 11 ----------
 ...kg-config-libdir_disable_error_undef.patch | 21 +++++++++++++++++++
 cross/rnm/Makefile                            | 10 +++++----
 cross/tree/Makefile                           |  2 +-
 cross/tree/digests                            |  6 +++---
 ...01-enable-cross-compiler-definitions.patch | 16 +++++++-------
 diyspk/bat/Makefile                           |  6 +++---
 diyspk/dos2unix/Makefile                      |  2 +-
 diyspk/exa/Makefile                           | 18 ----------------
 diyspk/eza/Makefile                           | 18 ++++++++++++++++
 diyspk/file/Makefile                          |  2 +-
 diyspk/fzf/Makefile                           |  2 +-
 diyspk/jdupes/Makefile                        |  3 +--
 diyspk/less/Makefile                          |  3 +--
 diyspk/mc/Makefile                            |  7 +++----
 diyspk/mg/Makefile                            |  4 ++--
 diyspk/micro/Makefile                         |  2 +-
 diyspk/ncdu/Makefile                          |  9 ++++----
 diyspk/nnn/Makefile                           |  5 ++++-
 diyspk/rhash/Makefile                         | 10 ++++-----
 diyspk/rmlint/Makefile                        |  8 +++----
 diyspk/rnm/Makefile                           | 11 +++++-----
 diyspk/tree/Makefile                          |  2 +-
 native/file/Makefile                          | 20 ++++++++++++++++++
 native/file/digests                           |  3 +++
 spk/synocli-file/Makefile                     | 21 ++++++++-----------
 58 files changed, 223 insertions(+), 166 deletions(-)
 delete mode 100644 cross/exa/PLIST
 delete mode 100644 cross/exa/digests
 rename cross/{exa => eza}/Makefile (61%)
 create mode 100644 cross/eza/PLIST
 create mode 100644 cross/eza/digests
 create mode 100644 cross/file/patches/001-force-use-of-native-file.patch
 delete mode 100644 cross/rmlint/patches/001-scons-pkg-config-libdir.patch
 create mode 100644 cross/rmlint/patches/001-scons-pkg-config-libdir_disable_error_undef.patch
 delete mode 100644 diyspk/exa/Makefile
 create mode 100644 diyspk/eza/Makefile
 create mode 100644 native/file/Makefile
 create mode 100644 native/file/digests

diff --git a/cross/bat/Makefile b/cross/bat/Makefile
index e39ed6633a1..e6b2566e869 100644
--- a/cross/bat/Makefile
+++ b/cross/bat/Makefile
@@ -8,11 +8,10 @@ PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
 
 DEPENDS = cross/zlib-ng
 
-# unsupported by cross/zlib-ng
 UNSUPPORTED_ARCHS = $(OLD_PPC_ARCHS)
 
 HOMEPAGE = https://github.com/sharkdp/bat
-COMMENT  = A cat(1) clone with wings.
-LICENSE  = MIT or Apache 2.0
+COMMENT = A cat(1) clone with wings.
+LICENSE = MIT or Apache 2.0
 
 include ../../mk/spksrc.cross-rust.mk
diff --git a/cross/dos2unix/Makefile b/cross/dos2unix/Makefile
index 3fa19572ef9..5c83bb2de56 100644
--- a/cross/dos2unix/Makefile
+++ b/cross/dos2unix/Makefile
@@ -1,5 +1,5 @@
 PKG_NAME = dos2unix
-PKG_VERS = 7.5.0
+PKG_VERS = 7.5.1
 PKG_EXT = tar.gz
 PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://waterlan.home.xs4all.nl/dos2unix
diff --git a/cross/dos2unix/digests b/cross/dos2unix/digests
index eafe3993318..28fc64996bd 100644
--- a/cross/dos2unix/digests
+++ b/cross/dos2unix/digests
@@ -1,3 +1,3 @@
-dos2unix-7.5.0.tar.gz SHA1 cc84af705ed9a5c4419b57784ee504c2af04c024
-dos2unix-7.5.0.tar.gz SHA256 7a3b01d01e214d62c2b3e04c3a92e0ddc728a385566e4c0356efa66fd6eb95af
-dos2unix-7.5.0.tar.gz MD5 001af2b16ae216241ac08bef29f36c28
+dos2unix-7.5.1.tar.gz SHA1 231bcea3d5efc7addd66dd1ecd0c718c70fc6aae
+dos2unix-7.5.1.tar.gz SHA256 da07788bb2e029b0d63f6471d166f68528acd8da2cf14823a188e8a9d5c1fc15
+dos2unix-7.5.1.tar.gz MD5 8aef90aeae07b6ad9f8fc77e4eb12541
diff --git a/cross/exa/PLIST b/cross/exa/PLIST
deleted file mode 100644
index eeaf9f1211e..00000000000
--- a/cross/exa/PLIST
+++ /dev/null
@@ -1 +0,0 @@
-bin:bin/exa
diff --git a/cross/exa/digests b/cross/exa/digests
deleted file mode 100644
index dd0888697c7..00000000000
--- a/cross/exa/digests
+++ /dev/null
@@ -1,3 +0,0 @@
-exa-0.10.1.tar.gz SHA1 2a0645a9bcf63fd52cbd73213628b835dc20b14c
-exa-0.10.1.tar.gz SHA256 ff0fa0bfc4edef8bdbbb3cabe6fdbd5481a71abbbcc2159f402dea515353ae7c
-exa-0.10.1.tar.gz MD5 01f0ac8192de592f8db0acc99c101429
diff --git a/cross/exa/Makefile b/cross/eza/Makefile
similarity index 61%
rename from cross/exa/Makefile
rename to cross/eza/Makefile
index 03633484d01..9776ee6825a 100644
--- a/cross/exa/Makefile
+++ b/cross/eza/Makefile
@@ -1,17 +1,16 @@
-PKG_NAME = exa
-PKG_VERS = 0.10.1
+PKG_NAME = eza
+PKG_VERS = 0.13.0
 PKG_EXT = tar.gz
 PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT)
-PKG_DIST_SITE = https://github.com/ogham/exa/archive
+PKG_DIST_SITE = https://github.com/eza-community/eza/archive
 PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
 
-DEPENDS = cross/zlib-ng
+DEPENDS = cross/zlib
 
-# unsupported by cross/zlib-ng
 UNSUPPORTED_ARCHS = $(OLD_PPC_ARCHS)
 
-HOMEPAGE = https://the.exa.website/
+HOMEPAGE = https://eza.rocks/
 COMMENT  = A modern replacement for 'ls'.
 LICENSE  = MIT
 
diff --git a/cross/eza/PLIST b/cross/eza/PLIST
new file mode 100644
index 00000000000..b8bed0861e6
--- /dev/null
+++ b/cross/eza/PLIST
@@ -0,0 +1 @@
+bin:bin/eza
diff --git a/cross/eza/digests b/cross/eza/digests
new file mode 100644
index 00000000000..31474b560fe
--- /dev/null
+++ b/cross/eza/digests
@@ -0,0 +1,3 @@
+eza-0.13.0.tar.gz SHA1 053a8fdfed411cb6f89fdaa3aa9de687c294859b
+eza-0.13.0.tar.gz SHA256 3b774d1396f7aa5382d358133f2923a49639b1c615fea0942cbc63042c15830b
+eza-0.13.0.tar.gz MD5 4f06d39b2c8071306836c037f0217936
diff --git a/cross/file/Makefile b/cross/file/Makefile
index f9a79d2e137..9c891493498 100644
--- a/cross/file/Makefile
+++ b/cross/file/Makefile
@@ -1,13 +1,11 @@
 PKG_NAME = file
-PKG_VERS = 5.39
+PKG_VERS = 5.45
 PKG_EXT = tar.gz
 PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = http://ftp.astron.com/pub/file
 PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
 
-# remarks: the build environment must have file installed of the same version
-
-DEPENDS =
+BUILD_DEPENDS = native/file
 
 HOMEPAGE = https://www.darwinsys.com/file/
 COMMENT  = The file command is "a file type guesser", that is, a command-line tool that tells you in words what kind of data a file contains. Unlike most GUI systems, command-line UNIX systems - with this program leading the charge - don't rely on filename extentions to tell you the type of a file, but look at the file's actual contents. This is, of course, more reliable, but requires a bit of I/O.
@@ -17,4 +15,9 @@ GNU_CONFIGURE = 1
 
 ADDITIONAL_CPPFLAGS = -Os
 
+# Inject native/file into magic/Makefile (by patched Makefile.in)
+NATIVE_FILE = $(abspath $(WORK_DIR)/../../../native/file/work-native/install/usr/local/bin/file)
+ENV += NATIVE_FILE=$(NATIVE_FILE)
+
 include ../../mk/spksrc.cross-cc.mk
+
diff --git a/cross/file/digests b/cross/file/digests
index d247a3c8894..3eedd482019 100644
--- a/cross/file/digests
+++ b/cross/file/digests
@@ -1,3 +1,3 @@
-file-5.39.tar.gz SHA1 a5a8941a8e4c436fe22933db6a71c5161c3fb10b
-file-5.39.tar.gz SHA256 f05d286a76d9556243d0cb05814929c2ecf3a5ba07963f8f70bfaaa70517fad1
-file-5.39.tar.gz MD5 1c450306053622803a25647d88f80f25
+file-5.45.tar.gz SHA1 e8ee39339e5d3d68b7da9c45580f2ca5faf0db54
+file-5.45.tar.gz SHA256 fc97f51029bb0e2c9f4e3bffefdaf678f0e039ee872b9de5c002a6d09c784d82
+file-5.45.tar.gz MD5 26b2a96d4e3a8938827a1e572afd527a
diff --git a/cross/file/patches/001-force-use-of-native-file.patch b/cross/file/patches/001-force-use-of-native-file.patch
new file mode 100644
index 00000000000..ac7ca9dc726
--- /dev/null
+++ b/cross/file/patches/001-force-use-of-native-file.patch
@@ -0,0 +1,14 @@
+# force the use of native file executable instead of system installed version
+# required to compile the magic.mgc of the same version as the native executable
+#
+--- magic/Makefile.in.orig	2023-07-27 19:46:45.000000000 +0000
++++ magic/Makefile.in	2023-09-19 18:44:24.771956250 +0000
+@@ -638,7 +638,7 @@
+ 
+ # FIXME: Build file natively as well so that it can be used to compile
+ # the target's magic file; for now we bail if the local version does not match
+-@IS_CROSS_COMPILE_TRUE@FILE_COMPILE = file${EXEEXT}
++@IS_CROSS_COMPILE_TRUE@FILE_COMPILE = ${NATIVE_FILE}
+ @IS_CROSS_COMPILE_FALSE@FILE_COMPILE_DEP = $(FILE_COMPILE)
+ @IS_CROSS_COMPILE_TRUE@FILE_COMPILE_DEP = 
+ all: all-am
diff --git a/cross/fzf/Makefile b/cross/fzf/Makefile
index f1fff11f9b3..0534e1e363e 100644
--- a/cross/fzf/Makefile
+++ b/cross/fzf/Makefile
@@ -1,5 +1,5 @@
 PKG_NAME = fzf
-PKG_VERS = 0.40.0
+PKG_VERS = 0.42.0
 PKG_EXT = tar.gz
 PKG_REVISION = $(shell date +%m/%d/%Y)
 PKG_DIST_NAME = $(PKG_VERS).$(PKG_EXT)
diff --git a/cross/fzf/digests b/cross/fzf/digests
index 15d7775d7cf..60723073430 100644
--- a/cross/fzf/digests
+++ b/cross/fzf/digests
@@ -1,3 +1,3 @@
-fzf-0.40.0.tar.gz SHA1 7bf6fbb26d59bc22a1e44e2a2800ffe7df1a2164
-fzf-0.40.0.tar.gz SHA256 9597f297a6811d300f619fff5aadab8003adbcc1566199a43886d2ea09109a65
-fzf-0.40.0.tar.gz MD5 42ef06b3f318d7afb03648708edfa142
+fzf-0.42.0.tar.gz SHA1 ac0e5b39a0642241980bfe10bad67f8dc8ca5fff
+fzf-0.42.0.tar.gz SHA256 743c1bfc7851b0796ab73c6da7db09d915c2b54c0dd3e8611308985af8ed3df2
+fzf-0.42.0.tar.gz MD5 b47bb2d48df48eb7967d7d770d77d0f8
diff --git a/cross/jdupes/Makefile b/cross/jdupes/Makefile
index 7151ac70bc5..0e427996b9a 100644
--- a/cross/jdupes/Makefile
+++ b/cross/jdupes/Makefile
@@ -1,5 +1,5 @@
 PKG_NAME = jdupes
-PKG_VERS = 1.26.1
+PKG_VERS = 1.27.3
 PKG_EXT = tar.gz
 PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://github.com/jbruchon/jdupes/archive
diff --git a/cross/jdupes/digests b/cross/jdupes/digests
index b64551af947..b0cf7a8c4b3 100644
--- a/cross/jdupes/digests
+++ b/cross/jdupes/digests
@@ -1,3 +1,3 @@
-jdupes-1.26.1.tar.gz SHA1 f47b81ec55f6bf67071fcc7bc2e3f0007bf8c443
-jdupes-1.26.1.tar.gz SHA256 09153824320c65ad529f8f97cd3b7e792c50e9f9018192ea1a76f2e33a196225
-jdupes-1.26.1.tar.gz MD5 98cad96bf21079d6ea88c1be132dd604
+jdupes-1.27.3.tar.gz SHA1 c9c158d3e699176da3f5468a956b76327cbfe6b5
+jdupes-1.27.3.tar.gz SHA256 6e8352f61b3920a2b5626c7122c3b80b4fdcc5cdd3f1c0c3424530425a77d846
+jdupes-1.27.3.tar.gz MD5 692767c0b697d8c914f5c59e711143a8
diff --git a/cross/jdupes/patches/001-use-std-gnu99.patch b/cross/jdupes/patches/001-use-std-gnu99.patch
index 20490c7b2b0..f964bb900cc 100644
--- a/cross/jdupes/patches/001-use-std-gnu99.patch
+++ b/cross/jdupes/patches/001-use-std-gnu99.patch
@@ -1,11 +1,11 @@
 # use -std=gnu99 that works for older compilers too.
 # 
---- Makefile.orig	2023-07-02 14:27:33.000000000 +0000
-+++ Makefile	2023-07-03 20:55:13.670834358 +0000
-@@ -37,7 +37,7 @@
+--- Makefile.orig	2023-08-27 01:12:34.000000000 +0000
++++ Makefile	2023-09-19 20:37:23.480268500 +0000
+@@ -38,7 +38,7 @@
  # Configuration section
  COMPILER_OPTIONS = -Wall -Wwrite-strings -Wcast-align -Wstrict-aliasing -Wstrict-prototypes -Wpointer-arith -Wundef
- COMPILER_OPTIONS += -Wshadow -Wfloat-equal -Waggregate-return -Wcast-qual -Wswitch-default -Wswitch-enum -Wconversion -Wunreachable-code -Wformat=2
+ COMPILER_OPTIONS += -Wshadow -Wfloat-equal -Waggregate-return -Wcast-qual -Wswitch-default -Wswitch-enum -Wunreachable-code -Wformat=2
 -COMPILER_OPTIONS += -std=gnu11 -D_FILE_OFFSET_BITS=64 -fstrict-aliasing -pipe
 +COMPILER_OPTIONS += -std=gnu99 -D_FILE_OFFSET_BITS=64 -fstrict-aliasing -pipe
  COMPILER_OPTIONS += -DNO_ATIME
diff --git a/cross/less/Makefile b/cross/less/Makefile
index 189dc97a880..a9c15a2b78c 100644
--- a/cross/less/Makefile
+++ b/cross/less/Makefile
@@ -1,5 +1,5 @@
 PKG_NAME = less
-PKG_VERS = 633
+PKG_VERS = 643
 PKG_EXT = tar.gz
 PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = http://www.greenwoodsoftware.com/less
diff --git a/cross/less/digests b/cross/less/digests
index b65ebbca6bc..68e78048568 100644
--- a/cross/less/digests
+++ b/cross/less/digests
@@ -1,3 +1,3 @@
-less-633.tar.gz SHA1 632207c546b0ee23d9097b7de82a81416e0b193d
-less-633.tar.gz SHA256 2f201d64b828b88af36dfe6cfdba3e0819ece2e446ebe6224813209aaefed04f
-less-633.tar.gz MD5 35cc7734e9e6224388ab7b9a214da4da
+less-643.tar.gz SHA1 ee1f35a340b2631eb0376df7e073f01d86cdfbed
+less-643.tar.gz SHA256 2911b5432c836fa084c8a2e68f6cd6312372c026a58faaa98862731c8b6052e8
+less-643.tar.gz MD5 cf05e2546a3729492b944b4874dd43dd
diff --git a/cross/mc/Makefile b/cross/mc/Makefile
index 36fb91e73e8..0b2a448173f 100644
--- a/cross/mc/Makefile
+++ b/cross/mc/Makefile
@@ -1,5 +1,5 @@
 PKG_NAME = mc
-PKG_VERS = 4.8.29
+PKG_VERS = 4.8.30
 PKG_EXT = tar.xz
 PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = http://ftp.midnight-commander.org/
diff --git a/cross/mc/digests b/cross/mc/digests
index ef60e3a6897..ac7f6c15a76 100644
--- a/cross/mc/digests
+++ b/cross/mc/digests
@@ -1,3 +1,3 @@
-mc-4.8.29.tar.xz SHA1 250411bd93c31fd3d818588add444bffd9b641fb
-mc-4.8.29.tar.xz SHA256 01d8a3b94f58180cca5bf17257b5078d1fd6fd27a9b5c0e970ec767549540ad4
-mc-4.8.29.tar.xz MD5 7f9339b6b2167a7920ac29e133b9c594
+mc-4.8.30.tar.xz SHA1 91708eb00ba0d7c1579de357745b1a6717b1dfac
+mc-4.8.30.tar.xz SHA256 5ebc3cb2144b970c5149fda556c4ad50b78780494696cdf2d14a53204c95c7df
+mc-4.8.30.tar.xz MD5 96fcd04710b7848fedea8597da4bd7da
diff --git a/cross/mg/Makefile b/cross/mg/Makefile
index 9b3a3a8943b..7db970f0045 100644
--- a/cross/mg/Makefile
+++ b/cross/mg/Makefile
@@ -1,5 +1,5 @@
 PKG_NAME = mg
-PKG_VERS = 3.6
+PKG_VERS = 3.7
 PKG_EXT = tar.gz
 PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://github.com/troglobit/mg/releases/download/v$(PKG_VERS)
diff --git a/cross/mg/digests b/cross/mg/digests
index 0f8b6b6350e..61526036b99 100644
--- a/cross/mg/digests
+++ b/cross/mg/digests
@@ -1,3 +1,3 @@
-mg-3.6.tar.gz SHA1 00451598948c890cc9cb151d153faac4969d230e
-mg-3.6.tar.gz SHA256 0e30f99b7606ddd92535aec0ba0118557afa4adca0961267314a4bf7791865fb
-mg-3.6.tar.gz MD5 a6eab531431abd3c9e1dbb18749e30b9
+mg-3.7.tar.gz SHA1 0d33ea9a31ac05e6718ac60d0913da11c3acdf3b
+mg-3.7.tar.gz SHA256 05101360d2194392da0950e8b6f18d067d8af0fd2f572461ba4d4e7b4ccbb4c1
+mg-3.7.tar.gz MD5 0040c9e738bd204db26c6967bbb8be38
diff --git a/cross/micro/Makefile b/cross/micro/Makefile
index f33d362ac87..7395dc8934e 100644
--- a/cross/micro/Makefile
+++ b/cross/micro/Makefile
@@ -1,8 +1,8 @@
 PKG_NAME = micro
-PKG_VERS = 2.0.11
+PKG_VERS = 2.0.12
 PKG_EXT = tar.gz
 # make sure the hash matches this release, as it is shown with 'micro --version'
-GIT_HASH = 225927b
+GIT_HASH = c2cebaa
 PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://github.com/zyedidia/micro/archive
 PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
@@ -11,7 +11,7 @@ PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
 BUILD_DEPENDS = native/go
 
 HOMEPAGE = https://micro-editor.github.io/
-COMMENT  = a modern and intuitive terminal-based text editor.
+COMMENT  = A modern and intuitive terminal-based text editor.
 LICENSE  = MIT
 
 GOPATH = $(WORK_DIR)
@@ -24,5 +24,5 @@ include ../../mk/spksrc.cross-go.mk
 
 .PHONY: micro_install
 micro_install:
-	install -m 755 -d $(STAGING_INSTALL_PREFIX)/bin
+	@install -m 755 -d $(STAGING_INSTALL_PREFIX)/bin
 	@$(RUN) ; install -m 755 micro $(STAGING_INSTALL_PREFIX)/bin
diff --git a/cross/micro/digests b/cross/micro/digests
index 4928bc16024..28c6eb07c03 100644
--- a/cross/micro/digests
+++ b/cross/micro/digests
@@ -1,3 +1,3 @@
-micro-2.0.11.tar.gz SHA1 0fb9454a9334ce237aad8573f7649641171677eb
-micro-2.0.11.tar.gz SHA256 1bb499edeaaadf1fe1791a49f96ab672c4e1add31ee125882ccd85a0fc8a4abe
-micro-2.0.11.tar.gz MD5 deb32d1fffe374a8592aa640eec643de
+micro-2.0.12.tar.gz SHA1 901fd809fe5f594ba9b86d0d148b4f09d314133b
+micro-2.0.12.tar.gz SHA256 936d109670035235da1f3fb07c76c57c729b59bc1460aab41feb3516136e450f
+micro-2.0.12.tar.gz MD5 14717fd97623e502fdb92e269ff5058d
diff --git a/cross/ncdu/Makefile b/cross/ncdu/Makefile
index 55c0f198fb3..4b77e94b308 100644
--- a/cross/ncdu/Makefile
+++ b/cross/ncdu/Makefile
@@ -1,5 +1,5 @@
 PKG_NAME = ncdu
-PKG_VERS = 1.18.1
+PKG_VERS = 1.19
 PKG_EXT = tar.gz
 PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://dev.yorhel.nl/download
diff --git a/cross/ncdu/digests b/cross/ncdu/digests
index f0216d2eeaa..b802fd113ca 100644
--- a/cross/ncdu/digests
+++ b/cross/ncdu/digests
@@ -1,3 +1,3 @@
-ncdu-1.18.1.tar.gz SHA1 bdc12fa539db1e310a29431939efca7091dbb867
-ncdu-1.18.1.tar.gz SHA256 7c0fa1eb29d85aaed4ba174164bdbb8f011b5c390d017c57d668fc7231332405
-ncdu-1.18.1.tar.gz MD5 567df772ef0f2e28801009a90ab7b8e3
+ncdu-1.19.tar.gz SHA1 3ee7aff60bdaa1c79eb4f27e3d277fc2d76e0043
+ncdu-1.19.tar.gz SHA256 30363019180cde0752c7fb006c12e154920412f4e1b5dc3090654698496bb17d
+ncdu-1.19.tar.gz MD5 7986451d5b222b8a99b5382f33a30831
diff --git a/cross/nnn/Makefile b/cross/nnn/Makefile
index d350f3f47ca..98bc081f6ba 100644
--- a/cross/nnn/Makefile
+++ b/cross/nnn/Makefile
@@ -5,6 +5,17 @@ PKG_DIST_NAME = $(PKG_NAME)-v$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://github.com/jarun/nnn/releases/download/v$(PKG_VERS)
 PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
 
+# REMARKGS:
+# currently stay on version 4.8
+# version 4.9 fails with the error for all DSM 6 (even 64 bit):
+# error "<fts.h> cannot be used with -D_FILE_OFFSET_BITS==64"
+# we will have to decide whether we 
+# - fall back to version 4.0 for all packages with DSM < 7
+# - keep nnn version 4.8 for DSM 6 and x64, x86 and aarch64
+# - patch version > 4.8 for DSM 6 and x64, x86 and aarch64 to remove the definition of _FILE_OFFSET_BITS==64
+#   (but we have to verify that 64 bit/largefile support is working when built without -D_FILE_OFFSET_BITS==64)
+# 
+
 DEPENDS = cross/ncursesw cross/readline
 
 # compiler too old (-std=c11 required)
diff --git a/cross/rhash/Makefile b/cross/rhash/Makefile
index 4d93e119e18..29660cbc655 100644
--- a/cross/rhash/Makefile
+++ b/cross/rhash/Makefile
@@ -1,5 +1,5 @@
 PKG_NAME = RHash
-PKG_VERS = 1.4.3
+PKG_VERS = 1.4.4
 PKG_EXT = tar.gz
 PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://github.com/rhash/RHash/archive
diff --git a/cross/rhash/PLIST b/cross/rhash/PLIST
index a6ac140d2f3..fcf5237c438 100644
--- a/cross/rhash/PLIST
+++ b/cross/rhash/PLIST
@@ -1,5 +1,3 @@
-bin:bin/rhash
-rsc:etc/rhashrc
 lnk:bin/ed2k-link
 lnk:bin/edonr256-hash
 lnk:bin/edonr512-hash
@@ -7,8 +5,11 @@ lnk:bin/gost12-256-hash
 lnk:bin/gost12-512-hash
 lnk:bin/has160-hash
 lnk:bin/magnet-link
+bin:bin/rhash
 lnk:bin/sfv-hash
 lnk:bin/tiger-hash
 lnk:bin/tth-hash
 lnk:bin/whirlpool-hash
-lib:lib/librhash.so.0
+rsc:etc/rhashrc
+lnk:lib/librhash.so.1
+lib:lib/librhash.so.1.4.4
diff --git a/cross/rhash/digests b/cross/rhash/digests
index 1aaafe3d617..e57593b2260 100644
--- a/cross/rhash/digests
+++ b/cross/rhash/digests
@@ -1,3 +1,3 @@
-RHash-v1.4.3.tar.gz SHA1 6e698e6d5b13aeac55076d6a53dc4dab55f2114e
-RHash-v1.4.3.tar.gz SHA256 1e40fa66966306920f043866cbe8612f4b939b033ba5e2708c3f41be257c8a3e
-RHash-v1.4.3.tar.gz MD5 6de2d29618321e98cbb6138813b99797
+RHash-v1.4.4.tar.gz SHA1 feaee551aec9cc9a303a45aa8c864f97ece9ed2d
+RHash-v1.4.4.tar.gz SHA256 8e7d1a8ccac0143c8fe9b68ebac67d485df119ea17a613f4038cda52f84ef52a
+RHash-v1.4.4.tar.gz MD5 85384cefd616b6371cc95b9d89ffca28
diff --git a/cross/rmlint/Makefile b/cross/rmlint/Makefile
index 0329d4d37d0..8894ba1a3ff 100644
--- a/cross/rmlint/Makefile
+++ b/cross/rmlint/Makefile
@@ -1,5 +1,5 @@
 PKG_NAME = rmlint
-PKG_VERS = 2.10.1
+PKG_VERS = 2.10.2
 PKG_EXT = tar.gz
 PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://github.com/sahib/rmlint/archive
diff --git a/cross/rmlint/digests b/cross/rmlint/digests
index 2379e564696..ec27452b734 100644
--- a/cross/rmlint/digests
+++ b/cross/rmlint/digests
@@ -1,3 +1,3 @@
-rmlint-v2.10.1.tar.gz SHA1 9b4b8a7a38fbe3d105343bedda4198df8d3e9b26
-rmlint-v2.10.1.tar.gz SHA256 10e72ba4dd9672d1b6519c0c94eae647c5069c7d11f1409a46e7011dd0c6b883
-rmlint-v2.10.1.tar.gz MD5 ded893cfb1b24f2ec4b5525d6b92c298
+rmlint-v2.10.2.tar.gz SHA1 da49dba3d6bb71b87e1142b326a971d3018e6377
+rmlint-v2.10.2.tar.gz SHA256 0a0233ad517e0fb721f21e188a57cdee5279dd5329b38acb56d5d5312ce46388
+rmlint-v2.10.2.tar.gz MD5 4c3ebd6abb6843809d21d015a237ec30
diff --git a/cross/rmlint/patches/001-scons-pkg-config-libdir.patch b/cross/rmlint/patches/001-scons-pkg-config-libdir.patch
deleted file mode 100644
index eaf32acb79c..00000000000
--- a/cross/rmlint/patches/001-scons-pkg-config-libdir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- SConstruct.orig	2019-09-22 14:00:34.610189122 +0200
-+++ SConstruct	2019-09-22 13:59:57.096414135 +0200
-@@ -558,7 +558,7 @@
-     PREFIX=GetOption('prefix'),
-     ENV = dict([ (key, os.environ[key])
-                  for key in os.environ
--                 if key in ['PATH', 'TERM', 'HOME', 'PKG_CONFIG_PATH']
-+                 if key in ['PATH', 'TERM', 'HOME', 'PKG_CONFIG_PATH', 'PKG_CONFIG_LIBDIR']
-               ])
- )
- 
diff --git a/cross/rmlint/patches/001-scons-pkg-config-libdir_disable_error_undef.patch b/cross/rmlint/patches/001-scons-pkg-config-libdir_disable_error_undef.patch
new file mode 100644
index 00000000000..f3f3730fef3
--- /dev/null
+++ b/cross/rmlint/patches/001-scons-pkg-config-libdir_disable_error_undef.patch
@@ -0,0 +1,21 @@
+--- SConstruct.orig	2023-08-08 16:19:57.000000000 +0000
++++ SConstruct	2023-09-21 05:46:09.095898401 +0000
+@@ -538,7 +538,7 @@
+     PREFIX=GetOption('prefix'),
+     ENV = dict([ (key, os.environ[key])
+                  for key in os.environ
+-                 if key in ['PATH', 'TERM', 'HOME', 'PKG_CONFIG_PATH']
++                 if key in ['PATH', 'TERM', 'HOME', 'PKG_CONFIG_PATH', 'PKG_CONFIG_LIBDIR']                 
+               ])
+ )
+ 
+@@ -710,9 +710,6 @@
+ if conf.env['HAVE_LIBELF']:
+     conf.env.Append(_LIBFLAGS=['-lelf'])
+ 
+-# NB: After checks so they don't fail
+-conf.env.Append(CCFLAGS=['-Werror=undef'])
+-
+ 
+ if ARGUMENTS.get('GDB') == '1':
+     ARGUMENTS['DEBUG'] = '1'
diff --git a/cross/rnm/Makefile b/cross/rnm/Makefile
index 312ec664c69..89e70373ada 100644
--- a/cross/rnm/Makefile
+++ b/cross/rnm/Makefile
@@ -3,7 +3,7 @@ PKG_VERS = 4.0.9
 PKG_EXT = tar.gz
 PKG_DIST_NAME = $(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://github.com/neurobin/rnm/archive/refs/tags
-PKG_DIST_FILE=$(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
+PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
 
 DEPENDS = cross/jpcre2 cross/gmp
@@ -18,9 +18,11 @@ PRE_CONFIGURE_TARGET = rnm_pre_configure
 
 include ../../mk/spksrc.cross-cc.mk
 
-# requires gnu GCC >= 4.8
-UNSUPPORTED_ARCHS = $(ARMv5_ARCHS) $(OLD_PPC_ARCHS)
+ifeq ($(call version_lt, $(TC_GCC), 4.8.1),1)
+# A compiler with support for C++11 language features is required.
+UNSUPPORTED_ARCHS = $(ARCH)
+endif
 
 .PHONY: rnm_pre_configure
 rnm_pre_configure:
-	$(RUN) ./autogen.sh
+	@$(RUN) ./autogen.sh
diff --git a/cross/tree/Makefile b/cross/tree/Makefile
index 510f83a084c..1c576521fc7 100644
--- a/cross/tree/Makefile
+++ b/cross/tree/Makefile
@@ -1,5 +1,5 @@
 PKG_NAME = tree
-PKG_VERS = 2.1.0
+PKG_VERS = 2.1.1
 PKG_EXT = tgz
 PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = http://mama.indstate.edu/users/ice/tree/src
diff --git a/cross/tree/digests b/cross/tree/digests
index 7bd30e579cd..80505a21991 100644
--- a/cross/tree/digests
+++ b/cross/tree/digests
@@ -1,3 +1,3 @@
-tree-2.1.0.tgz SHA1 68a3e519e40805ca54bf71b746951e3bd96e48fe
-tree-2.1.0.tgz SHA256 0160c535bff2b0dc6a830b9944e981e3427380f63e748da96ced7071faebabf6
-tree-2.1.0.tgz MD5 50aa5cdb28df6340ef67a3a3ec953ffc
+tree-2.1.1.tgz SHA1 24c7eb69b9fd1d99eab8493f037eebd0213a0c3d
+tree-2.1.1.tgz SHA256 d3c3d55f403af7c76556546325aa1eca90b918cbaaf6d3ab60a49d8367ab90d5
+tree-2.1.1.tgz MD5 1376096bad6b1875d680b18873c249f1
diff --git a/cross/tree/patches/001-enable-cross-compiler-definitions.patch b/cross/tree/patches/001-enable-cross-compiler-definitions.patch
index ba69163751e..3cd5dfdde4e 100644
--- a/cross/tree/patches/001-enable-cross-compiler-definitions.patch
+++ b/cross/tree/patches/001-enable-cross-compiler-definitions.patch
@@ -1,5 +1,5 @@
---- Makefile.orig	2022-12-26 19:15:45.000000000 +0000
-+++ Makefile	2023-05-22 06:52:12.573047149 +0000
+--- Makefile.orig	2023-05-31 20:06:18.000000000 +0000
++++ Makefile	2023-09-19 20:23:34.496980046 +0000
 @@ -18,7 +18,7 @@
  
  PREFIX=/usr/local
@@ -8,13 +8,13 @@
 +#CC=gcc
  INSTALL=install
  
- VERSION=2.1.0
-@@ -33,7 +33,7 @@
+ VERSION=2.1.1
+@@ -32,7 +32,7 @@
+ # Uncomment options below for your particular OS:
  
  # Linux defaults:
- #CFLAGS+=-ggdb -std=c11 -pedantic -Wall -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
--CFLAGS+=-O3 -std=c11 -pedantic -Wall -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
-+#CFLAGS+=-O3 -std=c11 -pedantic -Wall -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+-CFLAGS+=-ggdb -std=c11 -pedantic -Wall -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
++#CFLAGS+=-ggdb -std=c11 -pedantic -Wall -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+ #CFLAGS+=-O3 -std=c11 -pedantic -Wall -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
  #LDFLAGS+=-s
  
- # Uncomment for FreeBSD:
diff --git a/diyspk/bat/Makefile b/diyspk/bat/Makefile
index f88965e2e0c..20bbc8821c7 100644
--- a/diyspk/bat/Makefile
+++ b/diyspk/bat/Makefile
@@ -1,10 +1,10 @@
 SPK_NAME = bat
-SPK_VERS = 0.22.1
+SPK_VERS = 0.23.0
 SPK_REV = 1
 
-DEPENDS = cross/$(SPK_NAME)
+DEPENDS = cross/bat
 
-UNSUPPORTED_ARCHS = $(OLD_PPC_ARCHS) $(ARMv5_ARCHS)
+UNSUPPORTED_ARCHS = $(OLD_PPC_ARCHS)
 
 MAINTAINER = SynoCommunity
 DESCRIPTION = A cat(1) clone with wings.
diff --git a/diyspk/dos2unix/Makefile b/diyspk/dos2unix/Makefile
index 6ec285119cf..d91c4457698 100644
--- a/diyspk/dos2unix/Makefile
+++ b/diyspk/dos2unix/Makefile
@@ -1,5 +1,5 @@
 SPK_NAME = dos2unix
-SPK_VERS = 7.4.3
+SPK_VERS = 7.5.1
 SPK_REV = 1
 
 DEPENDS = cross/dos2unix
diff --git a/diyspk/exa/Makefile b/diyspk/exa/Makefile
deleted file mode 100644
index 2bcbf8fd237..00000000000
--- a/diyspk/exa/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-SPK_NAME = exa
-SPK_VERS = 0.10.1
-SPK_REV = 1
-
-DEPENDS = cross/$(SPK_NAME)
-
-UNSUPPORTED_ARCHS = $(OLD_PPC_ARCHS) $(ARMv5_ARCHS)
-
-MAINTAINER = SynoCommunity
-DESCRIPTION = A modern replacement for ‘ls’.
-STARTABLE = no
-
-HOMEPAGE = https://the.exa.website/
-LICENSE  = MIT
-
-SPK_COMMANDS = bin/exa
-
-include ../../mk/spksrc.spk.mk
diff --git a/diyspk/eza/Makefile b/diyspk/eza/Makefile
new file mode 100644
index 00000000000..bb8dc7e2027
--- /dev/null
+++ b/diyspk/eza/Makefile
@@ -0,0 +1,18 @@
+SPK_NAME = eza
+SPK_VERS = 0.13.0
+SPK_REV = 1
+
+DEPENDS = cross/eza
+
+UNSUPPORTED_ARCHS = $(OLD_PPC_ARCHS)
+
+MAINTAINER = SynoCommunity
+DESCRIPTION = A modern replacement for ‘ls’.
+STARTABLE = no
+
+HOMEPAGE = https://eza.rocks/
+LICENSE  = MIT
+
+SPK_COMMANDS = bin/eza
+
+include ../../mk/spksrc.spk.mk
diff --git a/diyspk/file/Makefile b/diyspk/file/Makefile
index 99f14bb68ab..dfb01fe7f53 100644
--- a/diyspk/file/Makefile
+++ b/diyspk/file/Makefile
@@ -1,5 +1,5 @@
 SPK_NAME = file
-SPK_VERS = 5.39
+SPK_VERS = 5.45
 SPK_REV = 1
 
 DEPENDS = cross/file
diff --git a/diyspk/fzf/Makefile b/diyspk/fzf/Makefile
index 65cf275a226..6e04b6a7528 100644
--- a/diyspk/fzf/Makefile
+++ b/diyspk/fzf/Makefile
@@ -1,5 +1,5 @@
 SPK_NAME = fzf
-SPK_VERS = 0.35.1
+SPK_VERS = 0.42.0
 SPK_REV = 1
 SPK_ICON = src/fzf.png
 
diff --git a/diyspk/jdupes/Makefile b/diyspk/jdupes/Makefile
index a217e0c8c18..f322f1beaa9 100755
--- a/diyspk/jdupes/Makefile
+++ b/diyspk/jdupes/Makefile
@@ -1,5 +1,5 @@
 SPK_NAME = jdupes
-SPK_VERS = 1.26.1
+SPK_VERS = 1.27.3
 SPK_REV = 1
 SPK_ICON = src/jdupes.png
 
@@ -11,7 +11,6 @@ STARTABLE = no
 
 HOMEPAGE   = https://github.com/jbruchon/jdupes/
 LICENSE    = MIT
-HELP_URL   = https://github.com/jbruchon/jdupes/README
 
 SPK_COMMANDS = bin/jdupes
 
diff --git a/diyspk/less/Makefile b/diyspk/less/Makefile
index e418cb91757..7c6d2adb9e2 100644
--- a/diyspk/less/Makefile
+++ b/diyspk/less/Makefile
@@ -1,5 +1,5 @@
 SPK_NAME = less
-SPK_VERS = 608
+SPK_VERS = 643
 SPK_REV = 1
 SPK_ICON = src/gnu-logo.png
 
@@ -12,7 +12,6 @@ STARTABLE = no
 
 HOMEPAGE   = https://www.gnu.org/software/less/
 LICENSE    = GPLv3
-HELP_URL   = http://www.greenwoodsoftware.com/less/faq.html
 
 SPK_COMMANDS = bin/less bin/lessecho bin/lesskey
 
diff --git a/diyspk/mc/Makefile b/diyspk/mc/Makefile
index 6104b66a2a8..646d9b1511b 100644
--- a/diyspk/mc/Makefile
+++ b/diyspk/mc/Makefile
@@ -1,6 +1,6 @@
 SPK_NAME = mc
-SPK_VERS = 4.8.28
-SPK_REV = 10
+SPK_VERS = 4.8.30
+SPK_REV = 1
 SPK_ICON = src/mc.png
 
 DEPENDS = cross/mc
@@ -10,10 +10,9 @@ DESCRIPTION = Midnight Commander is a console application with a text user inter
 DESCRIPTION_FRE = Midnight Commander est une application en mode texte. L\'interface principale se compose de deux «panneaux» qui affichent les fichiers présents par rapport à leur emplacement sur le disque.
 DISPLAY_NAME = Midnight Commander
 STARTABLE = no
-CHANGELOG = "Update mc to version 4.8.28"
 
 HOMEPAGE = https://www.midnight-commander.org
-LICENSE  = GPL
+LICENSE = GPL
 
 SPK_COMMANDS = bin/mc bin/mcdiff bin/mcview bin/mcedit
 
diff --git a/diyspk/mg/Makefile b/diyspk/mg/Makefile
index aadf281bba4..7d2f134ba0e 100644
--- a/diyspk/mg/Makefile
+++ b/diyspk/mg/Makefile
@@ -1,6 +1,6 @@
 SPK_NAME = mg
-SPK_VERS = 3.5
-SPK_REV = 2
+SPK_VERS = 3.7
+SPK_REV = 1
 SPK_ICON = src/unix.png
 
 DEPENDS = cross/mg
diff --git a/diyspk/micro/Makefile b/diyspk/micro/Makefile
index 51bd187c023..cac374e0aa8 100644
--- a/diyspk/micro/Makefile
+++ b/diyspk/micro/Makefile
@@ -1,5 +1,5 @@
 SPK_NAME = micro
-SPK_VERS = 2.0.10
+SPK_VERS = 2.0.11
 SPK_REV = 2
 SPK_ICON = src/micro.png
 
diff --git a/diyspk/ncdu/Makefile b/diyspk/ncdu/Makefile
index 5e5a546b69e..f8895c5d185 100755
--- a/diyspk/ncdu/Makefile
+++ b/diyspk/ncdu/Makefile
@@ -1,16 +1,15 @@
 SPK_NAME = ncdu
-SPK_VERS = 1.17
-SPK_REV = 3
+SPK_VERS = 1.19
+SPK_REV = 1
 
 DEPENDS = cross/ncdu
 
 MAINTAINER = yeled
 DESCRIPTION = Disk usage analyzer with an ncurses interface.
-DISPLAY_NAME = ncdu
 STARTABLE = no
 
-HOMEPAGE   = https://dev.yorhel.nl/ncdu
-LICENSE    = MIT
+HOMEPAGE = https://dev.yorhel.nl/ncdu
+LICENSE = MIT
 
 SPK_COMMANDS = bin/ncdu
 
diff --git a/diyspk/nnn/Makefile b/diyspk/nnn/Makefile
index 6daf72e9da7..35f832953e2 100644
--- a/diyspk/nnn/Makefile
+++ b/diyspk/nnn/Makefile
@@ -1,10 +1,13 @@
 SPK_NAME = nnn
-SPK_VERS = 4.7
+SPK_VERS = 4.8
 SPK_REV = 1
 SPK_ICON = src/nnn.png
 
 DEPENDS = cross/nnn
 
+# for those use cross/nnn_4.0
+UNSUPPORTED_ARCHS = $(OLD_PPC_ARCHS) $(ARMv5_ARCHS)
+
 MAINTAINER = SynoCommunity
 DESCRIPTION = n³ The unorthodox terminal file manager.
 DISPLAY_NAME = n³
diff --git a/diyspk/rhash/Makefile b/diyspk/rhash/Makefile
index 0ec73d49b33..7da4b6bde8c 100755
--- a/diyspk/rhash/Makefile
+++ b/diyspk/rhash/Makefile
@@ -1,8 +1,8 @@
 SPK_NAME = rhash
-SPK_VERS = 1.4.3
-SPK_REV = 2
+SPK_VERS = 1.4.4
+SPK_REV = 1
 
-DEPENDS = cross/$(SPK_NAME)
+DEPENDS = cross/rhash
 
 MAINTAINER = Fredrike
 DESCRIPTION = "RHash is a console utility for calculation and verification of magnet links and a wide range of hash sums like CRC32, MD4, MD5, SHA1, SHA256, SHA512, SHA3, AICH, ED2K, Tiger, DC++ TTH, BitTorrent BTIH, GOST R 34.11-94, RIPEMD-160, HAS-160, EDON-R, Whirlpool and Snefru."
@@ -11,8 +11,8 @@ STARTABLE = no
 
 POST_STRIP_TARGET = rhash_extra_install
 
-HOMEPAGE   = http://rhash.sourceforge.net/
-LICENSE    = MIT
+HOMEPAGE = http://rhash.sourceforge.net/
+LICENSE = MIT
 
 SPK_COMMANDS  = bin/rhash
 SPK_COMMANDS += bin/ed2k-link
diff --git a/diyspk/rmlint/Makefile b/diyspk/rmlint/Makefile
index 71afa05f7c8..efd5af666b7 100644
--- a/diyspk/rmlint/Makefile
+++ b/diyspk/rmlint/Makefile
@@ -1,5 +1,5 @@
 SPK_NAME = rmlint
-SPK_VERS = 2.10.1
+SPK_VERS = 2.10.2
 SPK_REV = 1
 SPK_ICON = src/rmlint-logo.png
 
@@ -7,12 +7,10 @@ DEPENDS = cross/rmlint
 
 MAINTAINER = SynoCommunity
 DESCRIPTION = rmlint finds space waste and other broken things on your filesystem and offers to remove it.
-DISPLAY_NAME = rmlint
 STARTABLE = no
 
-HOMEPAGE   = https://github.com/sahib/rmlint
-LICENSE    = GPLv3
-HELP_URL   = https://rmlint.readthedocs.io/en/latest/
+HOMEPAGE = https://github.com/sahib/rmlint
+LICENSE = GPLv3
 
 SPK_COMMANDS = bin/rmlint
 
diff --git a/diyspk/rnm/Makefile b/diyspk/rnm/Makefile
index 44ac5c3f664..b2b7a96ffc1 100644
--- a/diyspk/rnm/Makefile
+++ b/diyspk/rnm/Makefile
@@ -1,15 +1,12 @@
 SPK_NAME = rnm
-SPK_VERS = 4.0.6
+SPK_VERS = 4.0.9
 SPK_REV = 1
 
 DEPENDS = cross/rnm
 
 MAINTAINER = SynoCommunity
-DESCRIPTION = rnm renames files/directories in bulk. Naming scheme (Name String) can be applied or regex replace can be performed to modify file names on the fly. It uses PCRE2 (revised version of PCRE) regex to provide search (and replace) functionality.
-RELOAD_UI = no
-DISPLAY_NAME = rnm
+DESCRIPTION = rnm renames files/directories in bulk. Naming scheme \(Name String\) can be applied or regex replace can be performed to modify file names on the fly. It uses PCRE2 \(revised version of PCRE\) regex to provide search \(and replace\) functionality.
 STARTABLE = no
-CHANGELOG = Initial release
 
 HOMEPAGE = https://neurobin.org/projects/softwares/unix/rnm/
 LICENSE = GPL v3.0
@@ -17,3 +14,7 @@ LICENSE = GPL v3.0
 SPK_COMMANDS = bin/rnm
 
 include ../../mk/spksrc.spk.mk
+
+ifeq ($(call version_lt, $(TC_GCC), 4.8.1),1)
+UNSUPPORTED_ARCHS = $(ARCH)
+endif
diff --git a/diyspk/tree/Makefile b/diyspk/tree/Makefile
index 512f50dd75b..e15b262be59 100644
--- a/diyspk/tree/Makefile
+++ b/diyspk/tree/Makefile
@@ -1,5 +1,5 @@
 SPK_NAME = tree
-SPK_VERS = 2.0.4
+SPK_VERS = 2.1.1
 SPK_REV = 1
 
 DEPENDS = cross/tree
diff --git a/native/file/Makefile b/native/file/Makefile
new file mode 100644
index 00000000000..d468db10740
--- /dev/null
+++ b/native/file/Makefile
@@ -0,0 +1,20 @@
+PKG_NAME = file
+PKG_VERS = 5.45
+PKG_EXT = tar.gz
+PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
+PKG_DIST_SITE = http://ftp.astron.com/pub/file
+PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
+
+DEPENDS =
+
+HOMEPAGE = https://www.darwinsys.com/file/
+COMMENT  = The file command is "a file type guesser", that is, a command-line tool that tells you in words what kind of data a file contains. Unlike most GUI systems, command-line UNIX systems - with this program leading the charge - don't rely on filename extentions to tell you the type of a file, but look at the file's actual contents. This is, of course, more reliable, but requires a bit of I/O.
+LICENSE  = https://github.com/file/file/blob/master/COPYING
+
+GNU_CONFIGURE = 1
+# force build of static version
+# otherwise magic.mgc fails to build with error:
+# Compiled magic version [545] does not match with shared library magic version [539]
+CONFIGURE_ARGS += --enable-static --disable-shared
+
+include ../../mk/spksrc.native-cc.mk
diff --git a/native/file/digests b/native/file/digests
new file mode 100644
index 00000000000..3eedd482019
--- /dev/null
+++ b/native/file/digests
@@ -0,0 +1,3 @@
+file-5.45.tar.gz SHA1 e8ee39339e5d3d68b7da9c45580f2ca5faf0db54
+file-5.45.tar.gz SHA256 fc97f51029bb0e2c9f4e3bffefdaf678f0e039ee872b9de5c002a6d09c784d82
+file-5.45.tar.gz MD5 26b2a96d4e3a8938827a1e572afd527a
diff --git a/spk/synocli-file/Makefile b/spk/synocli-file/Makefile
index 07b8c8768d4..7b898a04588 100644
--- a/spk/synocli-file/Makefile
+++ b/spk/synocli-file/Makefile
@@ -1,6 +1,6 @@
 SPK_NAME = synocli-file
-SPK_VERS = 2.7
-SPK_REV = 20
+SPK_VERS = 3.1
+SPK_REV = 21
 SPK_ICON = src/synocli-file.png
 
 # packages depending on cross/zlib must be defined later, see below
@@ -13,7 +13,7 @@ DEPENDS += cross/iconv
 DEPENDS += cross/dos2unix
 
 OPTIONAL_DEPENDS  = cross/rmlint cross/rnm cross/micro cross/fzf cross/ripgrep cross/fd cross/sd
-OPTIONAL_DEPENDS += cross/bat cross/exa
+OPTIONAL_DEPENDS += cross/bat cross/eza
 OPTIONAL_DEPENDS += cross/nnn cross/nnn_4.0
 
 MAINTAINER = hgy59
@@ -28,8 +28,8 @@ include ../../mk/spksrc.common.mk
 ifneq ($(findstring $(ARCH),$(OLD_PPC_ARCHS)),$(ARCH))
 # build rust tools before packages depending on cross/zlib
 # These tools must use cross/zlib-ng instead of cross/zlib, otherwise will fail to find zlib (x64 only)
-DEPENDS += cross/bat cross/exa
-OPTIONAL_DESC := $(OPTIONAL_DESC)", bat, exa"
+DEPENDS += cross/bat cross/eza
+OPTIONAL_DESC := $(OPTIONAL_DESC)", bat, eza"
 endif
 
 # PPC archs except QorIQ
@@ -43,14 +43,11 @@ endif
 # packages depending on cross/zlib
 DEPENDS += cross/mc cross/pcre2 cross/fdupes cross/zstd
 
-ifneq ($(findstring $(ARCH),$(OLD_PPC_ARCHS) $(ARMv5_ARCHS)),$(ARCH))
-# gcc with stdc++11 support
-ifneq ($(call version_lt, ${TCVERSION}, 6.0)$(call version_ge, ${TCVERSION}, 3.0),11)
-# to build rnm, GCC >= 4.8 is required
+ifeq ($(call version_ge, $(TC_GCC), 4.8.1),1)
+# A compiler with support for C++11 language features is required.
 DEPENDS += cross/rnm
 OPTIONAL_DESC := $(OPTIONAL_DESC)", rnm"
 endif
-endif
 
 ifneq ($(findstring $(ARCH),$(OLD_PPC_ARCHS)),$(ARCH))
 OPTIONAL_DESC := $(OPTIONAL_DESC)", nnn (n³)"
@@ -90,7 +87,7 @@ export PCRE2_CLI_FULL
 
 DESCRIPTION = "SynoCli File Tools provide a set of small command-line utilities: less, tree, ncdu, jdupes, fdupes, rhash, mc \(midnight commander\), mg \(emacs-like text editor\), nano, jupp \(based on JOE - Joe\'s Own Editor 3.1\), file, detox, pcre2, zstd, lzip, plzip, detox, iconv, dos2unix tools$(OPTIONAL_DESC)."
 STARTABLE = no
-CHANGELOG = "1. Update bat to v0.23.0.<br/>2. Update dos2unix to v7.5.0.<br/>3. Update fzf to v0.40.0.<br/>4. Update gdu to v5.23.0.<br/>5. Update jdupes to v1.26.1.<br/>6. Update jupp to v3.1-41.<br/>7. Update less to v633.<br/>8. Update mc to v4.8.29.<br/>9. Update mg to v3.6.<br/>10. Update nano to v7.2.<br/>11. Update ncdu to v1.18.1.<br/>12. Update nnn to v.4.8, but downgrade nnn to v4.0 for 32-bit archs on DSM<7.<br/>13. Update pcre2 to v10.42.<br/>14. Update tree to v2.1.0.<br/>15. Update openssl to v3.1.1."
+CHANGELOG = "1. Replace exa by eza v0.13.0.<br/>2. Update dos2unix to v 7.5.1.<br>3. Update file to v5.45.<br/>4. Update fzf to v0.42.0.<br/>5. Update jdupes to v1.27.3.<br/>6. Update less to v643.<br/>7. Update micro to v2.0.12.<br/>8. Update Midnight Commander to v4.8.30.<br/>9. Update mg v3.7.<br/>10. Update ncdu to v1.19.<br/>11. Update rhash to v1.4.4.<br/>12. Update rmlint to v2.10.2.<br/>13. Update tree to v2.1.1.<br/>"
 
 SERVICE_SETUP = src/service-setup.sh
 
@@ -118,7 +115,7 @@ SPK_COMMANDS += bin/fd
 SPK_COMMANDS += bin/sd
 SPK_COMMANDS += bin/mg
 SPK_COMMANDS += bin/bat
-SPK_COMMANDS += bin/exa
+SPK_COMMANDS += bin/eza
 SPK_COMMANDS += bin/jmacs bin/joe bin/jpico bin/jstar bin/jupp bin/rjoe
 SPK_COMMANDS += bin/nnn
 SPK_COMMANDS += bin/iconv