From mboxrd@z Thu Jan 1 00:00:00 1970 From: Leo Famulari Subject: Re: [PATCH 1/3] gnu: expat: Fix CVE-2016-0718. Date: Thu, 9 Jun 2016 12:20:56 -0400 Message-ID: <20160609162056.GA4896@jasmine> References: <81e60fcd24fbb26d6d4e6fc4b5cdafe7fe1e2bc5.1465347219.git.leo@famulari.name> <87h9d3hkx8.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 8bit Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:41078) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bB2ho-00032v-LK for guix-devel@gnu.org; Thu, 09 Jun 2016 12:21:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bB2hk-0002Sh-Jc for guix-devel@gnu.org; Thu, 09 Jun 2016 12:21:16 -0400 Content-Disposition: inline In-Reply-To: <87h9d3hkx8.fsf@gnu.org> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: Ludovic =?iso-8859-1?Q?Court=E8s?= Cc: guix-devel@gnu.org On Wed, Jun 08, 2016 at 03:25:39PM +0200, Ludovic Courtès wrote: > Leo Famulari 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.