Subject: Re: trouble patching xntpd
To: None <jwjr@panix.com>
From: John Darrow <John.P.Darrow@wheaton.edu>
List: netbsd-help
Date: 04/06/2001 00:09:21
James Wetterau <jwjr@panix.com> wrote:
>
># patch < NetBSD*asc
>Hmm...  Looks like a unified diff to me...
>The text leading up to this was:
>--------------------------
>|- --- ntp_control.c    1998/08/27 20:31:02     1.6
>|+++ ntp_control.c      2001/04/05 01:50:18
>--------------------------
>Patching file ntp_control.c using Plan A...
>Hunk #1 failed at 1757.
>1 out of 1 hunks failed--saving rejects to ntp_control.c.rej
>Hmm...  Ignoring the trailing garbage.
>done
>
>What did I do wrong?
>
>I got the patch at:
>ftp://ftp.netbsd.org/pub/NetBSD/misc/security/advisories/NetBSD-SA2001-004.txt.asc
>
>I have NetBSD 1.4.1 installed.
>
>Thanks for any information anyone can provide!

You've got two problems:

First, the .txt.asc file contains two patches, one for 1.4.x, the other
for 1.5, so you should trim out the lines before and after the patch you
need.

Second, due to passing through a mailer, every line which began with
a hyphen ('-') had another hyphen and a space ('- ') prepended to it.
You'll need to edit the patch to remove those two extra characters
(leaving only the original hyphen) before the patch will apply cleanly.

Hope this helps!

jdarrow

-- 
John Darrow - Senior Technical Specialist               Office: 630/752-5201
Computing Services, Wheaton College, Wheaton, IL 60187  Fax:    630/752-5968
Alphapage: 6303160707@alphapage.airtouch.com            Pager:  630/316-0707
Email:     John.P.Darrow@wheaton.edu