All diffs for ChangeSet 1.3272

==== ChangeLog ====


2014-12-22 05:57:59+00:00, stenn@psp-fb1.ntp.org +2 -1
  [Bug 2693] ntp-keygen doesn't build without OpenSSL
--- 1.1596/ChangeLog	2014-12-22 05:48:32 +00:00
+++ 1.1597/ChangeLog	2014-12-22 05:57:59 +00:00
@@ -1,7 +1,8 @@
 ---
 
 * [Sec 2672] On some OSes ::1 can be spoofed, bypassing source IP ACLs.
-* [Bug 2699] IN6_IS_ADDR_LOOPBACK build problems on some OSes.
+* [Bug 2693] ntp-keygen doesn't build without OpenSSL.
+* [Bug 2697] IN6_IS_ADDR_LOOPBACK build problems on some OSes.
 * [Bug 2699] HAVE_SYS_SELECT_H is misspelled in refclock_gpsdjson.c.
 ---
 (4.2.8) 2014/12/19 Released by Harlan Stenn <stenn@ntp.org>

==== Makefile.am ====


2014-12-22 05:57:59+00:00, stenn@psp-fb1.ntp.org +3 -2
  [Bug 2693] ntp-keygen doesn't build without OpenSSL
--- 1.123/Makefile.am	2014-09-10 08:24:42 +00:00
+++ 1.124/Makefile.am	2014-12-22 05:57:59 +00:00
@@ -2,7 +2,10 @@ NULL =
 
 NULL =
 
+# moved sntp first to get libtool and libevent built.
+
 SUBDIRS =		\
+	sntp		\
 	scripts		\
 	include		\
 	libntp		\
@@ -17,7 +20,6 @@ SUBDIRS =		\
 	clockstuff	\
 	kernel		\
 	util		\
-	sntp		\
 	tests		\
 	$(NULL)
 
@@ -64,7 +66,6 @@ BUILT_SOURCES =				\
 	.gcc-warning			\
 	libtool				\
 	html/.datecheck			\
-	sntp/built-sources-only		\
 	$(srcdir)/COPYRIGHT		\
 	$(srcdir)/.checkChangeLog	\
 	$(NULL)

==== configure.ac ====


2014-12-22 05:58:00+00:00, stenn@psp-fb1.ntp.org +5 -1
  [Bug 2693] ntp-keygen doesn't build without OpenSSL
--- 1.578/configure.ac	2014-12-14 16:11:30 +00:00
+++ 1.579/configure.ac	2014-12-22 05:58:00 +00:00
@@ -102,7 +102,7 @@ LIBOPTS_CHECK_NOBUILD([sntp/libopts])
 enable_nls=no
 LIBOPTS_CHECK_NOBUILD([sntp/libopts])
 
-NTP_ENABLE_LOCAL_LIBEVENT
+NTP_LIBEVENT_CHECK_NOBUILD([2], [sntp/libevent])
 
 NTP_LIBNTP
 
@@ -771,6 +771,10 @@ esac
 
 #### 
 
+AC_CHECK_FUNCS([arc4random_buf])
+
+#### 
+
 saved_LIBS="$LIBS"
 LIBS="$LIBS $LDADD_LIBNTP"
 AC_CHECK_FUNCS([daemon])

==== libntp/ntp_crypto_rnd.c ====


2014-12-22 05:58:04+00:00, stenn@psp-fb1.ntp.org +15 -0
  [Bug 2693] ntp-keygen doesn't build without OpenSSL
--- 1.1/libntp/ntp_crypto_rnd.c	2014-12-14 16:07:51 +00:00
+++ 1.2/libntp/ntp_crypto_rnd.c	2014-12-22 05:58:04 +00:00
@@ -24,6 +24,21 @@ int crypto_rand_init = 0;
 int crypto_rand_init = 0;
 #endif
 
+#ifndef HAVE_ARC4RANDOM_BUF
+static void
+arc4random_buf(void *buf, size_t nbytes);
+
+void
+evutil_secure_rng_get_bytes(void *buf, size_t nbytes);
+
+static void
+arc4random_buf(void *buf, size_t nbytes)
+{
+	evutil_secure_rng_get_bytes(buf, nbytes);
+	return;
+}
+#endif
+
 /*
  * As of late 2014, here's how we plan to provide cryptographic-quality
  * random numbers:

==== sntp/configure.ac ====


2014-12-22 05:58:34+00:00, stenn@psp-fb1.ntp.org +8 -5
  [Bug 2693] ntp-keygen doesn't build without OpenSSL
--- 1.76/sntp/configure.ac	2013-10-28 08:16:08 +00:00
+++ 1.77/sntp/configure.ac	2014-12-22 05:58:34 +00:00
@@ -97,11 +97,14 @@ LIBOPTS_CHECK
 enable_nls=no
 LIBOPTS_CHECK
 
-AM_COND_IF(
-    [BUILD_SNTP],
-    [NTP_LIBEVENT_CHECK],
-    [NTP_LIBEVENT_CHECK_NOBUILD]
-)
+# From when we only used libevent for sntp:
+#AM_COND_IF(
+#    [BUILD_SNTP],
+#    [NTP_LIBEVENT_CHECK],
+#    [NTP_LIBEVENT_CHECK_NOBUILD]
+#)
+
+NTP_LIBEVENT_CHECK([2])
 
 # Checks for libraries.

==== sntp/m4/ntp_libevent.m4 ====


2014-12-22 05:58:34+00:00, stenn@psp-fb1.ntp.org +23 -2
  [Bug 2693] ntp-keygen doesn't build without OpenSSL
--- 1.11/sntp/m4/ntp_libevent.m4	2014-06-28 08:59:57 +00:00
+++ 1.12/sntp/m4/ntp_libevent.m4	2014-12-22 05:58:34 +00:00
@@ -1,4 +1,25 @@
-dnl NTP_ENABLE_LOCAL_LIBEVENT				     -*- Autoconf -*-
+# SYNOPSIS						-*- Autoconf -*-
+#
+#  NTP_ENABLE_LOCAL_LIBEVENT
+#  NTP_LIBEVENT_CHECK([MINVERSION [, DIR]])
+#  NTP_LIBEVENT_CHECK_NOBUILD([MINVERSION [, DIR]])
+#
+# DESCRIPTION
+#
+# AUTHOR
+#
+#  Harlan Stenn
+#
+# LICENSE
+#
+#  This file is Copyright (c) 2014 Network Time Foundation
+# 
+#  Copying and distribution of this file, with or without modification, are
+#  permitted in any medium without royalty provided the copyright notice,
+#  author attribution and this notice are preserved.  This file is offered
+#  as-is, without any warranty.
+
+dnl NTP_ENABLE_LOCAL_LIBEVENT
 dnl
 dnl Provide only the --enable-local-libevent command-line option.
 dnl
@@ -29,7 +50,7 @@ dnl
 dnl but DO NOT invoke DIR/configure if we are going to use our bundled
 dnl version.  This may be the case for nested packages.
 dnl
-dnl provide --enable-local-libevent .
+dnl provides: --enable-local-libevent 
 dnl
 dnl Examples:
 dnl

==== util/Makefile.am ====


2014-12-22 05:58:54+00:00, stenn@psp-fb1.ntp.org +1 -0
  [Bug 2693] ntp-keygen doesn't build without OpenSSL
--- 1.76/util/Makefile.am	2014-08-23 00:23:22 +00:00
+++ 1.77/util/Makefile.am	2014-12-22 05:58:54 +00:00
@@ -19,6 +19,7 @@ ntp_keygen_LDADD  = version.o $(LIBOPTS_
 LDADD=		../libntp/libntp.a $(LDADD_LIBNTP) $(LIBM) $(PTHREAD_LIBS)
 tg2_LDADD=	../libntp/libntp.a $(LDADD_LIBNTP) $(LIBM)
 ntp_keygen_LDADD  = version.o $(LIBOPTS_LDADD) ../libntp/libntp.a
+ntp_keygen_LDADD += $(LDADD_LIBEVENT)
 ntp_keygen_LDADD += $(LDADD_LIBNTP) $(PTHREAD_LIBS) $(LDADD_NTP) $(LIBM)
 ntp_keygen_SOURCES = ntp-keygen.c ntp-keygen-opts.c ntp-keygen-opts.h

#### ChangeSet ####

==== ChangeLog ====

==== Makefile.am ====

==== configure.ac ====

==== libntp/ntp_crypto_rnd.c ====

==== sntp/configure.ac ====

==== sntp/m4/ntp_libevent.m4 ====

==== util/Makefile.am ====