ChangeLog, Makefile.in, configure, configure.in, refclock_oncore.c, config.h:

  * ports/winnt/include/config.h: Typo (CLOCK_PALISADE comment)
  From: Carl Byington <carl@five-ten-sg.com>
  * configure.in: Disable kernel_fll_bug for Generic_105181-17 under
  Solaris-2.6
  From: Juergen Georgi <georgi@belwue.de>

bk: 38a20abf6HSQfD79ab-WgCY0al8nMg

diff --git a/ChangeLog b/ChangeLog
index 32d68f8f71a532e93ed31b254c3b07cf7f3cfb66..eabe2dea126f5927ed3a8b18c3102cc36394f72b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
+2000-02-09  Harlan Stenn  <stenn@whimsy.udel.edu>
+
+       * ports/winnt/include/config.h: Typo (CLOCK_PALISADE comment)
+       From: Carl Byington <carl@five-ten-sg.com>
+
+       * configure.in: Disable kernel_fll_bug for Generic_105181-17 under
+       Solaris-2.6
+       From: Juergen Georgi <georgi@belwue.de>
+
 2000-02-07  Harlan Stenn  <stenn@whimsy.udel.edu>
 
+       * configure.in: 4.0.99d
+
        * html/Oncore-SHMEM.htm: New document
        * html/driver30.htm: Cleanup and improvements
        From: Reg Clemens <reg@dwf.com>

diff --git a/Makefile.in b/Makefile.in
index 761c3cf7da3e2a9b7fee9f976e8319a13786a6f2..decac23d69b45c51eab3867bc329ba203666a1ca 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -143,10 +143,10 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES = 
 DIST_SOURCES = 
-DIST_COMMON =  README ./config.guess ./config.sub ./stamp-h.in ChangeLog \
-INSTALL Makefile.am Makefile.in NEWS TODO acconfig.h aclocal.m4 \
-config.guess config.h.in config.sub configure configure.in depcomp \
-install-sh missing mkinstalldirs
+DIST_COMMON =  README ./stamp-h.in ChangeLog INSTALL Makefile.am \
+Makefile.in NEWS TODO acconfig.h aclocal.m4 config.guess config.h.in \
+config.sub configure configure.in depcomp install-sh missing \
+mkinstalldirs
 
 
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)

diff --git a/configure b/configure
index e2af8463e3498732bede7459e96ff3a62994e8bc..fb79e299118a411de68b34898b2cce7726ce3ffb 100755 (executable)
--- a/configure
+++ b/configure
@@ -1088,7 +1088,7 @@ fi
 
 PACKAGE=ntp
 
-VERSION=4.0.99c
+VERSION=4.0.99d
 
 if test "`CDPATH=: && cd $srcdir && pwd`" != "`pwd`" &&
    test -f $srcdir/config.status; then
@@ -10714,7 +10714,13 @@ if test "${enable_kernel_fll_bug+set}" = set; then
 else
       case "$target" in
      *-*-solaris2.6)
-        ans=yes
+        case "`uname -v`" in
+         Generic_105181-17)
+            ans=no
+            ;;
+         *) ans=yes
+            ;;
+        esac
         ;;
      *-*-solaris2.7)
         case "`uname -v`" in

diff --git a/configure.in b/configure.in
index 8673a4f0bec5a770572c3a397fb493aba5a4e8df..e176765c9fa561621b9c6be2d6b8e267d94aab94 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -5,7 +5,7 @@ AC_CANONICAL_SYSTEM
 AC_DEFINE_UNQUOTED(STR_SYSTEM, "$target")
 AM_CONFIG_HEADER(config.h)
 AC_ARG_PROGRAM
-AM_INIT_AUTOMAKE(ntp, 4.0.99c)
+AM_INIT_AUTOMAKE(ntp, 4.0.99d)
 AC_PREREQ(2.14)
 
 ac_cv_var_oncore_ok=no
@@ -2943,7 +2943,13 @@ AC_CACHE_CHECK(if we should avoid kernel FLL bug, ac_cv_var_kernel_fll_bug,
     [changequote(<<, >>)dnl
     case "$target" in
      *-*-solaris2.6)
-        ans=yes
+        case "`uname -v`" in
+         Generic_105181-17)
+            ans=no
+            ;;
+         *) ans=yes
+            ;;
+        esac
         ;;
      *-*-solaris2.7)
         case "`uname -v`" in

diff --git a/ntpd/refclock_oncore.c b/ntpd/refclock_oncore.c
index b0df60967a5d72b7f2d98e4386bc1f8166472617..7b05507cba822fe20f1d47823be06bd7bcde8ea7 100644 (file)
--- a/ntpd/refclock_oncore.c
+++ b/ntpd/refclock_oncore.c
@@ -802,20 +802,16 @@ oncore_read_config(
                if (!*cc)
                        continue;
 
-               /* Lowercase the command and find the arg */
+               /* Uppercase the command and find the arg */
                for (ca = cc; *ca; ca++) {
                        if (isascii((int)*ca) && islower((int)*ca)) {
                                *ca = toupper(*ca);
-                       } else if (isascii((int)*ca) && isspace((int)*ca)) {
+                       } else if (isascii((int)*ca) && (isspace((int)*ca) || (*ca == '=')))
                                break;
-                       } else if (*ca == '=') {
-                               *ca = ' ';
-                               break;
-                       }
                }
                
-               /* Remove space leading the arg */
-               for (; *ca && isascii((int)*ca) && isspace((int)*ca); ca++)
+               /* Remove space (and possible =) leading the arg */
+               for (; *ca && isascii((int)*ca) && (isspace((int)*ca) || (*ca == '=')); ca++)
                        continue;
 
                if (!strncmp(cc, "STATUS", 6)) {

diff --git a/ports/winnt/include/config.h b/ports/winnt/include/config.h
index eeacee3865c457a521c4280aaa426ab318bb7371..4421a5d5915035c4758e76a9ea423a4f16ece401 100644 (file)
--- a/ports/winnt/include/config.h
+++ b/ports/winnt/include/config.h
@@ -27,9 +27,9 @@
 # define CLOCK_LOCAL                   /* from ntpd.mak */
 //# define CLOCK_PARSE 
 /* # define CLOCK_ATOM */
-/* # define CLOCK_SHM  */               /* from ntpd.mak */                                                                                                                            
+/* # define CLOCK_SHM  */               /* from ntpd.mak */
 # define CLOCK_NMEA
-# define CLOCK_PALISADE                 * from ntpd.mak */                                                                                                                             
+# define CLOCK_PALISADE                 /* from ntpd.mak */
 # define CLOCK_DUMBCLOCK
 # define CLOCK_TRIMBLEDC
 # define CLOCK_TRIMTSIP 1