synocli-file: add dos2unix tools (#5364) (#5365)

* synocli-file: add dos2unix tools (#5364) * synocli-file: update tools - update native/go to v1.18.5 - update fzf to v0.32.1 - update micro to v2.0.11 - update nano to v6.4 - update nnn to v4.6 * fix rhash - add librhash * fix for rhash with shared library
SynoCommunity · Aug 25, 2022 · 18aa859 · 18aa859
1 parent f80831d
commit 18aa859
Show file tree

Hide file tree

Showing 20 changed files with 85 additions and 28 deletions.
diff --git a/cross/dos2unix/Makefile b/cross/dos2unix/Makefile
@@ -0,0 +1,16 @@
+PKG_NAME = dos2unix
+PKG_VERS = 7.4.3
+PKG_EXT = tar.gz
+PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
+PKG_DIST_SITE = https://waterlan.home.xs4all.nl/dos2unix
+PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
+
+DEPENDS =
+
+HOMEPAGE = https://waterlan.home.xs4all.nl/dos2unix.html
+COMMENT  = Convert text files with DOS or Mac line breaks to Unix line breaks and vice versa.
+LICENSE  = FreeBSD style
+
+CONFIGURE_TARGET = nop
+
+include ../../mk/spksrc.cross-cc.mk
diff --git a/cross/dos2unix/PLIST b/cross/dos2unix/PLIST
@@ -0,0 +1,4 @@
+bin:bin/dos2unix
+lnk:bin/mac2unix
+bin:bin/unix2dos
+lnk:bin/unix2mac
diff --git a/cross/dos2unix/digests b/cross/dos2unix/digests
@@ -0,0 +1,3 @@
+dos2unix-7.4.3.tar.gz SHA1 b81a7287d7e6de742277e18e764e549174a90696
+dos2unix-7.4.3.tar.gz SHA256 b68db41956daf933828423aa30510e00c12d29ef5916e715e8d4e694fe66ca72
+dos2unix-7.4.3.tar.gz MD5 ff949538cf3c82910d5f6f486c1981dd
diff --git a/cross/fzf/Makefile b/cross/fzf/Makefile
@@ -1,5 +1,5 @@
 PKG_NAME = fzf
-PKG_VERS = 0.30.0
+PKG_VERS = 0.32.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.30.0.tar.gz SHA1 1b4d625e38282bca4e92b50419dfb532a3d42eda
-fzf-0.30.0.tar.gz SHA256 a3428f510b7136e39104a002f19b2e563090496cb5205fa2e4c5967d34a20124
-fzf-0.30.0.tar.gz MD5 509cde51b5a98dbe9c79092d6fbf3e6a
+fzf-0.32.1.tar.gz SHA1 119600d703a0fb0588b8ec95eedec8e96c7b4623
+fzf-0.32.1.tar.gz SHA256 c7afef61553b3b3e4e02819c5d560fa4acf33ecb39829aeba392c2e05457ca6a
+fzf-0.32.1.tar.gz MD5 f51bfcb16e934a8f3e45c393c02fe35c
diff --git a/cross/jdupes/Makefile b/cross/jdupes/Makefile
@@ -12,7 +12,7 @@ HOMEPAGE = https://github.com/jbruchon/jdupes
 COMMENT  = A powerful duplicate file finder and an enhanced fork of fdupes.
 LICENSE  = MIT
 
-CONFIGURE_TARGET = none
+CONFIGURE_TARGET = nop
 INSTALL_TARGET = jdupes_install
 
 include ../../mk/spksrc.cross-cc.mk

diff --git a/cross/micro/Makefile b/cross/micro/Makefile
@@ -1,8 +1,8 @@
 PKG_NAME = micro
-PKG_VERS = 2.0.10
+PKG_VERS = 2.0.11
 PKG_EXT = tar.gz
 # make sure the hash matches this release, as it is shown with 'micro --version'
-GIT_HASH = b976385
+GIT_HASH = 225927b
 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)
@@ -14,7 +14,7 @@ HOMEPAGE = https://micro-editor.github.io/
 COMMENT  = a modern and intuitive terminal-based text editor.
 LICENSE  = MIT
 
-GOPATH=$(WORK_DIR)
+GOPATH = $(WORK_DIR)
 
 COMPILE_MAKE_OPTIONS += VERSION=$(PKG_VERS) HASH=$(GIT_HASH)
 

diff --git a/cross/micro/digests b/cross/micro/digests
@@ -1,3 +1,3 @@
-micro-2.0.10.tar.gz SHA1 97b0f59983f4f0670435953a433ca9ea293d102d
-micro-2.0.10.tar.gz SHA256 d849751fcd70eba48bf3e15c3cc665f818fe77e5ac7819d0afe2123dc258aedc
-micro-2.0.10.tar.gz MD5 7a1d21543f56eb478235f372d3022e54
+micro-2.0.11.tar.gz SHA1 0fb9454a9334ce237aad8573f7649641171677eb
+micro-2.0.11.tar.gz SHA256 1bb499edeaaadf1fe1791a49f96ab672c4e1add31ee125882ccd85a0fc8a4abe
+micro-2.0.11.tar.gz MD5 deb32d1fffe374a8592aa640eec643de
diff --git a/cross/nano/Makefile b/cross/nano/Makefile
@@ -1,5 +1,5 @@
 PKG_NAME = nano
-PKG_VERS = 6.3
+PKG_VERS = 6.4
 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.3.tar.xz SHA1 f3e81c232a434f2ea0a059a6500f79a1e5719d99
-nano-6.3.tar.xz SHA256 eb532da4985672730b500f685dbaab885a466d08fbbf7415832b95805e6f8687
-nano-6.3.tar.xz MD5 0a7051a61113a60d2e25b535476c75b4
+nano-6.4.tar.xz SHA1 a1f796e5bd16858748804c978d80860b9638a11c
+nano-6.4.tar.xz SHA256 4199ae8ca78a7796de56de1a41b821dc47912c0307e9816b56cc317df34661c0
+nano-6.4.tar.xz MD5 3aecde9eb04e5027eca2d0dc67bf3a3b
diff --git a/cross/ncdu/Makefile b/cross/ncdu/Makefile
@@ -5,6 +5,7 @@ PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://dev.yorhel.nl/download
 PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
 
+# ncdu 2.x is written in Zig and needs a Zig compiler to build with.
 DEPENDS = cross/ncursesw
 
 HOMEPAGE = https://dev.yorhel.nl/ncdu

diff --git a/cross/nnn/Makefile b/cross/nnn/Makefile
@@ -1,5 +1,5 @@
 PKG_NAME = nnn
-PKG_VERS = 4.5
+PKG_VERS = 4.6
 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)

diff --git a/cross/nnn/digests b/cross/nnn/digests
@@ -1,3 +1,3 @@
-nnn-v4.5.tar.gz SHA1 5f32dc69571535597db63ed7e094a371866349cc
-nnn-v4.5.tar.gz SHA256 fadc15bd6d4400c06e5ccc47845b42e60774f368570e475bd882767ee18749aa
-nnn-v4.5.tar.gz MD5 7358f4ca32c04e1a1bef7633ab10aff6
+nnn-v4.6.tar.gz SHA1 7939e414d6de5a730008657f7ba7e9b73bc816e2
+nnn-v4.6.tar.gz SHA256 15acaf9a88cfb5a2a640d3ef55a48af644fba92b46aac0768efe94c4addf7e3f
+nnn-v4.6.tar.gz MD5 597ef6d2a7c45ae0d12c636186db08f1
diff --git a/cross/rhash/Makefile b/cross/rhash/Makefile
@@ -29,6 +29,6 @@ endif
 ifeq ($(findstring $(ARCH),$(x64_ARCHS)),$(ARCH))
 CONFIGURE_ARGS = --target=x86_64-linux
 endif
-CONFIGURE_ARGS += --prefix=$(INSTALL_PREFIX) --enable-symlinks --enable-static
+CONFIGURE_ARGS += --prefix=$(INSTALL_PREFIX) --enable-symlinks --disable-static
 
 include ../../mk/spksrc.cross-cc.mk
diff --git a/cross/rhash/PLIST b/cross/rhash/PLIST
@@ -11,3 +11,4 @@ lnk:bin/sfv-hash
 lnk:bin/tiger-hash
 lnk:bin/tth-hash
 lnk:bin/whirlpool-hash
+lib:lib/librhash.so.0
diff --git a/diyspk/dos2unix/Makefile b/diyspk/dos2unix/Makefile
@@ -0,0 +1,16 @@
+SPK_NAME = dos2unix
+SPK_VERS = 7.4.3
+SPK_REV = 1
+
+DEPENDS = cross/dos2unix
+
+MAINTAINER = SynoCommunity
+DESCRIPTION = Convert text files with DOS or Mac line breaks to Unix line breaks and vice versa.
+STARTABLE = no
+
+HOMEPAGE = https://waterlan.home.xs4all.nl/dos2unix.html
+LICENSE  = FreeBSD style
+
+SPK_COMMANDS = bin/dos2unix bin/unix2dos bin/mac2unix bin/unix2mac 
+
+include ../../mk/spksrc.spk.mk
diff --git a/diyspk/rhash/Makefile b/diyspk/rhash/Makefile
@@ -9,6 +9,8 @@ DESCRIPTION = "RHash is a console utility for calculation and verification of ma
 DISPLAY_NAME = RHash
 STARTABLE = no
 
+POST_STRIP_TARGET = rhash_extra_install
+
 HOMEPAGE   = http://rhash.sourceforge.net/
 LICENSE    = MIT
 
@@ -26,3 +28,8 @@ SPK_COMMANDS += bin/tth-hash
 SPK_COMMANDS += bin/whirlpool-hash
 
 include ../../mk/spksrc.spk.mk
+
+.PHONY: rhash_extra_install
+rhash_extra_install:
+	@$(MSG) "Set library runpath in rhash executable."
+	@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/bin/rhash
diff --git a/native/go/Makefile b/native/go/Makefile
@@ -1,5 +1,5 @@
 PKG_NAME = go
-PKG_VERS = 1.18.4
+PKG_VERS = 1.18.5
 PKG_EXT = tar.gz
 PKG_DIST_NAME = $(PKG_NAME)$(PKG_VERS).linux-amd64.$(PKG_EXT)
 PKG_DIST_SITE = https://go.dev/dl

diff --git a/native/go/digests b/native/go/digests
@@ -1,3 +1,3 @@
-go1.18.4.linux-amd64.tar.gz SHA1 a668437a131162c273e3bc48a57e91b14bc9e02b
-go1.18.4.linux-amd64.tar.gz SHA256 c9b099b68d93f5c5c8a8844a89f8db07eaa58270e3a1e01804f17f4cf8df02f5
-go1.18.4.linux-amd64.tar.gz MD5 4d0f7959a85e74b8013d3977a43e542a
+go1.18.5.linux-amd64.tar.gz SHA1 8fe5d6fe34db1c5edf0526c3bd2331f491d7f50f
+go1.18.5.linux-amd64.tar.gz SHA256 9e5de37f9c49942c601b191ac5fba404b868bfc21d446d6960acc12283d6e5f2
+go1.18.5.linux-amd64.tar.gz MD5 e7c1a6cf3ccd596896e5bc68e390a765
diff --git a/spk/synocli-file/Makefile b/spk/synocli-file/Makefile
@@ -1,6 +1,6 @@
 SPK_NAME = synocli-file
-SPK_VERS = 2.6
-SPK_REV = 16
+SPK_VERS = 2.7
+SPK_REV = 17
 SPK_ICON = src/synocli-file.png
 
 # packages depending on cross/zlib must be defined later, see below
@@ -10,6 +10,7 @@ DEPENDS += cross/lzip cross/plzip
 DEPENDS += cross/mg
 DEPENDS += cross/jupp
 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
@@ -18,6 +19,8 @@ OPTIONAL_DEPENDS += cross/nnn
 MAINTAINER = SynoCommunity
 DISPLAY_NAME = SynoCli File Tools
 
+POST_STRIP_TARGET = synocli-file_extra_install
+
 OPTIONAL_DESC =
 
 include ../../mk/spksrc.common.mk
@@ -72,9 +75,9 @@ endif
 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, 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$(OPTIONAL_DESC)."
+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. Add iconv.<br/>2. Update of the following tools<ul><li>update bat to v0.21.0</li><li>update detox to v1.4.5</li><li>update fd to v8.3.2</li><li>update fzf to v0.30.0</li><li>update jdupes to v1.20.2</li><li>update lzip to v1.23 and plzip to v1.10</li><li>update Midnight Commander to v4.8.28</li><li>update nano to v6.3</li><li>update nnn to v4.5</li><li>update RHash to v1.4.3</li><li>update tree to v2.0.2</li></ul><br/>3. Update zstd to v1.5.2."
+CHANGELOG = "1. Add dos2unix tools.<br/2. Update fzf to v0.32.1.<br/>3. Update micro to v2.0.11.<br/>4. Update nano to v6.4.<br/>5. Update nnn to v4.6."
 
 SERVICE_SETUP = src/service-setup.sh
 
@@ -106,6 +109,7 @@ SPK_COMMANDS += bin/exa
 SPK_COMMANDS += bin/jmacs bin/joe bin/jpico bin/jstar bin/jupp bin/rjoe
 SPK_COMMANDS += bin/nnn
 SPK_COMMANDS += bin/iconv
+SPK_COMMANDS += bin/dos2unix bin/unix2dos bin/mac2unix bin/unix2mac 
 
 SPK_COMMANDS += bin/rhash
 SPK_COMMANDS += bin/ed2k-link
@@ -121,3 +125,8 @@ SPK_COMMANDS += bin/tth-hash
 SPK_COMMANDS += bin/whirlpool-hash
 
 include ../../mk/spksrc.spk.mk
+
+.PHONY: synocli-file_extra_install
+synocli-file_extra_install:
+	@$(MSG) "Set library runpath in rhash executable."
+	@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/bin/rhash