From: Dave Hart Date: Sun, 10 May 2009 04:22:23 +0000 (+0000) Subject: Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1180 X-Git-Tag: NTP_4_2_5P175~7 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=775e7ae0b3a6f1a5cff9ca16f3a1324050c3a52f;p=thirdparty%2Fntp.git Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1180 into shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1178-80-cver bk: 4a06567fHBp2Farei8nbpl5bHclvwQ --- 775e7ae0b3a6f1a5cff9ca16f3a1324050c3a52f diff --cc ChangeLog index bb6285458,5f8e3948c..c3b62cd32 --- a/ChangeLog +++ b/ChangeLog @@@ -1,7 -1,5 +1,8 @@@ - (4.2.5p174) 2009/05/09 Released by Harlan Stenn - * Stale leapsecond file fixes from Dave Mills. + * [Bug 1180] ntpd won't start with more than ~1000 interfaces +* Clean up configure.ac NTP_CACHEVERSION interface, display cache + version when clearing. Fixes a regression. ++(4.2.5p174) 2009/05/09 Released by Harlan Stenn + * Stale leapsecond file fixes from Dave Mills. (4.2.5p173) 2009/05/08 Released by Harlan Stenn * Include (4.2.4p7-RC6) (4.2.5p172) 2009/05/06 Released by Harlan Stenn @@@ -13,7 -11,7 +14,7 @@@ * [Bug 1173] NMEA refclock fails with Solaris PPSAPI * Fix problem linking msntp on Solaris when sntp subdir is configured before parent caused by different gethostent library search order. --* Do not clear config.cache when it is already empty. ++* Do not clear config.cache when it is empty. (4.2.5p170) 2009/05/02 Released by Harlan Stenn * [Bug 1152] adjust PARSE to new refclock_pps logic * Include (4.2.4p7-RC5) diff --cc configure.ac index f091fc69d,178dd5f76..416efe819 --- a/configure.ac +++ b/configure.ac @@@ -4386,9 -4386,9 +4404,9 @@@ AC_MSG_RESULT([$ntp_have_linuxcaps] AC_ARG_ENABLE( [linuxcaps], - AC_HELP_STRING( + AS_HELP_STRING( [--enable-linuxcaps], - [s Use Linux capabilities for non-root clock control] + [+ Use Linux capabilities for non-root clock control] ), [ntp_have_linuxcaps=$enableval] )