busybox: Update from 1.28.4 to 1.29.1

This commit is contained in:
Fredrik Fornwall 2018-07-23 01:33:02 +02:00
parent 4474709169
commit 1200b5a072
4 changed files with 18 additions and 22 deletions

View File

@ -1,11 +0,0 @@
diff -u -r ../busybox-1.24.1/arch/i386/Makefile ./arch/i386/Makefile
--- ../busybox-1.24.1/arch/i386/Makefile 2015-07-12 22:18:46.000000000 -0400
+++ ./arch/i386/Makefile 2015-12-25 19:05:56.660211464 -0500
@@ -4,4 +4,5 @@
# -mpreferred-stack-boundary=2 is essential in preventing gcc 4.2.x
# from aligning stack to 16 bytes. (Which is gcc's way of supporting SSE).
-CFLAGS += $(call cc-option,-march=i386 -mpreferred-stack-boundary=2,)
+# This fixes crashing e.g. running busybox sed -e "s#'#'\"'\"'#g"
+# on the x86_64 emulator.
+# CFLAGS += $(call cc-option,-march=i386 -mpreferred-stack-boundary=2,)

View File

@ -1,9 +1,8 @@
TERMUX_PKG_HOMEPAGE=https://busybox.net/
TERMUX_PKG_DESCRIPTION="Tiny versions of many common UNIX utilities into a single small executable"
TERMUX_PKG_ESSENTIAL=yes
TERMUX_PKG_VERSION=1.28.4
TERMUX_PKG_REVISION=2
TERMUX_PKG_SHA256=e3c14a3699dc7e82fed397392957afc78e37bdf25398ac38ead6e84621b2ae6a
TERMUX_PKG_VERSION=1.29.1
TERMUX_PKG_SHA256=fc250730ea16d28839bfecda3c431683fa6bd4273ffca6b632cbeb3556c914c3
TERMUX_PKG_SRCURL=https://busybox.net/downloads/busybox-${TERMUX_PKG_VERSION}.tar.bz2
TERMUX_PKG_BUILD_IN_SRC=yes

View File

@ -53,6 +53,7 @@ CONFIG_FEATURE_SYSLOG=y
# Build Options
#
# CONFIG_STATIC is not set
CONFIG_STACK_OPTIMIZATION_386=n
CONFIG_PIE=y
# CONFIG_NOMMU is not set
# CONFIG_BUILD_LIBBUSYBOX is not set
@ -95,6 +96,7 @@ CONFIG_MD5_SMALL=1
CONFIG_SHA3_SMALL=1
# CONFIG_FEATURE_FAST_TOP is not set
# CONFIG_FEATURE_ETC_NETWORKS is not set
CONFIG_FEATURE_ETC_SERVICES=n
CONFIG_FEATURE_USE_TERMIOS=y
CONFIG_FEATURE_EDITING=y
CONFIG_FEATURE_EDITING_MAX_LEN=1024
@ -102,6 +104,7 @@ CONFIG_FEATURE_EDITING_VI=y
CONFIG_FEATURE_EDITING_HISTORY=255
CONFIG_FEATURE_EDITING_SAVEHISTORY=y
CONFIG_FEATURE_EDITING_SAVE_ON_EXIT=y
CONFIG_FEATURE_EDITING_WINCH=y
CONFIG_FEATURE_REVERSE_SEARCH=y
CONFIG_FEATURE_TAB_COMPLETION=y
# CONFIG_FEATURE_USERNAME_COMPLETION is not set
@ -140,6 +143,7 @@ CONFIG_LZMA=y
CONFIG_UNXZ=y
CONFIG_XZ=y
CONFIG_BZIP2=y
CONFIG_BZIP2_SMALL=8
CONFIG_CPIO=y
CONFIG_FEATURE_CPIO_O=y
CONFIG_FEATURE_CPIO_P=y
@ -288,6 +292,7 @@ CONFIG_FEATURE_FANCY_SLEEP=y
CONFIG_FEATURE_FLOAT_SLEEP=y
CONFIG_SORT=y
CONFIG_FEATURE_SORT_BIG=y
CONFIG_FEATURE_SORT_OPTIMIZE_MEMORY=n
CONFIG_SPLIT=y
CONFIG_FEATURE_SPLIT_FANCY=y
# CONFIG_STAT is not set
@ -672,6 +677,8 @@ CONFIG_FEATURE_CROND_SPECIAL_TIMES=y
CONFIG_LESS=y
CONFIG_FEATURE_LESS_MAXLINES=9999999
CONFIG_FEATURE_LESS_BRACKETS=y
CONFIG_FEATURE_LESS_RAW=y
CONFIG_FEATURE_LESS_ENV=y
CONFIG_FEATURE_LESS_FLAGS=y
CONFIG_FEATURE_LESS_MARKS=y
CONFIG_FEATURE_LESS_REGEXP=y
@ -859,6 +866,7 @@ CONFIG_PSCAN=y
CONFIG_ROUTE=y
# CONFIG_SLATTACH is not set
CONFIG_SSL_CLIENT=n
CONFIG_TC=n
CONFIG_TCPSVD=y
CONFIG_TELNET=y
CONFIG_FEATURE_TELNET_TTYPE=y
@ -988,6 +996,7 @@ CONFIG_RUNSV=y
CONFIG_RUNSVDIR=y
# CONFIG_FEATURE_RUNSVDIR_LOG is not set
CONFIG_SV=y
CONFIG_SVOK=n
CONFIG_SVC=n
CONFIG_SVLOGD=y
CONFIG_CHPST=y

View File

@ -1,17 +1,16 @@
We have patched the ndk header to include getsid().
diff -u -r ../busybox-1.22.1/libbb/missing_syscalls.c ./libbb/missing_syscalls.c
--- ../busybox-1.22.1/libbb/missing_syscalls.c 2014-01-09 19:15:44.000000000 +0100
+++ ./libbb/missing_syscalls.c 2014-07-08 15:57:13.545408937 +0200
@@ -11,11 +11,6 @@
#include "libbb.h"
diff -u -r ../busybox-1.29.1/libbb/missing_syscalls.c ./libbb/missing_syscalls.c
--- ../busybox-1.29.1/libbb/missing_syscalls.c 2018-07-02 11:23:06.000000000 +0000
+++ ./libbb/missing_syscalls.c 2018-07-22 23:12:25.751499056 +0000
@@ -10,10 +10,6 @@
#if defined(ANDROID) || defined(__ANDROID__)
/*# include <linux/timex.h> - for struct timex, but may collide with <time.h> */
# include <sys/syscall.h>
-pid_t getsid(pid_t pid)
-{
- return syscall(__NR_getsid, pid);
-}
-
int stime(const time_t *t)
{
struct timeval tv;