diff options
author | delphij <delphij@FreeBSD.org> | 2016-01-22 15:55:21 +0000 |
---|---|---|
committer | delphij <delphij@FreeBSD.org> | 2016-01-22 15:55:21 +0000 |
commit | 0e1dba9a0aa72f6f27001a50552a8c67575da336 (patch) | |
tree | dbb1c1e8cb8058b52ef547a1f18b9751613aeb04 /contrib/ntp/ntpq/ntpq-opts.h | |
parent | 7a67cba86b1ced9982ebb0dd11a9a987829efe9e (diff) | |
download | FreeBSD-src-0e1dba9a0aa72f6f27001a50552a8c67575da336.zip FreeBSD-src-0e1dba9a0aa72f6f27001a50552a8c67575da336.tar.gz |
MFC r294554: MFV r294491: ntp 4.2.8p6.
Security: CVE-2015-7973, CVE-2015-7974, CVE-2015-7975
Security: CVE-2015-7976, CVE-2015-7977, CVE-2015-7978
Security: CVE-2015-7979, CVE-2015-8138, CVE-2015-8139
Security: CVE-2015-8140, CVE-2015-8158
With hat: so
Diffstat (limited to 'contrib/ntp/ntpq/ntpq-opts.h')
-rw-r--r-- | contrib/ntp/ntpq/ntpq-opts.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/contrib/ntp/ntpq/ntpq-opts.h b/contrib/ntp/ntpq/ntpq-opts.h index 758817f..af7a4c2 100644 --- a/contrib/ntp/ntpq/ntpq-opts.h +++ b/contrib/ntp/ntpq/ntpq-opts.h @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntpq-opts.h) * - * It has been AutoGen-ed January 7, 2016 at 11:31:32 PM by AutoGen 5.18.5 + * It has been AutoGen-ed January 20, 2016 at 04:18:42 AM by AutoGen 5.18.5 * From the definitions ntpq-opts.def * and the template file options * @@ -18,7 +18,7 @@ * The ntpq program is copyrighted and licensed * under the following terms: * - * Copyright (C) 1992-2015 The University of Delaware and Network Time Foundation, all rights reserved. + * Copyright (C) 1992-2016 The University of Delaware and Network Time Foundation, all rights reserved. * This is free software. It is licensed for use, modification and * redistribution under the terms of the NTP License, copies of which * can be seen at: @@ -83,9 +83,9 @@ typedef enum { /** count of all options for ntpq */ #define OPTION_CT 15 /** ntpq version */ -#define NTPQ_VERSION "4.2.8p5" +#define NTPQ_VERSION "4.2.8p6" /** Full ntpq version text */ -#define NTPQ_FULL_VERSION "ntpq 4.2.8p5" +#define NTPQ_FULL_VERSION "ntpq 4.2.8p6" /** * Interface defines for all options. Replace "n" with the UPPER_CASED |