From 595732c2a370e8b37ba5ef9fb0826c5d0cd4b1ec Mon Sep 17 00:00:00 2001 From: Markham Date: Thu, 20 Jul 2017 18:11:31 +0200 Subject: [PATCH] bump version busybox-1.27.1 --- .../busybox-1.18-hack-init-s-console.patch | 6 +- archive-patches/busybox-1.22.1-hd1.config | 143 +++++++++++------- ...t-fix-for-brain-damaged-HTTP-servers.patch | 87 ----------- make/applications.mk | 1 - make/versions.mk | 2 +- 5 files changed, 96 insertions(+), 143 deletions(-) delete mode 100644 archive-patches/busybox-1.26.2-wget-fix-for-brain-damaged-HTTP-servers.patch diff --git a/archive-patches/busybox-1.18-hack-init-s-console.patch b/archive-patches/busybox-1.18-hack-init-s-console.patch index 0471f14..8a3dfe5 100644 --- a/archive-patches/busybox-1.18-hack-init-s-console.patch +++ b/archive-patches/busybox-1.18-hack-init-s-console.patch @@ -52,6 +52,6 @@ diff --git a/init/init.c b/init/init.c - putenv((char*)"TERM=vt102"); +/* if (!s || strcmp(s, "linux") == 0) + putenv((char*)"TERM=vt102");*/ - if (!ENABLE_FEATURE_INIT_SYSLOG) - log_console = NULL; - } else + # if !ENABLE_FEATURE_INIT_SYSLOG + log_console = NULL; + # endif diff --git a/archive-patches/busybox-1.22.1-hd1.config b/archive-patches/busybox-1.22.1-hd1.config index efd9447..207f236 100644 --- a/archive-patches/busybox-1.22.1-hd1.config +++ b/archive-patches/busybox-1.22.1-hd1.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.26.2 -# Fri Jan 27 23:01:11 2017 +# Busybox version: 1.27.1 +# Thu Jul 20 16:52:51 2017 # CONFIG_HAVE_DOT_CONFIG=y @@ -12,7 +12,6 @@ CONFIG_HAVE_DOT_CONFIG=y # CONFIG_EXTRA_COMPAT is not set CONFIG_INCLUDE_SUSv2=y # CONFIG_USE_PORTABLE_CODE is not set -CONFIG_PLATFORM_LINUX=y CONFIG_SHOW_USAGE=y CONFIG_FEATURE_VERBOSE_USAGE=y CONFIG_FEATURE_COMPRESS_USAGE=y @@ -35,6 +34,7 @@ CONFIG_FEATURE_SUID=y CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" CONFIG_FEATURE_SYSLOG=y CONFIG_FEATURE_HAVE_RPC=y +CONFIG_PLATFORM_LINUX=y # # Build Options @@ -62,7 +62,7 @@ CONFIG_INSTALL_APPLET_SYMLINKS=y # CONFIG_INSTALL_SH_APPLET_SYMLINK is not set # CONFIG_INSTALL_SH_APPLET_HARDLINK is not set # CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set -CONFIG_PREFIX="./_install" +CONFIG_PREFIX="/home/image/cs-busybox/build_tmp/busy" # # Debugging Options @@ -89,7 +89,6 @@ CONFIG_MD5_SMALL=1 CONFIG_SHA3_SMALL=1 # CONFIG_FEATURE_FAST_TOP is not set # CONFIG_FEATURE_ETC_NETWORKS is not set -CONFIG_FEATURE_USE_TERMIOS=y CONFIG_FEATURE_EDITING=y CONFIG_FEATURE_EDITING_MAX_LEN=1024 # CONFIG_FEATURE_EDITING_VI is not set @@ -150,6 +149,7 @@ CONFIG_FEATURE_GUNZIP_LONG_OPTIONS=y # CONFIG_XZCAT is not set # CONFIG_XZ is not set # CONFIG_BZIP2 is not set +# CONFIG_FEATURE_BZIP2_DECOMPRESS is not set # CONFIG_CPIO is not set # CONFIG_FEATURE_CPIO_O is not set # CONFIG_FEATURE_CPIO_P is not set @@ -159,6 +159,7 @@ CONFIG_GZIP=y CONFIG_FEATURE_GZIP_LONG_OPTIONS=y CONFIG_GZIP_FAST=0 # CONFIG_FEATURE_GZIP_LEVELS is not set +CONFIG_FEATURE_GZIP_DECOMPRESS=y # CONFIG_LZOP is not set # CONFIG_UNLZOP is not set # CONFIG_LZOPCAT is not set @@ -166,26 +167,29 @@ CONFIG_GZIP_FAST=0 # CONFIG_RPM is not set # CONFIG_RPM2CPIO is not set CONFIG_TAR=y +CONFIG_FEATURE_TAR_LONG_OPTIONS=y CONFIG_FEATURE_TAR_CREATE=y CONFIG_FEATURE_TAR_AUTODETECT=y CONFIG_FEATURE_TAR_FROM=y CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY=y # CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y -CONFIG_FEATURE_TAR_LONG_OPTIONS=y CONFIG_FEATURE_TAR_TO_COMMAND=y # CONFIG_FEATURE_TAR_UNAME_GNAME is not set CONFIG_FEATURE_TAR_NOPRESERVE_TIME=y # CONFIG_FEATURE_TAR_SELINUX is not set CONFIG_UNZIP=y +CONFIG_FEATURE_UNZIP_CDF=n +# CONFIG_FEATURE_UNZIP_BZIP2 is not set +# CONFIG_FEATURE_UNZIP_LZMA is not set +# CONFIG_FEATURE_UNZIP_XZ is not set # # Coreutils # CONFIG_BASENAME=y -# CONFIG_CAL is not set CONFIG_CAT=y -# CONFIG_CATV is not set +CONFIG_FEATURE_CATV=y CONFIG_CHGRP=y CONFIG_CHMOD=y CONFIG_CHOWN=y @@ -222,6 +226,7 @@ CONFIG_UNEXPAND=y CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS=y CONFIG_EXPR=y # CONFIG_EXPR_MATH_SUPPORT_64 is not set +CONFIG_FACTOR=n CONFIG_FALSE=y # CONFIG_FOLD is not set # CONFIG_FSYNC is not set @@ -232,12 +237,14 @@ CONFIG_HEAD=y CONFIG_GROUPS=y # CONFIG_INSTALL is not set # CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set +CONFIG_LINK=n CONFIG_LN=y # CONFIG_LOGNAME is not set CONFIG_LS=y CONFIG_FEATURE_LS_FILETYPES=y CONFIG_FEATURE_LS_FOLLOWLINKS=y CONFIG_FEATURE_LS_RECURSIVE=y +CONFIG_FEATURE_LS_WIDTH=y CONFIG_FEATURE_LS_SORTFILES=y CONFIG_FEATURE_LS_TIMESTAMPS=y CONFIG_FEATURE_LS_USERNAME=y @@ -257,11 +264,15 @@ 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 +CONFIG_NPROC=y # CONFIG_OD is not set +CONFIG_PASTE=y # CONFIG_PRINTENV is not set # CONFIG_PRINTF is not set CONFIG_PWD=y @@ -272,6 +283,7 @@ CONFIG_RM=y CONFIG_RMDIR=y CONFIG_FEATURE_RMDIR_LONG_OPTIONS=y CONFIG_SEQ=y +CONFIG_SHRED=n # CONFIG_SHUF is not set CONFIG_SLEEP=y CONFIG_FEATURE_FANCY_SLEEP=y @@ -296,6 +308,7 @@ CONFIG_TEST=y CONFIG_TEST1=y CONFIG_TEST2=y # CONFIG_FEATURE_TEST_64 is not set +# CONFIG_TIMEOUT is not set CONFIG_TOUCH=y CONFIG_FEATURE_TOUCH_NODEREF=y CONFIG_FEATURE_TOUCH_SUSV3=y @@ -316,6 +329,7 @@ CONFIG_BASE64=y CONFIG_WC=y # CONFIG_FEATURE_WC_LARGE 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 @@ -330,11 +344,6 @@ CONFIG_FEATURE_VERBOSE=y # CONFIG_FEATURE_PRESERVE_HARDLINKS=y -# -# Common options for ls, more and telnet -# -CONFIG_FEATURE_AUTOWIDTH=y - # # Common options for df, du, ls # @@ -369,14 +378,13 @@ CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS=y # # Debian Utilities # -CONFIG_MKTEMP=y # CONFIG_PIPE_PROGRESS is not set # CONFIG_RUN_PARTS is not set # CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS is not set # CONFIG_FEATURE_RUN_PARTS_FANCY is not set # CONFIG_START_STOP_DAEMON is not set -# CONFIG_FEATURE_START_STOP_DAEMON_FANCY is not set # CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS is not set +# CONFIG_FEATURE_START_STOP_DAEMON_FANCY is not set CONFIG_WHICH=y # @@ -467,12 +475,10 @@ CONFIG_FEATURE_USE_INITTAB=y CONFIG_FEATURE_KILL_DELAY=0 CONFIG_FEATURE_INIT_SCTTY=y CONFIG_FEATURE_INIT_SYSLOG=y -# CONFIG_FEATURE_EXTRA_QUIET is not set +CONFIG_FEATURE_INIT_QUIET=n # CONFIG_FEATURE_INIT_COREDUMPS is not set CONFIG_INIT_TERMINAL_TYPE="linux" CONFIG_FEATURE_INIT_MODIFY_CMDLINE=y -CONFIG_MESG=y -CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP=y # # Login/Password Management Utilities @@ -511,6 +517,7 @@ CONFIG_FEATURE_PASSWD_WEAK_CHECK=y # CONFIG_SU is not set # CONFIG_FEATURE_SU_SYSLOG is not set # CONFIG_FEATURE_SU_CHECKS_SHELLS is not set +# CONFIG_FEATURE_SU_BLANK_PW_NEEDS_SECURE_TTY is not set # CONFIG_SULOGIN is not set # CONFIG_VLOCK is not set @@ -531,8 +538,6 @@ CONFIG_INSMOD=y CONFIG_LSMOD=y CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y CONFIG_MODINFO=y -# CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE is not set -# CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set CONFIG_MODPROBE=y # CONFIG_FEATURE_MODPROBE_BLACKLIST is not set CONFIG_RMMOD=y @@ -540,14 +545,16 @@ CONFIG_RMMOD=y # # Options common to multiple modutils # +CONFIG_FEATURE_CMDLINE_MODULE_OPTIONS=y +# CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set # CONFIG_FEATURE_2_4_MODULES is not set -CONFIG_FEATURE_INSMOD_TRY_MMAP=y # CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set # CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set # CONFIG_FEATURE_INSMOD_LOADINKMEM is not set # CONFIG_FEATURE_INSMOD_LOAD_MAP is not set # CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set CONFIG_FEATURE_CHECK_TAINTED_MODULE=y +CONFIG_FEATURE_INSMOD_TRY_MMAP=y CONFIG_FEATURE_MODUTILS_ALIAS=y # CONFIG_FEATURE_MODUTILS_SYMBOLS is not set CONFIG_DEFAULT_MODULES_DIR="/lib/modules" @@ -562,8 +569,13 @@ CONFIG_DEFAULT_DEPMOD_FILE="modules.dep" # CONFIG_BLKID is not set # CONFIG_FEATURE_BLKID_TYPE is not set CONFIG_BLOCKDEV=y +# CONFIG_CAL is not set +# CONFIG_CHRT is not set CONFIG_DMESG=y CONFIG_FEATURE_DMESG_PRETTY=y +CONFIG_EJECT=y +# CONFIG_FEATURE_EJECT_SCSI is not set +CONFIG_FALLOCATE=y # CONFIG_FATATTR is not set # CONFIG_FBSET is not set # CONFIG_FEATURE_FBSET_FANCY is not set @@ -583,17 +595,22 @@ 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_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_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 CONFIG_IPCS=y +# CONFIG_LAST is not set +# CONFIG_FEATURE_LAST_FANCY is not set CONFIG_LOSETUP=y # CONFIG_LSPCI is not set CONFIG_LSUSB=y @@ -603,6 +620,8 @@ CONFIG_FEATURE_MDEV_RENAME=y CONFIG_FEATURE_MDEV_RENAME_REGEXP=y CONFIG_FEATURE_MDEV_EXEC=y CONFIG_FEATURE_MDEV_LOAD_FIRMWARE=y +CONFIG_MESG=y +CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP=y # CONFIG_MKE2FS is not set # CONFIG_MKFS_EXT2 is not set # CONFIG_MKFS_MINIX is not set @@ -623,12 +642,14 @@ CONFIG_FEATURE_MOUNT_CIFS=y CONFIG_FEATURE_MOUNT_FLAGS=y 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 CONFIG_READPROFILE=y +CONFIG_RENICE=y # CONFIG_REV is not set # CONFIG_RTCWAKE is not set # CONFIG_SCRIPT is not set @@ -636,15 +657,20 @@ CONFIG_READPROFILE=y # CONFIG_SETARCH is not set # CONFIG_LINUX32 is not set # CONFIG_LINUX64 is not set +CONFIG_SETPRIV=n +CONFIG_SETSID=y CONFIG_SWAPON=y CONFIG_FEATURE_SWAPON_DISCARD=y # CONFIG_FEATURE_SWAPON_PRI is not set CONFIG_SWAPOFF=y # CONFIG_SWITCH_ROOT is not set +# CONFIG_TASKSET is not set +# CONFIG_FEATURE_TASKSET_FANCY is not set CONFIG_UEVENT=y CONFIG_UMOUNT=y CONFIG_FEATURE_UMOUNT_ALL=y # CONFIG_UNSHARE is not set +# CONFIG_WALL is not set # # Common options for mount/umount @@ -698,7 +724,6 @@ CONFIG_FEATURE_BEEP_LENGTH_MS=0 # CONFIG_FEATURE_CHAT_SEND_ESCAPES is not set # CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set # CONFIG_FEATURE_CHAT_CLR_ABORT is not set -# CONFIG_CHRT is not set # CONFIG_CONSPY is not set CONFIG_CROND=y # CONFIG_FEATURE_CROND_D is not set @@ -713,8 +738,6 @@ CONFIG_CRONTAB=y # CONFIG_DEVFSD_VERBOSE is not set # CONFIG_FEATURE_DEVFS is not set # CONFIG_DEVMEM is not set -CONFIG_EJECT=y -# CONFIG_FEATURE_EJECT_SCSI is not set # CONFIG_FBSPLASH is not set # CONFIG_FLASH_ERASEALL is not set # CONFIG_FLASH_LOCK is not set @@ -732,9 +755,6 @@ CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA=y # CONFIG_I2CDUMP is not set # CONFIG_I2CDETECT is not set # CONFIG_INOTIFYD is not set -# CONFIG_IONICE is not set -# CONFIG_LAST is not set -# CONFIG_FEATURE_LAST_FANCY is not set # CONFIG_LESS is not set CONFIG_FEATURE_LESS_MAXLINES=0 # CONFIG_FEATURE_LESS_BRACKETS is not set @@ -746,27 +766,24 @@ CONFIG_FEATURE_LESS_MAXLINES=0 # CONFIG_FEATURE_LESS_ASK_TERMINAL is not set # CONFIG_FEATURE_LESS_DASHCMD is not set # CONFIG_FEATURE_LESS_LINENUMS is not set +CONFIG_LSSCSI=y CONFIG_MAKEDEVS=y # CONFIG_FEATURE_MAKEDEVS_LEAF is not set CONFIG_FEATURE_MAKEDEVS_TABLE=y # CONFIG_MAN is not set # CONFIG_MICROCOM is not set -# CONFIG_MOUNTPOINT is not set # CONFIG_MT is not set # CONFIG_NANDWRITE is not set # CONFIG_NANDDUMP is not set +CONFIG_PARTPROBE=y # CONFIG_RAIDAUTORUN is not set # CONFIG_READAHEAD is not set # CONFIG_RFKILL is not set # CONFIG_RUNLEVEL is not set # CONFIG_RX is not set CONFIG_SETSERIAL=y -CONFIG_SETSID=y CONFIG_STRINGS=y -# CONFIG_TASKSET is not set -# CONFIG_FEATURE_TASKSET_FANCY is not set CONFIG_TIME=y -# CONFIG_TIMEOUT is not set # CONFIG_TTYSIZE is not set # CONFIG_UBIATTACH is not set # CONFIG_UBIDETACH is not set @@ -776,7 +793,6 @@ CONFIG_TIME=y # CONFIG_UBIUPDATEVOL is not set # CONFIG_UBIRENAME is not set # CONFIG_VOLNAME is not set -# CONFIG_WALL is not set CONFIG_WATCHDOG=y # @@ -853,8 +869,8 @@ CONFIG_FEATURE_IP_ROUTE_DIR="/var/etc/iproute2" # CONFIG_FEATURE_IP_NEIGH is not set # CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set # CONFIG_IPCALC is not set -# CONFIG_FEATURE_IPCALC_FANCY is not set # CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set +# CONFIG_FEATURE_IPCALC_FANCY is not set # CONFIG_FAKEIDENTD is not set # CONFIG_NAMEIF is not set # CONFIG_FEATURE_NAMEIF_EXTENDED is not set @@ -876,11 +892,13 @@ CONFIG_FEATURE_FANCY_PING=y # CONFIG_PSCAN is not set CONFIG_ROUTE=y # CONFIG_SLATTACH is not set +CONFIG_SSL_CLIENT=n # CONFIG_TCPSVD is not set # CONFIG_UDPSVD is not set CONFIG_TELNET=y CONFIG_FEATURE_TELNET_TTYPE=y CONFIG_FEATURE_TELNET_AUTOLOGIN=y +CONFIG_FEATURE_TELNET_WIDTH=y CONFIG_TELNETD=y # CONFIG_FEATURE_TELNETD_STANDALONE is not set # CONFIG_FEATURE_TELNETD_INETD_WAIT is not set @@ -891,6 +909,7 @@ CONFIG_TELNETD=y # 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 # CONFIG_TRACEROUTE6 is not set # CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set @@ -899,29 +918,32 @@ CONFIG_TELNETD=y # CONFIG_FEATURE_TUNCTL_UG is not set # CONFIG_VCONFIG is not set CONFIG_WGET=y +CONFIG_FEATURE_WGET_LONG_OPTIONS=y # CONFIG_FEATURE_WGET_STATUSBAR is not set CONFIG_FEATURE_WGET_AUTHENTICATION=y -CONFIG_FEATURE_WGET_LONG_OPTIONS=y CONFIG_FEATURE_WGET_TIMEOUT=y +CONFIG_FEATURE_WGET_HTTPS=y CONFIG_FEATURE_WGET_OPENSSL=y -CONFIG_FEATURE_WGET_SSL_HELPER=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_DHCPRELAY is not set -# CONFIG_DUMPLEASES is not set # CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set # CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC is not set CONFIG_DHCPD_LEASES_FILE="" +# CONFIG_DUMPLEASES is not set +# CONFIG_DHCPRELAY is not set CONFIG_UDHCPC=y CONFIG_FEATURE_UDHCPC_ARPING=y CONFIG_FEATURE_UDHCPC_SANITIZEOPT=y +CONFIG_UDHCPC_DEFAULT_SCRIPT="/etc/network/udhcpc.sh" # CONFIG_FEATURE_UDHCP_PORT is not set CONFIG_UDHCP_DEBUG=0 # CONFIG_FEATURE_UDHCP_RFC3397 is not set CONFIG_FEATURE_UDHCP_8021Q=y -CONFIG_UDHCPC_DEFAULT_SCRIPT="/etc/network/udhcpc.sh" CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80 CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -b" @@ -962,18 +984,19 @@ CONFIG_PIDOF=y # CONFIG_FEATURE_PIDOF_OMIT is not set CONFIG_PMAP=y # CONFIG_POWERTOP is not set +# CONFIG_FEATURE_POWERTOP_INTERACTIVE is not set # CONFIG_PS is not set # CONFIG_FEATURE_PS_WIDE is not set # CONFIG_FEATURE_PS_LONG is not set # CONFIG_FEATURE_PS_TIME is not set -# CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS is not set # CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set +# CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS is not set # CONFIG_PSTREE is not set CONFIG_PWDX=y -CONFIG_RENICE=y # CONFIG_SMEMCAP is not set # CONFIG_BB_SYSCTL is not set # CONFIG_TOP is not set +# CONFIG_FEATURE_TOP_INTERACTIVE is not set # CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE is not set # CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS is not set # CONFIG_FEATURE_TOP_SMP_CPU is not set @@ -1028,24 +1051,23 @@ CONFIG_BASH_IS_NONE=y CONFIG_ASH=y CONFIG_ASH_OPTIMIZE_FOR_SIZE=y CONFIG_ASH_INTERNAL_GLOB=y -# CONFIG_ASH_RANDOM_SUPPORT is not set -CONFIG_ASH_EXPAND_PRMT=y CONFIG_ASH_BASH_COMPAT=y -# CONFIG_ASH_IDLE_TIMEOUT is not set CONFIG_ASH_JOB_CONTROL=y CONFIG_ASH_ALIAS=y -# CONFIG_ASH_GETOPTS is not set -CONFIG_ASH_BUILTIN_ECHO=y -CONFIG_ASH_BUILTIN_PRINTF=y -CONFIG_ASH_BUILTIN_TEST=y +# CONFIG_ASH_RANDOM_SUPPORT is not set +CONFIG_ASH_EXPAND_PRMT=y +# CONFIG_ASH_IDLE_TIMEOUT is not set +CONFIG_ASH_MAIL=y +CONFIG_ASH_ECHO=y +CONFIG_ASH_PRINTF=y +CONFIG_ASH_TEST=y # CONFIG_ASH_HELP is not set +# CONFIG_ASH_GETOPTS is not set # CONFIG_ASH_CMDCMD is not set -CONFIG_ASH_MAIL=y CONFIG_CTTYHACK=y # CONFIG_HUSH is not set # CONFIG_HUSH_BASH_COMPAT is not set # CONFIG_HUSH_BRACE_EXPANSION is not set -# CONFIG_HUSH_HELP is not set # CONFIG_HUSH_INTERACTIVE is not set # CONFIG_HUSH_SAVEHISTORY is not set # CONFIG_HUSH_JOB is not set @@ -1056,9 +1078,28 @@ CONFIG_CTTYHACK=y # CONFIG_HUSH_FUNCTIONS is not set # CONFIG_HUSH_LOCAL is not set # CONFIG_HUSH_RANDOM_SUPPORT is not set -# CONFIG_HUSH_EXPORT_N is not set # CONFIG_HUSH_MODE_X is not set +# CONFIG_HUSH_ECHO is not set +# CONFIG_HUSH_PRINTF is not set +# CONFIG_HUSH_TEST is not set +# CONFIG_HUSH_HELP is not set +# CONFIG_HUSH_EXPORT is not set +# CONFIG_HUSH_EXPORT_N 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_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_MEMLEAK is not set # CONFIG_MSH is not set + +# +# Options common to all shells +# CONFIG_FEATURE_SH_MATH=y # CONFIG_FEATURE_SH_MATH_64 is not set CONFIG_FEATURE_SH_EXTRA_QUIET=y diff --git a/archive-patches/busybox-1.26.2-wget-fix-for-brain-damaged-HTTP-servers.patch b/archive-patches/busybox-1.26.2-wget-fix-for-brain-damaged-HTTP-servers.patch deleted file mode 100644 index b5669d5..0000000 --- a/archive-patches/busybox-1.26.2-wget-fix-for-brain-damaged-HTTP-servers.patch +++ /dev/null @@ -1,87 +0,0 @@ -From dac762a702d01c8c2d42135795cc9bf23ff324a2 Mon Sep 17 00:00:00 2001 -From: Denys Vlasenko -Date: Wed, 11 Jan 2017 20:16:45 +0100 -Subject: wget: fix for brain-damaged HTTP servers. Closes 9471 - -write(3, "GET / HTTP/1.1\r\nUser-Agent: Wget\r\nConnection: close\r\n\r\n", 74) = 74 -shutdown(3, SHUT_WR) = 0 -alarm(900) = 900 -read(3, "", 1024) = 0 -write(2, "wget: error getting response\n", 29) = 29 -exit(1) - -The peer simply does not return anything. It closes its connection. - -Probably it detects wget closing its writing end: shutdown(3, SHUT_WR). - -The point it, closing write side of the socket is _valid_ for HTTP. -wget sent the full request, it won't be sending anything more: -it will only receive the response, and that's it. - -Signed-off-by: Denys Vlasenko ---- - networking/wget.c | 26 ++++++++++++++++++-------- - 1 file changed, 18 insertions(+), 8 deletions(-) - -diff --git a/networking/wget.c b/networking/wget.c -index b082a0f..afb09f5 100644 ---- a/networking/wget.c -+++ b/networking/wget.c -@@ -141,6 +141,8 @@ - #endif - - -+#define SSL_SUPPORTED (ENABLE_FEATURE_WGET_OPENSSL || ENABLE_FEATURE_WGET_SSL_HELPER) -+ - struct host_info { - char *allocated; - const char *path; -@@ -151,7 +153,7 @@ struct host_info { - }; - static const char P_FTP[] ALIGN1 = "ftp"; - static const char P_HTTP[] ALIGN1 = "http"; --#if ENABLE_FEATURE_WGET_OPENSSL || ENABLE_FEATURE_WGET_SSL_HELPER -+#if SSL_SUPPORTED - static const char P_HTTPS[] ALIGN1 = "https"; - #endif - -@@ -452,7 +454,7 @@ static void parse_url(const char *src_url, struct host_info *h) - if (strcmp(url, P_FTP) == 0) { - h->port = bb_lookup_port(P_FTP, "tcp", 21); - } else --#if ENABLE_FEATURE_WGET_OPENSSL || ENABLE_FEATURE_WGET_SSL_HELPER -+#if SSL_SUPPORTED - if (strcmp(url, P_HTTPS) == 0) { - h->port = bb_lookup_port(P_HTTPS, "tcp", 443); - h->protocol = P_HTTPS; -@@ -1093,12 +1095,20 @@ static void download_one_url(const char *url) - } - - fflush(sfp); -- /* If we use SSL helper, keeping our end of the socket open for writing -- * makes our end (i.e. the same fd!) readable (EAGAIN instead of EOF) -- * even after child closes its copy of the fd. -- * This helps: -- */ -- shutdown(fileno(sfp), SHUT_WR); -+ -+/* Tried doing this unconditionally. -+ * Cloudflare and nginx/1.11.5 are shocked to see SHUT_WR on non-HTTPS. -+ */ -+#if SSL_SUPPORTED -+ if (target.protocol == P_HTTPS) { -+ /* If we use SSL helper, keeping our end of the socket open for writing -+ * makes our end (i.e. the same fd!) readable (EAGAIN instead of EOF) -+ * even after child closes its copy of the fd. -+ * This helps: -+ */ -+ shutdown(fileno(sfp), SHUT_WR); -+ } -+#endif - - /* - * Retrieve HTTP response line and check for "200" status code. --- -cgit v0.12 - - diff --git a/make/applications.mk b/make/applications.mk index f436082..4566568 100755 --- a/make/applications.mk +++ b/make/applications.mk @@ -28,7 +28,6 @@ $(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.26.2-wget-fix-for-brain-damaged-HTTP-servers.patch; \ cp $(PATCHES)/busybox-1.22.1-hd1.config .config && \ sed -i -e 's#^CONFIG_PREFIX.*#CONFIG_PREFIX="$(TARGETPREFIX)"#' .config && \ $(MAKE) all CROSS_COMPILE=$(TARGET)- CFLAGS_EXTRA="$(TARGET_CFLAGS)" && \ diff --git a/make/versions.mk b/make/versions.mk index d1236b8..b509f5a 100644 --- a/make/versions.mk +++ b/make/versions.mk @@ -1,5 +1,5 @@ -BUSYBOX_VER = 1.26.2 +BUSYBOX_VER = 1.27.1 # cortex-strings; optimized string routines for ARM and AArch64 CRTXSTR_GIT=48fd30c -- 2.39.5