summaryrefslogtreecommitdiffstats
path: root/package/libcurl/libcurl-01-disable-manual.patch
diff options
context:
space:
mode:
authorGustavo Zacarias <gustavo@zacarias.com.ar>2014-03-31 19:34:58 -0300
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2014-04-01 14:45:20 +0200
commit71878d297253b6ef6b8309b1c8a841833edc446e (patch)
treee7bdfe4892ef5f914ebd67d01ff853b30f0514b7 /package/libcurl/libcurl-01-disable-manual.patch
parent094715d83a795ec5a5d29d4062612a9ec1d8269a (diff)
downloadbuildroot-71878d297253b6ef6b8309b1c8a841833edc446e.tar.gz
buildroot-71878d297253b6ef6b8309b1c8a841833edc446e.zip
libcurl: security bump to version 7.36.0
Fixes CVE-2014-0005, CVE-2014-0319, CVE-2014-1263 and CVE-2014-2522. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/libcurl/libcurl-01-disable-manual.patch')
-rw-r--r--package/libcurl/libcurl-01-disable-manual.patch31
1 files changed, 31 insertions, 0 deletions
diff --git a/package/libcurl/libcurl-01-disable-manual.patch b/package/libcurl/libcurl-01-disable-manual.patch
new file mode 100644
index 0000000000..48721693a4
--- /dev/null
+++ b/package/libcurl/libcurl-01-disable-manual.patch
@@ -0,0 +1,31 @@
+Apply fix from 38d582ff541353d738858299d4a2b78bafac03ed to unbreak
+building with --disable-manual.
+We don't use the literal patch since that means re-generating files
+from the tarball that are usually shipped.
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+diff -Nura curl-7.36.0.orig/src/tool_hugehelp.c curl-7.36.0/src/tool_hugehelp.c
+--- curl-7.36.0.orig/src/tool_hugehelp.c 2014-03-31 19:28:23.018515093 -0300
++++ curl-7.36.0/src/tool_hugehelp.c 2014-03-31 19:28:09.994076200 -0300
+@@ -4165,6 +4165,10 @@
+ " these mailing lists instead of mailing any individual.\n"
+ , stdout) ;
+ }
++#else /* !USE_MANUAL */
++/* built-in manual is disabled, blank function */
++#include "tool_hugehelp.h"
++void hugehelp(void) {}
+ #endif /* USE_MANUAL */
+ #else
+ /*
+@@ -8192,5 +8196,9 @@
+ }
+ inflateEnd(&z);
+ }
++#else
++/* built-in manual is disabled, blank function */
++#include "tool_hugehelp.h"
++void hugehelp(void) {}
+ #endif /* USE_MANUAL */
+ #endif /* HAVE_LIBZ */
OpenPOWER on IntegriCloud