diff --git a/.gitignore b/.gitignore index 7672e74a..8b0a93ae 100644 --- a/.gitignore +++ b/.gitignore @@ -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 diff --git a/ntp/Makefile b/ntp/Makefile index 4e8acebc..48b7dfff 100644 --- a/ntp/Makefile +++ b/ntp/Makefile @@ -22,7 +22,7 @@ # Copyright (c) 2014, Joyent, Inc. # -VER = ntp-dev-4.2.7p446 +VER = ntp-4.2.8 include ../Makefile.defs diff --git a/ntp/NOTES.md b/ntp/NOTES.md index 00380e34..207d8a71 100644 --- a/ntp/NOTES.md +++ b/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 @@ -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) diff --git a/ntp/Patches/configure.patch b/ntp/Patches/configure.patch index 931db203..76bf0665 100644 --- a/ntp/Patches/configure.patch +++ b/ntp/Patches/configure.patch @@ -1,10 +1,10 @@ ---- configure 2014-07-02 20:25:10.218834846 +0000 -+++ configure 2014-07-02 20:50:39.849049504 +0000 +--- configure 2014-12-19 12:42:27.000000000 +0000 ++++ configure 2014-12-20 00:01:43.677571331 +0000 @@ -1,13 +1,11 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. --# Generated by GNU Autoconf 2.68 for ntp4 4.2.7p446. -+# Generated by GNU Autoconf 2.69 for ntp4 4.2.7p446. +-# Generated by GNU Autoconf 2.68 for ntp4 4.2.8. ++# Generated by GNU Autoconf 2.69 for ntp4 4.2.8. # # Report bugs to . # @@ -193,7 +193,7 @@ LIBOBJS PTHREADS_FALSE PTHREADS_TRUE -@@ -1006,6 +1026,8 @@ +@@ -1010,6 +1030,8 @@ enable_getifaddrs enable_saveconfig with_gtest @@ -202,7 +202,7 @@ ' ac_precious_vars='build_alias host_alias -@@ -1477,8 +1499,6 @@ +@@ -1481,8 +1503,6 @@ if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe @@ -211,7 +211,7 @@ elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi -@@ -1774,6 +1794,8 @@ +@@ -1780,6 +1800,8 @@ --enable-getifaddrs + Enable the use of getifaddrs() [[yes|no]]. --enable-saveconfig + saveconfig mechanism --with-gtest Use the gtest framework (Default: if it's available) @@ -220,10 +220,10 @@ Some influential environment variables: CC C compiler command -@@ -1862,9 +1884,9 @@ +@@ -1868,9 +1890,9 @@ if $ac_init_version; then cat <<\_ACEOF - ntp4 configure 4.2.7p446 + ntp4 configure 4.2.8 -generated by GNU Autoconf 2.68 +generated by GNU Autoconf 2.69 @@ -232,7 +232,7 @@ This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF -@@ -2141,7 +2163,7 @@ +@@ -2147,7 +2169,7 @@ test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || @@ -241,7 +241,7 @@ }; then : ac_retval=0 else -@@ -2329,7 +2351,7 @@ +@@ -2335,7 +2357,7 @@ test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || @@ -250,7 +250,7 @@ }; then : ac_retval=0 else -@@ -2419,7 +2441,8 @@ +@@ -2425,7 +2447,8 @@ main () { static int test_array [1 - 2 * !(($2) >= 0)]; @@ -260,7 +260,7 @@ ; return 0; -@@ -2435,7 +2458,8 @@ +@@ -2441,7 +2464,8 @@ main () { static int test_array [1 - 2 * !(($2) <= $ac_mid)]; @@ -270,7 +270,7 @@ ; return 0; -@@ -2461,7 +2485,8 @@ +@@ -2467,7 +2491,8 @@ main () { static int test_array [1 - 2 * !(($2) < 0)]; @@ -280,7 +280,7 @@ ; return 0; -@@ -2477,7 +2502,8 @@ +@@ -2483,7 +2508,8 @@ main () { static int test_array [1 - 2 * !(($2) >= $ac_mid)]; @@ -290,7 +290,7 @@ ; return 0; -@@ -2511,7 +2537,8 @@ +@@ -2517,7 +2543,8 @@ main () { static int test_array [1 - 2 * !(($2) <= $ac_mid)]; @@ -300,16 +300,16 @@ ; return 0; -@@ -2687,7 +2714,7 @@ +@@ -2693,7 +2720,7 @@ running configure, to aid debugging if configure makes a mistake. - It was created by ntp4 $as_me 4.2.7p446, which was + It was created by ntp4 $as_me 4.2.8, which was -generated by GNU Autoconf 2.68. Invocation command line was +generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ -@@ -3234,7 +3261,7 @@ +@@ -3240,7 +3267,7 @@ # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do @@ -318,7 +318,7 @@ if test $ac_prog = install && grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. -@@ -3403,7 +3430,7 @@ +@@ -3409,7 +3436,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -327,7 +327,7 @@ ac_cv_prog_STRIP="${ac_tool_prefix}strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 -@@ -3443,7 +3470,7 @@ +@@ -3449,7 +3476,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -336,7 +336,7 @@ ac_cv_prog_ac_ct_STRIP="strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 -@@ -3494,7 +3521,7 @@ +@@ -3500,7 +3527,7 @@ test -z "$as_dir" && as_dir=. for ac_prog in mkdir gmkdir; do for ac_exec_ext in '' $ac_executable_extensions; do @@ -345,7 +345,7 @@ case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( 'mkdir (GNU coreutils) '* | \ 'mkdir (coreutils) '* | \ -@@ -3547,7 +3574,7 @@ +@@ -3553,7 +3580,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -354,7 +354,7 @@ ac_cv_prog_AWK="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 -@@ -3856,7 +3883,7 @@ +@@ -3862,7 +3889,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -363,7 +363,7 @@ ac_cv_prog_CC="${ac_tool_prefix}gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 -@@ -3896,7 +3923,7 @@ +@@ -3902,7 +3929,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -372,7 +372,7 @@ ac_cv_prog_ac_ct_CC="gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 -@@ -3949,7 +3976,7 @@ +@@ -3955,7 +3982,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -381,7 +381,7 @@ ac_cv_prog_CC="${ac_tool_prefix}cc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 -@@ -3990,7 +4017,7 @@ +@@ -3996,7 +4023,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -390,7 +390,7 @@ if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue -@@ -4048,7 +4075,7 @@ +@@ -4054,7 +4081,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -399,7 +399,7 @@ ac_cv_prog_CC="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 -@@ -4092,7 +4119,7 @@ +@@ -4098,7 +4125,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -408,7 +408,7 @@ ac_cv_prog_ac_ct_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 -@@ -4538,8 +4565,7 @@ +@@ -4544,8 +4571,7 @@ /* end confdefs.h. */ #include #include @@ -418,7 +418,7 @@ /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); -@@ -4906,7 +4932,7 @@ +@@ -4912,7 +4938,7 @@ for ac_prog in grep ggrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" @@ -427,7 +427,7 @@ # Check for GNU ac_path_GREP and select it if it is found. # Check for GNU $ac_path_GREP case `"$ac_path_GREP" --version 2>&1` in -@@ -4972,7 +4998,7 @@ +@@ -4978,7 +5004,7 @@ for ac_prog in egrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" @@ -436,7 +436,7 @@ # Check for GNU ac_path_EGREP and select it if it is found. # Check for GNU $ac_path_EGREP case `"$ac_path_EGREP" --version 2>&1` in -@@ -5342,8 +5368,7 @@ +@@ -5348,8 +5374,7 @@ /* end confdefs.h. */ #include #include @@ -446,7 +446,7 @@ /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); -@@ -5449,7 +5474,7 @@ +@@ -5455,7 +5480,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -455,7 +455,7 @@ ac_cv_prog_CC="${ac_tool_prefix}gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 -@@ -5489,7 +5514,7 @@ +@@ -5495,7 +5520,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -464,7 +464,7 @@ ac_cv_prog_ac_ct_CC="gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 -@@ -5542,7 +5567,7 @@ +@@ -5548,7 +5573,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -473,7 +473,7 @@ ac_cv_prog_CC="${ac_tool_prefix}cc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 -@@ -5583,7 +5608,7 @@ +@@ -5589,7 +5614,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -482,7 +482,7 @@ if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue -@@ -5641,7 +5666,7 @@ +@@ -5647,7 +5672,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -491,7 +491,7 @@ ac_cv_prog_CC="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 -@@ -5685,7 +5710,7 @@ +@@ -5691,7 +5716,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -500,7 +500,7 @@ ac_cv_prog_ac_ct_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 -@@ -5881,8 +5906,7 @@ +@@ -5887,8 +5912,7 @@ /* end confdefs.h. */ #include #include @@ -510,7 +510,7 @@ /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); -@@ -7080,7 +7104,7 @@ +@@ -7086,7 +7110,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -519,7 +519,7 @@ ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 -@@ -7124,7 +7148,7 @@ +@@ -7130,7 +7154,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -528,7 +528,7 @@ ac_cv_prog_ac_ct_CXX="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 -@@ -7454,7 +7478,7 @@ +@@ -7460,7 +7484,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -537,7 +537,7 @@ ac_cv_prog_YACC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 -@@ -7906,7 +7930,7 @@ +@@ -7912,7 +7936,7 @@ for ac_prog in sed gsed; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" @@ -546,7 +546,7 @@ # Check for GNU ac_path_SED and select it if it is found. # Check for GNU $ac_path_SED case `"$ac_path_SED" --version 2>&1` in -@@ -7985,7 +8009,7 @@ +@@ -7991,7 +8015,7 @@ for ac_prog in fgrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" @@ -555,7 +555,7 @@ # Check for GNU ac_path_FGREP and select it if it is found. # Check for GNU $ac_path_FGREP case `"$ac_path_FGREP" --version 2>&1` in -@@ -8241,7 +8265,7 @@ +@@ -8247,7 +8271,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -564,7 +564,7 @@ ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 -@@ -8285,7 +8309,7 @@ +@@ -8291,7 +8315,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -573,7 +573,7 @@ ac_cv_prog_ac_ct_DUMPBIN="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 -@@ -8704,7 +8728,7 @@ +@@ -8710,7 +8734,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -582,7 +582,7 @@ ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 -@@ -8744,7 +8768,7 @@ +@@ -8750,7 +8774,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -591,7 +591,7 @@ ac_cv_prog_ac_ct_OBJDUMP="objdump" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 -@@ -9050,7 +9074,7 @@ +@@ -9056,7 +9080,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -600,7 +600,7 @@ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 -@@ -9090,7 +9114,7 @@ +@@ -9096,7 +9120,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -609,7 +609,7 @@ ac_cv_prog_ac_ct_DLLTOOL="dlltool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 -@@ -9193,7 +9217,7 @@ +@@ -9199,7 +9223,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -618,7 +618,7 @@ ac_cv_prog_AR="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 -@@ -9237,7 +9261,7 @@ +@@ -9243,7 +9267,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -627,7 +627,7 @@ ac_cv_prog_ac_ct_AR="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 -@@ -9362,7 +9386,7 @@ +@@ -9368,7 +9392,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -636,7 +636,7 @@ ac_cv_prog_STRIP="${ac_tool_prefix}strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 -@@ -9402,7 +9426,7 @@ +@@ -9408,7 +9432,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -645,7 +645,7 @@ ac_cv_prog_ac_ct_STRIP="strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 -@@ -9461,7 +9485,7 @@ +@@ -9467,7 +9491,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -654,7 +654,7 @@ ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 -@@ -9501,7 +9525,7 @@ +@@ -9507,7 +9531,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -663,7 +663,7 @@ ac_cv_prog_ac_ct_RANLIB="ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 -@@ -10136,7 +10160,7 @@ +@@ -10142,7 +10166,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -672,7 +672,7 @@ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 -@@ -10176,7 +10200,7 @@ +@@ -10182,7 +10206,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -681,7 +681,7 @@ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 -@@ -10256,7 +10280,7 @@ +@@ -10262,7 +10286,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -690,7 +690,7 @@ ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 -@@ -10296,7 +10320,7 @@ +@@ -10302,7 +10326,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -699,7 +699,7 @@ ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 -@@ -10348,7 +10372,7 @@ +@@ -10354,7 +10378,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -708,7 +708,7 @@ ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 -@@ -10388,7 +10412,7 @@ +@@ -10394,7 +10418,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -717,7 +717,7 @@ ac_cv_prog_ac_ct_NMEDIT="nmedit" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 -@@ -10440,7 +10464,7 @@ +@@ -10446,7 +10470,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -726,7 +726,7 @@ ac_cv_prog_LIPO="${ac_tool_prefix}lipo" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 -@@ -10480,7 +10504,7 @@ +@@ -10486,7 +10510,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -735,7 +735,7 @@ ac_cv_prog_ac_ct_LIPO="lipo" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 -@@ -10532,7 +10556,7 @@ +@@ -10538,7 +10562,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -744,7 +744,7 @@ ac_cv_prog_OTOOL="${ac_tool_prefix}otool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 -@@ -10572,7 +10596,7 @@ +@@ -10578,7 +10602,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -753,7 +753,7 @@ ac_cv_prog_ac_ct_OTOOL="otool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 -@@ -10624,7 +10648,7 @@ +@@ -10630,7 +10654,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -762,7 +762,7 @@ ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 -@@ -10664,7 +10688,7 @@ +@@ -10670,7 +10694,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -771,7 +771,7 @@ ac_cv_prog_ac_ct_OTOOL64="otool64" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 -@@ -18991,7 +19015,7 @@ +@@ -19053,7 +19077,7 @@ for ac_prog in sed gsed; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" @@ -780,7 +780,7 @@ # Check for GNU ac_path_SED and select it if it is found. # Check for GNU $ac_path_SED case `"$ac_path_SED" --version 2>&1` in -@@ -19250,6 +19274,63 @@ +@@ -19312,6 +19336,63 @@ @@ -844,7 +844,7 @@ ac_fn_c_check_func "$LINENO" "vsnprintf" "ac_cv_func_vsnprintf" if test "x$ac_cv_func_vsnprintf" = xyes; then : hw_cv_func_vsnprintf=yes -@@ -19382,7 +19463,8 @@ +@@ -19444,7 +19525,8 @@ { static int test_array [1 - 2 * !(/* On Ultrix 4.3 cc, long double is 4 and double is 8. */ sizeof (double) <= sizeof (long double))]; @@ -854,7 +854,7 @@ ; return 0; -@@ -19405,75 +19487,47 @@ +@@ -19467,75 +19549,47 @@ fi @@ -952,7 +952,7 @@ else ac_cv_type_long_long_int=no fi -@@ -19481,11 +19535,8 @@ +@@ -19543,11 +19597,8 @@ conftest.$ac_objext conftest.beam conftest.$ac_ext fi @@ -966,7 +966,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_long_long_int" >&5 $as_echo "$ac_cv_type_long_long_int" >&6; } -@@ -19501,7 +19552,9 @@ +@@ -19563,7 +19614,9 @@ if ${ac_cv_type_unsigned_long_long_int+:} false; then : $as_echo_n "(cached) " >&6 else @@ -977,7 +977,7 @@ /* end confdefs.h. */ /* For now, do not test the preprocessor; as of 2007 there are too many -@@ -19534,12 +19587,13 @@ +@@ -19596,12 +19649,13 @@ _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -992,7 +992,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_unsigned_long_long_int" >&5 $as_echo "$ac_cv_type_unsigned_long_long_int" >&6; } -@@ -19614,7 +19668,8 @@ +@@ -19676,7 +19730,8 @@ main () { static int test_array [1 - 2 * !(sizeof (void *) <= sizeof ($ac_type))]; @@ -1002,7 +1002,7 @@ ; return 0; -@@ -19668,11 +19723,11 @@ +@@ -19730,11 +19785,11 @@ int main () { @@ -1017,7 +1017,7 @@ /* SunOS 4.1.1 cc rejects this. */ char const *const *pcpcc; char **ppc; -@@ -19689,8 +19744,9 @@ +@@ -19751,8 +19806,9 @@ ++pcpcc; ppc = (char**) pcpcc; pcpcc = (char const *const *) ppc; @@ -1029,7 +1029,7 @@ char const *s = 0 ? (char *) 0 : (char const *) 0; *t++ = 0; -@@ -19706,10 +19762,10 @@ +@@ -19768,10 +19824,10 @@ iptr p = 0; ++p; } @@ -1043,7 +1043,7 @@ } { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ const int foo = 10; -@@ -19832,11 +19888,11 @@ +@@ -19894,11 +19950,11 @@ int main () { @@ -1058,7 +1058,7 @@ /* SunOS 4.1.1 cc rejects this. */ char const *const *pcpcc; char **ppc; -@@ -19853,8 +19909,9 @@ +@@ -19915,8 +19971,9 @@ ++pcpcc; ppc = (char**) pcpcc; pcpcc = (char const *const *) ppc; @@ -1070,7 +1070,7 @@ char const *s = 0 ? (char *) 0 : (char const *) 0; *t++ = 0; -@@ -19870,10 +19927,10 @@ +@@ -19932,10 +19989,10 @@ iptr p = 0; ++p; } @@ -1084,7 +1084,7 @@ } { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ const int foo = 10; -@@ -20652,6 +20709,8 @@ +@@ -20714,6 +20771,8 @@ # ifdef _MSC_VER # include # define alloca _alloca @@ -1093,7 +1093,7 @@ # else # ifdef HAVE_ALLOCA_H # include -@@ -20755,23 +20814,20 @@ +@@ -20817,23 +20876,20 @@ /* end confdefs.h. */ $ac_includes_default int @@ -1126,7 +1126,7 @@ } _ACEOF if ac_fn_c_try_run "$LINENO"; then : -@@ -21677,7 +21733,8 @@ +@@ -21739,7 +21795,8 @@ main () { static int test_array [1 - 2 * !(((char) -1) < 0)]; @@ -1136,7 +1136,7 @@ ; return 0; -@@ -22076,7 +22133,7 @@ +@@ -22138,7 +22195,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -1145,7 +1145,7 @@ ac_cv_prog_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 -@@ -28023,7 +28080,7 @@ +@@ -28085,7 +28142,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -1154,7 +1154,7 @@ ac_cv_prog_AWK="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 -@@ -28152,47 +28209,6 @@ +@@ -28214,47 +28271,6 @@ @@ -1202,7 +1202,7 @@ # Extract the first word of "test", so it can be a program name with args. set dummy test; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -@@ -28211,7 +28227,7 @@ +@@ -28273,7 +28289,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -1211,7 +1211,7 @@ ac_cv_path_PATH_TEST="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 -@@ -28286,7 +28302,7 @@ +@@ -28348,7 +28364,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -1220,7 +1220,7 @@ ac_cv_path_PATH_NET_SNMP_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 -@@ -32934,7 +32950,7 @@ +@@ -33066,7 +33082,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -1229,7 +1229,7 @@ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 -@@ -32977,7 +32993,7 @@ +@@ -33109,7 +33125,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -1238,7 +1238,7 @@ ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 -@@ -33072,6 +33088,19 @@ +@@ -33204,6 +33220,19 @@ esac case "$with_crypto:${PKG_CONFIG:+notempty}:${with_openssl_libdir-notgiven}:${with_openssl_incdir-notgiven}" in no:*) ;; @@ -1258,7 +1258,32 @@ *:notempty:notgiven:notgiven) for pkg in `echo $with_crypto | sed -e 's/,/ /'`; do { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config for $pkg" >&5 -@@ -35795,7 +35824,7 @@ +@@ -33590,6 +33619,13 @@ + + fi + ++case "$with_crypto" in ++ sunw) ++ # SmartOS builds should use the platform OpenSSL for random number ++ # generation ++ ntp_use_openssl_random=force ++ ;; ++esac + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ntp_use_openssl_random" >&5 + $as_echo "$ntp_use_openssl_random" >&6; } + +@@ -33609,8 +33645,8 @@ + done + + LIBS="$NTPO_SAVED_LIBS" +-case "$ntp_use_openssl_random$ac_cv_func_RAND_bytes$ac_cv_func_RAND_poll" in +- yesyesyes) ++case "$ntp_use_openssl_random:$ac_cv_func_RAND_bytes:$ac_cv_func_RAND_poll" in ++ force:*|yes:yes:yes) + + $as_echo "#define USE_OPENSSL_CRYPTO_RAND 1" >>confdefs.h + +@@ -35970,7 +36006,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -1267,7 +1292,7 @@ ac_cv_path_GTEST_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 -@@ -35957,7 +35986,50 @@ +@@ -36132,7 +36168,50 @@ ac_config_files="$ac_config_files util/Makefile" @@ -1319,7 +1344,7 @@ prefix_NONE= exec_prefix_NONE= -@@ -36466,16 +36538,16 @@ +@@ -36645,16 +36724,16 @@ # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. @@ -1340,7 +1365,7 @@ fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null -@@ -36535,28 +36607,16 @@ +@@ -36714,28 +36793,16 @@ as_mkdir_p=false fi @@ -1379,19 +1404,19 @@ # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" -@@ -36578,7 +36638,7 @@ +@@ -36757,7 +36824,7 @@ # values after options handling. ac_log=" - This file was extended by ntp4 $as_me 4.2.7p446, which was + This file was extended by ntp4 $as_me 4.2.8, which was -generated by GNU Autoconf 2.68. Invocation command line was +generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS -@@ -36645,10 +36705,10 @@ +@@ -36824,10 +36891,10 @@ ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ - ntp4 config.status 4.2.7p446 + ntp4 config.status 4.2.8 -configured by $0, generated by GNU Autoconf 2.68, +configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -1401,7 +1426,7 @@ This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." -@@ -36739,7 +36799,7 @@ +@@ -36918,7 +36985,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then diff --git a/ntp/Patches/ntp_util.patch b/ntp/Patches/ntp_util.patch deleted file mode 100644 index 7d9dd885..00000000 --- a/ntp/Patches/ntp_util.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- scripts/lib/NTP/Util.pm Wed Jul 2 20:25:10 2014 -+++ scripts/lib/NTP/Util.pm Wed Jul 2 22:37:15 2014 -@@ -9,17 +9,9 @@ - my $ntpq_path = 'ntpq'; - my $sntp_path = 'sntp'; - --our $IP_AGNOSTIC; -- - BEGIN { - require Socket; -- if ($Socket::VERSION >= 1.94) { -- Socket->import(qw(getaddrinfo getnameinfo SOCK_RAW AF_INET)); -- $IP_AGNOSTIC = 1; -- } -- else { -- Socket->import(qw(inet_aton SOCK_RAW AF_INET)); -- } -+ Socket->import(qw(inet_aton SOCK_RAW AF_INET)); - } - - my %obsolete_vars = ( -@@ -69,19 +61,7 @@ - sub do_dns { - my ($host) = @_; - -- if ($IP_AGNOSTIC) { -- my ($err, $res); -- -- ($err, $res) = getaddrinfo($host, '', {socktype => SOCK_RAW}); -- die "getaddrinfo failed: $err\n" if $err; -- -- ($err, $res) = getnameinfo($res->{addr}, 0); -- die "getnameinfo failed: $err\n" if $err; -- -- return $res; -- } -- # Too old perl, do only ipv4 -- elsif ($host =~ /^(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})$/) { -+ if ($host =~ /^(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})$/) { - return gethostbyaddr inet_aton($host), AF_INET; - } - else { diff --git a/ntp/Patches/openssl.patch b/ntp/Patches/openssl.patch index 5b2bda46..0a1de2a8 100644 --- a/ntp/Patches/openssl.patch +++ b/ntp/Patches/openssl.patch @@ -18,3 +18,30 @@ *:notempty:notgiven:notgiven) for pkg in `echo $with_crypto | sed -e 's/,/ /'`; do AC_MSG_CHECKING([pkg-config for $pkg]) +--- sntp/m4/ntp_crypto_rand.m4 2014-12-19 11:56:54.000000000 +0000 ++++ sntp/m4/ntp_crypto_rand.m4 2014-12-20 00:01:11.556751398 +0000 +@@ -34,6 +34,13 @@ + [ntp_use_openssl_random=$enableval], + [ntp_use_openssl_random=yes] + ) ++case "$with_crypto" in ++ sunw) ++ # SmartOS builds should use the platform OpenSSL for random number ++ # generation ++ ntp_use_openssl_random=force ++ ;; ++esac + AC_MSG_RESULT([$ntp_use_openssl_random]) + + # The following might need extra libraries +@@ -42,8 +49,8 @@ + dnl AC_MSG_NOTICE([LIBS is <$LIBS>]) + AC_CHECK_FUNCS([RAND_bytes RAND_poll]) + LIBS="$NTPO_SAVED_LIBS" +-case "$ntp_use_openssl_random$ac_cv_func_RAND_bytes$ac_cv_func_RAND_poll" in +- yesyesyes) ++case "$ntp_use_openssl_random:$ac_cv_func_RAND_bytes:$ac_cv_func_RAND_poll" in ++ force:*|yes:yes:yes) + AC_DEFINE([USE_OPENSSL_CRYPTO_RAND], [1], [Use OpenSSL's crypto random functions]) + ;; + *) ntp_use_openssl_random=no ;; diff --git a/ntp/ntp-4.2.8.tar.gz b/ntp/ntp-4.2.8.tar.gz new file mode 100644 index 00000000..5174d6cc Binary files /dev/null and b/ntp/ntp-4.2.8.tar.gz differ diff --git a/ntp/ntp-dev-4.2.7p446.tar.gz b/ntp/ntp-dev-4.2.7p446.tar.gz deleted file mode 100644 index 3d160aae..00000000 Binary files a/ntp/ntp-dev-4.2.7p446.tar.gz and /dev/null differ