From nobody Mon Jan 5 20:01:31 2026 X-Original-To: dev-commits-src-branches@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 4dlQDD5lVyz6MyFv for ; Mon, 05 Jan 2026 20:01:32 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dlQDD18wNz3Fnh for ; Mon, 05 Jan 2026 20:01:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767643292; 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=UB6herDoheGqrvn2sxudjiJ+nj1NL632ADBSlMgVOng=; b=rQE02ATP1IsId++NUzVeDaFI95HOZ8nRkRXyp2wB28x6TXkM7Ru6CHQQDUCrynIWg28J1H snEYSuc5JMbaxDtr5gu8UdvcIDY+Pg8CHskm8kWFyCzAJ9AT5L/ZsTDFtrMLHvDCyTA/+p 5INpeJInp5EEk//P/t0TLHLthD/k4H/HjGzpJyNwretM77C+28WDRj1hih/BIPeTAxW8d9 WOLfxJTWOWqURQB4WdPUwbsZC376UuTfI7xPLVdPe45apr60xYJpx0sNXJmgT22tKs0O1b oB9LyHtGyGDCyZ5Mqsh9xHfzeUu6qDFmxMXbLuUAzF77Ifu2SXx9KGfAWlqQvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767643292; 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=UB6herDoheGqrvn2sxudjiJ+nj1NL632ADBSlMgVOng=; b=dAI2HqsNQtg5dksvepsZwFiv+wmCnPU+7khw5cBtS78kLLL5+wQQHMj15mwBosH0n9kTfi 1T7wklCgHYKp7wCFn/6lseDPFsoqpaF/Ld6ozQO8nB+dl3laPp9hR6IHGRLCZP0ynH9HUg ucwVT9TZPJG4K6rYNtKan5I/wUipjY304CP7bPb9jktGFzUGPqO1/KpMBheSF9Oz0NHj8V WA8Yr85RzkNimFMlG3WRNZls4ebV02NVapQ5AcTFWlvKUI5sjPiDHBV1tLXxqw+SgY1UGH LvAgTAC3PZuberc2XtKHCXSafvnedjSg0ha70YKLO16UiunKBh5vqYrP0HKX/w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767643292; a=rsa-sha256; cv=none; b=L7hstGbT0kWNIs+tvgciT8kM1kh24zSFlDejGmRRrklya0owazHhRaav/RuHBVsTxWBIHr LvV2ck+pW+qObBoqoZN3STkp5h5LOjsENjGEjfOfpsd0XQAW/55sTlys+d/mTCIJ+TqlYd qtNfCnZa2dhQKWHX8lYwIoWZMaYiHYZ8qnD7SZTRgKnrvjTrw2ARZ+AXk3coAPqA2YkPaV aa66fTOAVMmQo3g/LB1g6vSVJ1cJRzxc4KgUYF8dINJbWAjD14WsNabRymjYibOz/JrGfH c1CQcB3QbzMr0AtgGj0at3vA5P++6/eKaf5zXiDwEWxB2bzNxVF05P/PeIKtYw== 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 4dlQDC6NVBzbS9 for ; Mon, 05 Jan 2026 20:01:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 8590 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 05 Jan 2026 20:01:31 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: 36e77eafb4d3 - stable/14 - ntp: Fix buildworld with MK_OPENSSL=no List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 36e77eafb4d3eba643759d79f6355f682545917d Auto-Submitted: auto-generated Date: Mon, 05 Jan 2026 20:01:31 +0000 Message-Id: <695c189b.8590.5f3df59a@gitrepo.freebsd.org> The branch stable/14 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=36e77eafb4d3eba643759d79f6355f682545917d commit 36e77eafb4d3eba643759d79f6355f682545917d Author: Cy Schubert AuthorDate: 2025-12-19 04:59:38 +0000 Commit: Cy Schubert CommitDate: 2026-01-05 20:01:02 +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 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 */