From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 73a000f9d1e1f43807156cfb9a9c56843330d4c6
Date: Tue, 15 Dec 2015 13:41:12 +0100 [thread overview]
Message-ID: <20151215124112.A8D25212D1@argus.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 6108 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via 73a000f9d1e1f43807156cfb9a9c56843330d4c6 (commit)
via 93d6eed9a48a509e910fb4e248a70de9cdc15f0c (commit)
via 50923742ba537464986269c8eb3442676b315267 (commit)
via c4b28466d1004bd7fdb43299e18cbfa44b2a52ae (commit)
from 1b169a72daae63d435ee74b7ca9f28f1813fb177 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 73a000f9d1e1f43807156cfb9a9c56843330d4c6
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Tue Dec 15 00:07:10 2015 +0100
ntp 4.2.8p4: Update for rootfile
'/usr/share/ntp/lib/NTP/Util.pm' is needed for 'ntptrace'
to run correctly
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 93d6eed9a48a509e910fb4e248a70de9cdc15f0c
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Dec 15 12:37:16 2015 +0000
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(a)ipfire.org>
commit 50923742ba537464986269c8eb3442676b315267
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Sun Dec 13 18:54:25 2015 +0100
nano: Update to 2.5.0
Changelog: http://www.nano-editor.org/dist/v2.5/ChangeLog
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit c4b28466d1004bd7fdb43299e18cbfa44b2a52ae
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Sun Dec 13 18:58:10 2015 +0100
arping 2.15: Update for rootfile
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/common/arping | 1 +
config/rootfiles/common/ntp | 2 +-
.../{oldcore/95 => core/96}/filelists/ntp | 0
lfs/nano | 6 +++---
lfs/ntp | 1 +
src/patches/ntp-fix-sycing-with-local-clock.patch | 23 ++++++++++++++++++++++
6 files changed, 29 insertions(+), 4 deletions(-)
copy config/rootfiles/{oldcore/95 => core/96}/filelists/ntp (100%)
create mode 100644 src/patches/ntp-fix-sycing-with-local-clock.patch
Difference in files:
diff --git a/config/rootfiles/common/arping b/config/rootfiles/common/arping
index 9599f6d..74b4acf 100644
--- a/config/rootfiles/common/arping
+++ b/config/rootfiles/common/arping
@@ -1 +1,2 @@
usr/sbin/arping
+#usr/share/man/man8/arping.8
diff --git a/config/rootfiles/common/ntp b/config/rootfiles/common/ntp
index 4baa074..c6b95a5 100644
--- a/config/rootfiles/common/ntp
+++ b/config/rootfiles/common/ntp
@@ -283,7 +283,7 @@ usr/bin/update-leap
#usr/share/ntp
#usr/share/ntp/lib
#usr/share/ntp/lib/NTP
-#usr/share/ntp/lib/NTP/Util.pm
+usr/share/ntp/lib/NTP/Util.pm
var/ipfire/time/counter.conf
var/ipfire/time/enable
var/ipfire/time/settime.conf
diff --git a/config/rootfiles/core/96/filelists/ntp b/config/rootfiles/core/96/filelists/ntp
new file mode 120000
index 0000000..7542d86
--- /dev/null
+++ b/config/rootfiles/core/96/filelists/ntp
@@ -0,0 +1 @@
+../../../common/ntp
\ No newline at end of file
diff --git a/lfs/nano b/lfs/nano
index bf80810..c08ec88 100644
--- a/lfs/nano
+++ b/lfs/nano
@@ -24,7 +24,7 @@
include Config
-VER = 2.4.2
+VER = 2.5.0
THISAPP = nano-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = nano
-PAK_VER = 6
+PAK_VER = 7
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = ce6968992fec4283c17984b53554168b
+$(DL_FILE)_MD5 = 751ed96457017572bab15be18cb873ba
install : $(TARGET)
diff --git a/lfs/ntp b/lfs/ntp
index c03624e..7c23a3c 100644
--- a/lfs/ntp
+++ b/lfs/ntp
@@ -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 \
diff --git a/src/patches/ntp-fix-sycing-with-local-clock.patch b/src/patches/ntp-fix-sycing-with-local-clock.patch
new file mode 100644
index 0000000..bdca2e7
--- /dev/null
+++ b/src/patches/ntp-fix-sycing-with-local-clock.patch
@@ -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(a)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 */
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2015-12-15 12:41 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20151215124112.A8D25212D1@argus.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox