<div dir="ltr">Be aware that this upgrade might change your libcurl5 to libcurl4<div><br></div><div>With Yocto 1.7 Dizzy we used to have libcurl5, because of different SIZEOF_OFF_T value.</div><div><br></div><div>Then in Yocto 1.8 Fido SIZEOF_OFF_T was changed in oe-core and curl started to use libcurl4 again automatically.<br><div><br></div><div>Back then I&#39;ve added simple workaround in our bbappend to keep libcurl5 (until we can rebuild all prebuilt binaries from 3rd party vendors):</div><div><br></div><div><div># Force to use libcurl5 instead of libcurl4 (like we had with Yocto 1.7 Dizzy)</div><div># The SONAME isn&#39;t bumped automatically since oe-core commit 49c848018484827c433e1bcf9c63416640456f3e</div><div># which changed SIZEOF_OFF_T to 8</div><div>EXTRA_OECONF += &quot;--enable-soname-bump&quot;</div></div><div><br></div><div>and it was working fine until this upgrade to 7.57.0. I haven&#39;t checked yet why enable-soname-bump stopped working (it&#39;s still recognized by configure script).</div><div><br></div></div><div class="gmail_extra"><br><div class="gmail_quote">On Fri, Jan 26, 2018 at 2:10 PM,  <span dir="ltr">&lt;<a href="mailto:git@git.openembedded.org" target="_blank">git@git.openembedded.org</a>&gt;</span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">This is an automated email from the git hooks/post-receive script.<br>
<br>
rpurdie pushed a commit to branch master<br>
in repository openembedded-core.<br>
<br>
commit 215d5677004537fc190b5381157ac8<wbr>b94db6d7e8<br>
Author: Huang Qiyu &lt;<a href="mailto:huangqy.fnst@cn.fujitsu.com">huangqy.fnst@cn.fujitsu.com</a>&gt;<br>
AuthorDate: Wed Jan 24 11:01:36 2018 +0800<br>
<br>
    curl: 7.54.1 -&gt; 7.57.0<br>
<br>
    1.Upgrade curl from 7.54.1 to 7.57.0.<br>
    2.Delete CVE-2017-1000099.patch, CVE-2017-1000100.patch, CVE-2017-1000101.patch, CVE-2017-1000254.patch, reproducible-mkhelp.patch, since it is integrated upstream.<br>
    3.Remove &quot;do_install_append()&quot; from <a href="http://curl_7.57.0.bb" rel="noreferrer" target="_blank">curl_7.57.0.bb</a>, since curl/curlbuild.h has been removed.<br>
<br>
    Signed-off-by: Huang Qiyu &lt;<a href="mailto:huangqy.fnst@cn.fujitsu.com">huangqy.fnst@cn.fujitsu.com</a>&gt;<br>
    Signed-off-by: Ross Burton &lt;<a href="mailto:ross.burton@intel.com">ross.burton@intel.com</a>&gt;<br>
---<br>
 .../curl/curl/CVE-2017-<wbr>1000099.patch               |  41 ------<br>
 .../curl/curl/CVE-2017-<wbr>1000100.patch               |  51 --------<br>
 .../curl/curl/CVE-2017-<wbr>1000101.patch               |  99 ---------------<br>
 .../curl/curl/CVE-2017-<wbr>1000254.patch               | 138 ---------------------<br>
 .../curl/curl/reproducible-<wbr>mkhelp.patch            |  32 -----<br>
 .../curl/{<a href="http://curl_7.54.1.bb" rel="noreferrer" target="_blank">curl_7.54.1.bb</a> =&gt; <a href="http://curl_7.57.0.bb" rel="noreferrer" target="_blank">curl_7.57.0.bb</a>}        |  14 +--<br>
 6 files changed, 2 insertions(+), 373 deletions(-)<br>
<br>
diff --git a/meta/recipes-support/curl/<wbr>curl/CVE-2017-1000099.patch b/meta/recipes-support/curl/<wbr>curl/CVE-2017-1000099.patch<br>
deleted file mode 100644<br>
index 96ff1b0..0000000<br>
--- a/meta/recipes-support/curl/<wbr>curl/CVE-2017-1000099.patch<br>
+++ /dev/null<br>
@@ -1,41 +0,0 @@<br>
-From c9332fa5e84f24da300b42b1a931ad<wbr>e929d3e27d Mon Sep 17 00:00:00 2001<br>
-From: Even Rouault &lt;<a href="mailto:even.rouault@spatialys.com">even.rouault@spatialys.com</a>&gt;<br>
-Date: Tue, 1 Aug 2017 17:17:06 +0200<br>
-Subject: [PATCH] file: output the correct buffer to the user<br>
-<br>
-Regression brought by 7c312f84ea930d8 (April 2017)<br>
-<br>
-CVE: CVE-2017-1000099<br>
-<br>
-Bug: <a href="https://curl.haxx.se/docs/adv_20170809C.html" rel="noreferrer" target="_blank">https://curl.haxx.se/docs/adv_<wbr>20170809C.html</a><br>
-<br>
-Credit to OSS-Fuzz for the discovery<br>
-<br>
-Upstream-Status: Backport<br>
-<a href="https://github.com/curl/curl/commit/c9332fa5e84f24da300b42b1a931ade929d3e27d" rel="noreferrer" target="_blank">https://github.com/curl/curl/<wbr>commit/<wbr>c9332fa5e84f24da300b42b1a931ad<wbr>e929d3e27d</a><br>
-<br>
-Signed-off-by: Wenzong Fan &lt;<a href="mailto:wenzong.fan@windriver.com">wenzong.fan@windriver.com</a>&gt;<br>
----<br>
- lib/file.c | 2 +-<br>
- 1 file changed, 1 insertion(+), 1 deletion(-)<br>
-<br>
-diff --git a/lib/file.c b/lib/file.c<br>
-index bd426eac2..666cbe75b 100644<br>
---- a/lib/file.c<br>
-+++ b/lib/file.c<br>
-@@ -499,11 +499,11 @@ static CURLcode file_do(struct connectdata *conn, bool *done)<br>
-              Curl_month[tm-&gt;tm_mon],<br>
-              tm-&gt;tm_year + 1900,<br>
-              tm-&gt;tm_hour,<br>
-              tm-&gt;tm_min,<br>
-              tm-&gt;tm_sec);<br>
--    result = Curl_client_write(conn, CLIENTWRITE_BOTH, buf, 0);<br>
-+    result = Curl_client_write(conn, CLIENTWRITE_BOTH, header, 0);<br>
-     if(!result)<br>
-       /* set the file size to make it available post transfer */<br>
-       Curl_pgrsSetDownloadSize(data, expected_size);<br>
-     return result;<br>
-   }<br>
---<br>
-2.13.3<br>
-<br>
diff --git a/meta/recipes-support/curl/<wbr>curl/CVE-2017-1000100.patch b/meta/recipes-support/curl/<wbr>curl/CVE-2017-1000100.patch<br>
deleted file mode 100644<br>
index f74f1dd..0000000<br>
--- a/meta/recipes-support/curl/<wbr>curl/CVE-2017-1000100.patch<br>
+++ /dev/null<br>
@@ -1,51 +0,0 @@<br>
-From 358b2b131ad6c095696f20dcfa62b8<wbr>305263f898 Mon Sep 17 00:00:00 2001<br>
-From: Daniel Stenberg &lt;<a href="mailto:daniel@haxx.se">daniel@haxx.se</a>&gt;<br>
-Date: Tue, 1 Aug 2017 17:16:46 +0200<br>
-Subject: [PATCH] tftp: reject file name lengths that don&#39;t fit<br>
-<br>
-... and thereby avoid telling send() to send off more bytes than the<br>
-size of the buffer!<br>
-<br>
-CVE: CVE-2017-1000100<br>
-<br>
-Bug: <a href="https://curl.haxx.se/docs/adv_20170809B.html" rel="noreferrer" target="_blank">https://curl.haxx.se/docs/adv_<wbr>20170809B.html</a><br>
-Reported-by: Even Rouault<br>
-<br>
-Credit to OSS-Fuzz for the discovery<br>
-<br>
-Upstream-Status: Backport<br>
-<a href="https://github.com/curl/curl/commit/358b2b131ad6c095696f20dcfa62b8305263f898" rel="noreferrer" target="_blank">https://github.com/curl/curl/<wbr>commit/<wbr>358b2b131ad6c095696f20dcfa62b8<wbr>305263f898</a><br>
-<br>
-Signed-off-by: Wenzong Fan &lt;<a href="mailto:wenzong.fan@windriver.com">wenzong.fan@windriver.com</a>&gt;<br>
----<br>
- lib/tftp.c |    7 ++++++-<br>
- 1 file changed, 6 insertions(+), 1 deletion(-)<br>
-<br>
-diff --git a/lib/tftp.c b/lib/tftp.c<br>
-index 02bd842..f6f4bce 100644<br>
---- a/lib/tftp.c<br>
-+++ b/lib/tftp.c<br>
-@@ -5,7 +5,7 @@<br>
-  *                            | (__| |_| |  _ &lt;| |___<br>
-  *                             \___|\___/|_| \_\_____|<br>
-  *<br>
-- * Copyright (C) 1998 - 2016, Daniel Stenberg, &lt;<a href="mailto:daniel@haxx.se">daniel@haxx.se</a>&gt;, et al.<br>
-+ * Copyright (C) 1998 - 2017, Daniel Stenberg, &lt;<a href="mailto:daniel@haxx.se">daniel@haxx.se</a>&gt;, et al.<br>
-  *<br>
-  * This software is licensed as described in the file COPYING, which<br>
-  * you should have received as part of this distribution. The terms<br>
-@@ -491,6 +491,11 @@ static CURLcode tftp_send_first(tftp_state_<wbr>data_t *state, tftp_event_t event)<br>
-     if(result)<br>
-       return result;<br>
-<br>
-+    if(strlen(filename) &gt; (state-&gt;blksize - strlen(mode) - 4)) {<br>
-+      failf(data, &quot;TFTP file name too long\n&quot;);<br>
-+      return CURLE_TFTP_ILLEGAL; /* too long file name field */<br>
-+    }<br>
-+<br>
-     snprintf((char *)state-&gt;spacket.data+2,<br>
-              state-&gt;blksize,<br>
-              &quot;%s%c%s%c&quot;, filename, &#39;\0&#39;,  mode, &#39;\0&#39;);<br>
---<br>
-1.7.9.5<br>
-<br>
diff --git a/meta/recipes-support/curl/<wbr>curl/CVE-2017-1000101.patch b/meta/recipes-support/curl/<wbr>curl/CVE-2017-1000101.patch<br>
deleted file mode 100644<br>
index c300fff..0000000<br>
--- a/meta/recipes-support/curl/<wbr>curl/CVE-2017-1000101.patch<br>
+++ /dev/null<br>
@@ -1,99 +0,0 @@<br>
-From 453e7a7a03a2cec749abd3878a48e7<wbr>28c515cca7 Mon Sep 17 00:00:00 2001<br>
-From: Daniel Stenberg &lt;<a href="mailto:daniel@haxx.se">daniel@haxx.se</a>&gt;<br>
-Date: Tue, 1 Aug 2017 17:16:07 +0200<br>
-Subject: [PATCH] glob: do not continue parsing after a strtoul() overflow<br>
- range<br>
-<br>
-Added test 1289 to verify.<br>
-<br>
-CVE: CVE-2017-1000101<br>
-<br>
-Bug: <a href="https://curl.haxx.se/docs/adv_20170809A.html" rel="noreferrer" target="_blank">https://curl.haxx.se/docs/adv_<wbr>20170809A.html</a><br>
-Reported-by: Brian Carpenter<br>
-<br>
-Upstream-Status: Backport<br>
-<a href="https://github.com/curl/curl/commit/453e7a7a03a2cec749abd3878a48e728c515cca7" rel="noreferrer" target="_blank">https://github.com/curl/curl/<wbr>commit/<wbr>453e7a7a03a2cec749abd3878a48e7<wbr>28c515cca7</a><br>
-<br>
-Rebase the tests/data/Makefile.inc changes for curl 7.54.1.<br>
-<br>
-Signed-off-by: Wenzong Fan &lt;<a href="mailto:wenzong.fan@windriver.com">wenzong.fan@windriver.com</a>&gt;<br>
----<br>
- src/tool_urlglob.c      |  5 ++++-<br>
- tests/data/Makefile.inc |  2 +-<br>
- tests/data/test1289     | 35 ++++++++++++++++++++++++++++++<wbr>+++++<br>
- 3 files changed, 40 insertions(+), 2 deletions(-)<br>
- create mode 100644 tests/data/test1289<br>
-<br>
-diff --git a/src/tool_urlglob.c b/src/tool_urlglob.c<br>
-index 6b1ece0..d56dcd9 100644<br>
---- a/src/tool_urlglob.c<br>
-+++ b/src/tool_urlglob.c<br>
-@@ -273,7 +273,10 @@ static CURLcode glob_range(URLGlob *glob, char **patternp,<br>
-         }<br>
-         errno = 0;<br>
-         max_n = strtoul(pattern, &amp;endp, 10);<br>
--        if(errno || (*endp == &#39;:&#39;)) {<br>
-+        if(errno)<br>
-+          /* overflow */<br>
-+          endp = NULL;<br>
-+        else if(*endp == &#39;:&#39;) {<br>
-           pattern = endp+1;<br>
-           errno = 0;<br>
-           step_n = strtoul(pattern, &amp;endp, 10);<br>
-diff --git a/tests/data/Makefile.inc b/tests/data/Makefile.inc<br>
-index 155320a..7adbee6 100644<br>
---- a/tests/data/Makefile.inc<br>
-+++ b/tests/data/Makefile.inc<br>
-@@ -132,7 +132,7 @@ test1252 test1253 test1254 test1255 test1256 test1257 test1258 test1259 \<br>
- test1260 test1261 test1262 \<br>
- \<br>
- test1280 test1281 test1282 test1283 test1284 test1285 test1286 test1287 \<br>
--test1288 \<br>
-+test1288 test1289 \<br>
- \<br>
- test1300 test1301 test1302 test1303 test1304 test1305 test1306 test1307 \<br>
- test1308 test1309 test1310 test1311 test1312 test1313 test1314 test1315 \<br>
-diff --git a/tests/data/test1289 b/tests/data/test1289<br>
-new file mode 100644<br>
-index 0000000..d679cc0<br>
---- /dev/null<br>
-+++ b/tests/data/test1289<br>
-@@ -0,0 +1,35 @@<br>
-+&lt;testcase&gt;<br>
-+&lt;info&gt;<br>
-+&lt;keywords&gt;<br>
-+HTTP<br>
-+HTTP GET<br>
-+globbing<br>
-+&lt;/keywords&gt;<br>
-+&lt;/info&gt;<br>
-+<br>
-+#<br>
-+# Server-side<br>
-+&lt;reply&gt;<br>
-+&lt;/reply&gt;<br>
-+<br>
-+# Client-side<br>
-+&lt;client&gt;<br>
-+&lt;server&gt;<br>
-+http<br>
-+&lt;/server&gt;<br>
-+&lt;name&gt;<br>
-+globbing with overflow and bad syntxx<br>
-+&lt;/name&gt;<br>
-+&lt;command&gt;<br>
-+<a href="http://ur" rel="noreferrer" target="_blank">http://ur</a>%20[0-<wbr>60000000000000000000<br>
-+&lt;/command&gt;<br>
-+&lt;/client&gt;<br>
-+<br>
-+# Verify data after the test has been &quot;shot&quot;<br>
-+&lt;verify&gt;<br>
-+# curl: (3) [globbing] bad range in column<br>
-+&lt;errorcode&gt;<br>
-+3<br>
-+&lt;/errorcode&gt;<br>
-+&lt;/verify&gt;<br>
-+&lt;/testcase&gt;<br>
---<br>
-2.11.0<br>
-<br>
diff --git a/meta/recipes-support/curl/<wbr>curl/CVE-2017-1000254.patch b/meta/recipes-support/curl/<wbr>curl/CVE-2017-1000254.patch<br>
deleted file mode 100644<br>
index 2b0798b..0000000<br>
--- a/meta/recipes-support/curl/<wbr>curl/CVE-2017-1000254.patch<br>
+++ /dev/null<br>
@@ -1,138 +0,0 @@<br>
-From 1b2eba6f9745c064f7283e0ada8f46<wbr>df9d9d6e42 Mon Sep 17 00:00:00 2001<br>
-From: Li Zhou &lt;<a href="mailto:li.zhou@windriver.com">li.zhou@windriver.com</a>&gt;<br>
-Date: Mon, 23 Oct 2017 00:26:50 -0700<br>
-Subject: [PATCH] FTP: zero terminate the entry path even on bad input<br>
-<br>
-... a single double quote could leave the entry path buffer without a zero<br>
-terminating byte. CVE-2017-1000254<br>
-<br>
-Test 1152 added to verify.<br>
-<br>
-Reported-by: Max Dymond<br>
-Bug: <a href="https://curl.haxx.se/docs/adv_20171004.html" rel="noreferrer" target="_blank">https://curl.haxx.se/docs/adv_<wbr>20171004.html</a><br>
-<br>
-Upstream-Status: Backport<br>
-CVE: CVE-2017-1000254<br>
-Signed-off-by: Li Zhou &lt;<a href="mailto:li.zhou@windriver.com">li.zhou@windriver.com</a>&gt;<br>
----<br>
- lib/ftp.c               |  7 ++++--<br>
- tests/data/Makefile.inc |  2 ++<br>
- tests/data/test1152     | 61 ++++++++++++++++++++++++++++++<wbr>+++++++++++++++++++<br>
- 3 files changed, 68 insertions(+), 2 deletions(-)<br>
- create mode 100644 tests/data/test1152<br>
-<br>
-diff --git a/lib/ftp.c b/lib/ftp.c<br>
-index 5edec37..493dbf9 100644<br>
---- a/lib/ftp.c<br>
-+++ b/lib/ftp.c<br>
-@@ -2826,6 +2826,7 @@ static CURLcode ftp_statemach_act(struct connectdata *conn)<br>
-         const size_t buf_size = data-&gt;set.buffer_size;<br>
-         char *dir;<br>
-         char *store;<br>
-+        bool entry_extracted = FALSE;<br>
-<br>
-         dir = malloc(nread + 1);<br>
-         if(!dir)<br>
-@@ -2857,7 +2858,7 @@ static CURLcode ftp_statemach_act(struct connectdata *conn)<br>
-               }<br>
-               else {<br>
-                 /* end of path */<br>
--                *store = &#39;\0&#39;; /* zero terminate */<br>
-+                entry_extracted = TRUE;<br>
-                 break; /* get out of this loop */<br>
-               }<br>
-             }<br>
-@@ -2866,7 +2867,9 @@ static CURLcode ftp_statemach_act(struct connectdata *conn)<br>
-             store++;<br>
-             ptr++;<br>
-           }<br>
--<br>
-+          *store = &#39;\0&#39;; /* zero terminate */<br>
-+        }<br>
-+        if(entry_extracted) {<br>
-           /* If the path name does not look like an absolute path (i.e.: it<br>
-              does not start with a &#39;/&#39;), we probably need some server-dependent<br>
-              adjustments. For example, this is the case when connecting to<br>
-diff --git a/tests/data/Makefile.inc b/tests/data/Makefile.inc<br>
-index 7adbee6..5284654 100644<br>
---- a/tests/data/Makefile.inc<br>
-+++ b/tests/data/Makefile.inc<br>
-@@ -121,6 +121,8 @@ test1120 test1121 test1122 test1123 test1124 test1125 test1126 test1127 \<br>
- test1128 test1129 test1130 test1131 test1132 test1133 test1134 test1135 \<br>
- test1136 test1137 test1138 test1139 test1140 test1141 test1142 test1143 \<br>
- test1144 test1145 test1146 \<br>
-+test1152 \<br>
-+\<br>
- test1200 test1201 test1202 test1203 test1204 test1205 test1206 test1207 \<br>
- test1208 test1209 test1210 test1211 test1212 test1213 test1214 test1215 \<br>
- test1216 test1217 test1218 test1219 \<br>
-diff --git a/tests/data/test1152 b/tests/data/test1152<br>
-new file mode 100644<br>
-index 0000000..aa8c0a7<br>
---- /dev/null<br>
-+++ b/tests/data/test1152<br>
-@@ -0,0 +1,61 @@<br>
-+&lt;testcase&gt;<br>
-+&lt;info&gt;<br>
-+&lt;keywords&gt;<br>
-+FTP<br>
-+PASV<br>
-+LIST<br>
-+&lt;/keywords&gt;<br>
-+&lt;/info&gt;<br>
-+#<br>
-+# Server-side<br>
-+&lt;reply&gt;<br>
-+&lt;servercmd&gt;<br>
-+REPLY PWD 257 &quot;just one<br>
-+&lt;/servercmd&gt;<br>
-+<br>
-+# When doing LIST, we get the default list output hard-coded in the test<br>
-+# FTP server<br>
-+&lt;data mode=&quot;text&quot;&gt;<br>
-+total 20<br>
-+drwxr-xr-x   8 98       98           512 Oct 22 13:06 .<br>
-+drwxr-xr-x   8 98       98           512 Oct 22 13:06 ..<br>
-+drwxr-xr-x   2 98       98           512 May  2  1996 curl-releases<br>
-+-r--r--r--   1 0        1             35 Jul 16  1996 README<br>
-+lrwxrwxrwx   1 0        1              7 Dec  9  1999 bin -&gt; usr/bin<br>
-+dr-xr-xr-x   2 0        1            512 Oct  1  1997 dev<br>
-+drwxrwxrwx   2 98       98           512 May 29 16:04 download.html<br>
-+dr-xr-xr-x   2 0        1            512 Nov 30  1995 etc<br>
-+drwxrwxrwx   2 98       1            512 Oct 30 14:33 pub<br>
-+dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr<br>
-+&lt;/data&gt;<br>
-+&lt;/reply&gt;<br>
-+<br>
-+#<br>
-+# Client-side<br>
-+&lt;client&gt;<br>
-+&lt;server&gt;<br>
-+ftp<br>
-+&lt;/server&gt;<br>
-+ &lt;name&gt;<br>
-+FTP with uneven quote in PWD response<br>
-+ &lt;/name&gt;<br>
-+ &lt;command&gt;<br>
-+ftp://%HOSTIP:%FTPPORT/test-<wbr>1152/<br>
-+&lt;/command&gt;<br>
-+&lt;/client&gt;<br>
-+<br>
-+#<br>
-+# Verify data after the test has been &quot;shot&quot;<br>
-+&lt;verify&gt;<br>
-+&lt;protocol&gt;<br>
-+USER anonymous<br>
-+PASS <a href="mailto:ftp@example.com">ftp@example.com</a><br>
-+PWD<br>
-+CWD test-1152<br>
-+EPSV<br>
-+TYPE A<br>
-+LIST<br>
-+QUIT<br>
-+&lt;/protocol&gt;<br>
-+&lt;/verify&gt;<br>
-+&lt;/testcase&gt;<br>
---<br>
-2.11.0<br>
-<br>
diff --git a/meta/recipes-support/curl/<wbr>curl/reproducible-mkhelp.patch b/meta/recipes-support/curl/<wbr>curl/reproducible-mkhelp.patch<br>
deleted file mode 100644<br>
index 268bbeb..0000000<br>
--- a/meta/recipes-support/curl/<wbr>curl/reproducible-mkhelp.patch<br>
+++ /dev/null<br>
@@ -1,32 +0,0 @@<br>
-From 1fe92fd3dd64c7228f6ff41e3fc16c<wbr>4f2392471a Mon Sep 17 00:00:00 2001<br>
-From: Juro Bystricky &lt;<a href="mailto:juro.bystricky@intel.com">juro.bystricky@intel.com</a>&gt;<br>
-Date: Fri, 27 Oct 2017 08:28:25 -0700<br>
-Subject: <a href="http://mkhelp.pl" rel="noreferrer" target="_blank">mkhelp.pl</a>: support reproducible build<br>
-<br>
-Do not generate line with the current date, such as:<br>
-<br>
-* Generation time: Tue Oct-24 18:01:41 2017<br>
-<br>
-This will improve reproducibility. The generated string is only<br>
-part of a comment, so there should be no adverse consequences.<br>
-<br>
-Upstream-Status: Submitted [ <a href="https://github.com/curl/curl/pull/2026" rel="noreferrer" target="_blank">https://github.com/curl/curl/<wbr>pull/2026</a> ]<br>
-<br>
-Signed-off-by: Juro Bystricky &lt;<a href="mailto:juro.bystricky@intel.com">juro.bystricky@intel.com</a>&gt;<br>
-<br>
-diff --git a/src/<a href="http://mkhelp.pl" rel="noreferrer" target="_blank">mkhelp.pl</a> b/src/<a href="http://mkhelp.pl" rel="noreferrer" target="_blank">mkhelp.pl</a><br>
-index 270daa2..757f024 100755<br>
---- a/src/<a href="http://mkhelp.pl" rel="noreferrer" target="_blank">mkhelp.pl</a><br>
-+++ b/src/<a href="http://mkhelp.pl" rel="noreferrer" target="_blank">mkhelp.pl</a><br>
-@@ -102,11 +102,9 @@ while(&lt;READ&gt;) {<br>
- }<br>
- close(READ);<br>
-<br>
--$now = localtime;<br>
- print &lt;&lt;HEAD<br>
- /*<br>
-  * NEVER EVER edit this manually, fix the <a href="http://mkhelp.pl" rel="noreferrer" target="_blank">mkhelp.pl</a> script instead!<br>
-- * Generation time: $now<br>
-  */<br>
- #ifdef USE_MANUAL<br>
- #include &quot;tool_hugehelp.h&quot;<br>
diff --git a/meta/recipes-support/curl/<a href="http://curl_7.54.1.bb" rel="noreferrer" target="_blank">cu<wbr>rl_7.54.1.bb</a> b/meta/recipes-support/curl/<a href="http://curl_7.57.0.bb" rel="noreferrer" target="_blank">cu<wbr>rl_7.57.0.bb</a><br>
similarity index 86%<br>
rename from meta/recipes-support/curl/<a href="http://curl_7.54.1.bb" rel="noreferrer" target="_blank">curl<wbr>_7.54.1.bb</a><br>
rename to meta/recipes-support/curl/<a href="http://curl_7.57.0.bb" rel="noreferrer" target="_blank">curl<wbr>_7.57.0.bb</a><br>
index 58f0531..47e3d45 100644<br>
--- a/meta/recipes-support/curl/<a href="http://curl_7.54.1.bb" rel="noreferrer" target="_blank">cu<wbr>rl_7.54.1.bb</a><br>
+++ b/meta/recipes-support/curl/<a href="http://curl_7.57.0.bb" rel="noreferrer" target="_blank">cu<wbr>rl_7.57.0.bb</a><br>
@@ -7,23 +7,16 @@ LIC_FILES_CHKSUM = &quot;file://COPYING;beginline=8;<wbr>md5=<wbr>3a34942f4ae3fbf1a303160714e66<br>
<br>
 SRC_URI = &quot;<a href="http://curl.haxx.se/download/curl-${PV}.tar.bz2" rel="noreferrer" target="_blank">http://curl.haxx.se/download/<wbr>curl-${PV}.tar.bz2</a> \<br>
            file://0001-replace-krb5-<wbr>config-with-pkg-config.patch \<br>
-           file://CVE-2017-1000099.patch \<br>
-           file://CVE-2017-1000100.patch \<br>
-           file://CVE-2017-1000101.patch \<br>
-           file://CVE-2017-1000254.patch \<br>
 &quot;<br>
<br>
-SRC_URI_append_class-target = &quot; \<br>
-           file://reproducible-mkhelp.<wbr>patch \<br>
-&quot;<br>
<br>
 # curl likes to set -g0 in CFLAGS, so we stop it<br>
 # from mucking around with debug options<br>
 #<br>
 SRC_URI += &quot; file://configure_ac.patch&quot;<br>
<br>
-SRC_URI[md5sum] = &quot;<wbr>6b6eb722f512e7a24855ff084f54fe<wbr>55&quot;<br>
-SRC_URI[sha256sum] = &quot;<wbr>fdfc4df2d001ee0c44ec071186e770<wbr>046249263c491fcae48df0e1a3ca8f<wbr>25a0&quot;<br>
+SRC_URI[md5sum] = &quot;<wbr>dd3e22e923be17663e67f721c2aec0<wbr>54&quot;<br>
+SRC_URI[sha256sum] = &quot;<wbr>c92fe31a348eae079121b73884065e<wbr>600c533493eb50f1f6cee9c48a3f45<wbr>4826&quot;<br>
<br>
 CVE_PRODUCT = &quot;libcurl&quot;<br>
 inherit autotools pkgconfig binconfig multilib_header<br>
@@ -64,9 +57,6 @@ EXTRA_OECONF = &quot; \<br>
     --without-libpsl \<br>
 &quot;<br>
<br>
-do_install_append() {<br>
-       oe_multilib_header curl/curlbuild.h<br>
-}<br>
<br>
 do_install_append_class-<wbr>target() {<br>
        # cleanup buildpaths from curl-config<br>
<span class="HOEnZb"><font color="#888888"><br>
--<br>
To stop receiving notification emails like this one, please contact<br>
the administrator of this repository.<br>
--<br>
______________________________<wbr>_________________<br>
Openembedded-commits mailing list<br>
<a href="mailto:Openembedded-commits@lists.openembedded.org">Openembedded-commits@lists.<wbr>openembedded.org</a><br>
<a href="http://lists.openembedded.org/mailman/listinfo/openembedded-commits" rel="noreferrer" target="_blank">http://lists.openembedded.org/<wbr>mailman/listinfo/openembedded-<wbr>commits</a><br>
</font></span></blockquote></div><br></div></div>