ntp: Fix syncing with local clock

This is a bug that was introduced with the latest release
from upstream

Fixes #10997
Upstream: http://bugs.ntp.org/show_bug.cgi?id=2965

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
Michael Tremer
2015-12-15 12:37:16 +00:00
parent 50923742ba
commit 93d6eed9a4
3 changed files with 25 additions and 0 deletions

View File

@@ -0,0 +1 @@
../../../common/ntp

View File

@@ -70,6 +70,7 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/ntp-fix-sycing-with-local-clock.patch
cd $(DIR_APP) && \
./configure \
--prefix=/usr \

View File

@@ -0,0 +1,23 @@
# http://bugs.ntp.org/show_bug.cgi?id=2965
From 6f68f1f0fd764f0006506e3957a5b8116726d443 Mon Sep 17 00:00:00 2001
From: <burnicki/martin@pc-martin4.>
Date: Mon, 16 Nov 2015 11:59:55 +0100
Subject: [PATCH] [Bug 2965] Local clock didn't work since 4.2.8p4
---
ntpd/refclock_local.c | 1 +
1 files changed, 1 insertions(+)
diff --git a/ntpd/refclock_local.c b/ntpd/refclock_local.c
index d816c55..8c0f74f 100644
--- a/ntpd/refclock_local.c
+++ b/ntpd/refclock_local.c
@@ -205,6 +205,7 @@ local_poll(
pp->disp = 0;
pp->jitter = 0;
#else /* KERNEL_PLL LOCKCLOCK */
+ pp->leap = LEAP_NOWARNING;
pp->disp = DISPERSION;
pp->jitter = 0;
#endif /* KERNEL_PLL LOCKCLOCK */