On 11/24/2017 04:49 AM, Burton, Ross wrote: > Now I remember why this was rejected last time: it breaks dnf in musl > (https://autobuilder.yocto.io/builders/nightly-musl/builds/616). is it bugged?
- armin > > Ross > > On 21 November 2017 at 20:01, Armin Kuster <akuster...@gmail.com > <mailto:akuster...@gmail.com>> wrote: > > From: Armin Kuster <akus...@mvista.com <mailto:akus...@mvista.com>> > > v2] - remove inherit > > curlbuild.h removed from sources > > includes: > CVE-2017-1000257 > > removed patches for the following cve fixs: > CVE-2017-1000254 > CVE-2017-1000101 > CVE-2017-1000100 > CVE-2017-1000099 > > Signed-off-by: Armin Kuster <akus...@mvista.com > <mailto:akus...@mvista.com>> > --- > .../curl/{curl_7.54.1.bb <http://curl_7.54.1.bb> => > curl_7.56.1.bb <http://curl_7.56.1.bb>} | 14 > +++----------- > 1 file changed, 3 insertions(+), 11 deletions(-) > rename meta/recipes-support/curl/{curl_7.54.1.bb > <http://curl_7.54.1.bb> => curl_7.56.1.bb <http://curl_7.56.1.bb>} > (87%) > > diff --git a/meta/recipes-support/curl/curl_7.54.1.bb > <http://curl_7.54.1.bb> b/meta/recipes-support/curl/curl_7.56.1.bb > <http://curl_7.56.1.bb> > similarity index 87% > rename from meta/recipes-support/curl/curl_7.54.1.bb > <http://curl_7.54.1.bb> > rename to meta/recipes-support/curl/curl_7.56.1.bb > <http://curl_7.56.1.bb> > index 58f0531..830f350 100644 > --- a/meta/recipes-support/curl/curl_7.54.1.bb <http://curl_7.54.1.bb> > +++ b/meta/recipes-support/curl/curl_7.56.1.bb <http://curl_7.56.1.bb> > @@ -7,10 +7,6 @@ LIC_FILES_CHKSUM = > "file://COPYING;beginline=8;md5=3a34942f4ae3fbf1a303160714e66 > > SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 > <http://curl.haxx.se/download/curl-$%7BPV%7D.tar.bz2> \ > file://0001-replace-krb5-config-with-pkg-config.patch \ > - file://CVE-2017-1000099.patch \ > - file://CVE-2017-1000100.patch \ > - file://CVE-2017-1000101.patch \ > - file://CVE-2017-1000254.patch \ > " > > SRC_URI_append_class-target = " \ > @@ -22,11 +18,11 @@ SRC_URI_append_class-target = " \ > # > SRC_URI += " file://configure_ac.patch" > > -SRC_URI[md5sum] = "6b6eb722f512e7a24855ff084f54fe55" > -SRC_URI[sha256sum] = > "fdfc4df2d001ee0c44ec071186e770046249263c491fcae48df0e1a3ca8f25a0" > +SRC_URI[md5sum] = "428de25834ef8c04076906d6d5c0498e" > +SRC_URI[sha256sum] = > "2594670367875e7d87b0f129b5e4690150780884d90244ba0fe3e74a778b5f90" > > CVE_PRODUCT = "libcurl" > -inherit autotools pkgconfig binconfig multilib_header > +inherit autotools pkgconfig binconfig > > PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', > d)} gnutls proxy threaded-resolver zlib" > PACKAGECONFIG_class-native = "ipv6 proxy ssl threaded-resolver zlib" > @@ -64,10 +60,6 @@ EXTRA_OECONF = " \ > --without-libpsl \ > " > > -do_install_append() { > - oe_multilib_header curl/curlbuild.h > -} > - > do_install_append_class-target() { > # cleanup buildpaths from curl-config > sed -i \ > -- > 2.7.4 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > <mailto:Openembedded-core@lists.openembedded.org> > http://lists.openembedded.org/mailman/listinfo/openembedded-core > <http://lists.openembedded.org/mailman/listinfo/openembedded-core> > >
-- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
