From: Jan Nieuwenhuizen <janneke@gnu.org>
To: Leo Famulari <leo@famulari.name>
Cc: guix-devel@gnu.org
Subject: Re: [PATCH 0/1] libarchive: Fix CVE-2016-1541
Date: Thu, 12 May 2016 07:22:30 +0200 [thread overview]
Message-ID: <87eg97q295.fsf@drakenvlieg.flower> (raw)
In-Reply-To: <20160512015557.GA28558@jasmine> (Leo Famulari's message of "Wed, 11 May 2016 21:55:57 -0400")
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)
==>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
--
Jan Nieuwenhuizen <janneke@gnu.org> | GNU LilyPond http://lilypond.org
Freelance IT http://JoyofSource.com | Avatar® http://AvatarAcademy.nl
next prev parent reply other threads:[~2016-05-12 20:20 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-10 20:29 [PATCH 0/1] libarchive: Fix CVE-2016-1541 Leo Famulari
2016-05-10 20:29 ` [PATCH 1/1] gnu: " Leo Famulari
2016-05-11 13:44 ` [PATCH 0/1] " Ludovic Courtès
2016-05-12 1:55 ` Leo Famulari
2016-05-12 5:22 ` Jan Nieuwenhuizen [this message]
2016-05-13 6:45 ` Leo Famulari
2016-05-13 18:16 ` Jan Nieuwenhuizen
2016-05-14 17:26 ` Manolis Ragkousis
2016-05-12 7:24 ` Manolis Ragkousis
2016-05-15 6:45 ` Leo Famulari
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87eg97q295.fsf@drakenvlieg.flower \
--to=janneke@gnu.org \
--cc=guix-devel@gnu.org \
--cc=leo@famulari.name \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.