On Thu, 5 Apr 2001, Frederick Bruckman wrote:

> On Thu, 5 Apr 2001, Nigel Reed wrote:
> > On Thu, Apr 05, 2001 at 10:01:32PM -0400, James Wetterau wrote:
> > >
> > > # patch < NetBSD*asc
> >...
> > > 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.
> >
> > I have a similar problem trying to patch 1.5.1_ALPHA. Anyone know
> > if the 1.5 patch is supposed to work with it?
>
> That file evidently has _two_ patches, one for 1.4.x and one for 1.5.
> In order to use it with "patch", the lines for the "other" system
> should be deleted. In James' case, since the second patch is the one
> he wants, he could reverse the first one and then apply the rejects
>
>    cp ntp_control.c.orig ntp_control.c
>    patch <ntp_control.c.rej
>
> In Nigel's case, since you don't really want to apply the second part,
> it's OK, even with the error.

I finally got the patch through (had to pass an -l parameter to patch).
Now I have the netbsd-1-5-RELEASE tag of basesrc (and a patched
ntp) checked out into /usr/src. How do I compile and install *only* ntp,
i.e. without having to rebuild/reinstall the entire userland?

Also, just out of curiosity: I checked basesrc out from
anoncvs.netbsd.org. Why doesn't ntp_control.c get updated from 1.1.1.2 to
1.2 when I do a 'cvs up'? Should I specify a tag differing from
netbsd-1-5-RELEASE?

Regards


-- 
Audun Nordal