Skip to content

Commit f1ba150

Browse files
committed
OS-3659 upgrade NTP to ntp-4.2.8
1 parent 65ae079 commit f1ba150

8 files changed

+164
-164
lines changed

.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
/node.js/node-v0.10.26-32*
4646
/nss-nspr/nss-3.12.8-32*
4747
/nss-nspr/nss-3.12.8-64*
48-
/ntp/ntp-dev-4.2.7p446-32
48+
/ntp/ntp-4.2.8-32
4949
/openldap/openldap-2.4.26-32
5050
/openlldp/openlldp-0.4alpha-32
5151
/openssl/openssl-0.9.8za

ntp/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
# Copyright (c) 2014, Joyent, Inc.
2323
#
2424

25-
VER = ntp-dev-4.2.7p446
25+
VER = ntp-4.2.8
2626

2727
include ../Makefile.defs
2828

ntp/NOTES.md

+7-17
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# NTP
22

3-
This is the "dev" branch of the reference NTP implementation from
3+
This is the stable release branch of the reference NTP implementation from
44
http://ntp.org.
55

66
## Manual Pages
@@ -50,24 +50,14 @@ We patch the M4 source file for OpenSSL detection to accept a special flag:
5050

5151
./configure --with-crypto=sunw
5252

53-
Which forces our sane build flags to be used without any further detection or
54-
mangling. We also patch in a `--with-perllibdir` flag, and a `--with-perl`
55-
flag, such that we can ship the platform-private `NTP` perl module in
53+
This forces our sane build flags to be used without any further detection or
54+
mangling. It also forces the use of the OpenSSL CSPRNG functions, as we do not
55+
(yet) have the `arc4random` suite of functions on SmartOS.
56+
57+
We also patch in a `--with-perllibdir` flag, and a `--with-perl` flag, such
58+
that we can ship the platform-private `NTP` perl module in
5659
`/usr/perl5/5.12/lib` instead of `/usr/share`, and ensure it uses the correct
5760
`perl` interpreter.
5861

5962
The primary patch, `configure.patch`, includes a regenerated `configure`
6063
script. The M4 source file changes are in `perl.patch` and `openssl.patch`.
61-
62-
### `ntp_util.patch`
63-
64-
The include Perl module, `NTP::Util`, does not work completely correctly with
65-
the version of the `Socket` module that ships in the platform Perl
66-
distribution. Specifically, the version string is `"1.87_01"`, which emits a warning:
67-
68-
Argument "1.87_01" isn't numeric in numeric ge (>=) at
69-
/usr/perl5/5.12/lib/NTP/Util.pm line 16.
70-
71-
This patch makes us assume an old version of `Socket`, which is what we ship,
72-
and prevents the warning from being emitted. This is tracked upstream as [ntp
73-
bug 2620](http://bugs.ntp.org/show_bug.cgi?id=2620)

0 commit comments

Comments
 (0)