<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/10cd23b5516e44f55f7649e4859ddb06cca88e92">https://github.com/macports/macports-ports/commit/10cd23b5516e44f55f7649e4859ddb06cca88e92</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 10cd23b ntpsec: Update to 0.9.7
</span>10cd23b is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 10cd23b5516e44f55f7649e4859ddb06cca88e92
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Tue May 2 04:11:38 2017 -0500
<span style='display:block; white-space:pre;color:#404040;'> ntpsec: Update to 0.9.7
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Remove patches included upstream.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fix mandir with patchfile instead of reinplace.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Remove crypto variant because OpenSSL support is always on.
</span>---
sysutils/ntpsec/Portfile | 23 +-
sysutils/ntpsec/files/mandir.patch | 8 +
sysutils/ntpsec/files/patch-macros.diff | 370 --------------------------------
sysutils/ntpsec/files/patch-smear.diff | 27 ---
4 files changed, 14 insertions(+), 414 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/ntpsec/Portfile b/sysutils/ntpsec/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9fec7ea..1ab7546 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/ntpsec/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/ntpsec/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +1,11 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> PortSystem 1.0
PortGroup waf 1.0
PortGroup python 1.0
name ntpsec
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 0.9.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 0.9.7
</span> categories sysutils net
maintainers {schenkel.net:leonardo @lbschenkel} openmaintainer
description A secure, hardened, and improved implementation of NTP
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,14 +18,13 @@ homepage https://www.ntpsec.org/
</span> conflicts ntp openntpd
master_sites ftp://ftp.ntpsec.org/pub/releases/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 9527cc6bc78f1a02c868fbb6a1fb583461b8fa81 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 9d15ac59b67911eb1b42fe5916e8d00ded8b71ba34f1ab4fc0f251fc0d90d5e5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 f38927f677b94dfd51d1e26060953876c0a50f5c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 e6ca519c8536c43c70ca0f999b754a8d159156bae1ea16831c9537d4ef7cbb94
</span>
depends_build port:bison
depends_lib path:lib/libssl.dylib:openssl port:python${python.version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-macros.diff patch-smear.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles mandir.patch
</span>
use_configure yes
configure.args --alltests \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,15 +33,11 @@ configure.args --alltests \
</span> --pythondir=${python.pkgd}
destroot.cmd ${build.cmd}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default_variants +crypto +doc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default_variants +doc
</span>
variant classic description {Enable classic mode} {
configure.args-append --enable-classic-mode
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant crypto description {Enable crypto support (depends on OpenSSL)} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append path:lib/libssl.dylib:openssl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-crypto
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> variant doc description {Build manpages and HTML documentation} {
depends_build-append port:asciidoc port:docbook-xsl
configure.args-append --enable-doc --htmldir=${prefix}/share/doc/${name}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,12 +50,6 @@ variant smear description {Enable smearing of leap seconds} {
</span> configure.args-append --enable-leap-smear
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # build is not respecting --mandir
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -W ${worksrcpath}/wafhelpers \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "s|\${PREFIX}/man/|\${PREFIX}/share/man/|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- asciidoc.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> post-destroot {
xinstall -o root -m 644 ${filespath}/ntp.conf \
${destroot}${prefix}/etc/ntp.conf.dist
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -80,4 +70,3 @@ post-activate {
</span> startupitem.create yes
startupitem.netchange yes
startupitem.executable ${prefix}/sbin/ntpd -n -g -p ${prefix}/var/run/ntpd.pid -f ${prefix}/var/db/ntp.drift -c ${prefix}/etc/ntp.conf
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/ntpsec/files/mandir.patch b/sysutils/ntpsec/files/mandir.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..bc3db2f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/ntpsec/files/mandir.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- wafhelpers/asciidoc.py.orig 2017-03-21 17:08:55.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ wafhelpers/asciidoc.py 2017-05-02 04:08:40.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -34,4 +34,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ out = "%s.%s" % (n_file.replace("-man.txt.man-tmp", ""), self.section)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ out_n = self.bld.path.find_or_declare(out)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ self.create_task('a2x', node, out_n)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- self.bld.install_files("${PREFIX}/man/man%s/" % self.section, out_n)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ self.bld.install_files("${PREFIX}/share/man/man%s/" % self.section, out_n)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/ntpsec/files/patch-macros.diff b/sysutils/ntpsec/files/patch-macros.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index c3dbf32..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/ntpsec/files/patch-macros.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,370 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/include/ntp_fp.h b/include/ntp_fp.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 82d88a9..5098508 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/include/ntp_fp.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/include/ntp_fp.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -188,72 +188,79 @@ typedef uint32_t u_fp;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <math.h> /* ldexp() */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define M_DTOLFP(d, r_ui, r_uf) /* double to l_fp */ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- do { \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- double d_tmp; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- uint64_t q_tmp; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- int M_isneg; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- d_tmp = (d); \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- M_isneg = (d_tmp < 0.); \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (M_isneg) { \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- d_tmp = -d_tmp; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- } \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- q_tmp = (uint64_t)ldexp(d_tmp, 32); \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (M_isneg) { \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- q_tmp = ~q_tmp + 1; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- } \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (r_uf) = (uint32_t)q_tmp; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (r_ui) = (uint32_t)(q_tmp >> 32); \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- } while (false)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static inline l_fp dtolfp(double d)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* double to l_fp */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ double d_tmp;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ uint64_t q_tmp;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int M_isneg;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ l_fp r;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ d_tmp = (d);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ M_isneg = (d_tmp < 0.);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (M_isneg) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ d_tmp = -d_tmp;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ q_tmp = (uint64_t)ldexp(d_tmp, 32);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (M_isneg) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ q_tmp = ~q_tmp + 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ setlfpfrac(r, (uint32_t)q_tmp);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ setlfpuint(r, (uint32_t)(q_tmp >> 32));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return r;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define M_LFPTOD(r_ui, r_uf, d) /* l_fp to double */ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- do { \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- double d_tmp; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- uint64_t q_tmp; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- int M_isneg; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- q_tmp = ((uint64_t)(r_ui) << 32) + (r_uf); \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- M_isneg = M_ISNEG(r_ui); \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (M_isneg) { \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- q_tmp = ~q_tmp + 1; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- } \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- d_tmp = ldexp((double)q_tmp, -32); \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (M_isneg) { \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- d_tmp = -d_tmp; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- } \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (d) = d_tmp; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- } while (false)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static inline double lfptod(l_fp r)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* l_fp to double */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ double d;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ uint64_t q_tmp;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int M_isneg;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ q_tmp = ((uint64_t)lfpuint(r) << 32) + lfpfrac(r);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ M_isneg = M_ISNEG(lfpuint(r));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (M_isneg) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ q_tmp = ~q_tmp + 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ d = ldexp((double)q_tmp, -32);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (M_isneg) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ d = -d;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return d;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else /* use only 32 bit unsigned values */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define M_DTOLFP(d, r_ui, r_uf) /* double to l_fp */ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- do { \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- double d_tmp; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if ((d_tmp = (d)) < 0) { \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (r_ui) = (uint32_t)(-d_tmp); \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (r_uf) = (uint32_t)(-(d_tmp + (double)(r_ui)) * FRAC); \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- M_NEG((r_ui), (r_uf)); \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- } else { \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (r_ui) = (uint32_t)d_tmp; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (r_uf) = (uint32_t)((d_tmp - (double)(r_ui)) * FRAC); \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- } \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- } while (0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define M_LFPTOD(r_ui, r_uf, d) /* l_fp to double */ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- do { \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- uint32_t l_thi, l_tlo; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- l_thi = (r_ui); l_tlo = (r_uf); \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (M_ISNEG(l_thi)) { \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- M_NEG(l_thi, l_tlo); \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (d) = -((double)l_thi + (double)l_tlo / FRAC); \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- } else { \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (d) = (double)l_thi + (double)l_tlo / FRAC; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- } \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- } while (0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static inline l_fp dtolfp(double d)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* double to l_fp */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ double d_tmp;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ l_fp r;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ((d_tmp = (d)) < 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ setlfpuint(r, (uint32_t)(-d_tmp));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ setlfpfrac(r, (uint32_t)(-(d_tmp + (double)lfpuint(r)) * FRAC));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ M_NEG((r_ui), (r_uf));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ } else { \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ setlfpuint(r, (uint32_t)d_tmp);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ setlfpfrac(r, (uint32_t)((d_tmp - (double)lfpuint(r)) * FRAC));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return r;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define DTOLFP(d, v) M_DTOLFP((d), lfpuint(*v), lfpfrac(*v))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define LFPTOD(v, d) M_LFPTOD(lfpuint(*v), lfpfrac(*v), (d))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static inline double lfptod(l_fp r)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* l_fp to double */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ uint32_t l_thi, l_tlo;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ l_thi = lfpuint(r); l_tlo = lfpfrac(r);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (M_ISNEG(l_thi)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ M_NEG(l_thi, l_tlo);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (d) = -((double)l_thi + (double)l_tlo / FRAC);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (d) = (double)l_thi + (double)l_tlo / FRAC;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return d;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * Prototypes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/libntp/systime.c b/libntp/systime.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 24a1c5c..6179d77 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/libntp/systime.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/libntp/systime.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -187,7 +187,7 @@ normalize_time(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * Add in the fuzz.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dfuzz = rand * 2. / FRAC * sys_fuzz;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- DTOLFP(dfuzz, &lfpfuzz);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ lfpfuzz = dtolfp(dfuzz);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- L_ADD(&result, &lfpfuzz);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -208,7 +208,7 @@ normalize_time(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dfuzz);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lfpdelta = lfp_prev;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- L_SUB(&lfpdelta, &result);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- LFPTOD(&lfpdelta, ddelta);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ddelta = lfptod(lfpdelta);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- msyslog(LOG_ERR,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "prev get_systime 0x%x.%08x is %.9f later than 0x%x.%08x",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lfpuint(lfp_prev), lfpfrac(lfp_prev),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -362,8 +362,8 @@ step_systime(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* get the complete jump distance as l_fp */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- DTOLFP(sys_residual, &fp_sys);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- DTOLFP(step, &fp_ofs);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fp_sys = dtolfp(sys_residual);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fp_ofs = dtolfp(step);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- L_ADD(&fp_ofs, &fp_sys);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* ---> time-critical path starts ---> */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/ntpd/ntp_control.c b/ntpd/ntp_control.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index adca6c3..439c727 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/ntpd/ntp_control.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/ntpd/ntp_control.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1757,7 +1757,7 @@ ctl_putsys(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case CS_AUTHDELAY:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- LFPTOD(&sys_authdelay, dtemp);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ dtemp = lfptod(sys_authdelay);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ctl_putdbl(sys_var[varid].text, dtemp * 1e3);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/ntpd/ntp_packetstamp.c b/ntpd/ntp_packetstamp.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index fc1948c..e176348 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/ntpd/ntp_packetstamp.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/ntpd/ntp_packetstamp.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -190,7 +190,7 @@ fetch_packetstamp(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif /* USE_SCM_TIMESTAMP */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fuzz = ntp_random() * 2. / FRAC * sys_fuzz;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- DTOLFP(fuzz, &lfpfuzz);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ lfpfuzz = dtolfp(fuzz);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- L_ADD(&nts, &lfpfuzz);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef ENABLE_DEBUG_TIMING
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dts = ts;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/ntpd/ntp_proto.c b/ntpd/ntp_proto.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 0782fe7..a925da8 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/ntpd/ntp_proto.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/ntpd/ntp_proto.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2670,7 +2670,7 @@ measure_tick_fuzz(void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- max_repeats = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- repeats = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- changes = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- DTOLFP(MINSTEP, &minstep);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ minstep = dtolfp(MINSTEP);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- get_systime(&last);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for (i = 0; i < MAXLOOPS && changes < MINCHANGES; i++) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- get_systime(&val);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2681,7 +2681,7 @@ measure_tick_fuzz(void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- max_repeats = max(repeats, max_repeats);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- repeats = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- changes++;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- LFPTOD(&ldiff, diff);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ diff = lfptod(ldiff);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tick = min(diff, tick);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- repeats++;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/ntpd/ntp_refclock.c b/ntpd/ntp_refclock.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 82c6827..eb426b7 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/ntpd/ntp_refclock.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/ntpd/ntp_refclock.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -364,7 +364,7 @@ refclock_process_offset(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pp->lastrec = lastrec;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lftemp = lasttim;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- L_SUB(&lftemp, &lastrec);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- LFPTOD(&lftemp, doffset);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ doffset = lfptod(lftemp);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SAMPLE(doffset + fudge);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -408,7 +408,7 @@ refclock_process_f(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- setlfpuint(offset, sec);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- setlfpfrac(offset, 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- DTOLFP(pp->nsec / 1e9, <emp);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ltemp = dtolfp(pp->nsec / 1e9);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- L_ADD(&offset, <emp);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- refclock_process_offset(pp, offset, pp->lastrec, fudge);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return true;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/ntpd/refclock_gpsd.c b/ntpd/refclock_gpsd.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 09e3229..5afa6fc 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/ntpd/refclock_gpsd.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/ntpd/refclock_gpsd.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -772,13 +772,13 @@ gpsd_control(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- UNUSED_ARG(out_st);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (peer == up->pps_peer) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- DTOLFP(pp->fudgetime1, &up->pps_fudge2);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ up->pps_fudge2 = dtolfp(pp->fudgetime1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ( ! (pp->sloppyclockflag & CLK_FLAG1))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- peer->flags &= ~FLAG_PPS;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* save preprocessed fudge times */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- DTOLFP(pp->fudgetime1, &up->pps_fudge);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- DTOLFP(pp->fudgetime2, &up->ibt_fudge);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ up->pps_fudge = dtolfp(pp->fudgetime1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ up->ibt_fudge = dtolfp(pp->fudgetime2);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (MODE_OP_MODE(up->mode ^ peer->ttl)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- leave_opmode(peer, up->mode);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/ntpd/refclock_jupiter.c b/ntpd/refclock_jupiter.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index c6f79ab..ce3cb60 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/ntpd/refclock_jupiter.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/ntpd/refclock_jupiter.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -714,7 +714,7 @@ jupiter_control(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pp = peer->procptr;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- instance = pp->unitptr;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- DTOLFP(pp->fudgetime2, &instance->limit);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ instance->limit = dtolfp(pp->fudgetime2);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Force positive value. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (L_ISNEG(&instance->limit))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- L_NEG(&instance->limit);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/ntpd/refclock_nmea.c b/ntpd/refclock_nmea.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 74e5f8e..cc93831 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/ntpd/refclock_nmea.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/ntpd/refclock_nmea.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -721,7 +721,7 @@ refclock_ppsrelate(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pp_stamp = tspec_stamp_to_lfp(timeout);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pp_delta = *rd_stamp;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- L_SUB(&pp_delta, &pp_stamp);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- LFPTOD(&pp_delta, delta);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ delta = lfptod(pp_delta);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delta += pp_fudge - *rd_fudge;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (fabs(delta) > 1.5)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return PPS_RELATE_NONE; /* PPS timeout control */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -744,7 +744,7 @@ refclock_ppsrelate(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* check against reftime if PPS PLL can be used */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pp_delta = *reftime;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- L_SUB(&pp_delta, &pp_stamp);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- LFPTOD(&pp_delta, delta);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ delta = lfptod(pp_delta);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delta += pp_fudge;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (fabs(delta) > 0.45)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return PPS_RELATE_EDGE; /* cannot PLL with PPS code */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/ntpd/refclock_oncore.c b/ntpd/refclock_oncore.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 6dceab8..46c79a7 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/ntpd/refclock_oncore.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/ntpd/refclock_oncore.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1765,7 +1765,7 @@ oncore_get_timestamp(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ts_tmp = ts;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- setlfpuint(ts_tmp, 0); /* zero integer part */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- LFPTOD(&ts_tmp, dmy); /* convert fractional part to a double */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ dmy = lfptod(ts_tmp); /* convert fractional part to a double */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- j = 1.0e9*dmy; /* then to integer ns */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Rsm = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/ntpfrob/jitter.c b/ntpfrob/jitter.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index b48656d..2d93505 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/ntpfrob/jitter.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/ntpfrob/jitter.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -84,7 +84,7 @@ void jitter(const iomode mode)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for (i = 0; i < NBUF; i ++) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- get_clocktime(&tr);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- LFPTOD(&tr, gtod[i]);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gtod[i] = lfptod(tr);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/tests/libntp/lfpfunc.c b/tests/libntp/lfpfunc.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index c768663..3266c91 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/tests/libntp/lfpfunc.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/tests/libntp/lfpfunc.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -131,20 +131,6 @@ static int l_fp_signum(const l_fp first)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return (lfpuint(first) || lfpfrac(first));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--static double l_fp_convert_to_double(const l_fp first)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- double res;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- LFPTOD(&first, res);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return res;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--static l_fp l_fp_init_from_double( double rhs)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- l_fp temp;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- DTOLFP(rhs, &temp);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return temp;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static void l_fp_swap(l_fp * first, l_fp *second)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- l_fp temp = *second;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -372,11 +358,11 @@ TEST(lfpfunc, FDF_RoundTrip) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for (idx = 0; idx < addsub_cnt; ++idx) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- l_fp op1 = l_fp_init(addsub_tab[idx][0].h, addsub_tab[idx][0].l);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- double op2 = l_fp_convert_to_double(op1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- l_fp op3 = l_fp_init_from_double(op2);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ double op2 = lfptod(op1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ l_fp op3 = dtolfp(op2);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- l_fp temp = l_fp_subtract(op1, op3);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- double d = l_fp_convert_to_double(temp);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ double d = lfptod(temp);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TEST_ASSERT_DOUBLE_WITHIN(eps(op2), 0.0, fabs(d));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/ntpsec/files/patch-smear.diff b/sysutils/ntpsec/files/patch-smear.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index e009547..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/ntpsec/files/patch-smear.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,27 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/ntpd/ntp_proto.c b/ntpd/ntp_proto.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index f753534..3ab6b0e 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/ntpd/ntp_proto.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/ntpd/ntp_proto.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2298,7 +2298,7 @@ fast_xmit(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xpkt.refid = convertLFPToRefID(leap_smear.offset);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DPRINTF(2, ("fast_xmit: leap_smear.in_progress: refid %8x, smear %s\n",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ntohl(xpkt.refid),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- lfptoa(&leap_smear.offset, 8)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ lfptoa(leap_smear.offset, 8)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xpkt.reftime = htonl_fp(this_ref_time);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/ntpd/ntp_timer.c b/ntpd/ntp_timer.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 05f2a00..2b9a302 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/ntpd/ntp_timer.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/ntpd/ntp_timer.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -479,7 +479,7 @@ check_leapsec(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * Update the current leap smear offset, eventually 0.0 if outside smear interval.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- DTOLFP(leap_smear.doffset, &leap_smear.offset);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ leap_smear.offset = dtolfp(leap_smear.doffset);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif /* ENABLE_LEAP_SMEAR */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Full hit. Eventually step the clock, but always
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>