From 9b9274342c47051e4f921d63f19cdf84aa0b8485 Mon Sep 17 00:00:00 2001 From: Hannu Nyman Date: Mon, 31 Dec 2018 15:29:50 +0200 Subject: 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 --- package/utils/busybox/patches/200-udhcpc_reduce_msgs.patch | 4 ++-- package/utils/busybox/patches/201-udhcpc_changed_ifindex.patch | 2 +- package/utils/busybox/patches/203-udhcpc_renew_no_deconfig.patch | 2 +- package/utils/busybox/patches/270-libbb_make_unicode_printable.patch | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'package/utils/busybox/patches') diff --git a/package/utils/busybox/patches/200-udhcpc_reduce_msgs.patch b/package/utils/busybox/patches/200-udhcpc_reduce_msgs.patch index 4e498b807d..2d61a2d77d 100644 --- a/package/utils/busybox/patches/200-udhcpc_reduce_msgs.patch +++ b/package/utils/busybox/patches/200-udhcpc_reduce_msgs.patch @@ -1,6 +1,6 @@ --- 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; @@ -8,7 +8,7 @@ /* 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); diff --git a/package/utils/busybox/patches/201-udhcpc_changed_ifindex.patch b/package/utils/busybox/patches/201-udhcpc_changed_ifindex.patch index ad6fb9b026..51b15a73cc 100644 --- a/package/utils/busybox/patches/201-udhcpc_changed_ifindex.patch +++ b/package/utils/busybox/patches/201-udhcpc_changed_ifindex.patch @@ -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; diff --git a/package/utils/busybox/patches/203-udhcpc_renew_no_deconfig.patch b/package/utils/busybox/patches/203-udhcpc_renew_no_deconfig.patch index 301f65863a..6f5d3cc8bf 100644 --- a/package/utils/busybox/patches/203-udhcpc_renew_no_deconfig.patch +++ b/package/utils/busybox/patches/203-udhcpc_renew_no_deconfig.patch @@ -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 */ diff --git a/package/utils/busybox/patches/270-libbb_make_unicode_printable.patch b/package/utils/busybox/patches/270-libbb_make_unicode_printable.patch index 0ae8340568..0b682dc1f3 100644 --- a/package/utils/busybox/patches/270-libbb_make_unicode_printable.patch +++ b/package/utils/busybox/patches/270-libbb_make_unicode_printable.patch @@ -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; -- cgit v1.2.3