update synocli-file (#6436)

* update synocli-file - remove ncdu (duplicate of ncdu in synocli-disk) - update bat from v0.24.0 to v0.25.0 - update eza from v0.20.15 to v0.20.18 - update fzf from v0.57.0 to v0.58.0 - update mc from v4.8.32 to v4.8.33 - update plzip from v1.11 to v1.12
SynoCommunity · Feb 1, 2025 · 7fae178 · 7fae178
1 parent 25945f0
commit 7fae178
Show file tree

Hide file tree

Showing 16 changed files with 46 additions and 40 deletions.
diff --git a/cross/bat/Makefile b/cross/bat/Makefile
@@ -1,5 +1,5 @@
 PKG_NAME = bat
-PKG_VERS = 0.24.0
+PKG_VERS = 0.25.0
 PKG_EXT = tar.gz
 PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://github.com/sharkdp/bat/archive

diff --git a/cross/bat/digests b/cross/bat/digests
@@ -1,3 +1,3 @@
-bat-0.24.0.tar.gz SHA1 3ea9cf471484f520b58f699e4790bc3dadb3d5cb
-bat-0.24.0.tar.gz SHA256 907554a9eff239f256ee8fe05a922aad84febe4fe10a499def72a4557e9eedfb
-bat-0.24.0.tar.gz MD5 29835f4ae789902ef0db3a39024d6016
+bat-0.25.0.tar.gz SHA1 37a2d682fcd2e5b85062d37cf0ccbd745d0269ee
+bat-0.25.0.tar.gz SHA256 4433403785ebb61d1e5d4940a8196d020019ce11a6f7d4553ea1d324331d8924
+bat-0.25.0.tar.gz MD5 e130e0d21cb1999265b6f3a54079d316
diff --git a/cross/eza/Makefile b/cross/eza/Makefile
@@ -1,11 +1,14 @@
 PKG_NAME = eza
-PKG_VERS = 0.20.15
+PKG_VERS = 0.20.18
 PKG_EXT = tar.gz
 PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT)
 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)
 
+# Remarks: this is the latest version for ARMv5_ARCHS
+# eza >= 0.20.19 requires RUST_TOOLCHAIN >= 1.78
+
 DEPENDS = cross/zlib
 
 # linker error:  undefined reference to `pthread_setname_np'

diff --git a/cross/eza/digests b/cross/eza/digests
@@ -1,3 +1,3 @@
-eza-0.20.15.tar.gz SHA1 17d5343e82713ec933b0e4988adf8b5bedce0375
-eza-0.20.15.tar.gz SHA256 cbb50e61b35b06ccf487ee6cc88d3b624931093546194dd5a2bbd509ed1786d6
-eza-0.20.15.tar.gz MD5 29d640f75265e7327bd67a21202eaef0
+eza-0.20.18.tar.gz SHA1 40f2d349a87f6c770921bf594e6f5b2a7f3c7ad8
+eza-0.20.18.tar.gz SHA256 b123a29747fe164d8f9851dae42155111bf38c8820b6bb51cd2453bd7f9be6bc
+eza-0.20.18.tar.gz MD5 f66bd1234c3ef0cf9210ba93ec850c21
diff --git a/cross/fzf/Makefile b/cross/fzf/Makefile
@@ -1,5 +1,5 @@
 PKG_NAME = fzf
-PKG_VERS = 0.57.0
+PKG_VERS = 0.58.0
 PKG_EXT = tar.gz
 PKG_REVISION = $(shell date +%m/%d/%Y)
 PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT)

diff --git a/cross/fzf/digests b/cross/fzf/digests
@@ -1,3 +1,3 @@
-fzf-0.57.0.tar.gz SHA1 5c15a21083621fc2629ed7b483328810d75f9f8b
-fzf-0.57.0.tar.gz SHA256 d4e8e25fad2d3f75943b403c40b61326db74b705bf629c279978fdd0ceb1f97c
-fzf-0.57.0.tar.gz MD5 a90a9212ec21aeab508d9618c83bd9f8
+fzf-0.58.0.tar.gz SHA1 7e8f0415c4387be1cb85ad594bc961d546d50332
+fzf-0.58.0.tar.gz SHA256 c49e5b13c7f3ee28ebc41ce720e48054287f11186212b2152434497a590f1a63
+fzf-0.58.0.tar.gz MD5 d397b733177f9a10c23173d87a09d23c
diff --git a/cross/mc/Makefile b/cross/mc/Makefile
@@ -1,5 +1,5 @@
 PKG_NAME = mc
-PKG_VERS = 4.8.32
+PKG_VERS = 4.8.33
 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
@@ -1,3 +1,3 @@
-mc-4.8.32.tar.xz SHA1 34f81bca8fd0d79f2aa4884b1fed38ba80b09b22
-mc-4.8.32.tar.xz SHA256 4ddc83d1ede9af2363b3eab987f54b87cf6619324110ce2d3a0e70944d1359fe
-mc-4.8.32.tar.xz MD5 bcc9043a815c02c5837f8b1a4a60da5a
+mc-4.8.33.tar.xz SHA1 5c717fe7f5fde13bb0af9c5bd15cd2f83942d9fc
+mc-4.8.33.tar.xz SHA256 cae149d42f844e5185d8c81d7db3913a8fa214c65f852200a9d896b468af164c
+mc-4.8.33.tar.xz MD5 b3596c1f092b9822a6cd9c9a1aef8dde
diff --git a/cross/mc/patches/3689-bash-subshell.patch b/cross/mc/patches/3689-bash-subshell.patch
@@ -2,8 +2,8 @@ dnl original patch provided by alllexx88 as 3689-bash-subshell-V3.patch
 dnl https://midnight-commander.org/ticket/3689
 dnl since v4.8.32 src/subshell/common.c does not need a patch anymore
 
---- lib/shell.c.org	2019-06-16 17:49:31.000000000 +0000
-+++ lib/shell.c	2019-12-29 17:34:32.741113924 +0000
+--- lib/shell.c.orig	2025-01-15 16:52:17.000000000 +0000
++++ lib/shell.c	2025-02-01 14:41:48.363742677 +0000
 @@ -33,6 +33,8 @@
  #include <stdarg.h>
  #include <stdio.h>
@@ -13,7 +13,7 @@ dnl since v4.8.32 src/subshell/common.c does not need a patch anymore
 
  #include "global.h"
  #include "util.h"
-@@ -191,16 +193,56 @@
+@@ -217,16 +219,56 @@
          mc_shell->type = SHELL_NONE;
  }
 
@@ -62,7 +62,7 @@ dnl since v4.8.32 src/subshell/common.c does not need a patch anymore
  mc_shell_recognize_path (mc_shell_t *mc_shell)
  {
 -    /* If shell is not symlinked to busybox, it is safe to assume it is a real shell */
--    if (strstr (mc_shell->path, "/bash") != NULL || getenv ("BASH") != NULL)
+-    if (strstr (mc_shell->path, "/bash") != NULL || getenv ("BASH_VERSION") != NULL)
 +    /* If shell is not symlinked to busybox, it is safe to assume it is a real shell
 +       Let's assume shell is bash if BASH internal variable is set */
 +    if (mc_shell_internal_variable_isset (mc_shell, "BASH"))
@@ -71,5 +71,5 @@ dnl since v4.8.32 src/subshell/common.c does not need a patch anymore
 -        mc_shell->name = "bash";
 +        mc_shell->name = mc_shell->path;
      }
-     else if (strstr (mc_shell->path, "/sh") != NULL || getenv ("SH") != NULL)
+     else if (strstr (mc_shell->path, "/sh") != NULL)
      {
diff --git a/cross/plzip/Makefile b/cross/plzip/Makefile
@@ -1,5 +1,5 @@
 PKG_NAME = plzip
-PKG_VERS = 1.11
+PKG_VERS = 1.12
 PKG_EXT = tar.gz
 PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://download.savannah.gnu.org/releases/lzip/plzip

diff --git a/cross/plzip/digests b/cross/plzip/digests
@@ -1,3 +1,3 @@
-plzip-1.11.tar.gz SHA1 52f182a43f97ce302258cbc17685fa48e738c90a
-plzip-1.11.tar.gz SHA256 d8e3cbe45c9222383339130e1bcc6e5e884d776b63f188896e6df67bc1d5626b
-plzip-1.11.tar.gz MD5 bfd2f6fb94e8a3f458a11c7da663d900
+plzip-1.12.tar.gz SHA1 455bb9c62d3efd884a044771be5b5a5b179344fe
+plzip-1.12.tar.gz SHA256 50d71aad6fa154ad8c824279e86eade4bcf3bb4932d757d8f281ac09cfadae30
+plzip-1.12.tar.gz MD5 79f80e5f8b89dcd77b5a06c2590eff9f
diff --git a/diyspk/bat/Makefile b/diyspk/bat/Makefile
@@ -1,5 +1,5 @@
 SPK_NAME = bat
-SPK_VERS = 0.24.0
+SPK_VERS = 0.25.0
 SPK_REV = 1
 
 DEPENDS = cross/bat

diff --git a/diyspk/eza/Makefile b/diyspk/eza/Makefile
@@ -1,5 +1,5 @@
 SPK_NAME = eza
-SPK_VERS = 0.20.15
+SPK_VERS = 0.20.18
 SPK_REV = 1
 
 DEPENDS = cross/eza

diff --git a/diyspk/fzf/Makefile b/diyspk/fzf/Makefile
@@ -1,5 +1,5 @@
 SPK_NAME = fzf
-SPK_VERS = 0.57.0
+SPK_VERS = 0.58.0
 SPK_REV = 1
 SPK_ICON = src/fzf.png
 

diff --git a/diyspk/mc/Makefile b/diyspk/mc/Makefile
@@ -1,5 +1,5 @@
 SPK_NAME = mc
-SPK_VERS = 4.8.32
+SPK_VERS = 4.8.33
 SPK_REV = 1
 SPK_ICON = src/mc.png
 

diff --git a/spk/synocli-file/Makefile b/spk/synocli-file/Makefile
@@ -1,6 +1,6 @@
 SPK_NAME = synocli-file
 SPK_VERS = 4.0
-SPK_REV = 25
+SPK_REV = 26
 SPK_ICON = src/synocli-file.png
 
 # cross/libblkid must be built before cross/e2fsprogs or cross/libext2fs
@@ -9,7 +9,7 @@ SPK_ICON = src/synocli-file.png
 #   it's own libblkid and rmlint cannot find the working library of cross/libblkid.
 BUILD_DEPENDS = cross/libblkid
 
-DEPENDS  = cross/less cross/tree cross/ncdu cross/jdupes cross/rhash cross/nano cross/file
+DEPENDS  = cross/less cross/tree cross/jdupes cross/rhash cross/nano cross/file
 DEPENDS += cross/mc cross/pcre2 cross/fdupes cross/zstd
 DEPENDS += cross/detox
 DEPENDS += cross/lzip cross/plzip
@@ -101,7 +101,7 @@ PCRE2_CLI_FULL = 1
 export PCRE2_CLI_FULL
 
 DESCRIPTION = "SynoCli File Tools provide a set of small command-line utilities: \
-    less, tree, ncdu, jdupes, fdupes, rhash, \
+    less, tree, jdupes, fdupes, rhash, \
     mc \(midnight commander\), \
     mg \(emacs-like text editor\), nano, \
     jupp \(based on JOE - Joe\'s Own Editor 3.1\), \
@@ -110,13 +110,17 @@ DESCRIPTION = "SynoCli File Tools provide a set of small command-line utilities:
     detox, iconv, dos2unix tools, \
     patch$(OPTIONAL_DESC)."
 STARTABLE = no
-CHANGELOG  = "1. Remove fd (fd-find) v8.7.0 used for VS and NVR models (ARMv7L archs) and for ARMv5 archs. <br/>"
-CHANGELOG += "2. Update eza to v0.20.15. <br/>"
-CHANGELOG += "3. Update file to v5.46. <br/>"
-CHANGELOG += "4. Update fzf to v0.57.0. <br/>"
-CHANGELOG += "5. Update nano to v8.3. <br/>"
-CHANGELOG += "6. Update nnn to v5.0 (DSM 7 only). <br/>"
-CHANGELOG += "7. Update tree to v2.2.1."
+CHANGELOG  = "1. Remove fd (fd-find) for VS and NVR models (ARMv7L archs) and for ARMv5 archs. <br/>"
+CHANGELOG += "2. Remove ncdu (ncdu is part of synocli-disk). <br/>"
+CHANGELOG += "3. Update bat to v0.250. <br/>"
+CHANGELOG += "4. Update eza to v0.20.18. <br/>"
+CHANGELOG += "5. Update file to v5.46. <br/>"
+CHANGELOG += "6. Update fzf to v0.58.0. <br/>"
+CHANGELOG += "7. Update mc to v4.8.33. <br/>"
+CHANGELOG += "8. Update nano to v8.3. <br/>"
+CHANGELOG += "9. Update nnn to v5.0 (DSM 7 only). <br/>"
+CHANGELOG += "10. Update plzip to v1,12. <br/>"
+CHANGELOG += "11. Update tree to v2.2.1."
 
 SERVICE_SETUP = src/service-setup.sh
 
@@ -125,7 +129,6 @@ LICENSE  = Each tool is licensed under it's respective license.
 
 SPK_COMMANDS  = bin/less bin/lessecho bin/lesskey
 SPK_COMMANDS += bin/tree
-SPK_COMMANDS += bin/ncdu
 SPK_COMMANDS += bin/jdupes
 SPK_COMMANDS += bin/mc bin/mcdiff bin/mcview bin/mcedit
 SPK_COMMANDS += bin/nano bin/rnano