head 1.1; branch 1.1.1; access; symbols netbsd-11-0-RC5:1.1.1.1 netbsd-11-0-RC4:1.1.1.1 netbsd-11-0-RC3:1.1.1.1 netbsd-11-0-RC2:1.1.1.1 netbsd-11-0-RC1:1.1.1.1 perseant-exfatfs-base-20250801:1.1.1.1 netbsd-11:1.1.1.1.0.2 netbsd-11-base:1.1.1.1 ntp-4-2-8p18:1.1.1.1 UDEL:1.1.1; locks; strict; comment @# @; 1.1 date 2024.08.18.20.37.42; author christos; state Exp; branches 1.1.1.1; next ; commitid RohTFOFoVLJItlmF; 1.1.1.1 date 2024.08.18.20.37.42; author christos; state Exp; branches; next ; commitid RohTFOFoVLJItlmF; desc @@ 1.1 log @Initial revision @ text @include(CMakeParseArguments) set(LIBEVENT_SHARED_LIBRARIES "") set(LIBEVENT_STATIC_LIBRARIES "") macro(set_event_shared_lib_flags LIB_NAME) set_target_properties("${LIB_NAME}_shared" PROPERTIES COMPILE_FLAGS ${ARGN}) set_target_properties("${LIB_NAME}_shared" PROPERTIES LINK_FLAGS ${ARGN}) endmacro() macro(generate_pkgconfig LIB_NAME) set(prefix ${CMAKE_INSTALL_PREFIX}) set(exec_prefix ${CMAKE_INSTALL_PREFIX}) set(libdir ${CMAKE_INSTALL_PREFIX}/lib) set(includedir ${CMAKE_INSTALL_PREFIX}/include) set(VERSION ${EVENT_ABI_LIBVERSION}) set(LIBS "") foreach (LIB ${LIB_PLATFORM}) set(LIBS "${LIBS} -L${LIB}") endforeach() set(OPENSSL_LIBS "") foreach(LIB ${OPENSSL_LIBRARIES}) set(OPENSSL_LIBS "${OPENSSL_LIBS} -L${LIB}") endforeach() configure_file("lib${LIB_NAME}.pc.in" "lib${LIB_NAME}.pc" @@ONLY) install( FILES "${CMAKE_CURRENT_BINARY_DIR}/lib${LIB_NAME}.pc" DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig" ) endmacro() # LIB_NAME maybe event_core, event_extra, event_openssl, event_pthreads or event. # Targets whose LIB_NAME is not 'event' should be exported and installed. macro(export_install_target TYPE LIB_NAME OUTER_INCLUDES) if("${LIB_NAME}" STREQUAL "event") install(TARGETS "${LIB_NAME}_${TYPE}" LIBRARY DESTINATION "lib" COMPONENT lib ARCHIVE DESTINATION "lib" COMPONENT lib RUNTIME DESTINATION "lib" COMPONENT lib COMPONENT dev ) else() string(REPLACE "event_" "" PURE_NAME ${LIB_NAME}) string(TOUPPER ${TYPE} UPPER_TYPE) list(APPEND LIBEVENT_${UPPER_TYPE}_LIBRARIES "${PURE_NAME}") set(OUTER_INCS) if (NOT "${OUTER_INCLUDES}" STREQUAL "NONE") set(OUTER_INCS ${OUTER_INCLUDES}) endif() target_include_directories("${LIB_NAME}_${TYPE}" PUBLIC "$" "$" "$" ${OUTER_INCS} ) set_target_properties("${LIB_NAME}_${TYPE}" PROPERTIES EXPORT_NAME ${PURE_NAME}) export(TARGETS "${LIB_NAME}_${TYPE}" NAMESPACE ${PROJECT_NAME}:: FILE "${PROJECT_BINARY_DIR}/LibeventTargets-${TYPE}.cmake" APPEND ) install(TARGETS "${LIB_NAME}_${TYPE}" EXPORT LibeventTargets-${TYPE} LIBRARY DESTINATION "lib" COMPONENT lib ARCHIVE DESTINATION "lib" COMPONENT lib RUNTIME DESTINATION "lib" COMPONENT lib COMPONENT dev ) endif() endmacro() # Global variables that it uses: # - EVENT_ABI_LIBVERSION # - EVENT_ABI_LIBVERSION_CURRENT # - EVENT_ABI_LIBVERSION_REVISION # - EVENT_ABI_LIBVERSION_AGE # - EVENT_PACKAGE_RELEASE # - CMAKE_THREAD_LIBS_INIT LIB_PLATFORM # - OPENSSL_LIBRARIES # - EVENT_SHARED_FLAGS # - EVENT_LIBRARY_STATIC # - EVENT_LIBRARY_SHARED # # Exported variables: # - LIBEVENT_SHARED_LIBRARIES # - LIBEVENT_STATIC_LIBRARIES macro(add_event_library LIB_NAME) cmake_parse_arguments(LIB "" # Options "VERSION" # One val "SOURCES;LIBRARIES;INNER_LIBRARIES;OUTER_INCLUDES" # Multi val ${ARGN} ) if ("${LIB_OUTER_INCLUDES}" STREQUAL "") set(LIB_OUTER_INCLUDES NONE) endif() set(ADD_EVENT_LIBRARY_INTERFACE) if (${EVENT_LIBRARY_STATIC}) add_library("${LIB_NAME}_static" STATIC ${LIB_SOURCES}) set_target_properties("${LIB_NAME}_static" PROPERTIES OUTPUT_NAME "${LIB_NAME}" CLEAN_DIRECT_OUTPUT 1) if(LIB_INNER_LIBRARIES) set(INNER_LIBRARIES "${LIB_INNER_LIBRARIES}_static") endif() target_link_libraries("${LIB_NAME}_static" ${CMAKE_THREAD_LIBS_INIT} ${LIB_PLATFORM} ${INNER_LIBRARIES} ${LIB_LIBRARIES}) export_install_target(static "${LIB_NAME}" "${LIB_OUTER_INCLUDES}") set(ADD_EVENT_LIBRARY_INTERFACE "${LIB_NAME}_static") endif() if (${EVENT_LIBRARY_SHARED}) add_library("${LIB_NAME}_shared" SHARED ${LIB_SOURCES}) if(LIB_INNER_LIBRARIES) set(INNER_LIBRARIES "${LIB_INNER_LIBRARIES}_shared") endif() target_link_libraries("${LIB_NAME}_shared" ${CMAKE_THREAD_LIBS_INIT} ${LIB_PLATFORM} ${INNER_LIBRARIES} ${LIB_LIBRARIES}) if (EVENT_SHARED_FLAGS) set_event_shared_lib_flags("${LIB_NAME}" "${EVENT_SHARED_FLAGS}") endif() if (WIN32) set_target_properties( "${LIB_NAME}_shared" PROPERTIES OUTPUT_NAME "${LIB_NAME}" SOVERSION ${EVENT_ABI_LIBVERSION}) elseif (APPLE) math(EXPR COMPATIBILITY_VERSION "${EVENT_ABI_LIBVERSION_CURRENT}+1") math(EXPR CURRENT_MINUS_AGE "${EVENT_ABI_LIBVERSION_CURRENT}-${EVENT_ABI_LIBVERSION_AGE}") set_target_properties( "${LIB_NAME}_shared" PROPERTIES OUTPUT_NAME "${LIB_NAME}-${EVENT_PACKAGE_RELEASE}.${CURRENT_MINUS_AGE}" INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib" LINK_FLAGS "-compatibility_version ${COMPATIBILITY_VERSION} -current_version ${COMPATIBILITY_VERSION}.${EVENT_ABI_LIBVERSION_REVISION}") else() math(EXPR CURRENT_MINUS_AGE "${EVENT_ABI_LIBVERSION_CURRENT}-${EVENT_ABI_LIBVERSION_AGE}") set_target_properties( "${LIB_NAME}_shared" PROPERTIES OUTPUT_NAME "${LIB_NAME}-${EVENT_PACKAGE_RELEASE}" VERSION "${CURRENT_MINUS_AGE}.${EVENT_ABI_LIBVERSION_AGE}.${EVENT_ABI_LIBVERSION_REVISION}" SOVERSION "${CURRENT_MINUS_AGE}" INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib") endif() if (NOT WIN32) set(LIB_LINK_NAME "${CMAKE_SHARED_LIBRARY_PREFIX}${LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}") add_custom_command(TARGET ${LIB_NAME}_shared POST_BUILD COMMAND ${CMAKE_COMMAND} -E create_symlink "$" "${LIB_LINK_NAME}" WORKING_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}") endif() export_install_target(shared "${LIB_NAME}" "${LIB_OUTER_INCLUDES}") set(ADD_EVENT_LIBRARY_INTERFACE "${LIB_NAME}_shared") if (NOT WIN32) install(FILES "$/${LIB_LINK_NAME}" DESTINATION "lib" COMPONENT lib) endif() endif() add_library(${LIB_NAME} INTERFACE) target_link_libraries(${LIB_NAME} INTERFACE ${ADD_EVENT_LIBRARY_INTERFACE}) generate_pkgconfig("${LIB_NAME}") endmacro() @ 1.1.1.1 log @Import ntp-4.2.8p18 (previous was ntp-4.2.8p15 --- (4.2.8p18) 2024/05/25 Released by Harlan Stenn * [Bug 3918] Tweak openssl header/library handling. * [Bug 3914] Spurious "Unexpected origin timestamp" logged after time stepped. * [Bug 3913] Avoid duplicate IPv6 link-local manycast associations. * [Bug 3912] Avoid rare math errors in ntptrace. * [Bug 3910] Memory leak using openssl-3 * [Bug 3909] Do not select multicast local address for unicast peer. * [Bug 3903] lib/isc/win32/strerror.c NTstrerror() is not thread-safe. * [Bug 3901] LIB_GETBUF isn't thread-safe. * [Bug 3900] fast_xmit() selects wrong local addr responding to mcast on Windows. * [Bug 3888] ntpd with multiple same-subnet IPs using manycastclient creates duplicate associations. * [Bug 3872] Ignore restrict mask for hostname. * [Bug 3871] 4.2.8p17 build without hopf6021 refclock enabled fails. Reported by Hans Mayer. Moved NONEMPTY_TRANSLATION_UNIT declaration from ntp_types.h to config.h. * [Bug 3870] Server drops client packets with ppoll < 4. * [Bug 3869] Remove long-gone "calldelay" & "crypto sign" from docs. Reported by PoolMUC@@web.de. * [Bug 3868] Cannot restrict a pool peer. Thanks to Edward McGuire for tracking down the deficiency. * [Bug 3864] ntpd IPv6 refid different for big-endian and little-endian. * [Bug 3859] Use NotifyIpInterfaceChange on Windows ntpd. * [Bug 3856] Enable Edit & Continue debugging with Visual Studio. * [Bug 3855] ntpq lacks an equivalent to ntpdc's delrestrict. * [Bug 3854] ntpd 4.2.8p17 corrupts rawstats file with space in refid. * [Bug 3853] Clean up warnings with modern compilers. * [Bug 3852] check-libntp.mf and friends are not triggering rebuilds as intended. * [Bug 3851] Drop pool server when no local address can reach it. * [Bug 3850] ntpq -c apeers breaks column formatting s2 w/refclock refid. * [Bug 3849] ntpd --wait-sync times out. * [Bug 3847] SSL detection in configure should run-test if runpath is needed. * [Bug 3846] Use -Wno-format-truncation by default. * [Bug 3845] accelerate pool clock_sync when IPv6 has only link-local access. * [Bug 3842] Windows ntpd PPSAPI DLL load failure crashes. * [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. * [Bug 3837] NULL pointer deref crash when ntpd deletes last interface. Reported by renmingshuai. Correct UNLINK_EXPR_SLIST() when the list is empty. * [Bug 3835] NTP_HARD_*FLAGS not used by libevent tearoff. * [Bug 3831] pollskewlist zeroed on runtime configuration. * [Bug 3830] configure libevent check intersperses output with answer. * [Bug 3828] BK should ignore a git repo in the same directory. * [Bug 3827] Fix build in case CLOCK_HOPF6021 or CLOCK_WHARTON_400A is disabled. * [Bug 3825] Don't touch HTML files unless building inside a BK repo. Fix the script checkHtmlFileDates. * [Bug 3756] Improve OpenSSL library/header detection. * [Bug 3753] ntpd fails to start with FIPS-enabled OpenSSL 3. * [Bug 2734] TEST3 prevents initial interleave sync. Fix from * Log failures to allocate receive buffers. * Remove extraneous */ from libparse/ieee754io.c * Fix .datecheck target line in Makefile.am. * Update the copyright year. * Update ntp.conf documentation to add "delrestrict" and correct information about KoD rate limiting. * html/clockopt.html cleanup. * util/lsf-times - added. * Add DSA, DSA-SHA, and SHA to tests/libntp/digests.c. * Provide ntpd thread names to debugger on Windows. * Remove dead code libntp/numtohost.c and its unit tests. * Remove class A, B, C IPv4 distinctions in netof(). * Use @@configure_input@@ in various *.in files to include a comment that the file is generated from another pointing to the *.in. * Correct underquoting, indents in ntp_facilitynames.m4. * Clean up a few warnings seen building with older gcc. * Fix build on older FreeBSD lacking sys/procctl.h. * Disable [Bug 3627] workaround on newer FreeBSD which has the kernel fix that makes it unnecessary, re-enabling ASLR stack gap. * Use NONEMPTY_COMPILATION_UNIT in more conditionally-compiled files. * Remove useless pointer to Windows Help from system error messages. * Avoid newlines within Windows error messages. * Ensure unique association IDs if wrapped. * Simplify calc_addr_distance(). * Clamp min/maxpoll in edge cases in newpeer(). * Quiet local addr change logging when unpeering. * Correct missing arg for %s printf specifier in send_blocking_resp_internal(). * Suppress OpenSSL 3 deprecation warning clutter. * Correct OpenSSL usage in Autokey code to avoid warnings about discarding const qualifiers with OpenSSL 3. * Display KoD refid as text in recently added message. * Avoid running checkHtmlFileDates script repeatedly when no html/*.html files have changed. * Abort configure if --enable-crypto-rand given & unavailable. * Add configure --enable-verbose-ssl to trace SSL detection. * Add build test coverage for --disable-saveconfig to flock-build script. * Remove deprecated configure --with-arlib option. * Remove configure support for ISC UNIX ca. 1998. * Move NTP_OPENSSL and NTP_CRYPTO_RAND invocations from configure.ac files to NTP_LIBNTP. * Remove dead code: HAVE_U_INT32_ONLY_WITH_DNS. * Eliminate [v]snprintf redefinition warnings on macOS. * Fix clang 14 cast increases alignment warning on Linux. * Move ENABLE_CMAC to ntp_openssl.m4, reviving sntp/tests CMAC unit tests. * Use NTP_HARD_CPPFLAGS in libopts tearoff. * wire in --enable-build-framework-help --- (4.2.8p17) 2023/06/06 Released by Harlan Stenn * [Bug 3824] Spurious "ntpd: daemon failed to notify parent!" logged at event_sync. Reported by Edward McGuire. * [Bug 3822] ntpd significantly delays first poll of servers specified by name. Miroslav Lichvar identified regression in 4.2.8p16. * [Bug 3821] 4.2.8p16 misreads hex authentication keys, won't interop with 4.2.8p15 or earlier. Reported by Matt Nordhoff, thanks to Miroslav Lichvar and Matt for rapid testing and identifying the problem. * Add tests/libntp/digests.c to catch regressions reading keys file or with symmetric authentication digest output. --- (4.2.8p16) 2023/05/31 Released by Harlan Stenn * [Sec 3808] Assertion failure in ntpq on malformed RT-11 date * [Sec 3807] praecis_parse() in the Palisade refclock driver has a hypothetical input buffer overflow. Reported by ... stenn@@ * [Sec 3806] libntp/mstolfp.c needs bounds checking - solved numerically instead of using string manipulation * [Sec 3767] An OOB KoD RATE value triggers an assertion when debug is enabled. * [Bug 3819] Updated libopts/Makefile.am was missing NTP_HARD_* values. * [Bug 3817] Bounds-check "tos floor" configuration. * [Bug 3814] First poll delay of new or cleared associations miscalculated. * [Bug 3802] ntp-keygen -I default identity modulus bits too small for OpenSSL 3. Reported by rmsh1216@@163.com * [Bug 3801] gpsdjson refclock gps_open() device name mishandled. * [Bug 3800] libopts-42.1.17 does not compile with Microsoft C. * [Bug 3799] Enable libopts noreturn compiler advice for MSC. * [Bug 3797] Windows getaddrinfo w/AI_ADDRCONFIG fails for localhost when disconnected, breaking ntpq and ntpdc. * [Bug 3795] pollskewlist documentation uses | when it shouldn't. - ntp.conf manual page and miscopt.html corrections. * [Bug 3793] Wrong variable type passed to record_raw_stats(). - Report and patch by Yuezhen LUAN . * [Bug 3786] Timer starvation on high-load Windows ntpd. * [Bug 3784] high-load ntpd on Windows deaf after enough ICMP TTL exceeded. * [Bug 3781] log "Unable to listen for broadcasts" for IPv4 * [Bug 3774] mode 6 packets corrupted in rawstats file - Reported by Edward McGuire, fix identified by . * [Bug 3758] Provide a 'device' config statement for refclocks * [Bug 3757] Improve handling of Linux-PPS in NTPD * [Bug 3741] 4.2.8p15 can't build with glibc 2.34 * [Bug 3725] Make copyright of clk_wharton.c compatible with Debian. Philippe De Muyter * [Bug 3724] ntp-keygen with openSSL 1.1.1 fails on Windows - openssl applink needed again for openSSL-1.1.1 * [Bug 3719] configure.ac checks for closefrom() and getdtablesize() missing. Reported by Brian Utterback, broken in 2010 by * [Bug 3699] Problems handling drift file and restoring previous drifts - command line options override config statements where applicable - make initial frequency settings idempotent and reversible - make sure kernel PLL gets a recovered drift componsation * [Bug 3695] Fix memory leak with ntpq on Windows Server 2019 * [Bug 3694] NMEA refclock seems to unnecessarily require location in messages - misleading title; essentially a request to ignore the receiver status. Added a mode bit for this. * [Bug 3693] Improvement of error handling key lengths - original patch by Richard Schmidt, with mods & unit test fixes * [Bug 3692] /dev/gpsN requirement prevents KPPS - implement/wrap 'realpath()' to resolve symlinks in device names * [Bug 3691] Buffer Overflow reading GPSD output - original patch by matt - increased max PDU size to 4k to avoid truncation * [Bug 3690] newline in ntp clock variable (parse) - patch by Frank Kardel * [Bug 3689] Extension for MD5, SHA-1 and other keys - ntp{q,dc} now use the same password processing as ntpd does in the key file, so having a binary secret >= 11 bytes is possible for all keys. (This is a different approach to the problem than suggested) * [Bug 3688] GCC 10 build errors in testsuite * [Bug 3687] ntp_crypto_rand RNG status not known - patch by Gerry Garvey * [Bug 3682] Fixes for warnings when compiled without OpenSSL - original patch by Gerry Garvey * [Bug 3677] additional peer events not decoded in associations listing - original patch by Gerry Garvey * [Bug 3676] compiler warnings (CMAC, interrupt_buf, typo, fallthrough) - applied patches by Gerry Garvey * [Bug 3675] ntpq ccmds[] stores pointer to non-persistent storage * [Bug 3674] ntpq command 'execute only' using '~' prefix - idea+patch by Gerry Garvey * [Bug 3672] fix biased selection in median cut * [Bug 3666] avoid unlimited receive buffer allocation - follow-up: fix inverted sense in check, reset shortfall counter * [Bug 3660] Revert 4.2.8p15 change to manycast. * [Bug 3640] document "discard monitor" and fix the code. - fixed bug identified by Edward McGuire * [Bug 3626] (SNTP) UTC offset calculation needs dst flag - applied patch by Gerry Garvey * [Bug 3428] ntpd spinning consuming CPU on Linux router with full table. Reported by Israel G. Lugo. * [Bug 3103] libopts zsave_warn format string too few arguments * [Bug 2990] multicastclient incorrectly causes bind to broadcast address. Integrated patch from Brian Utterback. * [Bug 2525] Turn on automake subdir-objects across the project. * [Bug 2410] syslog an error message on panic exceeded. * Use correct rounding in mstolfp(). perlinger/hart * M_ADDF should use u_int32. * Only define tv_fmt_libbuf() if we will use it. * Use recv_buffer instead of the longer recv_space.X_recv_buffer. hart/stenn * Make sure the value returned by refid_str() prints cleanly. * If DEBUG is enabled, the startup banner now says that debug assertions are in force and that ntpd will abort if any are violated. * syslog valid incoming KoDs. * Rename a poorly-named variable. * Disable "embedded NUL in string" messages in libopts, when we can. * Use https in the AC_INIT URLs in configure.ac. * Implement NTP_FUNC_REALPATH. * Lose a gmake construct in ntpd/Makefile.am. * upgrade to: autogen-5.18.16 * upgrade to: libopts-42.1.17 * upgrade to: autoconf-2.71 * upgrade to: automake-1.16.15 * Upgrade to libevent-2.1.12-stable * Support OpenSSL-3.0 @ text @@