diff options
| -rw-r--r-- | patches/ntp-4.2.2p3/generic/bancomm_fix.diff | 37 | ||||
| -rw-r--r-- | rules/ntp.in | 2 | ||||
| -rw-r--r-- | rules/ntp.make | 2 | ||||
| -rw-r--r-- | rules/ntp_nonparse.in | 8 |
4 files changed, 47 insertions, 2 deletions
diff --git a/patches/ntp-4.2.2p3/generic/bancomm_fix.diff b/patches/ntp-4.2.2p3/generic/bancomm_fix.diff new file mode 100644 index 000000000..015ecb7dc --- /dev/null +++ b/patches/ntp-4.2.2p3/generic/bancomm_fix.diff @@ -0,0 +1,37 @@ +Index: ntp-4.2.2p3/ntpd/refclock_bancomm.c +=================================================================== +--- ntp-4.2.2p3.orig/ntpd/refclock_bancomm.c ++++ ntp-4.2.2p3/ntpd/refclock_bancomm.c +@@ -42,6 +42,7 @@ + #include <stdio.h> + #include <syslog.h> + #include <ctype.h> ++#include <sys/ioctl.h> + + /* STUFF BY RES */ + struct btfp_time /* Structure for reading 5 time words */ +@@ -99,7 +100,7 @@ extern u_long current_time; /* curre + /* + * Imported from ntpd module + */ +-extern int debug; /* global debug flag */ ++extern volatile int debug; /* global debug flag */ + + /* + * VME unit control structure. +@@ -292,13 +293,13 @@ vme_poll( + pp->hour = tptr->hr; + pp->minute = tptr->mn; + pp->second = tptr->sec; +- pp->usec = tptr->frac; ++ pp->nsec = 1000*tptr->frac; + + #ifdef DEBUG + if (debug) + printf("pp: %3d %02d:%02d:%02d.%06ld %1x\n", + pp->day, pp->hour, pp->minute, pp->second, +- pp->usec, tptr->status); ++ pp->nsec, tptr->status); + #endif + if (tptr->status ) { /* Status 0 is locked to ref., 1 is not */ + refclock_report(peer, CEVNT_BADREPLY); diff --git a/rules/ntp.in b/rules/ntp.in index 71f570d89..66fa248fa 100644 --- a/rules/ntp.in +++ b/rules/ntp.in @@ -5,7 +5,7 @@ menuconfig NTP bool prompt "NTP " select OPENSSL if NTP_CRYPTO - depends on BROKEN + #depends on BROKEN help Build the standard NTP Daemon Process This conflicts with BSD openntpd. diff --git a/rules/ntp.make b/rules/ntp.make index 2382d0b33..348368ce5 100644 --- a/rules/ntp.make +++ b/rules/ntp.make @@ -17,7 +17,7 @@ PACKAGES-$(PTXCONF_NTP) += ntp # # Paths and names # -NTP_VERSION = 4.2.0 +NTP_VERSION = 4.2.2p3 NTP = ntp-$(NTP_VERSION) NTP_SUFFIX = tar.gz NTP_URL = http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/$(NTP).$(NTP_SUFFIX) diff --git a/rules/ntp_nonparse.in b/rules/ntp_nonparse.in index d9cf0ddc0..7149cd19a 100644 --- a/rules/ntp_nonparse.in +++ b/rules/ntp_nonparse.in @@ -189,6 +189,10 @@ config NTP_TPRO bool prompt "KSI/Odetics TPRO/S GPS receiver/IRIG interface" depends on NTP_ALL_CLOCKS + depends on BROKEN + +comment "KSI/Odetics TPRO/S GPS receiver/IRIG interface is broken, please send a patch" + depends on !BROKEN config NTP_TRAK bool @@ -205,6 +209,10 @@ config NTP_TT560 bool prompt "TrueTime 560 IRIG-B decoder" depends on NTP_ALL_CLOCKS + depends on BROKEN + + comment "TrueTime 560 IRIG-B decoder is broken, please send a patch" + depends on !BROKEN config NTP_ULINK bool |