diff options
Diffstat (limited to 'contrib/ntp/sntp')
24 files changed, 210 insertions, 72 deletions
diff --git a/contrib/ntp/sntp/Makefile.in b/contrib/ntp/sntp/Makefile.in index 39f7dc7..73acd4f 100644 --- a/contrib/ntp/sntp/Makefile.in +++ b/contrib/ntp/sntp/Makefile.in @@ -126,8 +126,9 @@ am__aclocal_m4_deps = $(top_srcdir)/libopts/m4/libopts.m4 \ $(top_srcdir)/m4/ntp_ver_suffix.m4 \ $(top_srcdir)/m4/openldap-thread-check.m4 \ $(top_srcdir)/m4/openldap.m4 $(top_srcdir)/m4/os_cflags.m4 \ - $(top_srcdir)/m4/snprintf.m4 $(top_srcdir)/m4/version.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/snprintf.m4 \ + $(top_srcdir)/m4/sntp_problemtests.m4 \ + $(top_srcdir)/m4/version.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \ diff --git a/contrib/ntp/sntp/aclocal.m4 b/contrib/ntp/sntp/aclocal.m4 index 00ce908..515b2bb 100644 --- a/contrib/ntp/sntp/aclocal.m4 +++ b/contrib/ntp/sntp/aclocal.m4 @@ -1361,3 +1361,4 @@ m4_include([m4/openldap-thread-check.m4]) m4_include([m4/openldap.m4]) m4_include([m4/os_cflags.m4]) m4_include([m4/snprintf.m4]) +m4_include([m4/sntp_problemtests.m4]) diff --git a/contrib/ntp/sntp/configure b/contrib/ntp/sntp/configure index 75555f6..db89397 100755 --- a/contrib/ntp/sntp/configure +++ b/contrib/ntp/sntp/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for sntp 4.2.8p7. +# Generated by GNU Autoconf 2.69 for sntp 4.2.8p8. # # Report bugs to <http://bugs.ntp.org./>. # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='sntp' PACKAGE_TARNAME='sntp' -PACKAGE_VERSION='4.2.8p7' -PACKAGE_STRING='sntp 4.2.8p7' +PACKAGE_VERSION='4.2.8p8' +PACKAGE_STRING='sntp 4.2.8p8' PACKAGE_BUGREPORT='http://bugs.ntp.org./' PACKAGE_URL='http://www.ntp.org./' @@ -636,6 +636,10 @@ enable_option_checking=no ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS +BUILD_TEST_KODFILE_FALSE +BUILD_TEST_KODFILE_TRUE +BUILD_TEST_KODDATABASE_FALSE +BUILD_TEST_KODDATABASE_TRUE GTEST_AVAILABLE_FALSE GTEST_AVAILABLE_TRUE GTEST_CPPFLAGS @@ -937,6 +941,7 @@ enable_ipv6 with_kame enable_getifaddrs with_gtest +enable_problem_tests ' ac_precious_vars='build_alias host_alias @@ -1491,7 +1496,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures sntp 4.2.8p7 to adapt to many kinds of systems. +\`configure' configures sntp 4.2.8p8 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1561,7 +1566,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of sntp 4.2.8p7:";; + short | recursive ) echo "Configuration of sntp 4.2.8p8:";; esac cat <<\_ACEOF @@ -1596,6 +1601,7 @@ Optional Features: --enable-ipv6 s use IPv6? --enable-getifaddrs + Enable the use of getifaddrs() [[yes|no]]. + --enable-problem-tests + enable tests with undiagnosed problems Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -1706,7 +1712,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -sntp configure 4.2.8p7 +sntp configure 4.2.8p8 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2536,7 +2542,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by sntp $as_me 4.2.8p7, which was +It was created by sntp $as_me 4.2.8p8, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3533,7 +3539,7 @@ fi # Define the identity of the package. PACKAGE='sntp' - VERSION='4.2.8p7' + VERSION='4.2.8p8' cat >>confdefs.h <<_ACEOF @@ -30508,6 +30514,63 @@ fi + +case "$build" in + $host) cross=0 ;; + *) cross=1 ;; +esac + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we want to enable tests with undiagnosed problems" >&5 +$as_echo_n "checking if we want to enable tests with undiagnosed problems... " >&6; } +# Check whether --enable-problem-tests was given. +if test "${enable_problem_tests+set}" = set; then : + enableval=$enable_problem_tests; sntp_ept=$enableval +else + sntp_ept=yes + +fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sntp_ept" >&5 +$as_echo "$sntp_ept" >&6; } + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can run test-kodDatabase" >&5 +$as_echo_n "checking if we can run test-kodDatabase... " >&6; } +sntp_test_kodDatabase="no" +case "$sntp_ept:$cross:$host" in + no:0:*-apple-darwin12.6.0) ;; + *) sntp_test_kodDatabase="yes" ;; +esac +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sntp_test_kodDatabase" >&5 +$as_echo "$sntp_test_kodDatabase" >&6; } + if test x$sntp_test_kodDatabase = xyes; then + BUILD_TEST_KODDATABASE_TRUE= + BUILD_TEST_KODDATABASE_FALSE='#' +else + BUILD_TEST_KODDATABASE_TRUE='#' + BUILD_TEST_KODDATABASE_FALSE= +fi + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can run test-kodFile" >&5 +$as_echo_n "checking if we can run test-kodFile... " >&6; } +sntp_test_kodFile="no" +case "$sntp_ept:$cross:$host" in + no:0:*-apple-darwin12.6.0) ;; + *) sntp_test_kodFile="yes" ;; +esac +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sntp_test_kodFile" >&5 +$as_echo "$sntp_test_kodFile" >&6; } + if test x$sntp_test_kodFile = xyes; then + BUILD_TEST_KODFILE_TRUE= + BUILD_TEST_KODFILE_FALSE='#' +else + BUILD_TEST_KODFILE_TRUE='#' + BUILD_TEST_KODFILE_FALSE= +fi + + + + # All libraries should be in various LIB_* variables now. #LIBS= # Sadly not. There is a gettext() check somewhere, and on Solaris this pulls @@ -30716,6 +30779,14 @@ if test -z "${GTEST_AVAILABLE_TRUE}" && test -z "${GTEST_AVAILABLE_FALSE}"; then as_fn_error $? "conditional \"GTEST_AVAILABLE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${BUILD_TEST_KODDATABASE_TRUE}" && test -z "${BUILD_TEST_KODDATABASE_FALSE}"; then + as_fn_error $? "conditional \"BUILD_TEST_KODDATABASE\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${BUILD_TEST_KODFILE_TRUE}" && test -z "${BUILD_TEST_KODFILE_FALSE}"; then + as_fn_error $? "conditional \"BUILD_TEST_KODFILE\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi : "${CONFIG_STATUS=./config.status}" ac_write_fail=0 @@ -31113,7 +31184,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by sntp $as_me 4.2.8p7, which was +This file was extended by sntp $as_me 4.2.8p8, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -31180,7 +31251,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -sntp config.status 4.2.8p7 +sntp config.status 4.2.8p8 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/contrib/ntp/sntp/configure.ac b/contrib/ntp/sntp/configure.ac index a08aa13..391e586 100644 --- a/contrib/ntp/sntp/configure.ac +++ b/contrib/ntp/sntp/configure.ac @@ -143,6 +143,8 @@ NTP_UNITYBUILD AC_PROG_CXX NTP_GOOGLETEST +SNTP_PROBLEM_TESTS + # All libraries should be in various LIB_* variables now. #LIBS= # Sadly not. There is a gettext() check somewhere, and on Solaris this pulls diff --git a/contrib/ntp/sntp/include/Makefile.in b/contrib/ntp/sntp/include/Makefile.in index 1c8a179..e5274a5 100644 --- a/contrib/ntp/sntp/include/Makefile.in +++ b/contrib/ntp/sntp/include/Makefile.in @@ -114,8 +114,9 @@ am__aclocal_m4_deps = $(top_srcdir)/libopts/m4/libopts.m4 \ $(top_srcdir)/m4/ntp_ver_suffix.m4 \ $(top_srcdir)/m4/openldap-thread-check.m4 \ $(top_srcdir)/m4/openldap.m4 $(top_srcdir)/m4/os_cflags.m4 \ - $(top_srcdir)/m4/snprintf.m4 $(top_srcdir)/m4/version.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/snprintf.m4 \ + $(top_srcdir)/m4/sntp_problemtests.m4 \ + $(top_srcdir)/m4/version.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(noinst_HEADERS) \ diff --git a/contrib/ntp/sntp/include/version.def b/contrib/ntp/sntp/include/version.def index a6eb3b4..add303d 100644 --- a/contrib/ntp/sntp/include/version.def +++ b/contrib/ntp/sntp/include/version.def @@ -1 +1 @@ -version = '4.2.8p7'; +version = '4.2.8p8'; diff --git a/contrib/ntp/sntp/include/version.texi b/contrib/ntp/sntp/include/version.texi index d604964..9f303b2 100644 --- a/contrib/ntp/sntp/include/version.texi +++ b/contrib/ntp/sntp/include/version.texi @@ -1,3 +1,3 @@ -@set UPDATED 26 April 2016 -@set EDITION 4.2.8p7 -@set VERSION 4.2.8p7 +@set UPDATED 02 June 2016 +@set EDITION 4.2.8p8 +@set VERSION 4.2.8p8 diff --git a/contrib/ntp/sntp/invoke-sntp.texi b/contrib/ntp/sntp/invoke-sntp.texi index 455dc36..256ff86 100644 --- a/contrib/ntp/sntp/invoke-sntp.texi +++ b/contrib/ntp/sntp/invoke-sntp.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (invoke-sntp.texi) # -# It has been AutoGen-ed April 26, 2016 at 08:21:12 PM by AutoGen 5.18.5 +# It has been AutoGen-ed June 2, 2016 at 07:19:58 AM by AutoGen 5.18.5 # From the definitions sntp-opts.def # and the template file agtexi-cmd.tpl @end ignore @@ -101,7 +101,7 @@ with a status code of 0. @exampleindent 0 @example -sntp - standard Simple Network Time Protocol client program - Ver. 4.2.8p7 +sntp - standard Simple Network Time Protocol client program - Ver. 4.2.8p8 Usage: sntp [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]... \ [ hostname-or-IP ...] Flg Arg Option-Name Description diff --git a/contrib/ntp/sntp/libopts/Makefile.in b/contrib/ntp/sntp/libopts/Makefile.in index 1f138a2..d98b8a3 100644 --- a/contrib/ntp/sntp/libopts/Makefile.in +++ b/contrib/ntp/sntp/libopts/Makefile.in @@ -114,8 +114,9 @@ am__aclocal_m4_deps = $(top_srcdir)/libopts/m4/libopts.m4 \ $(top_srcdir)/m4/ntp_ver_suffix.m4 \ $(top_srcdir)/m4/openldap-thread-check.m4 \ $(top_srcdir)/m4/openldap.m4 $(top_srcdir)/m4/os_cflags.m4 \ - $(top_srcdir)/m4/snprintf.m4 $(top_srcdir)/m4/version.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/snprintf.m4 \ + $(top_srcdir)/m4/sntp_problemtests.m4 \ + $(top_srcdir)/m4/version.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) diff --git a/contrib/ntp/sntp/m4/ntp_problemtests.m4 b/contrib/ntp/sntp/m4/ntp_problemtests.m4 index 7cc14c9..ebc2cd9 100644 --- a/contrib/ntp/sntp/m4/ntp_problemtests.m4 +++ b/contrib/ntp/sntp/m4/ntp_problemtests.m4 @@ -55,5 +55,6 @@ case "$ntp_ept:$cross:$host" in esac AC_MSG_RESULT([$ntp_test_ntp_signd]) AM_CONDITIONAL([BUILD_TEST_NTP_SIGND], [test x$ntp_test_ntp_signd = xyes]) + ]) dnl ====================================================================== diff --git a/contrib/ntp/sntp/m4/sntp_problemtests.m4 b/contrib/ntp/sntp/m4/sntp_problemtests.m4 new file mode 100644 index 0000000..fcf7014 --- /dev/null +++ b/contrib/ntp/sntp/m4/sntp_problemtests.m4 @@ -0,0 +1,47 @@ +dnl ###################################################################### +dnl SNTP_PROBLEM_TESTS +dnl +dnl Some platforms have problems building or running certain tests. +dnl While we're in the initial phase of the deployment of the test +dnl framework, sometimes we may need to disable these tests. +dnl +dnl This is where we do that. +dnl +AC_DEFUN([SNTP_PROBLEM_TESTS], [ +case "$build" in + $host) cross=0 ;; + *) cross=1 ;; +esac + +AC_MSG_CHECKING([if we want to enable tests with undiagnosed problems]) +AC_ARG_ENABLE( + [problem-tests], + [AS_HELP_STRING( + [--enable-problem-tests], + [+ enable tests with undiagnosed problems] + )], + [sntp_ept=$enableval], + [sntp_ept=yes] +) +AC_MSG_RESULT([$sntp_ept]) + +AC_MSG_CHECKING([if we can run test-kodDatabase]) +sntp_test_kodDatabase="no" +case "$sntp_ept:$cross:$host" in + no:0:*-apple-darwin12.6.0) ;; + *) sntp_test_kodDatabase="yes" ;; +esac +AC_MSG_RESULT([$sntp_test_kodDatabase]) +AM_CONDITIONAL([BUILD_TEST_KODDATABASE], [test x$sntp_test_kodDatabase = xyes]) + +AC_MSG_CHECKING([if we can run test-kodFile]) +sntp_test_kodFile="no" +case "$sntp_ept:$cross:$host" in + no:0:*-apple-darwin12.6.0) ;; + *) sntp_test_kodFile="yes" ;; +esac +AC_MSG_RESULT([$sntp_test_kodFile]) +AM_CONDITIONAL([BUILD_TEST_KODFILE], [test x$sntp_test_kodFile = xyes]) + +]) +dnl ====================================================================== diff --git a/contrib/ntp/sntp/m4/version.m4 b/contrib/ntp/sntp/m4/version.m4 index 87597f3..3529730 100644 --- a/contrib/ntp/sntp/m4/version.m4 +++ b/contrib/ntp/sntp/m4/version.m4 @@ -1 +1 @@ -m4_define([VERSION_NUMBER],[4.2.8p7]) +m4_define([VERSION_NUMBER],[4.2.8p8]) diff --git a/contrib/ntp/sntp/scripts/Makefile.in b/contrib/ntp/sntp/scripts/Makefile.in index 0494fc3..952e7b8 100644 --- a/contrib/ntp/sntp/scripts/Makefile.in +++ b/contrib/ntp/sntp/scripts/Makefile.in @@ -113,8 +113,9 @@ am__aclocal_m4_deps = $(top_srcdir)/libopts/m4/libopts.m4 \ $(top_srcdir)/m4/ntp_ver_suffix.m4 \ $(top_srcdir)/m4/openldap-thread-check.m4 \ $(top_srcdir)/m4/openldap.m4 $(top_srcdir)/m4/os_cflags.m4 \ - $(top_srcdir)/m4/snprintf.m4 $(top_srcdir)/m4/version.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/snprintf.m4 \ + $(top_srcdir)/m4/sntp_problemtests.m4 \ + $(top_srcdir)/m4/version.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) diff --git a/contrib/ntp/sntp/sntp-opts.c b/contrib/ntp/sntp/sntp-opts.c index 71c8ab0..e469d3e 100644 --- a/contrib/ntp/sntp/sntp-opts.c +++ b/contrib/ntp/sntp/sntp-opts.c @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (sntp-opts.c) * - * It has been AutoGen-ed April 26, 2016 at 08:20:39 PM by AutoGen 5.18.5 + * It has been AutoGen-ed June 2, 2016 at 07:18:42 AM by AutoGen 5.18.5 * From the definitions sntp-opts.def * and the template file options * @@ -70,7 +70,7 @@ extern FILE * option_usage_fp; * static const strings for sntp options */ static char const sntp_opt_strs[2549] = -/* 0 */ "sntp 4.2.8p7\n" +/* 0 */ "sntp 4.2.8p8\n" "Copyright (C) 1992-2016 The University of Delaware and Network Time Foundation, all rights reserved.\n" "This is free software. It is licensed for use, modification and\n" "redistribution under the terms of the NTP License, copies of which\n" @@ -155,7 +155,7 @@ static char const sntp_opt_strs[2549] = /* 2298 */ "LOAD_OPTS\0" /* 2308 */ "no-load-opts\0" /* 2321 */ "SNTP\0" -/* 2326 */ "sntp - standard Simple Network Time Protocol client program - Ver. 4.2.8p7\n" +/* 2326 */ "sntp - standard Simple Network Time Protocol client program - Ver. 4.2.8p8\n" "Usage: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... \\\n" "\t\t[ hostname-or-IP ...]\n\0" /* 2485 */ "$HOME\0" @@ -163,7 +163,7 @@ static char const sntp_opt_strs[2549] = /* 2493 */ ".ntprc\0" /* 2500 */ "http://bugs.ntp.org, bugs@ntp.org\0" /* 2534 */ "\n\0" -/* 2536 */ "sntp 4.2.8p7"; +/* 2536 */ "sntp 4.2.8p8"; /** * ipv4 option description with @@ -1173,7 +1173,7 @@ static void bogus_function(void) { translate option names. */ /* referenced via sntpOptions.pzCopyright */ - puts(_("sntp 4.2.8p7\n\ + puts(_("sntp 4.2.8p8\n\ Copyright (C) 1992-2016 The University of Delaware and Network Time Foundation, all rights reserved.\n\ This is free software. It is licensed for use, modification and\n\ redistribution under the terms of the NTP License, copies of which\n\ @@ -1263,7 +1263,7 @@ implied warranty.\n")); puts(_("load options from a config file")); /* referenced via sntpOptions.pzUsageTitle */ - puts(_("sntp - standard Simple Network Time Protocol client program - Ver. 4.2.8p7\n\ + puts(_("sntp - standard Simple Network Time Protocol client program - Ver. 4.2.8p8\n\ Usage: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... \\\n\ \t\t[ hostname-or-IP ...]\n")); @@ -1271,7 +1271,7 @@ Usage: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... \\\n\ puts(_("\n")); /* referenced via sntpOptions.pzFullVersion */ - puts(_("sntp 4.2.8p7")); + puts(_("sntp 4.2.8p8")); /* referenced via sntpOptions.pzFullUsage */ puts(_("<<<NOT-FOUND>>>")); diff --git a/contrib/ntp/sntp/sntp-opts.h b/contrib/ntp/sntp/sntp-opts.h index 0c8fae6..9136f28 100644 --- a/contrib/ntp/sntp/sntp-opts.h +++ b/contrib/ntp/sntp/sntp-opts.h @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (sntp-opts.h) * - * It has been AutoGen-ed April 26, 2016 at 08:20:38 PM by AutoGen 5.18.5 + * It has been AutoGen-ed June 2, 2016 at 07:18:40 AM by AutoGen 5.18.5 * From the definitions sntp-opts.def * and the template file options * @@ -91,9 +91,9 @@ typedef enum { /** count of all options for sntp */ #define OPTION_CT 23 /** sntp version */ -#define SNTP_VERSION "4.2.8p7" +#define SNTP_VERSION "4.2.8p8" /** Full sntp version text */ -#define SNTP_FULL_VERSION "sntp 4.2.8p7" +#define SNTP_FULL_VERSION "sntp 4.2.8p8" /** * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/contrib/ntp/sntp/sntp.1sntpman b/contrib/ntp/sntp/sntp.1sntpman index e0f0553..6921dd3 100644 --- a/contrib/ntp/sntp/sntp.1sntpman +++ b/contrib/ntp/sntp/sntp.1sntpman @@ -10,11 +10,11 @@ .ds B-Font B .ds I-Font I .ds R-Font R -.TH sntp 1sntpman "26 Apr 2016" "4.2.8p7" "User Commands" +.TH sntp 1sntpman "02 Jun 2016" "4.2.8p8" "User Commands" .\" -.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-EjaOrb/ag-RjaGqb) +.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-5CayKq/ag-fDaqJq) .\" -.\" It has been AutoGen-ed April 26, 2016 at 08:21:08 PM by AutoGen 5.18.5 +.\" It has been AutoGen-ed June 2, 2016 at 07:19:39 AM by AutoGen 5.18.5 .\" From the definitions sntp-opts.def .\" and the template file agman-cmd.tpl .SH NAME diff --git a/contrib/ntp/sntp/sntp.1sntpmdoc b/contrib/ntp/sntp/sntp.1sntpmdoc index 959ab83..8025d49 100644 --- a/contrib/ntp/sntp/sntp.1sntpmdoc +++ b/contrib/ntp/sntp/sntp.1sntpmdoc @@ -1,9 +1,9 @@ -.Dd April 26 2016 +.Dd June 2 2016 .Dt SNTP 1sntpmdoc User Commands .Os .\" EDIT THIS FILE WITH CAUTION (sntp-opts.mdoc) .\" -.\" It has been AutoGen-ed April 26, 2016 at 08:21:15 PM by AutoGen 5.18.5 +.\" It has been AutoGen-ed June 2, 2016 at 07:20:03 AM by AutoGen 5.18.5 .\" From the definitions sntp-opts.def .\" and the template file agmdoc-cmd.tpl .Sh NAME diff --git a/contrib/ntp/sntp/sntp.html b/contrib/ntp/sntp/sntp.html index 2bbb8a1..46bad27 100644 --- a/contrib/ntp/sntp/sntp.html +++ b/contrib/ntp/sntp/sntp.html @@ -36,7 +36,7 @@ display the time offset of the system clock relative to the server clock. Run as root, it can correct the system clock to this offset as well. It can be run as an interactive command or from a cron job. - <p>This document applies to version 4.2.8p7 of <code>sntp</code>. + <p>This document applies to version 4.2.8p8 of <code>sntp</code>. <p>The program implements the SNTP protocol as defined by RFC 5905, the NTPv4 IETF specification. @@ -176,7 +176,7 @@ the usage text by passing it through a pager program. used to select the program, defaulting to <span class="file">more</span>. Both will exit with a status code of 0. -<pre class="example">sntp - standard Simple Network Time Protocol client program - Ver. 4.2.8p7 +<pre class="example">sntp - standard Simple Network Time Protocol client program - Ver. 4.2.8p8 Usage: sntp [ -<flag> [<val>] | --<name>[{=| }<val>] ]... \ [ hostname-or-IP ...] Flg Arg Option-Name Description diff --git a/contrib/ntp/sntp/sntp.man.in b/contrib/ntp/sntp/sntp.man.in index f136a72..899c49a 100644 --- a/contrib/ntp/sntp/sntp.man.in +++ b/contrib/ntp/sntp/sntp.man.in @@ -10,11 +10,11 @@ .ds B-Font B .ds I-Font I .ds R-Font R -.TH sntp @SNTP_MS@ "26 Apr 2016" "4.2.8p7" "User Commands" +.TH sntp @SNTP_MS@ "02 Jun 2016" "4.2.8p8" "User Commands" .\" -.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-EjaOrb/ag-RjaGqb) +.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-5CayKq/ag-fDaqJq) .\" -.\" It has been AutoGen-ed April 26, 2016 at 08:21:08 PM by AutoGen 5.18.5 +.\" It has been AutoGen-ed June 2, 2016 at 07:19:39 AM by AutoGen 5.18.5 .\" From the definitions sntp-opts.def .\" and the template file agman-cmd.tpl .SH NAME diff --git a/contrib/ntp/sntp/sntp.mdoc.in b/contrib/ntp/sntp/sntp.mdoc.in index 00a18e1..71dd224 100644 --- a/contrib/ntp/sntp/sntp.mdoc.in +++ b/contrib/ntp/sntp/sntp.mdoc.in @@ -1,9 +1,9 @@ -.Dd April 26 2016 +.Dd June 2 2016 .Dt SNTP @SNTP_MS@ User Commands .Os .\" EDIT THIS FILE WITH CAUTION (sntp-opts.mdoc) .\" -.\" It has been AutoGen-ed April 26, 2016 at 08:21:15 PM by AutoGen 5.18.5 +.\" It has been AutoGen-ed June 2, 2016 at 07:20:03 AM by AutoGen 5.18.5 .\" From the definitions sntp-opts.def .\" and the template file agmdoc-cmd.tpl .Sh NAME diff --git a/contrib/ntp/sntp/tests/Makefile.am b/contrib/ntp/sntp/tests/Makefile.am index c5338c7..0e14a87 100644 --- a/contrib/ntp/sntp/tests/Makefile.am +++ b/contrib/ntp/sntp/tests/Makefile.am @@ -34,8 +34,6 @@ run_unity = cd $(srcdir) && ruby ../unity/auto/generate_test_runner.rb check_PROGRAMS = \ test-crypto \ test-keyFile \ - test-kodDatabase \ - test-kodFile \ test-log \ test-networking \ test-packetHandling \ @@ -43,6 +41,14 @@ check_PROGRAMS = \ test-utilities \ $(NULL) +if BUILD_TEST_KODDATABASE +check_PROGRAMS += test-kodDatabase +endif + +if BUILD_TEST_KODFILE +check_PROGRAMS += test-kodFile +endif + noinst_HEADERS = \ sntptest.h \ $(NULL) diff --git a/contrib/ntp/sntp/tests/Makefile.in b/contrib/ntp/sntp/tests/Makefile.in index 9803fa8..e557947 100644 --- a/contrib/ntp/sntp/tests/Makefile.in +++ b/contrib/ntp/sntp/tests/Makefile.in @@ -90,11 +90,13 @@ build_triplet = @build@ host_triplet = @host@ EXTRA_PROGRAMS = check_PROGRAMS = test-crypto$(EXEEXT) test-keyFile$(EXEEXT) \ - test-kodDatabase$(EXEEXT) test-kodFile$(EXEEXT) \ test-log$(EXEEXT) test-networking$(EXEEXT) \ test-packetHandling$(EXEEXT) test-packetProcessing$(EXEEXT) \ - test-utilities$(EXEEXT) $(am__EXEEXT_1) -@NTP_CROSSCOMPILE_FALSE@am__append_1 = $(check_PROGRAMS) + test-utilities$(EXEEXT) $(am__EXEEXT_1) $(am__EXEEXT_2) \ + $(am__EXEEXT_3) +@BUILD_TEST_KODDATABASE_TRUE@am__append_1 = test-kodDatabase +@BUILD_TEST_KODFILE_TRUE@am__append_2 = test-kodFile +@NTP_CROSSCOMPILE_FALSE@am__append_3 = $(check_PROGRAMS) subdir = tests ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/libopts/m4/libopts.m4 \ @@ -121,8 +123,9 @@ am__aclocal_m4_deps = $(top_srcdir)/libopts/m4/libopts.m4 \ $(top_srcdir)/m4/ntp_ver_suffix.m4 \ $(top_srcdir)/m4/openldap-thread-check.m4 \ $(top_srcdir)/m4/openldap.m4 $(top_srcdir)/m4/os_cflags.m4 \ - $(top_srcdir)/m4/snprintf.m4 $(top_srcdir)/m4/version.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/snprintf.m4 \ + $(top_srcdir)/m4/sntp_problemtests.m4 \ + $(top_srcdir)/m4/version.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(dist_check_SCRIPTS) \ @@ -132,6 +135,8 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = fileHandlingTest.h CONFIG_CLEAN_VPATH_FILES = am__EXEEXT_1 = +@BUILD_TEST_KODDATABASE_TRUE@am__EXEEXT_2 = test-kodDatabase$(EXEEXT) +@BUILD_TEST_KODFILE_TRUE@am__EXEEXT_3 = test-kodFile$(EXEEXT) am__objects_1 = am_test_crypto_OBJECTS = test_crypto-crypto.$(OBJEXT) \ test_crypto-run-crypto.$(OBJEXT) test_crypto-version.$(OBJEXT) \ @@ -863,7 +868,7 @@ test_log_SOURCES = \ #$(srcdir)/../version.c: $(srcdir)/../version.c # gcc -o version.o ../version.c -TESTS = $(am__append_1) +TESTS = $(am__append_3) SNTP_INCS = -I$(top_srcdir)/../include \ -I$(top_srcdir)/../lib/isc/include \ -I$(top_srcdir)/../lib/isc/$(LIBISC_PTHREADS_NOTHREADS)/include \ @@ -1270,20 +1275,6 @@ test-keyFile.log: test-keyFile$(EXEEXT) --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) -test-kodDatabase.log: test-kodDatabase$(EXEEXT) - @p='test-kodDatabase$(EXEEXT)'; \ - b='test-kodDatabase'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -test-kodFile.log: test-kodFile$(EXEEXT) - @p='test-kodFile$(EXEEXT)'; \ - b='test-kodFile'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) test-log.log: test-log$(EXEEXT) @p='test-log$(EXEEXT)'; \ b='test-log'; \ @@ -1319,6 +1310,20 @@ test-utilities.log: test-utilities$(EXEEXT) --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) +test-kodDatabase.log: test-kodDatabase$(EXEEXT) + @p='test-kodDatabase$(EXEEXT)'; \ + b='test-kodDatabase'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +test-kodFile.log: test-kodFile$(EXEEXT) + @p='test-kodFile$(EXEEXT)'; \ + b='test-kodFile'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) .test.log: @p='$<'; \ $(am__set_b); \ diff --git a/contrib/ntp/sntp/unity/Makefile.in b/contrib/ntp/sntp/unity/Makefile.in index a5758b4..e82e55e 100644 --- a/contrib/ntp/sntp/unity/Makefile.in +++ b/contrib/ntp/sntp/unity/Makefile.in @@ -114,8 +114,9 @@ am__aclocal_m4_deps = $(top_srcdir)/libopts/m4/libopts.m4 \ $(top_srcdir)/m4/ntp_ver_suffix.m4 \ $(top_srcdir)/m4/openldap-thread-check.m4 \ $(top_srcdir)/m4/openldap.m4 $(top_srcdir)/m4/os_cflags.m4 \ - $(top_srcdir)/m4/snprintf.m4 $(top_srcdir)/m4/version.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/snprintf.m4 \ + $(top_srcdir)/m4/sntp_problemtests.m4 \ + $(top_srcdir)/m4/version.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) diff --git a/contrib/ntp/sntp/version.c b/contrib/ntp/sntp/version.c index 7eae711..38424f3 100644 --- a/contrib/ntp/sntp/version.c +++ b/contrib/ntp/sntp/version.c @@ -2,4 +2,4 @@ * version file for sntp */ #include <config.h> -const char * Version = "sntp 4.2.8p6@1.3265-o Wed Apr 27 00:21:06 UTC 2016 (28)"; +const char * Version = "sntp 4.2.8p7@1.3265-o Thu Jun 2 11:19:34 UTC 2016 (29)"; |
