From nobody Mon Jan 5 20:03:02 2026 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 4dlQFy60Rbz6MyVd for ; Mon, 05 Jan 2026 20:03:02 +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 4dlQFy2S5Zz3K0c for ; Mon, 05 Jan 2026 20:03:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767643382; 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=H0YsOavuww9NdUiG3Fe8Jzi3fs1B03XvggDEpZk5HdE=; b=mJClgqd77ZA7rA0jmJbkq6/XZCU+O0rV2xLEVOPHnQ8+bJHaUjAntommnQgYjWeeLHE/nm WqtpSpBNT5F0OLkI9aiWagmfajf0BD2R8GyYWBZzM4eO0aNAm5qFvWKImNOY/UgTeKhcMm DUcNXCJ9GLCsGViBNureZy0y1tDdGUgp3s0DFh2gzBZDEPldVNtTpjioj7BWLPAb+ZmAAR 6HQS0KU/w06tJOxs90OVLrNgphvtJzOB9SBt63iMnriCLze8OdIByWEWJwNOSd1WHi91TG 5OKcdBh5H1L9jq1s/qUrSq3+jrA01iPuXtXpdaQl/rUz4Mk5CnCTZ55MAVTbJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767643382; 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=H0YsOavuww9NdUiG3Fe8Jzi3fs1B03XvggDEpZk5HdE=; b=qCnMxMMc6+XhF9lYKuts8aLuDhSvkjvGigyoYyiheXP1DqPB0+wrTiAu6AWeRYqCtSJAEt 6bfeN/aUC6wgO3AKsBhH6dqYfTgS/fw7ePn7O+OpWPmLy/5eKsIoCl9i9UBP37aSnr/vdJ RkY5ShgFNPZ7lBCTa5g/o2EQXREk8DdAopNnreY8GMrgdByC/ON/BXIfzDkWN93vRwwvTZ 6ehlRt/S+f/38MwJbPhqQnoVhwfFOgk9ZKxdLd9FbmuvMRXYdodkyz5ogYvfKMo3NlMJzy c74vWlNjqx3b7kqaNf6D+qROdLqbWk5yl96qe4RM3kdPImaVa8+WSaVtri+aCA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767643382; a=rsa-sha256; cv=none; b=ZGh/0A+5RwFvTqcvKSBWbjFunVC+fVd7Q6sxNbl42xbjN9CIkUTkww8blOxFs0J1VzY4aF cPhJ5xCRYX+derlRmF0qU9jD8LXiyW+pZGWRcfN9BIZXCpkHhWM5gDc7U/GakaYv8vYm4K yihssSUSuAAktjyp6rJrIZ5+IfuJYEVY4wA8XGEngLLGP5kiMA4epz2C/I/EqOA80zVWrM xC58v1sX+PSXQ6a4jY8IkObuuvOYaVBL9bvI6RdKhi+V1nGsCUnR7vDloCGcyN+GrTC9Y5 utrZh9D+wQCfJ2DSSVv8Wfh68nnLbGGpm/hqrA5EY+m4xB1+P0MxFyZmNr56qQ== 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 4dlQFy1x79zbkY for ; Mon, 05 Jan 2026 20:03:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3fcff by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 05 Jan 2026 20:03:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: 57f1d519e02d - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 57f1d519e02d60c6d50f81aa6098a04a92152ab3 Auto-Submitted: auto-generated Date: Mon, 05 Jan 2026 20:03:02 +0000 Message-Id: <695c18f6.3fcff.5e061cc5@gitrepo.freebsd.org> The branch stable/13 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=57f1d519e02d60c6d50f81aa6098a04a92152ab3 commit 57f1d519e02d60c6d50f81aa6098a04a92152ab3 Author: Cy Schubert AuthorDate: 2025-12-19 04:59:38 +0000 Commit: Cy Schubert 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 */