Explorar el Código

toybox: update to 0.8.14

Waldemar Brodkorb hace 1 mes
padre
commit
e07ad3fcf6

+ 2 - 2
package/toybox/Makefile

@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		toybox
-PKG_VERSION:=		0.8.12
+PKG_VERSION:=		0.8.14
 PKG_RELEASE:=		1
-PKG_HASH:=		ad88a921133ae2231d9f2df875ec0bd42af4429145caea7d7db9e02208a6fd2e
+PKG_HASH:=		827e4cdfd69f5da973e00e2a59b30b3c9857fb7fae74c362fd0b4f96be7929b0
 PKG_DESCR:=		linux tools collection
 PKG_SECTION:=		base/apps
 PKG_URL:=		http://landley.net/toybox/

+ 10 - 10
package/toybox/files/config

@@ -1,10 +1,10 @@
 #
 # Automatically generated make config: don't edit
 # ToyBox version: KCONFIG_VERSION
-# Tue Apr  8 13:12:22 2025
+# Sun Jun 28 00:43:59 2026
 #
-# CONFIG_TOYBOX_ON_ANDROID is not set
-# CONFIG_TOYBOX_FORK is not set
+# CONFIG_IS_ANDROID is not set
+# CONFIG_IS_FDPIC is not set
 
 #
 # Posix commands
@@ -43,7 +43,6 @@ CONFIG_ENV=y
 # CONFIG_HEAD is not set
 # CONFIG_ICONV is not set
 # CONFIG_ID is not set
-# CONFIG_ID_Z is not set
 # CONFIG_GROUPS is not set
 # CONFIG_LOGNAME is not set
 # CONFIG_WHOAMI is not set
@@ -54,9 +53,7 @@ CONFIG_LN=y
 # CONFIG_LOGGER is not set
 CONFIG_LS=y
 CONFIG_MKDIR=y
-# CONFIG_MKDIR_Z is not set
 # CONFIG_MKFIFO is not set
-# CONFIG_MKFIFO_Z is not set
 # CONFIG_NICE is not set
 # CONFIG_NL is not set
 # CONFIG_NOHUP is not set
@@ -76,7 +73,6 @@ CONFIG_RMDIR=y
 # CONFIG_SED is not set
 # CONFIG_SLEEP is not set
 # CONFIG_SORT is not set
-CONFIG_SORT_FLOAT=y
 # CONFIG_SPLIT is not set
 # CONFIG_STRINGS is not set
 # CONFIG_TAIL is not set
@@ -133,8 +129,7 @@ CONFIG_GETTY=y
 # CONFIG_GROUPADD is not set
 # CONFIG_GROUPDEL is not set
 # CONFIG_HEXDUMP is not set
-# CONFIG_HD is not set
-# CONFIG_INIT is not set
+CONFIG_INIT=y
 # CONFIG_IP is not set
 # CONFIG_IPCRM is not set
 # CONFIG_IPCS is not set
@@ -148,6 +143,7 @@ CONFIG_GETTY=y
 # CONFIG_MORE is not set
 # CONFIG_ROUTE is not set
 CONFIG_SH=y
+# CONFIG_ALIAS is not set
 # CONFIG_BREAK is not set
 # CONFIG_CD is not set
 # CONFIG_CONTINUE is not set
@@ -163,6 +159,8 @@ CONFIG_SH=y
 # CONFIG_RETURN is not set
 # CONFIG_SHIFT is not set
 # CONFIG_SOURCE is not set
+# CONFIG_TRAP is not set
+# CONFIG_UNALIAS is not set
 # CONFIG_WAIT is not set
 # CONFIG_STRACE is not set
 # CONFIG_STTY is not set
@@ -217,6 +215,7 @@ CONFIG_FREE=y
 # CONFIG_GPIOINFO is not set
 # CONFIG_GPIOGET is not set
 # CONFIG_GPIOSET is not set
+# CONFIG_HD is not set
 # CONFIG_HELP is not set
 # CONFIG_HEXEDIT is not set
 # CONFIG_HWCLOCK is not set
@@ -247,6 +246,7 @@ CONFIG_FREE=y
 # CONFIG_MOUNTPOINT is not set
 # CONFIG_NBD_CLIENT is not set
 # CONFIG_NBD_SERVER is not set
+CONFIG_NOLOGIN=y
 # CONFIG_UNSHARE is not set
 # CONFIG_NSENTER is not set
 # CONFIG_ONEIT is not set
@@ -332,7 +332,6 @@ CONFIG_HOSTNAME=y
 # CONFIG_SHA384SUM is not set
 # CONFIG_SHA512SUM is not set
 # CONFIG_MKNOD is not set
-# CONFIG_MKNOD_Z is not set
 # CONFIG_MKTEMP is not set
 CONFIG_MOUNT=y
 # CONFIG_PASSWD is not set
@@ -391,3 +390,4 @@ CONFIG_TOYBOX_ZHELP=y
 CONFIG_TOYBOX_UID_SYS=100
 CONFIG_TOYBOX_UID_USR=500
 CONFIG_TOYBOX_FORCE_NOMMU=y
+# CONFIG_TOYBOX_FORK is not set

+ 0 - 29
package/toybox/patches/patch-toys_pending_sh_c

@@ -1,29 +0,0 @@
---- toybox-0.8.12.orig/toys/pending/sh.c	2025-01-18 21:20:33.000000000 +0100
-+++ toybox-0.8.12/toys/pending/sh.c	2025-04-07 16:43:09.861935892 +0200
-@@ -1398,18 +1398,6 @@ static int run_subshell(char *str, int l
-   pid_t pid;
- //dprintf(2, "%d run_subshell %.*s\n", getpid(), len, str); debug_show_fds();
-   // The with-mmu path is significantly faster.
--  if (CFG_TOYBOX_FORK) {
--    if ((pid = fork())<0) perror_msg("fork");
--    else if (!pid) {
--      call_function()->pp = (void *)1;
--      if (str) {
--        TT.ff->source = fmemopen(str, len, "r");
--        longjmp(TT.forkchild, 1);
--      }
--    }
--
--  // On nommu vfork, exec /proc/self/exe, and pipe state data to ourselves.
--  } else {
-     int pipes[2];
-     unsigned i;
-     char **oldenv = environ, *ss = str ? : pl2str(TT.ff->pl->next, 0);
-@@ -1446,7 +1434,6 @@ static int run_subshell(char *str, int l
-     dprintf(pipes[1], "0 0\n%.*s\n", len, ss);
-     if (!str) free(ss);
-     close(pipes[1]);
--  }
- 
-   return pid;
- }