From: Harlan Stenn Date: Fri, 24 Feb 2017 11:26:16 +0000 (-0500) Subject: [Sec 3376] Support build "hardening" flags. X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a465aa32fdc63ab96c3114f0cdf6170e917e0b6b;p=thirdparty%2Fntp.git [Sec 3376] Support build "hardening" flags. bk: 58b01858BDuBSxU40fKTiW1WT1M8AQ --- diff --git a/ChangeLog b/ChangeLog index fea59795f..a7aefe82d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ --- (4.2.8p10) +* [Sec 3376] Support build "hardening" flags. stenn@ntp.org * [Bug 3363] Support for openssl-1.1.0 without compatibility modes - rework of patch set from . * [Bug 3356] Bugfix 3072 breaks multicastclient diff --git a/adjtimed/Makefile.am b/adjtimed/Makefile.am index b603fed92..19bfe0c95 100644 --- a/adjtimed/Makefile.am +++ b/adjtimed/Makefile.am @@ -8,12 +8,15 @@ BUILT_SOURCES = CLEANFILES = EXTRA_PROGRAMS = adjtimed -AM_CFLAGS = $(CFLAGS_NTP) +AM_CFLAGS = $(CFLAGS_NTP) +AM_CFLAGS += $(NTP_HARD_CFLAGS) AM_CPPFLAGS = $(NTP_INCS) AM_CPPFLAGS += $(CPPFLAGS_NTP) +AM_CPPFLAGS += $(NTP_HARD_CPPFLAGS) LDADD = ../libntp/libntp.a $(LDADD_LIBNTP) $(LIBM) $(PTHREAD_LIBS) +AM_LDFLAGS = $(NTP_HARD_LDFLAGS) include $(top_srcdir)/bincheck.mf include $(top_srcdir)/sntp/check-libntp.mf diff --git a/clockstuff/Makefile.am b/clockstuff/Makefile.am index d909fbf61..27984e9df 100644 --- a/clockstuff/Makefile.am +++ b/clockstuff/Makefile.am @@ -2,11 +2,14 @@ noinst_PROGRAMS = @PROPDELAY@ @CHUTEST@ EXTRA_PROGRAMS = propdelay chutest AM_CFLAGS = $(CFLAGS_NTP) +AM_CFLAGS += $(NTP_HARD_CFLAGS) AM_CPPFLAGS = $(NTP_INCS) AM_CPPFLAGS += $(CPPFLAGS_NTP) +AM_CPPFLAGS += $(NTP_HARD_CPPFLAGS) LDADD = ../libntp/libntp.a $(LDADD_LIBNTP) $(LIBM) $(PTHREAD_LIBS) +AM_LDFLAGS = $(NTP_HARD_LDFLAGS) propdelay_LDADD = $(LDADD) BUILT_SOURCES = diff --git a/configure.ac b/configure.ac index 44a0a7426..066fb35c8 100644 --- a/configure.ac +++ b/configure.ac @@ -72,6 +72,8 @@ AC_PROG_YACC AC_PROG_CC_C_O AX_C99_STRUCT_INIT +NTP_HARDEN([sntp]) + NTP_VPATH_HACK dnl used only by ntpd/Makefile.am NTP_LOCINFO([sntp]) dnl takes over from NTP_BINDIR, in NTP_LIBNTP diff --git a/libntp/Makefile.am b/libntp/Makefile.am index 874739a18..6f3c0ba45 100644 --- a/libntp/Makefile.am +++ b/libntp/Makefile.am @@ -119,10 +119,14 @@ libntpsim_a_SOURCES = systime_s.c $(libntp_a_SRCS) EXTRA_libntp_a_SOURCES = adjtimex.c AM_CFLAGS = $(CFLAGS_NTP) +AM_CFLAGS += $(NTP_HARD_CFLAGS) AM_CPPFLAGS = $(NTP_INCS) AM_CPPFLAGS += $(LIBOPTS_CFLAGS) AM_CPPFLAGS += $(CPPFLAGS_NTP) +AM_CPPFLAGS += $(NTP_HARD_CPPFLAGS) + +AM_LDFLAGS = $(NTP_HARD_LDFLAGS) EXTRA_DIST = README diff --git a/libparse/Makefile.am b/libparse/Makefile.am index 2988e08e2..41528a76b 100644 --- a/libparse/Makefile.am +++ b/libparse/Makefile.am @@ -81,10 +81,14 @@ libparse_kernel_a_LIBADD = \ $(NULL) AM_CFLAGS = $(CFLAGS_NTP) +AM_CFLAGS += $(NTP_HARD_CFLAGS) AM_CPPFLAGS = $(NTP_INCS) AM_CPPFLAGS += -I$(top_srcdir)/kernel AM_CPPFLAGS += $(CPPFLAGS_NTP) +AM_CPPFLAGS += $(NTP_HARD_CPPFLAGS) + +AM_LDFLAGS = $(NTP_HARD_LDFLAGS) EXTRA_DIST = parsesolaris.c parsestreams.c mkinfo_scmd.sed mkinfo_rcmd.sed info_trimble.c diff --git a/ntpd/Makefile.am b/ntpd/Makefile.am index a5690b70d..60c5de8a1 100644 --- a/ntpd/Makefile.am +++ b/ntpd/Makefile.am @@ -7,12 +7,15 @@ sbin_PROGRAMS= $(NTPD_DS) $(NTPDSIM_DS) noinst_LIBRARIES= libntpd.a AM_CFLAGS = $(CFLAGS_NTP) +AM_CFLAGS += $(NTP_HARD_CFLAGS) AM_CPPFLAGS = $(NTP_INCS) AM_CPPFLAGS += $(LIBOPTS_CFLAGS) AM_CPPFLAGS += $(CPPFLAGS_NTP) +AM_CPPFLAGS += $(NTP_HARD_CPPFLAGS) AM_LDFLAGS = $(LDFLAGS_NTP) +AM_LDFLAGS += $(NTP_HARD_LDFLAGS) # LDADD might need RESLIB and ADJLIB. LDADD = version.o libntpd.a $(LIBPARSE) diff --git a/ntpd/ntp.conf.html b/ntpd/ntp.conf.html index d667e90d7..b76d4c53f 100644 --- a/ntpd/ntp.conf.html +++ b/ntpd/ntp.conf.html @@ -1,128 +1,164 @@ - + + + -NTP Configuration File User's Manual - - - - - - - +NTP Configuration File User’s Manual + + + + + + + + + + + + - -

NTP Configuration File User's Manual

-
-


-Next: , -Previous: (dir), -Up: (dir) -
-
-

NTP's Configuration File User Manual

+ +

NTP Configuration File User’s Manual

-

This document describes the configuration file for the NTP Project's -ntpd program. -

This document applies to version 4.2.8p9-win of ntp.conf. -

-

Short Contents

- + + + +
+

+Next: , Previous: , Up: (dir)  

+ +

NTP’s Configuration File User Manual

-