update synocli-file (#6031)

* update synocli-file
- add xstow (#5714)
- update dos2unix to v7.5.2
- update eza v0.18.6
- update fd to v9.0.0
- update fzf to v0.46.1
- update lzip to v1.24 and plzip to v1.11
- update ripgrep to v14.1.0

* synocli-file: add patch
- add patch (#6030)

* Update mc to v4.8.31

cross/dos2unix/Makefile

@@ -1,5 +1,5 @@
 PKG_NAME = dos2unix
-PKG_VERS = 7.5.1
+PKG_VERS = 7.5.2
 PKG_EXT = tar.gz
 PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://waterlan.home.xs4all.nl/dos2unix

cross/dos2unix/digests

@@ -1,3 +1,3 @@
-dos2unix-7.5.1.tar.gz SHA1 231bcea3d5efc7addd66dd1ecd0c718c70fc6aae
-dos2unix-7.5.1.tar.gz SHA256 da07788bb2e029b0d63f6471d166f68528acd8da2cf14823a188e8a9d5c1fc15
-dos2unix-7.5.1.tar.gz MD5 8aef90aeae07b6ad9f8fc77e4eb12541
+dos2unix-7.5.2.tar.gz SHA1 84d6f6daca1b91a776bf06cdbae96a91cd117acc
+dos2unix-7.5.2.tar.gz SHA256 264742446608442eb48f96c20af6da303cb3a92b364e72cb7e24f88239c4bf3a
+dos2unix-7.5.2.tar.gz MD5 646272020848c9b673de24c4e8e3422e

cross/eza/Makefile

@@ -1,5 +1,5 @@
 PKG_NAME = eza
-PKG_VERS = 0.16.1
+PKG_VERS = 0.18.6
 PKG_EXT = tar.gz
 PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://github.com/eza-community/eza/archive

cross/eza/digests

@@ -1,3 +1,3 @@
-eza-0.16.1.tar.gz SHA1 e7afeaacc4dfd6881601404eec6b4cd2080a8f1e
-eza-0.16.1.tar.gz SHA256 e1c9e313ffb98730e8bbc90a30ea951237f38474108072e9253ae89951ba8cdc
-eza-0.16.1.tar.gz MD5 415d6c5fdff790fb6d145c27bb63d2ff
+eza-0.18.6.tar.gz SHA1 7c0bad75356241bfcbdbe3a5b00b4d866650f964
+eza-0.18.6.tar.gz SHA256 4cbca009d8ddc817d9ffda34bd1cada4278896e63051c645f0821605a6497faa
+eza-0.18.6.tar.gz MD5 4c1132f9c474987c34069c3db7a8ee7d

cross/fd/Makefile

@@ -1,19 +1,21 @@
 PKG_NAME = fd
-PKG_VERS = 8.7.0
+PKG_VERS = 9.0.0
 PKG_EXT = tar.gz
 PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://github.com/sharkdp/fd/archive
 PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
 
 # PKG_VERS = 8.7.1 fails to build for RUST_TARGET = armv7-unknown-linux-gnueabi $(ARMv7L_ARCHS)
+# PKG_VERS >= 9 still fails for$(ARMv7L_ARCHS)
 # see: https://github.com/sharkdp/fd/issues/1428
-
+UNSUPPORTED_ARCHS = $(ARMv7L_ARCHS)
 # powerpc archs (except qoriq) are not supported
 # undefined reference to 'pipe2'
 UNSUPPORTED_ARCHS += $(OLD_PPC_ARCHS)
 
 include ../../mk/spksrc.archs.mk
+# This is still an issue with rustc 1.76.0 (07dca489a 2024-02-04):
 # issue with ARMv5: https://github.com/sharkdp/fd/issues/1049#issue-1283491635
 # workaround for: https://github.com/rust-lang/compiler-builtins/issues/420
 # fix documented in comment: https://github.com/rust-lang/compiler-builtins/issues/420#issuecomment-1335159456

cross/fd/digests

@@ -1,3 +1,3 @@
-fd-8.7.0.tar.gz SHA1 258ad4bc76758da1fe6a88777caae11eade2e95b
-fd-8.7.0.tar.gz SHA256 13da15f3197d58a54768aaad0099c80ad2e9756dd1b0c7df68c413ad2d5238c9
-fd-8.7.0.tar.gz MD5 053987b4ff53af8fb9b05affd0cfa011
+fd-9.0.0.tar.gz SHA1 397e4a5efcd3730fa036f058a6a7432dbf1dac71
+fd-9.0.0.tar.gz SHA256 306d7662994e06e23d25587246fa3fb1f528579e42a84f5128e75feec635a370
+fd-9.0.0.tar.gz MD5 3ee72ca77c9a6b0ad108f48338206f05

cross/fd_8.7.0/Makefile

@@ -0,0 +1,28 @@
+PKG_NAME = fd
+PKG_VERS = 8.7.0
+PKG_EXT = tar.gz
+PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT)
+PKG_DIST_SITE = https://github.com/sharkdp/fd/archive
+PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
+PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
+
+# PKG_VERS = 8.7.1 fails to build for RUST_TARGET = armv7-unknown-linux-gnueabi $(ARMv7L_ARCHS)
+# see: https://github.com/sharkdp/fd/issues/1428
+
+# powerpc archs (except qoriq) are not supported
+# undefined reference to 'pipe2'
+UNSUPPORTED_ARCHS += $(OLD_PPC_ARCHS)
+
+include ../../mk/spksrc.archs.mk
+# issue with ARMv5: https://github.com/sharkdp/fd/issues/1049#issue-1283491635
+# workaround for: https://github.com/rust-lang/compiler-builtins/issues/420
+# fix documented in comment: https://github.com/rust-lang/compiler-builtins/issues/420#issuecomment-1335159456
+ifeq ($(findstring $(ARCH),$(ARMv5_ARCHS)),$(ARCH))
+ENV += RUSTFLAGS="-Clink-arg=-Wl,--allow-multiple-definition"
+endif
+
+HOMEPAGE = https://github.com/sharkdp/fd
+COMMENT  = fd is a program to find entries in your filesystem. It is a simple, fast and user-friendly alternative to find. While it does not aim to support all of find's powerful functionality, it provides sensible (opinionated) defaults for a majority of use cases.
+LICENSE  = Apache 2.0 / MIT
+
+include ../../mk/spksrc.cross-rust.mk

cross/fd_8.7.0/PLIST

@@ -0,0 +1 @@
+bin:bin/fd

cross/fd_8.7.0/digests

@@ -0,0 +1,3 @@
+fd-8.7.0.tar.gz SHA1 258ad4bc76758da1fe6a88777caae11eade2e95b
+fd-8.7.0.tar.gz SHA256 13da15f3197d58a54768aaad0099c80ad2e9756dd1b0c7df68c413ad2d5238c9
+fd-8.7.0.tar.gz MD5 053987b4ff53af8fb9b05affd0cfa011

cross/fzf/Makefile

@@ -1,5 +1,5 @@
 PKG_NAME = fzf
-PKG_VERS = 0.44.1
+PKG_VERS = 0.46.1
 PKG_EXT = tar.gz
 PKG_REVISION = $(shell date +%m/%d/%Y)
 PKG_DIST_NAME = $(PKG_VERS).$(PKG_EXT)

cross/fzf/digests

@@ -1,3 +1,3 @@
-fzf-0.44.1.tar.gz SHA1 d70de6b092b546493717fdb8bb69930a97580379
-fzf-0.44.1.tar.gz SHA256 295f3aec9519f0cf2dce67a14e94d8a743d82c19520e5671f39c71c9ea04f90c
-fzf-0.44.1.tar.gz MD5 6687e6f61baae4678490643456c362ff
+fzf-0.46.1.tar.gz SHA1 0d022d23059cb4e193cd5320d8e979c13c66f6d6
+fzf-0.46.1.tar.gz SHA256 b0d640be3ae79980fdf461096f7d9d36d38ec752e25f8c4d2ca3ca6c041c2491
+fzf-0.46.1.tar.gz MD5 91a189b1f67ff47c1ecdc11821cd4127

cross/jdupes/Makefile

@@ -8,7 +8,7 @@ PKG_DIR = $(PKG_NAME)
 
 DEPENDS = cross/libjodycode
 
-HOMEPAGE = https://github.com/jbruchon/jdupes
+HOMEPAGE = https://www.jdupes.com/
 COMMENT  = A powerful duplicate file finder and an enhanced fork of fdupes.
 LICENSE  = MIT
 

cross/jemalloc/Makefile

@@ -2,17 +2,17 @@ PKG_NAME = jemalloc
 PKG_VERS = 5.2.1
 PKG_EXT = tar.bz2
 PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
-PKG_DIST_SITE = https://github.com/jemalloc/jemalloc/releases/download/$(PKG_VERS)/
+PKG_DIST_SITE = https://github.com/jemalloc/jemalloc/releases/download/$(PKG_VERS)
 PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
 
 DEPENDS =
 
 # jemalloc is a development tool, replacing standard allocator to diagnose memory leaks.
 # It is not included in any package, except to produce test packages for troubleshooting.
 
-HOMEPAGE = http://jemalloc.net/license.html
-COMMENT  = General-purpose scalable concurrent malloc(3) implementation
-LICENSE  = https://github.com/jemalloc/jemalloc/blob/dev/COPYING
+HOMEPAGE = https://jemalloc.net/
+COMMENT  = General-purpose scalable concurrent malloc(3) implementation.
+LICENSE  = 2-Clause BSD
 
 GNU_CONFIGURE = 1
 CONFIGURE_ARGS = --disable-doc --disable-static

cross/lzip/Makefile

@@ -1,5 +1,5 @@
 PKG_NAME = lzip
-PKG_VERS = 1.23
+PKG_VERS = 1.24
 PKG_EXT = tar.gz
 PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://download.savannah.gnu.org/releases/lzip

cross/lzip/digests

@@ -1,3 +1,3 @@
-lzip-1.23.tar.gz SHA1 9793edc5e4acda46b3ea16a47ea0dca02a6f6e3d
-lzip-1.23.tar.gz SHA256 4792c047ddf15ef29d55ba8e68a1a21e0cb7692d87ecdf7204419864582f280d
-lzip-1.23.tar.gz MD5 c47878da4af44ce7ab4115a75640a99d
+lzip-1.24.tar.gz SHA1 df0fd104de34aaae8bb630f04c5b213f9a15f5d9
+lzip-1.24.tar.gz SHA256 d42659229b10e066eeb6e81eb673cdd893b672e512d26719c2d95975556ca56c
+lzip-1.24.tar.gz MD5 95763cd199be5c343a891ce6a9aae9c5

cross/lzlib/Makefile

@@ -1,5 +1,5 @@
 PKG_NAME = lzlib
-PKG_VERS = 1.12
+PKG_VERS = 1.14
 PKG_EXT = tar.gz
 PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://download.savannah.gnu.org/releases/lzip/$(PKG_NAME)

cross/lzlib/digests

@@ -1,3 +1,3 @@
-lzlib-1.12.tar.gz SHA1 e028e1de57e158c4be16a0144588559053bb05f3
-lzlib-1.12.tar.gz SHA256 8e5d84242eb52cf1dcc98e58bd9ba8ef1aefa501431abdd0273a22bf4ce337b1
-lzlib-1.12.tar.gz MD5 df3eee3c4df377cdb061f7cd6d0c5c48
+lzlib-1.14.tar.gz SHA1 c65cb72a50a707766741f3c476ad166483f8d939
+lzlib-1.14.tar.gz SHA256 5acac8714ed4f306020bae660dddce706e5f8a795863679037da9fe6bf4dcf6f
+lzlib-1.14.tar.gz MD5 5b9116322f06fd3c2cd14cc4aa1545f5

cross/mc/Makefile

@@ -1,5 +1,5 @@
 PKG_NAME = mc
-PKG_VERS = 4.8.30
+PKG_VERS = 4.8.31
 PKG_EXT = tar.xz
 PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = http://ftp.midnight-commander.org/

cross/mc/digests

@@ -1,3 +1,3 @@
-mc-4.8.30.tar.xz SHA1 91708eb00ba0d7c1579de357745b1a6717b1dfac
-mc-4.8.30.tar.xz SHA256 5ebc3cb2144b970c5149fda556c4ad50b78780494696cdf2d14a53204c95c7df
-mc-4.8.30.tar.xz MD5 96fcd04710b7848fedea8597da4bd7da
+mc-4.8.31.tar.xz SHA1 d59c1290bd8896dc8d5269248b60bad55f1e9d24
+mc-4.8.31.tar.xz SHA256 24191cf8667675b8e31fc4a9d18a0a65bdc0598c2c5c4ea092494cd13ab4ab1a
+mc-4.8.31.tar.xz MD5 2c3dd9af66e4cfef5a7a460df1cdf868

cross/patch/Makefile

@@ -0,0 +1,16 @@
+PKG_NAME = patch
+PKG_VERS = 2.7.6
+PKG_EXT = tar.xz
+PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
+PKG_DIST_SITE = https://ftp.gnu.org/gnu/patch
+PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
+
+DEPENDS = cross/attr
+
+HOMEPAGE = https://savannah.gnu.org/projects/patch/
+COMMENT  = Patch takes a patch file containing a difference listing produced by the diff program and applies those differences to one or more original files, producing patched versions.
+LICENSE  = GPLv3+
+
+GNU_CONFIGURE = 1
+
+include ../../mk/spksrc.cross-cc.mk

cross/patch/PLIST

@@ -0,0 +1 @@
+bin:bin/patch

cross/patch/digests

@@ -0,0 +1,3 @@
+patch-2.7.6.tar.xz SHA1 6f64fa75993bdb285ac4ed6eca6c9212725bff91
+patch-2.7.6.tar.xz SHA256 ac610bda97abe0d9f6b7c963255a11dcb196c25e337c61f94e4778d632f1d8fd
+patch-2.7.6.tar.xz MD5 78ad9937e4caadcba1526ef1853730d5

cross/plzip/Makefile

@@ -1,5 +1,5 @@
 PKG_NAME = plzip
-PKG_VERS = 1.10
+PKG_VERS = 1.11
 PKG_EXT = tar.gz
 PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://download.savannah.gnu.org/releases/lzip/plzip

cross/plzip/digests

@@ -1,3 +1,3 @@
-plzip-1.10.tar.gz SHA1 cf591ba38996589b0a86599a1d2238668dfbed93
-plzip-1.10.tar.gz SHA256 43faa58265d8b89ad75bd4ed11d347ef10065a8070748bc1ed0e06f191458098
-plzip-1.10.tar.gz MD5 4601ee7a0a5e7a56a71b0558663d554e
+plzip-1.11.tar.gz SHA1 52f182a43f97ce302258cbc17685fa48e738c90a
+plzip-1.11.tar.gz SHA256 d8e3cbe45c9222383339130e1bcc6e5e884d776b63f188896e6df67bc1d5626b
+plzip-1.11.tar.gz MD5 bfd2f6fb94e8a3f458a11c7da663d900

cross/ripgrep/Makefile

@@ -1,5 +1,5 @@
 PKG_NAME = ripgrep
-PKG_VERS = 13.0.0
+PKG_VERS = 14.1.0
 PKG_EXT = tar.gz
 PKG_DIST_NAME = $(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://github.com/BurntSushi/ripgrep/archive

cross/ripgrep/digests

@@ -1,3 +1,3 @@
-ripgrep-13.0.0.tar.gz SHA1 1e67603fbc5dd955d0f65fb6ea3c380145fbcb01
-ripgrep-13.0.0.tar.gz SHA256 0fb17aaf285b3eee8ddab17b833af1e190d73de317ff9648751ab0660d763ed2
-ripgrep-13.0.0.tar.gz MD5 3080265a3ccc09bdc0c81527b09afa15
+ripgrep-14.1.0.tar.gz SHA1 1e3cceeb76f036ef849a0d17600e65417fa3b13e
+ripgrep-14.1.0.tar.gz SHA256 33c6169596a6bbfdc81415910008f26e0809422fda2d849562637996553b2ab6
+ripgrep-14.1.0.tar.gz MD5 ad6b5631a459fd20c257ca20a7eeaf73

cross/xstow/Makefile

@@ -0,0 +1,21 @@
+PKG_NAME = xstow
+PKG_VERS = 1.1.1
+PKG_EXT = tar.bz2
+PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
+PKG_DIST_SITE = https://github.com/majorkingleo/xstow/releases/download/$(PKG_VERS)
+PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
+
+DEPENDS = cross/ncursesw
+
+# toolchains lacking c++11
+UNSUPPORTED_ARCHS = $(ARMv5_ARCHS) $(OLD_PPC_ARCHS)
+
+HOMEPAGE = https://github.com/majorkingleo/xstow#readme
+COMMENT  = XStow is a replacement of GNU Stow written in C++. It supports all features of Stow with some extensions.
+LICENSE  = GPLv2
+
+GNU_CONFIGURE = 1
+
+CONFIGURE_ARGS = --with-curses --enable-static
+
+include ../../mk/spksrc.cross-cc.mk

cross/xstow/PLIST

@@ -0,0 +1,3 @@
+bin:bin/merge-info
+bin:bin/xstow
+bin:bin/xstow-static

cross/xstow/digests

@@ -0,0 +1,3 @@
+xstow-1.1.1.tar.bz2 SHA1 7374d8f07b72808acea3d849a0fa1a0a21450a30
+xstow-1.1.1.tar.bz2 SHA256 191535eb430f0456a5de3d82ff6a5f8c4a155ad3c6a65ecf80de7acf11065278
+xstow-1.1.1.tar.bz2 MD5 5ba099997de1273c8e4e63315323726d

cross/xstow/patches/001-configure-use_ncursesw.patch

@@ -0,0 +1,31 @@
+# search for ncursesw and link with libncursesw instead of ncurses
+# 
+--- configure.orig	2023-07-25 15:30:09.000000000 +0000
++++ configure	2023-10-03 18:25:31.772342129 +0000
+@@ -7923,14 +7923,14 @@
+
+ 				  if test $support_curses -eq 0; then
+
+-				     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for initscr in -lncurses" >&5
+-printf %s "checking for initscr in -lncurses... " >&6; }
++				     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for initscr in -lncursesw" >&5
++printf %s "checking for initscr in -lncursesw... " >&6; }
+ if test ${ac_cv_lib_ncurses_initscr+y}
+ then :
+   printf %s "(cached) " >&6
+ else $as_nop
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lncurses  $LIBS"
++LIBS="-lncursesw  $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+
+@@ -7961,7 +7961,7 @@
+ then :
+
+ 						  support_curses=1
+-						  curseslib="ncurses"
++						  curseslib="ncursesw"
+
+ else $as_nop
+    support_curses=0

diyspk/mc/Makefile

@@ -1,5 +1,5 @@
 SPK_NAME = mc
-SPK_VERS = 4.8.30
+SPK_VERS = 4.8.31
 SPK_REV = 1
 SPK_ICON = src/mc.png
 

diyspk/patch/Makefile

@@ -0,0 +1,16 @@
+SPK_NAME = patch
+SPK_VERS = 2.7.6
+SPK_REV = 1
+
+DEPENDS = cross/patch
+
+MAINTAINER = SynoCommunity
+DESCRIPTION = Patch takes a patch file containing a difference listing produced by the diff program and applies those differences to one or more original files, producing patched versions.
+STARTABLE = no
+
+HOMEPAGE = https://savannah.gnu.org/projects/patch/
+LICENSE  = GPLv3+
+
+SPK_COMMANDS = bin/patch
+
+include ../../mk/spksrc.spk.mk

diyspk/xstow/Makefile

@@ -0,0 +1,18 @@
+SPK_NAME = xstow
+SPK_VERS = 1.1.1
+SPK_REV = 1
+
+DEPENDS = cross/xstow
+
+UNSUPPORTED_ARCHS = $(ARMv5_ARCHS) $(PLD_PPC_ARCHS)
+
+MAINTAINER = SynoCommunity
+DESCRIPTION = XStow is a replacement of GNU Stow written in C++. It supports all features of Stow with some extensions.
+STARTABLE = no
+
+HOMEPAGE = https://github.com/majorkingleo/xstow#readme
+LICENSE  = GPLv2
+
+SPK_COMMANDS = bin/xstow bin/xstow-static bin/merge-info
+
+include ../../mk/spksrc.spk.mk