diff options
| author | Vlad Glagolev | 2018-05-12 11:33:02 -0400 |
|---|---|---|
| committer | Vlad Glagolev | 2018-05-12 11:33:12 -0400 |
| commit | 0626f9cb80a58cf858739fbeef40abb9e654f658 (patch) | |
| tree | 7b4e360c345b01087935bd3be50ce36f68e8b759 | |
| parent | 3bf37911284c5d53ac4c590c33b49a3109007235 (diff) | |
wget: fixed build with c-ares
(cherry picked from commit bbd82ec66dfd4c396581443c546d718364314e0e)
| -rw-r--r-- | ftp/wget/HISTORY | 2 | ||||
| -rwxr-xr-x | ftp/wget/PRE_BUILD | 4 | ||||
| -rw-r--r-- | ftp/wget/cares.patch | 23 |
3 files changed, 29 insertions, 0 deletions
diff --git a/ftp/wget/HISTORY b/ftp/wget/HISTORY index a2a4b0817e..433c197839 100644 --- a/ftp/wget/HISTORY +++ b/ftp/wget/HISTORY @@ -1,5 +1,7 @@ 2018-05-12 Vlad Glagolev <stealth@sourcemage.org> * DEPENDS: added c-ares optional dependency + * PRE_BUILD: added, to apply patch + * cares.patch: added, upstream patch to fix build with c-ares 2018-05-07 Pavel Vinogradov <public@sourcemage.org> * DETAILS: version 1.19.5, SECURITY_PATCH++, (CVE-2018-0494) diff --git a/ftp/wget/PRE_BUILD b/ftp/wget/PRE_BUILD new file mode 100755 index 0000000000..9a34989605 --- /dev/null +++ b/ftp/wget/PRE_BUILD @@ -0,0 +1,4 @@ +default_pre_build && +cd "${SOURCE_DIRECTORY}" && + +patch -p1 < "${SPELL_DIRECTORY}/cares.patch" diff --git a/ftp/wget/cares.patch b/ftp/wget/cares.patch new file mode 100644 index 0000000000..6f62b707a5 --- /dev/null +++ b/ftp/wget/cares.patch @@ -0,0 +1,23 @@ +From 7eff94e881b94d119ba22fc0c29edd65f4e6798b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de> +Date: Tue, 8 May 2018 09:36:45 +0200 +Subject: [PATCH] * src/host.c (wait_ares): Remove void assignment + +Reported-by: Josef Moellers +--- + src/host.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/host.c b/src/host.c +index 4597f46aa..b42cd6e8d 100644 +--- a/src/host.c ++++ b/src/host.c +@@ -732,7 +732,7 @@ wait_ares (ares_channel channel) + ares_process (channel, &read_fds, &write_fds); + } + if (timer) +- timer = ptimer_destroy (timer); ++ ptimer_destroy (timer); + } + + static void |