busybox: update to latest stable version

1 files changed, 49 insertions, 0 deletions

diff --git a/package/busybox/config/networking/Config.in b/package/busybox/config/networking/Config.in
index 93ff2c0f0..3f5019e7b 100644
--- a/package/busybox/config/networking/Config.in
+++ b/package/busybox/config/networking/Config.in
@@ -635,6 +635,13 @@ config BUSYBOX_FEATURE_IP_ROUTE
 	help
 	  Add support for routing table management to "ip".
 
+config BUSYBOX_FEATURE_IP_ROUTE_DIR
+	string "ip route configuration directory"
+	default "/etc/iproute2"
+	depends on BUSYBOX_FEATURE_IP_ROUTE
+	help
+	  Location of the "ip" applet routing configuration.
+
 config BUSYBOX_FEATURE_IP_TUNNEL
 	bool "ip tunnel"
 	default y
@@ -1093,6 +1100,48 @@ config BUSYBOX_FEATURE_WGET_TIMEOUT
 	  connection initialization).  When FEATURE_WGET_LONG_OPTIONS is
 	  also enabled, the --timeout option will work in addition to -T.
 
+config BUSYBOX_FEATURE_WGET_OPENSSL
+	bool "Try to connect to HTTPS using openssl"
+	default y
+	depends on BUSYBOX_WGET
+	help
+	  Choose how wget establishes SSL connection for https:// URLs.
+
+	  Busybox itself contains no SSL code. wget will spawn
+	  a helper program to talk over HTTPS.
+
+	  OpenSSL has a simple SSL client for debug purposes.
+	  If you select "openssl" helper, wget will effectively call
+	  "openssl s_client -quiet -connect IP:443 2>/dev/null"
+	  and pipe its data through it.
+	  Note inconvenient API: host resolution is done twice,
+	  and there is no guarantee openssl's idea of IPv6 address
+	  format is the same as ours.
+	  Another problem is that s_client prints debug information
+	  to stderr, and it needs to be suppressed. This means
+	  all error messages get suppressed too.
+	  openssl is also a big binary, often dynamically linked
+	  against ~15 libraries.
+
+config BUSYBOX_FEATURE_WGET_SSL_HELPER
+	bool "Try to connect to HTTPS using ssl_helper"
+	default y
+	depends on BUSYBOX_WGET
+	help
+	  Choose how wget establishes SSL connection for https:// URLs.
+
+	  Busybox itself contains no SSL code. wget will spawn
+	  a helper program to talk over HTTPS.
+
+	  ssl_helper is a tool which can be built statically
+	  from busybox sources against a small embedded SSL library.
+	  Please see networking/ssl_helper/README.
+	  It does not require double host resolution and emits
+	  error messages to stderr.
+
+	  Precompiled static binary may be available at
+	  http://busybox.net/downloads/binaries/
+
 config BUSYBOX_ZCIP
 	bool "zcip"
 	default n