On Sat, Feb 22, 2020 at 10:34:42AM -0800, akuster808 wrote: > Adrian, > > On 2/21/20 12:59 PM, Adrian Bunk wrote: > > From: Ross Burton <[email protected]> > > > > Fix the following CVEs: > > > > - CVE-2019-19244 > > - CVE-2019-19880 > > - CVE-2019-19923 > > - CVE-2019-19924 > > - CVE-2019-19925 > > - CVE-2019-19926 > > - CVE-2019-19959 > > - CVE-2019-20218 > > > > Signed-off-by: Ross Burton <[email protected]> > > Signed-off-by: Richard Purdie <[email protected]> > > Signed-off-by: Adrian Bunk <[email protected]> > > Thanks for backporting these changes. One question. The master commit > f3ebf3f8dd0b4d144db451a8fcb352762f7fbd75 > <https://git.openembedded.org/openembedded-core/commit/meta/recipes-support/sqlite?id=f3ebf3f8dd0b4d144db451a8fcb352762f7fbd75> > has merge conflicts
The patches are new files, so merge conflicts are impossbile on them (they might not apply, but git does not even know that they are patches). > and there is no mention in the commit message that > you made any changes to get them to apply. > > Did you have to fixup any of the patches? No. > Master and Zeus have different versions of sqlite. Yes, changing SRC_URI in the correct file was the trivial change needed. > - armin cu Adrian -- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
