Skip to content

Commit

Permalink
OS-3659 upgrade NTP to ntp-4.2.8
Browse files Browse the repository at this point in the history
  • Loading branch information
jclulow committed Dec 22, 2014
1 parent 65ae079 commit f1ba150
Show file tree
Hide file tree
Showing 8 changed files with 164 additions and 164 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Expand Up @@ -45,7 +45,7 @@
/node.js/node-v0.10.26-32*
/nss-nspr/nss-3.12.8-32*
/nss-nspr/nss-3.12.8-64*
/ntp/ntp-dev-4.2.7p446-32
/ntp/ntp-4.2.8-32
/openldap/openldap-2.4.26-32
/openlldp/openlldp-0.4alpha-32
/openssl/openssl-0.9.8za
Expand Down
2 changes: 1 addition & 1 deletion ntp/Makefile
Expand Up @@ -22,7 +22,7 @@
# Copyright (c) 2014, Joyent, Inc.
#

VER = ntp-dev-4.2.7p446
VER = ntp-4.2.8

include ../Makefile.defs

Expand Down
24 changes: 7 additions & 17 deletions ntp/NOTES.md
@@ -1,6 +1,6 @@
# NTP

This is the "dev" branch of the reference NTP implementation from
This is the stable release branch of the reference NTP implementation from
http://ntp.org.

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

./configure --with-crypto=sunw

Which forces our sane build flags to be used without any further detection or
mangling. We also patch in a `--with-perllibdir` flag, and a `--with-perl`
flag, such that we can ship the platform-private `NTP` perl module in
This forces our sane build flags to be used without any further detection or
mangling. It also forces the use of the OpenSSL CSPRNG functions, as we do not
(yet) have the `arc4random` suite of functions on SmartOS.

We also patch in a `--with-perllibdir` flag, and a `--with-perl` flag, such
that we can ship the platform-private `NTP` perl module in
`/usr/perl5/5.12/lib` instead of `/usr/share`, and ensure it uses the correct
`perl` interpreter.

The primary patch, `configure.patch`, includes a regenerated `configure`
script. The M4 source file changes are in `perl.patch` and `openssl.patch`.

### `ntp_util.patch`

The include Perl module, `NTP::Util`, does not work completely correctly with
the version of the `Socket` module that ships in the platform Perl
distribution. Specifically, the version string is `"1.87_01"`, which emits a warning:

Argument "1.87_01" isn't numeric in numeric ge (>=) at
/usr/perl5/5.12/lib/NTP/Util.pm line 16.

This patch makes us assume an old version of `Socket`, which is what we ship,
and prevents the warning from being emitted. This is tracked upstream as [ntp
bug 2620](http://bugs.ntp.org/show_bug.cgi?id=2620)

0 comments on commit f1ba150

Please sign in to comment.