From nobody Fri Dec 19 12:55:42 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dXnZk61DHz6Lc7t for ; Fri, 19 Dec 2025 12:55:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dXnZk3qZpz49MS for ; Fri, 19 Dec 2025 12:55:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766148942; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FreY5w2yom9fJaRqOtmpe/IhdBMFcMnJBeM1effKgds=; b=d0Wt0+HmSNlc0nH4i0izpBDkOXXoWs6TG/ltLozSQYXkEuytwYr/n3Z3AW7iexaTBE3N60 r+gW48X5ZyIjwO+3mdjxlI1p/3IfJ3OPJ++V4LSQ/3+RS2XsZitA+re+/ksE0zieyIEssu eLsdMBOZv7bDDkw33Zoeqaiev7VtjG1FgU9SVs4BTcd2220NoFwWzAj0YqAf8bWLiV9GF7 CWQpQUPxIp56pdO/2F/6F+VrNlExrhM4T72Rl+Btl6Lm1rvtlDPhP2vqQlgzi5xaU9SWGN YNkSxdh0lsqAkyrAGQFCy+yy4/sHdXr3AZX+0H3EmxcThw/bQsETFbVdpOtguA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766148942; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FreY5w2yom9fJaRqOtmpe/IhdBMFcMnJBeM1effKgds=; b=CTbeDL5Lo9MD9PEkAaDVKta9TvAD4Q96CgpksTrTS5SFSW0FMWfbM1TuB8umSGhFCFHoeg 8yXta3JvJDBtwjWB6Crf0gY/DWojp5TwiGKDPHajKEOFHyf9jT5ynBz2zm380KvhDlULMI GoGzn/EYRqcL80j4MOrNjsR/L+ymMbKhIFkueq46rgIWsKAqsRCcBzpbBWjjFb0udvW5f0 h8ua+3M6KDu9NQEIMN2B8gC2j+Y72OWgGV5Ck+tBTo37EdFDKjGG+JXhZQR3j5ivIvKPim PFegyLkcQe+rzYowI8ni5arNJm7YLmVw7kWJ+flcurEcdTJniyW7wc3HESWt8w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766148942; a=rsa-sha256; cv=none; b=B2F2J6+m1A4zC5AADDFXeUxlh5y+zxqA9/xJU08u+iqKrmC2z/4ftaoblvBfMUbRUR23i5 eRobUvdvro86MDDhtadizETyV2vR5qGt/ID7s8Vko5pXSQ1SQos8/0v0rn+m8iWKGbe2yo 08w5I6dL3c4ukwKvWs6dEG26afRsO/VsvG19yKCIUk8JwobqhQ0hHeMYw1Ppqaay3JNU9L tR3N7cdzX3Fr9UpTGk3VOxtrQPUfupP9z+NlQsIQb/gLt3LW9ZyNLOBbDFq03tjvZa8o0q NZOQjS8jDG7UK8d3FjEsA36hSiNO0aJAzU7C4oJ6l9ueP1PWMEmD5pnN1MIt7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dXnZk303Mz1NXY for ; Fri, 19 Dec 2025 12:55:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 35339 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 19 Dec 2025 12:55:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: 2804461adfc6 - main - ntp: Fix buildworld with MK_OPENSSL=no List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2804461adfc670c78c1dcb9cab6b2191c8d486ec Auto-Submitted: auto-generated Date: Fri, 19 Dec 2025 12:55:42 +0000 Message-Id: <69454b4e.35339.7ec756f9@gitrepo.freebsd.org> The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=2804461adfc670c78c1dcb9cab6b2191c8d486ec commit 2804461adfc670c78c1dcb9cab6b2191c8d486ec Author: Cy Schubert AuthorDate: 2025-12-19 04:59:38 +0000 Commit: Cy Schubert CommitDate: 2025-12-19 12:54:11 +0000 ntp: Fix buildworld with MK_OPENSSL=no Reported by: wosch Tested by: wosch MFC after: 1 week --- 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 5801d91aac46..85340a5a9eea 100644 --- a/usr.sbin/ntp/Makefile.inc +++ b/usr.sbin/ntp/Makefile.inc @@ -9,7 +9,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 3d6a1364dd10..6b0ef0b6ae6a 100644 --- a/usr.sbin/ntp/config.h +++ b/usr.sbin/ntp/config.h @@ -1664,7 +1664,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 */