<html lang='en'>
<head>
<meta content='text/html; charset=utf-8' http-equiv='Content-Type'>
<title>
GitLab
</title>
</meta>
</head>
<style>
img {
max-width: 100%;
height: auto;
}
p.details {
font-style:italic;
color:#777
}
.footer p {
font-size:small;
color:#777
}
pre.commit-message {
white-space: pre-wrap;
}
.file-stats a {
text-decoration: none;
}
.file-stats .new-file {
color: #090;
}
.file-stats .deleted-file {
color: #B00;
}
</style>
<body>
<div class='content'>
<h3>
Hal Murray pushed to branch master
at <a href="https://gitlab.com/NTPsec/ntpsec">NTPsec / ntpsec</a>
</h3>
<h4>
Commits:
</h4>
<ul>
<li>
<strong><a href="https://gitlab.com/NTPsec/ntpsec/commit/301f74204a0505b11d2c7248e4d936b3387ddf56">301f7420</a></strong>
<div>
<span>by Hal Murray</span>
<i>at 2016-02-10T23:40:01-08:00</i>
</div>
<pre class='commit-message'>Fix typo in NTPS_VERSION_MINOR</pre>
</li>
<li>
<strong><a href="https://gitlab.com/NTPsec/ntpsec/commit/1ca2e26c944b34a9eb9b9f4b5d7c7cec3bb68491">1ca2e26c</a></strong>
<div>
<span>by Hal Murray</span>
<i>at 2016-02-10T23:49:15-08:00</i>
</div>
<pre class='commit-message'>Add sys/time.h to places that use sys/timex.h
Needed by NetBSD and FreeBSD 9
FreeBSD 10 is OK</pre>
</li>
<li>
<strong><a href="https://gitlab.com/NTPsec/ntpsec/commit/ff3f2aba33ed948376978c2131c8fd51e50f3568">ff3f2aba</a></strong>
<div>
<span>by Hal Murray</span>
<i>at 2016-02-11T00:53:32-08:00</i>
</div>
<pre class='commit-message'>Remove HGM comments from pylib/configure.py
A while ago, I removed some unused tests.
I did it by commenting them out rather than actually
deleting them so it would be easier to recover in case
something turned out to be required.
Since there haven't been any problems, this is the actual delete.</pre>
</li>
</ul>
<h4>3 changed files:</h4>
<ul>
<li class='file-stats'>
<a href='#diff-0'>
<span class='deleted-file'>
−
pylib/check_timepps.py
</span>
</a>
</li>
<li class='file-stats'>
<a href='#diff-1'>
pylib/configure.py
</a>
</li>
<li class='file-stats'>
<a href='#diff-2'>
wscript
</a>
</li>
</ul>
<h4>Changes:</h4>
<li id='diff-0'>
<a href='https://gitlab.com/NTPsec/ntpsec/compare/d4cf864894037043831734fa7d9f58482bfe9049...ff3f2aba33ed948376978c2131c8fd51e50f3568#diff-0'>
<strong>
pylib/check_timepps.py
</strong>
deleted
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- a/pylib/check_timepps.py
</span><span style="color: #000000;background-color: #ddffdd">+++ /dev/null
</span><span style="color: #aaaaaa">@@ -1,30 +0,0 @@
</span><span style="color: #000000;background-color: #ffdddd">-TIMEPPS_FRAG = """
-#include <sys/types.h>
-
-#ifdef HAVE_TIMEPPS_H
-# include <timepps.h>
-#else
-# ifdef HAVE_SYS_TIMEPPS_H
-# include <sys/time.h> /* Needed on NetBSD */
-# include <sys/timepps.h>
-# endif
-#endif
-
-int main(void) {
- pps_handle_t pps_h;
- time_pps_destroy (pps_h);
-
- return 0;
-}
-"""
-
-
-def check_timepps(ctx):
- ctx.check_cc(
- fragment = TIMEPPS_FRAG,
- define_name = "HAVE_PPSAPI",
- features = "c",
- msg = "Checking if PPS API works",
- mandatory = False
- )
-
</span></code></pre>
<br>
</li>
<li id='diff-1'>
<a href='https://gitlab.com/NTPsec/ntpsec/compare/d4cf864894037043831734fa7d9f58482bfe9049...ff3f2aba33ed948376978c2131c8fd51e50f3568#diff-1'>
<strong>
pylib/configure.py
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- a/pylib/configure.py
</span><span style="color: #000000;background-color: #ddffdd">+++ b/pylib/configure.py
</span><span style="color: #aaaaaa">@@ -183,8 +183,6 @@ def cmd_configure(ctx):
</span> # int32_t and uint32_t probes aren't really needed, POSIX guarantees
# them. But int64_t and uint64_t are not guaranteed to exist on 32-bit
# machines.
<span style="color: #000000;background-color: #ffdddd">-#HGM types = ["int32_t", "uint32_t", "int64_t", "uint64_t",
-#HGM "uint_t", "size_t", "wint_t", "pid_t", "intptr_t", "uintptr_t"]
</span> # Used by timevalops and timespecops in tests/libntp/
# May go away when that is cleaned up.
types = ["uint64_t"]
<span style="color: #aaaaaa">@@ -200,7 +198,7 @@ def cmd_configure(ctx):
</span> ctx.check_type(f, h)
structures = (
<span style="color: #000000;background-color: #ffdddd">- ("struct timex", ["sys/timex.h"]),
</span><span style="color: #000000;background-color: #ddffdd">+ ("struct timex", ["sys/time.h", "sys/timex.h"]),
</span> ("struct ntptimeval", ["sys/time.h", "sys/timex.h"]),
)
for (s, h) in structures:
<span style="color: #aaaaaa">@@ -218,11 +216,8 @@ def cmd_configure(ctx):
</span> sizeofs = [
("time.h", "time_t"),
(None, "int"),
<span style="color: #000000;background-color: #ffdddd">-#HGM (None, "short"),
</span> (None, "long"),
(None, "long long"),
<span style="color: #000000;background-color: #ffdddd">-#HGM ("pthread.h", "pthread_t"),
-#HGM (None, "signed char"),
</span> ]
for header, sizeof in sorted(sizeofs):
<span style="color: #aaaaaa">@@ -235,7 +230,6 @@ def cmd_configure(ctx):
</span> ctx.define("GETSOCKNAME_SOCKLEN_TYPE", "socklen_t", quote=False)
ctx.define("DFLT_RLIMIT_STACK", 50)
ctx.define("DFLT_RLIMIT_MEMLOCK", 32)
<span style="color: #000000;background-color: #ffdddd">-#HGM ctx.define("POSIX_SHELL", "/bin/sh")
</span>
ctx.define("OPENSSL_VERSION_TEXT", "#XXX: Fixme")
<span style="color: #aaaaaa">@@ -268,14 +262,11 @@ def cmd_configure(ctx):
</span> # we're likely to duplicate them.
functions = (
('adjtimex', ["sys/time.h", "sys/timex.h"]),
<span style="color: #000000;background-color: #ffdddd">-#HGM ('arc4random', ["stdlib.h"]),
-#HGM ('arc4random_buf', ["stdlib.h"]),
</span> ('closefrom', ["stdlib.h"]),
('clock_gettime', ["time.h"], "RT"),
('clock_settime', ["time.h"], "RT"),
('EVP_MD_do_all_sorted', ["openssl/evp.h"], "CRYPTO"),
('getclock', ["sys/timers.h"]),
<span style="color: #000000;background-color: #ffdddd">-#HGM ('getdtablesize', ["unistd.h"]), # SVr4, 4.2BSD
</span> ('getpassphrase', ["stdlib.h"]), # Sun systems
('MD5Init', ["md5.h"], "CRYPTO"),
('ntp_adjtime', ["sys/time.h", "sys/timex.h"]), # BSD
<span style="color: #aaaaaa">@@ -286,7 +277,6 @@ def cmd_configure(ctx):
</span> ('settimeofday', ["sys/time.h"], "RT"), # BSD
('strlcpy', ["string.h"]),
('strlcat', ["string.h"]),
<span style="color: #000000;background-color: #ffdddd">-#HGM ('sysconf', ["unistd.h"]),
</span> ('timer_create', ["time.h"])
)
for ft in functions:
<span style="color: #aaaaaa">@@ -313,13 +303,9 @@ def cmd_configure(ctx):
</span> # Some of these are cruft from ancient big-iron systems and should
# be removed.
optional_headers = (
<span style="color: #000000;background-color: #ffdddd">-#HGM "alloca.h",
-#HGM "arpa/nameser.h",
</span> "dns_sd.h", # NetBSD, Apple, mDNS
"histedit.h", # Apple
<span style="color: #000000;background-color: #ffdddd">-#HGM "ieeefp.h", # x86, depricated by FreeBSD
</span> ("ifaddrs.h", ["sys/types.h"]),
<span style="color: #000000;background-color: #ffdddd">-#HGM "libintl.h",
</span> "libscf.h", # Solaris
"linux/if_addr.h",
"linux/rtnetlink.h",
<span style="color: #aaaaaa">@@ -341,15 +327,13 @@ def cmd_configure(ctx):
</span> "sys/ioctl.h",
"sys/modem.h", # Apple
"sys/prctl.h", # Linux
<span style="color: #000000;background-color: #ffdddd">-#HGM "sys/procset.h",
</span> "sys/sockio.h",
"sys/soundcard.h",
("sys/sysctl.h", ["sys/types.h"]),
<span style="color: #000000;background-color: #ffdddd">-#HGM "sys/systune.h",
</span> ("timepps.h", ["inttypes.h"]),
("sys/timepps.h", ["inttypes.h", "sys/time.h"]),
"utmpx.h", # missing on RTEMS and OpenBSD
<span style="color: #000000;background-color: #ffdddd">- "sys/timex.h",
</span><span style="color: #000000;background-color: #ddffdd">+ ("sys/timex.h", ["sys/time.h"]),
</span> "sys/audio.h"
)
for hdr in optional_headers:
<span style="color: #aaaaaa">@@ -365,9 +349,6 @@ def cmd_configure(ctx):
</span> print "Compilation check failed but include exists %s" % hdr
if ctx.get_define("HAVE_TIMEPPS_H") or ctx.get_define("HAVE_SYS_TIMEPPS_H"):
<span style="color: #000000;background-color: #ffdddd">-#HGM from pylib.check_timepps import check_timepps
-#HGM check_timepps(ctx)
-#HGM Can delete pylib/check_timepps.py
</span> ctx.define("HAVE_PPSAPI", 1)
<span style="color: #aaaaaa">@@ -378,11 +359,6 @@ def cmd_configure(ctx):
</span> from check_sockaddr import check_sockaddr
check_sockaddr(ctx)
<span style="color: #000000;background-color: #ffdddd">-#HGM from check_posix_thread_version import check_posix_thread_version
-
-#HGM check_posix_thread_version(ctx)
-#HGM ctx.define('HAVE_PTHREADS', ctx.env.POSIX_THREAD_VERISON)
-
</span> # Some systems don't have sys/timex.h eg OS X, OpenBSD...
if ctx.get_define("HAVE_SYS_TIMEX_H"):
ctx.env.HEADER_SYS_TIMEX_H = True
</code></pre>
<br>
</li>
<li id='diff-2'>
<a href='https://gitlab.com/NTPsec/ntpsec/compare/d4cf864894037043831734fa7d9f58482bfe9049...ff3f2aba33ed948376978c2131c8fd51e50f3568#diff-2'>
<strong>
wscript
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- a/wscript
</span><span style="color: #000000;background-color: #ddffdd">+++ b/wscript
</span><span style="color: #aaaaaa">@@ -130,7 +130,7 @@ def configure(ctx):
</span>
ctx.env.NTPS_VERSION = "%s.%s.%s" % (ctx.env.NTPS_VERSION_MAJOR, ctx.env.NTPS_VERSION_MINOR, ctx.env.NTPS_VERSION_REV)
ctx.define("NTPS_VERSION_MAJOR", ctx.env.NTPS_VERSION_MAJOR)
<span style="color: #000000;background-color: #ffdddd">- ctx.define("NTPS_VERSION_MINOR", ctx.env.NTPS_VERSION_REV)
</span><span style="color: #000000;background-color: #ddffdd">+ ctx.define("NTPS_VERSION_MINOR", ctx.env.NTPS_VERSION_MINOR)
</span> ctx.define("NTPS_VERSION_REV", ctx.env.NTPS_VERSION_REV)
</code></pre>
<br>
</li>
</div>
<div class='footer' style='margin-top: 10px;'>
<p>
—
<br>
<a href="https://gitlab.com/NTPsec/ntpsec/compare/d4cf864894037043831734fa7d9f58482bfe9049...ff3f2aba33ed948376978c2131c8fd51e50f3568">View it on GitLab</a>.
<br>
You're receiving this email because of your account on gitlab.com.
If you'd like to receive fewer emails, you can
adjust your notification settings.
</p>
</div>
</body>
</html>