diff options
author | Andre McCurdy <armccurdy@gmail.com> | 2018-05-18 17:42:34 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-06-15 17:56:57 +0100 |
commit | 664b1d5379425d69efa3b0ed05e8278855b442b5 (patch) | |
tree | 77a0b6197698e90d1fb66428c6c8756816e2d8b2 /meta/recipes-support/curl/curl | |
parent | 3fc84130ca27d143171bb1939c70b6305f5eb2e2 (diff) | |
download | poky-664b1d5379425d69efa3b0ed05e8278855b442b5.tar.gz |
curl: update 7.59.0 -> 7.60.0
includes:
CVE-2018-1000300 CWE-122: Heap-based Buffer Overflow
CVE-2018-1000301 CWE-126: Buffer Over-read
https://curl.haxx.se/changes.html#7_60_0
Also refresh 0001-replace-krb5-config-with-pkg-config.patch and drop
configure_ac.patch, which we've apparently been dragging along
unnecessarily for the past 5 years:
https://github.com/curl/curl/commit/c277bd6ce7069819484eb3dc30b5858735fde377
(From OE-Core rev: 4063c1e4b233b28ae14420a83960fd93b437a4a4)
(From OE-Core rev: 4decc8ca3bd1b6c1c67182782fe6019dc0efc4fa)
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/curl/curl')
-rw-r--r-- | meta/recipes-support/curl/curl/0001-replace-krb5-config-with-pkg-config.patch | 17 | ||||
-rw-r--r-- | meta/recipes-support/curl/curl/configure_ac.patch | 13 |
2 files changed, 9 insertions, 21 deletions
diff --git a/meta/recipes-support/curl/curl/0001-replace-krb5-config-with-pkg-config.patch b/meta/recipes-support/curl/curl/0001-replace-krb5-config-with-pkg-config.patch index 74e5d99cf2..a7db1b3c9e 100644 --- a/meta/recipes-support/curl/curl/0001-replace-krb5-config-with-pkg-config.patch +++ b/meta/recipes-support/curl/curl/0001-replace-krb5-config-with-pkg-config.patch | |||
@@ -1,17 +1,21 @@ | |||
1 | [PATCH] replace krb5-config with pkg-config | 1 | From ed70f0623708b8a6c1f58a5d243d87c5ff45b24d Mon Sep 17 00:00:00 2001 |
2 | From: Roy Li <rongqing.li@windriver.com> | ||
3 | Date: Tue, 26 Apr 2016 13:13:01 +0800 | ||
4 | Subject: [PATCH] replace krb5-config with pkg-config | ||
2 | 5 | ||
3 | Upstream-Status: Pending | 6 | Upstream-Status: Pending |
4 | 7 | ||
5 | Signed-off-by: Roy Li <rongqing.li@windriver.com> | 8 | Signed-off-by: Roy Li <rongqing.li@windriver.com> |
9 | |||
6 | --- | 10 | --- |
7 | configure.ac | 6 +++--- | 11 | configure.ac | 6 +++--- |
8 | 1 file changed, 3 insertions(+), 3 deletions(-) | 12 | 1 file changed, 3 insertions(+), 3 deletions(-) |
9 | 13 | ||
10 | diff --git a/configure.ac b/configure.ac | 14 | diff --git a/configure.ac b/configure.ac |
11 | index e99b303..dc93f39 100644 | 15 | index 5569a26..56b0380 100755 |
12 | --- a/configure.ac | 16 | --- a/configure.ac |
13 | +++ b/configure.ac | 17 | +++ b/configure.ac |
14 | @@ -1196,7 +1196,7 @@ AC_ARG_WITH(gssapi, | 18 | @@ -1290,7 +1290,7 @@ AC_ARG_WITH(gssapi, |
15 | fi | 19 | fi |
16 | ]) | 20 | ]) |
17 | 21 | ||
@@ -20,7 +24,7 @@ index e99b303..dc93f39 100644 | |||
20 | 24 | ||
21 | save_CPPFLAGS="$CPPFLAGS" | 25 | save_CPPFLAGS="$CPPFLAGS" |
22 | AC_MSG_CHECKING([if GSS-API support is requested]) | 26 | AC_MSG_CHECKING([if GSS-API support is requested]) |
23 | @@ -1207,7 +1207,7 @@ if test x"$want_gss" = xyes; then | 27 | @@ -1301,7 +1301,7 @@ if test x"$want_gss" = xyes; then |
24 | if test -n "$host_alias" -a -f "$GSSAPI_ROOT/bin/$host_alias-krb5-config"; then | 28 | if test -n "$host_alias" -a -f "$GSSAPI_ROOT/bin/$host_alias-krb5-config"; then |
25 | GSSAPI_INCS=`$GSSAPI_ROOT/bin/$host_alias-krb5-config --cflags gssapi` | 29 | GSSAPI_INCS=`$GSSAPI_ROOT/bin/$host_alias-krb5-config --cflags gssapi` |
26 | elif test -f "$KRB5CONFIG"; then | 30 | elif test -f "$KRB5CONFIG"; then |
@@ -29,7 +33,7 @@ index e99b303..dc93f39 100644 | |||
29 | elif test "$GSSAPI_ROOT" != "yes"; then | 33 | elif test "$GSSAPI_ROOT" != "yes"; then |
30 | GSSAPI_INCS="-I$GSSAPI_ROOT/include" | 34 | GSSAPI_INCS="-I$GSSAPI_ROOT/include" |
31 | fi | 35 | fi |
32 | @@ -1300,7 +1300,7 @@ if test x"$want_gss" = xyes; then | 36 | @@ -1394,7 +1394,7 @@ if test x"$want_gss" = xyes; then |
33 | elif test -f "$KRB5CONFIG"; then | 37 | elif test -f "$KRB5CONFIG"; then |
34 | dnl krb5-config doesn't have --libs-only-L or similar, put everything | 38 | dnl krb5-config doesn't have --libs-only-L or similar, put everything |
35 | dnl into LIBS | 39 | dnl into LIBS |
@@ -38,6 +42,3 @@ index e99b303..dc93f39 100644 | |||
38 | LIBS="$gss_libs $LIBS" | 42 | LIBS="$gss_libs $LIBS" |
39 | else | 43 | else |
40 | case $host in | 44 | case $host in |
41 | -- | ||
42 | 1.9.1 | ||
43 | |||
diff --git a/meta/recipes-support/curl/curl/configure_ac.patch b/meta/recipes-support/curl/curl/configure_ac.patch deleted file mode 100644 index b8bd304d71..0000000000 --- a/meta/recipes-support/curl/curl/configure_ac.patch +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | --- a/configure.ac | ||
4 | +++ b/configure.ac | ||
5 | @@ -281,7 +281,7 @@ dnl ************************************ | ||
6 | |||
7 | CURL_CHECK_COMPILER | ||
8 | CURL_SET_COMPILER_BASIC_OPTS | ||
9 | -CURL_SET_COMPILER_DEBUG_OPTS | ||
10 | +dnl CURL_SET_COMPILER_DEBUG_OPTS | ||
11 | CURL_SET_COMPILER_OPTIMIZE_OPTS | ||
12 | CURL_SET_COMPILER_WARNING_OPTS | ||
13 | |||