From 89f8a01daba938e77e94ef311233be49c23a7a55 Mon Sep 17 00:00:00 2001 From: Magnus Kroken Date: Wed, 23 Aug 2017 23:13:34 +0200 Subject: busybox: update to 1.27.2 Refresh patches, delete patches backported from upstream. This fixes ntpd sync issues (ntpd would not sync if the first provided peer address was unreachable). Signed-off-by: Magnus Kroken Signed-off-by: Kevin Darbyshire-Bryant --- package/utils/busybox/config/editors/Config.in | 37 +++++++++++--------------- 1 file changed, 16 insertions(+), 21 deletions(-) (limited to 'package/utils/busybox/config/editors/Config.in') diff --git a/package/utils/busybox/config/editors/Config.in b/package/utils/busybox/config/editors/Config.in index 6ae361f7ff..da4eaedd79 100644 --- a/package/utils/busybox/config/editors/Config.in +++ b/package/utils/busybox/config/editors/Config.in @@ -49,8 +49,6 @@ config BUSYBOX_CONFIG_FEATURE_DIFF_LONG_OPTIONS bool "Enable long options" default BUSYBOX_DEFAULT_FEATURE_DIFF_LONG_OPTIONS depends on BUSYBOX_CONFIG_DIFF && BUSYBOX_CONFIG_LONG_OPTS - help - Enable use of long options. config BUSYBOX_CONFIG_FEATURE_DIFF_DIR bool "Enable directory support" @@ -87,7 +85,7 @@ config BUSYBOX_CONFIG_VI you may wish to use something else. config BUSYBOX_CONFIG_FEATURE_VI_MAX_LEN - int "Maximum screen width in vi" + int "Maximum screen width" range 256 16384 default BUSYBOX_DEFAULT_FEATURE_VI_MAX_LEN depends on BUSYBOX_CONFIG_VI @@ -96,7 +94,7 @@ config BUSYBOX_CONFIG_FEATURE_VI_MAX_LEN Make it smaller than 4k only if you are very limited on memory. config BUSYBOX_CONFIG_FEATURE_VI_8BIT - bool "Allow vi to display 8-bit chars (otherwise shows dots)" + bool "Allow to display 8-bit chars (otherwise shows dots)" default BUSYBOX_DEFAULT_FEATURE_VI_8BIT depends on BUSYBOX_CONFIG_VI help @@ -110,7 +108,7 @@ config BUSYBOX_CONFIG_FEATURE_VI_COLON default BUSYBOX_DEFAULT_FEATURE_VI_COLON depends on BUSYBOX_CONFIG_VI help - Enable a limited set of colon commands for vi. This does not + Enable a limited set of colon commands. This does not provide an "ex" mode. config BUSYBOX_CONFIG_FEATURE_VI_YANKMARK @@ -118,16 +116,14 @@ config BUSYBOX_CONFIG_FEATURE_VI_YANKMARK default BUSYBOX_DEFAULT_FEATURE_VI_YANKMARK depends on BUSYBOX_CONFIG_VI help - This will enable you to use yank and put, as well as mark in - busybox vi. + This will enable you to use yank and put, as well as mark. config BUSYBOX_CONFIG_FEATURE_VI_SEARCH bool "Enable search and replace cmds" default BUSYBOX_DEFAULT_FEATURE_VI_SEARCH depends on BUSYBOX_CONFIG_VI help - Select this if you wish to be able to do search and replace in - busybox vi. + Select this if you wish to be able to do search and replace. config BUSYBOX_CONFIG_FEATURE_VI_REGEX_SEARCH bool "Enable regex in search and replace" @@ -141,16 +137,15 @@ config BUSYBOX_CONFIG_FEATURE_VI_USE_SIGNALS default BUSYBOX_DEFAULT_FEATURE_VI_USE_SIGNALS depends on BUSYBOX_CONFIG_VI help - Selecting this option will make busybox vi signal aware. This will - make busybox vi support SIGWINCH to deal with Window Changes, catch - Ctrl-Z and Ctrl-C and alarms. + Selecting this option will make vi signal aware. This will support + SIGWINCH to deal with Window Changes, catch ^Z and ^C and alarms. config BUSYBOX_CONFIG_FEATURE_VI_DOT_CMD bool "Remember previous cmd and \".\" cmd" default BUSYBOX_DEFAULT_FEATURE_VI_DOT_CMD depends on BUSYBOX_CONFIG_VI help - Make busybox vi remember the last command and be able to repeat it. + Make vi remember the last command and be able to repeat it. config BUSYBOX_CONFIG_FEATURE_VI_READONLY bool "Enable -R option and \"view\" mode" @@ -161,25 +156,23 @@ config BUSYBOX_CONFIG_FEATURE_VI_READONLY open a file in read-only mode. config BUSYBOX_CONFIG_FEATURE_VI_SETOPTS - bool "Enable set-able options, ai ic showmatch" + bool "Enable settable options, ai ic showmatch" default BUSYBOX_DEFAULT_FEATURE_VI_SETOPTS depends on BUSYBOX_CONFIG_VI help Enable the editor to set some (ai, ic, showmatch) options. config BUSYBOX_CONFIG_FEATURE_VI_SET - bool "Support for :set" + bool "Support :set" default BUSYBOX_DEFAULT_FEATURE_VI_SET depends on BUSYBOX_CONFIG_VI - help - Support for ":set". config BUSYBOX_CONFIG_FEATURE_VI_WIN_RESIZE bool "Handle window resize" default BUSYBOX_DEFAULT_FEATURE_VI_WIN_RESIZE depends on BUSYBOX_CONFIG_VI help - Make busybox vi behave nicely with terminals that get resized. + Behave nicely with terminals that get resized. config BUSYBOX_CONFIG_FEATURE_VI_ASK_TERMINAL bool "Use 'tell me cursor position' ESC sequence to measure window" @@ -190,15 +183,16 @@ config BUSYBOX_CONFIG_FEATURE_VI_ASK_TERMINAL this option makes vi perform a last-ditch effort to find it: position cursor to 999,999 and ask terminal to report real cursor position using "ESC [ 6 n" escape sequence, then read stdin. - This is not clean but helps a lot on serial lines and such. + config BUSYBOX_CONFIG_FEATURE_VI_UNDO - bool "Support undo command 'u'" + bool "Support undo command \"u\"" default BUSYBOX_DEFAULT_FEATURE_VI_UNDO depends on BUSYBOX_CONFIG_VI help Support the 'u' command to undo insertion, deletion, and replacement of text. + config BUSYBOX_CONFIG_FEATURE_VI_UNDO_QUEUE bool "Enable undo operation queuing" default BUSYBOX_DEFAULT_FEATURE_VI_UNDO_QUEUE @@ -209,6 +203,7 @@ config BUSYBOX_CONFIG_FEATURE_VI_UNDO_QUEUE reached, the contents of the queue are committed to the undo stack. This increases the size of the undo code and allows some undo operations (especially un-typing/backspacing) to be far more useful. + config BUSYBOX_CONFIG_FEATURE_VI_UNDO_QUEUE_MAX int "Maximum undo character queue size" default BUSYBOX_DEFAULT_FEATURE_VI_UNDO_QUEUE_MAX @@ -228,7 +223,7 @@ config BUSYBOX_CONFIG_FEATURE_ALLOW_EXEC default BUSYBOX_DEFAULT_FEATURE_ALLOW_EXEC depends on BUSYBOX_CONFIG_VI || BUSYBOX_CONFIG_AWK help - Enables vi and awk features which allows user to execute + Enables vi and awk features which allow user to execute shell commands (using system() C call). endmenu -- cgit v1.2.3