Skip to content
Permalink
Browse files

busybox: update to 1.30.0

Update busybox to 1.30.0.
Refresh patches.
Leave new features disabled by default.

Config refreshed via:

  cd package/utils/busybox/config/
  ../convert_menuconfig.pl ../../../../build_dir/target-arm_cortex-a15+neon-vfpv4_musl_eabi/busybox-1.30.0

  make package/busybox/compile

  cd package/utils/busybox
  ./convert_defaults.pl < ../../../build_dir/target-arm_cortex-a15+neon-vfpv4_musl_eabi/busybox-1.30.0/.config > Config-defaults.in

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
  • Loading branch information...
hnyman authored and dedeckeh committed Dec 31, 2018
1 parent 54e3ee0 commit 9b9274342c47051e4f921d63f19cdf84aa0b8485
@@ -49,6 +49,9 @@ config BUSYBOX_DEFAULT_PID_FILE_PATH
config BUSYBOX_DEFAULT_BUSYBOX
bool
default n
config BUSYBOX_DEFAULT_FEATURE_SHOW_SCRIPT
bool
default n
config BUSYBOX_DEFAULT_FEATURE_INSTALLER
bool
default n
@@ -175,9 +178,15 @@ config BUSYBOX_DEFAULT_EFENCE
config BUSYBOX_DEFAULT_FEATURE_USE_BSS_TAIL
bool
default n
config BUSYBOX_DEFAULT_FLOAT_DURATION
bool
default n
config BUSYBOX_DEFAULT_FEATURE_RTMINMAX
bool
default n
config BUSYBOX_DEFAULT_FEATURE_RTMINMAX_USE_LIBC_DEFINITIONS
bool
default n
config BUSYBOX_DEFAULT_FEATURE_BUFFERS_USE_MALLOC
bool
default n
@@ -508,6 +517,9 @@ config BUSYBOX_DEFAULT_CP
config BUSYBOX_DEFAULT_FEATURE_CP_LONG_OPTIONS
bool
default n
config BUSYBOX_DEFAULT_FEATURE_CP_REFLINK
bool
default n
config BUSYBOX_DEFAULT_CUT
bool
default y
@@ -742,9 +754,6 @@ config BUSYBOX_DEFAULT_SLEEP
config BUSYBOX_DEFAULT_FEATURE_FANCY_SLEEP
bool
default y
config BUSYBOX_DEFAULT_FEATURE_FLOAT_SLEEP
bool
default n
config BUSYBOX_DEFAULT_SORT
bool
default y
@@ -1099,6 +1108,9 @@ config BUSYBOX_DEFAULT_FEATURE_FIND_PERM
config BUSYBOX_DEFAULT_FEATURE_FIND_TYPE
bool
default y
config BUSYBOX_DEFAULT_FEATURE_FIND_EXECUTABLE
bool
default n
config BUSYBOX_DEFAULT_FEATURE_FIND_XDEV
bool
default y
@@ -1138,6 +1150,9 @@ config BUSYBOX_DEFAULT_FEATURE_FIND_SIZE
config BUSYBOX_DEFAULT_FEATURE_FIND_PRUNE
bool
default y
config BUSYBOX_DEFAULT_FEATURE_FIND_QUIT
bool
default n
config BUSYBOX_DEFAULT_FEATURE_FIND_DELETE
bool
default n
@@ -1672,6 +1687,12 @@ config BUSYBOX_DEFAULT_FEATURE_MOUNT_OTHERTAB
config BUSYBOX_DEFAULT_MOUNTPOINT
bool
default n
config BUSYBOX_DEFAULT_NOLOGIN
bool
default n
config BUSYBOX_DEFAULT_NOLOGIN_DEPENDENCIES
bool
default n
config BUSYBOX_DEFAULT_NSENTER
bool
default n
@@ -1861,6 +1882,24 @@ config BUSYBOX_DEFAULT_BBCONFIG
config BUSYBOX_DEFAULT_FEATURE_COMPRESS_BBCONFIG
bool
default n
config BUSYBOX_DEFAULT_BC
bool
default n
config BUSYBOX_DEFAULT_DC
bool
default n
config BUSYBOX_DEFAULT_FEATURE_DC_BIG
bool
default n
config BUSYBOX_DEFAULT_FEATURE_DC_LIBM
bool
default n
config BUSYBOX_DEFAULT_FEATURE_BC_INTERACTIVE
bool
default n
config BUSYBOX_DEFAULT_FEATURE_BC_LONG_OPTIONS
bool
default n
config BUSYBOX_DEFAULT_BEEP
bool
default n
@@ -1915,12 +1954,6 @@ config BUSYBOX_DEFAULT_FEATURE_CROND_DIR
config BUSYBOX_DEFAULT_CRONTAB
bool
default y
config BUSYBOX_DEFAULT_DC
bool
default n
config BUSYBOX_DEFAULT_FEATURE_DC_LIBM
bool
default n
config BUSYBOX_DEFAULT_DEVFSD
bool
default n
@@ -2135,6 +2168,9 @@ config BUSYBOX_DEFAULT_FEATURE_PREFER_IPV4_ADDRESS
config BUSYBOX_DEFAULT_VERBOSE_RESOLUTION_ERRORS
bool
default y
config BUSYBOX_DEFAULT_FEATURE_TLS_SHA1
bool
default n
config BUSYBOX_DEFAULT_ARP
bool
default n
@@ -2405,6 +2441,9 @@ config BUSYBOX_DEFAULT_FEATURE_NTPD_SERVER
config BUSYBOX_DEFAULT_FEATURE_NTPD_CONF
bool
default n
config BUSYBOX_DEFAULT_FEATURE_NTP_AUTH
bool
default n
config BUSYBOX_DEFAULT_PING
bool
default y
@@ -3023,6 +3062,9 @@ config BUSYBOX_DEFAULT_FEATURE_SH_READ_FRAC
config BUSYBOX_DEFAULT_FEATURE_SH_HISTFILESIZE
bool
default n
config BUSYBOX_DEFAULT_FEATURE_SH_EMBEDDED_SCRIPTS
bool
default n
config BUSYBOX_DEFAULT_KLOGD
bool
default n
@@ -8,14 +8,14 @@
include $(TOPDIR)/rules.mk

PKG_NAME:=busybox
PKG_VERSION:=1.29.3
PKG_RELEASE:=3
PKG_VERSION:=1.30.0
PKG_RELEASE:=1
PKG_FLAGS:=essential

PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=https://www.busybox.net/downloads \
http://sources.buildroot.net
PKG_HASH:=97648636e579462296478e0218e65e4bc1e9cd69089a3b1aeb810bff7621efb7
PKG_HASH:=9553da068c0a30b1b8b72479908c1ba58672e2be7b535363a88de5e0f7bc04ce

PKG_BUILD_DEPENDS:=BUSYBOX_USE_LIBRPC:librpc BUSYBOX_CONFIG_PAM:libpam
PKG_BUILD_PARALLEL:=1
@@ -177,6 +177,11 @@ config BUSYBOX_CONFIG_BUSYBOX

Running "busybox APPLET [ARGS...]" will still work, of course.

config BUSYBOX_CONFIG_FEATURE_SHOW_SCRIPT
bool "Support --show SCRIPT"
default BUSYBOX_DEFAULT_FEATURE_SHOW_SCRIPT
depends on BUSYBOX_CONFIG_BUSYBOX

config BUSYBOX_CONFIG_FEATURE_INSTALLER
bool "Support --install [-s] to install applet links at runtime"
default BUSYBOX_DEFAULT_FEATURE_INSTALLER
@@ -1,14 +1,14 @@
--- a/networking/udhcp/dhcpc.c
+++ b/networking/udhcp/dhcpc.c
@@ -705,6 +705,7 @@ static int bcast_or_ucast(struct dhcp_pa
@@ -713,6 +713,7 @@ static int bcast_or_ucast(struct dhcp_pa
static NOINLINE int send_discover(uint32_t xid, uint32_t requested)
{
struct dhcp_packet packet;
+ static int msgs = 0;

/* Fill in: op, htype, hlen, cookie, chaddr fields,
* random xid field (we override it below),
@@ -722,6 +723,7 @@ static NOINLINE int send_discover(uint32
@@ -730,6 +731,7 @@ static NOINLINE int send_discover(uint32
*/
add_client_options(&packet);

@@ -1,6 +1,6 @@
--- a/networking/udhcp/dhcpc.c
+++ b/networking/udhcp/dhcpc.c
@@ -1407,6 +1407,12 @@ int udhcpc_main(int argc UNUSED_PARAM, c
@@ -1417,6 +1417,12 @@ int udhcpc_main(int argc UNUSED_PARAM, c
/* silence "uninitialized!" warning */
unsigned timestamp_before_wait = timestamp_before_wait;

@@ -1,6 +1,6 @@
--- a/networking/udhcp/dhcpc.c
+++ b/networking/udhcp/dhcpc.c
@@ -1118,7 +1118,6 @@ static void perform_renew(void)
@@ -1128,7 +1128,6 @@ static void perform_renew(void)
state = RENEW_REQUESTED;
break;
case RENEW_REQUESTED: /* impatient are we? fine, square 1 */
@@ -1,6 +1,6 @@
--- a/libbb/printable_string.c
+++ b/libbb/printable_string.c
@@ -28,8 +28,6 @@ const char* FAST_FUNC printable_string(u
@@ -28,8 +28,6 @@ const char* FAST_FUNC printable_string2(
}
if (c < ' ')
break;
@@ -9,7 +9,7 @@
s++;
}

@@ -42,7 +40,7 @@ const char* FAST_FUNC printable_string(u
@@ -42,7 +40,7 @@ const char* FAST_FUNC printable_string2(
unsigned char c = *d;
if (c == '\0')
break;

0 comments on commit 9b92743

Please sign in to comment.
You can’t perform that action at this time.