From 0d45fcb6b245f168c0964c289b7f936ea3c0eef6 Mon Sep 17 00:00:00 2001 From: Markham Date: Sun, 25 Feb 2018 14:13:13 +0100 Subject: [PATCH] bump version busybox-1.28.1 --- ...1-hd1.config => busybox-1.28.1-cst.config} | 112 ++++++++++-------- .../busybox-1.28.1-flashcp-small-output.patch | 51 ++++++++ ...sybox-1.28.1-no-unsafe-symlink-check.patch | 23 ++++ archive-patches/busybox-1.28.1-unicode.patch | 20 ++++ make/applications.mk | 5 +- make/versions.mk | 2 +- 6 files changed, 163 insertions(+), 50 deletions(-) rename archive-patches/{busybox-1.22.1-hd1.config => busybox-1.28.1-cst.config} (96%) create mode 100644 archive-patches/busybox-1.28.1-flashcp-small-output.patch create mode 100644 archive-patches/busybox-1.28.1-no-unsafe-symlink-check.patch create mode 100644 archive-patches/busybox-1.28.1-unicode.patch diff --git a/archive-patches/busybox-1.22.1-hd1.config b/archive-patches/busybox-1.28.1-cst.config similarity index 96% rename from archive-patches/busybox-1.22.1-hd1.config rename to archive-patches/busybox-1.28.1-cst.config index e72f4ba..35f247c 100644 --- a/archive-patches/busybox-1.22.1-hd1.config +++ b/archive-patches/busybox-1.28.1-cst.config @@ -1,40 +1,39 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.27.1 -# Thu Jul 20 16:52:51 2017 +# Busybox version: 1.28.1 +# Sun Feb 25 13:19:53 2018 # CONFIG_HAVE_DOT_CONFIG=y # -# Busybox Settings +# Settings # # CONFIG_DESKTOP is not set # CONFIG_EXTRA_COMPAT is not set # CONFIG_FEDORA_COMPAT is not set CONFIG_INCLUDE_SUSv2=y -# CONFIG_USE_PORTABLE_CODE is not set +CONFIG_LONG_OPTS=y CONFIG_SHOW_USAGE=y CONFIG_FEATURE_VERBOSE_USAGE=y CONFIG_FEATURE_COMPRESS_USAGE=y -CONFIG_BUSYBOX=y -CONFIG_FEATURE_INSTALLER=y -CONFIG_INSTALL_NO_USR=y +CONFIG_LFS=y # CONFIG_PAM is not set -CONFIG_LONG_OPTS=y CONFIG_FEATURE_DEVPTS=y -# CONFIG_FEATURE_CLEAN_UP is not set # CONFIG_FEATURE_UTMP is not set # CONFIG_FEATURE_WTMP is not set CONFIG_FEATURE_PIDFILE=y CONFIG_PID_FILE_PATH="/var/run" +CONFIG_BUSYBOX=y +CONFIG_FEATURE_INSTALLER=y +CONFIG_INSTALL_NO_USR=y CONFIG_FEATURE_SUID=y # CONFIG_FEATURE_SUID_CONFIG is not set # CONFIG_FEATURE_SUID_CONFIG_QUIET is not set -# CONFIG_SELINUX is not set # CONFIG_FEATURE_PREFER_APPLETS is not set CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" +# CONFIG_SELINUX is not set +# CONFIG_FEATURE_CLEAN_UP is not set CONFIG_FEATURE_SYSLOG=y -CONFIG_FEATURE_HAVE_RPC=y CONFIG_PLATFORM_LINUX=y # @@ -44,14 +43,15 @@ CONFIG_PLATFORM_LINUX=y # CONFIG_PIE is not set # CONFIG_NOMMU is not set # CONFIG_BUILD_LIBBUSYBOX is not set +# CONFIG_FEATURE_LIBBUSYBOX_STATIC is not set # CONFIG_FEATURE_INDIVIDUAL is not set # CONFIG_FEATURE_SHARED_BUSYBOX is not set -CONFIG_LFS=y CONFIG_CROSS_COMPILER_PREFIX="" CONFIG_SYSROOT="" CONFIG_EXTRA_CFLAGS="" CONFIG_EXTRA_LDFLAGS="" CONFIG_EXTRA_LDLIBS="" +# CONFIG_USE_PORTABLE_CODE is not set # # Installation Options ("make install" behavior) @@ -78,7 +78,7 @@ CONFIG_NO_DEBUG_LIB=y # CONFIG_EFENCE is not set # -# Busybox Library Tuning +# Library Tuning # # CONFIG_FEATURE_USE_BSS_TAIL is not set CONFIG_FEATURE_RTMINMAX=y @@ -145,7 +145,6 @@ CONFIG_FEATURE_GUNZIP_LONG_OPTIONS=y # CONFIG_UNLZMA is not set # CONFIG_LZCAT is not set # CONFIG_LZMA is not set -# CONFIG_FEATURE_LZMA_FAST is not set # CONFIG_UNXZ is not set # CONFIG_XZCAT is not set # CONFIG_XZ is not set @@ -180,16 +179,18 @@ CONFIG_FEATURE_TAR_TO_COMMAND=y CONFIG_FEATURE_TAR_NOPRESERVE_TIME=y # CONFIG_FEATURE_TAR_SELINUX is not set CONFIG_UNZIP=y -CONFIG_FEATURE_UNZIP_CDF=n +# CONFIG_FEATURE_UNZIP_CDF is not set # CONFIG_FEATURE_UNZIP_BZIP2 is not set # CONFIG_FEATURE_UNZIP_LZMA is not set # CONFIG_FEATURE_UNZIP_XZ is not set +# CONFIG_FEATURE_LZMA_FAST is not set # # Coreutils # CONFIG_BASENAME=y CONFIG_CAT=y +CONFIG_FEATURE_CATN=y CONFIG_FEATURE_CATV=y CONFIG_CHGRP=y CONFIG_CHMOD=y @@ -220,14 +221,11 @@ CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y CONFIG_ECHO=y CONFIG_FEATURE_FANCY_ECHO=y CONFIG_ENV=y -CONFIG_FEATURE_ENV_LONG_OPTIONS=y # CONFIG_EXPAND is not set -# CONFIG_FEATURE_EXPAND_LONG_OPTIONS is not set CONFIG_UNEXPAND=y -CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS=y CONFIG_EXPR=y # CONFIG_EXPR_MATH_SUPPORT_64 is not set -CONFIG_FACTOR=n +# CONFIG_FACTOR is not set CONFIG_FALSE=y # CONFIG_FOLD is not set # CONFIG_FSYNC is not set @@ -238,7 +236,7 @@ CONFIG_HEAD=y CONFIG_GROUPS=y # CONFIG_INSTALL is not set # CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set -CONFIG_LINK=n +# CONFIG_LINK is not set CONFIG_LN=y # CONFIG_LOGNAME is not set CONFIG_LS=y @@ -262,12 +260,10 @@ CONFIG_SHA3SUM=y # # CONFIG_FEATURE_MD5_SHA1_SUM_CHECK is not set CONFIG_MKDIR=y -CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y CONFIG_MKFIFO=y CONFIG_MKNOD=y CONFIG_MKTEMP=y CONFIG_MV=y -CONFIG_FEATURE_MV_LONG_OPTIONS=y CONFIG_NICE=y CONFIG_NL=y CONFIG_NOHUP=y @@ -282,9 +278,8 @@ CONFIG_FEATURE_READLINK_FOLLOW=y # CONFIG_REALPATH is not set CONFIG_RM=y CONFIG_RMDIR=y -CONFIG_FEATURE_RMDIR_LONG_OPTIONS=y CONFIG_SEQ=y -CONFIG_SHRED=n +# CONFIG_SHRED is not set # CONFIG_SHUF is not set CONFIG_SLEEP=y CONFIG_FEATURE_FANCY_SLEEP=y @@ -321,6 +316,7 @@ CONFIG_TRUNCATE=y # CONFIG_TTY is not set CONFIG_UNAME=y CONFIG_UNAME_OSNAME="GNU/Linux" +CONFIG_BB_ARCH=y CONFIG_UNIQ=y # CONFIG_UNLINK is not set CONFIG_USLEEP=y @@ -329,10 +325,10 @@ CONFIG_BASE64=y # CONFIG_UUENCODE is not set CONFIG_WC=y # CONFIG_FEATURE_WC_LARGE is not set +# CONFIG_WHOAMI is not set # CONFIG_WHO is not set # CONFIG_W is not set # CONFIG_USERS is not set -# CONFIG_WHOAMI is not set CONFIG_YES=y # @@ -388,6 +384,14 @@ CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS=y # CONFIG_FEATURE_START_STOP_DAEMON_FANCY is not set CONFIG_WHICH=y +# +# klibc-utils +# +# CONFIG_MINIPS is not set +CONFIG_NUKE=y +CONFIG_RESUME=y +CONFIG_RUN_INIT=y + # # Editors # @@ -457,6 +461,8 @@ CONFIG_XARGS=y # CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT is not set CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y CONFIG_FEATURE_XARGS_SUPPORT_REPL_STR=y +CONFIG_FEATURE_XARGS_SUPPORT_PARALLEL=y +CONFIG_FEATURE_XARGS_SUPPORT_ARGS_FILE=y # # Init Utilities @@ -476,7 +482,7 @@ CONFIG_FEATURE_USE_INITTAB=y CONFIG_FEATURE_KILL_DELAY=0 CONFIG_FEATURE_INIT_SCTTY=y CONFIG_FEATURE_INIT_SYSLOG=y -CONFIG_FEATURE_INIT_QUIET=n +# CONFIG_FEATURE_INIT_QUIET is not set # CONFIG_FEATURE_INIT_COREDUMPS is not set CONFIG_INIT_TERMINAL_TYPE="linux" CONFIG_FEATURE_INIT_MODIFY_CMDLINE=y @@ -489,13 +495,11 @@ CONFIG_USE_BB_PWD_GRP=y # CONFIG_USE_BB_SHADOW is not set CONFIG_USE_BB_CRYPT=y # CONFIG_USE_BB_CRYPT_SHA is not set -# CONFIG_ADD_SHELL is not set -# CONFIG_REMOVE_SHELL is not set # CONFIG_ADDGROUP is not set -# CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS is not set # CONFIG_FEATURE_ADDUSER_TO_GROUP is not set +# CONFIG_ADD_SHELL is not set +# CONFIG_REMOVE_SHELL is not set CONFIG_ADDUSER=y -# CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set # CONFIG_FEATURE_CHECK_NAMES is not set CONFIG_LAST_ID=60000 CONFIG_FIRST_SYSTEM_ID=0 @@ -596,16 +600,15 @@ CONFIG_FEATURE_FDISK_ADVANCED=y # CONFIG_FDFLUSH is not set # CONFIG_FREERAMDISK is not set # CONFIG_FSCK_MINIX is not set -CONFIG_FSFREEZE=n +# CONFIG_FSFREEZE is not set CONFIG_FSTRIM=y # CONFIG_GETOPT is not set # CONFIG_FEATURE_GETOPT_LONG is not set CONFIG_HEXDUMP=y # CONFIG_FEATURE_HEXDUMP_REVERSE is not set # CONFIG_HD is not set -CONFIG_XXD=n +# CONFIG_XXD is not set # CONFIG_HWCLOCK is not set -# CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS is not set # CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set # CONFIG_IONICE is not set CONFIG_IPCRM=y @@ -645,7 +648,6 @@ CONFIG_FEATURE_MOUNT_FSTAB=y CONFIG_FEATURE_MOUNT_OTHERTAB=y # CONFIG_MOUNTPOINT is not set # CONFIG_NSENTER is not set -# CONFIG_FEATURE_NSENTER_LONG_OPTS is not set CONFIG_PIVOT_ROOT=y CONFIG_RDATE=y # CONFIG_RDEV is not set @@ -658,12 +660,16 @@ CONFIG_RENICE=y # CONFIG_SETARCH is not set # CONFIG_LINUX32 is not set # CONFIG_LINUX64 is not set -CONFIG_SETPRIV=n +# CONFIG_SETPRIV is not set +# CONFIG_FEATURE_SETPRIV_DUMP is not set +# CONFIG_FEATURE_SETPRIV_CAPABILITIES is not set +# CONFIG_FEATURE_SETPRIV_CAPABILITY_NAMES is not set CONFIG_SETSID=y CONFIG_SWAPON=y CONFIG_FEATURE_SWAPON_DISCARD=y # CONFIG_FEATURE_SWAPON_PRI is not set CONFIG_SWAPOFF=y +CONFIG_FEATURE_SWAPONOFF_LABEL=y # CONFIG_SWITCH_ROOT is not set # CONFIG_TASKSET is not set # CONFIG_FEATURE_TASKSET_FANCY is not set @@ -697,6 +703,7 @@ CONFIG_FEATURE_VOLUMEID_F2FS=y # CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set # CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set # CONFIG_FEATURE_VOLUMEID_LUKS is not set +CONFIG_FEATURE_VOLUMEID_MINIX=y CONFIG_FEATURE_VOLUMEID_NILFS=y # CONFIG_FEATURE_VOLUMEID_NTFS is not set # CONFIG_FEATURE_VOLUMEID_OCFS2 is not set @@ -729,6 +736,7 @@ CONFIG_FEATURE_BEEP_LENGTH_MS=0 CONFIG_CROND=y # CONFIG_FEATURE_CROND_D is not set # CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set +CONFIG_FEATURE_CROND_SPECIAL_TIMES=y CONFIG_FEATURE_CROND_DIR="/var/etc/cron" CONFIG_CRONTAB=y # CONFIG_DC is not set @@ -740,10 +748,10 @@ CONFIG_CRONTAB=y # CONFIG_FEATURE_DEVFS is not set # CONFIG_DEVMEM is not set # CONFIG_FBSPLASH is not set +CONFIG_FLASHCP=y # CONFIG_FLASH_ERASEALL is not set # CONFIG_FLASH_LOCK is not set # CONFIG_FLASH_UNLOCK is not set -CONFIG_FLASHCP=y CONFIG_HDPARM=y CONFIG_FEATURE_HDPARM_GET_IDENTITY=y # CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set @@ -751,6 +759,7 @@ CONFIG_FEATURE_HDPARM_GET_IDENTITY=y # CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set # CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA=y +CONFIG_HEXEDIT=y # CONFIG_I2CGET is not set # CONFIG_I2CSET is not set # CONFIG_I2CDUMP is not set @@ -782,17 +791,18 @@ CONFIG_PARTPROBE=y # CONFIG_RFKILL is not set # CONFIG_RUNLEVEL is not set # CONFIG_RX is not set +CONFIG_SETFATTR=y CONFIG_SETSERIAL=y CONFIG_STRINGS=y CONFIG_TIME=y # CONFIG_TTYSIZE is not set +# CONFIG_UBIRENAME is not set # CONFIG_UBIATTACH is not set # CONFIG_UBIDETACH is not set # CONFIG_UBIMKVOL is not set # CONFIG_UBIRMVOL is not set # CONFIG_UBIRSVOL is not set # CONFIG_UBIUPDATEVOL is not set -# CONFIG_UBIRENAME is not set # CONFIG_VOLNAME is not set CONFIG_WATCHDOG=y @@ -877,6 +887,7 @@ CONFIG_FEATURE_IP_ROUTE_DIR="/var/etc/iproute2" # CONFIG_FEATURE_NAMEIF_EXTENDED is not set CONFIG_NBDCLIENT=y CONFIG_NC=y +# CONFIG_NETCAT is not set CONFIG_NC_SERVER=y CONFIG_NC_EXTRA=y CONFIG_NC_110_COMPAT=y @@ -893,7 +904,7 @@ CONFIG_FEATURE_FANCY_PING=y # CONFIG_PSCAN is not set CONFIG_ROUTE=y # CONFIG_SLATTACH is not set -CONFIG_SSL_CLIENT=n +# CONFIG_SSL_CLIENT is not set # CONFIG_TCPSVD is not set # CONFIG_UDPSVD is not set CONFIG_TELNET=y @@ -904,11 +915,11 @@ CONFIG_TELNETD=y # CONFIG_FEATURE_TELNETD_STANDALONE is not set # CONFIG_FEATURE_TELNETD_INETD_WAIT is not set # CONFIG_TFTP is not set +# CONFIG_FEATURE_TFTP_PROGRESS_BAR is not set # CONFIG_TFTPD is not set # CONFIG_FEATURE_TFTP_GET is not set # CONFIG_FEATURE_TFTP_PUT is not set # CONFIG_FEATURE_TFTP_BLOCKSIZE is not set -# CONFIG_FEATURE_TFTP_PROGRESS_BAR is not set # CONFIG_TFTP_DEBUG is not set CONFIG_TLS=y # CONFIG_TRACEROUTE is not set @@ -927,13 +938,9 @@ CONFIG_FEATURE_WGET_HTTPS=y CONFIG_FEATURE_WGET_OPENSSL=y CONFIG_WHOIS=y # CONFIG_ZCIP is not set -# CONFIG_UDHCPC6 is not set -# CONFIG_FEATURE_UDHCPC6_RFC3646 is not set -# CONFIG_FEATURE_UDHCPC6_RFC4704 is not set -# CONFIG_FEATURE_UDHCPC6_RFC4833 is not set # CONFIG_UDHCPD is not set -# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set # CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC is not set +# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set CONFIG_DHCPD_LEASES_FILE="" # CONFIG_DUMPLEASES is not set # CONFIG_DHCPRELAY is not set @@ -941,11 +948,19 @@ CONFIG_UDHCPC=y CONFIG_FEATURE_UDHCPC_ARPING=y CONFIG_FEATURE_UDHCPC_SANITIZEOPT=y CONFIG_UDHCPC_DEFAULT_SCRIPT="/etc/network/udhcpc.sh" +# CONFIG_UDHCPC6 is not set +# CONFIG_FEATURE_UDHCPC6_RFC3646 is not set +# CONFIG_FEATURE_UDHCPC6_RFC4704 is not set +# CONFIG_FEATURE_UDHCPC6_RFC4833 is not set + +# +# Common options for DHCP applets +# # CONFIG_FEATURE_UDHCP_PORT is not set CONFIG_UDHCP_DEBUG=0 +CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80 # CONFIG_FEATURE_UDHCP_RFC3397 is not set CONFIG_FEATURE_UDHCP_8021Q=y -CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80 CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -b" # @@ -1025,13 +1040,11 @@ CONFIG_SV_DEFAULT_SERVICE_DIR="" # CONFIG_SVC is not set # CONFIG_SVLOGD is not set # CONFIG_CHCON is not set -# CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set # CONFIG_GETENFORCE is not set # CONFIG_GETSEBOOL is not set # CONFIG_LOAD_POLICY is not set # CONFIG_MATCHPATHCON is not set # CONFIG_RUNCON is not set -# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set # CONFIG_SELINUXENABLED is not set # CONFIG_SESTATUS is not set # CONFIG_SETENFORCE is not set @@ -1086,17 +1099,19 @@ CONFIG_CTTYHACK=y # CONFIG_HUSH_HELP is not set # CONFIG_HUSH_EXPORT is not set # CONFIG_HUSH_EXPORT_N is not set +# CONFIG_HUSH_READONLY is not set # CONFIG_HUSH_KILL is not set # CONFIG_HUSH_WAIT is not set # CONFIG_HUSH_TRAP is not set # CONFIG_HUSH_TYPE is not set +# CONFIG_HUSH_TIMES is not set # CONFIG_HUSH_READ is not set # CONFIG_HUSH_SET is not set # CONFIG_HUSH_UNSET is not set # CONFIG_HUSH_ULIMIT is not set # CONFIG_HUSH_UMASK is not set +# CONFIG_HUSH_GETOPTS is not set # CONFIG_HUSH_MEMLEAK is not set -# CONFIG_MSH is not set # # Options common to all shells @@ -1106,6 +1121,7 @@ CONFIG_FEATURE_SH_MATH=y CONFIG_FEATURE_SH_EXTRA_QUIET=y # CONFIG_FEATURE_SH_STANDALONE is not set # CONFIG_FEATURE_SH_NOFORK is not set +CONFIG_FEATURE_SH_READ_FRAC=y CONFIG_FEATURE_SH_HISTFILESIZE=y # diff --git a/archive-patches/busybox-1.28.1-flashcp-small-output.patch b/archive-patches/busybox-1.28.1-flashcp-small-output.patch new file mode 100644 index 0000000..94b004a --- /dev/null +++ b/archive-patches/busybox-1.28.1-flashcp-small-output.patch @@ -0,0 +1,51 @@ +--- a/miscutils/flashcp.c ++++ b/miscutils/flashcp.c +@@ -19,10 +19,11 @@ + //kbuild:lib-$(CONFIG_FLASHCP) += flashcp.o + + //usage:#define flashcp_trivial_usage +-//usage: "-v FILE MTD_DEVICE" ++//usage: "-v -s FILE MTD_DEVICE" + //usage:#define flashcp_full_usage "\n\n" + //usage: "Copy an image to MTD device\n" + //usage: "\n -v Verbose" ++//usage: "\n -s small output" + + #include "libbb.h" + #include +@@ -31,6 +32,7 @@ + #define MTD_DEBUG 0 + + #define OPT_v (1 << 0) ++#define OPT_s (1 << 1) + + #define BUFSIZE (4 * 1024) + +@@ -43,9 +45,15 @@ + percent = count * 100; + if (total) + percent = (unsigned) (percent / total); +- printf("\r%s: %"OFF_FMT"u/%"OFF_FMT"u (%u%%) ", +- (mode < 0) ? "Erasing block" : ((mode == 0) ? "Writing kb" : "Verifying kb"), +- count, total, (unsigned)percent); ++ if (option_mask32 & OPT_s) { ++ printf("%s%"OFF_FMT"u/%"OFF_FMT"u", ++ (mode < 0) ? "E:" : ((mode == 0) ? "W:" : "V:"), ++ count, total); ++ } else { ++ printf("\r%s: %"OFF_FMT"u/%"OFF_FMT"u (%u%%) ", ++ (mode < 0) ? "Erasing block" : ((mode == 0) ? "Writing kb" : "Verifying kb"), ++ count, total, (unsigned)percent); ++ } + fflush_all(); + } + +@@ -69,7 +77,7 @@ + RESERVE_CONFIG_UBUFFER(buf, BUFSIZE); + RESERVE_CONFIG_UBUFFER(buf2, BUFSIZE); + +- /*opts =*/ getopt32(argv, "^" "v" "\0" "=2"/*exactly 2 non-option args: file,dev*/); ++ /*opts =*/ getopt32(argv, "^" "vs" "\0" "=2"/*exactly 2 non-option args: file,dev*/); + argv += optind; + // filename = *argv++; + // devicename = *argv; diff --git a/archive-patches/busybox-1.28.1-no-unsafe-symlink-check.patch b/archive-patches/busybox-1.28.1-no-unsafe-symlink-check.patch new file mode 100644 index 0000000..0d4d998 --- /dev/null +++ b/archive-patches/busybox-1.28.1-no-unsafe-symlink-check.patch @@ -0,0 +1,23 @@ +--- a/archival/libarchive/unsafe_symlink_target_org.c 2017-08-17 13:50:45.000000000 +0200 ++++ b/archival/libarchive/unsafe_symlink_target.c 2018-01-12 15:42:58.479995606 +0100 +@@ -16,8 +16,9 @@ + if (var) { + if (LONE_CHAR(var, '1')) + return 0; /* pretend it's safe */ +- return 1; /* "UNSAFE!" */ ++ return 0; /* "UNSAFE! */ + } ++#if 0 + bb_error_msg("skipping unsafe symlink to '%s' in archive," + " set %s=1 to extract", + target, +@@ -25,7 +26,8 @@ + ); + /* Prevent further messages */ + setenv("EXTRACT_UNSAFE_SYMLINKS", "0", 0); +- return 1; /* "UNSAFE!" */ ++#endif ++ return 0; /* "UNSAFE!" */ + } + + dot = target; diff --git a/archive-patches/busybox-1.28.1-unicode.patch b/archive-patches/busybox-1.28.1-unicode.patch new file mode 100644 index 0000000..9758269 --- /dev/null +++ b/archive-patches/busybox-1.28.1-unicode.patch @@ -0,0 +1,20 @@ +--- busybox/libbb/printable_string.c ++++ busybox/libbb/printable_string.c +@@ -28,8 +28,6 @@ + } + if (c < ' ') + break; +- if (c >= 0x7f) +- break; + s++; + } + +@@ -42,7 +40,7 @@ + unsigned char c = *d; + if (c == '\0') + break; +- if (c < ' ' || c >= 0x7f) ++ if (c < ' ') + *d = '?'; + d++; + } diff --git a/make/applications.mk b/make/applications.mk index 42be3c0..e54d797 100755 --- a/make/applications.mk +++ b/make/applications.mk @@ -34,8 +34,11 @@ $(D)/busybox: $(ARCHIVE)/busybox-$(BUSYBOX_VER).tar.bz2 | $(TARGETPREFIX) $(PATCH)/busybox-1.18-hack-init-s-console.patch; \ $(PATCH)/busybox-1.21.1-changing-the-order-sys-tree-is-scanned-with-mdev.diff; \ $(PATCH)/busybox-1.21.1-mdev.diff; \ + $(PATCH)/busybox-1.28.1-unicode.patch; \ + $(PATCH)/busybox-1.28.1-flashcp-small-output.patch; \ + $(PATCH)/busybox-1.28.1-no-unsafe-symlink-check.patch; \ $(DF_FIX) \ - cp $(PATCHES)/busybox-1.22.1-hd1.config .config && \ + cp $(PATCHES)/busybox-1.28.1-cst.config .config && \ sed -i -e 's#^CONFIG_PREFIX.*#CONFIG_PREFIX="$(TARGETPREFIX)"#' .config && \ $(MAKE) all CROSS_COMPILE=$(TARGET)- CFLAGS_EXTRA="$(TARGET_CFLAGS)" && \ $(MAKE) install CROSS_COMPILE=$(TARGET)- CFLAGS_EXTRA="$(TARGET_CFLAGS)" diff --git a/make/versions.mk b/make/versions.mk index c291be6..b236688 100644 --- a/make/versions.mk +++ b/make/versions.mk @@ -1,7 +1,7 @@ AUTOFS4_VER = 4.1.4 -BUSYBOX_VER = 1.27.2 +BUSYBOX_VER = 1.28.1 # cortex-strings; optimized string routines for ARM and AArch64 CRTXSTR_GIT=48fd30c -- 2.39.5