From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jan Nieuwenhuizen Subject: Re: [PATCH 0/1] libarchive: Fix CVE-2016-1541 Date: Thu, 12 May 2016 07:22:30 +0200 Message-ID: <87eg97q295.fsf@drakenvlieg.flower> References: <87r3d8wvxg.fsf@gnu.org> <20160512015557.GA28558@jasmine> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:49879) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b0x66-0001Z4-Bu for guix-devel@gnu.org; Thu, 12 May 2016 16:20:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b0x64-0004cm-UY for guix-devel@gnu.org; Thu, 12 May 2016 16:20:38 -0400 In-Reply-To: <20160512015557.GA28558@jasmine> (Leo Famulari's message of "Wed, 11 May 2016 21:55:57 -0400") 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: Leo Famulari Cc: guix-devel@gnu.org Leo Famulari writes: > 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. I looked into it. If you modify the patch, changing `linux' to `kernel' except in one place (define (cross? x) =3D=3D>except this line ;; Return #t if X is a cross-libc or cross Linux. (or (string-prefix? libc x) (string-prefix? kernel x))) it applies cleanly. Here's what I did to do that mechanically. git reset --hard origin/master git rebase origin/core-updates ... cp .git/rebase-apply/patch patch sed -i s/linux/kernel/gi patch sed -i 's/or cross kernel/or cross Linux/' patch git reset --hard HEAD patch -p1 < patch If I can help any better, please let me know. Greetings, Jan --=20 Jan Nieuwenhuizen | GNU LilyPond http://lilypond.org Freelance IT http://JoyofSource.com | Avatar=C2=AE http://AvatarAcademy.nl= =20=20