From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 15 Jul 2023 06:44:21 +0000 (-0700)
Subject: Merge ntp-testbuild.tal1.ntfo.org:/home/localhost/u1/harlan/ntp-stable
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=db22d31b4ebe565badead7d4f0ea61cf8bac15d6;p=thirdparty%2Fntp.git

Merge ntp-testbuild.tal1.ntfo.org:/home/localhost/u1/harlan/ntp-stable
into  ntp-testbuild.tal1.ntfo.org:/home/localhost/u1/harlan/ntp-stable-3846

bk: 64b24045UMNKAqAwOz_8PNYR3QuuZw
---

db22d31b4ebe565badead7d4f0ea61cf8bac15d6
diff --cc ChangeLog
index 5837636c6,0a91317de..fb1df82ce
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,21 -1,5 +1,22 @@@
  ---
 +
+ * [Bug 3846] Use -Wno-format-truncation by default.
 +* [Bug 3841] 4.2.8p17 build break w/ gcc 12 -Wformat-security without -Wformat
 +             Need to remove --Wformat-security when removing -Wformat to
 +             silence numerous libopts warnings.  <hart@ntp.org>
 +* [Bug 3837] NULL pointer deref crash when ntpd deletes last interface.
 +             Reported by renmingshuai.  Correct UNLINK_EXPR_SLIST() when the
 +             list is empty. <hart@ntp.org>
 +* [Bug 3835] NTP_HARD_*FLAGS not used by libevent tearoff.
 +* [Bug 3831] pollskewlist zeroed on runtime configuration. <hart@ntp.org>
 +* [Bug 3828] BK should ignore a git repo in the same directory.
 +             <burnicki@ntp.org>
 +* [Bug 3827] Fix build in case CLOCK_HOPF6021 or CLOCK_WHARTON_400A
 +             is disabled.  <burnicki@ntp.org>
 +* [Bug 3825] Don't touch HTML files unless building inside a BK repo.
 +             Fix the script checkHtmlFileDates.  <burnicki@ntp.org>
 +* html/clockopt.html cleanup.  <stenn@ntp.org>
 +* Add DSA, DSA-SHA, and SHA to tests/libntp/digests.c. <hart@ntp.org>
  
  ---
  (4.2.8p17) 2023/06/06 Released by Harlan Stenn <stenn@ntp.org>
diff --cc sntp/m4/ntp_compiler.m4
index 0d857bbcc,6f603b087..d1c639125
--- a/sntp/m4/ntp_compiler.m4
+++ b/sntp/m4/ntp_compiler.m4
@@@ -104,8 -102,12 +102,11 @@@ case "$GCC" i
  	]
      )
      #
+     # $ntp_cv_gcc_Winit_self is tested later to add the 
+     # flag to CFLAGS_NTP.
+     #
      # libopts specifically builds a string with embedded NULs.
      # This causes a bunch of distracting warnings due to -Wformat.
 -    # Let's see if we can figure out how to disable these.
      #
      CFLAGS="$SAVED_CFLAGS -Wno-format -Wno-format-security"
      AC_CACHE_CHECK(
@@@ -119,17 -121,32 +120,30 @@@
  	    )
  	]
      )
 -
      case "$ntp_cv_gcc_Wno_format" in
+       no) ntp_cv_gcc_Wno_format_truncation=no
+ 	  ;;
       yes)
- 	CC_NOFORMAT="$CC_NOFORMAT -Wno-format -Wno-format-security"
+ 	CC_NOFORMAT="-Wno-format -Wno-format-security"
+ 	CFLAGS="$SAVED_CFLAGS -Wformat -Wno-format-truncation -Werror"
+ 	AC_CACHE_CHECK(
+ 		[if $CC can handle -Wformat -Wno-format-truncation], 
+ 		[ntp_cv_gcc_Wno_format_truncation], 
+ 		[AC_COMPILE_IFELSE(
+ 		    [AC_LANG_PROGRAM([[]], [[]])],
+ 		    [ntp_cv_gcc_Wno_format_truncation=yes],
+ 		    [ntp_cv_gcc_Wno_format_truncation=no]
+ 		)	]
+ 	)
+ 	#
+ 	# $ntp_cv_gcc_Wno_format_truncation is tested later to add the 
+ 	# flag to CFLAGS.
+ 	#
      esac
  
 -
      CFLAGS="$SAVED_CFLAGS"
      AS_UNSET([SAVED_CFLAGS])
-     #
-     # $ntp_cv_gcc_Winit_self is tested later to add the 
-     # flag to CFLAGS_NTP.
-     #
+ 
      AC_CACHE_CHECK(
  	[if linker supports omitting unused code and data],
  	[ntp_cv_gc_sections_runs],