mirror of
https://github.com/motioneye-project/motioneyeos.git
synced 2025-08-05 17:37:43 +00:00
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>
This commit is contained in:
parent
094715d83a
commit
71878d2972
31
package/libcurl/libcurl-01-disable-manual.patch
Normal file
31
package/libcurl/libcurl-01-disable-manual.patch
Normal file
@ -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 */
|
@ -4,7 +4,7 @@
|
|||||||
#
|
#
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
LIBCURL_VERSION = 7.35.0
|
LIBCURL_VERSION = 7.36.0
|
||||||
LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.bz2
|
LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.bz2
|
||||||
LIBCURL_SITE = http://curl.haxx.se/download
|
LIBCURL_SITE = http://curl.haxx.se/download
|
||||||
LIBCURL_DEPENDENCIES = host-pkgconf \
|
LIBCURL_DEPENDENCIES = host-pkgconf \
|
||||||
|
Loading…
x
Reference in New Issue
Block a user