From owner-svn-src-all@FreeBSD.ORG Mon May 25 20:27:49 2015 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A79D51FC; Mon, 25 May 2015 20:27:49 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8836AED1; Mon, 25 May 2015 20:27:49 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4PKRnsT043871; Mon, 25 May 2015 20:27:49 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4PKRlA7043861; Mon, 25 May 2015 20:27:47 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201505252027.t4PKRlA7043861@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Mon, 25 May 2015 20:27:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r283542 - in head/usr.sbin/ntp: . ntp-keygen ntpd ntpdate ntpdc ntpq sntp X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 May 2015 20:27:49 -0000 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 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