From 198cad9f46ab7adb5602203485beaea56cc32de1 Mon Sep 17 00:00:00 2001 From: roberto Date: Wed, 29 Aug 2001 15:03:54 +0000 Subject: Update for the import of 4.1.0. --- usr.sbin/ntp/Makefile | 3 +- usr.sbin/ntp/config.h | 634 +++++++++++++++++++++++------------------ usr.sbin/ntp/libntp/Makefile | 26 +- usr.sbin/ntp/libparse/Makefile | 10 +- usr.sbin/ntp/ntpd/Makefile | 42 +-- usr.sbin/ntp/ntpdc/Makefile | 4 +- usr.sbin/ntp/scripts/mkver | 15 +- 7 files changed, 411 insertions(+), 323 deletions(-) (limited to 'usr.sbin/ntp') diff --git a/usr.sbin/ntp/Makefile b/usr.sbin/ntp/Makefile index 04349e2..763a2a4 100644 --- a/usr.sbin/ntp/Makefile +++ b/usr.sbin/ntp/Makefile @@ -3,6 +3,7 @@ MAINTAINER= roberto -SUBDIR= doc libntp libparse ntpd ntpdc ntpq ntpdate ntptrace ntptimeset ntptime +SUBDIR= libntp libparse ntpd ntpdc ntpq ntpdate ntptrace \ + ntptimeset ntptime ntp-genkeys .include diff --git a/usr.sbin/ntp/config.h b/usr.sbin/ntp/config.h index 9746cdd..fb50848 100644 --- a/usr.sbin/ntp/config.h +++ b/usr.sbin/ntp/config.h @@ -1,69 +1,6 @@ /* config.h. Generated automatically by configure. */ /* config.h.in. Generated automatically from configure.in by autoheader. */ /* $FreeBSD$ */ - -/* Define if on AIX 3. - System headers sometimes define this. - We just want to avoid a redefinition error message. */ -#ifndef _ALL_SOURCE -/* #undef _ALL_SOURCE */ -#endif - -/* Define if type char is unsigned and you are not using gcc. */ -#ifndef __CHAR_UNSIGNED__ -/* #undef __CHAR_UNSIGNED__ */ -#endif - -/* Define to empty if the keyword does not work. */ -/* #undef const */ - -/* Define to `int' if doesn't define. */ -/* #undef gid_t */ - -/* Define as __inline if that's what the C compiler calls it. */ -/* #undef inline */ - -/* Define if on MINIX. */ -/* #undef _MINIX */ - -/* Define if your struct nlist has an n_un member. */ -/* #undef NLIST_NAME_UNION */ - -/* Define if you have . */ -#define NLIST_STRUCT 1 - -/* Define to `long' if doesn't define. */ -/* #undef off_t */ - -/* Define if the system does not provide POSIX.1 features except - with this defined. */ -/* #undef _POSIX_1_SOURCE */ - -/* Define if you need to in order for stat and other things to work. */ -/* #undef _POSIX_SOURCE */ - -/* Define as the return type of signal handlers (int or void). */ -#define RETSIGTYPE void - -/* Define to `unsigned' if doesn't define. */ -/* #undef size_t */ - -/* Define if you have the ANSI C header files. */ -#define STDC_HEADERS 1 - -/* Define if you can safely include both and . */ -#define TIME_WITH_SYS_TIME 1 - -/* Define if your declares struct tm. */ -/* #undef TM_IN_SYS_TIME */ - -/* Define to `int' if doesn't define. */ -/* #undef uid_t */ - -/* Define if your processor stores words with the most significant - byte first (like Motorola and SPARC, unlike Intel and VAX). */ -/* #undef WORDS_BIGENDIAN */ - /* debugging code */ #define DEBUG 1 @@ -86,7 +23,7 @@ /* #undef AUDIO_CHU */ /* PARSE kernel PLL PPS support */ -/* #undef PPS_SYNC */ +#define PPS_SYNC 1 /* ACTS modem service */ /* #undef CLOCK_ACTS */ @@ -136,6 +73,12 @@ /* HOPF 6021 clock */ /* #undef CLOCK_HOPF6021 */ +/* HOPF PCI clock device */ +/* #undef CLOCK_HOPF_PCI */ + +/* HOPF serial clock device*/ +/* #undef CLOCK_HOPF_SERIAL */ + /* HP 58503A GPS receiver */ /* #undef CLOCK_HPGPS */ @@ -278,8 +221,8 @@ /* define if struct clockinfo has tickadj */ #define HAVE_TICKADJ_IN_STRUCT_CLOCKINFO 1 -/* define if struct ntptimeval uses time.tv_nsec instead of time.tv_usec */ -#define HAVE_TV_NSEC_IN_NTPTIMEVAL 1 +/* define if struct ntptimeval uses time.tv_nsec instead of time.tv_usec */ +/* #undef HAVE_TV_NSEC_IN_NTPTIMEVAL */ /* Does a system header defind struct ppsclockev? */ /* #undef HAVE_STRUCT_PPSCLOCKEV */ @@ -332,6 +275,9 @@ /* can we use SIGPOLL for tty IO? */ /* #undef USE_TTY_SIGPOLL */ +/* should we use clock_settime()? */ +/* #undef USE_CLOCK_SETTIME */ + /* do we want the CHU driver? */ /* #undef CLOCK_CHU */ @@ -359,6 +305,9 @@ /* do we need an s_char typedef? */ #define NEED_S_CHAR_TYPEDEF 1 +/* include the GDT Surveying code? */ +/* #undef GDT_SURVEYING */ + /* does SIOCGIFCONF return size in the buffer? */ /* #undef SIZE_RETURNED_IN_BUFFER */ @@ -432,9 +381,6 @@ /* Define if you have the TIOCGSERIAL, TIOCSSERIAL, ASYNC_PPS_CD_POS, and ASYNC_PPS_CD_NEG ioctls (linux) */ /* #undef HAVE_TIO_SERIAL_STUFF */ -/* Define if you use struct timespec rather than struct timeval (time in ns rather than us) */ -#define HAVE_TIMESPEC 1 - /* Define if you have the interface in the Draft RFC */ #define HAVE_PPSAPI 1 @@ -444,6 +390,10 @@ /* Do we have support for SHMEM_STATUS? */ #define ONCORE_SHMEM_STATUS 1 +/***/ + +/* Which way should we declare... */ + /* adjtime()? */ /* #undef DECL_ADJTIME_0 */ @@ -456,6 +406,9 @@ /* cfset[io]speed()? */ /* #undef DECL_CFSETISPEED_0 */ +/* hstrerror()? */ +/* #undef DECL_HSTRERROR_0 */ + /* ioctl()? */ /* #undef DECL_IOCTL_0 */ @@ -465,6 +418,9 @@ /* memmove()? */ /* #undef DECL_MEMMOVE_0 */ +/* memset()? */ +/* #undef DECL_MEMSET_0 */ + /* mkstemp()? */ /* #undef DECL_MKSTEMP_0 */ @@ -524,391 +480,515 @@ /* toupper()? */ /* #undef DECL_TOUPPER_0 */ -/* The number of bytes in a int. */ -#define SIZEOF_INT 4 +/* strerror()? */ +/* #undef DECL_STRERROR_0 */ -/* The number of bytes in a long. */ -#ifdef __alpha__ -#define SIZEOF_LONG 8 -#else -#define SIZEOF_LONG 4 -#endif +#define ULONG_CONST(a) a ## UL -/* The number of bytes in a signed char. */ -#define SIZEOF_SIGNED_CHAR 1 +/* Autokey? */ +#define AUTOKEY -/* Define if you have the K_open function. */ -/* #undef HAVE_K_OPEN */ +/* Define if you have the header file. */ +#define HAVE_ARPA_NAMESER_H 1 -/* Define if you have the __adjtimex function. */ -/* #undef HAVE___ADJTIMEX */ +/* Do we have audio support? */ +/* #undef HAVE_AUDIO */ -/* Define if you have the __ntp_gettime function. */ -/* #undef HAVE___NTP_GETTIME */ +/* Define if you have the header file. */ +/* #undef HAVE_BSTRING_H */ -/* Define if you have the clock_settime function. */ +/* Define if you have the `clock_settime' function. */ #define HAVE_CLOCK_SETTIME 1 -/* Define if you have the daemon function. */ +/* Define if you have the `daemon' function. */ #define HAVE_DAEMON 1 -/* Define if you have the getbootfile function. */ +/* Define if you have the header file. */ +#define HAVE_ERRNO_H 1 + +/* Define if you have the header file. */ +#define HAVE_FCNTL_H 1 + +/* Define if you have the `finite' function. */ +/* #undef HAVE_FINITE */ + +/* Define if you have the `getbootfile' function. */ #define HAVE_GETBOOTFILE 1 -/* Define if you have the getdtablesize function. */ +/* Define if you have the `getclock' function. */ +/* #undef HAVE_GETCLOCK */ + +/* Define if you have the `getdtablesize' function. */ #define HAVE_GETDTABLESIZE 1 -/* Define if you have the getrusage function. */ +/* Define if you have the `getrusage' function. */ #define HAVE_GETRUSAGE 1 -/* Define if you have the gettimeofday function. */ +/* Define if you have the `gettimeofday' function. */ #define HAVE_GETTIMEOFDAY 1 -/* Define if you have the getuid function. */ +/* Define if you have the `getuid' function. */ #define HAVE_GETUID 1 -/* Define if you have the kvm_open function. */ +/* Define if you have the `hstrerror' function. */ +#define HAVE_HSTRERROR 1 + +/* Define if you have the header file. */ +#define HAVE_IEEEFP_H 1 + +/* Define if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define if you have the `isfinite' function. */ +/* #undef HAVE_ISFINITE */ + +/* Define if you have the `kvm_open' function. */ #define HAVE_KVM_OPEN 1 -/* Define if you have the memcpy function. */ +/* Define if you have the `K_open' function. */ +/* #undef HAVE_K_OPEN */ + +/* Define if you have the `advapi32' library (-ladvapi32). */ +/* #undef HAVE_LIBADVAPI32 */ + +/* Define if you have the `elf' library (-lelf). */ +/* #undef HAVE_LIBELF */ + +/* Define if you have the `gen' library (-lgen). */ +/* #undef HAVE_LIBGEN */ + +/* Define if you have the `kvm' library (-lkvm). */ +#define HAVE_LIBKVM 1 + +/* Define if you have the `ld' library (-lld). */ +/* #undef HAVE_LIBLD */ + +/* Define if you have the `mld' library (-lmld). */ +/* #undef HAVE_LIBMLD */ + +/* Define if you have the `nsl' library (-lnsl). */ +/* #undef HAVE_LIBNSL */ + +/* Define if you have the `posix4' library (-lposix4). */ +/* #undef HAVE_LIBPOSIX4 */ + +/* Define if you have the `readline' library (-lreadline). */ +#define HAVE_LIBREADLINE 1 + +/* Define if you have the `rt' library (-lrt). */ +/* #undef HAVE_LIBRT */ + +/* Define if you have the `socket' library (-lsocket). */ +/* #undef HAVE_LIBSOCKET */ + +/* Define if you have the header file. */ +/* #undef HAVE_MACHINE_INLINE_H */ + +/* Define if you have the header file. */ +#define HAVE_MATH_H 1 + +/* Define if you have the `memcpy' function. */ #define HAVE_MEMCPY 1 -/* Define if you have the memlk function. */ +/* Define if you have the `memlk' function. */ /* #undef HAVE_MEMLK */ -/* Define if you have the memmove function. */ +/* Define if you have the `memmove' function. */ #define HAVE_MEMMOVE 1 -/* Define if you have the memset function. */ +/* Define if you have the header file. */ +#define HAVE_MEMORY_H 1 + +/* Define if you have the `memset' function. */ #define HAVE_MEMSET 1 -/* Define if you have the mkstemp function. */ +/* Define if you have the `mkstemp' function. */ #define HAVE_MKSTEMP 1 -/* Define if you have the mktime function. */ +/* Define if you have the `mktime' function. */ #define HAVE_MKTIME 1 -/* Define if you have the mlockall function. */ +/* Define if you have the `mlockall' function. */ /* #undef HAVE_MLOCKALL */ -/* Define if you have the mrand48 function. */ +/* Define if you have the `mrand48' function. */ #define HAVE_MRAND48 1 -/* Define if you have the nice function. */ +/* Define if you have the header file. */ +#define HAVE_NETDB_H 1 + +/* Define if you have the header file. */ +#define HAVE_NETINET_IN_H 1 + +/* Define if you have the header file. */ +#define HAVE_NETINET_IN_SYSTM_H 1 + +/* Define if you have the header file. */ +/* #undef HAVE_NETINFO_NI_H */ + +/* Define if you have the header file. */ +#define HAVE_NET_IF_H 1 + +/* Define if you have the `nice' function. */ #define HAVE_NICE 1 -/* Define if you have the nlist function. */ +/* Define if you have the `nlist' function. */ #define HAVE_NLIST 1 -/* Define if you have the ntp_adjtime function. */ +/* Define if you have the `ntp_adjtime' function. */ #define HAVE_NTP_ADJTIME 1 -/* Define if you have the ntp_gettime function. */ +/* Define if you have the `ntp_gettime' function. */ #define HAVE_NTP_GETTIME 1 -/* Define if you have the plock function. */ +/* Define if you have the `plock' function. */ /* #undef HAVE_PLOCK */ -/* Define if you have the pututline function. */ +/* Define if you have the header file. */ +#define HAVE_POLL_H 1 + +/* Define if you have the `pututline' function. */ /* #undef HAVE_PUTUTLINE */ -/* Define if you have the pututxline function. */ +/* Define if you have the `pututxline' function. */ /* #undef HAVE_PUTUTXLINE */ -/* Define if you have the random function. */ -#define HAVE_RANDOM 1 +/* Define if you have the `random' function. */ +/* #undef HAVE_RANDOM */ + +/* Define if you have the `readlink' function. */ +#define HAVE_READLINK 1 -/* Define if you have the rtprio function. */ -/* #undef HAVE_RTPRIO 1 */ +/* Define if you have the header file. */ +#define HAVE_RESOLV_H 1 + +/* Define if you have the `rtprio' function. */ +#define HAVE_RTPRIO 1 -/* Define if you have the sched_setscheduler function. */ -/* #undef HAVE_SCHED_SETSCHEDULER 1 */ +/* Define if you have the header file. */ +/* #undef HAVE_SCHED_H */ -/* Define if you have the setlinebuf function. */ +/* Define if you have the `sched_setscheduler' function. */ +/* #undef HAVE_SCHED_SETSCHEDULER */ + +/* Define if you have the `setlinebuf' function. */ #define HAVE_SETLINEBUF 1 -/* Define if you have the setpgid function. */ +/* Define if you have the `setpgid' function. */ #define HAVE_SETPGID 1 -/* Define if you have the setpriority function. */ +/* Define if you have the `setpriority' function. */ #define HAVE_SETPRIORITY 1 -/* Define if you have the setsid function. */ +/* Define if you have the `setsid' function. */ #define HAVE_SETSID 1 -/* Define if you have the settimeofday function. */ +/* Define if you have the `settimeofday' function. */ #define HAVE_SETTIMEOFDAY 1 -/* Define if you have the setvbuf function. */ +/* Define if you have the `setvbuf' function. */ #define HAVE_SETVBUF 1 -/* Define if you have the sigaction function. */ +/* Define if you have the header file. */ +#define HAVE_SGTTY_H 1 + +/* Define if you have the `sigaction' function. */ #define HAVE_SIGACTION 1 -/* Define if you have the sigset function. */ +/* Define if you have the `sigset' function. */ /* #undef HAVE_SIGSET */ -/* Define if you have the sigsuspend function. */ +/* Define if you have the `sigsuspend' function. */ #define HAVE_SIGSUSPEND 1 -/* Define if you have the sigvec function. */ +/* Define if you have the `sigvec' function. */ #define HAVE_SIGVEC 1 -/* Define if you have the srand48 function. */ +/* Define if you have the `snprintf' function. */ +#define HAVE_SNPRINTF 1 + +/* Define if you have the `srand48' function. */ #define HAVE_SRAND48 1 -/* Define if you have the srandom function. */ -#define HAVE_SRANDOM 1 +/* Define if you have the header file. */ +#define HAVE_STDLIB_H 1 -/* Define if you have the stime function. */ +/* Define if you have the `stime' function. */ /* #undef HAVE_STIME */ -/* Define if you have the strchr function. */ +/* Define if you have the `strchr' function. */ #define HAVE_STRCHR 1 -/* Define if you have the strerror function. */ -#define HAVE_STRERROR 1 - -/* Define if you have the sysconf function. */ -#define HAVE_SYSCONF 1 - -/* Define if you have the sysctl function. */ -#define HAVE_SYSCTL 1 - -/* Define if you have the timer_create function. */ -/* #undef HAVE_TIMER_CREATE */ - -/* Define if you have the timer_settime function. */ -/* #undef HAVE_TIMER_SETTIME */ - -/* Define if you have the umask function. */ -#define HAVE_UMASK 1 - -/* Define if you have the uname function. */ -#define HAVE_UNAME 1 +/* Define if you have the `strdup' function. */ +#define HAVE_STRDUP 1 -/* Define if you have the updwtmp function. */ -/* #undef HAVE_UPDWTMP */ - -/* Define if you have the updwtmpx function. */ -/* #undef HAVE_UPDWTMPX */ - -/* Define if you have the vsprintf function. */ -#define HAVE_VSPRINTF 1 - -/* Define if you have the header file. */ -/* #undef HAVE__SYS_SYNC_QUEUE_H */ - -/* Define if you have the header file. */ -/* #undef HAVE__SYS_SYNC_SEMA_H */ - -/* Define if you have the header file. */ -#define HAVE_ARPA_NAMESER_H 1 - -/* Define if you have the header file. */ -/* #undef HAVE_BSTRING_H */ - -/* Define if you have the header file. */ -#define HAVE_ERRNO_H 1 - -/* Define if you have the header file. */ -#define HAVE_FCNTL_H 1 - -/* Define if you have the header file. */ -/* #undef HAVE_MACHINE_INLINE_H */ - -/* Define if you have the header file. */ -#define HAVE_MEMORY_H 1 - -/* Define if you have the header file. */ -#define HAVE_NET_IF_H 1 - -/* Define if you have the header file. */ -#define HAVE_NETDB_H 1 - -/* Define if you have the header file. */ -#define HAVE_NETINET_IN_H 1 - -/* Define if you have the header file. */ -#define HAVE_NETINET_IN_SYSTM_H 1 +/* Define if you have the `strerror' function. */ +#define HAVE_STRERROR 1 -/* Define if you have the header file. */ -/* #undef HAVE_NETINFO_NI_H */ +/* Define if you have the header file. */ +#define HAVE_STRINGS_H 1 -/* Define if you have the header file. */ -#define HAVE_POLL_H 1 +/* Define if you have the header file. */ +#define HAVE_STRING_H 1 -/* Define if you have the header file. */ -#define HAVE_RESOLV_H 1 +/* Do we have struct ntptimeval? */ +#define HAVE_STRUCT_NTPTIMEVAL 1 -/* Define if you have the header file. */ -#define HAVE_SCHED_H 1 +/* Define if `time.tv_nsec' is member of `struct ntptimeval'. */ +#define HAVE_STRUCT_NTPTIMEVAL_TIME_TV_NSEC 1 -/* Define if you have the header file. */ -#define HAVE_SGTTY_H 1 +/* Do we have struct timespec? */ +#define HAVE_STRUCT_TIMESPEC 1 -/* Define if you have the header file. */ -#define HAVE_STDLIB_H 1 +/* Define if you have the header file. */ +/* #undef HAVE_SUN_AUDIOIO_H */ -/* Define if you have the header file. */ -#define HAVE_STRING_H 1 +/* Define if you have the `sysconf' function. */ +#define HAVE_SYSCONF 1 -/* Define if you have the header file. */ -/* #undef HAVE_SUN_AUDIOIO_H */ +/* Define if you have the `sysctl' function. */ +#define HAVE_SYSCTL 1 -/* Define if you have the header file. */ +/* Define if you have the header file. */ /* #undef HAVE_SYS_AUDIOIO_H */ -/* Define if you have the header file. */ +/* Define if you have the header file. */ /* #undef HAVE_SYS_CLKDEFS_H */ -/* Define if you have the header file. */ +/* Define if you have the header file. */ #define HAVE_SYS_FILE_H 1 -/* Define if you have the header file. */ +/* Define if you have the header file. */ /* #undef HAVE_SYS_I8253_H */ -/* Define if you have the header file. */ +/* Define if you have the header file. */ #define HAVE_SYS_IOCTL_H 1 -/* Define if you have the header file. */ +/* Define if you have the header file. */ #define HAVE_SYS_LOCK_H 1 -/* Define if you have the header file. */ +/* Define if you have the header file. */ #define HAVE_SYS_MMAN_H 1 -/* Define if you have the header file. */ +/* Define if you have the header file. */ /* #undef HAVE_SYS_MODEM_H */ -/* Define if you have the header file. */ +/* Define if you have the header file. */ #define HAVE_SYS_PARAM_H 1 -/* Define if you have the header file. */ +/* Define if you have the header file. */ /* #undef HAVE_SYS_PCL720_H */ -/* Define if you have the header file. */ +/* Define if you have the header file. */ /* #undef HAVE_SYS_PPSCLOCK_H */ -/* Define if you have the header file. */ +/* Define if you have the header file. */ /* #undef HAVE_SYS_PPSTIME_H */ -/* Define if you have the header file. */ +/* Define if you have the header file. */ #define HAVE_SYS_PROC_H 1 -/* Define if you have the header file. */ +/* Define if you have the header file. */ #define HAVE_SYS_RESOURCE_H 1 -/* Define if you have the header file. */ +/* Define if you have the header file. */ /* #undef HAVE_SYS_SCHED_H */ -/* Define if you have the header file. */ +/* Define if you have the header file. */ #define HAVE_SYS_SELECT_H 1 -/* Define if you have the header file. */ +/* Define if you have the header file. */ /* #undef HAVE_SYS_SIO_H */ -/* Define if you have the header file. */ +/* Define if you have the header file. */ #define HAVE_SYS_SOCKIO_H 1 -/* Define if you have the header file. */ +/* Define if you have the header file. */ #define HAVE_SYS_STAT_H 1 -/* Define if you have the header file. */ +/* Define if you have the header file. */ /* #undef HAVE_SYS_STREAM_H */ -/* Define if you have the header file. */ +/* Define if you have the header file. */ /* #undef HAVE_SYS_STROPTS_H */ -/* Define if you have the header file. */ +/* Define if you have the header file. */ #define HAVE_SYS_SYSCTL_H 1 -/* Define if you have the header file. */ +/* Define if you have the header file. */ /* #undef HAVE_SYS_SYSSGI_H */ -/* Define if you have the header file. */ +/* Define if you have the header file. */ #define HAVE_SYS_TERMIOS_H 1 -/* Define if you have the header file. */ -#define HAVE_SYS_TIME_H 1 - -/* Define if you have the header file. */ +/* Define if you have the header file. */ #define HAVE_SYS_TIMEPPS_H 1 -/* Define if you have the header file. */ +/* Define if you have the header file. */ #define HAVE_SYS_TIMERS_H 1 -/* Define if you have the header file. */ +/* Define if you have the header file. */ #define HAVE_SYS_TIMEX_H 1 -/* Define if you have the header file. */ +/* Define if you have the header file. */ +#define HAVE_SYS_TIME_H 1 + +/* Define if you have the header file. */ /* #undef HAVE_SYS_TPRO_H */ -/* Define if you have the header file. */ +/* Define if you have the header file. */ #define HAVE_SYS_TYPES_H 1 -/* Define if you have the header file. */ +/* Define if you have the header file. */ #define HAVE_SYS_WAIT_H 1 -/* Define if you have the header file. */ -/* #undef HAVE_TERMIO_H */ +/* Define if the system has the type `s_char'. */ +/* #undef HAVE_S_CHAR */ -/* Define if you have the header file. */ +/* Define if you have the header file. */ #define HAVE_TERMIOS_H 1 -/* Define if you have the header file. */ +/* Define if you have the header file. */ +/* #undef HAVE_TERMIO_H */ + +/* Define if you have the header file. */ /* #undef HAVE_TIMEPPS_H */ -/* Define if you have the header file. */ +/* Define if you have the `timer_create' function. */ +/* #undef HAVE_TIMER_CREATE */ + +/* Define if you have the `timer_settime' function. */ +/* #undef HAVE_TIMER_SETTIME */ + +/* Define if you have the header file. */ /* #undef HAVE_TIMEX_H */ -/* Define if you have the header file. */ +/* Define if you have the `umask' function. */ +#define HAVE_UMASK 1 + +/* Define if you have the `uname' function. */ +#define HAVE_UNAME 1 + +/* Define if you have the header file. */ #define HAVE_UNISTD_H 1 -/* Define if you have the header file. */ -#define HAVE_UTMP_H 1 +/* Define if you have the `updwtmp' function. */ +/* #undef HAVE_UPDWTMP */ -/* Define if you have the header file. */ -/* #undef HAVE_UTMPX_H */ +/* Define if you have the `updwtmpx' function. */ +/* #undef HAVE_UPDWTMPX */ -/* Define if you have the advapi32 library (-ladvapi32). */ -/* #undef HAVE_LIBADVAPI32 */ +/* Define if you have the header file. */ +/* #undef HAVE_UTMPX_H */ -/* Define if you have the elf library (-lelf). */ -/* #undef HAVE_LIBELF */ +/* Define if you have the header file. */ +#define HAVE_UTMP_H 1 -/* Define if you have the gen library (-lgen). */ -/* #undef HAVE_LIBGEN */ +/* Define if you have the `vsprintf' function. */ +#define HAVE_VSPRINTF 1 -/* Define if you have the kvm library (-lkvm). */ -#define HAVE_LIBKVM 1 +/* Define if you have the header file. */ +/* #undef HAVE__SYS_SYNC_QUEUE_H */ -/* Define if you have the ld library (-lld). */ -/* #undef HAVE_LIBLD */ +/* Define if you have the header file. */ +/* #undef HAVE__SYS_SYNC_SEMA_H */ -/* Define if you have the mld library (-lmld). */ -/* #undef HAVE_LIBMLD */ +/* Define if you have the `__adjtimex' function. */ +/* #undef HAVE___ADJTIMEX */ -/* Define if you have the nsl library (-lnsl). */ -/* #undef HAVE_LIBNSL */ +/* Define if you have the `__ntp_gettime' function. */ +/* #undef HAVE___NTP_GETTIME */ -/* Define if you have the rt library (-lrt). */ -/* #undef HAVE_LIBRT */ +/* Default location of crypto key info */ +#define NTP_KEYSDIR "/usr/local/etc" -/* Define if you have the socket library (-lsocket). */ -/* #undef HAVE_LIBSOCKET */ +/* Use OpenSSL? */ +/* #undef OPENSSL */ /* Name of package */ #define PACKAGE "ntp" -/* Version number of package */ -#define VERSION "4.0.99b" - /* Define if compiler has function prototypes */ #define PROTOTYPES 1 -/* Do we have struct ntptimeval? */ -#define HAVE_STRUCT_NTPTIMEVAL 1 +/* Public key? */ +/* #undef PUBKEY */ + +/* Define as the return type of signal handlers (`int' or `void'). */ +#define RETSIGTYPE void + +/* Use RSAREF? */ +/* #undef RSAREF */ + +/* The size of a `int', as computed by sizeof. */ +#define SIZEOF_INT 4 + +/* The size of a `long', as computed by sizeof. */ +#ifdef __alpha__ +#define SIZEOF_LONG 8 +#else +#define SIZEOF_LONG 4 +#endif + +/* The size of a `signed char', as computed by sizeof. */ +#define SIZEOF_SIGNED_CHAR 1 + +/* Define if you have the ANSI C header files. */ +#define STDC_HEADERS 1 + +/* Define if you can safely include both and . */ +#define TIME_WITH_SYS_TIME 1 -/* Does ntptimeval use struct timespec? */ -#define TIMESPEC_IN_NTPTIMEVAL 1 +/* Define if your declares `struct tm'. */ +/* #undef TM_IN_SYS_TIME */ + +/* Version number of package */ +#define VERSION "4.1.0" + +/* Define if your processor stores words with the most significant byte first + (like Motorola and SPARC, unlike Intel and VAX). */ +/* #undef WORDS_BIGENDIAN */ + +/* Define if on AIX 3. + System headers sometimes define this. + We just want to avoid a redefinition error message. */ +#ifndef _ALL_SOURCE +/* # undef _ALL_SOURCE */ +#endif + +/* Define if on MINIX. */ +/* #undef _MINIX */ + +/* Define if the system does not provide POSIX.1 features except with this + defined. */ +/* #undef _POSIX_1_SOURCE */ + +/* Define if you need to in order for stat and other things to work. */ +/* #undef _POSIX_SOURCE */ +/* Define if type `char' is unsigned and you are not using gcc. */ +#ifndef __CHAR_UNSIGNED__ +/* # undef __CHAR_UNSIGNED__ */ +#endif + +/* Define to empty if `const' does not conform to ANSI C. */ +/* #undef const */ + +/* Define to `int' if doesn't define. */ +/* #undef gid_t */ + +/* Define as `__inline' if that's what the C compiler calls it, or to nothing + if it is not supported. */ +/* #undef inline */ + +/* Define to `long' if does not define. */ +/* #undef off_t */ + +/* Define to `unsigned' if does not define. */ +/* #undef size_t */ + +/* Define to `long' if does not define. */ +/* #undef time_t */ + +/* Define to `int' if doesn't define. */ +/* #undef uid_t */ diff --git a/usr.sbin/ntp/libntp/Makefile b/usr.sbin/ntp/libntp/Makefile index 498e250..589c289 100644 --- a/usr.sbin/ntp/libntp/Makefile +++ b/usr.sbin/ntp/libntp/Makefile @@ -9,23 +9,23 @@ NOPIC= true INTERNALSTATICLIB= true NOMAN= true -SRCS= a_md5encrypt.c adjtime.c atoint.c \ - atolfp.c atouint.c authencrypt.c authkeys.c \ +SRCS= a_md5encrypt.c adjtime.c atoint.c atolfp.c \ + atouint.c audio.c authencrypt.c authkeys.c \ authparity.c authreadkeys.c authusekey.c binio.c \ buftvtots.c caljulian.c calleapwhen.c caltontp.c \ calyearstart.c clocktime.c clocktypes.c decodenetnum.c \ dofptoa.c dolfptoa.c emalloc.c findconfig.c \ - fptoa.c fptoms.c getopt.c gpstolfp.c \ - hextoint.c hextolfp.c humandate.c ieee754io.c \ - inttoa.c iosignal.c lib_strbuf.c \ - machines.c md5c.c memmove.c \ - mfp_mul.c mfptoa.c mfptoms.c \ - modetoa.c mstolfp.c msutotsf.c msyslog.c \ - netof.c numtoa.c numtohost.c octtoint.c \ - prettydate.c ranny.c recvbuff.c refnumtoa.c \ - statestr.c syssignal.c systime.c \ - tsftomsu.c tstotv.c tvtoa.c tvtots.c \ - uglydate.c uinttoa.c utvtoa.c ymd2yd.c + fptoa.c fptoms.c getopt.c gpstolfp.c \ + hextoint.c hextolfp.c humandate.c icom.c \ + ieee754io.c inttoa.c iosignal.c lib_strbuf.c \ + machines.c md5c.c memmove.c mfp_mul.c \ + mfptoa.c mfptoms.c modetoa.c mstolfp.c \ + msutotsf.c msyslog.c netof.c numtoa.c \ + numtohost.c octtoint.c prettydate.c ranny.c \ + recvbuff.c refnumtoa.c statestr.c syssignal.c \ + systime.c tsftomsu.c tstotv.c tvtoa.c \ + tvtots.c uglydate.c uinttoa.c utvtoa.c \ + ymd2yd.c CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ diff --git a/usr.sbin/ntp/libparse/Makefile b/usr.sbin/ntp/libparse/Makefile index 0e28830..1a142ba 100644 --- a/usr.sbin/ntp/libparse/Makefile +++ b/usr.sbin/ntp/libparse/Makefile @@ -9,12 +9,10 @@ INTERNALLIB= true INTERNALSTATICLIB= true NOMAN= true -SRCS= parse.c parse_conf.c \ - clk_computime.c clk_dcf7000.c clk_hopf6021.c \ - clk_meinberg.c clk_rawdcf.c clk_rcc8000.c \ - clk_schmid.c clk_trimtaip.c clk_trimtsip.c \ - clk_varitext.c clk_wharton.c data_mbg.c \ - info_trimble.c trim_info.c +SRCS= clk_computime.c clk_dcf7000.c clk_hopf6021.c clk_meinberg.c \ + clk_rawdcf.c clk_rcc8000.c clk_schmid.c clk_trimtaip.c \ + clk_trimtsip.c clk_varitext.c clk_wharton.c data_mbg.c \ + info_trimble.c parse.c parse_conf.c trim_info.c CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ diff --git a/usr.sbin/ntp/ntpd/Makefile b/usr.sbin/ntp/ntpd/Makefile index 766ad47..84fd658 100644 --- a/usr.sbin/ntp/ntpd/Makefile +++ b/usr.sbin/ntp/ntpd/Makefile @@ -2,25 +2,28 @@ .PATH: ${.CURDIR}/../../../contrib/ntp/ntpd -PROG= ntpd -NOMAN= yes -SRCS= map_vme.c ntp_config.c \ - ntp_control.c ntp_filegen.c ntp_intres.c \ - ntp_io.c ntp_loopfilter.c ntp_monitor.c \ - ntp_peer.c ntp_proto.c ntp_refclock.c \ - ntp_request.c ntp_restrict.c ntp_timer.c \ - ntp_util.c ntpd.c refclock_acts.c \ - refclock_arbiter.c refclock_arc.c refclock_as2201.c \ - refclock_atom.c refclock_bancomm.c refclock_chronolog.c \ - refclock_chu.c refclock_conf.c refclock_datum.c \ - refclock_dumbclock.c refclock_gpsvme.c refclock_heath.c \ - refclock_hpgps.c refclock_irig.c refclock_jupiter.c \ - refclock_leitch.c refclock_local.c refclock_msfees.c \ - refclock_mx4200.c refclock_nmea.c refclock_oncore.c \ - refclock_palisade.c refclock_parse.c refclock_pst.c \ +PROG= ntpd +NOMAN= yes +SRCS= cmd_args.c map_vme.c ntp_config.c \ + ntp_control.c ntp_crypto.c ntp_filegen.c \ + ntp_intres.c ntp_io.c ntp_loopfilter.c \ + ntp_monitor.c ntp_peer.c ntp_proto.c \ + ntp_refclock.c ntp_request.c ntp_resolver.c \ + ntp_restrict.c ntp_timer.c ntp_util.c \ + ntpd.c refclock_acts.c refclock_arbiter.c \ + refclock_arc.c refclock_as2201.c refclock_atom.c \ + refclock_bancomm.c refclock_chronolog.c refclock_chu.c \ + refclock_conf.c refclock_datum.c refclock_dumbclock.c \ + refclock_fg.c refclock_gpsvme.c refclock_heath.c \ + refclock_hopfpci.c refclock_hopfser.c refclock_hpgps.c \ + refclock_irig.c refclock_jupiter.c refclock_leitch.c \ + refclock_local.c refclock_msfees.c refclock_mx4200.c \ + refclock_nmea.c refclock_oncore.c refclock_palisade.c \ + refclock_parse.c refclock_pcf.c refclock_pst.c \ refclock_ptbacts.c refclock_shm.c refclock_tpro.c \ - refclock_trak.c refclock_true.c refclock_usno.c \ - refclock_wwvb.c version.c + refclock_trak.c refclock_true.c refclock_ulink.c \ + refclock_usno.c refclock_wwv.c refclock_wwvb.c \ + version.c CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ @@ -32,7 +35,4 @@ CLEANFILES+= .version version.c version.c: sh -e ${.CURDIR}/../scripts/mkver ntpd -afterinstall: - rm -f ${DESTDIR}/usr/sbin/xntpd - .include diff --git a/usr.sbin/ntp/ntpdc/Makefile b/usr.sbin/ntp/ntpdc/Makefile index 8a37ae1..2cc9c4e 100644 --- a/usr.sbin/ntp/ntpdc/Makefile +++ b/usr.sbin/ntp/ntpdc/Makefile @@ -8,8 +8,8 @@ SRCS= ntpdc.c ntpdc_ops.c version.c CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ -DPADD= ${LIBNTP} -LDADD= ${LIBNTP} +DPADD= ${LIBNTP} -lreadline +LDADD= ${LIBNTP} -lreadline CLEANFILES+= .version version.c diff --git a/usr.sbin/ntp/scripts/mkver b/usr.sbin/ntp/scripts/mkver index 075b197..c4f8920 100755 --- a/usr.sbin/ntp/scripts/mkver +++ b/usr.sbin/ntp/scripts/mkver @@ -1,15 +1,24 @@ #!/bin/sh +# # $FreeBSD$ +# PROG=${1-UNKNOWN} ConfStr="$PROG" +ConfStr="$ConfStr 4.1.0" + case "" in - '') ;; - *) ConfStr="$ConfStr RSAREF" ;; + '') + case "1" in + '') ;; + *) ConfStr="${ConfStr}-a" ;; + esac + ;; + *) ConfStr="${ConfStr}-r" ;; esac -ConfStr="$ConfStr 4.0.99b `LC_ALL=C date`" +ConfStr="$ConfStr `LC_ALL=C date`" if [ ! -f .version ]; then echo 0 > .version -- cgit v1.1