<div dir="ltr">Now I remember why this was rejected last time: it breaks dnf in musl (<a href="https://autobuilder.yocto.io/builders/nightly-musl/builds/616">https://autobuilder.yocto.io/builders/nightly-musl/builds/616</a>).<div><br></div><div>Ross</div></div><div class="gmail_extra"><br><div class="gmail_quote">On 21 November 2017 at 20:01, Armin Kuster <span dir="ltr">&lt;<a href="mailto:akuster808@gmail.com" target="_blank">akuster808@gmail.com</a>&gt;</span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">From: Armin Kuster &lt;<a href="mailto:akuster@mvista.com">akuster@mvista.com</a>&gt;<br>
<br>
v2] - remove inherit<br>
<br>
curlbuild.h removed from sources<br>
<br>
includes:<br>
CVE-2017-1000257<br>
<br>
removed patches for the following cve fixs:<br>
CVE-2017-1000254<br>
CVE-2017-1000101<br>
CVE-2017-1000100<br>
CVE-2017-1000099<br>
<br>
Signed-off-by: Armin Kuster &lt;<a href="mailto:akuster@mvista.com">akuster@mvista.com</a>&gt;<br>
---<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.56.1.bb" rel="noreferrer" target="_blank">curl_7.56.1.bb</a>}                | 14 +++-----------<br>
 1 file changed, 3 insertions(+), 11 deletions(-)<br>
 rename meta/recipes-support/curl/{<a href="http://curl_7.54.1.bb" rel="noreferrer" target="_blank">cur<wbr>l_7.54.1.bb</a> =&gt; <a href="http://curl_7.56.1.bb" rel="noreferrer" target="_blank">curl_7.56.1.bb</a>} (87%)<br>
<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.56.1.bb" rel="noreferrer" target="_blank">cu<wbr>rl_7.56.1.bb</a><br>
similarity index 87%<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.56.1.bb" rel="noreferrer" target="_blank">curl<wbr>_7.56.1.bb</a><br>
index 58f0531..830f350 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.56.1.bb" rel="noreferrer" target="_blank">cu<wbr>rl_7.56.1.bb</a><br>
@@ -7,10 +7,6 @@ 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>
@@ -22,11 +18,11 @@ SRC_URI_append_class-target = &quot; \<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>428de25834ef8c04076906d6d5c049<wbr>8e&quot;<br>
+SRC_URI[sha256sum] = &quot;<wbr>2594670367875e7d87b0f129b5e469<wbr>0150780884d90244ba0fe3e74a778b<wbr>5f90&quot;<br>
<br>
 CVE_PRODUCT = &quot;libcurl&quot;<br>
-inherit autotools pkgconfig binconfig multilib_header<br>
+inherit autotools pkgconfig binconfig<br>
<br>
 PACKAGECONFIG ??= &quot;${@bb.utils.filter(&#39;DISTRO_<wbr>FEATURES&#39;, &#39;ipv6&#39;, d)} gnutls proxy threaded-resolver zlib&quot;<br>
 PACKAGECONFIG_class-native = &quot;ipv6 proxy ssl threaded-resolver zlib&quot;<br>
@@ -64,10 +60,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>
        sed -i \<br>
<span class="HOEnZb"><font color="#888888">--<br>
2.7.4<br>
<br>
--<br>
______________________________<wbr>_________________<br>
Openembedded-core mailing list<br>
<a href="mailto:Openembedded-core@lists.openembedded.org">Openembedded-core@lists.<wbr>openembedded.org</a><br>
<a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" rel="noreferrer" target="_blank">http://lists.openembedded.org/<wbr>mailman/listinfo/openembedded-<wbr>core</a><br>
</font></span></blockquote></div><br></div>