make buildworld failure at ntpd on -STABLE

Mon Jan 3 13:07:56 PST 2005

cvsupped Dragonfly-Stable source today and had patch failure on ntpd. I
deleted /usr/src and /usr/obj, re-cvsupped complete src and same
failure:

Patching file /usr/src/usr.sbin/ntpd/../../contrib/ntpd/ntp.c using Plan
A...
Reversed (or previously applied) patch detected!  Assume -R? [y]
Hunk #1 succeeded at 28 with fuzz 1 (offset 5 lines).
done
mkdir -p .
patch -o ntp_msg.c
-i /usr/src/usr.sbin/ntpd/patches/ntp_msg.c.patch /usr/src/usr.sbin/ntpd/../../contrib/ntpd/ntp_msg.c
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$DragonFly: src/usr.sbin/ntpd/patches/ntp_msg.c.patch,v 1.2 2004/11/09
21:29:34 joerg Exp $
|
|--- ntp_msg.c.orig     2004-11-09 22:18:03.000000000 +0100
|+++ ntp_msg.c  2004-11-09 22:18:28.000000000 +0100
--------------------------
Patching file /usr/src/usr.sbin/ntpd/../../contrib/ntpd/ntp_msg.c using
Plan A...
Hunk #1 succeeded at 59 with fuzz 1 (offset -15 lines).
Hunk #2 succeeded at 101 with fuzz 1 (offset -16 lines).
done
mkdir -p .
patch -o ntpd.c
-i /usr/src/usr.sbin/ntpd/patches/ntpd.c.patch /usr/src/usr.sbin/ntpd/../../contrib/ntpd/ntpd.c
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$DragonFly: src/usr.sbin/ntpd/patches/ntpd.c.patch,v 1.4 2004/12/01
04:14:08 joerg Exp $
|
|--- ntpd.c.orig        2004-11-09 20:39:54.000000000 +0100
|+++ ntpd.c     2004-11-09 20:40:48.000000000 +0100
--------------------------
Patching file /usr/src/usr.sbin/ntpd/../../contrib/ntpd/ntpd.c using
Plan A...
Hunk #1 succeeded at 66.
done
mkdir -p .
patch -o ntpd.h
-i /usr/src/usr.sbin/ntpd/patches/ntpd.h.patch /usr/src/usr.sbin/ntpd/../../contrib/ntpd/ntpd.h
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$DragonFly: src/usr.sbin/ntpd/patches/ntpd.h.patch,v 1.2 2004/11/09
21:29:34 joerg Exp $
|
|--- ntpd.h.orig        2004-11-09 20:36:49.000000000 +0100
|+++ ntpd.h     2004-11-09 20:43:28.000000000 +0100
--------------------------
Patching file /usr/src/usr.sbin/ntpd/../../contrib/ntpd/ntpd.h using
Plan A...
Hunk #1 succeeded at 19 with fuzz 2.
Hunk #2 failed at 211.
1 out of 2 hunks failed--saving rejects to ntpd.h.rej
done
*** Error code 1

Stop in /usr/src/usr.sbin/ntpd.
*** Error code 1

Stop in /usr/src/usr.sbin.
*** Error code 1

Stop in /usr/src.
*** Error code 1

Stop in /usr/src

looks like a patch is trying to reverse a previous patch (?) - shouldn't
be getting prompted during buildworld and a patch failed a couple files
later.

Sven