Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 05 Jan 2026 20:03:02 +0000
From:      Cy Schubert <cy@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: 57f1d519e02d - stable/13 - ntp: Fix buildworld with MK_OPENSSL=no
Message-ID:  <695c18f6.3fcff.5e061cc5@gitrepo.freebsd.org>

index | next in thread | raw e-mail

The branch stable/13 has been updated by cy:

URL: https://cgit.FreeBSD.org/src/commit/?id=57f1d519e02d60c6d50f81aa6098a04a92152ab3

commit 57f1d519e02d60c6d50f81aa6098a04a92152ab3
Author:     Cy Schubert <cy@FreeBSD.org>
AuthorDate: 2025-12-19 04:59:38 +0000
Commit:     Cy Schubert <cy@FreeBSD.org>
CommitDate: 2026-01-05 03:40:12 +0000

    ntp: Fix buildworld with MK_OPENSSL=no
    
    Reported by:    wosch
    Tested by:      wosch
    
    (cherry picked from commit 2804461adfc670c78c1dcb9cab6b2191c8d486ec)
---
 usr.sbin/ntp/Makefile.inc | 2 +-
 usr.sbin/ntp/config.h     | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/usr.sbin/ntp/Makefile.inc b/usr.sbin/ntp/Makefile.inc
index a4174bb99393..39d543c77d86 100644
--- a/usr.sbin/ntp/Makefile.inc
+++ b/usr.sbin/ntp/Makefile.inc
@@ -10,7 +10,7 @@ NTPDEFS=   -DSYS_FREEBSD
 CFLAGS+= ${NTPDEFS} ${DEFS_LOCAL} ${CLOCKDEFS}
 
 .if ${MK_OPENSSL} != "no"
-CFLAGS+= -DOPENSSL -DAUTOKEY
+CFLAGS+= -DOPENSSL -DAUTOKEY -DUSE_OPENSSL_CRYPTO_RAND
 .endif
 
 WARNS?=	0
diff --git a/usr.sbin/ntp/config.h b/usr.sbin/ntp/config.h
index c8e918a9128b..739b99c98bcd 100644
--- a/usr.sbin/ntp/config.h
+++ b/usr.sbin/ntp/config.h
@@ -1668,7 +1668,8 @@ typedef unsigned int	uintptr_t;
 #define USE_FSETOWNCTTY 1
 
 /* Use OpenSSL's crypto random functions */
-#define USE_OPENSSL_CRYPTO_RAND 1
+/* We define this in Makefile.inc instead */
+/* #undef USE_OPENSSL_CRYPTO_RAND */
 
 /* OK to use snprintb()? */
 /* #undef USE_SNPRINTB */


home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?695c18f6.3fcff.5e061cc5>