diff options
| author | glebius <glebius@FreeBSD.org> | 2015-10-26 11:35:40 +0000 |
|---|---|---|
| committer | glebius <glebius@FreeBSD.org> | 2015-10-26 11:35:40 +0000 |
| commit | c62812877398840dae0ba74b03e9e6a43cc56fc5 (patch) | |
| tree | 304551aa93f09787d4f56a966c6409faf1b1bcb0 /contrib/ntp/clockstuff | |
| parent | 9e809ce638c9be9ffb800ced1b91c0e8997f4c9e (diff) | |
| download | FreeBSD-src-c62812877398840dae0ba74b03e9e6a43cc56fc5.zip FreeBSD-src-c62812877398840dae0ba74b03e9e6a43cc56fc5.tar.gz | |
Upgrade NTP to 4.2.8p4.
Security: FreeBSD-SA-15:25.ntp
Security: CVE-2015-7871
Security: CVE-2015-7855
Security: CVE-2015-7854
Security: CVE-2015-7853
Security: CVE-2015-7852
Security: CVE-2015-7851
Security: CVE-2015-7850
Security: CVE-2015-7849
Security: CVE-2015-7848
Security: CVE-2015-7701
Security: CVE-2015-7703
Security: CVE-2015-7704, CVE-2015-7705
Security: CVE-2015-7691, CVE-2015-7692, CVE-2015-7702
Diffstat (limited to 'contrib/ntp/clockstuff')
| -rw-r--r-- | contrib/ntp/clockstuff/Makefile.in | 4 | ||||
| -rw-r--r-- | contrib/ntp/clockstuff/chutest.c | 2 | ||||
| -rw-r--r-- | contrib/ntp/clockstuff/propdelay.c | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/contrib/ntp/clockstuff/Makefile.in b/contrib/ntp/clockstuff/Makefile.in index 0236354..e75f4c0 100644 --- a/contrib/ntp/clockstuff/Makefile.in +++ b/contrib/ntp/clockstuff/Makefile.in @@ -117,6 +117,7 @@ am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \ $(top_srcdir)/sntp/m4/ntp_locinfo.m4 \ $(top_srcdir)/sntp/m4/ntp_openssl.m4 \ $(top_srcdir)/sntp/m4/ntp_pkg_config.m4 \ + $(top_srcdir)/sntp/m4/ntp_problemtests.m4 \ $(top_srcdir)/sntp/m4/ntp_prog_cc.m4 \ $(top_srcdir)/sntp/m4/ntp_rlimit.m4 \ $(top_srcdir)/sntp/m4/ntp_sntp.m4 \ @@ -224,6 +225,7 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BUILD_THREAD = @BUILD_THREAD@ CALC_TICKADJ_DB = @CALC_TICKADJ_DB@ CALC_TICKADJ_DL = @CALC_TICKADJ_DL@ CALC_TICKADJ_DS = @CALC_TICKADJ_DS@ @@ -232,6 +234,7 @@ CALC_TICKADJ_NI = @CALC_TICKADJ_NI@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CFLAGS_LIBEVENT = @CFLAGS_LIBEVENT@ CFLAGS_NTP = @CFLAGS_NTP@ CHUTEST = @CHUTEST@ CONFIG_SHELL = @CONFIG_SHELL@ @@ -293,6 +296,7 @@ LIBTOOL_DEPS = @LIBTOOL_DEPS@ LIPO = @LIPO@ LN_S = @LN_S@ LSCF = @LSCF@ +LTHREAD_LIBS = @LTHREAD_LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ MAKE_ADJTIMED = @MAKE_ADJTIMED@ diff --git a/contrib/ntp/clockstuff/chutest.c b/contrib/ntp/clockstuff/chutest.c index 488a0d1..78f6c5f 100644 --- a/contrib/ntp/clockstuff/chutest.c +++ b/contrib/ntp/clockstuff/chutest.c @@ -56,7 +56,7 @@ struct chucode { #define STREQ(a, b) (*(a) == *(b) && strcmp((a), (b)) == 0) -char *progname; +char const *progname; int dofilter = 0; /* set to 1 when we should run filter algorithm */ int showtimes = 0; /* set to 1 when we should show char arrival times */ diff --git a/contrib/ntp/clockstuff/propdelay.c b/contrib/ntp/clockstuff/propdelay.c index 52c2032..a3b9fc0 100644 --- a/contrib/ntp/clockstuff/propdelay.c +++ b/contrib/ntp/clockstuff/propdelay.c @@ -117,7 +117,7 @@ int Cflag = 0; int Gflag = 0; int height; -char *progname; +char const *progname; static void doit (double, double, double, double, double, char *); static double latlong (char *, int); |
