On Wed, Jun 08, 2016 at 03:25:39PM +0200, Ludovic Courtès wrote: > Leo Famulari <l...@famulari.name> skribis: > > > This "cherry-picks" part of 119b83989dd9edd1e8ba6cd379d159d024cbc61d > > from the master branch to core-updates. > > > > * gnu/packages/xml.scm (expat)[source]: Use patch. > > LGTM, but is expat-CVE-2016-0718.patch still in core-updates?
Yes and... > Did I mess things up when I merged master into core-updates yesterday? ... I've only merged master into core-updates once, but when I did I noticed some strange behavior re: patches and spent a lot of time making sure the merge did the "right thing". Next time I will take notes on the surprising things and send them to the list. If I am inspired, I might go back in time and re-do the merge I did before and take notes on that.
