Skip to content

Commit

Permalink
synocli-file: update tools
Browse files Browse the repository at this point in the history
- update detox to v2.0.0
- update eza v0.20.0
- update fd to v10.2.0
- update fdupes to v2.3.2 and add sqlite for optional caches
- update jdupes to v1.28.0 and libjodycode to v3.1.1
- update less to v661
- update lsd to v1.1.5
- update lzip to v1.24.1
- update mc to v4.8.32
- update micro to v2.0.14
- update nano to v8.2
- update pcre2 to v10.44
- update ripgrep to v14.1.1
- update tree to v2.1.3
  • Loading branch information
hgy59 committed Nov 7, 2024
1 parent ac27e7a commit bedae80
Show file tree
Hide file tree
Showing 58 changed files with 290 additions and 124 deletions.
73 changes: 73 additions & 0 deletions cross/attr/patches/001-attributes_h-for-old-gcc.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
# remove deprecated attributes not supported by old GCC
#
--- include/attributes.h.orig 2022-12-31 01:37:46.000000000 +0100
+++ include/attributes.h 2024-10-19 01:00:38.903700421 +0200
@@ -126,11 +126,9 @@
* The return value is -1 on error (w/errno set appropriately), 0 on success.
*/
EXPORT int attr_get (const char *__path, const char *__attrname,
- char *__attrvalue, int *__valuelength, int __flags)
- __attribute__ ((deprecated ("Use getxattr or lgetxattr instead")));
+ char *__attrvalue, int *__valuelength, int __flags);
EXPORT int attr_getf (int __fd, const char *__attrname, char *__attrvalue,
- int *__valuelength, int __flags)
- __attribute__ ((deprecated ("Use fgetxattr instead")));
+ int *__valuelength, int __flags);

/*
* Set the value of an attribute, creating the attribute if necessary.
@@ -138,22 +136,18 @@
*/
EXPORT int attr_set (const char *__path, const char *__attrname,
const char *__attrvalue, const int __valuelength,
- int __flags)
- __attribute__ ((deprecated ("Use setxattr or lsetxattr instead")));
+ int __flags);
EXPORT int attr_setf (int __fd, const char *__attrname,
const char *__attrvalue, const int __valuelength,
- int __flags)
- __attribute__ ((deprecated ("Use fsetxattr instead")));
+ int __flags);

/*
* Remove an attribute.
* The return value is -1 on error (w/errno set appropriately), 0 on success.
*/
EXPORT int attr_remove (const char *__path, const char *__attrname,
- int __flags)
- __attribute__ ((deprecated ("Use removexattr or lremovexattr instead")));
-EXPORT int attr_removef (int __fd, const char *__attrname, int __flags)
- __attribute__ ((deprecated ("Use fremovexattr instead")));
+ int __flags);
+EXPORT int attr_removef (int __fd, const char *__attrname, int __flags);

/*
* List the names and sizes of the values of all the attributes of an object.
@@ -163,11 +157,9 @@
* The return value is -1 on error (w/errno set appropriately), 0 on success.
*/
EXPORT int attr_list(const char *__path, char *__buffer, const int __buffersize,
- int __flags, attrlist_cursor_t *__cursor)
- __attribute__ ((deprecated ("Use listxattr or llistxattr instead")));
+ int __flags, attrlist_cursor_t *__cursor);
EXPORT int attr_listf(int __fd, char *__buffer, const int __buffersize,
- int __flags, attrlist_cursor_t *__cursor)
- __attribute__ ((deprecated ("Use flistxattr instead")));
+ int __flags, attrlist_cursor_t *__cursor);

/*
* Operate on multiple attributes of the same object simultaneously.
@@ -187,11 +179,9 @@
* to a ATTR_OP_GET are the same as the args to an attr_get() call.
*/
EXPORT int attr_multi (const char *__path, attr_multiop_t *__oplist,
- int __count, int __flags)
- __attribute__ ((deprecated ("Use getxattr, setxattr, listxattr, removexattr instead")));
+ int __count, int __flags);
EXPORT int attr_multif (int __fd, attr_multiop_t *__oplist,
- int __count, int __flags)
- __attribute__ ((deprecated ("Use getxattr, setxattr, listxattr, removexattr instead")));
+ int __count, int __flags);

#ifdef __cplusplus
}
3 changes: 2 additions & 1 deletion cross/detox/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PKG_NAME = detox
PKG_VERS = 1.4.5
PKG_VERS = 2.0.0
PKG_EXT = tar.bz2
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = https://github.com/dharple/detox/releases/download/v$(PKG_VERS)
Expand All @@ -12,5 +12,6 @@ COMMENT = detox is a program that renames files to make them easier to work wit
LICENSE = 3-clause BSD

GNU_CONFIGURE = 1
ADDITIONAL_CFLAGS = -O2

include ../../mk/spksrc.cross-cc.mk
6 changes: 3 additions & 3 deletions cross/detox/digests
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
detox-1.4.5.tar.bz2 SHA1 21e04283d3dd5a4dc43a0aaccb632d2a1072d4a3
detox-1.4.5.tar.bz2 SHA256 26ca275b1fecc19019a2fba079cc6a1fa4fae2c74057d5d453533274f52cdb18
detox-1.4.5.tar.bz2 MD5 f9adb8f895eb1ec3cc61b448e92a6b35
detox-2.0.0.tar.bz2 SHA1 3c45aeb9c937ef9dbc7a55ccd20b94513e1611e3
detox-2.0.0.tar.bz2 SHA256 5efaaef9fc2230de1e299680ee2e5b25fa9a3e41674e6092facbcc05f3eeb658
detox-2.0.0.tar.bz2 MD5 62c07049b66dae30231864d019ebc645
2 changes: 1 addition & 1 deletion cross/eza/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PKG_NAME = eza
PKG_VERS = 0.18.6
PKG_VERS = 0.20.0
PKG_EXT = tar.gz
PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = https://github.com/eza-community/eza/archive
Expand Down
6 changes: 3 additions & 3 deletions cross/eza/digests
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
eza-0.18.6.tar.gz SHA1 7c0bad75356241bfcbdbe3a5b00b4d866650f964
eza-0.18.6.tar.gz SHA256 4cbca009d8ddc817d9ffda34bd1cada4278896e63051c645f0821605a6497faa
eza-0.18.6.tar.gz MD5 4c1132f9c474987c34069c3db7a8ee7d
eza-0.20.0.tar.gz SHA1 b447ba51b605a9112c9dafa37c53df8f6774f32b
eza-0.20.0.tar.gz SHA256 e6c058b13aecbed9f037c0607f0df19bc0a3532fea14dacd0090878ed4bbfadc
eza-0.20.0.tar.gz MD5 e8a25c373a58dc62309063d981ea153a
7 changes: 5 additions & 2 deletions cross/fd/Makefile
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
PKG_NAME = fd
PKG_VERS = 9.0.0
PKG_VERS = 10.2.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 = 10.* requires rustc >= 1.77.2 (for qoriq we currently have rust 1.77.0 only)
# 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)
# PKG_VERS <= 8.7.0 fails with newer rustc 1.80.1
Expand All @@ -14,9 +15,11 @@ UNSUPPORTED_ARCHS = $(ARMv7L_ARCHS)
# powerpc archs (except qoriq) are not supported
# undefined reference to 'pipe2'
UNSUPPORTED_ARCHS += $(OLD_PPC_ARCHS)
# as long as rustc for qoriq is < 1.77.2
UNSUPPORTED_ARCHS += $(PPC_ARCHS)

include ../../mk/spksrc.archs.mk
# This is still an issue with rustc 1.76.0 (07dca489a 2024-02-04):
# This is still an issue with rustc 1.77.2 (25ef9e3d8 2024-04-09):
# 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
Expand Down
6 changes: 3 additions & 3 deletions cross/fd/digests
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
fd-9.0.0.tar.gz SHA1 397e4a5efcd3730fa036f058a6a7432dbf1dac71
fd-9.0.0.tar.gz SHA256 306d7662994e06e23d25587246fa3fb1f528579e42a84f5128e75feec635a370
fd-9.0.0.tar.gz MD5 3ee72ca77c9a6b0ad108f48338206f05
fd-10.2.0.tar.gz SHA1 1efddc3b7b0e9fd33c5104641156f2ce30f60868
fd-10.2.0.tar.gz SHA256 73329fe24c53f0ca47cd0939256ca5c4644742cb7c14cf4114c8c9871336d342
fd-10.2.0.tar.gz MD5 4d3a35422d71920cec694ad00aaf449b
32 changes: 32 additions & 0 deletions cross/fd_9.0.0/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
PKG_NAME = fd
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 = 10.* requires rustc >= 1.77.2 (for qoriq we currently have rust 1.77.0 only)
# 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)
# PKG_VERS <= 8.7.0 fails with newer rustc 1.80.1
# 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.77.2 (25ef9e3d8 2024-04-09):
# 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
1 change: 1 addition & 0 deletions cross/fd_9.0.0/PLIST
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
bin:bin/fd
3 changes: 3 additions & 0 deletions cross/fd_9.0.0/digests
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
fd-9.0.0.tar.gz SHA1 397e4a5efcd3730fa036f058a6a7432dbf1dac71
fd-9.0.0.tar.gz SHA256 306d7662994e06e23d25587246fa3fb1f528579e42a84f5128e75feec635a370
fd-9.0.0.tar.gz MD5 3ee72ca77c9a6b0ad108f48338206f05
4 changes: 2 additions & 2 deletions cross/fdupes/Makefile
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
PKG_NAME = fdupes
PKG_VERS = 2.2.1
PKG_VERS = 2.3.2
PKG_EXT = tar.gz
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = https://github.com/adrianlopezroche/fdupes/releases/download/v$(PKG_VERS)
PKG_DIR = $(PKG_NAME)-$(PKG_VERS)

DEPENDS = cross/ncursesw cross/pcre2
DEPENDS = cross/ncursesw cross/pcre2 cross/sqlite

HOMEPAGE = https://github.com/adrianlopezroche/fdupes
COMMENT = FDUPES is a program for identifying or deleting duplicate files residing within specified directories.
Expand Down
6 changes: 3 additions & 3 deletions cross/fdupes/digests
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
fdupes-2.2.1.tar.gz SHA1 5cb0773b7ac8f1e4496d53dc4e9bce0f137f5045
fdupes-2.2.1.tar.gz SHA256 846bb79ca3f0157856aa93ed50b49217feb68e1b35226193b6bc578be0c5698d
fdupes-2.2.1.tar.gz MD5 215dfb62542f26338229ca1d7e33202f
fdupes-2.3.2.tar.gz SHA1 01762693e959847b4335cc0e4da3fea042465b7f
fdupes-2.3.2.tar.gz SHA256 808d8decbe7fa41cab407ae4b7c14bfc27b8cb62227540c3dcb6caf980592ac7
fdupes-2.3.2.tar.gz MD5 87fa4ed2256c537189b377f357229046
4 changes: 2 additions & 2 deletions cross/fzf/Makefile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
PKG_NAME = fzf
PKG_VERS = 0.46.1
PKG_VERS = 0.55.0
PKG_EXT = tar.gz
PKG_REVISION = $(shell date +%m/%d/%Y)
PKG_DIST_NAME = $(PKG_VERS).$(PKG_EXT)
PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = https://github.com/junegunn/fzf/archive
PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
Expand Down
6 changes: 3 additions & 3 deletions cross/fzf/digests
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
fzf-0.46.1.tar.gz SHA1 0d022d23059cb4e193cd5320d8e979c13c66f6d6
fzf-0.46.1.tar.gz SHA256 b0d640be3ae79980fdf461096f7d9d36d38ec752e25f8c4d2ca3ca6c041c2491
fzf-0.46.1.tar.gz MD5 91a189b1f67ff47c1ecdc11821cd4127
fzf-0.55.0.tar.gz SHA1 38e29de7437dd3fcef152ef08db244ddd706f438
fzf-0.55.0.tar.gz SHA256 805383f71bca7f8fb271ecd716852aea88fd898d5027d58add9e43df6ea766da
fzf-0.55.0.tar.gz MD5 508f02b82b88574335fab7b3bf511d6c
2 changes: 1 addition & 1 deletion cross/jdupes/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PKG_NAME = jdupes
PKG_VERS = 1.27.3
PKG_VERS = 1.28.0
PKG_EXT = tar.gz
PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = https://codeberg.org/jbruchon/jdupes/archive
Expand Down
6 changes: 3 additions & 3 deletions cross/jdupes/digests
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
jdupes-1.27.3.tar.gz SHA1 65bc047c08b83a8fd650a0a856152449053c0f3e
jdupes-1.27.3.tar.gz SHA256 1c75ed30dc95b3b5024019ab2ba3f78a14835c11d5b71249aa94374fde650c16
jdupes-1.27.3.tar.gz MD5 b6eff10eb70604f77e8de98c59d2e8bb
jdupes-1.28.0.tar.gz SHA1 79c12cddc85bcada14a8b467ea06756aa8ba80d9
jdupes-1.28.0.tar.gz SHA256 a8f21c04fff5e3ff0a92e8ac76114b2195ed43dc32b84bf343f5256e7ba9cb04
jdupes-1.28.0.tar.gz MD5 0ef51f026f71e647c8185f7197eacb4e
2 changes: 1 addition & 1 deletion cross/less/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PKG_NAME = less
PKG_VERS = 643
PKG_VERS = 661
PKG_EXT = tar.gz
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = http://www.greenwoodsoftware.com/less
Expand Down
6 changes: 3 additions & 3 deletions cross/less/digests
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
less-643.tar.gz SHA1 ee1f35a340b2631eb0376df7e073f01d86cdfbed
less-643.tar.gz SHA256 2911b5432c836fa084c8a2e68f6cd6312372c026a58faaa98862731c8b6052e8
less-643.tar.gz MD5 cf05e2546a3729492b944b4874dd43dd
less-661.tar.gz SHA1 04815f4d066f231dce6f7353acd0425ddb308f75
less-661.tar.gz SHA256 2b5f0167216e3ef0ffcb0c31c374e287eb035e4e223d5dae315c2783b6e738ed
less-661.tar.gz MD5 44f54b6313c5d71fa1ac224d8d84766a
2 changes: 1 addition & 1 deletion cross/libjodycode/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PKG_NAME = libjodycode
PKG_VERS = 3.1
PKG_VERS = 3.1.1
PKG_EXT = tar.gz
PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = https://codeberg.org/jbruchon/libjodycode/archive
Expand Down
6 changes: 3 additions & 3 deletions cross/libjodycode/digests
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
libjodycode-3.1.tar.gz SHA1 5d58e6f4be46a9b3095bd8a4f55024684cceb557
libjodycode-3.1.tar.gz SHA256 837b660c305215f0cbd68b002e831f29fe1a1d823cace74d75203111eb433bbd
libjodycode-3.1.tar.gz MD5 b775aa9da7ef990950acc54235549d7d
libjodycode-3.1.1.tar.gz SHA1 ec02c4b538f8d072a88dc4801d96cb450eedb25a
libjodycode-3.1.1.tar.gz SHA256 82717625b91f92ea4e7435798385762c6906835fa2cf2c80c9f83d6734bfddad
libjodycode-3.1.1.tar.gz MD5 e0d84f476916e21eb37728605becc5cf
27 changes: 27 additions & 0 deletions cross/libjodycode/patches/002-avoid-symbol-redefinition.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# use jodyhash_t definition by include of jody_hash.h to avoid symbol redefinition
#
# without this patch old GCC fails with error:
# In file included from jc_block_hash.c:9:
# jody_hash.h:43: error: redefinition of typedef 'jodyhash_t'
# libjodycode.h:132: error: previous declaration of 'jodyhash_t' was here
#
--- libjodycode.h.orig 2024-07-26 01:01:47.000000000 +0200
+++ libjodycode.h 2024-10-19 00:20:12.960721930 +0200
@@ -121,16 +121,13 @@


/*** jody_hash ***/
+#include "jody_hash.h"

/* Version increments when algorithm changes incompatibly */
#ifndef JODY_HASH_VERSION
#define JODY_HASH_VERSION 7
#endif

-/* Width of a jody_hash */
-#define JODY_HASH_WIDTH 64
-typedef uint64_t jodyhash_t;
-
extern int jc_block_hash(jodyhash_t *data, jodyhash_t *hash, const size_t count);


2 changes: 1 addition & 1 deletion cross/lsd/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PKG_NAME = lsd
PKG_VERS = 1.0.0
PKG_VERS = 1.1.5
PKG_EXT = tar.gz
PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = https://github.com/lsd-rs/lsd/archive
Expand Down
6 changes: 3 additions & 3 deletions cross/lsd/digests
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
lsd-1.0.0.tar.gz SHA1 0ad10432e5339e5fa393eee216204011ca6185f9
lsd-1.0.0.tar.gz SHA256 ab34e9c85bc77cfa42b43bfb54414200433a37419f3b1947d0e8cfbb4b7a6325
lsd-1.0.0.tar.gz MD5 5caf536e33834dd90fd854cb590c8377
lsd-1.1.5.tar.gz SHA1 2531e69679af16969805d47e2ddf8932585da517
lsd-1.1.5.tar.gz SHA256 120935c7e98f9b64488fde39987154a6a5b2236cb65ae847917012adf5e122d1
lsd-1.1.5.tar.gz MD5 24422f940a45d11775a62cfc65767016
2 changes: 1 addition & 1 deletion cross/lzip/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PKG_NAME = lzip
PKG_VERS = 1.24
PKG_VERS = 1.24.1
PKG_EXT = tar.gz
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = https://download.savannah.gnu.org/releases/lzip
Expand Down
6 changes: 3 additions & 3 deletions cross/lzip/digests
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
lzip-1.24.tar.gz SHA1 df0fd104de34aaae8bb630f04c5b213f9a15f5d9
lzip-1.24.tar.gz SHA256 d42659229b10e066eeb6e81eb673cdd893b672e512d26719c2d95975556ca56c
lzip-1.24.tar.gz MD5 95763cd199be5c343a891ce6a9aae9c5
lzip-1.24.1.tar.gz SHA1 251d4d8f80f9603eb267015997497c29109ff7d1
lzip-1.24.1.tar.gz SHA256 30c9cb6a0605f479c496c376eb629a48b0a1696d167e3c1e090c5defa481b162
lzip-1.24.1.tar.gz MD5 1a7720f5ed267d06112446ecb2a90b74
2 changes: 1 addition & 1 deletion cross/mc/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PKG_NAME = mc
PKG_VERS = 4.8.31
PKG_VERS = 4.8.32
PKG_EXT = tar.xz
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = http://ftp.midnight-commander.org/
Expand Down
6 changes: 3 additions & 3 deletions cross/mc/digests
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
mc-4.8.31.tar.xz SHA1 d59c1290bd8896dc8d5269248b60bad55f1e9d24
mc-4.8.31.tar.xz SHA256 24191cf8667675b8e31fc4a9d18a0a65bdc0598c2c5c4ea092494cd13ab4ab1a
mc-4.8.31.tar.xz MD5 2c3dd9af66e4cfef5a7a460df1cdf868
mc-4.8.32.tar.xz SHA1 34f81bca8fd0d79f2aa4884b1fed38ba80b09b22
mc-4.8.32.tar.xz SHA256 4ddc83d1ede9af2363b3eab987f54b87cf6619324110ce2d3a0e70944d1359fe
mc-4.8.32.tar.xz MD5 bcc9043a815c02c5837f8b1a4a60da5a
14 changes: 2 additions & 12 deletions cross/mc/patches/3689-bash-subshell.patch
Original file line number Diff line number Diff line change
@@ -1,17 +1,7 @@
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

--- src/subshell/common.c.org 2019-06-16 17:49:31.000000000 +0000
+++ src/subshell/common.c 2019-12-29 17:28:33.049619129 +0000
@@ -369,7 +369,7 @@
switch (mc_global.shell->type)
{
case SHELL_BASH:
- execl (mc_global.shell->path, "bash", "-rcfile", init_file, (char *) NULL);
+ execl (mc_global.shell->path, mc_global.shell->name, "-rcfile", init_file, (char *) NULL);
break;

case SHELL_ZSH:
--- lib/shell.c.org 2019-06-16 17:49:31.000000000 +0000
+++ lib/shell.c 2019-12-29 17:34:32.741113924 +0000
@@ -33,6 +33,8 @@
Expand Down Expand Up @@ -69,7 +59,7 @@ dnl https://midnight-commander.org/ticket/3689
/* --------------------------------------------------------------------------------------------- */

static void
mc_shell_recognize_path (mc_shell_t * mc_shell)
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)
Expand Down
4 changes: 2 additions & 2 deletions cross/micro/Makefile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
PKG_NAME = micro
PKG_VERS = 2.0.13
PKG_VERS = 2.0.14
PKG_EXT = tar.gz
# make sure the hash matches this release, as it is shown with 'micro --version'
GIT_HASH = c2cebaa
GIT_HASH = 04c5770
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)
Expand Down
6 changes: 3 additions & 3 deletions cross/micro/digests
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
micro-2.0.13.tar.gz SHA1 179d697bc71094c663ea927357bdf92fcfa0883a
micro-2.0.13.tar.gz SHA256 a96fff974ed6bd9a1dd58a33e54ff23b78783bbb3571b86d5c37d787b1e0e4be
micro-2.0.13.tar.gz MD5 5397c91db868e6df120e4fea8b7b1c5d
micro-2.0.14.tar.gz SHA1 6906d4bb7d3c945f47ace37d00d6910af0418498
micro-2.0.14.tar.gz SHA256 40177579beb3846461036387b649c629395584a4bbe970f61ba7591bd9c0185a
micro-2.0.14.tar.gz MD5 eaddc3531dbaf6d26e1f6df7eac18cdd
2 changes: 1 addition & 1 deletion cross/nano/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PKG_NAME = nano
PKG_VERS = 7.2
PKG_VERS = 8.2
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)))
Expand Down
6 changes: 3 additions & 3 deletions cross/nano/digests
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
nano-7.2.tar.xz SHA1 00f5b15ba12843c38fa8f9dd3076eea943853c0a
nano-7.2.tar.xz SHA256 86f3442768bd2873cec693f83cdf80b4b444ad3cc14760b74361474fc87a4526
nano-7.2.tar.xz MD5 13742c686c6ddb0b7b294634f0c13cec
nano-8.2.tar.xz SHA1 33bc9c6bc8f84a8d551fd9d118a3495db5f419c7
nano-8.2.tar.xz SHA256 d5ad07dd862facae03051c54c6535e54c7ed7407318783fcad1ad2d7076fffeb
nano-8.2.tar.xz MD5 382baf871963ac2c31c1e8043c70776e
2 changes: 1 addition & 1 deletion cross/ncdu/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PKG_NAME = ncdu
PKG_VERS = 1.19
PKG_VERS = 1.20
PKG_EXT = tar.gz
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = https://dev.yorhel.nl/download
Expand Down
Loading

0 comments on commit bedae80

Please sign in to comment.