diff options
Diffstat (limited to 'sntp')
43 files changed, 161 insertions, 134 deletions
diff --git a/sntp/COPYRIGHT b/sntp/COPYRIGHT index f38933c19827b..628ee6cc48d3e 100644 --- a/sntp/COPYRIGHT +++ b/sntp/COPYRIGHT @@ -3,7 +3,7 @@ This file is automatically generated from html/copyright.html jpg "Clone me," says Dolly sheepishly. - Last update: 2-Jan-2017 11:58 UTC + Last update: 4-Feb-2020 23:47 UTC __________________________________________________________________ The following copyright notice applies to all files collectively called @@ -32,7 +32,7 @@ This file is automatically generated from html/copyright.html Burnicki is: *********************************************************************** * * -* Copyright (c) Network Time Foundation 2011-2017 * +* Copyright (c) Network Time Foundation 2011-2020 * * * * All Rights Reserved * * * diff --git a/sntp/configure b/sntp/configure index aa665af06a755..b446a654cc87f 100755 --- a/sntp/configure +++ b/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.8p13. +# Generated by GNU Autoconf 2.69 for sntp 4.2.8p14. # # 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.8p13' -PACKAGE_STRING='sntp 4.2.8p13' +PACKAGE_VERSION='4.2.8p14' +PACKAGE_STRING='sntp 4.2.8p14' PACKAGE_BUGREPORT='http://bugs.ntp.org./' PACKAGE_URL='http://www.ntp.org./' @@ -1486,7 +1486,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.8p13 to adapt to many kinds of systems. +\`configure' configures sntp 4.2.8p14 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1556,7 +1556,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of sntp 4.2.8p13:";; + short | recursive ) echo "Configuration of sntp 4.2.8p14:";; esac cat <<\_ACEOF @@ -1707,7 +1707,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -sntp configure 4.2.8p13 +sntp configure 4.2.8p14 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2416,7 +2416,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.8p13, which was +It was created by sntp $as_me 4.2.8p14, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3413,7 +3413,7 @@ fi # Define the identity of the package. PACKAGE='sntp' - VERSION='4.2.8p13' + VERSION='4.2.8p14' cat >>confdefs.h <<_ACEOF @@ -3506,6 +3506,7 @@ END fi fi + # Check whether --enable-silent-rules was given. if test "${enable_silent_rules+set}" = set; then : enableval=$enable_silent_rules; @@ -27146,7 +27147,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.8p13, which was +This file was extended by sntp $as_me 4.2.8p14, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -27213,7 +27214,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.8p13 +sntp config.status 4.2.8p14 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/sntp/configure.ac b/sntp/configure.ac index 5a70c5af636a0..f6de8a134565a 100644 --- a/sntp/configure.ac +++ b/sntp/configure.ac @@ -1,7 +1,7 @@ dnl SNTP subpackage configure.ac -*- Autoconf -*- dnl m4_include([m4/version.m4]) -AC_PREREQ([2.61]) +AC_PREREQ([2.68]) AC_INIT( [sntp], [VERSION_NUMBER], @@ -40,12 +40,10 @@ sntp_configure_cache_version=20120806 NTP_CACHEVERSION([sntp], [$sntp_configure_cache_version]) -AM_INIT_AUTOMAKE([1.10 foreign -Wall -Wno-gnu]) -dnl AM_SILENT_RULES req. automake 1.11. [yes] defaults V=0 -m4_ifdef( - [AM_SILENT_RULES], - [AM_SILENT_RULES([yes])] -) +AM_INIT_AUTOMAKE([1.15 foreign -Wall -Wno-gnu]) + +AM_SILENT_RULES([yes]) + AC_CANONICAL_BUILD AC_CANONICAL_HOST dnl the 'build' machine is where we run configure and compile diff --git a/sntp/crypto.c b/sntp/crypto.c index be94ed51d2efe..8ffe006f99120 100644 --- a/sntp/crypto.c +++ b/sntp/crypto.c @@ -32,7 +32,9 @@ compute_mac( ) { u_int len = 0; +#if defined(OPENSSL) && defined(ENABLE_CMAC) size_t slen = 0; +#endif int key_type; INIT_SSL(); diff --git a/sntp/include/copyright.def b/sntp/include/copyright.def index 902c16e6d4d7e..9334ac8da8160 100644 --- a/sntp/include/copyright.def +++ b/sntp/include/copyright.def @@ -1,7 +1,7 @@ /* -*- Mode: Text -*- */ copyright = { - date = "1992-2017"; + date = "1992-2020"; owner = "The University of Delaware and Network Time Foundation"; eaddr = "http://bugs.ntp.org, bugs@ntp.org"; type = ntp; diff --git a/sntp/include/version.def b/sntp/include/version.def index eee2240e1c654..1bb1853839a0a 100644 --- a/sntp/include/version.def +++ b/sntp/include/version.def @@ -1 +1 @@ -version = '4.2.8p13'; +version = '4.2.8p14'; diff --git a/sntp/include/version.texi b/sntp/include/version.texi index 1f30a3ad26981..70830c33d9601 100644 --- a/sntp/include/version.texi +++ b/sntp/include/version.texi @@ -1,3 +1,3 @@ -@set UPDATED 20 February 2019 -@set EDITION 4.2.8p13 -@set VERSION 4.2.8p13 +@set UPDATED 03 March 2020 +@set EDITION 4.2.8p14 +@set VERSION 4.2.8p14 diff --git a/sntp/invoke-sntp.texi b/sntp/invoke-sntp.texi index 4448653e3e23a..4beaec2ea4223 100644 --- a/sntp/invoke-sntp.texi +++ b/sntp/invoke-sntp.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (invoke-sntp.texi) # -# It has been AutoGen-ed February 20, 2019 at 09:55:49 AM by AutoGen 5.18.5 +# It has been AutoGen-ed March 3, 2020 at 05:40:02 PM 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.8p13 +sntp - standard Simple Network Time Protocol client program - Ver. 4.2.8p14 Usage: sntp [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]... \ [ hostname-or-IP ...] Flg Arg Option-Name Description diff --git a/sntp/libevent/build-aux/ar-lib b/sntp/libevent/build-aux/ar-lib index 05094d34c6962..463b9ec0206e0 100755 --- a/sntp/libevent/build-aux/ar-lib +++ b/sntp/libevent/build-aux/ar-lib @@ -4,7 +4,7 @@ me=ar-lib scriptversion=2012-03-01.08; # UTC -# Copyright (C) 2010-2017 Free Software Foundation, Inc. +# Copyright (C) 2010-2014 Free Software Foundation, Inc. # Written by Peter Rosin <peda@lysator.liu.se>. # # This program is free software; you can redistribute it and/or modify diff --git a/sntp/libevent/build-aux/compile b/sntp/libevent/build-aux/compile index 2ab71e4ea13e0..a85b723c7e67d 100755 --- a/sntp/libevent/build-aux/compile +++ b/sntp/libevent/build-aux/compile @@ -1,9 +1,9 @@ #! /bin/sh # Wrapper for compilers which do not understand '-c -o'. -scriptversion=2016-01-11.22; # UTC +scriptversion=2012-10-14.11; # UTC -# Copyright (C) 1999-2017 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # Written by Tom Tromey <tromey@cygnus.com>. # # This program is free software; you can redistribute it and/or modify @@ -255,8 +255,7 @@ EOF echo "compile $scriptversion" exit $? ;; - cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \ - icl | *[/\\]icl | icl.exe | *[/\\]icl.exe ) + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) func_cl_wrapper "$@" # Doesn't return... ;; esac @@ -343,6 +342,6 @@ exit $ret # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC0" +# time-stamp-time-zone: "UTC" # time-stamp-end: "; # UTC" # End: diff --git a/sntp/libevent/build-aux/config.guess b/sntp/libevent/build-aux/config.guess index 0bb53aebf96d2..6c32c8645c8b2 100755 --- a/sntp/libevent/build-aux/config.guess +++ b/sntp/libevent/build-aux/config.guess @@ -1,8 +1,8 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2015 Free Software Foundation, Inc. +# Copyright 1992-2014 Free Software Foundation, Inc. -timestamp='2015-03-04' +timestamp='2014-11-04' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -50,7 +50,7 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2015 Free Software Foundation, Inc. +Copyright 1992-2014 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -168,27 +168,20 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # Note: NetBSD doesn't particularly care about the vendor # portion of the name. We always set it to "unknown". sysctl="sysctl -n hw.machine_arch" - UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \ - /sbin/$sysctl 2>/dev/null || \ - /usr/sbin/$sysctl 2>/dev/null || \ - echo unknown)` + UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ + /usr/sbin/$sysctl 2>/dev/null || echo unknown)` case "${UNAME_MACHINE_ARCH}" in armeb) machine=armeb-unknown ;; arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; sh5el) machine=sh5le-unknown ;; - earmv*) - arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'` - endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'` - machine=${arch}${endian}-unknown - ;; *) machine=${UNAME_MACHINE_ARCH}-unknown ;; esac # The Operating System including object format, if it has switched # to ELF recently, or will in the future. case "${UNAME_MACHINE_ARCH}" in - arm*|earm*|i386|m68k|ns32k|sh3*|sparc|vax) + arm*|i386|m68k|ns32k|sh3*|sparc|vax) eval $set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ELF__ @@ -204,13 +197,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in os=netbsd ;; esac - # Determine ABI tags. - case "${UNAME_MACHINE_ARCH}" in - earm*) - expr='s/^earmv[0-9]/-eabi/;s/eb$//' - abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"` - ;; - esac # The OS release # Debian GNU/NetBSD machines have a different userland, and # thus, need a distinct triplet. However, they do not need @@ -227,7 +213,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "${machine}-${os}${release}${abi}" + echo "${machine}-${os}${release}" exit ;; *:Bitrig:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` @@ -825,7 +811,12 @@ EOF exit ;; *:FreeBSD:*:*) UNAME_PROCESSOR=`/usr/bin/uname -p` - echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + case ${UNAME_PROCESSOR} in + amd64) + echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + *) + echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + esac exit ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin @@ -942,9 +933,6 @@ EOF crisv32:Linux:*:*) echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; - e2k:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; frv:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; diff --git a/sntp/libevent/build-aux/config.sub b/sntp/libevent/build-aux/config.sub index 3580aaf3ef9c1..7ffe373784288 100755 --- a/sntp/libevent/build-aux/config.sub +++ b/sntp/libevent/build-aux/config.sub @@ -1,8 +1,8 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright 1992-2015 Free Software Foundation, Inc. +# Copyright 1992-2014 Free Software Foundation, Inc. -timestamp='2015-03-08' +timestamp='2014-12-03' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -68,7 +68,7 @@ Report bugs and patches to <config-patches@gnu.org>." version="\ GNU config.sub ($timestamp) -Copyright 1992-2015 Free Software Foundation, Inc. +Copyright 1992-2014 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -117,7 +117,7 @@ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ - knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \ + knetbsd*-gnu* | netbsd*-gnu* | \ kopensolaris*-gnu* | \ storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os @@ -259,8 +259,8 @@ case $basic_machine in | bfin \ | c4x | c8051 | clipper \ | d10v | d30v | dlx | dsp16xx \ - | e2k | epiphany \ - | fido | fr30 | frv | ft32 \ + | epiphany \ + | fido | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | hexagon \ | i370 | i860 | i960 | ia64 \ @@ -300,7 +300,7 @@ case $basic_machine in | ns16k | ns32k \ | open8 | or1k | or1knd | or32 \ | pdp10 | pdp11 | pj | pjl \ - | powerpc | powerpc64 | powerpc64le | powerpcle | powerpcspe \ + | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ | riscv32 | riscv64 \ | rl78 | rx \ @@ -373,7 +373,7 @@ case $basic_machine in | aarch64-* | aarch64_be-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | amd64-* | arc-* | arceb-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ | be32-* | be64-* \ @@ -381,7 +381,7 @@ case $basic_machine in | c[123]* | c30-* | [cjt]90-* | c4x-* \ | c8051-* | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ - | e2k-* | elxsi-* \ + | elxsi-* \ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ @@ -426,7 +426,7 @@ case $basic_machine in | or1k*-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | powerpcspe-* \ + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ | pyramid-* \ | rl78-* | romp-* | rs6000-* | rx-* \ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ @@ -485,6 +485,12 @@ case $basic_machine in basic_machine=a29k-none os=-bsd ;; + amd64) + basic_machine=x86_64-pc + ;; + amd64-*) + basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; amdahl) basic_machine=580-amdahl os=-sysv @@ -512,9 +518,6 @@ case $basic_machine in basic_machine=i386-pc os=-aros ;; - asmjs) - basic_machine=asmjs-unknown - ;; aux) basic_machine=m68k-apple os=-aux @@ -1370,7 +1373,7 @@ case $os in | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ | -sym* | -kopensolaris* | -plan9* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ - | -aos* | -aros* | -cloudabi* \ + | -aos* | -aros* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ diff --git a/sntp/libevent/build-aux/depcomp b/sntp/libevent/build-aux/depcomp index b39f98f9ae9f9..fc98710e2a1df 100755 --- a/sntp/libevent/build-aux/depcomp +++ b/sntp/libevent/build-aux/depcomp @@ -1,9 +1,9 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2016-01-11.22; # UTC +scriptversion=2013-05-30.07; # UTC -# Copyright (C) 1999-2017 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -786,6 +786,6 @@ exit 0 # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC0" +# time-stamp-time-zone: "UTC" # time-stamp-end: "; # UTC" # End: diff --git a/sntp/libevent/build-aux/install-sh b/sntp/libevent/build-aux/install-sh index 0360b79e7d020..0b0fdcbba69ab 100755 --- a/sntp/libevent/build-aux/install-sh +++ b/sntp/libevent/build-aux/install-sh @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2016-01-11.22; # UTC +scriptversion=2013-12-25.23; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -496,6 +496,6 @@ done # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC0" +# time-stamp-time-zone: "UTC" # time-stamp-end: "; # UTC" # End: diff --git a/sntp/libevent/build-aux/missing b/sntp/libevent/build-aux/missing index c6e379584baf7..f62bbae306c7e 100755 --- a/sntp/libevent/build-aux/missing +++ b/sntp/libevent/build-aux/missing @@ -1,9 +1,9 @@ #! /bin/sh # Common wrapper for a few potentially missing GNU programs. -scriptversion=2016-01-11.22; # UTC +scriptversion=2013-10-28.13; # UTC -# Copyright (C) 1996-2017 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -210,6 +210,6 @@ exit $st # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC0" +# time-stamp-time-zone: "UTC" # time-stamp-end: "; # UTC" # End: diff --git a/sntp/libevent/build-aux/test-driver b/sntp/libevent/build-aux/test-driver index 0218a01f616eb..8e575b017d937 100755 --- a/sntp/libevent/build-aux/test-driver +++ b/sntp/libevent/build-aux/test-driver @@ -1,9 +1,9 @@ #! /bin/sh # test-driver - basic testsuite driver script. -scriptversion=2016-01-11.22; # UTC +scriptversion=2013-07-13.22; # UTC -# Copyright (C) 2011-2017 Free Software Foundation, Inc. +# Copyright (C) 2011-2014 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -143,6 +143,6 @@ echo ":copy-in-global-log: $gcopy" >> $trs_file # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC0" +# time-stamp-time-zone: "UTC" # time-stamp-end: "; # UTC" # End: diff --git a/sntp/libevent/build-aux/ylwrap b/sntp/libevent/build-aux/ylwrap index d788f2da5581a..7c2d927f7f679 100755 --- a/sntp/libevent/build-aux/ylwrap +++ b/sntp/libevent/build-aux/ylwrap @@ -1,9 +1,9 @@ #! /bin/sh # ylwrap - wrapper for lex/yacc invocations. -scriptversion=2016-01-11.22; # UTC +scriptversion=2013-01-12.17; # UTC -# Copyright (C) 1996-2017 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # # Written by Tom Tromey <tromey@cygnus.com>. # @@ -242,6 +242,6 @@ exit $ret # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC0" +# time-stamp-time-zone: "UTC" # time-stamp-end: "; # UTC" # End: diff --git a/sntp/libevent/test/regress.gen.c b/sntp/libevent/test/regress.gen.c index 9ec92583bcc27..883cb40d946e4 100644 --- a/sntp/libevent/test/regress.gen.c +++ b/sntp/libevent/test/regress.gen.c @@ -1,5 +1,5 @@ /* - * Automatically generated from ../../../sntp/libevent/test/regress.rpc + * Automatically generated from /ntpbuild/data/snaps/ntp-stable/sntp/libevent/test/regress.rpc * by event_rpcgen.py/0.1. DO NOT EDIT THIS FILE. */ diff --git a/sntp/libevent/test/regress.gen.h b/sntp/libevent/test/regress.gen.h index 3546f621891f0..fc4db40034560 100644 --- a/sntp/libevent/test/regress.gen.h +++ b/sntp/libevent/test/regress.gen.h @@ -1,9 +1,9 @@ /* - * Automatically generated from ../../../sntp/libevent/test/regress.rpc + * Automatically generated from /ntpbuild/data/snaps/ntp-stable/sntp/libevent/test/regress.rpc */ -#ifndef EVENT_RPCOUT__________SNTP_LIBEVENT_TEST_REGRESS_RPC_ -#define EVENT_RPCOUT__________SNTP_LIBEVENT_TEST_REGRESS_RPC_ +#ifndef EVENT_RPCOUT__NTPBUILD_DATA_SNAPS_NTP_STABLE_SNTP_LIBEVENT_TEST_REGRESS_RPC_ +#define EVENT_RPCOUT__NTPBUILD_DATA_SNAPS_NTP_STABLE_SNTP_LIBEVENT_TEST_REGRESS_RPC_ #include <event2/util.h> /* for ev_uint*_t */ #include <event2/rpc.h> @@ -204,4 +204,4 @@ int run_other_numbers_get(struct run *, int, ev_uint32_t *); ev_uint32_t * run_other_numbers_add(struct run *msg, const ev_uint32_t value); /* --- run done --- */ -#endif /* EVENT_RPCOUT__________SNTP_LIBEVENT_TEST_REGRESS_RPC_ */ +#endif /* EVENT_RPCOUT__NTPBUILD_DATA_SNAPS_NTP_STABLE_SNTP_LIBEVENT_TEST_REGRESS_RPC_ */ diff --git a/sntp/libopts/m4/libopts.m4 b/sntp/libopts/m4/libopts.m4 index 1a896d9759a5b..f8b2c38e16d82 100644 --- a/sntp/libopts/m4/libopts.m4 +++ b/sntp/libopts/m4/libopts.m4 @@ -216,7 +216,7 @@ AC_DEFUN([LIBOPTS_WITHLIB_REGEX],[ LIBREGEX_LIBS="" AC_MSG_CHECKING([whether libregex functions properly]) AC_CACHE_VAL([libopts_cv_with_libregex],[ - AC_RUN_IFELSE([@%:@include <stdio.h> + AC_RUN_IFELSE([AC_LANG_SOURCE([@%:@include <stdio.h> @%:@include <stdlib.h> @%:@include <sys/types.h> @%:@include REGEX_HEADER @@ -235,7 +235,7 @@ int main() { fputs( "error: regex -->.<-- did not match\n", stderr ); return 1; } - return 0; }], + return 0; }])], [libopts_cv_with_libregex=yes], [libopts_cv_with_libregex=no], [libopts_cv_with_libregex=no]) # end of AC_RUN_IFELSE ]) # end of AC_CACHE_VAL for libopts_cv_with_libregex @@ -260,12 +260,12 @@ libopts_cv_with_libregex=no AC_DEFUN([LIBOPTS_RUN_PATHFIND],[ AC_MSG_CHECKING([whether pathfind(3) works]) AC_CACHE_VAL([libopts_cv_run_pathfind],[ - AC_RUN_IFELSE([@%:@include <string.h> + AC_RUN_IFELSE([AC_LANG_SOURCE([@%:@include <string.h> @%:@include <stdlib.h> int main (int argc, char ** argv) { char * pz = pathfind( getenv( "PATH" ), "sh", "x" ); return (pz == 0) ? 1 : 0; -}], +}])], [libopts_cv_run_pathfind=yes],[libopts_cv_run_pathfind=no],[libopts_cv_run_pathfind=no] ) # end of RUN_IFELSE ]) # end of AC_CACHE_VAL for libopts_cv_run_pathfind @@ -303,7 +303,7 @@ echo ${dzero}` AC_DEFUN([LIBOPTS_RUN_REALPATH],[ AC_MSG_CHECKING([whether we have a functional realpath(3C)]) AC_CACHE_VAL([libopts_cv_run_realpath],[ - AC_RUN_IFELSE([@%:@include <limits.h> + AC_RUN_IFELSE([AC_LANG_SOURCE([@%:@include <limits.h> @%:@include <stdlib.h> int main (int argc, char ** argv) { @%:@ifndef PATH_MAX @@ -313,7 +313,7 @@ choke me!! @%:@endif char *pz = realpath(argv@<:@0@:>@, zPath); return (pz == zPath) ? 0 : 1; -}], +}])], [libopts_cv_run_realpath=yes],[libopts_cv_run_realpath=no],[libopts_cv_run_realpath=no] ) # end of RUN_IFELSE ]) # end of AC_CACHE_VAL for libopts_cv_run_realpath @@ -330,7 +330,7 @@ choke me!! AC_DEFUN([LIBOPTS_RUN_STRFTIME],[ AC_MSG_CHECKING([whether strftime() works]) AC_CACHE_VAL([libopts_cv_run_strftime],[ - AC_RUN_IFELSE([@%:@include <time.h> + AC_RUN_IFELSE([AC_LANG_SOURCE([@%:@include <time.h> @%:@include <string.h> char t_buf@<:@ 64 @:>@; int main() { @@ -346,7 +346,7 @@ int main() { tm.tm_yday = 239; /* days since January 1 @<:@0, 365@:>@ */ tm.tm_isdst = 1; /* flag for daylight savings time */ strftime( t_buf, sizeof( t_buf ), "%A %b %d %j", &tm ); - return (strcmp( t_buf, z ) != 0); }], + return (strcmp( t_buf, z ) != 0); }])], [libopts_cv_run_strftime=yes],[libopts_cv_run_strftime=no],[libopts_cv_run_strftime=no] ) # end of RUN_IFELSE ]) # end of AC_CACHE_VAL for libopts_cv_run_strftime @@ -363,10 +363,10 @@ int main() { AC_DEFUN([LIBOPTS_RUN_FOPEN_BINARY],[ AC_MSG_CHECKING([whether fopen accepts "b" mode]) AC_CACHE_VAL([libopts_cv_run_fopen_binary],[ - AC_RUN_IFELSE([@%:@include <stdio.h> + AC_RUN_IFELSE([AC_LANG_SOURCE([@%:@include <stdio.h> int main (int argc, char ** argv) { FILE * fp = fopen("conftest.@S|@ac_ext", "rb"); -return (fp == NULL) ? 1 : fclose(fp); }], +return (fp == NULL) ? 1 : fclose(fp); }])], [libopts_cv_run_fopen_binary=yes],[libopts_cv_run_fopen_binary=no],[libopts_cv_run_fopen_binary=no] ) # end of RUN_IFELSE ]) # end of AC_CACHE_VAL for libopts_cv_run_fopen_binary @@ -386,10 +386,10 @@ return (fp == NULL) ? 1 : fclose(fp); }], AC_DEFUN([LIBOPTS_RUN_FOPEN_TEXT],[ AC_MSG_CHECKING([whether fopen accepts "t" mode]) AC_CACHE_VAL([libopts_cv_run_fopen_text],[ - AC_RUN_IFELSE([@%:@include <stdio.h> + AC_RUN_IFELSE([AC_LANG_SOURCE([@%:@include <stdio.h> int main (int argc, char ** argv) { FILE * fp = fopen("conftest.@S|@ac_ext", "rt"); -return (fp == NULL) ? 1 : fclose(fp); }], +return (fp == NULL) ? 1 : fclose(fp); }])], [libopts_cv_run_fopen_text=yes],[libopts_cv_run_fopen_text=no],[libopts_cv_run_fopen_text=no] ) # end of RUN_IFELSE ]) # end of AC_CACHE_VAL for libopts_cv_run_fopen_text diff --git a/sntp/m4/ntp_problemtests.m4 b/sntp/m4/ntp_problemtests.m4 index ebc2cd91b9351..c7b93c8c031da 100644 --- a/sntp/m4/ntp_problemtests.m4 +++ b/sntp/m4/ntp_problemtests.m4 @@ -33,6 +33,10 @@ case "$ntp_ept:$cross:$host" in no:0:*-*-solaris*) ;; *) ntp_test_ntp_restrict="yes" ;; esac +case "$ntp_cv_gc_sections_runs" in + no) ntp_test_ntp_restrict="no" ;; + * ) ;; +esac AC_MSG_RESULT([$ntp_test_ntp_restrict]) AM_CONDITIONAL([BUILD_TEST_NTP_RESTRICT], [test x$ntp_test_ntp_restrict = xyes]) @@ -43,6 +47,10 @@ case "$ntp_ept:$cross:$host" in no:0:*-*-solaris*) ;; *) ntp_test_ntp_scanner="yes" ;; esac +case "$ntp_cv_gc_sections_runs" in + no) ntp_test_ntp_scanner="no" ;; + * ) ;; +esac AC_MSG_RESULT([$ntp_test_ntp_scanner]) AM_CONDITIONAL([BUILD_TEST_NTP_SCANNER], [test x$ntp_test_ntp_scanner = xyes]) @@ -53,6 +61,10 @@ case "$ntp_ept:$cross:$host" in no:0:*-*-solaris*) ;; *) ntp_test_ntp_signd="yes" ;; esac +case "$ntp_cv_gc_sections_runs" in + no) ntp_test_ntp_signd="no" ;; + * ) ;; +esac AC_MSG_RESULT([$ntp_test_ntp_signd]) AM_CONDITIONAL([BUILD_TEST_NTP_SIGND], [test x$ntp_test_ntp_signd = xyes]) diff --git a/sntp/m4/version.m4 b/sntp/m4/version.m4 index 48b635c16e71a..836702a2efc71 100644 --- a/sntp/m4/version.m4 +++ b/sntp/m4/version.m4 @@ -1 +1 @@ -m4_define([VERSION_NUMBER],[4.2.8p13]) +m4_define([VERSION_NUMBER],[4.2.8p14]) diff --git a/sntp/main.c b/sntp/main.c index 204d6a8de328e..8a4a2e562bb4b 100644 --- a/sntp/main.c +++ b/sntp/main.c @@ -8,6 +8,10 @@ # include <event2/thread.h> #endif +#ifdef HAVE_SYSEXITS_H +# include <sysexits.h> +#endif + #include "main.h" #include "ntp_libopts.h" #include "kod_management.h" diff --git a/sntp/networking.c b/sntp/networking.c index 040395e175b2a..32fb5cd1c67b0 100644 --- a/sntp/networking.c +++ b/sntp/networking.c @@ -26,7 +26,7 @@ sendpkt ( cc = sendto(rsock, (void *)pkt, len, 0, &dest->sa, SOCKLEN(dest)); if (cc == SOCKET_ERROR) { - msyslog(LOG_ERR, "Send to %s failed, %m", + msyslog(LOG_ERR, "sendpkt: sendto(%s) failed: %m", sptoa(dest)); return FALSE; } diff --git a/sntp/scm-rev b/sntp/scm-rev index 4410181884b6b..fe53b4fe5a4d0 100644 --- a/sntp/scm-rev +++ b/sntp/scm-rev @@ -1 +1 @@ -1.3847 +1.3728 diff --git a/sntp/sntp-opts.c b/sntp/sntp-opts.c index 9f6ee3268aed9..e5857c3fe1d4c 100644 --- a/sntp/sntp-opts.c +++ b/sntp/sntp-opts.c @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (sntp-opts.c) * - * It has been AutoGen-ed February 20, 2019 at 09:55:45 AM by AutoGen 5.18.5 + * It has been AutoGen-ed March 3, 2020 at 05:39:59 PM by AutoGen 5.18.5 * From the definitions sntp-opts.def * and the template file options * @@ -18,7 +18,7 @@ * The sntp program is copyrighted and licensed * under the following terms: * - * Copyright (C) 1992-2017 The University of Delaware and Network Time Foundation, all rights reserved. + * Copyright (C) 1992-2020 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: @@ -70,8 +70,8 @@ extern FILE * option_usage_fp; * static const strings for sntp options */ static char const sntp_opt_strs[2566] = -/* 0 */ "sntp 4.2.8p13\n" - "Copyright (C) 1992-2017 The University of Delaware and Network Time Foundation, all rights reserved.\n" +/* 0 */ "sntp 4.2.8p14\n" + "Copyright (C) 1992-2020 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" "can be seen at:\n" @@ -156,7 +156,7 @@ static char const sntp_opt_strs[2566] = /* 2313 */ "LOAD_OPTS\0" /* 2323 */ "no-load-opts\0" /* 2336 */ "SNTP\0" -/* 2341 */ "sntp - standard Simple Network Time Protocol client program - Ver. 4.2.8p13\n" +/* 2341 */ "sntp - standard Simple Network Time Protocol client program - Ver. 4.2.8p14\n" "Usage: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... \\\n" "\t\t[ hostname-or-IP ...]\n\0" /* 2501 */ "$HOME\0" @@ -164,7 +164,7 @@ static char const sntp_opt_strs[2566] = /* 2509 */ ".ntprc\0" /* 2516 */ "http://bugs.ntp.org, bugs@ntp.org\0" /* 2550 */ "\n\0" -/* 2552 */ "sntp 4.2.8p13"; +/* 2552 */ "sntp 4.2.8p14"; /** * ipv4 option description with @@ -1176,8 +1176,8 @@ static void bogus_function(void) { translate option names. */ /* referenced via sntpOptions.pzCopyright */ - puts(_("sntp 4.2.8p13\n\ -Copyright (C) 1992-2017 The University of Delaware and Network Time Foundation, all rights reserved.\n\ + puts(_("sntp 4.2.8p14\n\ +Copyright (C) 1992-2020 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\ can be seen at:\n")); @@ -1266,7 +1266,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.8p13\n\ + puts(_("sntp - standard Simple Network Time Protocol client program - Ver. 4.2.8p14\n\ Usage: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... \\\n\ \t\t[ hostname-or-IP ...]\n")); @@ -1274,7 +1274,7 @@ Usage: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... \\\n\ puts(_("\n")); /* referenced via sntpOptions.pzFullVersion */ - puts(_("sntp 4.2.8p13")); + puts(_("sntp 4.2.8p14")); /* referenced via sntpOptions.pzFullUsage */ puts(_("<<<NOT-FOUND>>>")); diff --git a/sntp/sntp-opts.h b/sntp/sntp-opts.h index cf17a27c938f8..1a5f8740fc43e 100644 --- a/sntp/sntp-opts.h +++ b/sntp/sntp-opts.h @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (sntp-opts.h) * - * It has been AutoGen-ed February 20, 2019 at 09:55:45 AM by AutoGen 5.18.5 + * It has been AutoGen-ed March 3, 2020 at 05:39:58 PM by AutoGen 5.18.5 * From the definitions sntp-opts.def * and the template file options * @@ -18,7 +18,7 @@ * The sntp program is copyrighted and licensed * under the following terms: * - * Copyright (C) 1992-2017 The University of Delaware and Network Time Foundation, all rights reserved. + * Copyright (C) 1992-2020 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: @@ -91,9 +91,9 @@ typedef enum { /** count of all options for sntp */ #define OPTION_CT 23 /** sntp version */ -#define SNTP_VERSION "4.2.8p13" +#define SNTP_VERSION "4.2.8p14" /** Full sntp version text */ -#define SNTP_FULL_VERSION "sntp 4.2.8p13" +#define SNTP_FULL_VERSION "sntp 4.2.8p14" /** * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/sntp/sntp.1sntpman b/sntp/sntp.1sntpman index 732b0b427f1af..50ee5774ba87c 100644 --- a/sntp/sntp.1sntpman +++ b/sntp/sntp.1sntpman @@ -10,11 +10,11 @@ .ds B-Font B .ds I-Font I .ds R-Font R -.TH sntp 1sntpman "20 Feb 2019" "4.2.8p13" "User Commands" +.TH sntp 1sntpman "03 Mar 2020" "4.2.8p14" "User Commands" .\" .\" EDIT THIS FILE WITH CAUTION (in-mem file) .\" -.\" It has been AutoGen-ed February 20, 2019 at 09:55:51 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed March 3, 2020 at 05:40:04 PM by AutoGen 5.18.5 .\" From the definitions sntp-opts.def .\" and the template file agman-cmd.tpl .SH NAME @@ -353,7 +353,7 @@ it to autogen-users@lists.sourceforge.net. Thank you. .NOP "Dave Hart" .br .SH "COPYRIGHT" -Copyright (C) 1992-2017 The University of Delaware and Network Time Foundation all rights reserved. +Copyright (C) 1992-2020 The University of Delaware and Network Time Foundation all rights reserved. This program is released under the terms of the NTP license, <http://ntp.org/license>. .SH "BUGS" Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org diff --git a/sntp/sntp.1sntpmdoc b/sntp/sntp.1sntpmdoc index c3dc84d44eac3..6e1ede0098aa8 100644 --- a/sntp/sntp.1sntpmdoc +++ b/sntp/sntp.1sntpmdoc @@ -1,9 +1,9 @@ -.Dd February 20 2019 +.Dd March 3 2020 .Dt SNTP 1sntpmdoc User Commands .Os .\" EDIT THIS FILE WITH CAUTION (sntp-opts.mdoc) .\" -.\" It has been AutoGen-ed February 20, 2019 at 09:55:48 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed March 3, 2020 at 05:40:01 PM by AutoGen 5.18.5 .\" From the definitions sntp-opts.def .\" and the template file agmdoc-cmd.tpl .Sh NAME @@ -308,7 +308,7 @@ it to autogen\-users@lists.sourceforge.net. Thank you. .An "Harlan Stenn" .An "Dave Hart" .Sh "COPYRIGHT" -Copyright (C) 1992\-2017 The University of Delaware and Network Time Foundation all rights reserved. +Copyright (C) 1992\-2020 The University of Delaware and Network Time Foundation all rights reserved. This program is released under the terms of the NTP license, <http://ntp.org/license>. .Sh "BUGS" Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org diff --git a/sntp/sntp.html b/sntp/sntp.html index 884553b043220..e89319fbc4b5f 100644 --- a/sntp/sntp.html +++ b/sntp/sntp.html @@ -64,7 +64,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> -<p>This document applies to version 4.2.8p13 of <code>sntp</code>. +<p>This document applies to version 4.2.8p14 of <code>sntp</code>. </p> <p>The program implements the SNTP protocol as defined by RFC 5905, the NTPv4 IETF specification. @@ -243,7 +243,7 @@ used to select the program, defaulting to <samp>more</samp>. Both will exit with a status code of 0. </p> <div class="example"> -<pre class="example">sntp - standard Simple Network Time Protocol client program - Ver. 4.2.8p13 +<pre class="example">sntp - standard Simple Network Time Protocol client program - Ver. 4.2.8p14 Usage: sntp [ -<flag> [<val>] | --<name>[{=| }<val>] ]... \ [ hostname-or-IP ...] Flg Arg Option-Name Description diff --git a/sntp/sntp.man.in b/sntp/sntp.man.in index b94a3cdea388c..6410619ecd2af 100644 --- a/sntp/sntp.man.in +++ b/sntp/sntp.man.in @@ -10,11 +10,11 @@ .ds B-Font B .ds I-Font I .ds R-Font R -.TH sntp @SNTP_MS@ "20 Feb 2019" "4.2.8p13" "User Commands" +.TH sntp @SNTP_MS@ "03 Mar 2020" "4.2.8p14" "User Commands" .\" .\" EDIT THIS FILE WITH CAUTION (in-mem file) .\" -.\" It has been AutoGen-ed February 20, 2019 at 09:55:51 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed March 3, 2020 at 05:40:04 PM by AutoGen 5.18.5 .\" From the definitions sntp-opts.def .\" and the template file agman-cmd.tpl .SH NAME @@ -353,7 +353,7 @@ it to autogen-users@lists.sourceforge.net. Thank you. .NOP "Dave Hart" .br .SH "COPYRIGHT" -Copyright (C) 1992-2017 The University of Delaware and Network Time Foundation all rights reserved. +Copyright (C) 1992-2020 The University of Delaware and Network Time Foundation all rights reserved. This program is released under the terms of the NTP license, <http://ntp.org/license>. .SH "BUGS" Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org diff --git a/sntp/sntp.mdoc.in b/sntp/sntp.mdoc.in index 89eb68c0d0147..14caa5a762f4d 100644 --- a/sntp/sntp.mdoc.in +++ b/sntp/sntp.mdoc.in @@ -1,9 +1,9 @@ -.Dd February 20 2019 +.Dd March 3 2020 .Dt SNTP @SNTP_MS@ User Commands .Os .\" EDIT THIS FILE WITH CAUTION (sntp-opts.mdoc) .\" -.\" It has been AutoGen-ed February 20, 2019 at 09:55:48 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed March 3, 2020 at 05:40:01 PM by AutoGen 5.18.5 .\" From the definitions sntp-opts.def .\" and the template file agmdoc-cmd.tpl .Sh NAME @@ -308,7 +308,7 @@ it to autogen\-users@lists.sourceforge.net. Thank you. .An "Harlan Stenn" .An "Dave Hart" .Sh "COPYRIGHT" -Copyright (C) 1992\-2017 The University of Delaware and Network Time Foundation all rights reserved. +Copyright (C) 1992\-2020 The University of Delaware and Network Time Foundation all rights reserved. This program is released under the terms of the NTP license, <http://ntp.org/license>. .Sh "BUGS" Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org diff --git a/sntp/tests/run-crypto.c b/sntp/tests/run-crypto.c index 0d4e94d5536c7..a486f86c40353 100644 --- a/sntp/tests/run-crypto.c +++ b/sntp/tests/run-crypto.c @@ -43,7 +43,9 @@ extern void test_PacketSizeNotMultipleOfFourBytes(void); //=======Suite Setup===== static void suite_setup(void) { +extern int change_iobufs(int); extern int change_logfile(const char*, int); +change_iobufs(1); change_logfile("stderr", 0); } diff --git a/sntp/tests/run-keyFile.c b/sntp/tests/run-keyFile.c index 6c1848e660e20..5b25519cef3ca 100644 --- a/sntp/tests/run-keyFile.c +++ b/sntp/tests/run-keyFile.c @@ -41,7 +41,9 @@ extern void test_ReadKeyFileWithInvalidHex(void); //=======Suite Setup===== static void suite_setup(void) { +extern int change_iobufs(int); extern int change_logfile(const char*, int); +change_iobufs(1); change_logfile("stderr", 0); } diff --git a/sntp/tests/run-kodDatabase.c b/sntp/tests/run-kodDatabase.c index 0d86ee30fbf02..67b7fc2c4ba7e 100644 --- a/sntp/tests/run-kodDatabase.c +++ b/sntp/tests/run-kodDatabase.c @@ -44,7 +44,9 @@ extern void test_DeleteEntry(void); //=======Suite Setup===== static void suite_setup(void) { +extern int change_iobufs(int); extern int change_logfile(const char*, int); +change_iobufs(1); change_logfile("stderr", 0); } diff --git a/sntp/tests/run-kodFile.c b/sntp/tests/run-kodFile.c index 07a32d724a557..a3af21855c551 100644 --- a/sntp/tests/run-kodFile.c +++ b/sntp/tests/run-kodFile.c @@ -42,7 +42,9 @@ extern void test_WriteFileWithMultipleEntries(void); //=======Suite Setup===== static void suite_setup(void) { +extern int change_iobufs(int); extern int change_logfile(const char*, int); +change_iobufs(1); change_logfile("stderr", 0); } diff --git a/sntp/tests/run-networking.c b/sntp/tests/run-networking.c index 0083ec392aee5..1c1364fd65c73 100644 --- a/sntp/tests/run-networking.c +++ b/sntp/tests/run-networking.c @@ -34,7 +34,9 @@ extern void tearDown(void); //=======Suite Setup===== static void suite_setup(void) { +extern int change_iobufs(int); extern int change_logfile(const char*, int); +change_iobufs(1); change_logfile("stderr", 0); } diff --git a/sntp/tests/run-packetHandling.c b/sntp/tests/run-packetHandling.c index 4cca13b530a06..7790b208875fe 100644 --- a/sntp/tests/run-packetHandling.c +++ b/sntp/tests/run-packetHandling.c @@ -50,7 +50,9 @@ extern void test_HandleCorrectPacket(void); //=======Suite Setup===== static void suite_setup(void) { +extern int change_iobufs(int); extern int change_logfile(const char*, int); +change_iobufs(1); change_logfile("stderr", 0); } diff --git a/sntp/tests/run-packetProcessing.c b/sntp/tests/run-packetProcessing.c index 50144ed36977e..c91a6d340a393 100644 --- a/sntp/tests/run-packetProcessing.c +++ b/sntp/tests/run-packetProcessing.c @@ -54,7 +54,9 @@ extern void test_CorrectAuthenticatedPacketCMAC(void); //=======Suite Setup===== static void suite_setup(void) { +extern int change_iobufs(int); extern int change_logfile(const char*, int); +change_iobufs(1); change_logfile("stderr", 0); } diff --git a/sntp/tests/run-t-log.c b/sntp/tests/run-t-log.c index 3532c4e0ed664..268bf41d3a48e 100644 --- a/sntp/tests/run-t-log.c +++ b/sntp/tests/run-t-log.c @@ -36,7 +36,9 @@ extern void testWriteInCustomLogfile(void); //=======Suite Setup===== static void suite_setup(void) { +extern int change_iobufs(int); extern int change_logfile(const char*, int); +change_iobufs(1); change_logfile("stderr", 0); } diff --git a/sntp/tests/run-utilities.c b/sntp/tests/run-utilities.c index 0f388451763ad..f717882a4b572 100644 --- a/sntp/tests/run-utilities.c +++ b/sntp/tests/run-utilities.c @@ -44,7 +44,9 @@ extern void test_LfpOutputDecimalFormat(void); //=======Suite Setup===== static void suite_setup(void) { +extern int change_iobufs(int); extern int change_logfile(const char*, int); +change_iobufs(1); change_logfile("stderr", 0); } diff --git a/sntp/tests/testconf.yml b/sntp/tests/testconf.yml index 6140daaf9c787..182e0d762f387 100644 --- a/sntp/tests/testconf.yml +++ b/sntp/tests/testconf.yml @@ -4,6 +4,8 @@ --- :unity: :suite_setup: + - extern int change_iobufs(int); - extern int change_logfile(const char*, int); + - change_iobufs(1); - change_logfile("stderr", 0); diff --git a/sntp/version.c b/sntp/version.c index 77ce2231687e4..0285c3075f6f7 100644 --- a/sntp/version.c +++ b/sntp/version.c @@ -2,4 +2,4 @@ * version file for sntp */ #include <config.h> -const char * Version = "sntp 4.2.8p13@1.3847-o Thu Feb 21 01:04:54 UTC 2019 (1)"; +const char * Version = "sntp 4.2.8p14@1.3728-o Wed Mar 4 01:42:35 UTC 2020 (8)"; |