aboutsummaryrefslogtreecommitdiffstats
path: root/package/utils/busybox/patches/200-udhcpc_reduce_msgs.patch
diff options
context:
space:
mode:
authorHannu Nyman <hannu.nyman@iki.fi>2018-03-27 20:06:38 +0300
committerHauke Mehrtens <hauke@hauke-m.de>2018-04-03 23:26:45 +0200
commitd674422a814a4458af35e79587129a161b50a1ff (patch)
tree1613b1df5b3a61d93286607349b9b4b123d6faf2 /package/utils/busybox/patches/200-udhcpc_reduce_msgs.patch
parenta74fd570a23f2226afcf63f92f22bcb9df37beee (diff)
downloadupstream-d674422a814a4458af35e79587129a161b50a1ff.tar.gz
upstream-d674422a814a4458af35e79587129a161b50a1ff.tar.bz2
upstream-d674422a814a4458af35e79587129a161b50a1ff.zip
busybox: update to 1.28.2
Update busybox to 1.28.2, refresh patches and default config. * modify 230-add_nslookup_lede.patch as opt_complementary was removed Also move nslookup_longopts variable declaration to be inside the same conditional as the function itself. * modify 250-date-k-flag.patch to match upstream (opt_complementary) * remove 600-cve-2017-16544.patch that is upstreamed Notes about config changes: * Some applet-specific LONG_OPTIONS config options were removed * Config help text indentation changed, caused lots of text formatting changes for convert_menuconfig.pl * convert_defaults.pl moved lots of defaults around, summary of actual changes below New applets/features: --------------------- ARCH HEXEDIT MINIPS NETCAT NUKE RESUME RUN_INIT SETFATTR New options: ------------ FEATURE_CATN FEATURE_CROND_SPECIAL_TIMES FEATURE_LIBBUSYBOX_STATIC FEATURE_SETPRIV_CAPABILITIES FEATURE_SETPRIV_CAPABILITY_NAMES FEATURE_SETPRIV_DUMP FEATURE_SH_READ_FRAC FEATURE_SWAPONOFF_LABEL FEATURE_VOLUMEID_MINIX FEATURE_XARGS_SUPPORT_ARGS_FILE FEATURE_XARGS_SUPPORT_PARALLEL HUSH_GETOPTS HUSH_READONLY HUSH_TIMES Removed: -------- FEATURE_HAVE_RPC MSH Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Diffstat (limited to 'package/utils/busybox/patches/200-udhcpc_reduce_msgs.patch')
-rw-r--r--package/utils/busybox/patches/200-udhcpc_reduce_msgs.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/package/utils/busybox/patches/200-udhcpc_reduce_msgs.patch b/package/utils/busybox/patches/200-udhcpc_reduce_msgs.patch
index 5f64c19d05..a47c4fcc10 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
-@@ -706,6 +706,7 @@ static int bcast_or_ucast(struct dhcp_pa
+@@ -711,6 +711,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),
-@@ -723,6 +724,7 @@ static NOINLINE int send_discover(uint32
+@@ -728,6 +729,7 @@ static NOINLINE int send_discover(uint32
*/
add_client_options(&packet);