diff options
Diffstat (limited to 'usr.sbin')
-rw-r--r-- | usr.sbin/ntp/config.h | 32 | ||||
-rw-r--r-- | usr.sbin/ntp/doc/ntp-keygen.8 | 6 | ||||
-rw-r--r-- | usr.sbin/ntp/doc/ntp.conf.5 | 14 | ||||
-rw-r--r-- | usr.sbin/ntp/doc/ntp.keys.5 | 8 | ||||
-rw-r--r-- | usr.sbin/ntp/doc/ntpd.8 | 4 | ||||
-rw-r--r-- | usr.sbin/ntp/doc/ntpdc.8 | 4 | ||||
-rw-r--r-- | usr.sbin/ntp/doc/ntpq.8 | 4 | ||||
-rw-r--r-- | usr.sbin/ntp/doc/sntp.8 | 4 | ||||
-rwxr-xr-x | usr.sbin/ntp/scripts/mkver | 2 |
9 files changed, 49 insertions, 29 deletions
diff --git a/usr.sbin/ntp/config.h b/usr.sbin/ntp/config.h index a33891eb2eca9..56dbfedba6ecb 100644 --- a/usr.sbin/ntp/config.h +++ b/usr.sbin/ntp/config.h @@ -313,6 +313,9 @@ /* Provide the explicit 127.0.0.0/8 martian filter? */ #define ENABLE_BUG3020_FIX 1 +/* Enable CMAC support? */ +#define ENABLE_CMAC 1 + /* nls support in libopts */ /* #undef ENABLE_NLS */ @@ -374,6 +377,14 @@ /* Define to 1 if you have the `daemon' function. */ #define HAVE_DAEMON 1 +/* Define to 1 if you have the declaration of `siglongjmp', and to 0 if you + don't. */ +#define HAVE_DECL_SIGLONGJMP 1 + +/* Define to 1 if you have the declaration of `sigsetjmp', and to 0 if you + don't. */ +#define HAVE_DECL_SIGSETJMP 1 + /* Define to 1 if you have the declaration of `strerror_r', and to 0 if you don't. */ #define HAVE_DECL_STRERROR_R 1 @@ -655,6 +666,12 @@ /* if you have NT Threads */ /* #undef HAVE_NT_THREADS */ +/* Define to 1 if you have the <openssl/cmac.h> header file. */ +#define HAVE_OPENSSL_CMAC_H 1 + +/* Define to 1 if you have the <openssl/hmac.h> header file. */ +#define HAVE_OPENSSL_HMAC_H 1 + /* Define to 1 if the system has the type `pid_t'. */ #define HAVE_PID_T 1 @@ -959,6 +976,9 @@ /* Define to 1 if you have the <sys/lock.h> header file. */ #define HAVE_SYS_LOCK_H 1 +/* Define to 1 if you have the <sys/mac.h> header file. */ +#define HAVE_SYS_MAC_H 1 + /* Define to 1 if you have the <sys/mman.h> header file. */ #define HAVE_SYS_MMAN_H 1 @@ -1448,7 +1468,7 @@ #define PACKAGE_NAME "ntp" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "ntp 4.2.8p11" +#define PACKAGE_STRING "ntp 4.2.8p12" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "ntp" @@ -1457,7 +1477,7 @@ #define PACKAGE_URL "http://www.ntp.org./" /* Define to the version of this package. */ -#define PACKAGE_VERSION "4.2.8p11" +#define PACKAGE_VERSION "4.2.8p12" /* data dir */ #define PERLLIBDIR "/usr/share/ntp/lib" @@ -1638,10 +1658,10 @@ typedef unsigned int uintptr_t; /* #undef USE_UDP_SIGPOLL */ /* Version number of package */ -#define VERSION "4.2.8p11" +#define VERSION "4.2.8p12" /* vsnprintf expands "%m" to strerror(errno) */ -/* #undef VSNPRINTF_PERCENT_M */ +#define VSNPRINTF_PERCENT_M 1 /* configure --enable-ipv6 */ #define WANT_IPV6 1 @@ -1815,5 +1835,5 @@ typedef union mpinfou { /* * FreeBSD specific: Explicitly specify date/time for reproducible build. */ -#define MKREPRO_DATE "Feb 28 2018" -#define MKREPRO_TIME "06:33:03" +#define MKREPRO_DATE "Aug 19 2018" +#define MKREPRO_TIME "01:24:29" diff --git a/usr.sbin/ntp/doc/ntp-keygen.8 b/usr.sbin/ntp/doc/ntp-keygen.8 index e4b7eafc77306..f17666d650c6d 100644 --- a/usr.sbin/ntp/doc/ntp-keygen.8 +++ b/usr.sbin/ntp/doc/ntp-keygen.8 @@ -1,11 +1,11 @@ -.Dd February 27 2018 +.Dd August 14 2018 .Dt NTP_KEYGEN 8 User Commands .Os .\" EDIT THIS FILE WITH CAUTION (ntp-keygen-opts.mdoc) .\" .\" $FreeBSD$ .\" -.\" It has been AutoGen-ed February 27, 2018 at 05:16:00 PM by AutoGen 5.18.5 +.\" It has been AutoGen-ed August 14, 2018 at 08:30:38 AM by AutoGen 5.18.5 .\" From the definitions ntp-keygen-opts.def .\" and the template file agmdoc-cmd.tpl .Sh NAME @@ -945,7 +945,7 @@ Following the header the keys are entered one per line in the format .D1 Ar keyno Ar type Ar key where .Ar keyno -is a positive integer in the range 1\-65534; +is a positive integer in the range 1\-65535; .Ar type is the key type for the message digest algorithm, which in the absence of the OpenSSL library must be diff --git a/usr.sbin/ntp/doc/ntp.conf.5 b/usr.sbin/ntp/doc/ntp.conf.5 index 14632ce51b991..efbc983fd0d56 100644 --- a/usr.sbin/ntp/doc/ntp.conf.5 +++ b/usr.sbin/ntp/doc/ntp.conf.5 @@ -1,11 +1,11 @@ -.Dd February 27 2018 +.Dd August 14 2018 .Dt NTP_CONF 5 File Formats .Os .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" .\" $FreeBSD$ .\" -.\" It has been AutoGen-ed February 27, 2018 at 05:14:42 PM by AutoGen 5.18.5 +.\" It has been AutoGen-ed August 14, 2018 at 08:29:15 AM by AutoGen 5.18.5 .\" From the definitions ntp.conf.def .\" and the template file agmdoc-cmd.tpl .Sh NAME @@ -327,7 +327,7 @@ option. All packets sent to and received from the server or peer are to include authentication fields encrypted using the specified .Ar key -identifier with values from 1 to 65534, inclusive. +identifier with values from 1 to 65535, inclusive. The default is to include no encryption field. .It Cm minpoll Ar minpoll @@ -585,7 +585,7 @@ and reports at the NTP project page linked from .Li http://www.ntp.org/ . .Ss Symmetric\-Key Cryptography The original RFC\-1305 specification allows any one of possibly -65,534 keys, each distinguished by a 32\-bit key identifier, to +65,535 keys, each distinguished by a 32\-bit key identifier, to authenticate an association. The servers and clients involved must agree on the key and key identifier to @@ -879,7 +879,7 @@ The .Ar key argument is the key identifier for a trusted key, where the value can be in the -range 1 to 65,534, inclusive. +range 1 to 65,535, inclusive. .It Xo Ic crypto .Op Cm cert Ar file .Op Cm leap Ar file @@ -983,7 +983,7 @@ The .Ar key argument is a key identifier for the trusted key, where the value can be in the range 1 to -65,534, inclusive. +65,535, inclusive. .It Ic revoke Ar logsec Specifies the interval between re\-randomization of certain cryptographic values used by the Autokey scheme, as a power of 2 in @@ -1010,7 +1010,7 @@ servers. The .Ar key arguments are 32\-bit unsigned -integers with values from 1 to 65,534. +integers with values from 1 to 65,535. .El .Ss Error Codes The following error codes are reported via the NTP control diff --git a/usr.sbin/ntp/doc/ntp.keys.5 b/usr.sbin/ntp/doc/ntp.keys.5 index aeb73383a26e5..5c3785a73e368 100644 --- a/usr.sbin/ntp/doc/ntp.keys.5 +++ b/usr.sbin/ntp/doc/ntp.keys.5 @@ -1,11 +1,11 @@ -.Dd February 27 2018 +.Dd August 14 2018 .Dt NTP_KEYS 5 File Formats .Os SunOS 5.10 .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" .\" $FreeBSD$ .\" -.\" It has been AutoGen-ed February 27, 2018 at 05:14:46 PM by AutoGen 5.18.5 +.\" It has been AutoGen-ed August 14, 2018 at 08:29:18 AM by AutoGen 5.18.5 .\" From the definitions ntp.keys.def .\" and the template file agmdoc-file.tpl .Sh NAME @@ -39,7 +39,7 @@ statement in the configuration file. While key number 0 is fixed by the NTP standard (as 56 zero bits) and may not be changed, -one or more keys numbered between 1 and 65534 +one or more keys numbered between 1 and 65535 may be arbitrarily set in the keys file. .Pp The key file uses the same comment conventions @@ -50,7 +50,7 @@ Key entries use a fixed format of the form .Pp where .Ar keyno -is a positive integer (between 1 and 65534), +is a positive integer (between 1 and 65535), .Ar type is the message digest algorithm, .Ar key diff --git a/usr.sbin/ntp/doc/ntpd.8 b/usr.sbin/ntp/doc/ntpd.8 index 7fb6529278b5a..07cb6d5578c67 100644 --- a/usr.sbin/ntp/doc/ntpd.8 +++ b/usr.sbin/ntp/doc/ntpd.8 @@ -1,11 +1,11 @@ -.Dd February 27 2018 +.Dd August 14 2018 .Dt NTPD 8 User Commands .Os .\" EDIT THIS FILE WITH CAUTION (ntpd-opts.mdoc) .\" .\" $FreeBSD$ .\" -.\" It has been AutoGen-ed February 27, 2018 at 05:14:47 PM by AutoGen 5.18.5 +.\" It has been AutoGen-ed August 14, 2018 at 08:29:20 AM by AutoGen 5.18.5 .\" From the definitions ntpd-opts.def .\" and the template file agmdoc-cmd.tpl .Sh NAME diff --git a/usr.sbin/ntp/doc/ntpdc.8 b/usr.sbin/ntp/doc/ntpdc.8 index c1b9c3e62c8be..c0ffef1176138 100644 --- a/usr.sbin/ntp/doc/ntpdc.8 +++ b/usr.sbin/ntp/doc/ntpdc.8 @@ -1,11 +1,11 @@ -.Dd February 27 2018 +.Dd August 14 2018 .Dt NTPDC 8 User Commands .Os .\" EDIT THIS FILE WITH CAUTION (ntpdc-opts.mdoc) .\" .\" $FreeBSD$ .\" -.\" It has been AutoGen-ed February 27, 2018 at 05:15:09 PM by AutoGen 5.18.5 +.\" It has been AutoGen-ed August 14, 2018 at 08:29:43 AM by AutoGen 5.18.5 .\" From the definitions ntpdc-opts.def .\" and the template file agmdoc-cmd.tpl .Sh NAME diff --git a/usr.sbin/ntp/doc/ntpq.8 b/usr.sbin/ntp/doc/ntpq.8 index f1b77d324cca4..04f1d70133a04 100644 --- a/usr.sbin/ntp/doc/ntpq.8 +++ b/usr.sbin/ntp/doc/ntpq.8 @@ -1,11 +1,11 @@ -.Dd February 27 2018 +.Dd August 14 2018 .Dt NTPQ 8 User Commands .Os .\" EDIT THIS FILE WITH CAUTION (ntpq-opts.mdoc) .\" .\" $FreeBSD$ .\" -.\" It has been AutoGen-ed February 27, 2018 at 05:15:28 PM by AutoGen 5.18.5 +.\" It has been AutoGen-ed August 14, 2018 at 08:30:05 AM by AutoGen 5.18.5 .\" From the definitions ntpq-opts.def .\" and the template file agmdoc-cmd.tpl .Sh NAME diff --git a/usr.sbin/ntp/doc/sntp.8 b/usr.sbin/ntp/doc/sntp.8 index 813bcdd9c1454..2cf625ff2d5e3 100644 --- a/usr.sbin/ntp/doc/sntp.8 +++ b/usr.sbin/ntp/doc/sntp.8 @@ -1,11 +1,11 @@ -.Dd February 27 2018 +.Dd August 14 2018 .Dt SNTP 8 User Commands .Os .\" EDIT THIS FILE WITH CAUTION (sntp-opts.mdoc) .\" .\" $FreeBSD$ .\" -.\" It has been AutoGen-ed February 27, 2018 at 05:13:14 PM by AutoGen 5.18.5 +.\" It has been AutoGen-ed August 14, 2018 at 08:27:40 AM by AutoGen 5.18.5 .\" From the definitions sntp-opts.def .\" and the template file agmdoc-cmd.tpl .Sh NAME diff --git a/usr.sbin/ntp/scripts/mkver b/usr.sbin/ntp/scripts/mkver index 40e22f6605b52..4e81652f81359 100755 --- a/usr.sbin/ntp/scripts/mkver +++ b/usr.sbin/ntp/scripts/mkver @@ -6,7 +6,7 @@ PROG=${1-UNKNOWN} ConfStr="$PROG" -ConfStr="$ConfStr 4.2.8p11" +ConfStr="$ConfStr 4.2.8p12" case "$CSET" in '') ;; |