diff options
| author | Sören Tempel <soeren+git@soeren-tempel.net> | 2019-02-13 22:26:47 +0100 |
|---|---|---|
| committer | Sören Tempel <soeren+git@soeren-tempel.net> | 2019-02-15 23:23:00 +0100 |
| commit | 397f0cd902eaadce3b74e1e3021e941d9bb6ba72 (patch) | |
| tree | 92a0f82e3ff96244c3c790320d7d78e1978775d5 /main/busybox/0001-properly-fix-wget-https-support.patch | |
| parent | ba2aa302c949e3508b05e6de0b3aad143391a859 (diff) | |
| download | aports-397f0cd902eaadce3b74e1e3021e941d9bb6ba72.tar.bz2 aports-397f0cd902eaadce3b74e1e3021e941d9bb6ba72.tar.xz | |
main/busybox: upgrade to 1.30.0
Notable changes:
* The sysklogd -Z option has been removed in favor of -t option
which has been added by upstream.
* Our own nologin.c applet has been replaced by an upstream
nologin shell applet.
* New bc applet.
OK ncopa@
Fixes #9279
Fixes #7818
Diffstat (limited to 'main/busybox/0001-properly-fix-wget-https-support.patch')
| -rw-r--r-- | main/busybox/0001-properly-fix-wget-https-support.patch | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/main/busybox/0001-properly-fix-wget-https-support.patch b/main/busybox/0001-properly-fix-wget-https-support.patch index 2e94a0291e..81ac38e350 100644 --- a/main/busybox/0001-properly-fix-wget-https-support.patch +++ b/main/busybox/0001-properly-fix-wget-https-support.patch @@ -1,15 +1,15 @@ -From a89f8ef7ddb7506636b535daaf4fb4cfc2f7f6af Mon Sep 17 00:00:00 2001 +From 4fcea48c7a0c6b63a316764932f7ba4854e444f9 Mon Sep 17 00:00:00 2001 From: Natanael Copa <ncopa@alpinelinux.org> Date: Wed, 30 May 2018 09:52:20 +0000 Subject: [PATCH] properly fix wget https support See: https://git.alpinelinux.org/cgit/aports/commit/?id=1d0560a9b6b5597b191e5aff69a31c2fe0aba273 --- - networking/wget.c | 19 ++++++++++++------- - 1 file changed, 12 insertions(+), 7 deletions(-) + networking/wget.c | 21 ++++++++++++--------- + 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/networking/wget.c b/networking/wget.c -index 33c93bad3..e296d241a 100644 +index 30683dfc0..1ad4e1769 100644 --- a/networking/wget.c +++ b/networking/wget.c @@ -51,7 +51,6 @@ @@ -20,18 +20,20 @@ index 33c93bad3..e296d241a 100644 //config: help //config: wget will use internal TLS code to connect to https:// URLs. //config: Note: -@@ -716,8 +715,8 @@ static void spawn_ssl_client(const char *host, int network_fd, int flags) +@@ -717,10 +716,8 @@ static void spawn_ssl_client(const char *host, int network_fd, int flags) int pid; char *servername, *p; -- if (!(option_mask32 & WGET_OPT_NO_CHECK_CERT)) +- if (!(option_mask32 & WGET_OPT_NO_CHECK_CERT)) { +- option_mask32 |= WGET_OPT_NO_CHECK_CERT; - bb_error_msg("note: TLS certificate validation not implemented"); +- } + if (ENABLE_SSL_CLIENT && !(option_mask32 & WGET_OPT_NO_CHECK_CERT)) + bb_error_msg_and_die("note: TLS certificate validation not implemented"); servername = xstrdup(host); p = strrchr(servername, ':'); -@@ -734,14 +733,14 @@ static void spawn_ssl_client(const char *host, int network_fd, int flags) +@@ -737,14 +734,14 @@ static void spawn_ssl_client(const char *host, int network_fd, int flags) close(sp[0]); xmove_fd(sp[1], 0); xdup2(0, 1); @@ -48,7 +50,7 @@ index 33c93bad3..e296d241a 100644 xmove_fd(network_fd, 3); argv[0] = (char*)"ssl_client"; -@@ -749,8 +748,14 @@ static void spawn_ssl_client(const char *host, int network_fd, int flags) +@@ -752,8 +749,14 @@ static void spawn_ssl_client(const char *host, int network_fd, int flags) //TODO: if (!is_ip_address(servername))... argv[2] = (char*)"-n"; argv[3] = servername; |