diff options
author | roberto <roberto@FreeBSD.org> | 2002-10-29 20:20:36 +0000 |
---|---|---|
committer | roberto <roberto@FreeBSD.org> | 2002-10-29 20:20:36 +0000 |
commit | bf15655db7f4981cadaf159959795e0d99fff6b6 (patch) | |
tree | 6f3f208d4f2eb47f50abb098075fec027b5aadf2 | |
parent | 83149da41b3902d5e9d9fce6bf52da131ec3218b (diff) | |
download | FreeBSD-src-bf15655db7f4981cadaf159959795e0d99fff6b6.zip FreeBSD-src-bf15655db7f4981cadaf159959795e0d99fff6b6.tar.gz |
Update ntpd to 4.1.1a. This contains many bug fixes made on the STABLE
branch and a few new drivers. See contrib/ntp/ChangeLog for details.
Hide kernel header sys/lock.h from ntp [1]
PR: bin/33914
Submitted by: thomas, bde[1]
MFC after: 1 month
-rw-r--r-- | usr.sbin/ntp/config.h | 57 | ||||
-rw-r--r-- | usr.sbin/ntp/doc/Makefile | 2 | ||||
-rw-r--r-- | usr.sbin/ntp/ntpd/Makefile | 2 | ||||
-rw-r--r-- | usr.sbin/ntp/ntpq/Makefile | 4 | ||||
-rwxr-xr-x | usr.sbin/ntp/scripts/mkver | 7 |
5 files changed, 55 insertions, 17 deletions
diff --git a/usr.sbin/ntp/config.h b/usr.sbin/ntp/config.h index fb50848..4d45c95 100644 --- a/usr.sbin/ntp/config.h +++ b/usr.sbin/ntp/config.h @@ -2,7 +2,7 @@ /* config.h.in. Generated automatically from configure.in by autoheader. */ /* $FreeBSD$ */ /* debugging code */ -#define DEBUG 1 +/* #undef DEBUG */ /* Minutes per DST adjustment */ #define DSTMINUTES 60 @@ -85,6 +85,9 @@ /* Sun IRIG audio decoder */ /* #undef CLOCK_IRIG */ +/* JJY receiver */ +/* #undef CLOCK_JJY */ + /* Rockwell Jupiter GPS clock */ /* #undef CLOCK_JUPITER */ @@ -197,10 +200,14 @@ /* #undef NEED_HPUX_FINDCONFIG */ /* canonical system (cpu-vendor-os) string */ -#ifdef __alpha__ -#define STR_SYSTEM "alpha-unknown-freebsd" +#if defined(__alpha__) +#define STR_SYSTEM "alpha-undermydesk-freebsd" +#elif defined(__sparc64__) +#define STR_SYSTEM "sparc64-undermydesk-freebsd" +#elif defined(__ia64__) +#define STR_SYSTEM "ia64-undermydesk-freebsd" #else -#define STR_SYSTEM "i386-unknown-freebsd" +#define STR_SYSTEM "i386-undermydesk-freebsd" #endif /* define if NetInfo support is available */ @@ -219,7 +226,7 @@ #define HAVE_SA_SIGACTION_IN_STRUCT_SIGACTION 1 /* define if struct clockinfo has tickadj */ -#define HAVE_TICKADJ_IN_STRUCT_CLOCKINFO 1 +/* #undef HAVE_TICKADJ_IN_STRUCT_CLOCKINFO */ /* define if struct ntptimeval uses time.tv_nsec instead of time.tv_usec */ /* #undef HAVE_TV_NSEC_IN_NTPTIMEVAL */ @@ -409,6 +416,9 @@ /* hstrerror()? */ /* #undef DECL_HSTRERROR_0 */ +/* inet_ntoa()? */ +/* #undef DECL_INET_NTOA_0 */ + /* ioctl()? */ /* #undef DECL_IOCTL_0 */ @@ -488,6 +498,12 @@ /* Autokey? */ #define AUTOKEY +/* TrueTime 560 IRIG-B decoder? */ +/* #undef CLOCK_TT560 */ + +/* Zyfer GPStarplus */ +/* #undef CLOCK_ZYFER */ + /* Define if you have the <arpa/nameser.h> header file. */ #define HAVE_ARPA_NAMESER_H 1 @@ -497,6 +513,9 @@ /* Define if you have the <bstring.h> header file. */ /* #undef HAVE_BSTRING_H */ +/* Define if you have the `clock_gettime' function. */ +#define HAVE_CLOCK_GETTIME 1 + /* Define if you have the `clock_settime' function. */ #define HAVE_CLOCK_SETTIME 1 @@ -524,9 +543,6 @@ /* Define if you have the `getrusage' function. */ #define HAVE_GETRUSAGE 1 -/* Define if you have the `gettimeofday' function. */ -#define HAVE_GETTIMEOFDAY 1 - /* Define if you have the `getuid' function. */ #define HAVE_GETUID 1 @@ -581,6 +597,9 @@ /* Define if you have the `socket' library (-lsocket). */ /* #undef HAVE_LIBSOCKET */ +/* Define if you have the `syslog' library (-lsyslog). */ +/* #undef HAVE_LIBSYSLOG */ + /* Define if you have the <machine/inline.h> header file. */ /* #undef HAVE_MACHINE_INLINE_H */ @@ -620,9 +639,15 @@ /* Define if you have the <netinet/in.h> header file. */ #define HAVE_NETINET_IN_H 1 +/* Define if you have the <netinet/in_system.h> header file. */ +/* #undef HAVE_NETINET_IN_SYSTEM_H */ + /* Define if you have the <netinet/in_systm.h> header file. */ #define HAVE_NETINET_IN_SYSTM_H 1 +/* Define if you have the <netinet/ip.h> header file. */ +#define HAVE_NETINET_IP_H 1 + /* Define if you have the <netinfo/ni.h> header file. */ /* #undef HAVE_NETINFO_NI_H */ @@ -710,6 +735,9 @@ /* Define if you have the `srand48' function. */ #define HAVE_SRAND48 1 +/* Define if you have the <stdint.h> header file. */ +#define HAVE_STDINT_H 1 + /* Define if you have the <stdlib.h> header file. */ #define HAVE_STDLIB_H 1 @@ -765,7 +793,7 @@ #define HAVE_SYS_IOCTL_H 1 /* Define if you have the <sys/lock.h> header file. */ -#define HAVE_SYS_LOCK_H 1 +/* #undef HAVE_SYS_LOCK_H */ /* Define if you have the <sys/mman.h> header file. */ #define HAVE_SYS_MMAN_H 1 @@ -797,6 +825,9 @@ /* Define if you have the <sys/select.h> header file. */ #define HAVE_SYS_SELECT_H 1 +/* Define if you have the <sys/signal.h> header file. */ +#define HAVE_SYS_SIGNAL_H 1 + /* Define if you have the <sys/sio.h> header file. */ /* #undef HAVE_SYS_SIO_H */ @@ -924,7 +955,7 @@ #define SIZEOF_INT 4 /* The size of a `long', as computed by sizeof. */ -#ifdef __alpha__ +#if defined(__alpha__) || defined(__ia64__) || defined(__sparc64__) #define SIZEOF_LONG 8 #else #define SIZEOF_LONG 4 @@ -943,11 +974,13 @@ /* #undef TM_IN_SYS_TIME */ /* Version number of package */ -#define VERSION "4.1.0" +#define VERSION "4.1.1a" /* Define if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel and VAX). */ -/* #undef WORDS_BIGENDIAN */ +#if defined(__sparc64__) +#define WORDS_BIGENDIAN 1 +#endif /* Define if on AIX 3. System headers sometimes define this. diff --git a/usr.sbin/ntp/doc/Makefile b/usr.sbin/ntp/doc/Makefile index 8c79e51..b52cae4 100644 --- a/usr.sbin/ntp/doc/Makefile +++ b/usr.sbin/ntp/doc/Makefile @@ -19,7 +19,7 @@ FILES= accopt.htm assoc.htm audio.htm authopt.htm biblio.htm build.htm \ notes.htm ntpd.htm ntpdate.htm ntpdc.htm ntpq.htm ntptime.htm \ ntptrace.htm parsedata.htm parsenew.htm patches.htm porting.htm \ pps.htm prefer.htm qth.htm quick.htm rdebug.htm refclock.htm \ - release.htm tickadj.htm vxworks.htm y2k.htm + release.htm tickadj.htm MAN= ntp.conf.5 ntp.keys.5 MAN+= ntp-genkeys.8 ntpd.8 ntpdate.8 ntpdc.8 ntpq.8 ntptime.8 ntptrace.8 diff --git a/usr.sbin/ntp/ntpd/Makefile b/usr.sbin/ntp/ntpd/Makefile index 84fd658..aa91c02 100644 --- a/usr.sbin/ntp/ntpd/Makefile +++ b/usr.sbin/ntp/ntpd/Makefile @@ -8,7 +8,7 @@ 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_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 \ diff --git a/usr.sbin/ntp/ntpq/Makefile b/usr.sbin/ntp/ntpq/Makefile index 17d5545..f17aa63 100644 --- a/usr.sbin/ntp/ntpq/Makefile +++ b/usr.sbin/ntp/ntpq/Makefile @@ -10,8 +10,8 @@ SRCS= ntpq.c ntpq_ops.c version.c CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ -DPADD= ${LIBNTP} -LDADD= ${LIBNTP} +DPADD= ${LIBNTP} ${LIBREADLINE} ${LIBTERMCAP} +LDADD= ${LIBNTP} -lreadline -ltermcap CLEANFILES+= .version version.c diff --git a/usr.sbin/ntp/scripts/mkver b/usr.sbin/ntp/scripts/mkver index c4f8920..fe55908 100755 --- a/usr.sbin/ntp/scripts/mkver +++ b/usr.sbin/ntp/scripts/mkver @@ -6,7 +6,12 @@ PROG=${1-UNKNOWN} ConfStr="$PROG" -ConfStr="$ConfStr 4.1.0" +ConfStr="$ConfStr 4.1.1a" + +case "$CSET" in + '') ;; + *) ConfStr="$ConfStr@$CSET" ;; +esac case "" in '') |