Update information on build/import.

1 files changed, 14 insertions, 11 deletions

diff --git a/contrib/ntp/FREEBSD-upgrade b/contrib/ntp/FREEBSD-upgrade
index 12f1a51..feea467 100644
--- a/contrib/ntp/FREEBSD-upgrade
+++ b/contrib/ntp/FREEBSD-upgrade
@@ -2,8 +2,8 @@
 #
 # $FreeBSD$
 
-NTP 4.1.1a
-	originals can be found on ftp://louie.udel.edu/pub/ntp/testing
+NTP 4.2.0
+	originals can be found on ftp://ftp.udel.edu/pub/ntp/ntp4/
 
 For the import of NTP the following files were removed:
 
@@ -14,17 +14,17 @@ For the import of NTP the following files were removed:
 
 The stripped down version was created using FREEBSD-Xlist during extraction:
 
-	tar -X FREEBSD-Xlist -xvzf ntp-4.1.1a.tar.gz
-	mv ntp-4.1.1a ntp
+	tar -X FREEBSD-Xlist -xvzf ntp-4.2.0.tar.gz
+	mv ntp-4.2.0 ntp
 
 Imported by:
 
-	cvs import -m 'Virgin import of ntpd 4.1.1a' \
-		src/contrib/ntp DMILLS v4_1_1a
+	cvs import -ko -m 'Virgin import of ntpd 4.2.0' \
+		src/contrib/ntp DMILLS v4_2_0
 
 ./configure --disable-all-clocks --enable-NMEA --enable-ONCORE
---enable-RAWDCF --with-crypto=autokey --disable-debugging
---enable-LOCAL-CLOCK
+--enable-RAWDCF --with-crypto --disable-debugging
+--enable-LOCAL-CLOCK --with-sntp --with-arlib --prefix=/usr
 
 config.h was generated by running configure and excluding almost all clock
 drivers (what is included is DCF77 -- what I use --, NMEA, Motorola OnCORE
@@ -34,9 +34,12 @@ The file is then edited to edit the value of "NO_PARENB_IGNPAR" because we
 need to set no parity on the serial port (needed for DCF77). All clock
 drivers are then disabled (some of them are included by default by ntpd).
 
-Note that there are two #ifdef to support both alpha and i386 from the same
-sources. They'll need to be redone for each upgrade to the vendor branch to
-keep config.h in sync.
+Note that there are two #ifdef to support other architectures (WRT to long
+size and endianness). They'll need to be redone for each upgrade to the
+vendor branch to keep config.h in sync.
+
+ntpd/ntp_control.c is now the only file that is different from the vendor
+branch for unsigned char/int fixes and removal of a DoS.
 
 Documentation in /usr/share/doc/ntp is generated from the HTML files with
 lynx (without the GIF files of course).