From nobody Tue Nov 19 13:58:36 2024 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 4Xt5gc4yFFz5f3Sp; Tue, 19 Nov 2024 13:58:36 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xt5gc41k4z413r; Tue, 19 Nov 2024 13:58:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732024716; 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=vJgIgHtkv7yTq5Nt4NmB5T/pnpJx/kafjk0h/SZX/zQ=; b=HDneFuRuEmx0OU1K5rbqLvEDH/4yCRkdBPvs/hyOUOC27wNl3NQI2n/Z7mBSzk2iseYGRF sohl1fFXh67mlUUVj0v3kUYYOdBg/1vRqURCMC2S/UcSrOOi2QVuaQn+fjsGCuKbpU6P0o SATCk3eAifoN+quldhKHCcJqKG2G+CtiWwbRvXlj3JlA8egHwpyoOu4SIcGbW7dP/Sfspy E6x0mntAg0bdBqEqNZC+h5a07y7NPbpfdUwlJ2V5Jv+HDvKbnH0QRmMfn0zMiR6R8ZxMkq D2NekWxyscw3QdYDuiepISxVlOlITfde2Kzio/Yp3DUxTyVQQmiBSy9NqVPUkw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732024716; 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=vJgIgHtkv7yTq5Nt4NmB5T/pnpJx/kafjk0h/SZX/zQ=; b=wEX8SaxKxbYy+8uY2XKQOmSRcoCTlzgHSc1klDzQ7AWnnBPvoh1ZTdLQPMEB+gwULPHcyX s/eYAZOOI+aH+d0AMLSLoaLLPSIs/MV8fOmKeTlipLYvrDipM5rYyj6DGDuy9flVPUu6mu 8+FaVwYLLoJbk0OnZCb440oaTfoiJLICw7VhzgsoI/R44rhGeH5V43/4zuY1CehqFWdgY4 VMEHDitpLxFc2a2zr/WjH1OnWx9Q3T0ZXmHOP03BRC5ZHZmJJcYmgNl84fz3Ed2u1fEnEO 8TvRno3bGnHEt3QRtolxIkfU74iMaBn+V7s4MBviSTv7fkXMj/LbY7Qg+8tMDw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1732024716; a=rsa-sha256; cv=none; b=rFSg0Y4zFt2e1yqEg9kU49Xz8sBhWwU9Gmbx/rWBeTQlp93yQ8njjhz0aRMbAcQtuCSfMf Cs1UrIcJZdNG05MoE/ZogM/U1lPBr36pX+d4nxtglvKF82XXDtn0LvmG3mwmPw9v19N6Da SdBIlIQncxgN5hkBpxzdf5ogjvxRTpmBrybWSBiM7QwAU5QRrwXnjwzjt2oje9/Mzna76h vG3GjMxoVBOJyLra2koMcPKVMSimaIZcSQ583eyrKUYxnaancAJb3cRdnjQ5JaoNFPdpFK SDdw5BzGd7NMeiIMSH8xWpTM7cyXzQ+HfUZ5GbBCQG+q6fbHLNbRWzpClMj6ag== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Xt5gc3Ncfz1Rsy; Tue, 19 Nov 2024 13:58:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4AJDwaWu072912; Tue, 19 Nov 2024 13:58:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AJDwa10072909; Tue, 19 Nov 2024 13:58:36 GMT (envelope-from git) Date: Tue, 19 Nov 2024 13:58:36 GMT Message-Id: <202411191358.4AJDwa10072909@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 8db85ff95433 - stable/13 - getentropy: Add Git hashes corresponding to SVN references 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 8db85ff95433802935487c0a93b04b8debd3849e Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=8db85ff95433802935487c0a93b04b8debd3849e commit 8db85ff95433802935487c0a93b04b8debd3849e Author: Ed Maste AuthorDate: 2024-11-16 15:18:16 +0000 Commit: Ed Maste CommitDate: 2024-11-19 13:58:26 +0000 getentropy: Add Git hashes corresponding to SVN references getentropy has a comment about a special case to support kernels between SVN revisions r331280 and r337999. Add the corresponding Git hashes so there's a usable reference after Subversion infrastructure disappears. Sponsored by: The FreeBSD Foundation (cherry picked from commit 4ef07eb0802a6353faf79d58719d8008decabae0) (cherry picked from commit d45fb7b612fdab4172b9d348103c46145108810d) --- lib/libc/gen/getentropy.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/libc/gen/getentropy.c b/lib/libc/gen/getentropy.c index 44cb190f0237..10e7a274958f 100644 --- a/lib/libc/gen/getentropy.c +++ b/lib/libc/gen/getentropy.c @@ -125,11 +125,11 @@ getentropy(void *buf, size_t buflen) switch (errno) { case ECAPMODE: /* - * Kernel >= r331280 and < r337999 - * will return ECAPMODE when the - * caller is already in capability - * mode, fallback to traditional - * method in this case. + * Kernel >= r331280 (4948f7bf1153) + * and < r337999 (ed1fa01ac45a) will + * return ECAPMODE when the caller is + * already in capability mode; fallback + * to traditional method in this case. */ have_getrandom = false; continue;