From nobody Mon Jan 5 20:00:40 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 4dlQCF1S67z6MyWm for ; Mon, 05 Jan 2026 20:00:41 +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 4dlQCD5vLpz3D0v for ; Mon, 05 Jan 2026 20:00:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767643240; 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=7xXscE6Zkd+lTc76c1dDkBOl5Y4v6w2coc9rFeshUXE=; b=R9R5C/HNzk1qLyH0wV9toLK4A8aHs443Gs6JpX4oADpHipOTnfmVUZUoVfuv9lS+iTszQO denF3Bw+p+NJu+qsLbr/FawF5II3FoiA7tsZX0IHuNDIK6rYm6HDm4pg9zxp7pNo3ShsTC 08sg6XolnZbzIbXkAhiKM5G9+bLjy4uGrEBkuVTWj+YA9tXd+VMWsSnI0xPcfGdwVh64W4 moZvyfSHCV0JnbkVl4ventdme+Og1ForMZrXl1OxAy/IoC73RD+1IMUzZmDc2ae30nhIyg N7vz7tC1qY0cwvVBQKOziCY/l/y/8daTQhiMiyJuZHWBM/pe/eV13CLUIbXvJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767643240; 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=7xXscE6Zkd+lTc76c1dDkBOl5Y4v6w2coc9rFeshUXE=; b=n9dxmtsGsTbYioTHjPUj3WrIjjQDhaKomK5U07jgAODiVqWPJ6P6m8Tg1jWD4jfW9FKSlD kCLyQjzBgouJ7SeHXU9KeQoo0YLJjQwxO23YSq9OzsN1sPQxmSKPESpF8G5zxa22fqzOtc GgLb6qzBYxjyRrEQcQonTVCosYNmEXRXgPDaVJ4oPWfbsAAZNatUmBbv1qZeMRFzhylRux O6QJHYvuTblRw5ic5DVmT9NdUuofCurOYHI/1o6rfZoIv/QWAd4xW+Ua3lrTBng6JaPnHJ HU1GdYep1QN4ihcSk91LCRWeqS+ydqzJdGb2CdJt0iza9JfWbAcB7u4kjFSf3g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767643240; a=rsa-sha256; cv=none; b=TAp+LRuZfnU//gAS2GpNFRG/NcUQLvUt22pisdPcx1bIpQCoySQ0LhN+eXaQhEzP1lo65u Jb1c6GRVYj/vUcrd/RJ1av9O71wEe3amS2EIn8sjhRX3eOetizItZcBIpeuN1TMwzVoVLt 74Sc7gCBHrBuuoiM9nJH+0oF/s+iEG3gBowznvdqKVbkXktZDfNWJ4wHRKU7bt8hvcCip0 Rk9b0t/dKL+lCBMcTRrYlGIlG1YCm7AtBiutCBxULbDvVB4VgXuQVFcfVjEji8QGKMPzYM cj/m0H5Xe8KsaKYlso2p+ZGWiYli2kx6uxp6jduqbG6zR34/8qOc88tVGgZylQ== 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 4dlQCD5RY1zZV2 for ; Mon, 05 Jan 2026 20:00:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3fe9b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 05 Jan 2026 20:00:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: a71b64468796 - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: a71b6446879644b9742d6fcb75cb113d09144fd7 Auto-Submitted: auto-generated Date: Mon, 05 Jan 2026 20:00:40 +0000 Message-Id: <695c1868.3fe9b.7866b9d2@gitrepo.freebsd.org> The branch stable/15 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=a71b6446879644b9742d6fcb75cb113d09144fd7 commit a71b6446879644b9742d6fcb75cb113d09144fd7 Author: Cy Schubert AuthorDate: 2025-12-19 04:59:38 +0000 Commit: Cy Schubert CommitDate: 2026-01-05 20:00: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 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 */