Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/usr.sbin/ntp update the reachover build tree for ntp-4.2.0:



details:   https://anonhg.NetBSD.org/src/rev/db3d9ffe7349
branches:  trunk
changeset: 555924:db3d9ffe7349
user:      drochner <drochner%NetBSD.org@localhost>
date:      Thu Dec 04 16:41:56 2003 +0000

description:
update the reachover build tree for ntp-4.2.0:
-adjust for new libs, programs and source files
-replace generated config.h and mkver
-add Frederick Bruckman's awk implementation of "ntptrace" as a
 replacement for the perl program in the original tree

diffstat:

 usr.sbin/ntp/Makefile              |     7 +-
 usr.sbin/ntp/Makefile.inc          |     7 +-
 usr.sbin/ntp/include/config.h      |  1613 ++++++++++++++++++++---------------
 usr.sbin/ntp/libisc/Makefile       |    13 +
 usr.sbin/ntp/libntp/Makefile       |     7 +-
 usr.sbin/ntp/ntp-keygen/Makefile   |     9 +
 usr.sbin/ntp/ntpd/Makefile         |    21 +-
 usr.sbin/ntp/ntpdc/Makefile        |     6 +-
 usr.sbin/ntp/ntpq/Makefile         |     6 +-
 usr.sbin/ntp/ntptrace/Makefile     |     5 +-
 usr.sbin/ntp/ntptrace/ntptrace.awk |   128 ++
 usr.sbin/ntp/scripts/mkver         |    20 +-
 12 files changed, 1111 insertions(+), 731 deletions(-)

diffs (truncated from 2151 to 300 lines):

diff -r 191f58052bef -r db3d9ffe7349 usr.sbin/ntp/Makefile
--- a/usr.sbin/ntp/Makefile     Thu Dec 04 16:23:34 2003 +0000
+++ b/usr.sbin/ntp/Makefile     Thu Dec 04 16:41:56 2003 +0000
@@ -1,6 +1,7 @@
-#      $NetBSD: Makefile,v 1.5 2001/04/19 17:48:18 drochner Exp $
+#      $NetBSD: Makefile,v 1.6 2003/12/04 16:41:56 drochner Exp $
 
-SUBDIR=        html libntp libparse .WAIT ntpd ntpdate ntpdc ntpq ntptime \
-       ntptimeset ntptrace
+SUBDIR=        libisc libntp libparse .WAIT
+SUBDIR+= ntp-keygen ntpd ntpdate ntpdc ntpq ntptime
+SUBDIR+= ntptrace
 
 .include <bsd.subdir.mk>
diff -r 191f58052bef -r db3d9ffe7349 usr.sbin/ntp/Makefile.inc
--- a/usr.sbin/ntp/Makefile.inc Thu Dec 04 16:23:34 2003 +0000
+++ b/usr.sbin/ntp/Makefile.inc Thu Dec 04 16:41:56 2003 +0000
@@ -1,19 +1,18 @@
-#      $NetBSD: Makefile.inc,v 1.10 2003/10/21 10:01:22 lukem Exp $
+#      $NetBSD: Makefile.inc,v 1.11 2003/12/04 16:41:56 drochner Exp $
 
 .if !defined(NTP_MAKEFILE_INC)
 NTP_MAKEFILE_INC=1
 
 .include <bsd.own.mk>
 
-NTPDOCDIR?=    ${HTMLDOCDIR}/ntp
-
 DIST=          ${NETBSDSRCDIR}/dist/ntp
 
 CPPFLAGS+=     -I${.CURDIR}/../include -I${DIST}/include -DHAVE_CONFIG_H
 
 .if defined(PROG)
 LIBNTP!=       cd ${.CURDIR}/../libntp && ${PRINTOBJDIR}
-LDADD+=                -L${LIBNTP} -lntp
+LIBISC!=       cd ${.CURDIR}/../libisc && ${PRINTOBJDIR}
+LDADD+=                -L${LIBNTP} -lntp -lcrypto
 DPADD+=                ${LIBNTP}/libntp.a
 
 SRCS+= version.c
diff -r 191f58052bef -r db3d9ffe7349 usr.sbin/ntp/include/config.h
--- a/usr.sbin/ntp/include/config.h     Thu Dec 04 16:23:34 2003 +0000
+++ b/usr.sbin/ntp/include/config.h     Thu Dec 04 16:41:56 2003 +0000
@@ -1,29 +1,17 @@
-/* config.h.  Generated automatically by configure.  */
-/* config.h.in.  Generated automatically from configure.in by autoheader.  */
-
-/* debugging code */
-#define DEBUG 1
-
-/* Minutes per DST adjustment */
-#define DSTMINUTES 60
+/* $NetBSD: config.h,v 1.6 2003/12/04 16:41:56 drochner Exp $ */
+/* manually edited - check "XXX" comments */
 
-/* MD5 authentication */
-#define MD5 1
-
-/* DES authentication (COCOM only) */
-/* #undef DES */
+/* config.h.  Generated by configure.  */
+/* config.h.in.  Generated from configure.in by autoheader.  */
 
-/* time_t */
-/* #undef time_t */
+/* Is adjtime() accurate? */
+/* #undef ADJTIME_IS_ACCURATE */
 
-/* reference clock interface */
-#define REFCLOCK 1
-
-/* Audio CHU? */
+/* CHU audio/decoder? */
 #define AUDIO_CHU 1
 
-/* PARSE kernel PLL PPS support */
-/* #undef PPS_SYNC */
+/* Declare char *sys_errlist array */
+/* #undef CHAR_SYS_ERRLIST */
 
 /* ACTS modem service */
 #define CLOCK_ACTS 1
@@ -31,61 +19,70 @@
 /* Arbiter 1088A/B GPS receiver */
 #define CLOCK_ARBITER 1
 
-/* DHD19970505: ARCRON support. */
+/* ARCRON support? */
 #define CLOCK_ARCRON_MSF 1
 
-/* Austron 2200A/2201A GPS receiver */
+/* Austron 2200A/2201A GPS receiver? */
 #define CLOCK_AS2201 1
 
-/* PPS interface */
+/* PPS interface? */
 #define CLOCK_ATOM 1
 
-/* PPS auxiliary interface for ATOM */
-#define PPS_SAMPLE 1
-
-/* Datum/Bancomm bc635/VME interface */
+/* Datum/Bancomm bc635/VME interface? */
 /* #undef CLOCK_BANC */
 
-/* Diems Computime Radio Clock */
+/* Chronolog K-series WWVB receiver? */
+#define CLOCK_CHRONOLOG 1
+
+/* CHU modem/decoder */
+#define CLOCK_CHU 1
+
+/* Diems Computime Radio Clock? */
 #define CLOCK_COMPUTIME 1
 
-/* Chronolog K-series WWVB receiver */
-#define CLOCK_CHRONOLOG 1
-
-/* Datum Programmable Time System */
+/* Datum Programmable Time System? */
 #define CLOCK_DATUM 1
 
-/* ELV/DCF7000 clock */
+/* ELV/DCF7000 clock? */
 #define CLOCK_DCF7000 1
 
-/* Dumb generic hh:mm:ss local clock */
+/* Dumb generic hh:mm:ss local clock? */
 #define CLOCK_DUMBCLOCK 1
 
-/* Forum Graphic GPS datating station driver */
+/* Forum Graphic GPS datating station driver? */
 #define CLOCK_FG 1
 
-/* TrueTime GPS receiver/VME interface */
+/* TrueTime GPS receiver/VME interface? */
 /* #undef CLOCK_GPSVME */
 
-/* Heath GC-1000 WWV/WWVH receiver */
+/* Heath GC-1000 WWV/WWVH receiver? */
 #define CLOCK_HEATH 1
 
-/* HOPF 6021 clock */
+/* HOPF 6021 clock? */
 #define CLOCK_HOPF6021 1
 
-/* HP 58503A GPS receiver */
+/* HOPF PCI clock device? */
+#define CLOCK_HOPF_PCI 1
+
+/* HOPF serial clock device? */
+#define CLOCK_HOPF_SERIAL 1
+
+/* HP 58503A GPS receiver? */
 #define CLOCK_HPGPS 1
 
-/* Sun IRIG audio decoder */
+/* IRIG audio decoder? */
 #define CLOCK_IRIG 1
 
-/* Rockwell Jupiter GPS clock */
-/* #undef CLOCK_JUPITER */
+/* JJY receiver? */
+#define CLOCK_JJY 1
 
-/* Leitch CSD 5300 Master Clock System Driver */
+/* Rockwell Jupiter GPS clock? */
+#define CLOCK_JUPITER 1
+
+/* Leitch CSD 5300 Master Clock System Driver? */
 #define CLOCK_LEITCH 1
 
-/* local clock reference */
+/* local clock reference? */
 #define CLOCK_LOCAL 1
 
 /* Meinberg clocks */
@@ -97,6 +94,9 @@
 /* Magnavox MX4200 GPS receiver */
 /* #undef CLOCK_MX4200 */
 
+/* NeoClock4X */
+#define CLOCK_NEOCLOCK4X 1
+
 /* NMEA GPS receiver */
 #define CLOCK_NMEA 1
 
@@ -127,11 +127,14 @@
 /* RCC 8000 clock */
 #define CLOCK_RCC8000 1
 
+/* RIPE NCC Trimble clock */
+/* #undef CLOCK_RIPENCC */
+
 /* Schmid DCF77 clock */
 #define CLOCK_SCHMID 1
 
 /* clock thru shared memory */
-/* #undef CLOCK_SHM */
+#define CLOCK_SHM 1
 
 /* Spectracom 8170/Netclock/2 WWVB receiver */
 #define CLOCK_SPECTRACOM 1
@@ -151,768 +154,969 @@
 /* Kinemetrics/TrueTime receivers */
 #define CLOCK_TRUETIME 1
 
-/* Ultralink M320 WWVB receiver */
+/* TrueTime 560 IRIG-B decoder? */
+/* #undef CLOCK_TT560 */
+
+/* Ultralink M320 WWVB receiver? */
 #define CLOCK_ULINK 1
 
 /* USNO modem service */
 #define CLOCK_USNO 1
 
+/* VARITEXT protocol */
+#define CLOCK_VARITEXT 1
+
 /* WHARTON 400A Series protocol */
 #define CLOCK_WHARTON_400A 1
 
 /* WWV audio driver */
 #define CLOCK_WWV 1
 
-/* VARITEXT protocol */
-#define CLOCK_VARITEXT 1
+/* Zyfer GPStarplus */
+#define CLOCK_ZYFER 1
+
+/* Enable debugging? */
+#define DEBUG 1
+
+/* Declaration style */
+/* #undef DECL_ADJTIME_0 */
 
-/* define if we need to declare int errno; */
+/* Declaration style */
+/* #undef DECL_BCOPY_0 */
+
+/* Declaration style */
+/* #undef DECL_BZERO_0 */
+
+/* Declaration style */
+/* #undef DECL_CFSETISPEED_0 */
+
+/* Declare errno? */
 /* #undef DECL_ERRNO */
 
-/* define if we may declare int h_errno; */
+/* Declaration style */
+/* #undef DECL_HSTRERROR_0 */
+
+/* Declare h_errno? */
 #define DECL_H_ERRNO 1
 
-/* define if it's OK to declare char *sys_errlist[]; */
-/* #undef CHAR_SYS_ERRLIST */
+/* Declaration style */
+/* #undef DECL_INET_NTOA_0 */
+
+/* Declaration style */
+/* #undef DECL_IOCTL_0 */
+
+/* Declaration style */
+/* #undef DECL_IPC_0 */
+
+/* Declaration style */
+/* #undef DECL_MEMMOVE_0 */
+
+/* Declaration style */
+/* #undef DECL_MKSTEMP_0 */
+
+/* Declaration style */
+/* #undef DECL_MKTEMP_0 */
+
+/* Declaration style */
+/* #undef DECL_MRAND48_0 */
+
+/* Declaration style */
+/* #undef DECL_NLIST_0 */
+
+/* Declaration style */
+/* #undef DECL_PLOCK_0 */
+
+/* Declaration style */
+/* #undef DECL_RENAME_0 */
 
-/* define if it's OK to declare int syscall P((int, struct timeval *, struct timeval *)); */
+/* Declaration style */
+/* #undef DECL_SELECT_0 */
+
+/* Declaration style */
+/* #undef DECL_SETITIMER_0 */
+
+/* Declaration style */
+/* #undef DECL_SETPRIORITY_0 */
+
+/* Declaration style */



Home | Main Index | Thread Index | Old Index