svn commit: r283542 - in head/usr.sbin/ntp: . ntp-keygen ntpd ntpdate ntpdc ntpq sntp

[Baptiste Daroussin]

Author: bapt
Date: Mon May 25 20:27:46 2015
New Revision: 283542
URL: https://svnweb.freebsd.org/changeset/base/283542

Log:
  Fix overlinking again after recent ntp updates
  Fix building WITHOUT_OPENSSL

Modified:
  head/usr.sbin/ntp/Makefile.inc
  head/usr.sbin/ntp/config.h
  head/usr.sbin/ntp/ntp-keygen/Makefile
  head/usr.sbin/ntp/ntpd/Makefile
  head/usr.sbin/ntp/ntpdate/Makefile
  head/usr.sbin/ntp/ntpdc/Makefile
  head/usr.sbin/ntp/ntpq/Makefile
  head/usr.sbin/ntp/sntp/Makefile

Modified: head/usr.sbin/ntp/Makefile.inc
==============================================================================
--- head/usr.sbin/ntp/Makefile.inc	Mon May 25 20:06:49 2015	(r283541)
+++ head/usr.sbin/ntp/Makefile.inc	Mon May 25 20:27:46 2015	(r283542)
@@ -11,7 +11,7 @@ NTPDEFS=   -DSYS_FREEBSD
 CFLAGS+= ${NTPDEFS} ${DEFS_LOCAL} ${CLOCKDEFS}
 
 .if ${MK_OPENSSL} != "no" && !defined(RELEASE_CRUNCH)
-CFLAGS+= -DOPENSSL
+CFLAGS+= -DOPENSSL -DUSE_OPENSSL_CRYPTO_RAND -DAUTOKEY
 .endif
 
 WARNS?=	0

Modified: head/usr.sbin/ntp/config.h
==============================================================================
--- head/usr.sbin/ntp/config.h	Mon May 25 20:06:49 2015	(r283541)
+++ head/usr.sbin/ntp/config.h	Mon May 25 20:27:46 2015	(r283542)
@@ -9,7 +9,7 @@
 /* #undef ADJTIME_IS_ACCURATE */
 
 /* Support NTP Autokey protocol? */
-#define AUTOKEY 1
+/* #define AUTOKEY 1 */
 
 /* why not HAVE_P_S? */
 /* #undef CALL_PTHREAD_SETCONCURRENCY */
@@ -1578,7 +1578,7 @@ typedef unsigned int	uintptr_t;
 #define USE_FSETOWNCTTY 1
 
 /* Use OpenSSL's crypto random functions */
-#define USE_OPENSSL_CRYPTO_RAND 1
+/* #define USE_OPENSSL_CRYPTO_RAND 1 */
 
 /* OK to use snprintb()? */
 /* #undef USE_SNPRINTB */

Modified: head/usr.sbin/ntp/ntp-keygen/Makefile
==============================================================================
--- head/usr.sbin/ntp/ntp-keygen/Makefile	Mon May 25 20:06:49 2015	(r283541)
+++ head/usr.sbin/ntp/ntp-keygen/Makefile	Mon May 25 20:27:46 2015	(r283542)
@@ -23,7 +23,7 @@ CFLAGS+= -I${.CURDIR}/../../../contrib/n
 LIBADD+=	ntp opts pthread
 
 .if ${MK_OPENSSL} != "no"
-LIBADD+=	md crypto
+LIBADD+=	crypto
 .endif
 
 .include <bsd.prog.mk>

Modified: head/usr.sbin/ntp/ntpd/Makefile
==============================================================================
--- head/usr.sbin/ntp/ntpd/Makefile	Mon May 25 20:06:49 2015	(r283541)
+++ head/usr.sbin/ntp/ntpd/Makefile	Mon May 25 20:27:46 2015	(r283542)
@@ -35,10 +35,12 @@ CFLAGS+= -I${.CURDIR}/../../../contrib/n
 	-I${.CURDIR}/../ \
 	-I${.CURDIR}
 
-LIBADD=	parse ntp m rt opts md pthread
+LIBADD=	parse ntp m opts pthread
 
 .if ${MK_OPENSSL} != "no"
 LIBADD+=	crypto
+.else
+LIBADD+=	md
 .endif
 
 CLEANFILES+= .version version.c

Modified: head/usr.sbin/ntp/ntpdate/Makefile
==============================================================================
--- head/usr.sbin/ntp/ntpdate/Makefile	Mon May 25 20:06:49 2015	(r283541)
+++ head/usr.sbin/ntp/ntpdate/Makefile	Mon May 25 20:27:46 2015	(r283542)
@@ -14,10 +14,12 @@ CFLAGS+= -I${.CURDIR}/../../../contrib/n
 	-I${.CURDIR}/../../../contrib/ntp/lib/isc/pthreads/include \
 	-I${.CURDIR}/../
 
-LIBADD=	rt ntp m pthread
+LIBADD=	ntp m pthread
 
 .if ${MK_OPENSSL} != "no"
-LIBADD+=	md ssl crypto
+LIBADD+=	crypto
+.else
+LIBADD+=	md
 .endif
 
 CLEANFILES+= .version version.c

Modified: head/usr.sbin/ntp/ntpdc/Makefile
==============================================================================
--- head/usr.sbin/ntp/ntpdc/Makefile	Mon May 25 20:06:49 2015	(r283541)
+++ head/usr.sbin/ntp/ntpdc/Makefile	Mon May 25 20:27:46 2015	(r283542)
@@ -18,12 +18,14 @@ CFLAGS+= -I${.CURDIR}/../../../contrib/n
 	-I${.CURDIR}/../../../lib/libc/${MACHINE_ARCH} \
 	-I${.CURDIR}/../ -I${.CURDIR}
 
-LIBADD=	edit md ntp m readline opts ncurses pthread
+LIBADD=	edit ntp m opts pthread
 CFLAGS+=	-DHAVE_LIBEDIT -DHAVE_READLINE_READLINE_H \
 		-I${DESTDIR}/${INCLUDEDIR}/edit
 
 .if ${MK_OPENSSL} != "no"
-LIBADD+=	ssl crypto
+LIBADD+=	crypto
+.else
+LIBADD+=	md
 .endif
 
 CLEANFILES+= .version version.c

Modified: head/usr.sbin/ntp/ntpq/Makefile
==============================================================================
--- head/usr.sbin/ntp/ntpq/Makefile	Mon May 25 20:06:49 2015	(r283541)
+++ head/usr.sbin/ntp/ntpq/Makefile	Mon May 25 20:27:46 2015	(r283542)
@@ -21,10 +21,12 @@ CFLAGS+= -I${.CURDIR}/../../../contrib/n
 	-I${.CURDIR}/../../../contrib/ntp/sntp/libopts \
 	-I${.CURDIR}/../
 
-LIBADD+=	edit md ntp opts m pthread
+LIBADD+=	edit ntp opts m pthread
 
 .if ${MK_OPENSSL} != "no"
-LIBADD+=	ssl crypto
+LIBADD+=	crypto
+.else
+LIBADD+=	md
 .endif
 
 CFLAGS+=	-DHAVE_LIBEDIT -DHAVE_READLINE_READLINE_H \

Modified: head/usr.sbin/ntp/sntp/Makefile
==============================================================================
--- head/usr.sbin/ntp/sntp/Makefile	Mon May 25 20:06:49 2015	(r283541)
+++ head/usr.sbin/ntp/sntp/Makefile	Mon May 25 20:27:46 2015	(r283542)
@@ -23,7 +23,9 @@ CFLAGS+= -I${.CURDIR}/../../../contrib/n
 LIBADD=	m opts ntp ntpevent pthread
 
 .if ${MK_OPENSSL} != "no"
-LIBADD+=	md ssl crypto
+LIBADD+=	crypto
+.else
+LIBADD+=	md
 .endif
 
 .include <bsd.prog.mk>