sysocli-file: update jdupes (#5506)

* sysocli-file: update jdupes to support --dedupe * fix jdupes - temp. fix by patch for dedupe to work (until new release of jdupes is provided) * synocli-file: update tools - Update fzf to v0.35.1 - Update less to v608 - Update nano to v7.0 - Update nnn to v4.7
SynoCommunity · Dec 1, 2022 · b302012 · b302012
1 parent 5c56712
commit b302012
Show file tree

Hide file tree

Showing 15 changed files with 50 additions and 35 deletions.
diff --git a/cross/fzf/Makefile b/cross/fzf/Makefile
@@ -1,5 +1,5 @@
 PKG_NAME = fzf
-PKG_VERS = 0.34.0
+PKG_VERS = 0.35.1
 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
@@ -1,3 +1,3 @@
-fzf-0.34.0.tar.gz SHA1 947d233eec826b2778f0e3c56d62c2030f14e040
-fzf-0.34.0.tar.gz SHA256 5bfd2518f0d136a76137de799ff5911608802d23564fc26e245f25a627395ecc
-fzf-0.34.0.tar.gz MD5 c944fc51ba24f73ecc44bf240f374001
+fzf-0.35.1.tar.gz SHA1 feaede30af592f1adb3c342fa7c63bb51a27048b
+fzf-0.35.1.tar.gz SHA256 d59ec6f2b6e95dad53bb81f758471e066c657be1b696f2fe569e1a9265dda8fe
+fzf-0.35.1.tar.gz MD5 f8abbd5cf0a203516e39522a90bd4359
diff --git a/cross/jdupes/Makefile b/cross/jdupes/Makefile
@@ -13,10 +13,9 @@ COMMENT  = A powerful duplicate file finder and an enhanced fork of fdupes.
 LICENSE  = MIT
 
 CONFIGURE_TARGET = nop
-INSTALL_TARGET = jdupes_install
+INSTALL_MAKE_OPTIONS = install DESTDIR=$(INSTALL_DIR) PREFIX=$(INSTALL_PREFIX)
 
-include ../../mk/spksrc.cross-cc.mk
+ADDITIONAL_CFLAGS = -DENABLE_DEDUPE
+PATCHES_LEVEL = 1
 
-.PHONY: jdupes_install
-jdupes_install:
-	@$(RUN) $(MAKE) install DESTDIR=$(INSTALL_DIR) PREFIX=$(INSTALL_PREFIX)
+include ../../mk/spksrc.cross-cc.mk
diff --git a/cross/jdupes/patches/001-linux-dedupe-static.h_fix_ioctl.patch b/cross/jdupes/patches/001-linux-dedupe-static.h_fix_ioctl.patch
@@ -0,0 +1,20 @@
+From 0d4d98f51c99999d2c6dbbb89d554af551b5b69b Mon Sep 17 00:00:00 2001
+From: Calum McConnell <calumlikesapplepie@gmail.com>
+Date: Mon, 12 Sep 2022 14:42:50 -0400
+Subject: [PATCH] Fix linux static header IOCTL decimal literal (#212)
+
+---
+ linux-dedupe-static.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/linux-dedupe-static.h b/linux-dedupe-static.h
+index df45f4d..2e774e9 100644
+--- a/linux-dedupe-static.h
++++ b/linux-dedupe-static.h
+@@ -20,5 +20,5 @@ struct file_dedupe_range {
+ 	__u32 reserved2;
+ 	struct file_dedupe_range_info info[0];
+ };
+-#define FIDEDUPERANGE _IOWR(94, 54, struct file_dedupe_range)
++#define FIDEDUPERANGE _IOWR(0x94, 54, struct file_dedupe_range)
+ #endif /* JDUPES_DEDUPESTATIC_H */
diff --git a/cross/less/Makefile b/cross/less/Makefile
@@ -1,5 +1,5 @@
 PKG_NAME = less
-PKG_VERS = 590
+PKG_VERS = 608
 PKG_EXT = tar.gz
 PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://ftp.gnu.org/gnu/less/

diff --git a/cross/less/digests b/cross/less/digests
@@ -1,3 +1,3 @@
-less-590.tar.gz SHA1 82188f425b5197c24b834ae80b95ec07be442c78
-less-590.tar.gz SHA256 6aadf54be8bf57d0e2999a3c5d67b1de63808bb90deb8f77b028eafae3a08e10
-less-590.tar.gz MD5 f029087448357812fba450091a1172ab
+less-608.tar.gz SHA1 94493a15bed80574cefc30153a10ceebab6824a0
+less-608.tar.gz SHA256 a69abe2e0a126777e021d3b73aa3222e1b261f10e64624d41ec079685a6ac209
+less-608.tar.gz MD5 1cdec714569d830a68f4cff11203cdba
diff --git a/cross/nano/Makefile b/cross/nano/Makefile
@@ -1,5 +1,5 @@
 PKG_NAME = nano
-PKG_VERS = 6.4
+PKG_VERS = 7.0
 PKG_EXT = tar.xz
 PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://www.nano-editor.org/dist/v$(firstword $(subst ., ,$(PKG_VERS)))

diff --git a/cross/nano/digests b/cross/nano/digests
@@ -1,3 +1,3 @@
-nano-6.4.tar.xz SHA1 a1f796e5bd16858748804c978d80860b9638a11c
-nano-6.4.tar.xz SHA256 4199ae8ca78a7796de56de1a41b821dc47912c0307e9816b56cc317df34661c0
-nano-6.4.tar.xz MD5 3aecde9eb04e5027eca2d0dc67bf3a3b
+nano-7.0.tar.xz SHA1 70fad395e75e94087f92cc20e40b3ef09f6a71c6
+nano-7.0.tar.xz SHA256 8dd6eac38b2b8786d82681f0e1afd84f6b75210d17391b6443c437e451552149
+nano-7.0.tar.xz MD5 32faafd9da9ee75feda8423d5744ee4d
diff --git a/cross/nnn/Makefile b/cross/nnn/Makefile
@@ -1,5 +1,5 @@
 PKG_NAME = nnn
-PKG_VERS = 4.6
+PKG_VERS = 4.7
 PKG_EXT = tar.gz
 PKG_DIST_NAME = $(PKG_NAME)-v$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://github.com/jarun/nnn/releases/download/v$(PKG_VERS)
@@ -8,17 +8,13 @@ PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
 DEPENDS = cross/ncursesw cross/readline
 
 # compiler too old (-std=c11 required)
-UNSUPPORTED_ARCHS = $(OLD_PPC_ARCS) $(ARMv5_ARCHS)
+UNSUPPORTED_ARCHS = $(OLD_PPC_ARCHS) $(ARMv5_ARCHS)
 
 HOMEPAGE = https://github.com/jarun/nnn
 COMMENT  = n³ The unorthodox terminal file manager.
 LICENSE  = 2-clause BSD
 
 CONFIGURE_TARGET = nop
-INSTALL_TARGET = nnn_install
+INSTALL_MAKE_OPTIONS = install DESTDIR=$(INSTALL_DIR) PREFIX=$(INSTALL_PREFIX)
 
 include ../../mk/spksrc.cross-cc.mk
-
-.PHONY: nnn_install
-nnn_install:
-	@$(RUN) $(MAKE) install DESTDIR=$(INSTALL_DIR) PREFIX=$(INSTALL_PREFIX)
diff --git a/cross/nnn/digests b/cross/nnn/digests
@@ -1,3 +1,3 @@
-nnn-v4.6.tar.gz SHA1 7939e414d6de5a730008657f7ba7e9b73bc816e2
-nnn-v4.6.tar.gz SHA256 15acaf9a88cfb5a2a640d3ef55a48af644fba92b46aac0768efe94c4addf7e3f
-nnn-v4.6.tar.gz MD5 597ef6d2a7c45ae0d12c636186db08f1
+nnn-v4.7.tar.gz SHA1 3ccb8aee1d48d0140e828cf0e850533664948e88
+nnn-v4.7.tar.gz SHA256 ef969ae926ba720eb440ea2562a4bcb4927f0eec4e3734b2fa10ed382a297535
+nnn-v4.7.tar.gz MD5 e2cd0a31d735285890448304dc91b1fc
diff --git a/diyspk/fzf/Makefile b/diyspk/fzf/Makefile
@@ -1,5 +1,5 @@
 SPK_NAME = fzf
-SPK_VERS = 0.34.0
+SPK_VERS = 0.35.1
 SPK_REV = 1
 SPK_ICON = src/fzf.png
 

diff --git a/diyspk/less/Makefile b/diyspk/less/Makefile
@@ -1,6 +1,6 @@
 SPK_NAME = less
-SPK_VERS = 590
-SPK_REV = 2
+SPK_VERS = 608
+SPK_REV = 1
 SPK_ICON = src/gnu-logo.png
 
 DEPENDS = cross/less

diff --git a/diyspk/nano/Makefile b/diyspk/nano/Makefile
@@ -1,6 +1,6 @@
 SPK_NAME = nano
-SPK_VERS = 6.3
-SPK_REV = 8
+SPK_VERS = 7.0
+SPK_REV = 9
 SPK_ICON = src/nano.png
 
 DEPENDS = cross/nano

diff --git a/diyspk/nnn/Makefile b/diyspk/nnn/Makefile
@@ -1,5 +1,5 @@
 SPK_NAME = nnn
-SPK_VERS = 4.5
+SPK_VERS = 4.7
 SPK_REV = 1
 SPK_ICON = src/nnn.png
 

diff --git a/spk/synocli-file/Makefile b/spk/synocli-file/Makefile
@@ -1,6 +1,6 @@
 SPK_NAME = synocli-file
 SPK_VERS = 2.7
-SPK_REV = 18
+SPK_REV = 19
 SPK_ICON = src/synocli-file.png
 
 # packages depending on cross/zlib must be defined later, see below
@@ -78,7 +78,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 rmlint to support reflink, find nonstripped binaries and to read json caches.<br/>2. Update file to v5.39.<br/>3. Update fdupes to v2.2.1.<br/>4. Update jdupes to v1.21.0.<br/>5. Update fzf to v.0.34.0<br/>6. Update tree to v2.0.4.<br/>7. Update bat to v0.22.1."
+CHANGELOG = "1. Update jdupes to support dedupe.<br/>2. Update fzf to v0.35.1.<br/>3. Update less to v608.<br/>4. Update nano to v7.0.<br/>5. Update nnn to v4.7."
 
 SERVICE_SETUP = src/service-setup.sh