From mboxrd@z Thu Jan 1 00:00:00 1970 From: Leo Famulari Subject: Re: [PATCH 0/1] libarchive: Fix CVE-2016-1541 Date: Wed, 11 May 2016 21:55:57 -0400 Message-ID: <20160512015557.GA28558@jasmine> References: <87r3d8wvxg.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]:32953) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b0frQ-00061R-16 for guix-devel@gnu.org; Wed, 11 May 2016 21:56:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b0frG-0004lr-OO for guix-devel@gnu.org; Wed, 11 May 2016 21:56:19 -0400 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:41022) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b0frF-0004ij-Gt for guix-devel@gnu.org; Wed, 11 May 2016 21:56:10 -0400 Content-Disposition: inline In-Reply-To: <87r3d8wvxg.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, May 11, 2016 at 03:44:59PM +0200, Ludovic Courtès wrote: > Leo Famulari skribis: > > This patch applies the upstream patch [1]. > > LGTM. Done as e7806e6ca. > > I will follow this commit with an "ungrafting" commit on core-updates. > > Cool! There are conflicts in cross gnu/packages/cross-base.scm when merging master (e7806e6ca) into core-updates (f10e7ef47). These are the commits that are conflicting: Core-updates: 55de892b4 (gnu: glibc: Rename linux-headers input to kernel-headers). Master: efc4eb147 (gnu: cross: Use CROSS_*_INCLUDE_PATH for system headers) and maybe the follow-up typo fix in 0a0884c9 (gnu: cross: Fix typo). I could try to resolve the conflict myself, but I think it's better if Jan and Manolis work together, or at least give me some instructions. Here are the specific conflicts I'm not sure how to resolve: 182 <<<<<<< HEAD 183 (string-prefix? kernel x))) 184 185 (setenv "CROSS_CPATH" 186 (string-append libc "/include:" 187 kernel "/include")) 188 ======= 189 (string-prefix? linux x))) 190 (let ((cpath (string-append 191 libc "/include" 192 ":" linux "/include"))) 193 (for-each (cut setenv <> cpath) 194 '("CROSS_C_INCLUDE_PATH" 195 "CROSS_CPLUS_INCLUDE_PATH" 196 "CROSS_OBJC_INCLUDE_PATH" 197 "CROSS_OBJCPLUS_INCLUDE_PATH"))) 198 >>>>>>> master 347 <<<<<<< HEAD 348 (let ((kernel (assoc-ref inputs "kernel-headers"))) 349 (setenv "CROSS_CPATH" 350 (string-append kernel "/include")) 351 ======= 352 (let* ((linux (assoc-ref inputs "linux-headers")) 353 (cpath (string-append linux "/include"))) 354 (for-each (cut setenv <> cpath) 355 '("CROSS_C_INCLUDE_PATH" 356 "CROSS_CPLUS_INCLUDE_PATH" 357 "CROSS_OBJC_INCLUDE_PATH" 358 "CROSS_OBJCPLUS_INCLUDE_PATH")) 359 >>>>>>> master The other conflicts are just comments that need 's/linux/kernel'.