From nobody Sun Jul 2 01:17:33 2023 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 4Qtrl13fNKz4hPgb; Sun, 2 Jul 2023 01:17:33 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Qtrl12lk8z4BKR; Sun, 2 Jul 2023 01:17:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688260653; 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=uoiioXGqRLY8PtQCziN+2G/vEcT5ii3hPDe0vKrc3Q8=; b=Y6dHMZbv0Ldo9Zp0I2OGB7qwAhNJsX0SuL4iJ8Okz81gACN/zdKZZakkx9fX7LCa5MXnwL VkrphqKYsrzjeSEwxMFByVSoIsETj9crXNT0G01uCWoJyAQjyl/J+gvA/t048EiHzp2rDZ tDPmlYTTMTUe4fz13k3TLpWb1CJNSxtn0zREEhCDb85rNg6nE6jkwptYSau05CUngrUl5o 86OVVKpBxjJGcDAXWPPQ/YeylxoVTLp3XOGsGkI0QL6vLE3Yn7nJoBn0EZ8gEnBM6sigFo lwu9fg1thn+nZenWHDxzsKa3TBuu52U8gjIzOBHqxanKN1+8A7359J5UkI5ISA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688260653; 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=uoiioXGqRLY8PtQCziN+2G/vEcT5ii3hPDe0vKrc3Q8=; b=i6pasiOPZFLrc3sqBialn2iyy3KiW7BypDZTXnUENgrHD5Mb/kGBuZ4mG9+tvjh7YiCcnW c77d9nrbVzw38tDytzL14D5YpdC6iunz6Qn8WVB/w3Dz7bbiypVwH0KWWwQYxjK4uKV69f nMnLFvSSZSAj5V+ZtCyhWzrIqZNYOXBC74TI3rHbD5pGUBykcqo9qXjjaYhntpUSQ9nlJj PNVrwRubdFNmdN60yLK/M+IL1dRHCedL5bR2m4vB+29N5EtMP4u1om8c/AqejOTiU5o5DC NHqrjIF4L53pXBJ53fwD6K1Hd1QI2wI0+p5aZd0lApMeWpVpE4Int81XomdYDQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688260653; a=rsa-sha256; cv=none; b=LzkCoi3aJmofj6uSqbcbREmfMUEHfGoim5bLNY3yazAo35risZ5mhNsT+UzeSDmoq9KaIv XWTDvqgmyglk8dhoevumfnxkah3hDuJMuUHfnGw9fKQrx6vNTzvSbmcd9pmJR/OL4Q4eaX qAz8cUqb25sYyy4823utTCX2CvD1woHTOHZBLmMINJMU6Wf98s4TXSKiIJXBRy9koHFBoo UbaGlpyuqJ8HblvEI6ztYH25BB/Kw+twvoW5EL+rHw3F3zcmBSbs36odvkgzJlq2RtRlJD Jg2ma+9AQ/r+eTPT6QPWx2AkNCxz+A78S9t1VI/+wog0UmmjTbQCjpELtzwsAA== 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 4Qtrl11qFmznhp; Sun, 2 Jul 2023 01:17:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3621HX6x048094; Sun, 2 Jul 2023 01:17:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3621HXte048093; Sun, 2 Jul 2023 01:17:33 GMT (envelope-from git) Date: Sun, 2 Jul 2023 01:17:33 GMT Message-Id: <202307020117.3621HXte048093@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: e3fbeb1dd0c5 - stable/13 - libc.a: implement _rtld_addr_phdr() 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e3fbeb1dd0c5b19efad5a90838a42df1775103a4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=e3fbeb1dd0c5b19efad5a90838a42df1775103a4 commit e3fbeb1dd0c5b19efad5a90838a42df1775103a4 Author: Konstantin Belousov AuthorDate: 2023-06-24 10:59:56 +0000 Commit: Konstantin Belousov CommitDate: 2023-07-02 01:16:50 +0000 libc.a: implement _rtld_addr_phdr() (cherry picked from commit 42ceab3ea1a997db93b65404be0ee4b17b5382d7) --- lib/libc/gen/dlfcn.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/lib/libc/gen/dlfcn.c b/lib/libc/gen/dlfcn.c index 337ad48fd691..52e93d1476d7 100644 --- a/lib/libc/gen/dlfcn.c +++ b/lib/libc/gen/dlfcn.c @@ -40,6 +40,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include "namespace.h" #include #include "un-namespace.h" @@ -248,13 +249,48 @@ _rtld_atfork_post(int *locks __unused) { } +#ifndef IN_LIBDL +struct _rtld_addr_phdr_cb_data { + const void *addr; + struct dl_phdr_info *dli; +}; + +static int +_rtld_addr_phdr_cb(struct dl_phdr_info *dli, size_t sz, void *arg) +{ + struct _rtld_addr_phdr_cb_data *rd; + const Elf_Phdr *ph; + unsigned i; + + rd = arg; + for (i = 0; i < dli->dlpi_phnum; i++) { + ph = &dli->dlpi_phdr[i]; + if (ph->p_type == PT_LOAD && + dli->dlpi_addr + ph->p_vaddr <= (uintptr_t)rd->addr && + (uintptr_t)rd->addr < dli->dlpi_addr + ph->p_vaddr + + ph->p_memsz) { + memcpy(rd->dli, dli, sz); + return (1); + } + } + return (0); +} +#endif + #pragma weak _rtld_addr_phdr int _rtld_addr_phdr(const void *addr __unused, struct dl_phdr_info *phdr_info_a __unused) { +#ifndef IN_LIBDL + struct _rtld_addr_phdr_cb_data rd; + rd.addr = addr; + rd.dli = phdr_info_a; + return (dl_iterate_phdr(_rtld_addr_phdr_cb, &rd)); +#else return (0); +#endif } #pragma weak _rtld_get_stack_prot From nobody Sun Jul 2 01:26:08 2023 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 4Qtrww6qM6z4hVkh; Sun, 2 Jul 2023 01:26:08 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Qtrww6MY0z4G0n; Sun, 2 Jul 2023 01:26:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688261168; 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=iMGIbmhxxso4gSWZbiXA2X7s1e7ASTzFS2kLudy04C0=; b=CGfhluZzqIVUezmuRkfK3yS117rzM/7NQq4jXyuYP7K5KwoQ6sfQKa0UTx9L4QLJSLLQVb erilqNjqLIK9mBqzEPAqHAZLn0WGvBql0MsBYWYRoBHsrjXs9E3RUPBN27t1UXSrad1t5l BdgMxbz0H06trS+ENhdeITKXBqEKp4E/pGf9IVs0Scpp8pyeYTEzYylEnF4pGbfkB9bhun Cxv319oCR668W1du5kjtD+z4Xxr2GTKabJyZT9stMNeg41V9urs5r0eGz4cEuIB1RmMI9s ADt6Tupg2zFTO+28c+5pKtyEpQxCAYUj6KGA7TXPD5zHKht3rOm1QVVY4zZX3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688261168; 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=iMGIbmhxxso4gSWZbiXA2X7s1e7ASTzFS2kLudy04C0=; b=ZDa/KMmb7mxeMB32AnnVUeF3MeqGlILlbR+CBANs0J4XHyLgzSqKYhcAKdYCrpd274oqPZ RsBIiQN/EohrnYVJTFLyo0eeimzCUuA0+86KxrjCYNJF/ktphqg/lf3v5HA+6dD/9KiMvt p90JU+N66YKA8PfxppPbABroiXxLpTWld1D98Zk+oAoEOv0bKZI4XWltPD8pdrgB+PZ+8U unFRuSVK38e9kzJ9addbtSy6MbPapDiTK4cNgrwxMdvVZrXdKwR42a04AQtQVEy2eOGmWl W/ETg/0H6/B1yB0hXm5V7Ne6m0yyxXSxvCa10oHmJsqtMuqH1+Qqb+agLS94Mw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688261168; a=rsa-sha256; cv=none; b=DS8DUlPKhu6D0t3X/1bMaFbVMtskIEN5tf/+ufsZw3sD36JmOj7uK471uIqupnr3toHi3N if6kc463Fy0S1yyVTbFajrHsYX5ecyzJpK6tpOXC5lYdEbNQgytALnccThwdmvRqI+K3QN uQD0hNy9NRcDeNKhhmETYCnkqL3XztjlDfgW3Gz0I+nuzGRrowDX5ETSg3atRQ4TEk2s8R saMaqOVYL2yrcwIwmgB6TnW7Q6xdHWnV3PN+PvEjHr2p9EnSHdDdOmywCXEVrLwIMFiooC 9MLSsYvBjvY1swYNXMKQy1pBv6wK5y1slQdCArne+56wpmh2VzoGxtxy0YEHjQ== 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 4Qtrww5PqPzpS0; Sun, 2 Jul 2023 01:26:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3621Q8d9064886; Sun, 2 Jul 2023 01:26:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3621Q8xa064885; Sun, 2 Jul 2023 01:26:08 GMT (envelope-from git) Date: Sun, 2 Jul 2023 01:26:08 GMT Message-Id: <202307020126.3621Q8xa064885@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: d2ee65f43d03 - stable/13 - mount_nfs.8: Note a case where the "nconnect" option does not work 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d2ee65f43d03f144b1bd22fa41748523c981db8e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=d2ee65f43d03f144b1bd22fa41748523c981db8e commit d2ee65f43d03f144b1bd22fa41748523c981db8e Author: Rick Macklem AuthorDate: 2023-06-18 20:02:20 +0000 Commit: Rick Macklem CommitDate: 2023-07-02 01:24:51 +0000 mount_nfs.8: Note a case where the "nconnect" option does not work The "nconnect" NFS mount option will not work correctly for servers where the TCP connections might connect to different NFS clusters that do not share NFSv4.1/4.2 state information, such as file locks. This patch adds a sentence to the "nconnect" section of mount_nfs.8 noting this case. This is a content change. (cherry picked from commit 7e53f16baa3a02118f40c50587efde0338b5053e) --- sbin/mount_nfs/mount_nfs.8 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sbin/mount_nfs/mount_nfs.8 b/sbin/mount_nfs/mount_nfs.8 index 4f4b8891f67a..319e3bc2638d 100644 --- a/sbin/mount_nfs/mount_nfs.8 +++ b/sbin/mount_nfs/mount_nfs.8 @@ -28,7 +28,7 @@ .\" @(#)mount_nfs.8 8.3 (Berkeley) 3/29/95 .\" $FreeBSD$ .\" -.Dd April 3, 2023 +.Dd June 14, 2023 .Dt MOUNT_NFS 8 .Os .Sh NAME @@ -231,6 +231,9 @@ This option will result in more IP port#s being used. This option requires the .Cm nfsv4 option. +Note that for NFS servers such as AmazonEFS, where each new TCP +connection can connect to a different cluster that maintains lock +state separately, this option cannot be used. .It Cm nfsv2 Use the NFS Version 2 protocol (the default is to try version 3 first then version 2). From nobody Mon Jul 3 15:14:55 2023 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 4QvqGm1r52z4lDRC; Mon, 3 Jul 2023 15:14:56 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QvqGm18JVz44pK; Mon, 3 Jul 2023 15:14:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688397296; 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=fQJHjnDxIAD/lodPRoO6G3TZZyk0OCcxIb5ZdKSMOGc=; b=hWxVi7wYVdibxvbxoz+vAUvdEvkaW4SoZ3YOv9FUgLGwSEaPbzeBgYgbulkfn3VWZUxITp ImqjyleXcgtN4vvtWzR5TwIBNbbMCnOrrTk+AGO2VstHmirBfpXr8oNwTn5G9EjdvUYK/S QGMMWJkmz7xpWNQPzMhvz8pcBsAVzlPr0vOiXF4P3cNah4zaDnrkfllJvRZWPNN5q9RhhR QhpGkd92HdCqFFs0JEKMvM8AX3VjU/OiCBASLx9TRQ4YRxVyyhCNKm/tkuVie3jv5bDVqo PjEBH63wbv2EzYbw1FZ8kfm1NlQA6uP6wYuhTCySIefBmPtM/6Sl4LzVq0n6Xg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688397296; 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=fQJHjnDxIAD/lodPRoO6G3TZZyk0OCcxIb5ZdKSMOGc=; b=yJcCPsBGFPGVsDO5N2vCnYYRNAIqEV3ZYzJYo7U3S2A0XZPA2UIud80gaFeqyzwLtF5c/o gygPnzh4sVX4RnNR2AFY35pVTNkVveewqHSqlmQO6vAchjnJyH9V1YWpVv0w5rsRZU2tNZ IOhCd+nc+d1MWeA563yikvz1rqw5PPevU5mUupcTBarkT0l9jitk31KulZDwgCYMCOFs8a gmuh765B1AEvmyAqyCN5T3GrMRkK23ML8YRNRuHVlnmam7rvlfGTjjpzGUuIDqvnWlK9u6 wjUfiKGBYn32y83OFseKnfk2w0k+lZubc35+sHZ9XMAdLuaFJCkR32kBrVIQDg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688397296; a=rsa-sha256; cv=none; b=t7aBl0zpNGFhEOzxZvojoNzw1vJphpHiB2FpaBEOl418xYlu3skUGimhceU3by2XbNcyrh rK0qt/AxhkYNIBTukLrWs+zthl0QaiDjpKW+NwSvYwWMyZ74b3FlgvOCHsAuqGBHudDaJw gmVdK8rg4X6hPHJWwvsbc6tv/ancxPZV6p308GyWf83xaHfy9g0rtcgD6GThOkfIfpfu7J ctWFtjURNzUsOwf/MNjMvU1cuGZINEQNyk1NT2zZ15b3dLWf5QcuvU/1La393RMeDUDOMl 1zipKn2y5wCZ09EjAsXqaIbWM+PY0tAVQhDQyp8EtN/+/sKqa9oqeYn1OuQctg== 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 4QvqGm0BlwzvKC; Mon, 3 Jul 2023 15:14:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 363FEtIn017852; Mon, 3 Jul 2023 15:14:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 363FEtrp017851; Mon, 3 Jul 2023 15:14:55 GMT (envelope-from git) Date: Mon, 3 Jul 2023 15:14:55 GMT Message-Id: <202307031514.363FEtrp017851@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: =?utf-8?Q?Dag-Erling=20Sm=C3=B8rgrav?= Subject: git: 77d9e708c07b - stable/13 - asa: Error out if writing to stdout failed. 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 77d9e708c07b7bbbebc8e729f8fb339fb99c2d99 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=77d9e708c07b7bbbebc8e729f8fb339fb99c2d99 commit 77d9e708c07b7bbbebc8e729f8fb339fb99c2d99 Author: Dag-Erling Smørgrav AuthorDate: 2023-06-15 19:23:19 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-07-03 15:13:11 +0000 asa: Error out if writing to stdout failed. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D40562 (cherry picked from commit 9e379f9639d51442ad1d5e1800c687ef2c954901) asa: Read from stdin if *argv is "-". MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D40563 (cherry picked from commit f08f90e6987775f88d25efbd8762c361819f40ba) asa: Add some unit tests. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D40564 (cherry picked from commit b7412da2e122d9274341ef840c6918409bc523b3) --- etc/mtree/BSD.tests.dist | 2 + usr.bin/asa/Makefile | 5 ++- usr.bin/asa/asa.c | 25 ++++++++--- usr.bin/asa/tests/Makefile | 4 ++ usr.bin/asa/tests/asa_test.sh | 99 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 126 insertions(+), 9 deletions(-) diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist index eb62812bfcd8..35d8e9505b9a 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -886,6 +886,8 @@ usr.bin apply .. + asa + .. awk .. basename diff --git a/usr.bin/asa/Makefile b/usr.bin/asa/Makefile index c2a221ae027b..a29db0f31781 100644 --- a/usr.bin/asa/Makefile +++ b/usr.bin/asa/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.2 1995/03/25 18:04:51 glass Exp $ -# $FreeBSD$ +.include PROG= asa +HAS_TESTS= +SUBDIR.${MK_TESTS}= tests .include diff --git a/usr.bin/asa/asa.c b/usr.bin/asa/asa.c index 22174ed340cd..a6c3d7d7c1e5 100644 --- a/usr.bin/asa/asa.c +++ b/usr.bin/asa/asa.c @@ -43,6 +43,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include static void asa(FILE *); @@ -71,16 +72,23 @@ main(int argc, char *argv[]) asa(stdin); else { while ((fn = *argv++) != NULL) { - if ((fp = fopen(fn, "r")) == NULL) { - warn("%s", fn); - exval = 1; - continue; - } - asa(fp); - fclose(fp); + if (strcmp(fn, "-") == 0) { + asa(stdin); + } else { + if ((fp = fopen(fn, "r")) == NULL) { + warn("%s", fn); + exval = 1; + continue; + } + asa(fp); + fclose(fp); + } } } + if (fflush(stdout) != 0) + err(1, "stdout"); + exit(exval); } @@ -140,4 +148,7 @@ asa(FILE *f) putchar('\n'); } + + if (ferror(stdout) != 0) + err(1, "stdout"); } diff --git a/usr.bin/asa/tests/Makefile b/usr.bin/asa/tests/Makefile new file mode 100644 index 000000000000..c8c0cde1b3a2 --- /dev/null +++ b/usr.bin/asa/tests/Makefile @@ -0,0 +1,4 @@ +PACKAGE= tests +ATF_TESTS_SH= asa_test + +.include diff --git a/usr.bin/asa/tests/asa_test.sh b/usr.bin/asa/tests/asa_test.sh new file mode 100644 index 000000000000..429342d530e4 --- /dev/null +++ b/usr.bin/asa/tests/asa_test.sh @@ -0,0 +1,99 @@ +# +# Copyright (c) 2023 Klara, Inc. +# +# SPDX-License-Identifier: BSD-2-Clause +# + +a="The magic words are" +b="Squeamish Ossifrage" + +atf_check_asa() { + atf_check -o file:"$2" asa "$1" + atf_check -o file:"$2" asa <"$1" + atf_check -o file:"$2" asa - <"$1" +} + +atf_test_case space +space_head() { + atf_set descr "First character on line is ' '" +} +space_body() { + printf " %s\n %s\n" "$a" "$b" >infile + printf "%s\n%s\n" "$a" "$b" >outfile + atf_check_asa infile outfile +} + +atf_test_case zero +zero_head() { + atf_set descr "First character on line is '0'" +} +zero_body() { + printf " %s\n0%s\n" "$a" "$b" >infile + printf "%s\n\n%s\n" "$a" "$b" >outfile + atf_check_asa infile outfile +} + +atf_test_case one +one_head() { + atf_set descr "First character on line is '1'" +} +one_body() { + printf " %s\n1%s\n" "$a" "$b" >infile + printf "%s\f%s\n" "$a" "$b" >outfile + atf_check_asa infile outfile +} + +atf_test_case plus +plus_head() { + atf_set descr "First character on line is '+'" +} +plus_body() { + printf " %s\n+%s\n" "$a" "$b" >infile + printf "%s\r%s\n" "$a" "$b" >outfile + atf_check_asa infile outfile +} + +atf_test_case plus_top +plus_top_head() { + atf_set descr "First character in input is '+'" +} +plus_top_body() { + printf "+%s\n+%s\n" "$a" "$b" >infile + printf "%s\r%s\n" "$a" "$b" >outfile + atf_check_asa infile outfile +} + +atf_test_case stdout +stdout_head() { + atf_set descr "Failure to write to stdout" +} +stdout_body() { + ( + trap "" PIPE + echo " $a $b" | asa 2>stderr + echo $? >result + ) | true + atf_check -o inline:"1\n" cat result + atf_check -o match:"stdout" cat stderr +} + +atf_test_case dashdash +dashdash_head() { + atf_set descr "Use -- to end options" +} +dashdash_body() { + echo " $a $b" >-infile + atf_check -s not-exit:0 -e match:"illegal option" asa -infile + atf_check -o inline:"$a $b\n" asa -- -infile +} + +atf_init_test_cases() +{ + atf_add_test_case space + atf_add_test_case zero + atf_add_test_case one + atf_add_test_case plus + atf_add_test_case plus_top + atf_add_test_case stdout + atf_add_test_case dashdash +} From nobody Mon Jul 3 15:14:57 2023 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 4QvqGn2bqgz4lDW9; Mon, 3 Jul 2023 15:14:57 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QvqGn21lgz44vw; Mon, 3 Jul 2023 15:14:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688397297; 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=V3LNAFJLsgWsNLKsqN8QT9rAhvU9awWePHAzd2CS3pg=; b=b0YNvPTjl8AIKbOTckVD4w2X7n8Zj+O2tS1DpEGXKU+L14UxiztvdqjzVgKSRjygSLfnqA WDEo7ar9ORIRU6EK8bFSCnT5RF0aSTlTGZS8o7FprlIpwCCeqU5mq9poQoG2CwGOnt5Aqv 8khWfPsPJI0J1htFL1GwDF1CnP5lBROFof/ShU4B0+OgL9tKddL+qvN5w3N+daQc5qTzJW dG292+quJdcixdSd+g4g5PeYc629Nq3zeP9eSI+FBZ2L2UnrYpre6haB/ZlVVZCcwa50FI T3t7JSooINUgGXJqk+/2mZnVCV8ZXtO7pT4B9Be5QIvWXG7BNS4N2bERFiWZOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688397297; 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=V3LNAFJLsgWsNLKsqN8QT9rAhvU9awWePHAzd2CS3pg=; b=vGdAarJEUEhWu2EJe2etcJDLXktTjd6ghrY/oOipa/pWD8TvsjG+T+vSq6qgJGiCGhAAGr v8LVT8EQFeK+381EdvbIzAhpL7bKRxn19yLharcAbIyu5KK7QSuApgxVMp701sW1Sp1nO/ LveLgd75hZUVpZ7YFUb3O7R4d3W6bqyrPFegOSLpH/mZ3jR6j70iEP9Qg0bXbXsm96K1Bn komrME2O/CAP7N0p7EbjTVAFvscpXKakScafuEV5+4gOodNSHvFunn1JX8DXKAuva8MSJ7 /PqqlaFPQ1JoRSCVqgXYutyi6ve/JIaj0a3Pl0Oq31+McHl7XE+pzWjALgpbtg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688397297; a=rsa-sha256; cv=none; b=r9Yn853aKY9eRflMxAk56xwr9bBZN8DoMe34h/21nN5UF5IZIvZx1Oxz+P0NK8nJz5wVvi sr13pDeL5hvSqeJ4C16bQbGrv2GkLY4qvLCt6dxHFUuZcskS1Sz8PNq5N00AaW+RA18w3T /QBFPWWR7aPTqOvMGuaG7MMoc77a5CIs3rxxUieWZ2qS8Dk3HqkjtzHtWKOouuN94d1L/y QlmpISrwBbyB7xl+WVAQOQ2t+YgorQhI+STZaZkvYK9EdLIHPKWeYwXDyycTEc5+GvKjkO 16rcVUMZ7OP8diJ7Q0O/pOKATya9s7zbU/2r+VlzvjgbwCJQGI+cjMbgj/AulQ== 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 4QvqGn14wFzvM0; Mon, 3 Jul 2023 15:14:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 363FEvEf017892; Mon, 3 Jul 2023 15:14:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 363FEv6P017891; Mon, 3 Jul 2023 15:14:57 GMT (envelope-from git) Date: Mon, 3 Jul 2023 15:14:57 GMT Message-Id: <202307031514.363FEv6P017891@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: =?utf-8?Q?Dag-Erling=20Sm=C3=B8rgrav?= Subject: git: 2c1f52c11f17 - stable/13 - m4: Support long options. 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 2c1f52c11f175c8da3e6c59e967d9807dfbc28b7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=2c1f52c11f175c8da3e6c59e967d9807dfbc28b7 commit 2c1f52c11f175c8da3e6c59e967d9807dfbc28b7 Author: Dag-Erling Smørgrav AuthorDate: 2023-06-21 20:58:40 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-07-03 15:13:11 +0000 m4: Support long options. The option names are identical to those of the equivalent options in GNU m4, except of course for --gnu which does not exist in GNU m4. While here, make the argument to -d / --debug optional, with the same default behavior as in GNU m4, and document it properly. Sponsored by: Klara, Inc. Reviewed by: kevans, imp Differential Revision: https://reviews.freebsd.org/D40694 (cherry picked from commit 47b32f8f93b46ce2c7fe3973c331a40096b529da) m4: Add -G option which reverses -g. This matches GNU m4's -G / --traditional option, and although BSD m4 in non-GNU mode is not exactly identical to GNU mode in traditional mode, it's close enough. Sponsored by: Klara, Inc. Reviewed by: kevans, imp Differential Revision: https://reviews.freebsd.org/D40697 (cherry picked from commit 6c9ed64c94f192eda8c8b5e9e2b92ff93da36de2) m4: Miscellaneous man page fixes. Sponsored by: Klara, Inc. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D40701 (cherry picked from commit db4c5b8a05bbd54a00dad145a91902d71c1f92a1) Fix spelling of "behavior" to be consistent with the rest of the file (cherry picked from commit 764464af49688e74fd6d803df0404ca4726dd460) --- usr.bin/m4/m4.1 | 70 +++++++++++++++++++++++++++++++++++++------------------ usr.bin/m4/main.c | 24 +++++++++++++++++-- 2 files changed, 69 insertions(+), 25 deletions(-) diff --git a/usr.bin/m4/m4.1 b/usr.bin/m4/m4.1 index 83f124dd3dfc..ffc60af22d30 100644 --- a/usr.bin/m4/m4.1 +++ b/usr.bin/m4/m4.1 @@ -33,7 +33,7 @@ .\" .\" $FreeBSD$ .\" -.Dd April 8, 2021 +.Dd June 21, 2023 .Dt M4 1 .Os .Sh NAME @@ -41,13 +41,13 @@ .Nd macro language processor .Sh SYNOPSIS .Nm -.Op Fl EgPs +.Op Fl EGgPs .Oo .Sm off .Fl D Ar name Op No = Ar value .Sm on .Oc -.Op Fl d Ar flags +.Op Fl d Oo Oo +- Oc Ns Ar flags Oc .Op Fl I Ar dirname .Op Fl o Ar filename .Op Fl t Ar macro @@ -98,15 +98,14 @@ recognized as special when not followed by an open parenthesis. .Pp The options are as follows: .Bl -tag -width Ds -.It Fl D Ns Ar name Ns Op = Ns Ar value +.It Fl D Ns Ar name Ns Oo = Ns Ar value Oc , Fl -define Ns = Ns Ar name Ns Oo = Ns Ar value Oc Define the symbol .Ar name to have some value (or .Dv NULL ) . -.It Fl d Ar "flags" -Set trace flags. -.Ar flags -may hold the following: +.It Fl d Oo Oo +|- Oc Ns Ar flags Oc , Fl -debug Ns = Ns Oo Oo +|- Oc Ns Ar flags Oc +Set or unset trace flags. +The trace flags are as follows: .Bl -tag -width Ds .It Ar a print macro arguments. @@ -128,9 +127,21 @@ number macro expansions. turn on all options. .El .Pp +If +.Qq + +or +.Qq - +is used, the specified flags are added to or removed from the set of +active trace flags, respectively; otherwise, the specified flags +replace the set of active trace flags. +.Pp +Specifying this option without an argument is equivalent to specifying +it with the argument +.Qq aeq . +.Pp By default, trace is set to .Qq eq . -.It Fl E +.It Fl E , Fl -fatal-warnings Set warnings to be fatal. When a single .Fl E @@ -144,38 +155,51 @@ flags are specified, execution will halt upon issuing the first warning and .Nm will exit with a non-zero exit status. -This behaviour matches GNU-m4 1.4.9 and later. -.It Fl g -Activate GNU-m4 compatibility mode. -In this mode, translit handles simple character -ranges (e.g., a-z), regular expressions mimic emacs behavior, -multiple m4wrap calls are handled as a stack, +This behavior matches GNU m4 1.4.9 and later. +.It Fl G , Fl -traditional +Disable GNU compatibility mode (see +.Fl g +below). +.It Fl g , Fl -gnu +Enable GNU compatibility mode. +In this mode, +.Ic translit +handles simple character ranges (e.g., +.Sq a-z ) , +regular expressions mimic Emacs behavior, +multiple +.Ic m4wrap +calls are handled as a stack, the number of diversions is unlimited, empty names for macro definitions are allowed, -and eval understands +.Ic undivert +can be used to include files, +and +.Ic eval +understands .Sq 0rbase:value numbers. -.It Fl I Ar "dirname" +.It Fl I Ar dirname , Fl -include Ns = Ns Ar dirname Add directory .Ar dirname to the include path. -.It Fl o Ar filename +.It Fl o Ar filename , Fl -error-output Ns = Ns Ar filename Send trace output to .Ar filename . -.It Fl P +.It Fl P , Fl -prefix-builtins Prefix all built-in macros with .Sq m4_ . For example, instead of writing .Ic define , use .Ic m4_define . -.It Fl s +.It Fl s , Fl -synclines Output line synchronization directives, suitable for .Xr cpp 1 . -.It Fl t Ar macro +.It Fl t Ar macro , Fl -trace Ns = Ns Ar macro Turn tracing on for .Ar macro . -.It Fl "U" Ns Ar "name" +.It Fl U Ns Ar name , Fl -undefine Ns = Ns Ar name Undefine the symbol .Ar name . .El @@ -474,7 +498,7 @@ utility is compliant with the specification. .Pp The flags -.Op Fl dEgIPot +.Op Fl dEGgIPot and the macros .Ic builtin , .Ic esyscmd , diff --git a/usr.bin/m4/main.c b/usr.bin/m4/main.c index 292dc5eb3f76..f776ca8594e4 100644 --- a/usr.bin/m4/main.c +++ b/usr.bin/m4/main.c @@ -47,6 +47,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -60,6 +61,22 @@ __FBSDID("$FreeBSD$"); #include "extern.h" #include "pathnames.h" +static const char *shortopts = "+D:d::EGgI:o:Pst:U:"; +static const struct option longopts[] = { + { "define", required_argument, NULL, 'D' }, + { "debug", optional_argument, NULL, 'd' }, + { "fatal-warnings", no_argument, NULL, 'E' }, + { "traditional", no_argument, NULL, 'G' }, + { "gnu", no_argument, NULL, 'g' }, + { "include", required_argument, NULL, 'I' }, + { "error-output", required_argument, NULL, 'o' }, + { "prefix-builtins", no_argument, NULL, 'P' }, + { "synclines", no_argument, NULL, 's' }, + { "trace", required_argument, NULL, 't' }, + { "undefine", required_argument, NULL, 'U' }, + { NULL, 0, NULL, 0 }, +}; + stae *mstack; /* stack of m4 machine */ char *sstack; /* shadow stack, for string space extension */ static size_t STACKMAX; /* current maximum size of stack */ @@ -188,7 +205,7 @@ main(int argc, char *argv[]) outfile = NULL; resizedivs(MAXOUT); - while ((c = getopt(argc, argv, "gst:d:D:EU:o:I:P")) != -1) + while ((c = getopt_long(argc, argv, shortopts, longopts, NULL)) != -1) switch(c) { case 'D': /* define something..*/ @@ -214,11 +231,14 @@ main(int argc, char *argv[]) case 'U': /* undefine... */ macro_popdef(optarg); break; + case 'G': + mimic_gnu = 0; + break; case 'g': mimic_gnu = 1; break; case 'd': - set_trace_flags(optarg); + set_trace_flags(optarg ? optarg : "aeq"); break; case 's': synch_lines = 1; From nobody Mon Jul 3 15:14:58 2023 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 4QvqGp5rktz4lDWG; Mon, 3 Jul 2023 15:14:58 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QvqGp5BZqz4519; Mon, 3 Jul 2023 15:14:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688397298; 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=GhUn9Vpk/58joqzV9c8osLE42rDxdwxhpiV0gdH0tbc=; b=XoimvH6nwusjN+dietx8zXvCW9fNOVL3srIV2/6JPdo8yFOWySjSmh1fAFcUjTJ4pVjPBH KyxPeYtUZpXkZhC1GCrRODGCmTfnPd5v2CqLPdifMmTWZUF8Wplq0CrGT10HJMrT/z/HLR jYvNvCciPaRVGkjBxesMhM8s2Muue6J/Ci4TAwhCO7YyY810VYMVwAc41ddZMvMjUBJmhf tioLcL1hpfejT7aOXPdOd2DJokjW1OzILAjjdmrygwGbPEIRJjcrts3LNNMqRfHEanB5Yh PKiugP3UPvB0BWTi6fAjOGu3MaEucgCUx0JYg4ZfBXzGnCbm2QXlo1oxuW1dfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688397298; 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=GhUn9Vpk/58joqzV9c8osLE42rDxdwxhpiV0gdH0tbc=; b=mnFiLdoRAgTH8UqrG6NlvJyu5Q0qtlonOyjHmzDVxO3GnjzL9MXJaIn3FNeHxOLh8f0yrZ sSndtLeToPXiveRymPUH+CLKR7HhxXJq4yNErQTGN41CKvLnPo+jTGvnASdD39OGJ0s7Nh srbqraHA/UySXkfVw3lFoopLz4zXMs4NEJSIqfApS4KGQvNxgZPzuMmu0Nd0Llo7jQeZBC 7JoIIKqZsYu+KT5pUCGCaVtUyA1FNZHUJQkj4SX2nnXHILzHNcevBtvu93W7/chTmpZ+dW ceFZvQ9uel8AU4LDy1vS9jDQ65qGMI9DZyh5bIldNOsELmGxzqzegyneAafPCQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688397298; a=rsa-sha256; cv=none; b=dX2gcDDJC6EEJYeyoBj74H0IHevauFN55BN6Qs+pauoM6XtwiUAyPDtSZ8zbiMQoIkujX5 OuP81tGoHEGi33vK3yR1rxdTefRl3nbX88txht7aQhvf8s2A4reRB0VEruhNzIJc9T1+8n 0IrIJfUI2q3Pp52lfl7V49y+x+mgDAkJaVA0QDSEoRHu/szpNiYTsuSUmIb+m4stZoeyS4 jhWElNimNnVO1eDIAh7IAwehUUcaaVgVoQd7KWQLKd2fG5cDn3Nf40V3HohwPyeoY4fQHc kq9Ue4j5/+7kkMn1msTOvYT0IzejDqqHcdkTeTSvv5eMpQr+c6V02ByS/ExbLw== 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 4QvqGp4FW8zvGP; Mon, 3 Jul 2023 15:14:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 363FEwXx017955; Mon, 3 Jul 2023 15:14:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 363FEwf3017953; Mon, 3 Jul 2023 15:14:58 GMT (envelope-from git) Date: Mon, 3 Jul 2023 15:14:58 GMT Message-Id: <202307031514.363FEwf3017953@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: =?utf-8?Q?Dag-Erling=20Sm=C3=B8rgrav?= Subject: git: a86b5f4f063e - stable/13 - Upgrade to OpenPAM Ximenia. 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a86b5f4f063e146597ee1f851c279d772d09afe9 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=a86b5f4f063e146597ee1f851c279d772d09afe9 commit a86b5f4f063e146597ee1f851c279d772d09afe9 Author: Dag-Erling Smørgrav AuthorDate: 2023-06-27 17:03:17 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-07-03 15:13:11 +0000 Upgrade to OpenPAM Ximenia. Merge commit '5894a4142a9d5ae5f7f6bee1f46237a3d20d0b5b' (cherry picked from commit 3ba4c8c81a28de3e00ccf6d7f92c6f8e58bef456) --- contrib/openpam/CREDITS | 1 + contrib/openpam/HISTORY | 11 + contrib/openpam/LICENSE | 2 +- contrib/openpam/Makefile.am | 31 +- contrib/openpam/Makefile.in | 99 +- contrib/openpam/RELNOTES | 4 +- contrib/openpam/aclocal.m4 | 119 +- contrib/openpam/autogen.sh | 3 - contrib/openpam/bin/Makefile.am | 2 - contrib/openpam/bin/Makefile.in | 29 +- .../openpam/bin/openpam_dump_policy/Makefile.am | 2 - .../openpam/bin/openpam_dump_policy/Makefile.in | 29 +- .../bin/openpam_dump_policy/openpam_dump_policy.c | 2 - contrib/openpam/bin/pamtest/Makefile.am | 2 - contrib/openpam/bin/pamtest/Makefile.in | 29 +- contrib/openpam/bin/pamtest/pamtest.1 | 4 +- contrib/openpam/bin/pamtest/pamtest.c | 2 - contrib/openpam/bin/su/Makefile.am | 2 - contrib/openpam/bin/su/Makefile.in | 29 +- contrib/openpam/bin/su/su.1 | 4 +- contrib/openpam/bin/su/su.c | 2 - contrib/openpam/compile | 6 +- contrib/openpam/config.guess | 747 +- contrib/openpam/config.h.in | 114 +- contrib/openpam/config.sub | 1674 +- contrib/openpam/configure | 23391 +++++++++++-------- contrib/openpam/configure.ac | 55 +- contrib/openpam/depcomp | 2 +- contrib/openpam/doc/Makefile.am | 2 - contrib/openpam/doc/Makefile.in | 29 +- contrib/openpam/doc/man/Makefile.am | 2 - contrib/openpam/doc/man/Makefile.in | 27 +- contrib/openpam/doc/man/openpam.3 | 5 +- contrib/openpam/doc/man/openpam.man | 3 - contrib/openpam/doc/man/openpam_borrow_cred.3 | 3 +- contrib/openpam/doc/man/openpam_free_data.3 | 3 +- contrib/openpam/doc/man/openpam_free_envlist.3 | 3 +- contrib/openpam/doc/man/openpam_get_feature.3 | 3 +- contrib/openpam/doc/man/openpam_get_option.3 | 3 +- contrib/openpam/doc/man/openpam_log.3 | 3 +- contrib/openpam/doc/man/openpam_nullconv.3 | 3 +- contrib/openpam/doc/man/openpam_readline.3 | 3 +- contrib/openpam/doc/man/openpam_readlinev.3 | 3 +- contrib/openpam/doc/man/openpam_readword.3 | 3 +- contrib/openpam/doc/man/openpam_restore_cred.3 | 3 +- contrib/openpam/doc/man/openpam_set_feature.3 | 3 +- contrib/openpam/doc/man/openpam_set_option.3 | 3 +- contrib/openpam/doc/man/openpam_straddch.3 | 3 +- contrib/openpam/doc/man/openpam_subst.3 | 3 +- contrib/openpam/doc/man/openpam_ttyconv.3 | 3 +- contrib/openpam/doc/man/pam.3 | 5 +- contrib/openpam/doc/man/pam.conf.5 | 4 +- contrib/openpam/doc/man/pam.man | 3 - contrib/openpam/doc/man/pam_acct_mgmt.3 | 3 +- contrib/openpam/doc/man/pam_authenticate.3 | 3 +- contrib/openpam/doc/man/pam_chauthtok.3 | 3 +- contrib/openpam/doc/man/pam_close_session.3 | 3 +- contrib/openpam/doc/man/pam_conv.3 | 4 +- contrib/openpam/doc/man/pam_end.3 | 3 +- contrib/openpam/doc/man/pam_error.3 | 3 +- contrib/openpam/doc/man/pam_get_authtok.3 | 3 +- contrib/openpam/doc/man/pam_get_data.3 | 3 +- contrib/openpam/doc/man/pam_get_item.3 | 3 +- contrib/openpam/doc/man/pam_get_user.3 | 3 +- contrib/openpam/doc/man/pam_getenv.3 | 3 +- contrib/openpam/doc/man/pam_getenvlist.3 | 3 +- contrib/openpam/doc/man/pam_info.3 | 3 +- contrib/openpam/doc/man/pam_open_session.3 | 3 +- contrib/openpam/doc/man/pam_prompt.3 | 3 +- contrib/openpam/doc/man/pam_putenv.3 | 3 +- contrib/openpam/doc/man/pam_set_data.3 | 3 +- contrib/openpam/doc/man/pam_set_item.3 | 3 +- contrib/openpam/doc/man/pam_setcred.3 | 3 +- contrib/openpam/doc/man/pam_setenv.3 | 3 +- contrib/openpam/doc/man/pam_sm_acct_mgmt.3 | 3 +- contrib/openpam/doc/man/pam_sm_authenticate.3 | 3 +- contrib/openpam/doc/man/pam_sm_chauthtok.3 | 3 +- contrib/openpam/doc/man/pam_sm_close_session.3 | 3 +- contrib/openpam/doc/man/pam_sm_open_session.3 | 3 +- contrib/openpam/doc/man/pam_sm_setcred.3 | 3 +- contrib/openpam/doc/man/pam_start.3 | 3 +- contrib/openpam/doc/man/pam_strerror.3 | 3 +- contrib/openpam/doc/man/pam_verror.3 | 3 +- contrib/openpam/doc/man/pam_vinfo.3 | 3 +- contrib/openpam/doc/man/pam_vprompt.3 | 3 +- contrib/openpam/freebsd/Makefile.in | 33 + contrib/openpam/include/Makefile.am | 2 - contrib/openpam/include/Makefile.in | 29 +- contrib/openpam/include/security/Makefile.am | 2 - contrib/openpam/include/security/Makefile.in | 29 +- contrib/openpam/include/security/openpam.h | 2 - contrib/openpam/include/security/openpam_attr.h | 4 - contrib/openpam/include/security/openpam_version.h | 8 +- contrib/openpam/include/security/pam_appl.h | 2 - contrib/openpam/include/security/pam_constants.h | 2 - contrib/openpam/include/security/pam_modules.h | 2 - contrib/openpam/include/security/pam_types.h | 2 - contrib/openpam/install-sh | 172 +- contrib/openpam/lib/Makefile.am | 2 - contrib/openpam/lib/Makefile.in | 29 +- contrib/openpam/lib/libpam/Makefile.am | 2 - contrib/openpam/lib/libpam/Makefile.in | 29 +- contrib/openpam/lib/libpam/openpam_asprintf.c | 2 - contrib/openpam/lib/libpam/openpam_asprintf.h | 2 - contrib/openpam/lib/libpam/openpam_borrow_cred.c | 2 - .../openpam/lib/libpam/openpam_check_owner_perms.c | 2 - contrib/openpam/lib/libpam/openpam_configure.c | 2 - contrib/openpam/lib/libpam/openpam_constants.c | 2 - contrib/openpam/lib/libpam/openpam_constants.h | 2 - contrib/openpam/lib/libpam/openpam_cred.h | 2 - contrib/openpam/lib/libpam/openpam_ctype.h | 2 - contrib/openpam/lib/libpam/openpam_debug.h | 2 - contrib/openpam/lib/libpam/openpam_dispatch.c | 2 - contrib/openpam/lib/libpam/openpam_dlfunc.h | 2 - contrib/openpam/lib/libpam/openpam_dynamic.c | 2 - contrib/openpam/lib/libpam/openpam_features.c | 2 - contrib/openpam/lib/libpam/openpam_features.h | 2 - contrib/openpam/lib/libpam/openpam_findenv.c | 2 - contrib/openpam/lib/libpam/openpam_free_data.c | 2 - contrib/openpam/lib/libpam/openpam_free_envlist.c | 2 - contrib/openpam/lib/libpam/openpam_get_feature.c | 2 - contrib/openpam/lib/libpam/openpam_get_option.c | 2 - contrib/openpam/lib/libpam/openpam_impl.h | 2 - contrib/openpam/lib/libpam/openpam_load.c | 2 - contrib/openpam/lib/libpam/openpam_log.c | 2 - contrib/openpam/lib/libpam/openpam_nullconv.c | 2 - contrib/openpam/lib/libpam/openpam_readline.c | 2 - contrib/openpam/lib/libpam/openpam_readlinev.c | 4 - contrib/openpam/lib/libpam/openpam_readword.c | 3 - contrib/openpam/lib/libpam/openpam_restore_cred.c | 2 - contrib/openpam/lib/libpam/openpam_set_feature.c | 2 - contrib/openpam/lib/libpam/openpam_set_option.c | 5 +- contrib/openpam/lib/libpam/openpam_static.c | 2 - contrib/openpam/lib/libpam/openpam_straddch.c | 4 - contrib/openpam/lib/libpam/openpam_strlcat.c | 2 - contrib/openpam/lib/libpam/openpam_strlcat.h | 2 - contrib/openpam/lib/libpam/openpam_strlcmp.h | 2 - contrib/openpam/lib/libpam/openpam_strlcpy.c | 2 - contrib/openpam/lib/libpam/openpam_strlcpy.h | 2 - contrib/openpam/lib/libpam/openpam_strlset.c | 2 - contrib/openpam/lib/libpam/openpam_strlset.h | 2 - contrib/openpam/lib/libpam/openpam_subst.c | 7 +- contrib/openpam/lib/libpam/openpam_ttyconv.c | 2 - contrib/openpam/lib/libpam/openpam_vasprintf.c | 2 - contrib/openpam/lib/libpam/openpam_vasprintf.h | 2 - contrib/openpam/lib/libpam/pam_acct_mgmt.c | 2 - contrib/openpam/lib/libpam/pam_authenticate.c | 2 - .../lib/libpam/pam_authenticate_secondary.c | 2 - contrib/openpam/lib/libpam/pam_chauthtok.c | 2 - contrib/openpam/lib/libpam/pam_close_session.c | 2 - contrib/openpam/lib/libpam/pam_end.c | 2 - contrib/openpam/lib/libpam/pam_error.c | 2 - contrib/openpam/lib/libpam/pam_get_authtok.c | 2 - contrib/openpam/lib/libpam/pam_get_data.c | 2 - contrib/openpam/lib/libpam/pam_get_item.c | 2 - .../openpam/lib/libpam/pam_get_mapped_authtok.c | 2 - .../openpam/lib/libpam/pam_get_mapped_username.c | 2 - contrib/openpam/lib/libpam/pam_get_user.c | 2 - contrib/openpam/lib/libpam/pam_getenv.c | 2 - contrib/openpam/lib/libpam/pam_getenvlist.c | 2 - contrib/openpam/lib/libpam/pam_info.c | 2 - contrib/openpam/lib/libpam/pam_open_session.c | 2 - contrib/openpam/lib/libpam/pam_prompt.c | 2 - contrib/openpam/lib/libpam/pam_putenv.c | 2 - contrib/openpam/lib/libpam/pam_set_data.c | 2 - contrib/openpam/lib/libpam/pam_set_item.c | 2 - .../openpam/lib/libpam/pam_set_mapped_authtok.c | 2 - .../openpam/lib/libpam/pam_set_mapped_username.c | 2 - contrib/openpam/lib/libpam/pam_setcred.c | 2 - contrib/openpam/lib/libpam/pam_setenv.c | 2 - contrib/openpam/lib/libpam/pam_sm_acct_mgmt.c | 2 - contrib/openpam/lib/libpam/pam_sm_authenticate.c | 2 - .../lib/libpam/pam_sm_authenticate_secondary.c | 2 - contrib/openpam/lib/libpam/pam_sm_chauthtok.c | 2 - contrib/openpam/lib/libpam/pam_sm_close_session.c | 2 - .../openpam/lib/libpam/pam_sm_get_mapped_authtok.c | 2 - .../lib/libpam/pam_sm_get_mapped_username.c | 2 - contrib/openpam/lib/libpam/pam_sm_open_session.c | 2 - .../openpam/lib/libpam/pam_sm_set_mapped_authtok.c | 2 - .../lib/libpam/pam_sm_set_mapped_username.c | 2 - contrib/openpam/lib/libpam/pam_sm_setcred.c | 2 - contrib/openpam/lib/libpam/pam_start.c | 2 - contrib/openpam/lib/libpam/pam_strerror.c | 2 - contrib/openpam/lib/libpam/pam_verror.c | 2 - contrib/openpam/lib/libpam/pam_vinfo.c | 2 - contrib/openpam/lib/libpam/pam_vprompt.c | 2 - contrib/openpam/ltmain.sh | 855 +- contrib/openpam/m4/ax_compiler_vendor.m4 | 117 + contrib/openpam/m4/libtool.m4 | 227 +- contrib/openpam/m4/ltoptions.m4 | 4 +- contrib/openpam/m4/ltsugar.m4 | 2 +- contrib/openpam/m4/ltversion.m4 | 13 +- contrib/openpam/m4/lt~obsolete.m4 | 4 +- contrib/openpam/misc/Makefile.am | 2 +- contrib/openpam/misc/Makefile.in | 34 +- contrib/openpam/misc/coverage.sh.in | 33 - contrib/openpam/misc/gendoc.pl | 2 - contrib/openpam/missing | 2 +- contrib/openpam/mkpkgng.in | 177 - contrib/openpam/modules/Makefile.am | 2 - contrib/openpam/modules/Makefile.in | 29 +- contrib/openpam/modules/pam_deny/Makefile.am | 2 - contrib/openpam/modules/pam_deny/Makefile.in | 29 +- contrib/openpam/modules/pam_deny/pam_deny.c | 2 - contrib/openpam/modules/pam_permit/Makefile.am | 2 - contrib/openpam/modules/pam_permit/Makefile.in | 29 +- contrib/openpam/modules/pam_permit/pam_permit.c | 2 - contrib/openpam/modules/pam_return/Makefile.am | 2 - contrib/openpam/modules/pam_return/Makefile.in | 29 +- contrib/openpam/modules/pam_return/pam_return.c | 2 - contrib/openpam/modules/pam_unix/Makefile.am | 2 - contrib/openpam/modules/pam_unix/Makefile.in | 29 +- contrib/openpam/modules/pam_unix/pam_unix.c | 2 - contrib/openpam/t/Makefile.am | 4 +- contrib/openpam/t/Makefile.in | 87 +- contrib/openpam/t/t_openpam_ctype.c | 2 - contrib/openpam/t/t_openpam_dispatch.c | 2 - contrib/openpam/t/t_openpam_readlinev.c | 2 - contrib/openpam/t/t_openpam_readword.c | 2 - contrib/openpam/t/t_openpam_straddch.c | 183 + contrib/openpam/t/t_openpam_subst.c | 105 + contrib/openpam/t/t_pam_conv.c | 2 - contrib/openpam/t/t_pam_conv.h | 2 - contrib/openpam/t/t_pam_env.c | 2 - contrib/openpam/t/t_pam_err.c | 2 - contrib/openpam/t/t_pam_err.h | 2 - contrib/openpam/test-driver | 25 +- 227 files changed, 17395 insertions(+), 11816 deletions(-) diff --git a/contrib/openpam/CREDITS b/contrib/openpam/CREDITS index a560f9e12c1f..7dd4356fa824 100644 --- a/contrib/openpam/CREDITS +++ b/contrib/openpam/CREDITS @@ -45,6 +45,7 @@ ideas: Mikko Työläjärvi Nick Hibma Patrick Bihan-Faou + Robert Morris Robert Watson Ruslan Ermilov Sebastian Krahmer diff --git a/contrib/openpam/HISTORY b/contrib/openpam/HISTORY index 98032d7e5973..659c2ec430ff 100644 --- a/contrib/openpam/HISTORY +++ b/contrib/openpam/HISTORY @@ -1,3 +1,14 @@ +OpenPAM Ximenia 2023-06-27 + + - BUGFIX: Fix race condition in openpam_ttyconv(3) when used with + expect scripts. + + - BUGFIX: In openpam_set_option(3), when removing an option, properly + decrement the option count. + + - BUGFIX: In openpam_subst(3), avoid incrementing past the end of the + template. +============================================================================ OpenPAM Tabebuia 2019-02-24 - BUGFIX: Fix off-by-one bug in pam_getenv(3) which was introduced in diff --git a/contrib/openpam/LICENSE b/contrib/openpam/LICENSE index 879b34bc7beb..8c7e42564955 100644 --- a/contrib/openpam/LICENSE +++ b/contrib/openpam/LICENSE @@ -1,6 +1,6 @@ Copyright (c) 2002-2003 Networks Associates Technology, Inc. -Copyright (c) 2004-2019 Dag-Erling Smørgrav +Copyright (c) 2004-2023 Dag-Erling Smørgrav All rights reserved. This software was developed for the FreeBSD Project by ThinkSec AS and diff --git a/contrib/openpam/Makefile.am b/contrib/openpam/Makefile.am index 6355cefcd5bc..89ec3a3cfa34 100644 --- a/contrib/openpam/Makefile.am +++ b/contrib/openpam/Makefile.am @@ -1,5 +1,3 @@ -# $OpenPAM: Makefile.am 938 2017-04-30 21:34:42Z des $ - ACLOCAL_AMFLAGS = -I m4 SUBDIRS = misc include lib bin modules @@ -19,3 +17,32 @@ EXTRA_DIST = \ RELNOTES \ autogen.sh \ misc/gendoc.pl + +if WITH_CODE_COVERAGE +covdir = @abs_top_builddir@/cov +coverage: coverage-clean all coverage-prepare coverage-run coverage-report +coverage-clean: + -rm -rf "${covdir}" +coverage-prepare: + mkdir "${covdir}" +if CLANG_CODE_COVERAGE +profdata = ${covdir}/@PACKAGE@.profdata +# hardcoding libpam.so here is horrible, need to find a better solution +coverage-run: + LLVM_PROFILE_FILE="${covdir}/@PACKAGE@.%p.raw" \ + ${MAKE} -C "@abs_top_builddir@" check +coverage-report: + llvm-profdata@clang_ver@ merge \ + --sparse "${covdir}/@PACKAGE@".*.raw -o "${profdata}" + llvm-cov@clang_ver@ show \ + --format=html --tab-size=8 \ + --output-dir="${covdir}" \ + --instr-profile="${profdata}" \ + --object "@abs_top_builddir@/lib/libpam/.libs/libpam.so" + @echo "coverage report: file://${covdir}/index.html" +endif +else +coverage: + echo "code coverage is not enabled." >&2 + false +endif diff --git a/contrib/openpam/Makefile.in b/contrib/openpam/Makefile.in index 05483ef6562d..50e7b492db11 100644 --- a/contrib/openpam/Makefile.in +++ b/contrib/openpam/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -13,8 +13,6 @@ # PARTICULAR PURPOSE. @SET_MAKE@ - -# $OpenPAM: Makefile.am 938 2017-04-30 21:34:42Z des $ VPATH = @srcdir@ am__is_gnu_make = { \ if test -z '$(MAKELEVEL)'; then \ @@ -92,10 +90,11 @@ host_triplet = @host@ @WITH_DOC_TRUE@am__append_1 = doc subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_config.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compiler_vendor.m4 \ + $(top_srcdir)/m4/ax_pkg_config.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \ @@ -104,7 +103,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno mkinstalldirs = $(install_sh) -d CONFIG_HEADER = config.h -CONFIG_CLEAN_FILES = mkpkgng +CONFIG_CLEAN_FILES = freebsd/Makefile CONFIG_CLEAN_VPATH_FILES = AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) @@ -141,8 +140,8 @@ am__recursive_targets = \ $(am__extra_recursive_targets) AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ cscope distdir distdir-am dist dist-all distcheck -am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ - $(LISP)config.h.in +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) \ + config.h.in # Read a list of newline-separated strings from the standard input, # and print each of them once, without duplicates. Input order is # *not* preserved. @@ -159,13 +158,10 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags -CSCOPE = cscope DIST_SUBDIRS = misc include lib bin modules doc t am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \ - $(srcdir)/mkpkgng.in INSTALL README TODO compile config.guess \ - config.sub install-sh ltmain.sh missing + $(top_srcdir)/freebsd/Makefile.in INSTALL README TODO compile \ + config.guess config.sub depcomp install-sh ltmain.sh missing DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -204,6 +200,8 @@ am__relativize = \ DIST_ARCHIVES = $(distdir).tar.gz GZIP_ENV = --best DIST_TARGETS = dist-gzip +# Exists only to be overridden by the user if desired. +AM_DISTCHECK_DVI_TARGET = dvi distuninstallcheck_listfiles = find . -type f -print am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' @@ -224,6 +222,12 @@ CPPFLAGS = @CPPFLAGS@ CRYB_TEST_CFLAGS = @CRYB_TEST_CFLAGS@ CRYB_TEST_LIBS = @CRYB_TEST_LIBS@ CRYB_TEST_VERSION = @CRYB_TEST_VERSION@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -235,8 +239,10 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ @@ -287,6 +293,7 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ @@ -300,6 +307,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ builddir = @builddir@ +clang_ver = @clang_ver@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -326,6 +334,7 @@ pkgconfigdir = @pkgconfigdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -346,6 +355,8 @@ EXTRA_DIST = \ autogen.sh \ misc/gendoc.pl +@WITH_CODE_COVERAGE_TRUE@covdir = @abs_top_builddir@/cov +@CLANG_CODE_COVERAGE_TRUE@@WITH_CODE_COVERAGE_TRUE@profdata = ${covdir}/@PACKAGE@.profdata all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive @@ -398,7 +409,7 @@ $(srcdir)/config.h.in: $(am__configure_deps) distclean-hdr: -rm -f config.h stamp-h1 -mkpkgng: $(top_builddir)/config.status $(srcdir)/mkpkgng.in +freebsd/Makefile: $(top_builddir)/config.status $(top_srcdir)/freebsd/Makefile.in cd $(top_builddir) && $(SHELL) ./config.status $@ mostlyclean-libtool: @@ -515,7 +526,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -rm -f cscope.out cscope.in.out cscope.po.out cscope.files - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am @@ -599,6 +609,10 @@ dist-xz: distdir tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz $(am__post_remove_distdir) +dist-zstd: distdir + tardir=$(distdir) && $(am__tar) | zstd -c $${ZSTD_CLEVEL-$${ZSTD_OPT--19}} >$(distdir).tar.zst + $(am__post_remove_distdir) + dist-tarZ: distdir @echo WARNING: "Support for distribution archives compressed with" \ "legacy program 'compress' is deprecated." >&2 @@ -641,6 +655,8 @@ distcheck: dist eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\ *.zip*) \ unzip $(distdir).zip ;;\ + *.tar.zst*) \ + zstd -dc $(distdir).tar.zst | $(am__untar) ;;\ esac chmod -R a-w $(distdir) chmod u+w $(distdir) @@ -656,7 +672,7 @@ distcheck: dist $(DISTCHECK_CONFIGURE_FLAGS) \ --srcdir=../.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) dvi \ + && $(MAKE) $(AM_MAKEFLAGS) $(AM_DISTCHECK_DVI_TARGET) \ && $(MAKE) $(AM_MAKEFLAGS) check \ && $(MAKE) $(AM_MAKEFLAGS) install \ && $(MAKE) $(AM_MAKEFLAGS) installcheck \ @@ -818,21 +834,42 @@ uninstall-am: am--refresh check check-am clean clean-cscope clean-generic \ clean-libtool cscope cscopelist-am ctags ctags-am dist \ dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \ - dist-xz dist-zip distcheck distclean distclean-generic \ - distclean-hdr distclean-libtool distclean-tags distcleancheck \ - distdir distuninstallcheck dvi dvi-am html html-am info \ - info-am install install-am install-data install-data-am \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ - uninstall-am + dist-xz dist-zip dist-zstd distcheck distclean \ + distclean-generic distclean-hdr distclean-libtool \ + distclean-tags distcleancheck distdir distuninstallcheck dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs installdirs-am \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am .PRECIOUS: Makefile +@WITH_CODE_COVERAGE_TRUE@coverage: coverage-clean all coverage-prepare coverage-run coverage-report +@WITH_CODE_COVERAGE_TRUE@coverage-clean: +@WITH_CODE_COVERAGE_TRUE@ -rm -rf "${covdir}" +@WITH_CODE_COVERAGE_TRUE@coverage-prepare: +@WITH_CODE_COVERAGE_TRUE@ mkdir "${covdir}" +# hardcoding libpam.so here is horrible, need to find a better solution +@CLANG_CODE_COVERAGE_TRUE@@WITH_CODE_COVERAGE_TRUE@coverage-run: +@CLANG_CODE_COVERAGE_TRUE@@WITH_CODE_COVERAGE_TRUE@ LLVM_PROFILE_FILE="${covdir}/@PACKAGE@.%p.raw" \ +@CLANG_CODE_COVERAGE_TRUE@@WITH_CODE_COVERAGE_TRUE@ ${MAKE} -C "@abs_top_builddir@" check +@CLANG_CODE_COVERAGE_TRUE@@WITH_CODE_COVERAGE_TRUE@coverage-report: +@CLANG_CODE_COVERAGE_TRUE@@WITH_CODE_COVERAGE_TRUE@ llvm-profdata@clang_ver@ merge \ +@CLANG_CODE_COVERAGE_TRUE@@WITH_CODE_COVERAGE_TRUE@ --sparse "${covdir}/@PACKAGE@".*.raw -o "${profdata}" +@CLANG_CODE_COVERAGE_TRUE@@WITH_CODE_COVERAGE_TRUE@ llvm-cov@clang_ver@ show \ +@CLANG_CODE_COVERAGE_TRUE@@WITH_CODE_COVERAGE_TRUE@ --format=html --tab-size=8 \ +@CLANG_CODE_COVERAGE_TRUE@@WITH_CODE_COVERAGE_TRUE@ --output-dir="${covdir}" \ +@CLANG_CODE_COVERAGE_TRUE@@WITH_CODE_COVERAGE_TRUE@ --instr-profile="${profdata}" \ +@CLANG_CODE_COVERAGE_TRUE@@WITH_CODE_COVERAGE_TRUE@ --object "@abs_top_builddir@/lib/libpam/.libs/libpam.so" +@CLANG_CODE_COVERAGE_TRUE@@WITH_CODE_COVERAGE_TRUE@ @echo "coverage report: file://${covdir}/index.html" +@WITH_CODE_COVERAGE_FALSE@coverage: +@WITH_CODE_COVERAGE_FALSE@ echo "code coverage is not enabled." >&2 +@WITH_CODE_COVERAGE_FALSE@ false # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/contrib/openpam/RELNOTES b/contrib/openpam/RELNOTES index 895370ae8774..3bbd7bb19721 100644 --- a/contrib/openpam/RELNOTES +++ b/contrib/openpam/RELNOTES @@ -1,6 +1,6 @@ - Release notes for OpenPAM Tabebuia - ================================== + Release notes for OpenPAM Ximenia + ================================= OpenPAM is developed primarily on FreeBSD, but is expected to work on almost any POSIX-like platform that has GNU autotools, GNU make and diff --git a/contrib/openpam/aclocal.m4 b/contrib/openpam/aclocal.m4 index 005a0f19d170..109e73063233 100644 --- a/contrib/openpam/aclocal.m4 +++ b/contrib/openpam/aclocal.m4 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.16.1 -*- Autoconf -*- +# generated automatically by aclocal 1.16.5 -*- Autoconf -*- -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,13 +14,13 @@ m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, -[m4_warning([this file was generated for autoconf 2.69. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.71],, +[m4_warning([this file was generated for autoconf 2.71. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically 'autoreconf'.])]) -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -35,7 +35,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version='1.16' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.16.1], [], +m4_if([$1], [1.16.5], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -51,14 +51,14 @@ m4_define([_AM_AUTOCONF_VERSION], []) # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.16.1])dnl +[AM_AUTOMAKE_VERSION([1.16.5])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -108,9 +108,46 @@ AC_DEFUN([AM_AUX_DIR_EXPAND], am_aux_dir=`cd "$ac_aux_dir" && pwd` ]) +# AM_COND_IF -*- Autoconf -*- + +# Copyright (C) 2008-2021 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# _AM_COND_IF +# _AM_COND_ELSE +# _AM_COND_ENDIF +# -------------- +# These macros are only used for tracing. +m4_define([_AM_COND_IF]) +m4_define([_AM_COND_ELSE]) +m4_define([_AM_COND_ENDIF]) + +# AM_COND_IF(COND, [IF-TRUE], [IF-FALSE]) +# --------------------------------------- +# If the shell condition COND is true, execute IF-TRUE, otherwise execute +# IF-FALSE. Allow automake to learn about conditional instantiating macros +# (the AC_CONFIG_FOOS). +AC_DEFUN([AM_COND_IF], +[m4_ifndef([_AM_COND_VALUE_$1], + [m4_fatal([$0: no such condition "$1"])])dnl +_AM_COND_IF([$1])dnl +if test -z "$$1_TRUE"; then : + m4_n([$2])[]dnl +m4_ifval([$3], +[_AM_COND_ELSE([$1])dnl +else + $3 +])dnl +_AM_COND_ENDIF([$1])dnl +fi[]dnl +]) + # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2018 Free Software Foundation, Inc. +# Copyright (C) 1997-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -141,7 +178,7 @@ AC_CONFIG_COMMANDS_PRE( Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -332,7 +369,7 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -371,7 +408,9 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], done if test $am_rc -ne 0; then AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments - for automatic dependency tracking. Try re-running configure with the + for automatic dependency tracking. If GNU make was not used, consider + re-running the configure script with MAKE="gmake" (or whatever is + necessary). You can also try re-running configure with the '--disable-dependency-tracking' option to at least be able to build the package (albeit without support for automatic dependency tracking).]) fi @@ -398,7 +437,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -426,6 +465,10 @@ m4_defn([AC_PROG_CC]) # release and drop the old call support. AC_DEFUN([AM_INIT_AUTOMAKE], [AC_PREREQ([2.65])dnl +m4_ifdef([_$0_ALREADY_INIT], + [m4_fatal([$0 expanded multiple times +]m4_defn([_$0_ALREADY_INIT]))], + [m4_define([_$0_ALREADY_INIT], m4_expansion_stack)])dnl dnl Autoconf wants to disallow AM_ names. We explicitly allow dnl the ones we care about. m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl @@ -462,7 +505,7 @@ m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl [_AM_SET_OPTIONS([$1])dnl dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. m4_if( - m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), + m4_ifset([AC_PACKAGE_NAME], [ok]):m4_ifset([AC_PACKAGE_VERSION], [ok]), [ok:ok],, [m4_fatal([AC_INIT should be called with package and version arguments])])dnl AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl @@ -514,6 +557,20 @@ AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], [m4_define([AC_PROG_OBJCXX], m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl ]) +# Variables for tags utilities; see am/tags.am +if test -z "$CTAGS"; then + CTAGS=ctags +fi +AC_SUBST([CTAGS]) +if test -z "$ETAGS"; then + ETAGS=etags +fi +AC_SUBST([ETAGS]) +if test -z "$CSCOPE"; then + CSCOPE=cscope +fi +AC_SUBST([CSCOPE]) + AC_REQUIRE([AM_SILENT_RULES])dnl dnl The testsuite driver may need to know about EXEEXT, so add the dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This @@ -595,7 +652,7 @@ for _am_header in $config_headers :; do done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -616,7 +673,7 @@ if test x"${install_sh+set}" != xset; then fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -637,7 +694,7 @@ AC_SUBST([am__leading_dot])]) # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -680,7 +737,7 @@ AC_SUBST([am__quote])]) # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2018 Free Software Foundation, Inc. +# Copyright (C) 1997-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -701,12 +758,7 @@ AC_DEFUN([AM_MISSING_HAS_RUN], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl AC_REQUIRE_AUX_FILE([missing])dnl if test x"${MISSING+set}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; - *) - MISSING="\${SHELL} $am_aux_dir/missing" ;; - esac + MISSING="\${SHELL} '$am_aux_dir/missing'" fi # Use eval to expand $SHELL if eval "$MISSING --is-lightweight"; then @@ -721,7 +773,7 @@ fi # Obsolete and "removed" macros, that must however still report explicit # error messages when used, to smooth transition. # -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -748,7 +800,7 @@ AU_DEFUN([fp_C_PROTOTYPES], [AM_C_PROTOTYPES]) # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -777,7 +829,7 @@ AC_DEFUN([_AM_SET_OPTIONS], AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -824,7 +876,7 @@ AC_LANG_POP([C])]) # For backward compatibility. AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -843,7 +895,7 @@ AC_DEFUN([AM_RUN_LOG], # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -924,7 +976,7 @@ AC_CONFIG_COMMANDS_PRE( rm -f conftest.file ]) -# Copyright (C) 2009-2018 Free Software Foundation, Inc. +# Copyright (C) 2009-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -984,7 +1036,7 @@ AC_SUBST([AM_BACKSLASH])dnl _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1012,7 +1064,7 @@ fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2018 Free Software Foundation, Inc. +# Copyright (C) 2006-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1031,7 +1083,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2018 Free Software Foundation, Inc. +# Copyright (C) 2004-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1162,6 +1214,7 @@ AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR +m4_include([m4/ax_compiler_vendor.m4]) m4_include([m4/ax_pkg_config.m4]) m4_include([m4/libtool.m4]) m4_include([m4/ltoptions.m4]) diff --git a/contrib/openpam/autogen.sh b/contrib/openpam/autogen.sh index 4573429d4ee9..92213e71d82c 100755 --- a/contrib/openpam/autogen.sh +++ b/contrib/openpam/autogen.sh @@ -1,7 +1,4 @@ #!/bin/sh -# -# $OpenPAM: autogen.sh 938 2017-04-30 21:34:42Z des $ -# libtoolize --copy --force aclocal -I m4 diff --git a/contrib/openpam/bin/Makefile.am b/contrib/openpam/bin/Makefile.am index ce57b7a74ab7..420748808ad2 100644 --- a/contrib/openpam/bin/Makefile.am +++ b/contrib/openpam/bin/Makefile.am @@ -1,5 +1,3 @@ -# $OpenPAM: Makefile.am 938 2017-04-30 21:34:42Z des $ - SUBDIRS = openpam_dump_policy if WITH_PAMTEST diff --git a/contrib/openpam/bin/Makefile.in b/contrib/openpam/bin/Makefile.in index 05e3166a03ee..8bc8aa6f51d1 100644 --- a/contrib/openpam/bin/Makefile.in +++ b/contrib/openpam/bin/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -13,8 +13,6 @@ # PARTICULAR PURPOSE. @SET_MAKE@ - -# $OpenPAM: Makefile.am 938 2017-04-30 21:34:42Z des $ VPATH = @srcdir@ am__is_gnu_make = { \ if test -z '$(MAKELEVEL)'; then \ @@ -93,10 +91,11 @@ host_triplet = @host@ @WITH_SU_TRUE@am__append_2 = su subdir = bin ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_config.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compiler_vendor.m4 \ + $(top_srcdir)/m4/ax_pkg_config.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) @@ -156,8 +155,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags DIST_SUBDIRS = openpam_dump_policy pamtest su am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -202,6 +199,12 @@ CPPFLAGS = @CPPFLAGS@ CRYB_TEST_CFLAGS = @CRYB_TEST_CFLAGS@ CRYB_TEST_LIBS = @CRYB_TEST_LIBS@ CRYB_TEST_VERSION = @CRYB_TEST_VERSION@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ *** 38391 LINES SKIPPED *** From nobody Mon Jul 3 15:14:59 2023 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 4QvqGr32kMz4lDYW; Mon, 3 Jul 2023 15:15:00 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QvqGr2QQWz456b; Mon, 3 Jul 2023 15:15:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688397300; 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=z6dD478OCm8E8+4Owf+5eoZC/BWrdycPQBm7WDZQvSA=; b=QvZkOR2ALx4vaj+ZQyEE8r58AdKZetmGBu/jkXVHUJWwdM4KCbv/owSJ9bSWZ4Xz9fZd6a BJtB2Clc97H+lwOwFPm588vpcZvjhRAAcUU6xxf0Mx5jAchnSRQN6FIPWBbTfc+Hu2xeKH dxpZ4xNUc62Mu3avlmNAfPl+lS3TQIXHeHDjt53aFOwNFz8OZnMcVPDBv7oLhB7euMeyB4 j1a0+j/lQca0yTTwf2Q44fo29Wz7vfUtrhRdobS7Ieq5gmenZg4rNIe4vYTz5+6zln5GQJ /EZ2LyVSgCbVvVugOUO8MdyI/S7hy3BOwUnBsSItyn6gl0h8bO/uhLDvoknDOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688397300; 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=z6dD478OCm8E8+4Owf+5eoZC/BWrdycPQBm7WDZQvSA=; b=RO2Hlb5UPApPefSmOQkqriAVelvmSxyZmHG11Oub/OzhQKDWOFMdPMQycrUTxIa+ULxRcd 1lUrQv1hhGqvUMImaee+ZKpcuAmm0U7dLRMnpFT6v2V67+ucJvQ8kozZAFUK23QUuEJecW eV740dvsxhHikW7VOMIgyoJF3iqhoQdKbRgRl5hSWmuItTrElbO3affhpUKKekPf20cvs5 uplzyDrk5wefGfmBT3Vl8CrWe0ZEPvSerNclIbM5vjyhTf/UuWumEZi0s8GM15BJymjmlA 2q891YSgH50otMfhZtUYV6uk+kw7wj7lm4uXiK+5sS0Vho5QznwJu/TqUGXl3g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688397300; a=rsa-sha256; cv=none; b=xIwB8AWX97y/iReE4O+2EQJRFc2cADDZTUpKh6RK2BrHZZqjv8Xi9S86wdy725SH6NAsOe oNk9/i/e7Ro2hXEpDlULUnE+Cn3z7lbJHAd1hRJF9DSfrQbBGEQctxz30m2TP0z5GeidqL zWuT7si/bbxRciJdPsLxaprR+uUYSrD46O+c0TcIw6wHSOtzvejNn1dsxiQ5daGLIrz0pZ s+0y/5bNzoWkFgo3+qyKQBinEkra/labh6/LHdCVaFf18YjfT6p4COpunB2Ych2LmQK4QP aGClAcOlaE7Y6Eci5A9VUun0SAyoCamltKymlve/PlN3hCggE2jfUSGAfmswkw== 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 4QvqGr1JV1zvv4; Mon, 3 Jul 2023 15:15:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 363FF0Vl018079; Mon, 3 Jul 2023 15:15:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 363FEx5k018068; Mon, 3 Jul 2023 15:14:59 GMT (envelope-from git) Date: Mon, 3 Jul 2023 15:14:59 GMT Message-Id: <202307031514.363FEx5k018068@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: =?utf-8?Q?Dag-Erling=20Sm=C3=B8rgrav?= Subject: git: 0f0b8bb211c7 - stable/12 - Upgrade to OpenPAM Ximenia. 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 0f0b8bb211c79845598805312ddcc2f36553452b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=0f0b8bb211c79845598805312ddcc2f36553452b commit 0f0b8bb211c79845598805312ddcc2f36553452b Author: Dag-Erling Smørgrav AuthorDate: 2023-06-27 17:03:17 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-07-03 15:13:49 +0000 Upgrade to OpenPAM Ximenia. Merge commit '5894a4142a9d5ae5f7f6bee1f46237a3d20d0b5b' (cherry picked from commit 3ba4c8c81a28de3e00ccf6d7f92c6f8e58bef456) --- contrib/openpam/CREDITS | 1 + contrib/openpam/HISTORY | 11 + contrib/openpam/LICENSE | 2 +- contrib/openpam/Makefile.am | 31 +- contrib/openpam/Makefile.in | 99 +- contrib/openpam/RELNOTES | 4 +- contrib/openpam/aclocal.m4 | 119 +- contrib/openpam/autogen.sh | 3 - contrib/openpam/bin/Makefile.am | 2 - contrib/openpam/bin/Makefile.in | 29 +- .../openpam/bin/openpam_dump_policy/Makefile.am | 2 - .../openpam/bin/openpam_dump_policy/Makefile.in | 29 +- .../bin/openpam_dump_policy/openpam_dump_policy.c | 2 - contrib/openpam/bin/pamtest/Makefile.am | 2 - contrib/openpam/bin/pamtest/Makefile.in | 29 +- contrib/openpam/bin/pamtest/pamtest.1 | 4 +- contrib/openpam/bin/pamtest/pamtest.c | 2 - contrib/openpam/bin/su/Makefile.am | 2 - contrib/openpam/bin/su/Makefile.in | 29 +- contrib/openpam/bin/su/su.1 | 4 +- contrib/openpam/bin/su/su.c | 2 - contrib/openpam/compile | 6 +- contrib/openpam/config.guess | 747 +- contrib/openpam/config.h.in | 114 +- contrib/openpam/config.sub | 1674 +- contrib/openpam/configure | 23391 +++++++++++-------- contrib/openpam/configure.ac | 55 +- contrib/openpam/depcomp | 2 +- contrib/openpam/doc/Makefile.am | 2 - contrib/openpam/doc/Makefile.in | 29 +- contrib/openpam/doc/man/Makefile.am | 2 - contrib/openpam/doc/man/Makefile.in | 27 +- contrib/openpam/doc/man/openpam.3 | 5 +- contrib/openpam/doc/man/openpam.man | 3 - contrib/openpam/doc/man/openpam_borrow_cred.3 | 3 +- contrib/openpam/doc/man/openpam_free_data.3 | 3 +- contrib/openpam/doc/man/openpam_free_envlist.3 | 3 +- contrib/openpam/doc/man/openpam_get_feature.3 | 3 +- contrib/openpam/doc/man/openpam_get_option.3 | 3 +- contrib/openpam/doc/man/openpam_log.3 | 3 +- contrib/openpam/doc/man/openpam_nullconv.3 | 3 +- contrib/openpam/doc/man/openpam_readline.3 | 3 +- contrib/openpam/doc/man/openpam_readlinev.3 | 3 +- contrib/openpam/doc/man/openpam_readword.3 | 3 +- contrib/openpam/doc/man/openpam_restore_cred.3 | 3 +- contrib/openpam/doc/man/openpam_set_feature.3 | 3 +- contrib/openpam/doc/man/openpam_set_option.3 | 3 +- contrib/openpam/doc/man/openpam_straddch.3 | 3 +- contrib/openpam/doc/man/openpam_subst.3 | 3 +- contrib/openpam/doc/man/openpam_ttyconv.3 | 3 +- contrib/openpam/doc/man/pam.3 | 5 +- contrib/openpam/doc/man/pam.conf.5 | 4 +- contrib/openpam/doc/man/pam.man | 3 - contrib/openpam/doc/man/pam_acct_mgmt.3 | 3 +- contrib/openpam/doc/man/pam_authenticate.3 | 3 +- contrib/openpam/doc/man/pam_chauthtok.3 | 3 +- contrib/openpam/doc/man/pam_close_session.3 | 3 +- contrib/openpam/doc/man/pam_conv.3 | 4 +- contrib/openpam/doc/man/pam_end.3 | 3 +- contrib/openpam/doc/man/pam_error.3 | 3 +- contrib/openpam/doc/man/pam_get_authtok.3 | 3 +- contrib/openpam/doc/man/pam_get_data.3 | 3 +- contrib/openpam/doc/man/pam_get_item.3 | 3 +- contrib/openpam/doc/man/pam_get_user.3 | 3 +- contrib/openpam/doc/man/pam_getenv.3 | 3 +- contrib/openpam/doc/man/pam_getenvlist.3 | 3 +- contrib/openpam/doc/man/pam_info.3 | 3 +- contrib/openpam/doc/man/pam_open_session.3 | 3 +- contrib/openpam/doc/man/pam_prompt.3 | 3 +- contrib/openpam/doc/man/pam_putenv.3 | 3 +- contrib/openpam/doc/man/pam_set_data.3 | 3 +- contrib/openpam/doc/man/pam_set_item.3 | 3 +- contrib/openpam/doc/man/pam_setcred.3 | 3 +- contrib/openpam/doc/man/pam_setenv.3 | 3 +- contrib/openpam/doc/man/pam_sm_acct_mgmt.3 | 3 +- contrib/openpam/doc/man/pam_sm_authenticate.3 | 3 +- contrib/openpam/doc/man/pam_sm_chauthtok.3 | 3 +- contrib/openpam/doc/man/pam_sm_close_session.3 | 3 +- contrib/openpam/doc/man/pam_sm_open_session.3 | 3 +- contrib/openpam/doc/man/pam_sm_setcred.3 | 3 +- contrib/openpam/doc/man/pam_start.3 | 3 +- contrib/openpam/doc/man/pam_strerror.3 | 3 +- contrib/openpam/doc/man/pam_verror.3 | 3 +- contrib/openpam/doc/man/pam_vinfo.3 | 3 +- contrib/openpam/doc/man/pam_vprompt.3 | 3 +- contrib/openpam/freebsd/Makefile.in | 33 + contrib/openpam/include/Makefile.am | 2 - contrib/openpam/include/Makefile.in | 29 +- contrib/openpam/include/security/Makefile.am | 2 - contrib/openpam/include/security/Makefile.in | 29 +- contrib/openpam/include/security/openpam.h | 2 - contrib/openpam/include/security/openpam_attr.h | 4 - contrib/openpam/include/security/openpam_version.h | 8 +- contrib/openpam/include/security/pam_appl.h | 2 - contrib/openpam/include/security/pam_constants.h | 2 - contrib/openpam/include/security/pam_modules.h | 2 - contrib/openpam/include/security/pam_types.h | 2 - contrib/openpam/install-sh | 172 +- contrib/openpam/lib/Makefile.am | 2 - contrib/openpam/lib/Makefile.in | 29 +- contrib/openpam/lib/libpam/Makefile.am | 2 - contrib/openpam/lib/libpam/Makefile.in | 29 +- contrib/openpam/lib/libpam/openpam_asprintf.c | 2 - contrib/openpam/lib/libpam/openpam_asprintf.h | 2 - contrib/openpam/lib/libpam/openpam_borrow_cred.c | 2 - .../openpam/lib/libpam/openpam_check_owner_perms.c | 2 - contrib/openpam/lib/libpam/openpam_configure.c | 2 - contrib/openpam/lib/libpam/openpam_constants.c | 2 - contrib/openpam/lib/libpam/openpam_constants.h | 2 - contrib/openpam/lib/libpam/openpam_cred.h | 2 - contrib/openpam/lib/libpam/openpam_ctype.h | 2 - contrib/openpam/lib/libpam/openpam_debug.h | 2 - contrib/openpam/lib/libpam/openpam_dispatch.c | 2 - contrib/openpam/lib/libpam/openpam_dlfunc.h | 2 - contrib/openpam/lib/libpam/openpam_dynamic.c | 2 - contrib/openpam/lib/libpam/openpam_features.c | 2 - contrib/openpam/lib/libpam/openpam_features.h | 2 - contrib/openpam/lib/libpam/openpam_findenv.c | 2 - contrib/openpam/lib/libpam/openpam_free_data.c | 2 - contrib/openpam/lib/libpam/openpam_free_envlist.c | 2 - contrib/openpam/lib/libpam/openpam_get_feature.c | 2 - contrib/openpam/lib/libpam/openpam_get_option.c | 2 - contrib/openpam/lib/libpam/openpam_impl.h | 2 - contrib/openpam/lib/libpam/openpam_load.c | 2 - contrib/openpam/lib/libpam/openpam_log.c | 2 - contrib/openpam/lib/libpam/openpam_nullconv.c | 2 - contrib/openpam/lib/libpam/openpam_readline.c | 2 - contrib/openpam/lib/libpam/openpam_readlinev.c | 4 - contrib/openpam/lib/libpam/openpam_readword.c | 3 - contrib/openpam/lib/libpam/openpam_restore_cred.c | 2 - contrib/openpam/lib/libpam/openpam_set_feature.c | 2 - contrib/openpam/lib/libpam/openpam_set_option.c | 5 +- contrib/openpam/lib/libpam/openpam_static.c | 2 - contrib/openpam/lib/libpam/openpam_straddch.c | 4 - contrib/openpam/lib/libpam/openpam_strlcat.c | 2 - contrib/openpam/lib/libpam/openpam_strlcat.h | 2 - contrib/openpam/lib/libpam/openpam_strlcmp.h | 2 - contrib/openpam/lib/libpam/openpam_strlcpy.c | 2 - contrib/openpam/lib/libpam/openpam_strlcpy.h | 2 - contrib/openpam/lib/libpam/openpam_strlset.c | 2 - contrib/openpam/lib/libpam/openpam_strlset.h | 2 - contrib/openpam/lib/libpam/openpam_subst.c | 7 +- contrib/openpam/lib/libpam/openpam_ttyconv.c | 2 - contrib/openpam/lib/libpam/openpam_vasprintf.c | 2 - contrib/openpam/lib/libpam/openpam_vasprintf.h | 2 - contrib/openpam/lib/libpam/pam_acct_mgmt.c | 2 - contrib/openpam/lib/libpam/pam_authenticate.c | 2 - .../lib/libpam/pam_authenticate_secondary.c | 2 - contrib/openpam/lib/libpam/pam_chauthtok.c | 2 - contrib/openpam/lib/libpam/pam_close_session.c | 2 - contrib/openpam/lib/libpam/pam_end.c | 2 - contrib/openpam/lib/libpam/pam_error.c | 2 - contrib/openpam/lib/libpam/pam_get_authtok.c | 2 - contrib/openpam/lib/libpam/pam_get_data.c | 2 - contrib/openpam/lib/libpam/pam_get_item.c | 2 - .../openpam/lib/libpam/pam_get_mapped_authtok.c | 2 - .../openpam/lib/libpam/pam_get_mapped_username.c | 2 - contrib/openpam/lib/libpam/pam_get_user.c | 2 - contrib/openpam/lib/libpam/pam_getenv.c | 2 - contrib/openpam/lib/libpam/pam_getenvlist.c | 2 - contrib/openpam/lib/libpam/pam_info.c | 2 - contrib/openpam/lib/libpam/pam_open_session.c | 2 - contrib/openpam/lib/libpam/pam_prompt.c | 2 - contrib/openpam/lib/libpam/pam_putenv.c | 2 - contrib/openpam/lib/libpam/pam_set_data.c | 2 - contrib/openpam/lib/libpam/pam_set_item.c | 2 - .../openpam/lib/libpam/pam_set_mapped_authtok.c | 2 - .../openpam/lib/libpam/pam_set_mapped_username.c | 2 - contrib/openpam/lib/libpam/pam_setcred.c | 2 - contrib/openpam/lib/libpam/pam_setenv.c | 2 - contrib/openpam/lib/libpam/pam_sm_acct_mgmt.c | 2 - contrib/openpam/lib/libpam/pam_sm_authenticate.c | 2 - .../lib/libpam/pam_sm_authenticate_secondary.c | 2 - contrib/openpam/lib/libpam/pam_sm_chauthtok.c | 2 - contrib/openpam/lib/libpam/pam_sm_close_session.c | 2 - .../openpam/lib/libpam/pam_sm_get_mapped_authtok.c | 2 - .../lib/libpam/pam_sm_get_mapped_username.c | 2 - contrib/openpam/lib/libpam/pam_sm_open_session.c | 2 - .../openpam/lib/libpam/pam_sm_set_mapped_authtok.c | 2 - .../lib/libpam/pam_sm_set_mapped_username.c | 2 - contrib/openpam/lib/libpam/pam_sm_setcred.c | 2 - contrib/openpam/lib/libpam/pam_start.c | 2 - contrib/openpam/lib/libpam/pam_strerror.c | 2 - contrib/openpam/lib/libpam/pam_verror.c | 2 - contrib/openpam/lib/libpam/pam_vinfo.c | 2 - contrib/openpam/lib/libpam/pam_vprompt.c | 2 - contrib/openpam/ltmain.sh | 855 +- contrib/openpam/m4/ax_compiler_vendor.m4 | 117 + contrib/openpam/m4/libtool.m4 | 227 +- contrib/openpam/m4/ltoptions.m4 | 4 +- contrib/openpam/m4/ltsugar.m4 | 2 +- contrib/openpam/m4/ltversion.m4 | 13 +- contrib/openpam/m4/lt~obsolete.m4 | 4 +- contrib/openpam/misc/Makefile.am | 2 +- contrib/openpam/misc/Makefile.in | 34 +- contrib/openpam/misc/coverage.sh.in | 33 - contrib/openpam/misc/gendoc.pl | 2 - contrib/openpam/missing | 2 +- contrib/openpam/mkpkgng.in | 177 - contrib/openpam/modules/Makefile.am | 2 - contrib/openpam/modules/Makefile.in | 29 +- contrib/openpam/modules/pam_deny/Makefile.am | 2 - contrib/openpam/modules/pam_deny/Makefile.in | 29 +- contrib/openpam/modules/pam_deny/pam_deny.c | 2 - contrib/openpam/modules/pam_permit/Makefile.am | 2 - contrib/openpam/modules/pam_permit/Makefile.in | 29 +- contrib/openpam/modules/pam_permit/pam_permit.c | 2 - contrib/openpam/modules/pam_return/Makefile.am | 2 - contrib/openpam/modules/pam_return/Makefile.in | 29 +- contrib/openpam/modules/pam_return/pam_return.c | 2 - contrib/openpam/modules/pam_unix/Makefile.am | 2 - contrib/openpam/modules/pam_unix/Makefile.in | 29 +- contrib/openpam/modules/pam_unix/pam_unix.c | 2 - contrib/openpam/t/Makefile.am | 4 +- contrib/openpam/t/Makefile.in | 87 +- contrib/openpam/t/t_openpam_ctype.c | 2 - contrib/openpam/t/t_openpam_dispatch.c | 2 - contrib/openpam/t/t_openpam_readlinev.c | 2 - contrib/openpam/t/t_openpam_readword.c | 2 - contrib/openpam/t/t_openpam_straddch.c | 183 + contrib/openpam/t/t_openpam_subst.c | 105 + contrib/openpam/t/t_pam_conv.c | 2 - contrib/openpam/t/t_pam_conv.h | 2 - contrib/openpam/t/t_pam_env.c | 2 - contrib/openpam/t/t_pam_err.c | 2 - contrib/openpam/t/t_pam_err.h | 2 - contrib/openpam/test-driver | 25 +- 227 files changed, 17395 insertions(+), 11816 deletions(-) diff --git a/contrib/openpam/CREDITS b/contrib/openpam/CREDITS index a560f9e12c1f..7dd4356fa824 100644 --- a/contrib/openpam/CREDITS +++ b/contrib/openpam/CREDITS @@ -45,6 +45,7 @@ ideas: Mikko Työläjärvi Nick Hibma Patrick Bihan-Faou + Robert Morris Robert Watson Ruslan Ermilov Sebastian Krahmer diff --git a/contrib/openpam/HISTORY b/contrib/openpam/HISTORY index 98032d7e5973..659c2ec430ff 100644 --- a/contrib/openpam/HISTORY +++ b/contrib/openpam/HISTORY @@ -1,3 +1,14 @@ +OpenPAM Ximenia 2023-06-27 + + - BUGFIX: Fix race condition in openpam_ttyconv(3) when used with + expect scripts. + + - BUGFIX: In openpam_set_option(3), when removing an option, properly + decrement the option count. + + - BUGFIX: In openpam_subst(3), avoid incrementing past the end of the + template. +============================================================================ OpenPAM Tabebuia 2019-02-24 - BUGFIX: Fix off-by-one bug in pam_getenv(3) which was introduced in diff --git a/contrib/openpam/LICENSE b/contrib/openpam/LICENSE index 879b34bc7beb..8c7e42564955 100644 --- a/contrib/openpam/LICENSE +++ b/contrib/openpam/LICENSE @@ -1,6 +1,6 @@ Copyright (c) 2002-2003 Networks Associates Technology, Inc. -Copyright (c) 2004-2019 Dag-Erling Smørgrav +Copyright (c) 2004-2023 Dag-Erling Smørgrav All rights reserved. This software was developed for the FreeBSD Project by ThinkSec AS and diff --git a/contrib/openpam/Makefile.am b/contrib/openpam/Makefile.am index 6355cefcd5bc..89ec3a3cfa34 100644 --- a/contrib/openpam/Makefile.am +++ b/contrib/openpam/Makefile.am @@ -1,5 +1,3 @@ -# $OpenPAM: Makefile.am 938 2017-04-30 21:34:42Z des $ - ACLOCAL_AMFLAGS = -I m4 SUBDIRS = misc include lib bin modules @@ -19,3 +17,32 @@ EXTRA_DIST = \ RELNOTES \ autogen.sh \ misc/gendoc.pl + +if WITH_CODE_COVERAGE +covdir = @abs_top_builddir@/cov +coverage: coverage-clean all coverage-prepare coverage-run coverage-report +coverage-clean: + -rm -rf "${covdir}" +coverage-prepare: + mkdir "${covdir}" +if CLANG_CODE_COVERAGE +profdata = ${covdir}/@PACKAGE@.profdata +# hardcoding libpam.so here is horrible, need to find a better solution +coverage-run: + LLVM_PROFILE_FILE="${covdir}/@PACKAGE@.%p.raw" \ + ${MAKE} -C "@abs_top_builddir@" check +coverage-report: + llvm-profdata@clang_ver@ merge \ + --sparse "${covdir}/@PACKAGE@".*.raw -o "${profdata}" + llvm-cov@clang_ver@ show \ + --format=html --tab-size=8 \ + --output-dir="${covdir}" \ + --instr-profile="${profdata}" \ + --object "@abs_top_builddir@/lib/libpam/.libs/libpam.so" + @echo "coverage report: file://${covdir}/index.html" +endif +else +coverage: + echo "code coverage is not enabled." >&2 + false +endif diff --git a/contrib/openpam/Makefile.in b/contrib/openpam/Makefile.in index 05483ef6562d..50e7b492db11 100644 --- a/contrib/openpam/Makefile.in +++ b/contrib/openpam/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -13,8 +13,6 @@ # PARTICULAR PURPOSE. @SET_MAKE@ - -# $OpenPAM: Makefile.am 938 2017-04-30 21:34:42Z des $ VPATH = @srcdir@ am__is_gnu_make = { \ if test -z '$(MAKELEVEL)'; then \ @@ -92,10 +90,11 @@ host_triplet = @host@ @WITH_DOC_TRUE@am__append_1 = doc subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_config.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compiler_vendor.m4 \ + $(top_srcdir)/m4/ax_pkg_config.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \ @@ -104,7 +103,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno mkinstalldirs = $(install_sh) -d CONFIG_HEADER = config.h -CONFIG_CLEAN_FILES = mkpkgng +CONFIG_CLEAN_FILES = freebsd/Makefile CONFIG_CLEAN_VPATH_FILES = AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) @@ -141,8 +140,8 @@ am__recursive_targets = \ $(am__extra_recursive_targets) AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ cscope distdir distdir-am dist dist-all distcheck -am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ - $(LISP)config.h.in +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) \ + config.h.in # Read a list of newline-separated strings from the standard input, # and print each of them once, without duplicates. Input order is # *not* preserved. @@ -159,13 +158,10 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags -CSCOPE = cscope DIST_SUBDIRS = misc include lib bin modules doc t am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \ - $(srcdir)/mkpkgng.in INSTALL README TODO compile config.guess \ - config.sub install-sh ltmain.sh missing + $(top_srcdir)/freebsd/Makefile.in INSTALL README TODO compile \ + config.guess config.sub depcomp install-sh ltmain.sh missing DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -204,6 +200,8 @@ am__relativize = \ DIST_ARCHIVES = $(distdir).tar.gz GZIP_ENV = --best DIST_TARGETS = dist-gzip +# Exists only to be overridden by the user if desired. +AM_DISTCHECK_DVI_TARGET = dvi distuninstallcheck_listfiles = find . -type f -print am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' @@ -224,6 +222,12 @@ CPPFLAGS = @CPPFLAGS@ CRYB_TEST_CFLAGS = @CRYB_TEST_CFLAGS@ CRYB_TEST_LIBS = @CRYB_TEST_LIBS@ CRYB_TEST_VERSION = @CRYB_TEST_VERSION@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -235,8 +239,10 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ @@ -287,6 +293,7 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ @@ -300,6 +307,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ builddir = @builddir@ +clang_ver = @clang_ver@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -326,6 +334,7 @@ pkgconfigdir = @pkgconfigdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -346,6 +355,8 @@ EXTRA_DIST = \ autogen.sh \ misc/gendoc.pl +@WITH_CODE_COVERAGE_TRUE@covdir = @abs_top_builddir@/cov +@CLANG_CODE_COVERAGE_TRUE@@WITH_CODE_COVERAGE_TRUE@profdata = ${covdir}/@PACKAGE@.profdata all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive @@ -398,7 +409,7 @@ $(srcdir)/config.h.in: $(am__configure_deps) distclean-hdr: -rm -f config.h stamp-h1 -mkpkgng: $(top_builddir)/config.status $(srcdir)/mkpkgng.in +freebsd/Makefile: $(top_builddir)/config.status $(top_srcdir)/freebsd/Makefile.in cd $(top_builddir) && $(SHELL) ./config.status $@ mostlyclean-libtool: @@ -515,7 +526,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -rm -f cscope.out cscope.in.out cscope.po.out cscope.files - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am @@ -599,6 +609,10 @@ dist-xz: distdir tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz $(am__post_remove_distdir) +dist-zstd: distdir + tardir=$(distdir) && $(am__tar) | zstd -c $${ZSTD_CLEVEL-$${ZSTD_OPT--19}} >$(distdir).tar.zst + $(am__post_remove_distdir) + dist-tarZ: distdir @echo WARNING: "Support for distribution archives compressed with" \ "legacy program 'compress' is deprecated." >&2 @@ -641,6 +655,8 @@ distcheck: dist eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\ *.zip*) \ unzip $(distdir).zip ;;\ + *.tar.zst*) \ + zstd -dc $(distdir).tar.zst | $(am__untar) ;;\ esac chmod -R a-w $(distdir) chmod u+w $(distdir) @@ -656,7 +672,7 @@ distcheck: dist $(DISTCHECK_CONFIGURE_FLAGS) \ --srcdir=../.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) dvi \ + && $(MAKE) $(AM_MAKEFLAGS) $(AM_DISTCHECK_DVI_TARGET) \ && $(MAKE) $(AM_MAKEFLAGS) check \ && $(MAKE) $(AM_MAKEFLAGS) install \ && $(MAKE) $(AM_MAKEFLAGS) installcheck \ @@ -818,21 +834,42 @@ uninstall-am: am--refresh check check-am clean clean-cscope clean-generic \ clean-libtool cscope cscopelist-am ctags ctags-am dist \ dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \ - dist-xz dist-zip distcheck distclean distclean-generic \ - distclean-hdr distclean-libtool distclean-tags distcleancheck \ - distdir distuninstallcheck dvi dvi-am html html-am info \ - info-am install install-am install-data install-data-am \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ - uninstall-am + dist-xz dist-zip dist-zstd distcheck distclean \ + distclean-generic distclean-hdr distclean-libtool \ + distclean-tags distcleancheck distdir distuninstallcheck dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs installdirs-am \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am .PRECIOUS: Makefile +@WITH_CODE_COVERAGE_TRUE@coverage: coverage-clean all coverage-prepare coverage-run coverage-report +@WITH_CODE_COVERAGE_TRUE@coverage-clean: +@WITH_CODE_COVERAGE_TRUE@ -rm -rf "${covdir}" +@WITH_CODE_COVERAGE_TRUE@coverage-prepare: +@WITH_CODE_COVERAGE_TRUE@ mkdir "${covdir}" +# hardcoding libpam.so here is horrible, need to find a better solution +@CLANG_CODE_COVERAGE_TRUE@@WITH_CODE_COVERAGE_TRUE@coverage-run: +@CLANG_CODE_COVERAGE_TRUE@@WITH_CODE_COVERAGE_TRUE@ LLVM_PROFILE_FILE="${covdir}/@PACKAGE@.%p.raw" \ +@CLANG_CODE_COVERAGE_TRUE@@WITH_CODE_COVERAGE_TRUE@ ${MAKE} -C "@abs_top_builddir@" check +@CLANG_CODE_COVERAGE_TRUE@@WITH_CODE_COVERAGE_TRUE@coverage-report: +@CLANG_CODE_COVERAGE_TRUE@@WITH_CODE_COVERAGE_TRUE@ llvm-profdata@clang_ver@ merge \ +@CLANG_CODE_COVERAGE_TRUE@@WITH_CODE_COVERAGE_TRUE@ --sparse "${covdir}/@PACKAGE@".*.raw -o "${profdata}" +@CLANG_CODE_COVERAGE_TRUE@@WITH_CODE_COVERAGE_TRUE@ llvm-cov@clang_ver@ show \ +@CLANG_CODE_COVERAGE_TRUE@@WITH_CODE_COVERAGE_TRUE@ --format=html --tab-size=8 \ +@CLANG_CODE_COVERAGE_TRUE@@WITH_CODE_COVERAGE_TRUE@ --output-dir="${covdir}" \ +@CLANG_CODE_COVERAGE_TRUE@@WITH_CODE_COVERAGE_TRUE@ --instr-profile="${profdata}" \ +@CLANG_CODE_COVERAGE_TRUE@@WITH_CODE_COVERAGE_TRUE@ --object "@abs_top_builddir@/lib/libpam/.libs/libpam.so" +@CLANG_CODE_COVERAGE_TRUE@@WITH_CODE_COVERAGE_TRUE@ @echo "coverage report: file://${covdir}/index.html" +@WITH_CODE_COVERAGE_FALSE@coverage: +@WITH_CODE_COVERAGE_FALSE@ echo "code coverage is not enabled." >&2 +@WITH_CODE_COVERAGE_FALSE@ false # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/contrib/openpam/RELNOTES b/contrib/openpam/RELNOTES index 895370ae8774..3bbd7bb19721 100644 --- a/contrib/openpam/RELNOTES +++ b/contrib/openpam/RELNOTES @@ -1,6 +1,6 @@ - Release notes for OpenPAM Tabebuia - ================================== + Release notes for OpenPAM Ximenia + ================================= OpenPAM is developed primarily on FreeBSD, but is expected to work on almost any POSIX-like platform that has GNU autotools, GNU make and diff --git a/contrib/openpam/aclocal.m4 b/contrib/openpam/aclocal.m4 index 005a0f19d170..109e73063233 100644 --- a/contrib/openpam/aclocal.m4 +++ b/contrib/openpam/aclocal.m4 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.16.1 -*- Autoconf -*- +# generated automatically by aclocal 1.16.5 -*- Autoconf -*- -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,13 +14,13 @@ m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, -[m4_warning([this file was generated for autoconf 2.69. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.71],, +[m4_warning([this file was generated for autoconf 2.71. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically 'autoreconf'.])]) -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -35,7 +35,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version='1.16' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.16.1], [], +m4_if([$1], [1.16.5], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -51,14 +51,14 @@ m4_define([_AM_AUTOCONF_VERSION], []) # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.16.1])dnl +[AM_AUTOMAKE_VERSION([1.16.5])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -108,9 +108,46 @@ AC_DEFUN([AM_AUX_DIR_EXPAND], am_aux_dir=`cd "$ac_aux_dir" && pwd` ]) +# AM_COND_IF -*- Autoconf -*- + +# Copyright (C) 2008-2021 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# _AM_COND_IF +# _AM_COND_ELSE +# _AM_COND_ENDIF +# -------------- +# These macros are only used for tracing. +m4_define([_AM_COND_IF]) +m4_define([_AM_COND_ELSE]) +m4_define([_AM_COND_ENDIF]) + +# AM_COND_IF(COND, [IF-TRUE], [IF-FALSE]) +# --------------------------------------- +# If the shell condition COND is true, execute IF-TRUE, otherwise execute +# IF-FALSE. Allow automake to learn about conditional instantiating macros +# (the AC_CONFIG_FOOS). +AC_DEFUN([AM_COND_IF], +[m4_ifndef([_AM_COND_VALUE_$1], + [m4_fatal([$0: no such condition "$1"])])dnl +_AM_COND_IF([$1])dnl +if test -z "$$1_TRUE"; then : + m4_n([$2])[]dnl +m4_ifval([$3], +[_AM_COND_ELSE([$1])dnl +else + $3 +])dnl +_AM_COND_ENDIF([$1])dnl +fi[]dnl +]) + # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2018 Free Software Foundation, Inc. +# Copyright (C) 1997-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -141,7 +178,7 @@ AC_CONFIG_COMMANDS_PRE( Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -332,7 +369,7 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -371,7 +408,9 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], done if test $am_rc -ne 0; then AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments - for automatic dependency tracking. Try re-running configure with the + for automatic dependency tracking. If GNU make was not used, consider + re-running the configure script with MAKE="gmake" (or whatever is + necessary). You can also try re-running configure with the '--disable-dependency-tracking' option to at least be able to build the package (albeit without support for automatic dependency tracking).]) fi @@ -398,7 +437,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -426,6 +465,10 @@ m4_defn([AC_PROG_CC]) # release and drop the old call support. AC_DEFUN([AM_INIT_AUTOMAKE], [AC_PREREQ([2.65])dnl +m4_ifdef([_$0_ALREADY_INIT], + [m4_fatal([$0 expanded multiple times +]m4_defn([_$0_ALREADY_INIT]))], + [m4_define([_$0_ALREADY_INIT], m4_expansion_stack)])dnl dnl Autoconf wants to disallow AM_ names. We explicitly allow dnl the ones we care about. m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl @@ -462,7 +505,7 @@ m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl [_AM_SET_OPTIONS([$1])dnl dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. m4_if( - m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), + m4_ifset([AC_PACKAGE_NAME], [ok]):m4_ifset([AC_PACKAGE_VERSION], [ok]), [ok:ok],, [m4_fatal([AC_INIT should be called with package and version arguments])])dnl AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl @@ -514,6 +557,20 @@ AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], [m4_define([AC_PROG_OBJCXX], m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl ]) +# Variables for tags utilities; see am/tags.am +if test -z "$CTAGS"; then + CTAGS=ctags +fi +AC_SUBST([CTAGS]) +if test -z "$ETAGS"; then + ETAGS=etags +fi +AC_SUBST([ETAGS]) +if test -z "$CSCOPE"; then + CSCOPE=cscope +fi +AC_SUBST([CSCOPE]) + AC_REQUIRE([AM_SILENT_RULES])dnl dnl The testsuite driver may need to know about EXEEXT, so add the dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This @@ -595,7 +652,7 @@ for _am_header in $config_headers :; do done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -616,7 +673,7 @@ if test x"${install_sh+set}" != xset; then fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -637,7 +694,7 @@ AC_SUBST([am__leading_dot])]) # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -680,7 +737,7 @@ AC_SUBST([am__quote])]) # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2018 Free Software Foundation, Inc. +# Copyright (C) 1997-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -701,12 +758,7 @@ AC_DEFUN([AM_MISSING_HAS_RUN], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl AC_REQUIRE_AUX_FILE([missing])dnl if test x"${MISSING+set}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; - *) - MISSING="\${SHELL} $am_aux_dir/missing" ;; - esac + MISSING="\${SHELL} '$am_aux_dir/missing'" fi # Use eval to expand $SHELL if eval "$MISSING --is-lightweight"; then @@ -721,7 +773,7 @@ fi # Obsolete and "removed" macros, that must however still report explicit # error messages when used, to smooth transition. # -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -748,7 +800,7 @@ AU_DEFUN([fp_C_PROTOTYPES], [AM_C_PROTOTYPES]) # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -777,7 +829,7 @@ AC_DEFUN([_AM_SET_OPTIONS], AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -824,7 +876,7 @@ AC_LANG_POP([C])]) # For backward compatibility. AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -843,7 +895,7 @@ AC_DEFUN([AM_RUN_LOG], # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -924,7 +976,7 @@ AC_CONFIG_COMMANDS_PRE( rm -f conftest.file ]) -# Copyright (C) 2009-2018 Free Software Foundation, Inc. +# Copyright (C) 2009-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -984,7 +1036,7 @@ AC_SUBST([AM_BACKSLASH])dnl _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1012,7 +1064,7 @@ fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2018 Free Software Foundation, Inc. +# Copyright (C) 2006-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1031,7 +1083,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2018 Free Software Foundation, Inc. +# Copyright (C) 2004-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1162,6 +1214,7 @@ AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR +m4_include([m4/ax_compiler_vendor.m4]) m4_include([m4/ax_pkg_config.m4]) m4_include([m4/libtool.m4]) m4_include([m4/ltoptions.m4]) diff --git a/contrib/openpam/autogen.sh b/contrib/openpam/autogen.sh index 4573429d4ee9..92213e71d82c 100755 --- a/contrib/openpam/autogen.sh +++ b/contrib/openpam/autogen.sh @@ -1,7 +1,4 @@ #!/bin/sh -# -# $OpenPAM: autogen.sh 938 2017-04-30 21:34:42Z des $ -# libtoolize --copy --force aclocal -I m4 diff --git a/contrib/openpam/bin/Makefile.am b/contrib/openpam/bin/Makefile.am index ce57b7a74ab7..420748808ad2 100644 --- a/contrib/openpam/bin/Makefile.am +++ b/contrib/openpam/bin/Makefile.am @@ -1,5 +1,3 @@ -# $OpenPAM: Makefile.am 938 2017-04-30 21:34:42Z des $ - SUBDIRS = openpam_dump_policy if WITH_PAMTEST diff --git a/contrib/openpam/bin/Makefile.in b/contrib/openpam/bin/Makefile.in index 05e3166a03ee..8bc8aa6f51d1 100644 --- a/contrib/openpam/bin/Makefile.in +++ b/contrib/openpam/bin/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -13,8 +13,6 @@ # PARTICULAR PURPOSE. @SET_MAKE@ - -# $OpenPAM: Makefile.am 938 2017-04-30 21:34:42Z des $ VPATH = @srcdir@ am__is_gnu_make = { \ if test -z '$(MAKELEVEL)'; then \ @@ -93,10 +91,11 @@ host_triplet = @host@ @WITH_SU_TRUE@am__append_2 = su subdir = bin ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_config.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compiler_vendor.m4 \ + $(top_srcdir)/m4/ax_pkg_config.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) @@ -156,8 +155,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags DIST_SUBDIRS = openpam_dump_policy pamtest su am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -202,6 +199,12 @@ CPPFLAGS = @CPPFLAGS@ CRYB_TEST_CFLAGS = @CRYB_TEST_CFLAGS@ CRYB_TEST_LIBS = @CRYB_TEST_LIBS@ CRYB_TEST_VERSION = @CRYB_TEST_VERSION@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ *** 38391 LINES SKIPPED *** From nobody Tue Jul 4 03:18:07 2023 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 4Qw7LF0byjz4lVVF; Tue, 4 Jul 2023 03:19:01 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Qw7LD5PvNz412q; Tue, 4 Jul 2023 03:19:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688440740; 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=wpiT+PLKxuj7RP96QyJkxrIYbp+Qs81RROhHVpM9tEI=; b=TGAgKF1IyaYj2anFlHAaKszHHQAShUDdguid6FzbRV6WDGjhbb8QCGrnTQgKTtcN8Pdaf8 dSa9i9W+cQkcjf6wej7tRgh//u1Wotbj3oCdU4juPIk2TQK6tSuHvsVSmFnMcxvDXMlOKh VD67Oexiim8i078uTLLydw6b/tL/gOidn6taIcQ6KROJKMGrudlpyuxAp2Aj+B+2XLUF8m i9fa/sBSwyPrddt9UbigucJFkUfVsFipLeCdUEMfpUJzqFVDghLpMeOU+EdUAPfRN9ncfq FxdbiXLZhP+EDYbvbbWwh+hckdbswBqWBDtk6oDFf8pF1hX8tzQGdnLAU6ggmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688440740; 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=wpiT+PLKxuj7RP96QyJkxrIYbp+Qs81RROhHVpM9tEI=; b=Ezbya//dZQHnndZaquEd3fSmtz2ZT864EBtanp64l84b1K+UA12XIM2k/2+qaIYY96ozQo hIa58Q6eFh3bOfOC8ZVWFm7dl+Unzzeam4wJwvqx01Mw1pkE1NB/mr1ITvzcb4gA6Ai51t lAorVKFM5ldTniQ8J+423+bqnyw8ke73MqvdlL3zLL0jQvUuk20sZxGh3yC52+9GHYqf6M cA35Yl55dzuWlz+xEzM8Xv9uvlrc3uIVEMiiDbtOb0waDHdlh7+ew+k/vLvudfvSi4LNRH xCy8lu49Jxdgjpyns3F3fo7vUVu+045kAejmNM+0W27Zw6Su5uEJjImoadqfYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688440740; a=rsa-sha256; cv=none; b=jF6UrJKoJ7Lafbo5zMIYC79qoz6RjcfmjifWzICVU+GaYVD/ljp7DYz7efKr1M45I9H50r aHN/HAhQ0wu23OV5Mk9ua7/C+myDzWTlRKU0sFjQbCRukDFRdL8IjG06pwIthCaOLJ/jN5 +/9DhECo9IgsfWUEnjNCgH442GeNUAvwdGLtE5XdgtXHo0ri9L/ly3KJvHrcF+1Di6H4oW 63ToY6gtO7pM7A7aFwn0HrtI31m/3GcLeujuRAaOuVbGrEcV4RyYeEpLpDHeyvTa6zT+kY kRfGCABCWYxYxc97jkXxMHjj5KV3Ri4uLwlYK1xHumJ9uBLGZobiTiIc4ymVXQ== 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 4Qw7KC1t3czGR7; Tue, 4 Jul 2023 03:18:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3643I741009703; Tue, 4 Jul 2023 03:18:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3643I7kn009702; Tue, 4 Jul 2023 03:18:07 GMT (envelope-from git) Date: Tue, 4 Jul 2023 03:18:07 GMT Message-Id: <202307040318.3643I7kn009702@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 109230f383ac - stable/13 - fdescfs: improve linrdlnk mount option 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 109230f383ac5a60a7bd4e40bbde361c28c430cf Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=109230f383ac5a60a7bd4e40bbde361c28c430cf commit 109230f383ac5a60a7bd4e40bbde361c28c430cf Author: Konstantin Belousov AuthorDate: 2023-06-22 13:30:59 +0000 Commit: Konstantin Belousov CommitDate: 2023-07-04 03:06:46 +0000 fdescfs: improve linrdlnk mount option PR: 272127 (cherry picked from commit 3bffa2262328e4ff1737516f176107f607e7bc76) --- sys/fs/fdescfs/fdesc_vnops.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sys/fs/fdescfs/fdesc_vnops.c b/sys/fs/fdescfs/fdesc_vnops.c index 85a3c12f3419..b2ae6964551e 100644 --- a/sys/fs/fdescfs/fdesc_vnops.c +++ b/sys/fs/fdescfs/fdesc_vnops.c @@ -204,8 +204,9 @@ loop: fd->fd_type = ftype; fd->fd_fd = fd_fd; fd->fd_ix = ix; - if (ftype == Fdesc && fmp->flags & FMNT_LINRDLNKF) - vp->v_vflag |= VV_READLINK; + /* Cannot set v_type to VCHR */ + if (ftype == Fdesc && (fmp->flags & FMNT_LINRDLNKF) != 0) + vp->v_type = VLNK; error = insmntque1(vp, mp, fdesc_insmntque_dtr, NULL); if (error != 0) { *vpp = NULLVP; @@ -468,7 +469,8 @@ fdesc_getattr(struct vop_getattr_args *ap) break; case Fdesc: - vap->va_type = (vp->v_vflag & VV_READLINK) == 0 ? VCHR : VLNK; + vap->va_type = (VFSTOFDESC(vp->v_mount)->flags & + FMNT_LINRDLNKF) == 0 ? VCHR : VLNK; vap->va_nlink = 1; vap->va_size = 0; vap->va_rdev = makedev(0, vap->va_fileid); From nobody Tue Jul 4 03:18:08 2023 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 4Qw7LF0cSkz4lVGN; Tue, 4 Jul 2023 03:19:01 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Qw7LD435Rz41B6; Tue, 4 Jul 2023 03:19:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688440740; 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=uwdvTOfvgpzSKupmMhIwAvgAt8twWF1LpWr3dVHLe5c=; b=MPtJE4MvTJNsxWpoSG+uHvdseSI1DDPMvleoVNVoza/sRRcLbGv5FgvAWX25PkgjDLHpO+ r2o/K9SNl9AFW/BZHAJsXnMkpef+ZDssle6FMtWf46IOUJf5de+Mg790MKwGCNb7IKDwml v2tn3Ld1gbp2WOesMAz/AsXj/RunHEK+FNgIWMM81Kc6t3fPdk2jhS43HmJoNkzC9SH+Q6 kNjTcJ3BJ5/y1Msppvs/U+HVqj76eywl0ShsDLDBDNQA93ceLEjPAB4tuoE9Cei2cmwo1Q ZIBj9n4GO0oxmXIWixafwI3C/AJ/g074Rr1uCB46ynerA+QXxiJARDjXBMSyvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688440740; 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=uwdvTOfvgpzSKupmMhIwAvgAt8twWF1LpWr3dVHLe5c=; b=omXgzJCsiuOOC0IMLeScliMhbej2W4gxR7oMkA62ambFAY2sReTrlkBXdVTg5C91WaNCqX IovX7qY4o9CsvjugaQNf6IaK7zXWq0awXFH6RIWRmyDXNduGMfDYf1wWHoOFWDkVoKXAqK HSlwoW85zwCEgp9TGZMHxRCc5wjQYdDHRmk3GA8DSKzlqG4G2cV6u6XjC+8HSXWlCZYaZQ S0uGA52TnCOXNqEKlCByNQj1T7V8bekk6X35HiZRLdvIGeHiArEuNL7xANY06YycUZq6Qw wQBGUbMRYliPivdtQO9ZEhgkkpSjXvxV6fGmdCTi62GkkCkFP+2cKCGKwguF1Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688440740; a=rsa-sha256; cv=none; b=KVleE62HUbna4wmOElFPYtlvENHo2pSc1qgYS4Dej0/vV16usz3RsmwH9E+MP8L+AjQssc J16jzHVNcCsZFwR8j0y3KHYK6nyJpFoPt3PkN5Nkr+jX19fsgu0Gaw4+p7dfO5U1/YjXY6 4W20KdG0dohOSyv3+9XrwGKsfpuj1bm5Y2ys5uydJkKVnDmgOPCPE4qvaQcte0nBy9N9u3 RTvrRFMASuW4EKGktB6yTrKH8hVtIXdazEaLq+I8m6kXNPI6wrDEoiXo8WzvofuVsRBSat TKawFJqjC2gUdBUUqNiiIEtSYklTeXL4YL3QbCLdZTuvYtYwfKsorxsMf/nlbw== 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 4Qw7KD2qW9zGlM; Tue, 4 Jul 2023 03:18:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3643I8De009722; Tue, 4 Jul 2023 03:18:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3643I8EL009721; Tue, 4 Jul 2023 03:18:08 GMT (envelope-from git) Date: Tue, 4 Jul 2023 03:18:08 GMT Message-Id: <202307040318.3643I8EL009721@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: be9fd6f1f283 - stable/13 - VFS: Remove VV_READLINK flag 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: be9fd6f1f283e2ba11916dbb75dc1823cc25b24f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=be9fd6f1f283e2ba11916dbb75dc1823cc25b24f commit be9fd6f1f283e2ba11916dbb75dc1823cc25b24f Author: Konstantin Belousov AuthorDate: 2023-06-21 16:37:30 +0000 Commit: Konstantin Belousov CommitDate: 2023-07-04 03:06:46 +0000 VFS: Remove VV_READLINK flag (cherry picked from commit 4a402dfe0bc44770c9eac6e58a501e4805e29413) --- sys/kern/vfs_subr.c | 5 +---- sys/kern/vfs_syscalls.c | 2 +- sys/sys/vnode.h | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 2002f3b81937..dd742277a98f 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -4263,12 +4263,9 @@ vn_printf(struct vnode *vp, const char *fmt, ...) strlcat(buf, "|VV_MD", sizeof(buf)); if (vp->v_vflag & VV_FORCEINSMQ) strlcat(buf, "|VV_FORCEINSMQ", sizeof(buf)); - if (vp->v_vflag & VV_READLINK) - strlcat(buf, "|VV_READLINK", sizeof(buf)); flags = vp->v_vflag & ~(VV_ROOT | VV_ISTTY | VV_NOSYNC | VV_ETERNALDEV | VV_CACHEDLABEL | VV_VMSIZEVNLOCK | VV_COPYONWRITE | VV_SYSTEM | - VV_PROCDEP | VV_NOKNOTE | VV_DELETED | VV_MD | VV_FORCEINSMQ | - VV_READLINK); + VV_PROCDEP | VV_NOKNOTE | VV_DELETED | VV_MD | VV_FORCEINSMQ); if (flags != 0) { snprintf(buf2, sizeof(buf2), "|VV(0x%lx)", flags); strlcat(buf, buf2, sizeof(buf)); diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c index 7f7836450811..b7cdac8540da 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -2660,7 +2660,7 @@ kern_readlink_vp(struct vnode *vp, char *buf, enum uio_seg bufseg, size_t count, if (error != 0) return (error); #endif - if (vp->v_type != VLNK && (vp->v_vflag & VV_READLINK) == 0) + if (vp->v_type != VLNK) return (EINVAL); aiov.iov_base = buf; diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h index 543eb06f2f16..82e9ba9a2237 100644 --- a/sys/sys/vnode.h +++ b/sys/sys/vnode.h @@ -271,7 +271,7 @@ struct xvnode { #define VV_DELETED 0x0400 /* should be removed */ #define VV_MD 0x0800 /* vnode backs the md device */ #define VV_FORCEINSMQ 0x1000 /* force the insmntque to succeed */ -#define VV_READLINK 0x2000 /* fdescfs linux vnode */ +#define VV_UNUSED01 0x2000 /* was: fdescfs linux vnode */ #define VV_UNREF 0x4000 /* vunref, do not drop lock in inactive() */ #define VV_UNLINKED 0x8000 /* unlinked but stil open directory */ From nobody Tue Jul 4 03:18:09 2023 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 4Qw7LG19KWz4lVQ4; Tue, 4 Jul 2023 03:19: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Qw7LF54cQz41B9; Tue, 4 Jul 2023 03:19:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688440741; 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=s4HIx2RQJmwBhcS05pGB+EkkNo/SGyKL24PWggpt2p0=; b=EZ34fPWNyEXF9vSRNZ5v1Cq/QtqeKuEHxGmun1PnaPkhcI2vhp6TkR0c5Za81ogWG6SIjz h+FIa9lXB77HmwcpkRYcxuq9QesX3crMpP86sSR+QswAcAMsb00F00U0lSwEMcTCp2DCaY FNDnazTUg4t6mxNff+V8KZSHyTAphD/DDfweqMiLkRoJn2MR4DEtVscdX0mgMvxF0b5Uib DhQ76t7XZNXvEotmZx7RaSl65uHxRBopYFw40kqskoqRtf+EaAs/mlqqCBWcm3YPec8eej 9BwwI16Mg4IGVh7LuR68wy/K4puYTPpi/T02e2nLqEQos7SwkYRMrzJrdwElBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688440741; 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=s4HIx2RQJmwBhcS05pGB+EkkNo/SGyKL24PWggpt2p0=; b=QmV2aKUj31UUJugz3mj2OX/DBfR/2hnWpuo6QqcVSo4emMycxqnF4YoLhsHu+0peg2rzS9 Y4oTsPYRXVE9A021HWDgh4PTwU9VVRRpPFNVz+Q/Xx+dx27vFFFbNXuq+X8JAkZToI22zE tVrqslIqgk8cN/dGzpxVfeczpNXeSJSWBC6Vbmx+lIEvzxrJY04D79qjSm8CHjrQPwtzBs 7TOL9+SqNwlRnFR67VSxX7Xk5Y0dzryV1kN8cUsi1Hg9Vq+volsj5IZJay3Ngh72T3veqa qPQBsII1+Rq9XkVbsIauEi13ob+DSNBYrrWa23YD2TMm3Sm36MfgR8naWjHr3A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688440741; a=rsa-sha256; cv=none; b=BOclPR+iKg7A42M3bKqA7B0lJNXEVwfQnNoQoB2jZ9serNEn3TbVie8Bf8uEyOpAM6YjIL 678NccVhcd0rMmmAmhw+JASZIZrYvVp2K9d14/J7ZQKAiY58xwsZM4M+IJd1drrAlhLQCy g7aOChKjpIHVzXCEpkM5krhP3mBgZT3PNEiuC/784aLEFpmry+GfwbLC4mRpIW2O4pv3WQ 6LCsCnyVg/ZkDEz9XgOOY6dNuLvxGyPY5ts3TOeh2ucdvCbKftNB71L3IDxk50m5hikr// kIs5BJpHUxkC+xYTR3Fz7djFLvaRjqagTFdjl9CuA/V+M7yBNChc4eaiPAcXBQ== 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 4Qw7KF3ln1zGkV; Tue, 4 Jul 2023 03:18:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3643I9Ff009746; Tue, 4 Jul 2023 03:18:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3643I9iR009745; Tue, 4 Jul 2023 03:18:09 GMT (envelope-from git) Date: Tue, 4 Jul 2023 03:18:09 GMT Message-Id: <202307040318.3643I9iR009745@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 6f21f94b1583 - stable/13 - vm_fault: move FAULT_* return codes out of range for Mach errors 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6f21f94b158382762d528c514b58aa96c8ecdcd9 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6f21f94b158382762d528c514b58aa96c8ecdcd9 commit 6f21f94b158382762d528c514b58aa96c8ecdcd9 Author: Konstantin Belousov AuthorDate: 2023-06-27 11:41:14 +0000 Commit: Konstantin Belousov CommitDate: 2023-07-04 03:07:01 +0000 vm_fault: move FAULT_* return codes out of range for Mach errors (cherry picked from commit ef747607ead43552cb3ebb093fadd2c39c56a36d) --- sys/vm/vm_fault.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/vm/vm_fault.c b/sys/vm/vm_fault.c index 4872990c33ec..51fb51f69f3d 100644 --- a/sys/vm/vm_fault.c +++ b/sys/vm/vm_fault.c @@ -159,7 +159,7 @@ struct faultstate { * Return codes for internal fault routines. */ enum fault_status { - FAULT_SUCCESS = 1, /* Return success to user. */ + FAULT_SUCCESS = 10000, /* Return success to user. */ FAULT_FAILURE, /* Return failure to user. */ FAULT_CONTINUE, /* Continue faulting. */ FAULT_RESTART, /* Restart fault. */ From nobody Tue Jul 4 03:19:04 2023 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 4Qw7LJ6jWtz4lVVh; Tue, 4 Jul 2023 03:19:04 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Qw7LJ5skzz41Nx; Tue, 4 Jul 2023 03:19:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688440744; 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=siF9ADhVa9iSMQcGbDx8ALTcrNuTjm0Cg/0SZo8wTd8=; b=GhawuJSYT3Agd6ucEczVAKrM65x7cMx3XIdn9KK4+0K2AjqJpZ7nNHEGd8tS+028LUV42Q nI8s8LE5RSbwtCqGWBrv3IqBmZiV2ZmcP23s84kH/WeHjG4wk5KTl3f9G1OI9CWRsrM3aJ AlePyc/W6MVRFLOlmZuHnT+/8HYip9BaJWwgAVs5IiPSHsI7aJinU8br3L6kmN8XWzSDTq a5VXW4tpbndKlEsm34F8YcnKsX8RZuSjsIL05nB+btqjqGFJOvwxzeRGLYHrMIEWZgeIig xHRBJimT98DsjC4lT1s0bSvXFBfE1A75bnwc2CjH9EH2PlWrmeqUaWhv8hbKNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688440744; 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=siF9ADhVa9iSMQcGbDx8ALTcrNuTjm0Cg/0SZo8wTd8=; b=udyLq7ggb+YJaHZR75E9V2fKl2DMaoUxBoB2052zBmZ5SS/mKCqZbHRlskYrOmtuRj+maf 8MkIBojosGuMpiMRT3cIrZojdqQEtZntMAmJkO9ssuZYvyUztUJ5AJR61Aqs+ZW4N146c7 N+/UN+H54AUPJTWu/DivwmIjFSNiP+PZ1V0rhusJHkOkmZ3WwFLOSmshHHVvT6Fs5vUX8j 324SjxAN6kJPWTQtq21MnRX/2AopaKOCBt9KAnZ+TBQmU0LCFEU84RG4PmP/XNh/4VxXHI VFIeeQ8E/xTeq1aYgct6Z4UUypIVigkLjy/YO43Mk8oetQNxYWji8UIwaoiC9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688440744; a=rsa-sha256; cv=none; b=pWsare7Yrx+WMYeEmLQLf8QZhF2Ooo6FQ1jFeaVTPoMQloA9lowj0M7bvp5Z6mck0gLbU4 Tw23yBy1bW04FhGLFjjK9Pnuv45BQiadOLRlaaJQSs0ps76jNgk7z6KykXONenj6mTc8NG jKfhw6l93qTNkwHQJyXKVuNDJ0G+nRiiollDXBWATZWC/9PYyNLoDECnENQaDSWblpjgsH 8GzmfWj/1afyxjZ32ShWI7+gk0eZEvTvklYQoTpcLhT58ixhf4viEGp4FOKsZu2iCYCDAC D7eTYkdvZ/M6k78xzgoetAL+7ypA6xBN+gj+NdDA4hjbUZ0rUt0gxQ4ZZCy7cA== 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 4Qw7LJ4pv0zGR8; Tue, 4 Jul 2023 03:19:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3643J4pL009961; Tue, 4 Jul 2023 03:19:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3643J4hC009960; Tue, 4 Jul 2023 03:19:04 GMT (envelope-from git) Date: Tue, 4 Jul 2023 03:19:04 GMT Message-Id: <202307040319.3643J4hC009960@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: bdadd506cae4 - stable/13 - vn_lock_pair(): allow to request shared locking 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: bdadd506cae4e57010a8e1fed5d14b2b3af48939 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=bdadd506cae4e57010a8e1fed5d14b2b3af48939 commit bdadd506cae4e57010a8e1fed5d14b2b3af48939 Author: Konstantin Belousov AuthorDate: 2023-04-06 04:11:08 +0000 Commit: Konstantin Belousov CommitDate: 2023-07-04 03:07:02 +0000 vn_lock_pair(): allow to request shared locking (cherry picked from commit bb24eaea498268572aa140c35c02e02884cdf930) --- sys/kern/vfs_vnops.c | 86 ++++++++++++++++++++++++++++++++--------------- sys/sys/vnode.h | 4 +-- sys/ufs/ffs/ffs_softdep.c | 10 +++--- sys/ufs/ufs/ufs_vnops.c | 2 +- 4 files changed, 68 insertions(+), 34 deletions(-) diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c index dfaa6868c567..e314739fa0ad 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -3868,50 +3868,74 @@ vn_lock_pair_pause(const char *wmesg) /* * Lock pair of vnodes vp1, vp2, avoiding lock order reversal. - * vp1_locked indicates whether vp1 is exclusively locked; if not, vp1 - * must be unlocked. Same for vp2 and vp2_locked. One of the vnodes - * can be NULL. + * vp1_locked indicates whether vp1 is locked; if not, vp1 must be + * unlocked. Same for vp2 and vp2_locked. One of the vnodes can be + * NULL. * - * The function returns with both vnodes exclusively locked, and - * guarantees that it does not create lock order reversal with other - * threads during its execution. Both vnodes could be unlocked - * temporary (and reclaimed). + * The function returns with both vnodes exclusively or shared locked, + * according to corresponding lkflags, and guarantees that it does not + * create lock order reversal with other threads during its execution. + * Both vnodes could be unlocked temporary (and reclaimed). + * + * If requesting shared locking, locked vnode lock must not be recursed. */ void -vn_lock_pair(struct vnode *vp1, bool vp1_locked, struct vnode *vp2, - bool vp2_locked) +vn_lock_pair(struct vnode *vp1, bool vp1_locked, int lkflags1, + struct vnode *vp2, bool vp2_locked, int lkflags2) { int error; + MPASS(lkflags1 == LK_SHARED || lkflags1 == LK_EXCLUSIVE); + MPASS(lkflags2 == LK_SHARED || lkflags2 == LK_EXCLUSIVE); + if (vp1 == NULL && vp2 == NULL) return; + if (vp1 != NULL) { - if (vp1_locked) - ASSERT_VOP_ELOCKED(vp1, "vp1"); - else + if (lkflags1 == LK_SHARED && + (vp1->v_vnlock->lock_object.lo_flags & LK_NOSHARE) != 0) + lkflags1 = LK_EXCLUSIVE; + if (vp1_locked && VOP_ISLOCKED(vp1) != LK_EXCLUSIVE) { + ASSERT_VOP_LOCKED(vp1, "vp1"); + if (lkflags1 == LK_EXCLUSIVE) { + VOP_UNLOCK(vp1); + ASSERT_VOP_UNLOCKED(vp1, + "vp1 shared recursed"); + vp1_locked = false; + } + } else if (!vp1_locked) ASSERT_VOP_UNLOCKED(vp1, "vp1"); } else { vp1_locked = true; } + if (vp2 != NULL) { - if (vp2_locked) - ASSERT_VOP_ELOCKED(vp2, "vp2"); - else + if (lkflags2 == LK_SHARED && + (vp2->v_vnlock->lock_object.lo_flags & LK_NOSHARE) != 0) + lkflags2 = LK_EXCLUSIVE; + if (vp2_locked && VOP_ISLOCKED(vp2) != LK_EXCLUSIVE) { + ASSERT_VOP_LOCKED(vp2, "vp2"); + if (lkflags2 == LK_EXCLUSIVE) { + VOP_UNLOCK(vp2); + ASSERT_VOP_UNLOCKED(vp2, + "vp2 shared recursed"); + vp2_locked = false; + } + } else if (!vp2_locked) ASSERT_VOP_UNLOCKED(vp2, "vp2"); } else { vp2_locked = true; } + if (!vp1_locked && !vp2_locked) { - vn_lock(vp1, LK_EXCLUSIVE | LK_RETRY); + vn_lock(vp1, lkflags1 | LK_RETRY); vp1_locked = true; } - for (;;) { - if (vp1_locked && vp2_locked) - break; + while (!vp1_locked || !vp2_locked) { if (vp1_locked && vp2 != NULL) { if (vp1 != NULL) { - error = VOP_LOCK1(vp2, LK_EXCLUSIVE | LK_NOWAIT, + error = VOP_LOCK1(vp2, lkflags2 | LK_NOWAIT, __FILE__, __LINE__); if (error == 0) break; @@ -3919,12 +3943,12 @@ vn_lock_pair(struct vnode *vp1, bool vp1_locked, struct vnode *vp2, vp1_locked = false; vn_lock_pair_pause("vlp1"); } - vn_lock(vp2, LK_EXCLUSIVE | LK_RETRY); + vn_lock(vp2, lkflags2 | LK_RETRY); vp2_locked = true; } if (vp2_locked && vp1 != NULL) { if (vp2 != NULL) { - error = VOP_LOCK1(vp1, LK_EXCLUSIVE | LK_NOWAIT, + error = VOP_LOCK1(vp1, lkflags1 | LK_NOWAIT, __FILE__, __LINE__); if (error == 0) break; @@ -3932,14 +3956,22 @@ vn_lock_pair(struct vnode *vp1, bool vp1_locked, struct vnode *vp2, vp2_locked = false; vn_lock_pair_pause("vlp2"); } - vn_lock(vp1, LK_EXCLUSIVE | LK_RETRY); + vn_lock(vp1, lkflags1 | LK_RETRY); vp1_locked = true; } } - if (vp1 != NULL) - ASSERT_VOP_ELOCKED(vp1, "vp1 ret"); - if (vp2 != NULL) - ASSERT_VOP_ELOCKED(vp2, "vp2 ret"); + if (vp1 != NULL) { + if (lkflags1 == LK_EXCLUSIVE) + ASSERT_VOP_ELOCKED(vp1, "vp1 ret"); + else + ASSERT_VOP_LOCKED(vp1, "vp1 ret"); + } + if (vp2 != NULL) { + if (lkflags2 == LK_EXCLUSIVE) + ASSERT_VOP_ELOCKED(vp2, "vp2 ret"); + else + ASSERT_VOP_LOCKED(vp2, "vp2 ret"); + } } int diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h index 82e9ba9a2237..e79bd1c9ddba 100644 --- a/sys/sys/vnode.h +++ b/sys/sys/vnode.h @@ -761,8 +761,8 @@ bool vn_isdisk_error(struct vnode *vp, int *errp); bool vn_isdisk(struct vnode *vp); int _vn_lock(struct vnode *vp, int flags, const char *file, int line); #define vn_lock(vp, flags) _vn_lock(vp, flags, __FILE__, __LINE__) -void vn_lock_pair(struct vnode *vp1, bool vp1_locked, struct vnode *vp2, - bool vp2_locked); +void vn_lock_pair(struct vnode *vp1, bool vp1_locked, int lkflags1, + struct vnode *vp2, bool vp2_locked, int lkflags2); int vn_open(struct nameidata *ndp, int *flagp, int cmode, struct file *fp); int vn_open_cred(struct nameidata *ndp, int *flagp, int cmode, u_int vn_open_flags, struct ucred *cred, struct file *fp); diff --git a/sys/ufs/ffs/ffs_softdep.c b/sys/ufs/ffs/ffs_softdep.c index ff72dad97250..c86ae35ee8c5 100644 --- a/sys/ufs/ffs/ffs_softdep.c +++ b/sys/ufs/ffs/ffs_softdep.c @@ -3323,7 +3323,7 @@ softdep_prelink(struct vnode *dvp, if (vp != NULL) { VOP_UNLOCK(dvp); ffs_syncvnode(vp, MNT_NOWAIT, 0); - vn_lock_pair(dvp, false, vp, true); + vn_lock_pair(dvp, false, LK_EXCLUSIVE, vp, true, LK_EXCLUSIVE); if (dvp->v_data == NULL) goto out; } @@ -3335,7 +3335,8 @@ softdep_prelink(struct vnode *dvp, VOP_UNLOCK(dvp); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); if (vp->v_data == NULL) { - vn_lock_pair(dvp, false, vp, true); + vn_lock_pair(dvp, false, LK_EXCLUSIVE, vp, true, + LK_EXCLUSIVE); goto out; } ACQUIRE_LOCK(ump); @@ -3345,7 +3346,8 @@ softdep_prelink(struct vnode *dvp, VOP_UNLOCK(vp); vn_lock(dvp, LK_EXCLUSIVE | LK_RETRY); if (dvp->v_data == NULL) { - vn_lock_pair(dvp, true, vp, false); + vn_lock_pair(dvp, true, LK_EXCLUSIVE, vp, false, + LK_EXCLUSIVE); goto out; } } @@ -3360,7 +3362,7 @@ softdep_prelink(struct vnode *dvp, journal_check_space(ump); FREE_LOCK(ump); - vn_lock_pair(dvp, false, vp, false); + vn_lock_pair(dvp, false, LK_EXCLUSIVE, vp, false, LK_EXCLUSIVE); out: ndp->ni_dvp_seqc = vn_seqc_read_any(dvp); if (vp != NULL) diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c index 985641b02378..41bbb701c4fc 100644 --- a/sys/ufs/ufs/ufs_vnops.c +++ b/sys/ufs/ufs/ufs_vnops.c @@ -230,7 +230,7 @@ ufs_sync_nlink(struct vnode *vp, struct vnode *vp1) if (vp1 != NULL) VOP_UNLOCK(vp1); error = ufs_sync_nlink1(mp); - vn_lock_pair(vp, false, vp1, false); + vn_lock_pair(vp, false, LK_EXCLUSIVE, vp1, false, LK_EXCLUSIVE); return (error); } From nobody Tue Jul 4 12:41:30 2023 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 4QwMqG3fkGz4lJDp; Tue, 4 Jul 2023 12:41:30 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QwMqG2ScDz43fc; Tue, 4 Jul 2023 12:41:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688474490; 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=w/AEwCISP6jF13U7dqdxuqbhkaSUmQaeCVG69fywyHQ=; b=LxH/CacfngqdBFwyReqt/1KKlqCI0wkmSEdeg/qZ4OaCkUn+pVMhQsfrnc149QGOLsuHEA +jR8WUa9EPVQzjq9dlCpeSmDvE0R0vqsucQjOkyOWJXslpZK3nlry23RIKDs5NEjfCZqEH 4vp8udcAYIQxWIsLkrQjAC2pKlnbdSGSvDolY20QngSoYFBApG4zc0J3jxRm1DgV+lRTVR jMx7ICFx4n6rbkc9ABLzBlRMgmJ5pM7Qm6eUBi/0jb/GhAArUZNU2QjhnBYXP1g0U2EBKa 0hzrZRspZagIUS6TjnC+06iEl2B/FwjMbB1VO6CfHH5zMLCp0X7KF+2/W0E/mg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688474490; 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=w/AEwCISP6jF13U7dqdxuqbhkaSUmQaeCVG69fywyHQ=; b=s9F/ZU8CEWpOC49yfx5x8W+KhU9raEvbeNa8lm3WeCC2CdDpDvyET5CuRpAruMT8KziMad N5TonWSkgdL/H+ms+KG7qgGGcIMcLBsmojyI6IPYjHA/XPI0K2ZIhiFJr8DezJ5ObKMz88 erKeD0qbb8THOoKJp3LZCWc0YHw+WbOSDjHNZS+rsOkp/5RbixukCpZ2/ru2Aikqaav3In k2UaH26SiKe4qrMA1HH+sWOmwsjyvqgfS+vBy/v33Xs1T4CBq5LatiyPGcOcNY8f3Mlt62 EkLvtNjmFQ1SHwzzVC4Gz29wdfzWwmqMpts6pQ8HJfSU0jV4vKrU9Re/Q2rw0A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688474490; a=rsa-sha256; cv=none; b=mT58ePZvqrgjWZNJPkMMVA1JEwes57CNGAT5kPl/b68/A4Bm3ivWu7Mbsco3Tes7p48OtI bkwngBXJFb4S6A2yZny08xX3W3dX8Dj/bLqujbtEnIy9iSA2vx3M9RSHbUUhwpk0TYrpCq 6g7qVa8n7RxcEBfUfJ09Y2nmdGpon5OAPRIDZFx7B/ktZFEWcpFq+h1MX4UvInu6rnFdd7 DH75nT9ApkvY/PEKQ4qtZ7rXHV/s5X/8MkvsSr62ulp7NPDfD1Rr5Itku2WU8Rhm/GWVUB PwUocwHzowNq+CVjxkoPRSqgOSFFIH5BEqUaOobTpX4/4t65nHU4KHxYPNF6jQ== 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 4QwMqG1WZ8zY02; Tue, 4 Jul 2023 12:41:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 364CfUCG048054; Tue, 4 Jul 2023 12:41:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 364CfUpx048053; Tue, 4 Jul 2023 12:41:30 GMT (envelope-from git) Date: Tue, 4 Jul 2023 12:41:30 GMT Message-Id: <202307041241.364CfUpx048053@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ka Ho Ng Subject: git: 4c20e26e26ec - stable/13 - syscalls: fix modspecific_t stack content leak 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: khng X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 4c20e26e26ec33664475900de028c9e77bffd8bf Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by khng: URL: https://cgit.FreeBSD.org/src/commit/?id=4c20e26e26ec33664475900de028c9e77bffd8bf commit 4c20e26e26ec33664475900de028c9e77bffd8bf Author: Ka Ho Ng AuthorDate: 2023-06-27 19:33:46 +0000 Commit: Ka Ho Ng CommitDate: 2023-07-04 12:41:07 +0000 syscalls: fix modspecific_t stack content leak Zero-initialize the whole modspecific_t so that there would not be kernel stack content leak in the unused part. Sponsored by: Juniper Networks, Inc. Differential Revision: https://reviews.freebsd.org/D40815 (cherry picked from commit 2cab2d43b83bddd44ecc1f267afb5e2725975ac7) --- sys/kern/kern_syscalls.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/kern_syscalls.c b/sys/kern/kern_syscalls.c index b4fec879708a..fa1df225ee3b 100644 --- a/sys/kern/kern_syscalls.c +++ b/sys/kern/kern_syscalls.c @@ -173,7 +173,7 @@ kern_syscall_module_handler(struct sysent *sysents, struct module *mod, int what, void *arg) { struct syscall_module_data *data = arg; - modspecific_t ms; + modspecific_t ms = { 0 }; int error; switch (what) { From nobody Tue Jul 4 12:53:08 2023 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 4QwN4j0RxWz4lPf4; Tue, 4 Jul 2023 12:53:09 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QwN4h6DGpz463p; Tue, 4 Jul 2023 12:53:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688475188; 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=B68Mbnr3RJTqbeEcP4ClHgbAaPhYyHipyd60bcS/Ufo=; b=PUMrwiGcDLbe/WvbtQ9qu29XZvSvhwTwt7EsKnlvi9PRuR/fGRDMO/uCL4XhKj7wjcIDAO XyGip9Y6wSj/mSCfuBnwHWNmY8R/V/EE8T8fY4MnxtdoizpapodzwpVC4t16tAI3KFrOtu Sj5P5eafhy6ItxK+INp7w/RyTXwEI4pWnE/lat0DsvOjgXfHTajTY/zGrv6k6BHg8pAz6I 8QKyHFbLIuvTtg7ycdPBm9WeFp6rfoWFboSIySjx9TbbzAFwISR4lNntBAyovD2ybB3Gnw St1stuGaFIz5MxqvBGwZYe9ITx5IG7tuLIoT8x269i7AaIpSG8+E5AADbmgyTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688475188; 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=B68Mbnr3RJTqbeEcP4ClHgbAaPhYyHipyd60bcS/Ufo=; b=AHiuWlZlTWOCwRvV56D/QBdJ15YphInrm8Ho/1rpp6Zjn9aum3+YdeM/4SZkeRekoY1150 GOE7J6PF7HNgaxD7Sk2heXDNW5vNjiSSFrdE1Xv1MC4r9YqXPPALdOSw5il2bjam/DvTOn zpdhgZWB3JWHXQOaurov2NOLACWIfWN6T3p96WKnaOfuRhuuYri1lvQG0X03UaVhwobG1n VMorVM/XXbnCf6CNI25IFAkvRSj6xtK8nUc3J5nO7brnsWpfKOUoKASNckgL46IidK2lNY 25yheCwt6NNegr+cjtqHc4Mn4aAEBngOTAMJK17xysLIPOS0/yvpQY6EvuPnTw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688475188; a=rsa-sha256; cv=none; b=GuCIXcBKPtSJYJRds58zX3v6GtIrj7zgYTU2f7+sF23iHUKld9ayIkxY1GHblk93DflaB6 C+u0IatWdTCZP8kRnbqLjSiZrJGuzBPlzq7iSCrg/ibxZZUNAaAV9JCYER2g8fC570JvJn Jxf1XnwbZOz4jDEY+v/c+JoS9Vg9oiDA9qXjE+tVctFy5UnfTnWWdfvrfMzxXUeNmMTBMD G53WBX2VKHSYOmUXh0g8ERaobOCWTrEPHk3xgnN5p/gIcKK01vAK1a7iWNEHGBnEjCyiAZ q0O0OiN7Oe9tkdgSlHF4ZdkjFTBE2hA+azG7MBpAHSbH4l92W0m86ddm0xy0dw== 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 4QwN4h5J9nzY8D; Tue, 4 Jul 2023 12:53:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 364Cr88K067007; Tue, 4 Jul 2023 12:53:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 364Cr82H067006; Tue, 4 Jul 2023 12:53:08 GMT (envelope-from git) Date: Tue, 4 Jul 2023 12:53:08 GMT Message-Id: <202307041253.364Cr82H067006@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ka Ho Ng Subject: git: 2d148ce84d29 - stable/12 - syscalls: fix modspecific_t stack content leak 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: khng X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 2d148ce84d29321f5f1a0ccb405c5238f5859005 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by khng: URL: https://cgit.FreeBSD.org/src/commit/?id=2d148ce84d29321f5f1a0ccb405c5238f5859005 commit 2d148ce84d29321f5f1a0ccb405c5238f5859005 Author: Ka Ho Ng AuthorDate: 2023-06-27 19:33:46 +0000 Commit: Ka Ho Ng CommitDate: 2023-07-04 12:52:50 +0000 syscalls: fix modspecific_t stack content leak Zero-initialize the whole modspecific_t so that there would not be kernel stack content leak in the unused part. Sponsored by: Juniper Networks, Inc. Differential Revision: https://reviews.freebsd.org/D40815 (cherry picked from commit 2cab2d43b83bddd44ecc1f267afb5e2725975ac7) --- sys/kern/kern_syscalls.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/kern_syscalls.c b/sys/kern/kern_syscalls.c index 035e169bbe0e..0af8e18890c8 100644 --- a/sys/kern/kern_syscalls.c +++ b/sys/kern/kern_syscalls.c @@ -164,7 +164,7 @@ kern_syscall_module_handler(struct sysent *sysents, struct module *mod, int what, void *arg) { struct syscall_module_data *data = arg; - modspecific_t ms; + modspecific_t ms = { 0 }; int error; switch (what) { From nobody Wed Jul 5 12:35:10 2023 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 4QwzdV6x7Qz4lsq7; Wed, 5 Jul 2023 12:35:10 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QwzdV6TM5z4G3B; Wed, 5 Jul 2023 12:35:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688560510; 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=bktnkrZnD63MQRjQiwVfd31IjV6s9dgJfsuOj4mwm+Q=; b=hc0Hc0gLfwXLO3ESLf5ZoZ8QS8l/N93IgVEV78RXXSvityYa/v8mR6HquPDiCkfzWP8+hn 4WmxFsyrsvJYbW8Hx4LPkVQL5JNSkoFO8S39ut/ifMMsk3eLV1FUGEI3UAkFha2KZtG2+u EeVQ5IDLq/JRoEuO9dEknBCBdEL5nAuVKy3zqq51wgh/Vp1I806+l7GUMG4wca8NHJgOQh zS2tlwwpbDa67rH7X0RllaxpfYXdFrOmRzD4b1Ntc9Kk6Jrhakszen1Y80VJcpYeQZHivr fldpnCpgzxOyEX1z4qww1fy66sMRKMSyNEW3mGBufqbnPcodQKIWwTo0XfJF+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688560510; 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=bktnkrZnD63MQRjQiwVfd31IjV6s9dgJfsuOj4mwm+Q=; b=pFJ9ftxQmH/9nvJ84znt8ptbTnZV3Q+x5VqMabpCCD3T66SrpOFCHKRXSWsXjlW3hG6KNq FX6DEaUE0seh+tQM2rmDUKzZUyQVMZkdbyCvqgr59hwAsIM82BS0r35oIUvEopKDN6COGB ZZ62sArjLKnERvdte/puuXv/E7UtXYmgs+HAC/UTt7XzswKXBhfXkflUfWQODPRHyTL7SV Rtxh8DAC35mSNN90ku495RE9J+bpN9QGYMXq8DjUbVIW0RXf9OekyYgQM9Z84Z5QlhnCOc LExaiNbffzOBjsit/yFn3368YaXci38Mbe7IB1REt1UTQIb7hTKA8QfoPD1thA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688560510; a=rsa-sha256; cv=none; b=UipvCn3coH2frd8xLkOlP4nsc0gl1m/MslZHBGC17fVr70Dg4G53zZQ3JsZhgS7g40ryRr bvkYYnHCadUTIpY5+GgPFjRVaHf23tkXkW3+MpHl0qBsnriQ4dk86JNYCbSyWl8pK5lERN DC7AX6+ZGBzi8FO13C9GKkMJdUeGf1qXUABnNimmXrKD/2HdKWGvUbLxWGKBmKdKMoNClc wGDPqYb0AYGNlnF8mt0MHdiRZfizRljL8KWoIihqni1DAKR9K4vzwLiuAKjKbeH6KenI38 9qJG+GyK0jtJdJPVqQQk0QBC3pCjpJ9cVC9Nd+tSMlYkmMgt2c5VPR2zKwYL/Q== 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 4QwzdV5YfhzFTX; Wed, 5 Jul 2023 12:35:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 365CZAdG020429; Wed, 5 Jul 2023 12:35:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 365CZA8E020428; Wed, 5 Jul 2023 12:35:10 GMT (envelope-from git) Date: Wed, 5 Jul 2023 12:35:10 GMT Message-Id: <202307051235.365CZA8E020428@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Guzik Subject: git: cbca929869a8 - stable/13 - libpthread: allocate rwlocks and spinlocks in dedicated cachelines 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: cbca929869a818c9b3353753df71210816a126d6 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=cbca929869a818c9b3353753df71210816a126d6 commit cbca929869a818c9b3353753df71210816a126d6 Author: Greg Becker AuthorDate: 2023-06-27 01:08:29 +0000 Commit: Mateusz Guzik CommitDate: 2023-07-05 12:34:09 +0000 libpthread: allocate rwlocks and spinlocks in dedicated cachelines Reduces severe performance degradation due to false-sharing. Note that this does not account for hardware which can perform adjacent cacheline prefetch. [mjg: massaged the commit message and the patch to use aligned_alloc instead of malloc] PR: 272238 MFC after: 1 week (cherry picked from commit a6c0d801ca5934bb9b9cca6870ea7406d5db0641) --- lib/libthr/thread/thr_pspinlock.c | 3 ++- lib/libthr/thread/thr_rwlock.c | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/libthr/thread/thr_pspinlock.c b/lib/libthr/thread/thr_pspinlock.c index d1a53446f654..b1b8164c9777 100644 --- a/lib/libthr/thread/thr_pspinlock.c +++ b/lib/libthr/thread/thr_pspinlock.c @@ -60,7 +60,8 @@ _pthread_spin_init(pthread_spinlock_t *lock, int pshared) if (lock == NULL) return (EINVAL); if (pshared == PTHREAD_PROCESS_PRIVATE) { - lck = malloc(sizeof(struct pthread_spinlock)); + lck = aligned_alloc(CACHE_LINE_SIZE, + roundup(sizeof(struct pthread_spinlock), CACHE_LINE_SIZE)); if (lck == NULL) return (ENOMEM); *lock = lck; diff --git a/lib/libthr/thread/thr_rwlock.c b/lib/libthr/thread/thr_rwlock.c index 1d110a7bf285..8457250e60f7 100644 --- a/lib/libthr/thread/thr_rwlock.c +++ b/lib/libthr/thread/thr_rwlock.c @@ -32,6 +32,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include "namespace.h" #include @@ -102,9 +103,11 @@ rwlock_init(pthread_rwlock_t *rwlock, const pthread_rwlockattr_t *attr) if (attr == NULL || *attr == NULL || (*attr)->pshared == PTHREAD_PROCESS_PRIVATE) { - prwlock = calloc(1, sizeof(struct pthread_rwlock)); + prwlock = aligned_alloc(CACHE_LINE_SIZE, + roundup(sizeof(struct pthread_rwlock), CACHE_LINE_SIZE)); if (prwlock == NULL) return (ENOMEM); + memset(prwlock, 0, sizeof(struct pthread_rwlock)); *rwlock = prwlock; } else { prwlock = __thr_pshared_offpage(rwlock, 1); From nobody Wed Jul 5 13:07:54 2023 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 4Qx0MH0FgCz4mDm7; Wed, 5 Jul 2023 13:07:55 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Qx0MG6mSDz3CQw; Wed, 5 Jul 2023 13:07:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688562475; 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=3ftFMI6ZBFPGl26R3glg6WPHH7DeXFtoI9k0rJhiEcM=; b=nVrGxiBpt3mpocPhG8HCzceiwWLT85iZ+layVpGvk7k27trZYSCfLUu5oDUeWKen33h8mS UtulHGRie4yUMPDn0QKrykCujLcZKNBoFiaE9zeq0L3Qa5C2T3ARW863nN8j+O99QgFukG FLlqqQyflZ7I7re/pl7m3byUc0U63RZhBVJEbfSZhm4nCiu3sBoGLmqKDAnz5aQeiunxNi XOhZ6WTTeNiIpy5n57l7Ipg9f8BM5o2LZYKfESU4QORgP5rnsgaD7D0G5BFeupVNOm/yuM oWyPEwgbVDBGj5zudoQAaYwW5w32a35WC/jJ9AZPOYtoEBOmWHLu9ITHrEl+Iw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688562474; 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=3ftFMI6ZBFPGl26R3glg6WPHH7DeXFtoI9k0rJhiEcM=; b=ZzN34+tMk4/vtXSC7TYdTj5U4Zm+E7zOIA4V2zX4q5dBjlpWGZQ62M6DcOfMh2+c2zJ2ig 1SFtHwHG4/D0TcajAO5tuc+eF7kyvotfqhpDYH2j5q0vimr6m1kuY5j3fwDKusibMgLGqh MrtXexb5MQHKdKk77B/EqbL1I0Bi5oTiW+IFYGOINV0rIJBPD+btoiCgqdw7Fxmj1mtdsj drN2wqx5FoNgCB7VM55DMVk/zRggswI4zSffS+PvOyEVb90V2Ihop4k1QuQJKrA6t1ILfT AtYQcMQ+KMnR8VyM8f17mGixZDFb7yJe8QmF8TVIcp3teCH+PFu2Kqomtgj+2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688562474; a=rsa-sha256; cv=none; b=r23THODru7QbFRmVVmj14/Tor/Q3JTELQwovKpbdghbiq7EZ1st4E5ePaBxyQSAfoFjwyj /mY6yLGDRUDwWIziDn2aQjkECKrwevXvctYSWsgyXQa1jhUGCaV57xY6QVhAofrDvZBPRr C9MiR4SvEB6iedZe0qCfr5qdlR8Gg6hErQrzpH+Y1VxV4BiSY9qrUGCvi4es85Ew2yUtwC FAqpqh6WL4Gh1fzH9uJD1cRu+6nSUkiHSz/FaBoBC74NNumwjSXnTqHl+RWKS3vg0PWU8m bYfMzlR9lJkDLc5UODAiYAZCwnNXdRilCRGvpL3f9PfjA7KR9NZqRv0P/1V/yw== 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 4Qx0MG5ncNzGfF; Wed, 5 Jul 2023 13:07:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 365D7sWB071231; Wed, 5 Jul 2023 13:07:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 365D7sf8071230; Wed, 5 Jul 2023 13:07:54 GMT (envelope-from git) Date: Wed, 5 Jul 2023 13:07:54 GMT Message-Id: <202307051307.365D7sf8071230@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: b16a120b3b9b - stable/13 - bhyve: Rename a pci_cfgrw() parameter 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b16a120b3b9b682944da8d54d826e52fa7720e04 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b16a120b3b9b682944da8d54d826e52fa7720e04 commit b16a120b3b9b682944da8d54d826e52fa7720e04 Author: Mark Johnston AuthorDate: 2023-06-28 20:06:37 +0000 Commit: Mark Johnston CommitDate: 2023-07-05 13:06:59 +0000 bhyve: Rename a pci_cfgrw() parameter pci_cfgrw() may be called via a write to the extended config space, which is memory-mapped. In this case, the name "eax" is misleading. Give it a more generic name. No functional change intended. Reviewed by: corvink, jhb MFC after: 1 week Sponsored by: Innovate UK Differential Revision: https://reviews.freebsd.org/D40732 (cherry picked from commit f4841d8af0cd42c16fa66529bfde7b3a8b4f16d6) --- usr.sbin/bhyve/pci_emul.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/usr.sbin/bhyve/pci_emul.c b/usr.sbin/bhyve/pci_emul.c index 41b7718e6935..34ce3cb7d49a 100644 --- a/usr.sbin/bhyve/pci_emul.c +++ b/usr.sbin/bhyve/pci_emul.c @@ -2099,7 +2099,7 @@ pci_emul_cmdsts_write(struct pci_devinst *pi, int coff, uint32_t new, int bytes) static void pci_cfgrw(int in, int bus, int slot, int func, int coff, int bytes, - uint32_t *eax) + uint32_t *valp) { struct businfo *bi; struct slotinfo *si; @@ -2121,7 +2121,7 @@ pci_cfgrw(int in, int bus, int slot, int func, int coff, int bytes, if (pi == NULL || (bytes != 1 && bytes != 2 && bytes != 4) || (coff & (bytes - 1)) != 0) { if (in) - *eax = 0xffffffff; + *valp = 0xffffffff; return; } @@ -2131,7 +2131,7 @@ pci_cfgrw(int in, int bus, int slot, int func, int coff, int bytes, */ if (coff >= PCI_REGMAX + 1) { if (in) { - *eax = 0xffffffff; + *valp = 0xffffffff; /* * Extended capabilities begin at offset 256 in config * space. Absence of extended capabilities is signaled @@ -2139,7 +2139,7 @@ pci_cfgrw(int in, int bus, int slot, int func, int coff, int bytes, * offset 256. */ if (coff <= PCI_REGMAX + 4) - *eax = 0x00000000; + *valp = 0x00000000; } return; } @@ -2152,19 +2152,19 @@ pci_cfgrw(int in, int bus, int slot, int func, int coff, int bytes, if (in) { /* Let the device emulation override the default handler */ if (pe->pe_cfgread != NULL) { - needcfg = pe->pe_cfgread(pi, coff, bytes, eax); + needcfg = pe->pe_cfgread(pi, coff, bytes, valp); } else { needcfg = 1; } if (needcfg) - *eax = CFGREAD(pi, coff, bytes); + *valp = CFGREAD(pi, coff, bytes); - pci_emul_hdrtype_fixup(bus, slot, coff, bytes, eax); + pci_emul_hdrtype_fixup(bus, slot, coff, bytes, valp); } else { /* Let the device emulation override the default handler */ if (pe->pe_cfgwrite != NULL && - (*pe->pe_cfgwrite)(pi, coff, bytes, *eax) == 0) + (*pe->pe_cfgwrite)(pi, coff, bytes, *valp) == 0) return; /* @@ -2193,7 +2193,7 @@ pci_cfgrw(int in, int bus, int slot, int func, int coff, int bytes, pi->pi_bar[idx].addr = bar = 0; break; case PCIBAR_IO: - addr = *eax & mask; + addr = *valp & mask; addr &= 0xffff; bar = addr | pi->pi_bar[idx].lobits; /* @@ -2205,7 +2205,7 @@ pci_cfgrw(int in, int bus, int slot, int func, int coff, int bytes, } break; case PCIBAR_MEM32: - addr = bar = *eax & mask; + addr = bar = *valp & mask; bar |= pi->pi_bar[idx].lobits; if (addr != pi->pi_bar[idx].addr) { update_bar_address(pi, addr, idx, @@ -2213,7 +2213,7 @@ pci_cfgrw(int in, int bus, int slot, int func, int coff, int bytes, } break; case PCIBAR_MEM64: - addr = bar = *eax & mask; + addr = bar = *valp & mask; bar |= pi->pi_bar[idx].lobits; if (addr != (uint32_t)pi->pi_bar[idx].addr) { update_bar_address(pi, addr, idx, @@ -2222,7 +2222,7 @@ pci_cfgrw(int in, int bus, int slot, int func, int coff, int bytes, break; case PCIBAR_MEMHI64: mask = ~(pi->pi_bar[idx - 1].size - 1); - addr = ((uint64_t)*eax << 32) & mask; + addr = ((uint64_t)*valp << 32) & mask; bar = addr >> 32; if (bar != pi->pi_bar[idx - 1].addr >> 32) { update_bar_address(pi, addr, idx - 1, @@ -2230,12 +2230,12 @@ pci_cfgrw(int in, int bus, int slot, int func, int coff, int bytes, } break; case PCIBAR_ROM: - addr = bar = *eax & mask; + addr = bar = *valp & mask; if (memen(pi) && romen(pi)) { unregister_bar(pi, idx); } pi->pi_bar[idx].addr = addr; - pi->pi_bar[idx].lobits = *eax & + pi->pi_bar[idx].lobits = *valp & PCIM_BIOS_ENABLE; /* romen could have changed it value */ if (memen(pi) && romen(pi)) { @@ -2249,11 +2249,11 @@ pci_cfgrw(int in, int bus, int slot, int func, int coff, int bytes, pci_set_cfgdata32(pi, coff, bar); } else if (pci_emul_iscap(pi, coff)) { - pci_emul_capwrite(pi, coff, bytes, *eax, 0, 0); + pci_emul_capwrite(pi, coff, bytes, *valp, 0, 0); } else if (coff >= PCIR_COMMAND && coff < PCIR_REVID) { - pci_emul_cmdsts_write(pi, coff, *eax, bytes); + pci_emul_cmdsts_write(pi, coff, *valp, bytes); } else { - CFGWRITE(pi, coff, *eax, bytes); + CFGWRITE(pi, coff, *valp, bytes); } } } From nobody Wed Jul 5 13:07:55 2023 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 4Qx0MJ3LmFz4mDmF; Wed, 5 Jul 2023 13:07:56 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Qx0MJ04wMz3CHp; Wed, 5 Jul 2023 13:07:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688562476; 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=jIM4jcVE1QBjgTPAImZhBmsBPu9pCuuaPrFocbcwTy4=; b=QZ69ZMtBN2hUJ3K5G05hCV6MeGbDACCt3AWDYbDnB0XgQSUDY6RiE2T6J02hEVp9EInhVu bVvvbGSFIMhER35GAYkxSj96HaF4SvdRsata2i5HyIvqiQ/NvMlMZfibKPyFWgNNV9zErK 3gq4zQ1ANxFrizI8XtqgrAPGliBUvNvcK8dgCjN+nk6Pk1IuBwAwTmXo/PYmeiUKGsEUeK J51v+Y9iph5E4iZE/wwPenxDnsP2L/J/WavEVcy4WKYFBoTdHgkP6GAtDtu5GQPukKD4e1 K++3qAkKetXKyqclne8zibFUoByBUV3qAKjbH7OG//CVB9n1SotyC+7xbKAq4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688562476; 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=jIM4jcVE1QBjgTPAImZhBmsBPu9pCuuaPrFocbcwTy4=; b=nhGUuZk3USdarCaG14XOKnYnK3C4vMgPuA0dQ23qtTVL0ixEoPEWaJu8Ex3UM9mL2rTCsz g54l9aAujATFXVlLG/7+It7uSfJVTXuXu7wk9xm0LrqvBb8fwUbiCqvRcz2vffQ0r1pB7h Ncov5VSJe0Gx3MzhJ9BGkvKUjxK5+nUDYT+EbvtYTQyXC9W4+estT+kCjuNc9YoPqupXdA uuftYiGmFCZ5YIEQog84N+G44W+CfZu6fOy/CKgorN/6VkVMMkAwA7ygf8D999VjXeQI0k 72ifWI9sFThfuU688w+EOxogA4CUp35I/DJ7/snKasLAyNQaqJPkvD7SQvdxoQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688562476; a=rsa-sha256; cv=none; b=lmeTA8nAJFhnPuKXmdb48hL/y6SsUotcSw06Snq/gAtpFLgX9PXO/pOPafcnoNgTxNLBSh GZ9hG62x5GjGcj5B6PP6UoL0s+KHbDUV/jrO+dg8kErjYpVSmz0RjQp1bubyQo5x9rSWsc tt4JCGekDx1pu1GR8DO9BJq98Yy11+KpdwX4BCGqaZa+7Iel27/k2+L4/1rsAO9Qdeu9qB Cu1rwGRWbzyrh0Eb2Az1Ro7ycqX3kKHbnQqeFzXKlR0z4pKJIroWeCkx2f4R44MTLnG7ZD zxRj0fIHH9r3jNui639mM+Bp2WIBB/dFEtqkBHAjBH/cyhjD23ll50qLKMCLpw== 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 4Qx0MH6HZ0zGcb; Wed, 5 Jul 2023 13:07:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 365D7ttR071265; Wed, 5 Jul 2023 13:07:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 365D7t5r071264; Wed, 5 Jul 2023 13:07:55 GMT (envelope-from git) Date: Wed, 5 Jul 2023 13:07:55 GMT Message-Id: <202307051307.365D7t5r071264@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 44ee4e90a3a6 - stable/13 - ctfconvert: Integer encoding types are unsigned 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 44ee4e90a3a6d68fe1ef7684fe60f8b9a60d4ae2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=44ee4e90a3a6d68fe1ef7684fe60f8b9a60d4ae2 commit 44ee4e90a3a6d68fe1ef7684fe60f8b9a60d4ae2 Author: Mark Johnston AuthorDate: 2023-06-06 17:28:02 +0000 Commit: Mark Johnston CommitDate: 2023-07-05 13:07:06 +0000 ctfconvert: Integer encoding types are unsigned Before this change, encodings in the user-defined range were being sign-extended. MFC after: 1 week Sponsored by: Innovate UK (cherry picked from commit 258a0d760aa8b42899a000e30f610f900a402556) --- cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c b/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c index 9c422fb58fa1..861fda0931af 100644 --- a/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c +++ b/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c @@ -1367,7 +1367,7 @@ static const fp_size_map_t fp_encodings[] = { }; static uint_t -die_base_type2enc(dwarf_t *dw, Dwarf_Off off, Dwarf_Signed enc, size_t sz) +die_base_type2enc(dwarf_t *dw, Dwarf_Off off, Dwarf_Unsigned enc, size_t sz) { const fp_size_map_t *map = fp_encodings; uint_t szidx = dw->dw_ptrsz == sizeof (uint64_t); @@ -1398,9 +1398,9 @@ static intr_t * die_base_from_dwarf(dwarf_t *dw, Dwarf_Die base, Dwarf_Off off, size_t sz) { intr_t *intr = xcalloc(sizeof (intr_t)); - Dwarf_Signed enc; + Dwarf_Unsigned enc; - (void) die_signed(dw, base, DW_AT_encoding, &enc, DW_ATTR_REQ); + (void) die_unsigned(dw, base, DW_AT_encoding, &enc, DW_ATTR_REQ); switch (enc) { case DW_ATE_unsigned: From nobody Wed Jul 5 21:01:23 2023 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 4QxBsb4Kc2z4lWhn; Wed, 5 Jul 2023 21:01:23 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QxBsb3nwwz3pZs; Wed, 5 Jul 2023 21:01:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688590883; 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=au+44pWJJy4zQSrtWSKbzJ+XiIzhVKHEt6GMxmYfiIo=; b=IWsF6u6mOsvL07VuVpBTrvwU3ZmVIdETzKCv+Z5TRyH86xS1pO87Mf2e58kkhkOMgbaHhA pT5+OzCIx6QPxiX2Dq5PY//0ysWkak3trkr39n5F9N4qS/AOkKI08cP9R99zUguFd5IkCl opoZpOoTY+/GiFGAayPveCeMu8csVeUngPH7NV4uJrUAPso++zw2xUFo7aOk6OKUKQMvqG o1Qy91oqXH9VK43TvSybZpAwFvApuFpPDK4FQDgr5fq3UKh4i4qRkz2bRJeMD+DYhiSLuS hwyNu/2i900sOh1wPwbLwGHoCEgawECLZVBzOaUAgoqCz6Xu9QWJdGarkeCGDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688590883; 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=au+44pWJJy4zQSrtWSKbzJ+XiIzhVKHEt6GMxmYfiIo=; b=hK4KxYjNDOvMCtU7L05vMvHk+is7VaSG/1vdtyy04UpmRTHxe+EWD8cIB0mnXXufvYJXKC 7nxX62c2yBbolXsxoj03Dc2CQH+6pRNkRk18wECGsYI9TSww3PsXSpaGH+qBpMnBePHeHs Ef0JHwD+Vwua7goQa8szBFYgs6J5Yq8GcYCtAuesTgaSvqyrkQM3dr60neOmGtLR9+gi/3 BpXvOW5s7kiDIJ3AmxRJoF3Ih2vMipED3/vnKq3rwsjTKerLAgNWTJ+4PbxfULpUfsS/7l UUW//V5EALOqD+tpSItQpwJUckhB4ueRGLp4IPJESJD0whV1RY5VCUXpzY++Nw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688590883; a=rsa-sha256; cv=none; b=PQJuVh1P6rKjjtvdSNok92kR8BVPSpvVYn3PQPfLknQJEoqP1VJ3B9w051200OSBED9SBG Trt5Gcuj5BztcIMlvLnagzqo7PqFpxbpEGJzR5ywY4Tibrey8zZffpIvO3lGbETDbawS5I Dv23iUHBeAhtqLBzmUWi35UhPxBB2VJvtzcp13aKLVrqvPUzfI0wW1Ed19CCtOrjcykm+R 697MhDQBE/H845DXrm23b5hXf8FQy+0wgzjP2AUpNSw+eA2uDNK4pW0tO8HeVeF1pBdERh RwRDLH1fb55Snwu45kNdM7pDSvT8vyfwnNxXZp79YLmLJqYVh1UPEHRClmsx0Q== 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 4QxBsb2tHXzVLQ; Wed, 5 Jul 2023 21:01:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 365L1Nfu060543; Wed, 5 Jul 2023 21:01:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 365L1NBW060542; Wed, 5 Jul 2023 21:01:23 GMT (envelope-from git) Date: Wed, 5 Jul 2023 21:01:23 GMT Message-Id: <202307052101.365L1NBW060542@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Glen Barber Subject: git: d63909d243cb - stable/13 - release: allow VM_EXTRA_PACKAGES to be specified in the environment 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gjb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d63909d243cb07904b8df2248ee27b99f1bf458a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by gjb: URL: https://cgit.FreeBSD.org/src/commit/?id=d63909d243cb07904b8df2248ee27b99f1bf458a commit d63909d243cb07904b8df2248ee27b99f1bf458a Author: Brad Davis AuthorDate: 2021-08-09 16:31:51 +0000 Commit: Glen Barber CommitDate: 2023-07-05 20:59:47 +0000 release: allow VM_EXTRA_PACKAGES to be specified in the environment This is useful for adding extra packages to the build of an AMI. For example: env VM_EXTRA_PACKAGES="zsh" make -C release ec2ami (cherry picked from commit 83952a5baa337cc257858feb4886d947ba1a60e3) --- release/tools/azure.conf | 2 +- release/tools/ec2.conf | 4 +++- release/tools/gce.conf | 7 ++++--- release/tools/vagrant.conf | 3 ++- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/release/tools/azure.conf b/release/tools/azure.conf index 60076984b1bd..c88651a07745 100644 --- a/release/tools/azure.conf +++ b/release/tools/azure.conf @@ -6,7 +6,7 @@ # Set to a list of packages to install. # Example: #export VM_EXTRA_PACKAGES="www/apache24" -export VM_EXTRA_PACKAGES="sysutils/azure-agent" +export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} sysutils/azure-agent" # Set to a list of third-party software to enable in rc.conf(5). # Example: diff --git a/release/tools/ec2.conf b/release/tools/ec2.conf index d44fe9ff2f27..a07e6b65f519 100644 --- a/release/tools/ec2.conf +++ b/release/tools/ec2.conf @@ -6,7 +6,9 @@ # Packages to install into the image we're creating. This is a deliberately # minimalist set, providing only the packages necessary to bootstrap further # package installation as specified via EC2 user-data. -export VM_EXTRA_PACKAGES="ec2-scripts firstboot-freebsd-update firstboot-pkgs isc-dhcp44-client ebsnvme-id" +export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} ec2-scripts \ + firstboot-freebsd-update firstboot-pkgs isc-dhcp44-client \ + ebsnvme-id" # Include the amazon-ssm-agent package in amd64 images, since some users want # to be able to use it on systems which are not connected to the Internet. diff --git a/release/tools/gce.conf b/release/tools/gce.conf index 0dd00f020110..1acd789a88e6 100644 --- a/release/tools/gce.conf +++ b/release/tools/gce.conf @@ -7,9 +7,10 @@ export VMSIZE=20g # Set to a list of packages to install. -export VM_EXTRA_PACKAGES="firstboot-freebsd-update firstboot-pkgs \ - google-cloud-sdk panicmail sudo sysutils/py-google-compute-engine \ - lang/python lang/python2 lang/python3" +export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} firstboot-freebsd-update \ + firstboot-pkgs \ google-cloud-sdk panicmail sudo \ + sysutils/py-google-compute-engine lang/python lang/python2 \ + lang/python3" # Set to a list of third-party software to enable in rc.conf(5). export VM_RC_LIST="ntpd sshd growfs \ diff --git a/release/tools/vagrant.conf b/release/tools/vagrant.conf index 05e7052d46c4..ebf69338b7d7 100644 --- a/release/tools/vagrant.conf +++ b/release/tools/vagrant.conf @@ -8,7 +8,8 @@ export VMSIZE=8g # Packages to install into the image we're creating. This is a deliberately # minimalist set, providing only the packages necessary to bootstrap. -export VM_EXTRA_PACKAGES="shells/bash firstboot-freebsd-update firstboot-pkgs" +export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} shells/bash \ + firstboot-freebsd-update firstboot-pkgs" # Set to a list of third-party software to enable in rc.conf(5). export VM_RC_LIST="firstboot_freebsd_update firstboot_pkgs growfs" From nobody Wed Jul 5 21:01:24 2023 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 4QxBsc5Yr4z4lX1T; Wed, 5 Jul 2023 21:01:24 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QxBsc4k4Rz3pvf; Wed, 5 Jul 2023 21:01:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688590884; 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=IENqs0tWfz8iS3vLr5pZFNYdgERD6zyjvj4wOCDOYaw=; b=q2rJfZBxr/+hm5AA5Oi7vxuABMK6vhAqdVRyIOsjQSJ6cPQaMEp9VRvUjb+tZLCMesPYNw Dl5qk3x6n1yRLT7zOnr4CcBCLGnX+KvwAVyzXuMWVN2FAv1/arj3iXRwrnNHSxMIxNtnrK Ce2ms6KpmmHJMh/9ud1YWz5CoBdfoLJSxNv0F7S5Hl5b8Y85D8aHj+GGG+jgacMDnGphYi 2z2+iuo99u7IbuCO2QuV7QffZogVas16CRojpjYD7uZ2smnTe+FZcWQTFCMBl7aqYZIuZe rmi2lBKAjClIIAS3WwJWrKZEHqxyALs0iR/Z3kKuGj34HmFulPt9Q2wWV4/lLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688590884; 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=IENqs0tWfz8iS3vLr5pZFNYdgERD6zyjvj4wOCDOYaw=; b=kUiH6VcyWiqXJl/XX1xttvvuxIbdQPWiPgQsRWsSnPmfx0lB7jp9jmwPwEToSuLxcbmY/o JjhmwSUSbCvFWg6tuIWMujcMD7KUNBVorOyZmlepX/u+lQqsxYZRaaJV/NTeftHzMGDAIv k5gdSuSRFWsOqxEhNUqY7UVnwDt5bm3DE06deM5eWTZ0uJfKbSd/Pa6iRaD0u5x2ta8Z1X 8VSLdYZRwmZtOWuJ21MRdr2S0+dsTw+kLiDn/tyUgzw2P5SoMYf/c6PphYlE1eG6Ea5sr0 9wL9wexFymKzDYhs/Cg+XQXjRccLyQbCLoNmalUaW5DA56i0pSOWoxoStZefTw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688590884; a=rsa-sha256; cv=none; b=kaCwVnif6fMGKnso5co+t5nUOthHr/8yr99rqAfkDwMqv6cll6cNib0VqYjhliJMnaY6fk QIOMpu18r2O8KE+1Y8nN+I7jf+NwdGljRxNxOfaY5pEV+DX9CqXKbjaaAgYswEM3e/jtYu BxhkycmxGoPGT/ORXLHlhUyLpBUmTNPir+Oi/5UmSxl5XtndfMl2PfX0iJxeq0e2rOFNQv SGb+OLkdVIg2uu1dyS7cETn26mL/NY3vMFxv+lfsSR7M2mtIWhOM4SrZBns+aA7lmnb5C7 w9B49SfLHaHvxvxaxLU5bknaoxWh3KA/ozrxaz4A87RyEctxFHEDygiODyJ5vw== 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 4QxBsc3nVYzVFW; Wed, 5 Jul 2023 21:01:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 365L1OVE060562; Wed, 5 Jul 2023 21:01:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 365L1OeF060561; Wed, 5 Jul 2023 21:01:24 GMT (envelope-from git) Date: Wed, 5 Jul 2023 21:01:24 GMT Message-Id: <202307052101.365L1OeF060561@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Glen Barber Subject: git: 32beaf6d4dc5 - stable/13 - release: update GCE configuration for python3 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gjb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 32beaf6d4dc5c380545cb05c8684f330bb4770d6 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by gjb: URL: https://cgit.FreeBSD.org/src/commit/?id=32beaf6d4dc5c380545cb05c8684f330bb4770d6 commit 32beaf6d4dc5c380545cb05c8684f330bb4770d6 Author: Glen Barber AuthorDate: 2023-07-03 19:28:33 +0000 Commit: Glen Barber CommitDate: 2023-07-05 21:00:05 +0000 release: update GCE configuration for python3 Reported by: asomers PR: 272354 Sponsored by: GoFundMe https://www.gofundme.com/f/gjbbsd (cherry picked from commit 3f21d3e0babacabb9a32e0e9a8ab290025d5577c) --- release/tools/gce.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/tools/gce.conf b/release/tools/gce.conf index 1acd789a88e6..725709e3f335 100644 --- a/release/tools/gce.conf +++ b/release/tools/gce.conf @@ -9,7 +9,7 @@ export VMSIZE=20g # Set to a list of packages to install. export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} firstboot-freebsd-update \ firstboot-pkgs \ google-cloud-sdk panicmail sudo \ - sysutils/py-google-compute-engine lang/python lang/python2 \ + sysutils/py-google-compute-engine lang/python \ lang/python3" # Set to a list of third-party software to enable in rc.conf(5). From nobody Wed Jul 5 21:01:32 2023 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 4QxBsm6THbz4lWsl; Wed, 5 Jul 2023 21: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QxBsm61cfz3qDc; Wed, 5 Jul 2023 21: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=1688590892; 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=dT5B5j0Qc+Vpe4lGb5fo1my7E7jchBLrvYIg/vaS8v4=; b=Yjur36LURHpes/sSQe1vv+4vId45vrhnzvnY6HG22NXWp/VxYeZL+cI7VQs+3ermB6/Xup U+WMEDKQN3rokHvz/apyjDms23Md1pJZiE294Lvee7J0bofU/ckopxjUW4Prq2r1S9HuMi 5eO3PLtdXGw4NqCWj8b3sik5dcD4rVtFfrOcIpid9IUU/s3ovkWJqtwquM3LuRi6xHhnAQ H8aP//56Tuh1qMAoywTLGbaq7UOVx+T7a5yk+17BDQ0ntE5mN17UZv3Nb5sRdoDvcv2cnX xmN4EP5kYHjq1rA+i0NqSTZWiy/ZrQdNv0pek2pbnUDyY9CUm324Yg6OW4RM2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688590892; 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=dT5B5j0Qc+Vpe4lGb5fo1my7E7jchBLrvYIg/vaS8v4=; b=PJKxxZ86+E4CewzyY+OH7qRnv2VQPXphVATGKaViSb6CFrmZbtAF3aEwgKbElPlbweOoeo PvRbzPsHP6onA7mkY5vXc6JVNT8/Kn/f0aXtDLlNd8cPZQa5ykP6WsA+fdChhF3oPQm4ps Eqq8AKDyqTjXiz7H3S8IDdujQyYHWL/5Yn8cN7znuCTlUZ3Eu6vOa4F/sE0yIAhA9Go77X 0CJlLXhQoC5sPwMTAW/N4N3xs7C/0DzdX0saFOmyngfQ3w0EnDmB1M06n601nXvyaUp2Ge F7gscfXJhZ6v2c7pquuE6AaHM4Z82fktc5uhvQVG5XWcDVOo6KXP6AE9PpqS9A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688590892; a=rsa-sha256; cv=none; b=WJ6kEj3Mf5Zvl+8czHSwCC/ceE+Jjram4xFDcPceNchfGz5lXoD1agfeIMUaezLlFFqlVE G4E+O862oBh/mRhemkOlND8YAe3DKWLofxgQL6DvM3KsHiC/tbgM7+1ygZIoyS714KIvPP rZFUzDN5BnrxDmfwrFn1ph5QQDhDTLcDN0/PVoYdRlYY21hgguAXzmleZM2JEslzdh4Z4J P85VlU8MRbg6pAgHJK5L/71RgX9JZTin6sHn3YZeUe2wZcCyAQrmd5tCuNSWXK/i2rxLOF LpwkTq+0aiEh+9nC1YSzmp79SUcauUm8TIH44+xhvZRZb1JAeMr24+sEfceNRw== 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 4QxBsm57S1zVLf; Wed, 5 Jul 2023 21:01:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 365L1WAI060699; Wed, 5 Jul 2023 21:01:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 365L1WYx060698; Wed, 5 Jul 2023 21:01:32 GMT (envelope-from git) Date: Wed, 5 Jul 2023 21:01:32 GMT Message-Id: <202307052101.365L1WYx060698@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Glen Barber Subject: git: 6dd5f0231324 - stable/12 - release: allow VM_EXTRA_PACKAGES to be specified in the environment 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gjb X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 6dd5f023132433801caf18db85f1b9f0f9bb9a7b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by gjb: URL: https://cgit.FreeBSD.org/src/commit/?id=6dd5f023132433801caf18db85f1b9f0f9bb9a7b commit 6dd5f023132433801caf18db85f1b9f0f9bb9a7b Author: Brad Davis AuthorDate: 2021-08-09 16:31:51 +0000 Commit: Glen Barber CommitDate: 2023-07-05 21:00:20 +0000 release: allow VM_EXTRA_PACKAGES to be specified in the environment This is useful for adding extra packages to the build of an AMI. For example: env VM_EXTRA_PACKAGES="zsh" make -C release ec2ami (cherry picked from commit 83952a5baa337cc257858feb4886d947ba1a60e3) --- release/tools/azure.conf | 2 +- release/tools/ec2.conf | 4 +++- release/tools/gce.conf | 7 ++++--- release/tools/vagrant.conf | 3 ++- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/release/tools/azure.conf b/release/tools/azure.conf index 60076984b1bd..c88651a07745 100644 --- a/release/tools/azure.conf +++ b/release/tools/azure.conf @@ -6,7 +6,7 @@ # Set to a list of packages to install. # Example: #export VM_EXTRA_PACKAGES="www/apache24" -export VM_EXTRA_PACKAGES="sysutils/azure-agent" +export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} sysutils/azure-agent" # Set to a list of third-party software to enable in rc.conf(5). # Example: diff --git a/release/tools/ec2.conf b/release/tools/ec2.conf index 1f3b581a4f27..f1513926e681 100644 --- a/release/tools/ec2.conf +++ b/release/tools/ec2.conf @@ -6,7 +6,9 @@ # Packages to install into the image we're creating. This is a deliberately # minimalist set, providing only the packages necessary to bootstrap further # package installation as specified via EC2 user-data. -export VM_EXTRA_PACKAGES="ec2-scripts firstboot-freebsd-update firstboot-pkgs isc-dhcp44-client ebsnvme-id" +export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} ec2-scripts \ + firstboot-freebsd-update firstboot-pkgs isc-dhcp44-client \ + ebsnvme-id" # Include the amazon-ssm-agent package in amd64 images, since some users want # to be able to use it on systems which are not connected to the Internet. diff --git a/release/tools/gce.conf b/release/tools/gce.conf index 30561acb054c..593dc398b219 100644 --- a/release/tools/gce.conf +++ b/release/tools/gce.conf @@ -7,9 +7,10 @@ export VMSIZE=20G # Set to a list of packages to install. -export VM_EXTRA_PACKAGES="firstboot-freebsd-update firstboot-pkgs \ - google-cloud-sdk panicmail sudo sysutils/py-google-compute-engine \ - lang/python lang/python2 lang/python3" +export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} firstboot-freebsd-update \ + firstboot-pkgs \ google-cloud-sdk panicmail sudo \ + sysutils/py-google-compute-engine lang/python lang/python2 \ + lang/python3" # Set to a list of third-party software to enable in rc.conf(5). export VM_RC_LIST="ntpd sshd growfs \ diff --git a/release/tools/vagrant.conf b/release/tools/vagrant.conf index c683cf7a07d2..3a4bc1896408 100644 --- a/release/tools/vagrant.conf +++ b/release/tools/vagrant.conf @@ -8,7 +8,8 @@ export VMSIZE=8G # Packages to install into the image we're creating. This is a deliberately # minimalist set, providing only the packages necessary to bootstrap. -export VM_EXTRA_PACKAGES="shells/bash firstboot-freebsd-update firstboot-pkgs" +export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} shells/bash \ + firstboot-freebsd-update firstboot-pkgs" # Set to a list of third-party software to enable in rc.conf(5). export VM_RC_LIST="firstboot_freebsd_update firstboot_pkgs growfs" From nobody Wed Jul 5 21:01:33 2023 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 4QxBsp0SNHz4lWwl; Wed, 5 Jul 2023 21:01:34 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QxBsn6wlpz3qV5; Wed, 5 Jul 2023 21:01:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688590894; 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=voemWHmpkhA63fNrXqhiqGz/55GDZD5TADJV1olfbPQ=; b=Ii6CeY1Q7MF5hvHvUMcSPK/Nf3srugId06yYNNn19OBHUN35E7nfnAjprbUEro+xfNEnMF +xMaA4TkwqLICRb1olmx1RtW9NfRBTW4Ol5uVIS1sJeTNeBeOrcp0zTaCUhZH0hI5XGDBJ zDBIbbnhRaNZAh9vQfAar49KPNKwyDhx4ZmejmAkHQpofgNPBFeRmZ6CtOPvluM5T2y5U5 IHl5sig1mjGlmroC/L2R5rnScFVb2V15EF5b/CpL9k5piwp4ygcLpQWvHzfug+V0gRFW3W jEknA1phQDZGb+oYHnU4INC0rY0vOavkEzk9pLJ+eG/sjYNJWIw82E2ZioI8Uw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688590894; 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=voemWHmpkhA63fNrXqhiqGz/55GDZD5TADJV1olfbPQ=; b=aNyshPjfWoN9whtVV58PBAA2qySeDe8mucmjGY5ImImbVkk0FK01pmmaVWBDMvUIPwcdBo Pu/c7A7eZmHot8sk53/in/BjvAe0c/nX3Iz2wOYQqj0leyYOwHOXnta7dbnuMFxVk4ZyBQ MElVY1G/8B51noMiyZwFaNpHXbdurbZoMZrG67V4MggKHKID6pkkErbC05OlqrtW+ivrtQ qQlUiyQ22NcjtjEe8gLxutF9xzrIhjY6QZyRWSfp4UL+w2o/k+Cv9o8+RL0mS5JbXu8EnJ wSzQTjNX1M9pbs68C626IbGWAnIlcA0XN+r8MxdqjzCUz+kqhmYzjpt+pD+cyw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688590894; a=rsa-sha256; cv=none; b=GAEXV2s5f2HB/u1ywDB3IEuedWOhmbXqf0JuZjUIbBM3/TT2N2Gqz4Z0DNLdrzj1uNdFot rz/PRoVd9KrbmubV24Nhzqzx1YJTiuGcRrBOpXNL/h0hJo+dMg17dO9KrSUcPTtibDJgXD ET5+t4QrQzDfhccCn+CQuoN1Cr7z7nG2V47v/aFsv3otdg06TtLCrplOYqP/3CxmZqlCNx 87Zr+kwJszSsYTKGYJneuDHcrNmUhlX17cE9UVLDYAoccTHZCpkYQMyBXe5SjwwCqg+3W5 ih7tHuvjFTt/Hs2ERmJ2E8naaoLDxF3XvltQGrUTFr8MJBSrF0QgZJ1eEYxPlg== 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 4QxBsn627hzVFg; Wed, 5 Jul 2023 21:01:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 365L1Xq3060724; Wed, 5 Jul 2023 21:01:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 365L1XHC060723; Wed, 5 Jul 2023 21:01:33 GMT (envelope-from git) Date: Wed, 5 Jul 2023 21:01:33 GMT Message-Id: <202307052101.365L1XHC060723@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Glen Barber Subject: git: afbcdd6e080f - stable/12 - release: update GCE configuration for python3 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gjb X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: afbcdd6e080f817ed51af42ac3e645584441abdc Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by gjb: URL: https://cgit.FreeBSD.org/src/commit/?id=afbcdd6e080f817ed51af42ac3e645584441abdc commit afbcdd6e080f817ed51af42ac3e645584441abdc Author: Glen Barber AuthorDate: 2023-07-03 19:28:33 +0000 Commit: Glen Barber CommitDate: 2023-07-05 21:00:31 +0000 release: update GCE configuration for python3 Reported by: asomers PR: 272354 Sponsored by: GoFundMe https://www.gofundme.com/f/gjbbsd (cherry picked from commit 3f21d3e0babacabb9a32e0e9a8ab290025d5577c) --- release/tools/gce.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/tools/gce.conf b/release/tools/gce.conf index 593dc398b219..cfadbaf9413b 100644 --- a/release/tools/gce.conf +++ b/release/tools/gce.conf @@ -9,7 +9,7 @@ export VMSIZE=20G # Set to a list of packages to install. export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} firstboot-freebsd-update \ firstboot-pkgs \ google-cloud-sdk panicmail sudo \ - sysutils/py-google-compute-engine lang/python lang/python2 \ + sysutils/py-google-compute-engine lang/python \ lang/python3" # Set to a list of third-party software to enable in rc.conf(5). From nobody Thu Jul 6 01:55:23 2023 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 4QxKNq2rZCz4lsX6; Thu, 6 Jul 2023 01:55:23 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QxKNq2LDHz3J9h; Thu, 6 Jul 2023 01:55:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688608523; 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=ooguPCCGV0QqJPaYvu2RIFI6wXnH9pXZbYgIskkWsgI=; b=DKsx/tNktA5TjYEXKwt7yw0Pypn3VQ1DqVnWj8lhHJHJScAYq1jUU0RTYOEPCKO0Fj+LSV K0VJPbgP17KEkxn51ZXXjUFnzY0F2So2EC0Oo8gR42UCoLzZjMLU9jTMny7yg2AekQNB7b 1WhaJ5B7OvEY2QNakrCdCoEVcCjHMolvHgtDXFhqRQYYXFUOSQDTIe31kAeQ+HXOL7+xHN mqkF+fEu+XBeSHawOR7m3mnt0wlqcE9e1lHr9holj8JrIl8M/GE8eMOJcMV/tdRpCQlzYz n+7pVtB0id3rUuITy2NdrVEydNRKAKU80eQgKdfY+Zr5qSNDsLBYQTlcPLrpuQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688608523; 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=ooguPCCGV0QqJPaYvu2RIFI6wXnH9pXZbYgIskkWsgI=; b=mI2O4pFkuDUXU/dT/3n4TGw3BxcNsYJ3FR37huzlFlsR7+L8gAhDBPzD6IlDmUbllMH8X1 8J3ZTeBQC5C1fDIiFc81j+eqqpS643GI9UbHwBUbcChEBrxdRkGPP9hSQVQFhDUJeW6Qzh TbYPtVPpr3T1MJWDd767CuMP/aLQIj1jrAYsnxa3HIrQ5a5stsjDNMorzwHaUQ0RKWUP3N 019x4ISodPuCYR2begEzPpA3fHAzlF0M5eSItSx9Z1/ztfTFqWYL3Outt/Of22nTiWerrc T4xYqrYcUHJrmDUR0ubdauU9m0jpiYaoi7YWz/Jcg38i/H5PYVVL1a9IH9H1Yw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688608523; a=rsa-sha256; cv=none; b=iqloaage2jx6FE5OciKdWSMILYXUxWaJSqb5mZuFr5q7d/tanQJuFdgw9F3SP8ecLEr92i 4twGe8Uk78sXAkWkUle/j5NyFpYgipowMuVpyYJH8icqidBlsKhn6mJL1zY+IPMMzZ0rRj SDl5cpCJpV1DkLCiowJGdVWF9pJiGixJdH7AhYwZsFeKE6derY5CyzigRrL6vblCTj6KTz zGzpYGnX5b1J8OfsAI8xfa6KVTCydeA0kCw+kiLtZ+Wbdw9GAa6yyV4Ymen86/GhLflD8O MpxgpFHmQ6RkeI2xJf/Kl+xInLCli3OJpAwg0KgcLy4xcVkLs9rhEGylSFub3A== 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 4QxKNq1B7tzdfN; Thu, 6 Jul 2023 01:55:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3661tN9W041605; Thu, 6 Jul 2023 01:55:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3661tN9G041604; Thu, 6 Jul 2023 01:55:23 GMT (envelope-from git) Date: Thu, 6 Jul 2023 01:55:23 GMT Message-Id: <202307060155.3661tN9G041604@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: cb1b77808a1e - stable/13 - nfscl: Fix support for doing Null RPCs 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: cb1b77808a1edf8ca803568439e8ef8a092192fb Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=cb1b77808a1edf8ca803568439e8ef8a092192fb commit cb1b77808a1edf8ca803568439e8ef8a092192fb Author: Rick Macklem AuthorDate: 2023-04-07 19:57:26 +0000 Commit: Rick Macklem CommitDate: 2023-07-06 01:53:47 +0000 nfscl: Fix support for doing Null RPCs Although the NFS client does not currently perform Null RPCs, this fix is needed if/when it might do so. Found during testing of experimental code that uses Null RPCs to maintain/monitor TCP connections for "nconnect" mounts. (cherry picked from commit 4adb28c0abfa3b8d076c7249f61a093c6eb9dac2) --- sys/fs/nfs/nfs_commonsubs.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sys/fs/nfs/nfs_commonsubs.c b/sys/fs/nfs/nfs_commonsubs.c index af9f66f03488..a738f8cc6fb1 100644 --- a/sys/fs/nfs/nfs_commonsubs.c +++ b/sys/fs/nfs/nfs_commonsubs.c @@ -375,6 +375,10 @@ nfscl_reqstart(struct nfsrv_descript *nd, int procnum, struct nfsmount *nmp, nd->nd_mreq = nd->nd_mb = mb; nd->nd_bpos = mtod(mb, char *); + /* For NFSPROC_NULL, there are no arguments. */ + if (procnum == NFSPROC_NULL) + goto out; + /* * And fill the first file handle into the request. */ @@ -469,6 +473,7 @@ nfscl_reqstart(struct nfsrv_descript *nd, int procnum, struct nfsmount *nmp, } else { (void)nfsm_fhtom(NULL, nd, nfhp, fhlen, 0); } +out: if (procnum < NFSV42_NPROCS) NFSINCRGLOBAL(nfsstatsv1.rpccnt[procnum]); } From nobody Thu Jul 6 06:57:43 2023 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 4QxS5g3jLyz4lykF; Thu, 6 Jul 2023 06:57:43 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QxS5g30xxz4KFS; Thu, 6 Jul 2023 06:57:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688626663; 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=PDKcPx19vIV/Dni+uoL7liBIdhqsSSs03c2Ip25Gjz4=; b=LHWWuLT/GX7AboDWUGPcU25a0LfqseQz1rfqWrTd1yAL552s+mZF73zjVMQT8K89aO9HTp WOI/5QYkhjDK553kZ0zQ2aZ8IfB+EX/KRzD40aWUyEuyEBnZpqKwt5OIcvhhqDBmKgAjuv H/E9MxeFESi5qUmthJ+p74tB4RlWgSl6BaVNIamcFBL7QSLvgjAWLEDRaldb1NRhCOSM7j nZl68i401aFNc6iAsGLnKHAsOx3i9IYuDJ5AwcMsZk9iC8FAUDBHUsO+m/FLckXSWaxTdp HSAcOd9mu3IDjhPHQ3VUqlHWGgYKZrdYlH0QGhsyTK69TfamqjOJ/0t4oH6K8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688626663; 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=PDKcPx19vIV/Dni+uoL7liBIdhqsSSs03c2Ip25Gjz4=; b=pIlfV/ckXOtRc97ILslFpRnKf6/2T2Ms9mMllKuW2Z8rdqN6oK7K5OhWAAbQGv91oeWeNH u6uicd3tzx85TEaBSpRRzrgBZW9C1x94q00OIX7MRRHfNo3/FMwMdJNDwCJWD4RcDvju72 Ah01CvodI8W43fV4zIzFU5OYxyoVsWWDGRyX7graupbqrjl+8uE4vUs3oVcFRPHgIQwwdQ uYUmi+PgRu4fnWnqhSQKAVPoI/NjxNk3TiS4gjjIalzBICdjGJor4UV6l/nyg4Z6erk0vB Xx47Ljnlmxj1O6FIq+OIz+Ek0DLZ3BQD/qnuuOgKNeulAnCiprKqB422AaKIgg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688626663; a=rsa-sha256; cv=none; b=bCVla1roxYw5ya16er3H27MTxsu7+lgxhEVjgUS08nTQAJUoV6TSBTCkBcGUKkmsy9GO93 e6iFXrfzFERE5JWjcwAkFz0p9lBRFUrA/Q9XC+B+/46QlOWCpxA6JKd8wP3pGHwL0/2T28 9j7VOEA9QyJSTGuq1m++nNCx+ug7YGVQEzgMY6pG5t9Pa89VBHv/IrLiRRwTv5voTTUVzM 5P7j67nOerufk/Q6hh0yqlRzSpa3xLC0O6btI4vjlMVy2PwS/6CRQ+6ix6LmLWHZ2g1uAz jHIUrG1avFpwCowN2tHKX7DXQXlqTuBwss+mGSQmwQspCOYBaN/UhuGJndHBog== 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 4QxS5g23d8zmN3; Thu, 6 Jul 2023 06:57:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3666vhdZ039844; Thu, 6 Jul 2023 06:57:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3666vhaa039843; Thu, 6 Jul 2023 06:57:43 GMT (envelope-from git) Date: Thu, 6 Jul 2023 06:57:43 GMT Message-Id: <202307060657.3666vhaa039843@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 3b05949e4932 - stable/13 - killpg1(): update the herald comment 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3b05949e49326e6ddcb1f4d14f74a03e3ec14e96 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=3b05949e49326e6ddcb1f4d14f74a03e3ec14e96 commit 3b05949e49326e6ddcb1f4d14f74a03e3ec14e96 Author: Konstantin Belousov AuthorDate: 2023-06-16 09:02:04 +0000 Commit: Konstantin Belousov CommitDate: 2023-07-06 06:55:58 +0000 killpg1(): update the herald comment (cherry picked from commit 4b59d1724b765063891cb44c28079b4c503a02fd) --- sys/kern/kern_sig.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c index 539c020c183e..79440c2866df 100644 --- a/sys/kern/kern_sig.c +++ b/sys/kern/kern_sig.c @@ -1744,7 +1744,7 @@ killpg1_sendsig(struct proc *p, bool notself, struct killpg1_ctx *arg) /* * Common code for kill process group/broadcast kill. - * cp is calling process. + * td is the calling thread, as usual. */ static int killpg1(struct thread *td, int sig, int pgid, int all, ksiginfo_t *ksi) From nobody Thu Jul 6 06:57:44 2023 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 4QxS5h4y4Hz4lyxB; Thu, 6 Jul 2023 06:57:44 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QxS5h43rpz4KP1; Thu, 6 Jul 2023 06:57:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688626664; 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=Yjis+H8s0nDe1MPS2eCjHW2rtOb2y5RWGYX+xH9tWlU=; b=Cw/cqbPY9YcE4BTc6rF9s9zpZzMsexq//g2t1A/hiV2NHhJ5t+KOPR/NmjprmCdf2FOXdH 15Ga+nnAClvy4MCooc/Awnyx9hm03lvKBl6Z1p7lEr/YqzTvM4sCZD9emF+rz55/3sHAdb VrjguO0veMnfNq96DuqiVlGgPQVC+Vy+BAO5ZSq+mp4c9MiNHxiocBdxWB/mqQQj0AoA7T GzGsM1SGcqgVVCec/0zBbdvy3cWvQLBveaBd4l0iD0kaWPvr2JEfF8xgseSngf/LKlMip2 KnQTEENDgrXSiKZL9K90yQS5kZC7vTCfKXduHO5HBubuWOhJNXgmswf7adE3QQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688626664; 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=Yjis+H8s0nDe1MPS2eCjHW2rtOb2y5RWGYX+xH9tWlU=; b=WhBwKiw6Dn0/8GQxpwei5L4B5oIAnapyXkfokgmG98r8KQrtleMoGIZToY5AQ2g3N29y/W u7I3Kl2y9mDuLUm8cCL9WBxmVv+iRXBvgF0BPG8fnizKBh/0ULYKHdZRNyGUKSLzuSoVW0 sZQlmSDur1ALiAv8TYFUzCQerj8G1gEYVdEWL+n0B9RtNEUF+EEFZA8iqWs+OGCBQi09Qf dXcDgfT3H/ksQO0zGqecHYNWRU/VfJ6HEfGNK0TUjtg2a24qRAUTgYDEF+H/vOzXDk43B8 ujWNasZHMuG2rFqeJLlKugIwCkcrowUcOl68VOBBfk7utPOswy+0lYm3u14WGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688626664; a=rsa-sha256; cv=none; b=NEv2PMW8LdaNxSzG0FtVtsUcfRDo66woAAMIvx9Gy8/PQ3fII3Pe54sifO6ZX1FiU9rZvT kKCNOSkA2KmfrTW7/7pfYMszTLr9KcJ8OylM76JbTHkABaueuPlCymBvSkNTuUfTS13FMC bQDwNOtLHGzMT8kW3mMrTfZGfspXG3fll4kN7Tkb3Jwh1J9MjLVz35HBjwqz79vn48kAuq SqifE2W9xQ8qTeNAqi1ry8GAn5RHfHuLcEfW/oLQxIk3PXa6vVUGwl9WSLUtCvQAvm4u5c Q3Db6Wdk70VkDf8fDCZhvNUK1s880Zlvl2eIhiIT/DxHYjINK32OVVT4qcQ/XA== 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 4QxS5h2q6fzmcC; Thu, 6 Jul 2023 06:57:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3666viD2039864; Thu, 6 Jul 2023 06:57:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3666vixJ039863; Thu, 6 Jul 2023 06:57:44 GMT (envelope-from git) Date: Thu, 6 Jul 2023 06:57:44 GMT Message-Id: <202307060657.3666vixJ039863@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: ee42b38ca436 - stable/13 - kern_lockf.c: fix typo 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: ee42b38ca4364fdc992d2f2d395a9d36e5222630 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=ee42b38ca4364fdc992d2f2d395a9d36e5222630 commit ee42b38ca4364fdc992d2f2d395a9d36e5222630 Author: Konstantin Belousov AuthorDate: 2023-07-04 22:23:57 +0000 Commit: Konstantin Belousov CommitDate: 2023-07-06 06:56:57 +0000 kern_lockf.c: fix typo (cherry picked from commit 658e7620672f8eb650695992b4a73e004c5f101b) --- sys/kern/kern_lockf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/kern_lockf.c b/sys/kern/kern_lockf.c index 52c603949bdc..2bd5b24014a0 100644 --- a/sys/kern/kern_lockf.c +++ b/sys/kern/kern_lockf.c @@ -195,7 +195,7 @@ static void lf_print_owner(struct lock_owner *); struct lock_owner { LIST_ENTRY(lock_owner) lo_link; /* (l) hash chain */ int lo_refs; /* (l) Number of locks referring to this */ - int lo_flags; /* (c) Flags passwd to lf_advlock */ + int lo_flags; /* (c) Flags passed to lf_advlock */ caddr_t lo_id; /* (c) Id value passed to lf_advlock */ pid_t lo_pid; /* (c) Process Id of the lock owner */ int lo_sysid; /* (c) System Id of the lock owner */ From nobody Thu Jul 6 07:57:44 2023 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 4QxTQw2hNyz4mCP4; Thu, 6 Jul 2023 07:57:44 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QxTQw22wcz3DJ1; Thu, 6 Jul 2023 07:57:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688630264; 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=ldOwpTqRvwJ4kssViTOUFm7rWO6GcsIxxF99GvwonY0=; b=UVFMXVxmZu0kvAvaPhHzYf6WMTJKrGIsiTymXzHA6P4TcXVDTEd8Yd8NecgB3Lbep5Fz63 UQJuEkAPoGN1VG9WkF95a02mtt+JUVhevMUh9OEicUzo0YivIik/Mxta3zh/2eapUVgNa9 sgcCW0wDbeW9CefX7QmZZCFJ1FUCCJhxXRNcPNKntXsmAhw+33RJIYB33H4696H794JoLv oLhO5/0JPlaEsXv05dRuMOCZATj0OwlhKYjeONE5zOvUhVeanGpCE7HIpNAnP3lIdEuoSF vCZ7GmJ78TF9Q+hq/XRN9Jo3dFUOlax8CeK2f0AwhbKibvwdV7j3IyRS+7OcJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688630264; 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=ldOwpTqRvwJ4kssViTOUFm7rWO6GcsIxxF99GvwonY0=; b=k5FQGi0KBuS9u0MptZt6L23sQ4OblAwxKJfMSq1SF1qPx+iIsSF3JjDiW3E532kqvSY/Nk /KuyE7HZaAIvofVr+iRIZ2g691q23uFpzxuTi/FCJc0bTi/hn8sc54xR5uR3aPoADkkwMp keXR77jOXGDvQwMHm3E9lmS6gyC9oDG+RfJxPRJKdh76sJ7i/XvOcNQsaZb4Q+TT7kJlrg YCiRbmnVk3BUGjarmHKOzRputB3s5kf1JZykjnjsDyIhK1kc0BHSJ+f8cdkf8iZC2td9ZC QyYjo/pUmJcqW/JwUdqegMb5L8cDKjzxUXhEdERGlCSnYN2i8zXpf7S/EXYHBA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688630264; a=rsa-sha256; cv=none; b=cY97aU3BYr2rdaHly240tL5PMlyP4vr7vKQtBYF8YC61GkbetUYTc3DlmlkZCa7Q5pJmlV 82PJe26wHRpvTxKlHdHs5TVnbxGH1AZCUBAYAqWqabdMAH6x4Kpald/i2TZ0cpGP4t+jEZ megyBKudBTaCtEiW6IL2Bm+4PfoVbB4ZIZhVv/ACB/wnEUidViKAP5GwowG75qu0pfcRGN IVRzUz2h1mfirGJle27Dk75x5lpVOT3W1787+Ttlmkcht0LkWrAtPdTC7BpNZTQ6LvmbOW TifwyX2inLolRhNiR522FcyU+k1pBqdTJl3fLmxblgZhyzWwgJzb6V5KutRTaw== 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 4QxTQw10NYznl3; Thu, 6 Jul 2023 07:57:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3667viRj038256; Thu, 6 Jul 2023 07:57:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3667viac038253; Thu, 6 Jul 2023 07:57:44 GMT (envelope-from git) Date: Thu, 6 Jul 2023 07:57:44 GMT Message-Id: <202307060757.3667viac038253@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Juraj Lutter Subject: git: 9000459d3bc2 - stable/13 - periodic: Honor kern.localbase 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: otis X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 9000459d3bc2816df3525cda8d3fa4eee6c92b26 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by otis: URL: https://cgit.FreeBSD.org/src/commit/?id=9000459d3bc2816df3525cda8d3fa4eee6c92b26 commit 9000459d3bc2816df3525cda8d3fa4eee6c92b26 Author: Juraj Lutter AuthorDate: 2023-06-06 11:40:49 +0000 Commit: Juraj Lutter CommitDate: 2023-07-06 07:56:35 +0000 periodic: Honor kern.localbase Take kern.localbase into account with fallback to /usr/local and also allow for LOCALBASE/etc/periodic.conf (similarly to what many other utilities do). Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D40435 (cherry picked from commit e5d7100c09e03e66535eee69d7e454c01e4a9d28) --- usr.sbin/periodic/periodic.8 | 9 +++++++-- usr.sbin/periodic/periodic.conf | 6 +++--- usr.sbin/periodic/periodic.sh | 8 ++++++++ 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/usr.sbin/periodic/periodic.8 b/usr.sbin/periodic/periodic.8 index 2fda1db157f5..fd09fbf1b368 100644 --- a/usr.sbin/periodic/periodic.8 +++ b/usr.sbin/periodic/periodic.8 @@ -183,7 +183,7 @@ and the standard and .Pa security scripts -.It Pa /etc/periodic.conf +.It Pa /etc/periodic.conf , ${LOCALBASE}/etc/periodic.conf this file contains local overrides for the default .Nm configuration @@ -207,7 +207,12 @@ system registry will typically have a .Va local_periodic variable reading: .Pp -.Dl local_periodic="/usr/local/etc/periodic" +.Dl local_periodic="${_localbase}/etc/periodic" +.Pp +where +.Pa ${_localbase} +is being set from within +.Pa /usr/sbin/periodic . .Pp To log .Nm diff --git a/usr.sbin/periodic/periodic.conf b/usr.sbin/periodic/periodic.conf index 4429c8d48eea..c14f4dd001db 100644 --- a/usr.sbin/periodic/periodic.conf +++ b/usr.sbin/periodic/periodic.conf @@ -17,10 +17,10 @@ # # What files override these defaults ? -periodic_conf_files="/etc/periodic.conf /etc/periodic.conf.local" +periodic_conf_files="/etc/periodic.conf /etc/periodic.conf.local ${_localbase}/etc/periodic.conf" -# periodic script dirs -local_periodic="/usr/local/etc/periodic" +# periodic script dirs. _localbase is being set in /usr/sbin/periodic +local_periodic="${_localbase}/etc/periodic" # Max time to sleep to avoid causing congestion on download servers anticongestion_sleeptime=3600 diff --git a/usr.sbin/periodic/periodic.sh b/usr.sbin/periodic/periodic.sh index 84e14e9cfd80..97de8192dd28 100644 --- a/usr.sbin/periodic/periodic.sh +++ b/usr.sbin/periodic/periodic.sh @@ -30,6 +30,14 @@ if [ $# -lt 1 ] ; then usage fi +_localbase=`/sbin/sysctl -n user.localbase 2> /dev/null` +# Set default value of _localbase if not previously set +: ${_localbase:="/usr/local"} + +# Use a deterministic path to match the preset from /etc/crontab in case +# periodic is run interactively. +export PATH=/sbin:/bin:/usr/sbin:/usr/bin:${_localbase}/sbin:${_localbase}/bin + # If possible, check the global system configuration file, # to see if there are additional dirs to check if [ -r /etc/defaults/periodic.conf ]; then From nobody Thu Jul 6 15:39:53 2023 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 4QxghB14QRz4lXl7; Thu, 6 Jul 2023 15:39:54 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QxghB0Zmdz3DYt; Thu, 6 Jul 2023 15:39:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688657994; 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=877cKfzQwljcuRq4WWLQwEgzSRy9s0ze1ISdXt++I8Y=; b=SnYAGECrz6k65FB3y1+mQrXmZWohAyC2O/IPZ7/drChWXxIuy0wG7wqdd3v7hmZl/Oh3qB wBKBUfHjHuqaN5s6iXeph9yC56h7Cjqf8aJXI5g7CSuOT/0xOyKpiroeyuKVmvy5ZRurJQ wdzU7iBIrLWt7gsUx9RR2S5R8QXRCfO8+j+NSG69AA/W/s4g7S4VJr4hJzN3KfhW1vzMl/ iEYYRU46kA784I9kxwQe5MCQSlOsrqIh4wvGg+jflZ2bFunMSnc/ZazdyOfoVwzF9oI2vB kTlMickEc6hMDNeRpESVy3crgun+4voCoJsJYvHHZR8wXDW4YUg0buS2V+CEUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688657994; 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=877cKfzQwljcuRq4WWLQwEgzSRy9s0ze1ISdXt++I8Y=; b=tbvsOGQFbicHztzUjmejBLzTdUCSNlslTOpFJkZxl+L9H5sY+38mW/n4zQJrz9oWHR1D1r 0/1TASHSmTVIXN/moheg7EpfR/7wUvGm7Efsatg/62fm8v+dJFVwMKcEaUPk+gumRlZRdk ox0wSi6LEQKfvFvdQAPwb2ce7gk12K6D4rcPOGkx5iQVPrN6IcH3l2D8DsYYbX3cJzPwIj CdbGYTsEgqVHPZ3uJJonULqvrtGzzfd/tY96A7TeNVds160DL938t2x9gtDP8FdSc3TPRn XkoXM/MBDL/FHxqc0t4U2i2u/nuzjW7hdPz1UfscWBlZjWCYmqpYAH5KkWFymA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688657994; a=rsa-sha256; cv=none; b=tuExc0JGaarcoZ++A0ByMl8bWorw8U88Plte1iU3aDyVSs5tHIedo0QZEzi5vvhuEZPxmb nc1pSr0+VxVPqlTmpoETNOpCpjO0c8/C2th9XretlPrQU3v+EOHshH64CpRQOxr3OMlcwK d51bF9goXcrt5cbIkd7U339NI64PEJ1FKrF78PA+M3oZBTA814nFFlqVhYcCoZOOJN+Lm5 EnMqrjjFZ960JEedR3Z4xPdzpvoNk357SqntUoz5yjADEcNIVsK9NcsjXV9/QNfRSV0B9+ ClCNQA1GcCfIWJVmgpajHdiussgjos88smS/vBx5AXMc2f10w4Sj5uupB79nlw== 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 4Qxgh96kFXz12MJ; Thu, 6 Jul 2023 15:39:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 366FdrYT000994; Thu, 6 Jul 2023 15:39:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 366FdrSe000993; Thu, 6 Jul 2023 15:39:53 GMT (envelope-from git) Date: Thu, 6 Jul 2023 15:39:53 GMT Message-Id: <202307061539.366FdrSe000993@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 98358de5754c - stable/12 - Fix spurious error from sysrc 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 98358de5754cc85b50309323ff72a66193502107 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=98358de5754cc85b50309323ff72a66193502107 commit 98358de5754cc85b50309323ff72a66193502107 Author: Devin Teske AuthorDate: 2019-12-02 05:24:16 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2023-07-06 15:39:23 +0000 Fix spurious error from sysrc When using sysrc to modify a file, the file should be created silently. However, with the introduction of SVN r335280, an error of "No such file or directory" would appear despite everything else working as-expected. The nature of this spurious error is that SVN r335280 did not check if the file exists first, before trying to fixup the line-endings in the file just prior to modification. PR: bin/240875 Reported by: Jose Luis Duran MFC after: 3 days (cherry picked from commit e19a2226fe3bbeeb6e922987475300868374d09a) --- usr.sbin/bsdconfig/share/sysrc.subr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/bsdconfig/share/sysrc.subr b/usr.sbin/bsdconfig/share/sysrc.subr index 010d240f680a..11298f00f47a 100644 --- a/usr.sbin/bsdconfig/share/sysrc.subr +++ b/usr.sbin/bsdconfig/share/sysrc.subr @@ -560,7 +560,7 @@ f_sysrc_set() # if [ "$not_found" ]; then # Add a newline if missing before appending to the file - awk 'BEGIN { wc = 0 } NR == 1 { + [ ! -e "$file" ] || awk 'BEGIN { wc = 0 } NR == 1 { (cmd = "wc -l " FILENAME) | getline close(cmd) wc = $1 From nobody Fri Jul 7 18:52:20 2023 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 4QyMvm5d2Pz4lMC6; Fri, 7 Jul 2023 18:52:20 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QyMvm5BSJz3P5D; Fri, 7 Jul 2023 18:52:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688755940; 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=k2nmsUgTiLXQiaofeGPTYo37MlhYo0DuLDUr5GmPdsY=; b=htnxhY88HTs6BsRz+8xrLwPsLAm8N6zQ2qHyqGg/vT/wHahL2kGPTmkXNutDcraoel+E9x 7i1inPE9bgY4ZkVyQHKu9u2zg8hTGJenYiPE5AkrUke2VXQ+qeLTJARjLDtFiVwmcowg4o bJCiZdaRcvKhpzAHaePNxS426CgH9IhWYvlZUuqAkR6zRNcy+lXypSZU2IsDco/4AtQGzg fNgjmkdrv/V3RXRr5efJLpQq3eA+Mv2K5qa5yJbkPiNflGuMMBHmf15e32yn/qVm241ccw kO4ug9ji0hJsJ/SGW7O0maUYrvzdKlxO8uIAnWnuGzjrst3hTKktJMnjEDcZyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688755940; 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=k2nmsUgTiLXQiaofeGPTYo37MlhYo0DuLDUr5GmPdsY=; b=b7c+QvW1Ty+wPFyySG8nS0UKN4W+RWwrdGTjtHeuen7gNzI+uHtreLjWBw0tXUEr5Gu/ij RbKN+kVsu49XTCDfst6MVT6iXcwT9jMlPcxeTdyPJo0a+HxECY0xlIV/uHp26nP9NI+n+/ 5hDx3Mnz+bRj6dVbEBfyjvfvArPmQiqrXmCtvrsMg3aaPxRp7vruJkZtr6T+M+r+22fKtI lh0KLlJgKOgZ9ppZbGG5pzHalhBuyI2uQF0zIr/O6pzl+t6w4YS7VwBHkHRyzmPImzo0sR Whvj2C+JiQMxvtbWDt9uAT4DCtgrKjG0pk3uDiSPSHiK1EtVfj16I+qdv8JddQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688755940; a=rsa-sha256; cv=none; b=g3GtGknlO6pM3yAaBWq3qVztWm788TNHDDWaKgzxS3NVDHoqZFFZhjoBMbFri2eDnxgWpv ReGDiWJ9IDnIqHDSmKWHkOg6+r106jH5/x/O8hoZSj1Ld7zhh6o+XttHxaisuUnxZ2566w vZmc4bIVPzxDQ0gmaRoKVKDnqSmKj9zYez5GmdMbaProKGyJHr6ZyDToX8WDDzKX4SXvNh X78MoLIxOcJ+F+DSIG8UWMQoHy8WQEDOGxnY5l/6eoeea5f1yY9tu35ov394u/VoZ7HejH i7zU2YPpz/WMWR3tajoSt6ke57R4ZX5VEDSyjSJnGItCRq9BPF5FIEgi+4ksZg== 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 4QyMvm4GrBzqRf; Fri, 7 Jul 2023 18:52:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 367IqKQ4009059; Fri, 7 Jul 2023 18:52:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 367IqKMn009058; Fri, 7 Jul 2023 18:52:20 GMT (envelope-from git) Date: Fri, 7 Jul 2023 18:52:20 GMT Message-Id: <202307071852.367IqKMn009058@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: e27e9b3ac329 - stable/13 - pseudofs: Fix a potential out-of-bounds access in pfs_lookup() 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e27e9b3ac329b8d01c0800de32c735b2363c8862 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=e27e9b3ac329b8d01c0800de32c735b2363c8862 commit e27e9b3ac329b8d01c0800de32c735b2363c8862 Author: Mark Johnston AuthorDate: 2023-06-23 13:54:39 +0000 Commit: Mark Johnston CommitDate: 2023-07-07 18:46:08 +0000 pseudofs: Fix a potential out-of-bounds access in pfs_lookup() pseudofs nodes store their name in a flexible array member, so the node allocation is sized using the length of the name, including a nul terminator. pfs_lookup() scans a directory of nodes, comparing names to find a match. The comparison was incorrect and assumed that all node names were at least as long as the name being looked up, which of course isn't true. I believe the bug is mostly harmless since it cannot result in false positive or negative matches from the lookup, but it triggers a KASAN check. Reported by: pho Reviewed by: kib, Olivier Certner MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D40692 (cherry picked from commit fc915f1be145a52c53f6f1c37525043216e32bb8) --- sys/fs/pseudofs/pseudofs_vnops.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/fs/pseudofs/pseudofs_vnops.c b/sys/fs/pseudofs/pseudofs_vnops.c index e0c795ed2a25..5eccc7ac4b43 100644 --- a/sys/fs/pseudofs/pseudofs_vnops.c +++ b/sys/fs/pseudofs/pseudofs_vnops.c @@ -537,8 +537,8 @@ pfs_lookup(struct vop_cachedlookup_args *va) for (pn = pd->pn_nodes; pn != NULL; pn = pn->pn_next) if (pn->pn_type == pfstype_procdir) pdn = pn; - else if (pn->pn_name[namelen] == '\0' && - bcmp(pname, pn->pn_name, namelen) == 0) { + else if (strncmp(pname, pn->pn_name, namelen) == 0 && + pn->pn_name[namelen] == '\0') { pfs_unlock(pd); goto got_pnode; } From nobody Fri Jul 7 18:52:21 2023 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 4QyMvn6YMBz4lM25; Fri, 7 Jul 2023 18:52:21 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QyMvn60kmz3P7H; Fri, 7 Jul 2023 18:52:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688755941; 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=c88FeeHWh3esI8OcVYHR1X9VqZRjvYmNMiHhe0uCXyo=; b=J9ttqgeRAB5e9NMnpzAZAEgvcBOICcFjJGXvM9M63yaHWmKy19n+K2Z64p/IcfQlIqLvFx yXM/d5xPhxPT965LLv4NLYfO4bYkh6MZ1cZtuB++YoJZ1KoVqVWUDzFIqflsLZykQtsRpZ iq0Y/XmWfpXZTUjZAf4yEjC9A0K4o57aR/CLBkfgBgvFfVQOOq/Z4Ruo3yJVmjFhrnOPhW Y0FDeAnHWhGD0U2Ry8YZm4KgjLSs61egl3g1lxzDH+13fyM9oHE7ok5ddsEAS9vmtIvVwF kAhSOdKemFip70ooYEptVjynkSItL2rN/jChqJMwavDXbufftY1LDl5sxSETIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688755941; 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=c88FeeHWh3esI8OcVYHR1X9VqZRjvYmNMiHhe0uCXyo=; b=KYDCfGCosD+r3VHlxOCcXbXRYA6EPbrJM8l41QOrtQNW2b/9roGBagifk7Bns0t0vVxnCp JSMHOyE8eE42wv61PLjPPWRTmpE2PoY8SJ+qjeSr221t/cpVTesgnZWrhr64TMicHWUsj/ MI7BF0/If3aEUt3Zw5o6XJ4Toa+j+7UqnSLeIVZGSMPY19zUMjeMmFFg0IKpJldVfjeVBK tG0ibjyrThsC5LOBMj9OA+/Tbm0K6ID9tX3WvldSFqxp1F2AuT+MaGEXPh9J8z+hNEPfBP v8t8390oRxJC9ROF++ysUdkYXRw3wVty+EOj2q3w07fiE/tDiGYoMgEienwEsw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688755941; a=rsa-sha256; cv=none; b=ShYYcyFSrOCRBLhRGmDKpcstBg6IBtPpzM7TYaSWPi6B4MOUiTQhvP9+6G1ym/vqpwtG2Q /Fsgt7BG7LI0DPfbRsIk4FYDHDbaAuqhct2ukDWm70kx/Db0d1W+B+S/HJnoshOGsK3JkQ l6FY1pIyBLu9VnwVhiaSvdHZCnxFuzY7XHXa08ye8Ky7dJI/PODYKPzc3sHnrwX5GMc3wt fk0aLp0GvM2c8b5Wd8R66xQh+ngz1GrSxjZO/2RiDqyIZApJYsEgwf/1S1KjagY7B+GQKm 3GhbrroGqLcQaTVPZXFUlvcAUqCNoxPYDTXxn8F5eobjEh0oGp+ujobip/ODkQ== 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 4QyMvn4qXFzq07; Fri, 7 Jul 2023 18:52:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 367IqLDk009080; Fri, 7 Jul 2023 18:52:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 367IqLfY009079; Fri, 7 Jul 2023 18:52:21 GMT (envelope-from git) Date: Fri, 7 Jul 2023 18:52:21 GMT Message-Id: <202307071852.367IqLfY009079@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: d2681db6434d - stable/13 - netinet tests: Add a test which connects a disconnected socket 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d2681db6434d1d0eb5e6d1e3af07c7b1ff9cb723 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d2681db6434d1d0eb5e6d1e3af07c7b1ff9cb723 commit d2681db6434d1d0eb5e6d1e3af07c7b1ff9cb723 Author: Mark Johnston AuthorDate: 2023-06-23 14:06:13 +0000 Commit: Mark Johnston CommitDate: 2023-07-07 18:46:23 +0000 netinet tests: Add a test which connects a disconnected socket MFC after: 2 weeks Sponsored by: The FreeBSD Foundation (cherry picked from commit b1c66bc44af099174afb9840c7db011a5bd0225d) --- tests/sys/netinet/socket_afinet.c | 47 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 45 insertions(+), 2 deletions(-) diff --git a/tests/sys/netinet/socket_afinet.c b/tests/sys/netinet/socket_afinet.c index 985d67d83c99..07fe90704206 100644 --- a/tests/sys/netinet/socket_afinet.c +++ b/tests/sys/netinet/socket_afinet.c @@ -28,9 +28,9 @@ #include __FBSDID("$FreeBSD$"); -#include #include #include +#include #include #include @@ -228,14 +228,57 @@ ATF_TC_BODY(socket_afinet_poll_rdhup, tc) close(ss); } -ATF_TP_ADD_TCS(tp) +ATF_TC_WITHOUT_HEAD(socket_afinet_stream_reconnect); +ATF_TC_BODY(socket_afinet_stream_reconnect, tc) { + struct sockaddr_in sin; + int ss, cs, rc; + + /* + * Make sure that an attempt to connect(2) a connected or disconnected + * stream socket fails with EISCONN. + */ + /* Server setup. */ + ss = socket(PF_INET, SOCK_STREAM, 0); + ATF_CHECK(ss >= 0); + bzero(&sin, sizeof(sin)); + sin.sin_family = AF_INET; + sin.sin_len = sizeof(sin); + sin.sin_port = htons(6666); + sin.sin_addr.s_addr = htonl(INADDR_LOOPBACK); + rc = bind(ss, (struct sockaddr *)&sin, sizeof(sin)); + ATF_CHECK_EQ(0, rc); + rc = listen(ss, 1); + ATF_CHECK_EQ(0, rc); + + /* Client connects, shuts down. */ + cs = socket(PF_INET, SOCK_STREAM, 0); + ATF_CHECK(cs >= 0); + rc = connect(cs, (struct sockaddr *)&sin, sizeof(sin)); + ATF_CHECK_EQ(0, rc); + rc = shutdown(cs, SHUT_RDWR); + ATF_CHECK_EQ(0, rc); + + /* A subsequent connect(2) fails with EISCONN. */ + rc = connect(cs, (struct sockaddr *)&sin, sizeof(sin)); + ATF_CHECK_EQ(-1, rc); + ATF_CHECK_EQ(errno, EISCONN); + + rc = close(cs); + ATF_CHECK_EQ(0, rc); + rc = close(ss); + ATF_CHECK_EQ(0, rc); +} + +ATF_TP_ADD_TCS(tp) +{ ATF_TP_ADD_TC(tp, socket_afinet); ATF_TP_ADD_TC(tp, socket_afinet_bind_zero); ATF_TP_ADD_TC(tp, socket_afinet_bind_ok); ATF_TP_ADD_TC(tp, socket_afinet_poll_no_rdhup); ATF_TP_ADD_TC(tp, socket_afinet_poll_rdhup); + ATF_TP_ADD_TC(tp, socket_afinet_stream_reconnect); return atf_no_error(); } From nobody Fri Jul 7 18:52:22 2023 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 4QyMvq0T0Gz4lLyw; Fri, 7 Jul 2023 18:52:23 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QyMvp6nFNz3PRn; Fri, 7 Jul 2023 18:52:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688755943; 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=5j7JYIP9skJd3hbLys3oGJQ9SOdrK1R/nkHQuPQyKnQ=; b=vkZHAP5AZi5y9rL4vPLIzIoR0IVo+nbgYnMtAtaFgcAgHMRdPFLZaL9TracfX3YF8Aledv YPImNToJjFDICIjDUpq63zWBQZvt29GATJ2PwLrHKIgYxfBZ4p6OFETLGTAbjgVCc8Tk9h hrliyyuSXdcWchsAjARozmhYpENqVIjUpKizsMVh2bNbqRvuGuOmhYZMZwgnMJeWflKXhl y92Otvdx+9tkscBgq+/AqRFiq0+KS1fVVGiX3p0enZfhf28CyyBEwhzuz4FGHUUaBfyS/U oRUqmbpnLGQqfA35yscwaB1qJ+AWNsQgD6mHgO3OKmZhOCW679NN+PYfN4EdLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688755943; 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=5j7JYIP9skJd3hbLys3oGJQ9SOdrK1R/nkHQuPQyKnQ=; b=egirnvqJNM1dNwjbh3XOTUyZIM1Lxg36VFzNIp2YQlLJmc/Y20uh52ojADz86MCKJHwn+K jbupfqpN3mx0v+5AsGrTQTezMS8kZL5BUpeFjVTlVujMQTKRskrhAAf0/2y6egBQUWWJ0X k6dUBYz98zUtO7jMh3KA2C+b3LaVhIdDrAv3Quni0lje7j61GivKfK3U8NnN7EW6xVKzKW 99I1yecTxnp3x327iLYT0I7p+iKta7bqDpaUPTCkakoANf08Xo6KE8j2XlUu12cN7OZ7My +m25MEnU1GI6Jp7egMNx0X5zmzHexJ6yQiK6di6Q7muX6CWoRKOQEuyOs7OoNw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688755943; a=rsa-sha256; cv=none; b=W/p/kiU+SyVKDmLek1juI+A94uz71eHCJqaSO0YlQu7j+KP/LsIgeJD4gbyzAAqFKQhcEK MpIyexB+rL1BL0N9WmEXuf8GlgbyLsN4YSMs2DkqE/EnIqwtJVonw/tKZQlvCCwWz0NxAn 7hyy8GVdhSPRgG5kikEUQWeakemy6izebM6ACwYq+dVKcoRbQ09BbTt/cHkidGW5hn613X yDVj38GVJAhr4V7REy72wK/Cpscip9SfvNetDLBYpf3N3KWJhBZx0KBMuTHywGp1nDViPo VMNILuLqZs369g+f1bwKJbE6uuOzWB9UaZ9D7a0zdZ+7SE/KDulwG4QknGr8Ow== 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 4QyMvp5m1Lzph2; Fri, 7 Jul 2023 18:52:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 367IqMjR009099; Fri, 7 Jul 2023 18:52:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 367IqMOS009098; Fri, 7 Jul 2023 18:52:22 GMT (envelope-from git) Date: Fri, 7 Jul 2023 18:52:22 GMT Message-Id: <202307071852.367IqMOS009098@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: db6978e02401 - stable/13 - netinet6: Implement in6_cksum_partial() using m_apply() 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: db6978e02401cc3c1ea6e965fffd2482b1dd6461 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=db6978e02401cc3c1ea6e965fffd2482b1dd6461 commit db6978e02401cc3c1ea6e965fffd2482b1dd6461 Author: Mark Johnston AuthorDate: 2023-06-23 13:55:43 +0000 Commit: Mark Johnston CommitDate: 2023-07-07 18:46:41 +0000 netinet6: Implement in6_cksum_partial() using m_apply() This ensures that in6_cksum_partial() can be applied to unmapped mbufs, which can happen at least when icmp6_reflect() quotes a packet. The basic idea is to restructure in6_cksum_partial() to operate on one mbuf at a time. If the buffer length is odd or unaligned, an extra residual byte may be returned, to be incorporated into the checksum when processing the next buffer. PR: 268400 Reviewed by: cy MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D40598 (cherry picked from commit 6775ef4188b4d4c023e76ebd2b71fa8c2c7e7cd2) --- sys/netinet6/in6.h | 6 +- sys/netinet6/in6_cksum.c | 300 +++++++++++++++++++++-------------------------- 2 files changed, 139 insertions(+), 167 deletions(-) diff --git a/sys/netinet6/in6.h b/sys/netinet6/in6.h index 82f876506f0f..5dd7c13e3272 100644 --- a/sys/netinet6/in6.h +++ b/sys/netinet6/in6.h @@ -660,10 +660,10 @@ struct ip6_mtuinfo { struct cmsghdr; struct ip6_hdr; +int in6_cksum(struct mbuf *, uint8_t, uint32_t, uint32_t); +int in6_cksum_partial(struct mbuf *, uint8_t, uint32_t, uint32_t, uint32_t); int in6_cksum_pseudo(struct ip6_hdr *, uint32_t, uint8_t, uint16_t); -int in6_cksum(struct mbuf *, u_int8_t, u_int32_t, u_int32_t); -int in6_cksum_partial(struct mbuf *, u_int8_t, u_int32_t, u_int32_t, - u_int32_t); + int in6_localaddr(struct in6_addr *); int in6_localip(struct in6_addr *); int in6_ifhasaddr(struct ifnet *, struct in6_addr *); diff --git a/sys/netinet6/in6_cksum.c b/sys/netinet6/in6_cksum.c index c4624b90b6a1..a93db45eb968 100644 --- a/sys/netinet6/in6_cksum.c +++ b/sys/netinet6/in6_cksum.c @@ -82,6 +82,16 @@ __FBSDID("$FreeBSD$"); #define ADDCARRY(x) (x > 65535 ? x -= 65535 : x) #define REDUCE {l_util.l = sum; sum = l_util.s[0] + l_util.s[1]; (void)ADDCARRY(sum);} +union l_util { + uint16_t s[2]; + uint32_t l; +}; + +union s_util { + uint8_t c[2]; + uint16_t s; +}; + static int _in6_cksum_pseudo(struct ip6_hdr *ip6, uint32_t len, uint8_t nxt, uint16_t csum) { @@ -131,17 +141,115 @@ _in6_cksum_pseudo(struct ip6_hdr *ip6, uint32_t len, uint8_t nxt, uint16_t csum) int in6_cksum_pseudo(struct ip6_hdr *ip6, uint32_t len, uint8_t nxt, uint16_t csum) { + union l_util l_util; int sum; - union { - u_int16_t s[2]; - u_int32_t l; - } l_util; sum = _in6_cksum_pseudo(ip6, len, nxt, csum); REDUCE; return (sum); } +static int +in6_cksumdata(void *data, int *lenp, uint8_t *residp, int rlen) +{ + union l_util l_util; + union s_util s_util; + uint16_t *w; + int len, sum; + bool byte_swapped; + + KASSERT(*lenp >= 0, ("%s: negative len %d", __func__, *lenp)); + KASSERT(rlen == 0 || rlen == 1, ("%s: rlen %d", __func__, rlen)); + + len = *lenp; + sum = 0; + + if (len == 0) { + len = rlen; + goto out; + } + + byte_swapped = false; + w = data; + + /* + * Do we have a residual byte left over from the previous buffer? + */ + if (rlen == 1) { + s_util.c[0] = *residp; + s_util.c[1] = *(uint8_t *)w; + sum += s_util.s; + w = (uint16_t *)((uint8_t *)w + 1); + len--; + rlen = 0; + } + + /* + * Force to even boundary. + */ + if ((1 & (uintptr_t)w) && len > 0) { + REDUCE; + sum <<= 8; + s_util.c[0] = *(uint8_t *)w; + w = (uint16_t *)((uint8_t *)w + 1); + len--; + byte_swapped = true; + } + + /* + * Unroll the loop to make overhead from branches &c small. + */ + while ((len -= 32) >= 0) { + sum += w[0]; sum += w[1]; sum += w[2]; sum += w[3]; + sum += w[4]; sum += w[5]; sum += w[6]; sum += w[7]; + sum += w[8]; sum += w[9]; sum += w[10]; sum += w[11]; + sum += w[12]; sum += w[13]; sum += w[14]; sum += w[15]; + w += 16; + } + len += 32; + while ((len -= 8) >= 0) { + sum += w[0]; sum += w[1]; sum += w[2]; sum += w[3]; + w += 4; + } + len += 8; + if (len == 0 && !byte_swapped) + goto out; + REDUCE; + while ((len -= 2) >= 0) { + sum += *w++; + } + if (byte_swapped) { + REDUCE; + sum <<= 8; + if (len == -1) { + s_util.c[1] = *(uint8_t *)w; + sum += s_util.s; + } else /* len == -2 */ + *residp = s_util.c[0]; + len++; + } else if (len == -1) + *residp = *(uint8_t *)w; +out: + *lenp = len & 1; + return (sum); +} + +struct in6_cksum_partial_arg { + int sum; + int rlen; + uint8_t resid; +}; + +static int +in6_cksum_partial_one(void *_arg, void *data, u_int len) +{ + struct in6_cksum_partial_arg *arg = _arg; + + arg->sum += in6_cksumdata(data, &len, &arg->resid, arg->rlen); + arg->rlen = len; + return (0); +} + /* * m MUST contain a contiguous IP6 header. * off is an offset where TCP/UDP/ICMP6 header starts. @@ -150,33 +258,29 @@ in6_cksum_pseudo(struct ip6_hdr *ip6, uint32_t len, uint8_t nxt, uint16_t csum) * cov is the number of bytes to be taken into account for the checksum */ int -in6_cksum_partial(struct mbuf *m, u_int8_t nxt, u_int32_t off, - u_int32_t len, u_int32_t cov) +in6_cksum_partial(struct mbuf *m, uint8_t nxt, uint32_t off, uint32_t len, + uint32_t cov) { + struct in6_cksum_partial_arg arg; + union l_util l_util; + union s_util s_util; struct ip6_hdr *ip6; - u_int16_t *w, scope; - int byte_swapped, mlen; + uint16_t *w, scope; int sum; union { - u_int16_t phs[4]; + uint16_t phs[4]; struct { - u_int32_t ph_len; - u_int8_t ph_zero[3]; - u_int8_t ph_nxt; + uint32_t ph_len; + uint8_t ph_zero[3]; + uint8_t ph_nxt; } __packed ph; } uph; - union { - u_int8_t c[2]; - u_int16_t s; - } s_util; - union { - u_int16_t s[2]; - u_int32_t l; - } l_util; /* Sanity check. */ KASSERT(m->m_pkthdr.len >= off + len, ("%s: mbuf len (%d) < off(%d)+" "len(%d)", __func__, m->m_pkthdr.len, off, len)); + KASSERT(m->m_len >= sizeof(*ip6), + ("%s: mbuf len %d < sizeof(ip6)", __func__, m->m_len)); /* * First create IP6 pseudo header and calculate a summary. @@ -193,7 +297,7 @@ in6_cksum_partial(struct mbuf *m, u_int8_t nxt, u_int32_t off, /* IPv6 source address. */ scope = in6_getscope(&ip6->ip6_src); - w = (u_int16_t *)&ip6->ip6_src; + w = (uint16_t *)&ip6->ip6_src; sum += w[0]; sum += w[1]; sum += w[2]; sum += w[3]; sum += w[4]; sum += w[5]; sum += w[6]; sum += w[7]; if (scope != 0) @@ -201,158 +305,26 @@ in6_cksum_partial(struct mbuf *m, u_int8_t nxt, u_int32_t off, /* IPv6 destination address. */ scope = in6_getscope(&ip6->ip6_dst); - w = (u_int16_t *)&ip6->ip6_dst; + w = (uint16_t *)&ip6->ip6_dst; sum += w[0]; sum += w[1]; sum += w[2]; sum += w[3]; sum += w[4]; sum += w[5]; sum += w[6]; sum += w[7]; if (scope != 0) sum -= scope; /* - * Secondly calculate a summary of the first mbuf excluding offset. + * Loop over the rest of the mbuf chain and compute the rest of the + * checksum. m_apply() handles unmapped mbufs. */ - while (off > 0) { - if (m->m_len <= off) - off -= m->m_len; - else - break; - m = m->m_next; - } - w = (u_int16_t *)(mtod(m, u_char *) + off); - mlen = m->m_len - off; - if (cov < mlen) - mlen = cov; - cov -= mlen; - /* - * Force to even boundary. - */ - if ((1 & (long)w) && (mlen > 0)) { - REDUCE; - sum <<= 8; - s_util.c[0] = *(u_char *)w; - w = (u_int16_t *)((char *)w + 1); - mlen--; - byte_swapped = 1; - } else - byte_swapped = 0; + arg.sum = sum; + arg.rlen = 0; + (void)m_apply(m, off, cov, in6_cksum_partial_one, &arg); + sum = arg.sum; /* - * Unroll the loop to make overhead from - * branches &c small. + * Handle a residual byte. */ - while ((mlen -= 32) >= 0) { - sum += w[0]; sum += w[1]; sum += w[2]; sum += w[3]; - sum += w[4]; sum += w[5]; sum += w[6]; sum += w[7]; - sum += w[8]; sum += w[9]; sum += w[10]; sum += w[11]; - sum += w[12]; sum += w[13]; sum += w[14]; sum += w[15]; - w += 16; - } - mlen += 32; - while ((mlen -= 8) >= 0) { - sum += w[0]; sum += w[1]; sum += w[2]; sum += w[3]; - w += 4; - } - mlen += 8; - if (mlen == 0 && byte_swapped == 0) - goto next; - REDUCE; - while ((mlen -= 2) >= 0) { - sum += *w++; - } - if (byte_swapped) { - REDUCE; - sum <<= 8; - byte_swapped = 0; - if (mlen == -1) { - s_util.c[1] = *(char *)w; - sum += s_util.s; - mlen = 0; - } else - mlen = -1; - } else if (mlen == -1) - s_util.c[0] = *(char *)w; - next: - m = m->m_next; - - /* - * Lastly calculate a summary of the rest of mbufs. - */ - - for (;m && cov; m = m->m_next) { - if (m->m_len == 0) - continue; - w = mtod(m, u_int16_t *); - if (mlen == -1) { - /* - * The first byte of this mbuf is the continuation - * of a word spanning between this mbuf and the - * last mbuf. - * - * s_util.c[0] is already saved when scanning previous - * mbuf. - */ - s_util.c[1] = *(char *)w; - sum += s_util.s; - w = (u_int16_t *)((char *)w + 1); - mlen = m->m_len - 1; - cov--; - } else - mlen = m->m_len; - if (cov < mlen) - mlen = cov; - cov -= mlen; - /* - * Force to even boundary. - */ - if ((1 & (long) w) && (mlen > 0)) { - REDUCE; - sum <<= 8; - s_util.c[0] = *(u_char *)w; - w = (u_int16_t *)((char *)w + 1); - mlen--; - byte_swapped = 1; - } - /* - * Unroll the loop to make overhead from - * branches &c small. - */ - while ((mlen -= 32) >= 0) { - sum += w[0]; sum += w[1]; sum += w[2]; sum += w[3]; - sum += w[4]; sum += w[5]; sum += w[6]; sum += w[7]; - sum += w[8]; sum += w[9]; sum += w[10]; sum += w[11]; - sum += w[12]; sum += w[13]; sum += w[14]; sum += w[15]; - w += 16; - } - mlen += 32; - while ((mlen -= 8) >= 0) { - sum += w[0]; sum += w[1]; sum += w[2]; sum += w[3]; - w += 4; - } - mlen += 8; - if (mlen == 0 && byte_swapped == 0) - continue; - REDUCE; - while ((mlen -= 2) >= 0) { - sum += *w++; - } - if (byte_swapped) { - REDUCE; - sum <<= 8; - byte_swapped = 0; - if (mlen == -1) { - s_util.c[1] = *(char *)w; - sum += s_util.s; - mlen = 0; - } else - mlen = -1; - } else if (mlen == -1) - s_util.c[0] = *(char *)w; - } - if (cov) - panic("in6_cksum: out of data"); - if (mlen == -1) { - /* The last mbuf has odd # of bytes. Follow the - standard (the odd byte may be shifted left by 8 bits - or not as determined by endian-ness of the machine) */ + if (arg.rlen == 1) { + s_util.c[0] = arg.resid; s_util.c[1] = 0; sum += s_util.s; } @@ -361,7 +333,7 @@ in6_cksum_partial(struct mbuf *m, u_int8_t nxt, u_int32_t off, } int -in6_cksum(struct mbuf *m, u_int8_t nxt, u_int32_t off, u_int32_t len) +in6_cksum(struct mbuf *m, uint8_t nxt, uint32_t off, uint32_t len) { return (in6_cksum_partial(m, nxt, off, len, len)); } From nobody Fri Jul 7 19:13:20 2023 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 4QyNN02mhZz4lSMg; Fri, 7 Jul 2023 19:13:20 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QyNN02KSHz3jjL; Fri, 7 Jul 2023 19:13:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688757200; 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=OJB0gmSUgdEtHhv6KkWVjBZrKUpQP81K7mTl097ezsU=; b=lQMKKmT07vJstrc2ZMh74QDjjdjlpKs61sx5t5BrQO9KQ+dJ8uXM2dphGJjR8dCHNEE2kS OAELOUJAe7GfNHPR7cwsDuQqeoOQrV58B2a3dtHDkIuA3wA3OH+uyYu+0C+Z5p316TfAek tKLdD/mbeEy1CPC1VCVLTvTPxUDyOtwK2MsvzyMsPnwDmc/Fj8E2RF6szdU3K0OTpAzd/7 toDgtqWD/ke+CRXbaTpLV2T71uhcrAYHVywave8seiefaNISiqiOlEh06lQvuh2OMJnWq7 IVAKQSSW8zCzszjLcgQDdQHuySawASEHTojSjPoCwKTDOEkBbnHW1cF9Z4pNKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688757200; 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=OJB0gmSUgdEtHhv6KkWVjBZrKUpQP81K7mTl097ezsU=; b=XLm/Egfhuei4u8fsoWBCGOsTL9ICCHJ3b8yx3+8aO6fd1bVbk3MnomxbJhaobaZlLrU/PG qGkzDtqtsD7rYklmy8HAN6vHqPtQzQHXEzJJvqlc76umVoeVNxXM1sKJa6n7Vkx2CAO8vT QgucNpKMqu+rBR8IZgtgQ9UKYDBnnevxXGKA+CcytKpiV98d6O49zeGLBMm4mFV6/QJGJE VAZ5svFBikuyeP8gmiYIepBT2Mm+6hjG0Hk1D7BJyKnmvwUs2hhMr6AHniwHqtjiv321VF HhTCdgLLnXkJa0e6a46IRlqAPbwXe2tHWEXwSgPnvJh+ng45p3vZmGjZteX6Uw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688757200; a=rsa-sha256; cv=none; b=gKt4kL4iVcsz7sWoYmDLjN5K18eno2nw1vLZjs5ekPHl2Rsmr0qYidWQZgX2R+6Y/S3Ai4 7oOXYhjjyJ+9Qmlz6Y4kCIjrcqldEMpZubjAH5tIGiAlMTcILRylEyjEbPaQu+LISKN1tj 7ltXraoCwfYFG+eiJAwDODs3ReoFEfEXmTuWpQ1OejGQxbUxLU3kiMFgmSFYHL2UDjSO1U lGqJMIISbnS2yr6sP7xax/HseU1eZiwcErnLHojqRjPUt4Ex7Af8u8p4iBDdV5DyBzY8/B l1nd+7XTGFx+0qYhzONcDzlp0RHWRpdVKZG9IcH7YnIqJyh0aIVupMHres+bdQ== 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 4QyNN01PBkzqB7; Fri, 7 Jul 2023 19:13:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 367JDKg7045860; Fri, 7 Jul 2023 19:13:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 367JDKsJ045859; Fri, 7 Jul 2023 19:13:20 GMT (envelope-from git) Date: Fri, 7 Jul 2023 19:13:20 GMT Message-Id: <202307071913.367JDKsJ045859@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 397222b9ffc2 - stable/13 - hier.7: Add some missing Xr's 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 397222b9ffc234bfc8df62a3ef2440f037816bb4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=397222b9ffc234bfc8df62a3ef2440f037816bb4 commit 397222b9ffc234bfc8df62a3ef2440f037816bb4 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2022-06-28 13:15:53 +0000 Commit: Mitchell Horne CommitDate: 2023-07-07 19:13:02 +0000 hier.7: Add some missing Xr's MFC after: 3 days (cherry picked from commit c618ee727712900105212af29b3ebf16b1076875) --- share/man/man7/hier.7 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7 index 498dae503133..a6610419fcbf 100644 --- a/share/man/man7/hier.7 +++ b/share/man/man7/hier.7 @@ -554,7 +554,9 @@ system since it was booted .Pp .Bl -tag -width Fl -compact .It Pa bhyve/ -bhyve vm unix domain sockets +.Xr bhyve 8 +virtual machine +.Xr unix 4 Ns -domain sockets .It Pa ppp/ writable by the .Dq network From nobody Fri Jul 7 19:13:21 2023 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 4QyNN13zLTz4lSB3; Fri, 7 Jul 2023 19:13:21 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QyNN13CFwz3kDZ; Fri, 7 Jul 2023 19:13:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688757201; 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=JWGuw69vG8oloaCDJtVgW0zw2gPEuwfiVYlV6uPVrZk=; b=iSr3zegGehFOXnfdQYIrThXpA13uFqqx1rq8D0dg5USPzz9aVWLsPpG34JIEPufmgV+e+s /rVTLzRvli9n5zYr+8nGIwmTRNlmfIUcY6U5Qt3jv27tF8LnTrfRxDDnv1XmvZaP47GS0t 4hwZzBUZbN3eP7Kii5hsr1XV0jqK8jGIAb1PlDIm3wQojlfZ+PE5tt1YjNVvEE9bq/OF3l bamVUXwTaRz8WXxiw2wxobIT+nVnFNoAkKbhfDLtDGBa/dkJm1FnjOfwNNo/4rSijeX8qt 50vq4mcm+yGe8pKgW9rY5DT4N+ylOfDbt6V5WwMLn/tK5Vmamq3EW8fAxe08QQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688757201; 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=JWGuw69vG8oloaCDJtVgW0zw2gPEuwfiVYlV6uPVrZk=; b=JMmDpENZAmLYH8284e2/qrH4+hpct2S3JNlCNNLcpE9tEqO6hLwUpCh6J6dzjr4zQ25h0G +4sSMTVkZh+w8hF0MYtHxUAAsdS1cxvOFHfOGoC8aNLxoervoV/a/11YodRgT81iCl6g6i Wf+dJEPcZPdnUWh+TJGVZ8zjXioM4f1w/cY240o4CYqTkeg5iWO8MfTrnfm0Q6hzQWMZGM El9W+qYYVyPGWTBKp1nwlMQcqLiK8j26+N2dBA/xXV/HGQQyqTb/DVy4AQ+9jOwckzxnXX BxkOI/b3DjairPGrYRWEJci6JF8kTsm/t6ZE4o+T2H7LN+U3tIrNG/A5FBkCpA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688757201; a=rsa-sha256; cv=none; b=vUAFBFxDXmMgCU6+AlCq6+udOFiBgPICVNW4ZUj1Yu1ouh0uNZ5qqdqw1hYs4SvvC3XyYy 1rygAa46/PfoIe4PBLD1+r4gB7e7O4ucN8ao6c6dNHo1MAazSt96eNFhcgGBFDQv2gYZr8 mCa4C5pxl492uEHT708uv1YNOF9X6V9Xbtiq0I+lmkOQSUrLwpmMkdxKgca7peVgzXUYLX ubqXbuPO/4wFuiPne8RaRGHZl8ijfUv6g9XGAua5UgmYi/zi4oCDKcr2MhjUI3fn1BIUI1 8nZiSloC9xaNVYbLWYYR4d162S/OOYNv0qF51JwYshGieDJzWQinisxkMH/cRg== 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 4QyNN12GcqzqQn; Fri, 7 Jul 2023 19:13:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 367JDL62045879; Fri, 7 Jul 2023 19:13:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 367JDL5g045878; Fri, 7 Jul 2023 19:13:21 GMT (envelope-from git) Date: Fri, 7 Jul 2023 19:13:21 GMT Message-Id: <202307071913.367JDL5g045878@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 29f2daef761c - stable/13 - hier.7: Document /var/db/freebsd-update 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 29f2daef761cc9c5c60769d4a9d6714d3dcd6167 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=29f2daef761cc9c5c60769d4a9d6714d3dcd6167 commit 29f2daef761cc9c5c60769d4a9d6714d3dcd6167 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2022-08-04 13:57:18 +0000 Commit: Mitchell Horne CommitDate: 2023-07-07 19:13:02 +0000 hier.7: Document /var/db/freebsd-update MFC after: 3 days Sponsored by: Klara, Inc. (cherry picked from commit 3c4f8adc794d769bdc332a92f0920af928002441) --- share/man/man7/hier.7 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7 index a6610419fcbf..6c428bbba670 100644 --- a/share/man/man7/hier.7 +++ b/share/man/man7/hier.7 @@ -511,6 +511,11 @@ see .Pp .It Pa db/ miscellaneous automatically generated system-specific database files +.Bl -tag -width Fl -compact +.It Pa freebsd-update/ +.Xr freebsd-update 8 +work directory for temporary files and downloaded updates +.El .It Pa empty/ empty directory for use by programs that need a specifically empty directory. Used for instance by From nobody Fri Jul 7 19:13:22 2023 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 4QyNN24szfz4lSD9; Fri, 7 Jul 2023 19:13:22 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QyNN246flz3kH8; Fri, 7 Jul 2023 19:13:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688757202; 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=Km7N7Z0UbYmpS9L9hZSzfR15l+AHDqTnq4FijnRkkGg=; b=IbeyyoSlZJWQ9p4EadTHnkfmCWfhK3oV2Zhg7vTpfipv8G92viJNK7XWEg7aj4c+545jgb 6c8XesQMnjWv4gXztCdTp1aTKJHoJ9xWBGNhkk1pXtUMi7mZMVcAzjU3Dlbtv9iAbU/mQk whsG6Hhdul3zSGgBZ/ER22Olu2e1e6MNixdVYOJ+yONVCb3s7IPDAwGeQzEuHy4Au9InIp jt7Sp/bhDTHHjxFvQ4lS5iLtOZ0xaugzAVlGimKm6MIR06LQfsTWaJK/GCnFu1zknZ6gdx X3cvs0WQp5obtLghiOc2KFZWgOSqEwX1Nc9giNOGUHZXf4VWyQyWm5jhE7J2zA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688757202; 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=Km7N7Z0UbYmpS9L9hZSzfR15l+AHDqTnq4FijnRkkGg=; b=OAllkN3DMbIDsqFxLI6fHWS61RtbKEOrmp53i7Zpn5KL/PP6zNBQF2XBw/eP0jM9Qk55Z8 WZTkO9RPEXfowrvkF8+ltjOMySoCV1zbLadVXbXU7Mb0aUTRmnZV0w43knC0j39BjM7Rqw YGoscMOYt2xCxr00mZELfgFt0FE8EdFhBjAJv3GoK/upHpQu5O1wkgBKBbH7zVJOKdjoyF e99lDzHx/+k+MzC0FezJfH+Bh61dS02n0939h5afQqI4tQOXedTDZUezHVFybmJRYtVP0i S/HsPViCOwgpQjJ+tUARnMfVRhc2wbW5D3zBaKVgweM72lSgQwEihO755z3I4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688757202; a=rsa-sha256; cv=none; b=uaMpqRuLj1906g1B1tkwJDT+QnioNJG61u9FUFlUz9FWKsTRliMUSS59czreKBB7V2/pbd 7VicwSsEaT+Qpi1TkIU7NwIq69zSx8qFGXT/eJkwOplfsA/CQpXr6VwRBsSTrukfL1IVZR LessTShbdVmqLDLc/21p2yqaybhbuR0m63od0q+bXRIfQxNpm+5kzhoy+RUbW1CYSRH1kK +RuoocLJu77dI3WjUX7RiUG4ip86DtRGp8jXk2BJ1QWTjwxVI25WqXsRSio01HT3U+72Qn QuIMrSI+eH8KhGTBpwqfwG8CIUDcBuDiR+Vlz9nm2Z4qTdM+dWbzwv+OTK3gig== 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 4QyNN239rdzr4s; Fri, 7 Jul 2023 19:13:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 367JDMVe045898; Fri, 7 Jul 2023 19:13:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 367JDM2L045897; Fri, 7 Jul 2023 19:13:22 GMT (envelope-from git) Date: Fri, 7 Jul 2023 19:13:22 GMT Message-Id: <202307071913.367JDM2L045897@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: bdb80cfbb073 - stable/13 - hier(7): document libdata/pkgconfig 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: bdb80cfbb07325c49343f3a4af9922e590652129 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=bdb80cfbb07325c49343f3a4af9922e590652129 commit bdb80cfbb07325c49343f3a4af9922e590652129 Author: Baptiste Daroussin AuthorDate: 2022-07-25 09:14:50 +0000 Commit: Mitchell Horne CommitDate: 2023-07-07 19:13:02 +0000 hier(7): document libdata/pkgconfig (cherry picked from commit 94778fc7382d2d9dd474eca1f88a86364f768f15) --- share/man/man7/hier.7 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7 index 6c428bbba670..6f058c0d7cd5 100644 --- a/share/man/man7/hier.7 +++ b/share/man/man7/hier.7 @@ -251,6 +251,8 @@ GCC configuration data linker scripts; see .Xr ld 1 +.It Pa pkgconfig/ +pc files .El .Pp .It Pa libexec/ From nobody Fri Jul 7 19:13:23 2023 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 4QyNN35dY7z4lS88; Fri, 7 Jul 2023 19:13:23 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QyNN357Nbz3kNb; Fri, 7 Jul 2023 19:13:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688757203; 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=6V5iv7RZP8s65ycvmfaklibYM6Ub8zxMiHtQ9HdXL60=; b=imNTBbEmpLbcp510vLyJyCqRxJTGarBn5N17w7CCB6oiMnDzm8OCFoaZ6lkodKVCndD5G+ ZtIReO6QnGbxr3jp109pZq5Ml6R8JZI2I23eL1q74jVwIie6OylBQ56iMt7out5Xw6lUH2 TNUnPgoRWNgAi4uED9Ged1W+40GtZlxAEszAW+z+4laGIJ5ftcZ5/KSQ7MDDKtikPcSP4C 3V1xrzqscIKRuxD/b45H9ct/N6uPtcv8YvmqDCrQO2dtoQCvauEAL0g8iVtzapefrxkbX1 TWlrNXCi/C4KWomI4SBMDudlIdAJdKSGs6kFOD5YL/iJ3Ps3wtNK8JGzaGtYUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688757203; 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=6V5iv7RZP8s65ycvmfaklibYM6Ub8zxMiHtQ9HdXL60=; b=kC4uvFr/T2XTQWLuIfVGWTCJw7/F98t9uklVklOEEJIkXgb22eKiMCSeLAo40R2f+S7B5r ysR6AveLik7s0p85TTVZPCPxuKaxYiw5tm9dKYBIWepvwn71NMsT8CFltdE4C5AMBviqNc uO3vZsuwEWu+rhiZr+86MMSklzlF614IUeOpbjIGdmPsLOtLXzVcOn+6ZB2fSHy96kx4nE /Ta6BGbeW4VgEeVxWQ9gRUgbliTVk1jtY1NAHrUHtHirS7pDklpebxZ+l9CuqRimC9Cxot pvO9xVnsfACtw53vDcROcxMZmen/JFtv3kMKA/2vNze9X+zlXefkpOOaoojANA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688757203; a=rsa-sha256; cv=none; b=SSbAwMD0bbD3zG0mgsQUavH+UQlEQYohnQznDCIgfwAHZuVW5bmHqE+mjwN+Vp8evipuV2 biVaKxTcQ5g81T3Vr5zXeHW4lI4FWPdV2ddFALeNiWRbvGm2mkLF25unYnRH8LXDdt/uBu PS06y5PY4x9KCrDH+8YFLz1Qi+ULiach8idCq5I+D7pybgqjZ7rXMXo5GVbaFERtPhdK4S Vd5dh1LVbCH+2kJ1GRN5c3HDTMIRFQtezC+y1cZXR+nPllksu5uwoyWpeF5BfCwCSwvxoN 0l6hNK/P/lUsVIo89ecx51WseALiC/EL54NQQpnA8fL/i1MocOt3z0fYLhnR1w== 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 4QyNN347gnzqcj; Fri, 7 Jul 2023 19:13:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 367JDN3h045924; Fri, 7 Jul 2023 19:13:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 367JDNJs045923; Fri, 7 Jul 2023 19:13:23 GMT (envelope-from git) Date: Fri, 7 Jul 2023 19:13:23 GMT Message-Id: <202307071913.367JDNJs045923@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 317af3e132c4 - stable/13 - mac(4): update the references to MAC modules 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 317af3e132c4528f67096f8f0d2f3ad65fdcb712 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=317af3e132c4528f67096f8f0d2f3ad65fdcb712 commit 317af3e132c4528f67096f8f0d2f3ad65fdcb712 Author: Mitchell Horne AuthorDate: 2023-06-12 18:56:34 +0000 Commit: Mitchell Horne CommitDate: 2023-07-07 19:13:02 +0000 mac(4): update the references to MAC modules Add entries for mac_ntpd(4) and mac_priority(4) to the table of MAC modules. Drop the entry for mac_none(4) from the list, but retain the cross-reference in SEE ALSO. This module has no functional impact and is of minimal interest to users. Add a new cross-reference to the similar mac_stub(4), limited to SEE ALSO for the same reasoning. Reviewed by: Pau Amma MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D40483 (cherry picked from commit e2cb7201015dbd2d4cea5c9b4e0385d11614263c) --- share/man/man4/mac.4 | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/share/man/man4/mac.4 b/share/man/man4/mac.4 index 135301962f3b..2ba03434c878 100644 --- a/share/man/man4/mac.4 +++ b/share/man/man4/mac.4 @@ -30,7 +30,7 @@ .\" .\" $FreeBSD$ .\" -.Dd July 25, 2015 +.Dd June 10, 2023 .Dt MAC 4 .Os .Sh NAME @@ -58,9 +58,10 @@ Currently, the following MAC policy modules are shipped with .It Xr mac_ifoff 4 Ta "Interface silencing" Ta no Ta any time .It Xr mac_lomac 4 Ta "Low-Watermark MAC policy" Ta yes Ta boot only .It Xr mac_mls 4 Ta "Confidentiality policy" Ta yes Ta boot only -.It Xr mac_none 4 Ta "Sample no-op policy" Ta no Ta any time +.It Xr mac_ntpd 4 Ta "Non-root NTP Daemon policy" Ta no Ta any time .It Xr mac_partition 4 Ta "Process partition policy" Ta yes Ta any time .It Xr mac_portacl 4 Ta "Port bind(2) access control" Ta no Ta any time +.It Xr mac_priority 4 Ta "Scheduling priority policy" Ta no Ta any time .It Xr mac_seeotheruids 4 Ta "See-other-UIDs policy" Ta no Ta any time .It Xr mac_test 4 Ta "MAC testing policy" Ta no Ta any time .El @@ -205,9 +206,12 @@ man page. .Xr mac_lomac 4 , .Xr mac_mls 4 , .Xr mac_none 4 , +.Xr mac_ntpd 4 , .Xr mac_partition 4 , .Xr mac_portacl 4 , +.Xr mac_priority 4 , .Xr mac_seeotheruids 4 , +.Xr mac_stub 4 , .Xr mac_test 4 , .Xr login.conf 5 , .Xr maclabel 7 , From nobody Fri Jul 7 19:13:24 2023 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 4QyNN51GjJz4lS8G; Fri, 7 Jul 2023 19:13:25 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QyNN45g50z3kW9; Fri, 7 Jul 2023 19:13:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688757204; 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=7aHbF/mLFTOGEJp2YmhFK93XYQQZj64q8KPZ7XwZMUo=; b=PkrftivsQuZP+YDpU1IyoRpdzm1GVmZL3RDSjbTzgSv8kJbdabqWPky30mBXFDqdM82pFp 0l0d0JYmJBc28v6drxRVZwgfPajj3MaCyGNS/odfmZte5qg+UBeCi8K6hmeSrurheWGjT0 APrLHpc+6/EGj4OCi2zhXoAx1sTAsmcni1+gwgFVjyB+uVJKWeVYKLgS9ueikMKMa/KYGm KGOIZdzT87ZYR6V6e7c2a+yq8kSAdXT8kcKb9btb5+O12Iwf3pUCm4Pu6ya1iPTX480Fm6 O8e1LL9NvHY0e2aNoGO6mKnt+dAihyfaSL7SBPE/VW/rYulAnnZ6BJL5rrEHlA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688757204; 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=7aHbF/mLFTOGEJp2YmhFK93XYQQZj64q8KPZ7XwZMUo=; b=QxdWeMLK6fL9nJJE61K59nmtQKg1Kqmna2OARo19IkOpMHU6bPmQYf3oFb2hScMNdfS3Xa ik0yEVcV/vLdtcjQ9Crktq4L3208ezxHHOB51q++uKShjLEU63wpyTiv/75OLGmhrKT8gA 58ztlPbm73aUf0q/m/hfzQCTd6NmIGn6Pf2KPF764ceh9aYGDtT0LCW3lXUF0I+kQkc4Bm jI8ZVE2O/C+aucz5KhrQAtenPqlb0yJdkhnnLXMZHdkxvwuUH6DNMF0rPQtEFJ6Bov8X9t nlm4EWxYEpMoBe54Y7LLXdQYfXSW9Ay6bI7t5bFmHACAJx8KtPvmok/iDiK9IA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688757204; a=rsa-sha256; cv=none; b=nkJWnrB4rtmCHm4OI7o/Lo1mcQ2xUr5aLy8sfd/jrl8gBi04JyHLrF/ZbxNy8F5k0M4Qhf p9Wjk7eMroLQYd6AlswibcfxwsgEVOb7YzbhrOPEasoRmdGGzwPg3Z39Edh8ZNkzaEf+QX g5qw35s6Pp+NOISK36K0XPIwIE/6jeLAvQvvVEJC27Wo5KqlIvMd00whmCLtEoQLOPC6xf oYXleuL6YGllmSjTZFWYjMTdcctDEZwbxZdcjWqKI2nmuCD8D7Y7CYzx+zRngnQeldQ3Rk iJXwxAaKup8jkSvWljXCFQE6xYgfoPRPcz286kZ2yPc/x8pU4My8Z1Xbn1Jtfw== 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 4QyNN44nBKzqck; Fri, 7 Jul 2023 19:13:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 367JDOZm045943; Fri, 7 Jul 2023 19:13:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 367JDO9p045942; Fri, 7 Jul 2023 19:13:24 GMT (envelope-from git) Date: Fri, 7 Jul 2023 19:13:24 GMT Message-Id: <202307071913.367JDO9p045942@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 29df36d507ec - stable/13 - mac(9): update SEE ALSO 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 29df36d507ec7664eef3bb7928dc456b6ec762bc Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=29df36d507ec7664eef3bb7928dc456b6ec762bc commit 29df36d507ec7664eef3bb7928dc456b6ec762bc Author: Mitchell Horne AuthorDate: 2023-06-12 18:59:00 +0000 Commit: Mitchell Horne CommitDate: 2023-07-07 19:13:02 +0000 mac(9): update SEE ALSO Rather than maintaining an incomplete list of MAC modules references, just reference mac(4), where such a list can be found. Reviewed by: Mina Galić Reviewed by: Pau Amma MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D40485 (cherry picked from commit 0449bc249b78a8c85afe375e581432351f90427d) --- share/man/man9/mac.9 | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/share/man/man9/mac.9 b/share/man/man9/mac.9 index 58c2f7a2484e..b7a930499f44 100644 --- a/share/man/man9/mac.9 +++ b/share/man/man9/mac.9 @@ -150,15 +150,7 @@ for information on the MAC Framework APIs. .Xr acl 3 , .Xr mac 3 , .Xr posix1e 3 , -.Xr mac_biba 4 , -.Xr mac_bsdextended 4 , -.Xr mac_ifoff 4 , -.Xr mac_lomac 4 , -.Xr mac_mls 4 , -.Xr mac_none 4 , -.Xr mac_partition 4 , -.Xr mac_seeotheruids 4 , -.Xr mac_test 4 , +.Xr mac 4 , .Xr ucred 9 , .Xr vaccess 9 , .Xr vaccess_acl_posix1e 9 , From nobody Fri Jul 7 19:13:25 2023 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 4QyNN60LBWz4lSH3; Fri, 7 Jul 2023 19:13:26 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QyNN56qmYz3kPB; Fri, 7 Jul 2023 19:13:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688757206; 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=Tt8B791OGUohdb7Xj1psSeRxO4H4A/9B31CU4M8P5sc=; b=gApk/ORTEoukLp/2YH2Uk7LkN9ztM4U80ks24snQ5P+9kOuRIB9/ej5UhXkoTqDSJsaxgJ fcbBvswfz/N5lsaGwo9YUpn72ljM9hvLfKFn02cAwawuEKYjxnWn/0Mv3iQ4QqqK0ksI7k FMejLqb/QRdvOQ9yMop+Tuq32iphOE5tmI/lPZ/2Birb4pSxv7TKO91AXWmv5AgsklU1hW UcBBTPATr8xy1S+kSW7dcCSRRlzIdBHfYiHKiN4lZpZgAcrWBjEJKsHsHM7YmpXvBcCkv2 jR9wqLG/yk3+d9vHfT6/BT7QEtm05Cvx2nb0L7cIejl0Dwh0T+QtrfRX4w38xg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688757206; 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=Tt8B791OGUohdb7Xj1psSeRxO4H4A/9B31CU4M8P5sc=; b=yFrp0p4s27/tMjwtnLuaHMcPTHAPVrW+5+TmZMeQyo/IhVAhxwB5Hm1gh+82ocd8nJX1ug MRBeCvRmLaeDchp0vTdeaAL5KFKAMUS0/Mb8H95y2NFJ7tQofOmArCyBShMdQFR9rOOooW 640aMOjf/K01e8JV3nUV3k6enx2HBcN01yMhjRLxvtkx9z3w9iEVPYIwfEES4rWj4pJ64X AbW61hxC3GxtkTxIWdlnUNeQ8UzH8QFoZZcIbO7A6Tt0xwjzMt5bmzU2w1FIJof0LB4xr8 T8Xtyd2F6vRSrPv52qtyjwDyXex4YwXfL/qVJSHYJLUfUZJ3xSAubkV/1IVn+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688757206; a=rsa-sha256; cv=none; b=UPBGvYJEF0jJZ0Q6MX++dngyLxhrGlUMfyjYHi0UOZM57bUrr2e0WpxHNjwRwXELP6HctL n6HspXtSEuuHjubY11XDn5NgJfz0ymS+NCcgiPy0eiZFPh2P2/4ReAiJBgt9O/B5EvI9TQ /zgnwr+ckq05SPx3N17dhCSHWosNqYDqszdc5qdvskN+Ep9BYPevZ8GuC1xJ5d6PVZ1The mcWKyPPllaQW/JxPcYyQEGqu6aHmhdiSXtfXkWrBWMsNyaTyVacXGBIA1b2ZPcGAuaJ8zj 4GTSxgGo97y8KPa58GIRW58CFCz1X/05uA/vA3J6WedS8sobBEqwUfbDhzx2qw== 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 4QyNN55jzFzqB8; Fri, 7 Jul 2023 19:13:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 367JDPfk045967; Fri, 7 Jul 2023 19:13:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 367JDPbL045966; Fri, 7 Jul 2023 19:13:25 GMT (envelope-from git) Date: Fri, 7 Jul 2023 19:13:25 GMT Message-Id: <202307071913.367JDPbL045966@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 4950d4533e40 - stable/13 - hier(7): alphabetical order 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 4950d4533e409976e514fa7d0c5297c4520d48fd Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=4950d4533e409976e514fa7d0c5297c4520d48fd commit 4950d4533e409976e514fa7d0c5297c4520d48fd Author: Graham Perrin AuthorDate: 2023-05-30 19:30:20 +0000 Commit: Mitchell Horne CommitDate: 2023-07-07 19:13:02 +0000 hier(7): alphabetical order Approved by: mhorne Pull request: https://github.com/freebsd/freebsd-src/pull/756 (cherry picked from commit 2071e54c226a120a62baa710bef225c4f6ad5ee3) --- share/man/man7/hier.7 | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7 index 6f058c0d7cd5..5b8f19423c16 100644 --- a/share/man/man7/hier.7 +++ b/share/man/man7/hier.7 @@ -28,7 +28,7 @@ .\" @(#)hier.7 8.1 (Berkeley) 6/5/93 .\" $FreeBSD$ .\" -.Dd November 23, 2022 +.Dd May 30, 2023 .Dt HIER 7 .Os .Sh NAME @@ -98,12 +98,12 @@ This is a symlink to system configuration files and scripts .Pp .Bl -tag -width "defaults/" -compact +.It Pa bluetooth/ +bluetooth configuration files .It Pa defaults/ default system configuration files; see .Xr rc 8 -.It Pa bluetooth/ -bluetooth configuration files .It Pa localtime local timezone information; see @@ -122,6 +122,10 @@ scripts that are run daily, weekly, and monthly, via .Xr cron 8 ; see .Xr periodic 8 +.It Pa ppp/ +ppp configuration files; +see +.Xr ppp 8 .It Pa rc.d/ system and daemon startup/control scripts; see @@ -130,10 +134,6 @@ see OpenBSM audit configuration files; see .Xr audit 8 -.It Pa ppp/ -ppp configuration files; -see -.Xr ppp 8 .It Pa ssh/ OpenSSH configuration files; see From nobody Fri Jul 7 19:13:26 2023 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 4QyNN70t5mz4lSDJ; Fri, 7 Jul 2023 19:13:27 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QyNN70Nryz3kXD; Fri, 7 Jul 2023 19:13:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688757207; 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=5GhGgzM20HnABKa4m2Zn/rrIdlpu0/41N0rdUUWfxwE=; b=kwEPhBk3HSnJmOtrokMAvXiNPFt95I9hMK+r0ZibKuFFC8eCoCimrFqqy+34DZa5zLNDDi cCpyTzWTXOWdw/ZnSjP30Ew752IIsuyDGL8BBwkB9ygJZXAzXKVfEPsx3YS6J8Tde0hcuU D6XmontRhu+SPSNh+gKgFGR74+7WS2QpO3kTmTkbVI7hp3kcb+GlF1LjMFmInUcRpavh/y oU+ugZIeRp3Erq/R8QkygzZDm5lDqoLluj4VIikKCjsfw5ypZBT4ubUz9YUXel6UjvO6Ck ZpOAp+04iphjaUJ2XyF0SmvR/zzYm8akQpBqEhqk0aCipbNSzaEW8JHrwJPU/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688757207; 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=5GhGgzM20HnABKa4m2Zn/rrIdlpu0/41N0rdUUWfxwE=; b=QErCWdyXNU2Xx5mS/kHyoQ2oxAi5u1cbLAUGoje9m0O2zTL4u5C1jxd7Zc/SmR3Voj93tL 52QLOLhxbm5oiQBuESEjrbUfXBnt5HNFrQmwI09bKTB2uXcd8hsnlxlUYtqXeUPoFRppSj 3dOm4mzJqzf1opmQwqUgaEks8qm/spkljztOtYNcZwUtmuTXITBfJ2OkAsBIjBw9h2yphY nma1BYijay/KUANO8vbKJs/Q7czgvw4O0vixtFQOSeEOe/+6/G12x/MCrBJTjauJyW1giS rw8LdJbIPBhAblRhegQLV1McBnkgtLj9jtkxFr8vLG8F/1f/9TZXJt80nxvkdA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688757207; a=rsa-sha256; cv=none; b=Go9rr/UqZ+oioG2KNX73bcPe1GV+G/T2ysyh1ELu8HFqWroqsEpiBPYYHsRnl64hgwvQ5c dTrJQwJetDl4eLdvYtTCmPjFD7GSKaqfydEudZXdscoqq1F4hygnKybh7+uh0ceLG9NwgS bBj2ZUtwahO5m7c9DVvGL18hiGjDb+d6XCIQCmRt4ac6/OVSSoLt4QMDB2SptEVR5G6lry 0mxVIwOlYIs4uPBRXqA3AlYpSdivZ64IG97iOLcqu9/rdnd8P/w1xY9EQ+eIGEFs3JzD0A ZtuX1Fh32cpBzLjXFW+zCV8UlBDpKU6aktojKRAkvujk20YG3Xl3UttyYYaRaA== 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 4QyNN66ZlSzqcl; Fri, 7 Jul 2023 19:13:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 367JDQZp045986; Fri, 7 Jul 2023 19:13:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 367JDQ3b045985; Fri, 7 Jul 2023 19:13:26 GMT (envelope-from git) Date: Fri, 7 Jul 2023 19:13:26 GMT Message-Id: <202307071913.367JDQ3b045985@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 7ff4d8452720 - stable/13 - hier(7): improvement, modernisation 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 7ff4d84527204590ea169bf41ee9628990d78cee Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=7ff4d84527204590ea169bf41ee9628990d78cee commit 7ff4d84527204590ea169bf41ee9628990d78cee Author: Graham Perrin AuthorDate: 2023-06-10 08:41:35 +0000 Commit: Mitchell Horne CommitDate: 2023-07-07 19:13:02 +0000 hier(7): improvement, modernisation Consistent use of lowercase, spacing between sections, etc. Cease mentioning floppy disks. De-list /usr/share/misc/fonts/, which has been ??? (without a description) for twenty-seven years. Change zpool to pool. (zpool is a command.) Uppercase PPP for Point-to-Point Protocol. A few other changes to wording, including avoidance of the phrase pre-fab. Update the descriptions of: * /tmp/ * /usr/share/misc/ * /var/preserve/ * /var/tmp/ * /var/tmp/vi.recover/. Refer to vi(1) instead of ex(1). https://bugs.freebsd.org/261349 PR: 261349 Reviewed by: mhorne Approved by: mhorne Pull request: https://github.com/freebsd/freebsd-src/pull/763 (cherry picked from commit 6469f9c595c609dd552ec198a16c471c87df7c57) (cherry picked from commit 5ca7f02946940ff698741d4da4a30b554cb0f592) (cherry picked from commit b374a3921d97bdb20b103aaeb91988c3d355ea71) --- share/man/man7/hier.7 | 288 ++++++++++++++++++++++---------------------------- 1 file changed, 128 insertions(+), 160 deletions(-) diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7 index 5b8f19423c16..0ccc3679b91e 100644 --- a/share/man/man7/hier.7 +++ b/share/man/man7/hier.7 @@ -28,51 +28,51 @@ .\" @(#)hier.7 8.1 (Berkeley) 6/5/93 .\" $FreeBSD$ .\" -.Dd May 30, 2023 +.Dd June 27, 2023 .Dt HIER 7 .Os .Sh NAME .Nm hier .Nd layout of file systems .Sh SYNOPSIS -A sketch of the file system hierarchy. +An overview of the file system hierarchy. .Sh DESCRIPTION .Bl -tag -width "/libexec/" .It Pa / -root directory of the file system +root directory .It Pa /bin/ -user utilities fundamental to both single-user and multi-user environments +user utilities that are fundamental to single-user and multi-user modes .It Pa /boot/ -programs and configuration files used during operating system bootstrap +programs and configuration files used during bootstrap of the operating system .Pp -.Bl -tag -width "defaults/" -compact +.Bl -tag -width "nvmecontrol/" -compact .It Pa defaults/ -default bootstrapping configuration files; see +default bootstrap configuration files; see .Xr loader.conf 5 .It Pa dtb/ -Compiled flattened device tree (FDT) files; see +compiled flattened device tree (FDT) files; see .Xr fdt 4 and .Xr dtc 1 .It Pa efi/ -Mount point for EFI System Partition (ESP) on UEFI systems +mount point for the EFI System Partition (ESP) on UEFI systems .It Pa firmware/ -loadable kernel modules containing binary firmware for hardware that needs -firmware downloaded to it to function +loadable kernel modules containing binary firmware, for hardware to which +firmware must be downloaded .It Pa kernel/ -pure kernel executable (the operating system loaded into memory -at boot time) and kernel modules +pure kernel executable (the operating system loaded into memory at boot time) +and kernel modules .It Pa modules/ -third-party loadable kernel modules, such as the ones installed from +third-party loadable kernel modules, such as those associated with .Xr ports 7 .It Pa overlays/ -Compiled flattened device tree (FDT) overlays; see +compiled flattened device tree (FDT) overlays; see .Xr fdt 4 and .Xr dtc 1 .It Pa zfs/ .Xr zfs 8 -zpool cache files +pool cache files .El .It Pa /compat/ normally a link to @@ -81,13 +81,12 @@ If not, then the .Pa /usr/compat comments apply .It Pa /dev/ -device special files managed by +the normal mount point for .Xr devfs 5 .Pp -.Bl -tag -width "defaults/" -compact +.Bl -tag -width "nvmecontrol/" -compact .It Pa fd/ -file descriptor files; -see +file descriptor files; see .Xr fd 4 .El .It Pa /home/ @@ -97,57 +96,51 @@ This is a symlink to .It Pa /etc/ system configuration files and scripts .Pp -.Bl -tag -width "defaults/" -compact +.Bl -tag -width "nvmecontrol/" -compact .It Pa bluetooth/ bluetooth configuration files .It Pa defaults/ -default system configuration files; -see +default system configuration files; see .Xr rc 8 .It Pa localtime -local timezone information; -see +local timezone information; see .Xr ctime 3 .It Pa mail/ -Sendmail control files +.Xr sendmail 8 +control files .It Pa mtree/ -mtree configuration files; -see .Xr mtree 8 +configuration files .It Pa pam.d/ -configuration files for the Pluggable Authentication Modules (PAM) -library +configuration files for the Pluggable Authentication Modules (PAM) library; see +.Xr pam 3 .It Pa periodic/ -scripts that are run daily, weekly, and monthly, via +scripts that are run daily, weekly, or monthly by .Xr cron 8 ; see .Xr periodic 8 .It Pa ppp/ -ppp configuration files; -see +PPP configuration files; see .Xr ppp 8 .It Pa rc.d/ -system and daemon startup/control scripts; -see +system and daemon startup/control scripts; see .Xr rc 8 .It Pa security/ -OpenBSM audit configuration files; -see +OpenBSM audit configuration files; see .Xr audit 8 .It Pa ssh/ -OpenSSH configuration files; -see +OpenSSH configuration files; see .Xr ssh 1 .It Pa ssl/ OpenSSL configuration files .El .It Pa /lib/ -critical system libraries needed for binaries in +system libraries that are critical to binaries in .Pa /bin and .Pa /sbin .Pp -.Bl -tag -width "defaults/" -compact +.Bl -tag -width "nvmecontrol/" -compact .It Pa casper/ service-specific .Xr libcasper 3 @@ -162,43 +155,41 @@ vendor-specific libraries to extend the utility .El .It Pa /libexec/ -critical system utilities needed for binaries in +system utilities that are critical to binaries in .Pa /bin and .Pa /sbin .It Pa /media/ -contains subdirectories to be used as mount points -for removable media such as CDs, USB drives, and -floppy disks +contains subdirectories that are mount points for removable media such as +USB drives, CDs and DVDs .It Pa /mnt/ -empty directory commonly used by -system administrators as a temporary mount point +empty directory commonly used by system administrators as a temporary mount +point .It Pa /net/ -automounted NFS shares; -see +automounted NFS shares; see .Xr auto_master 5 .It Pa /nonexistent/ -a non-existent directory; -by convention, it serves as a home directory -for special user accounts -that need no home directory; -see also +a non-existent directory; conventionally, a home directory for special user +accounts that do not require a home directory. See also .Pa /var/empty/ .It Pa /proc/ -process file system; -see +process file system; see .Xr procfs 5 .It Pa /rescue/ -statically linked programs for emergency recovery; -see +statically-linked programs for emergency recovery; see .Xr rescue 8 .It Pa /root/ -root's HOME directory +home directory of the root user .It Pa /sbin/ -system programs and administration utilities -fundamental to both single-user and multi-user environments +system programs and administration utilities that are fundamental to +single-user and multi-user modes .It Pa /tmp/ -temporary files that are not guaranteed to persist across system reboots +temporary files that may be removed by +.Xr rc 8 ; +see the +.Va clear_tmp_enable +variable of +.Xr rc.conf 5 .It Pa /usr/ contains the majority of user utilities and applications .Pp @@ -206,13 +197,11 @@ contains the majority of user utilities and applications .It Pa bin/ common utilities, programming tools, and applications .It Pa compat/ -files needed to support binary compatibility with other operating systems; -see +files needed to support binary compatibility with other operating systems; see .Xr linux 4 .It Pa freebsd-dist/ distribution files -.Pq like base.txz ; -see +.Pq like base.txz ; see .Xr release 7 and .Xr bsdinstall 8 @@ -224,7 +213,6 @@ the layout is not standardized, but a typical interactive user .Dv beastie might receive their own directory under .Pa /usr/home/beastie -.Pp .It Pa lib/ shared and archive .Xr ar 1 Ns -type @@ -248,15 +236,16 @@ miscellaneous utility data files .It Pa gcc/ GCC configuration data .It Pa ldscripts/ -linker scripts; -see +linker scripts; see .Xr ld 1 .It Pa pkgconfig/ -pc files +.Xr pc 5 Pq Pa ports/devel/pkgconf +files; collections of compiler flags, linker flags, and other information +relevant to library use .El .Pp .It Pa libexec/ -system daemons & system utilities (executed by other programs) +system daemons and system utilities that are executed by other programs .Pp .Bl -tag -width Fl -compact .It Pa aout/ @@ -264,14 +253,12 @@ utilities to manipulate a.out executables .It Pa elf/ utilities to manipulate ELF executables .It Pa lpr/ -utilities and filters for LP print system; -see +utilities and filters for LP print system; see .Xr lpr 1 .It Pa sendmail/ the .Xr sendmail 8 -binary; -see +binary; see .Xr mailwrapper 8 .It Pa sm.bin/ restricted shell for @@ -292,8 +279,7 @@ the general layout sketched out by for .Pa /usr should be used. -Exceptions are the -ports documentation +Exceptions are the ports documentation .Po in .Pa share/doc// Ns Pc , and @@ -303,27 +289,25 @@ and .It Pa obj/ architecture-specific target tree produced by building .Fx -from source; -see +from source; see .Xr build 7 .It Pa ports/ .Fx ports collection; see .Xr ports 7 .It Pa sbin/ -system daemons & system utilities (executed by users) +system daemons and system utilities that are executed by users .It Pa share/ architecture-independent files .Pp .Bl -tag -width Fl -compact .It Pa calendar/ -a variety of pre-fab calendar files; -see +system-wide calendar files; see .Xr calendar 1 .It Pa dict/ -word lists; -see +word lists; see .Xr look 1 +.Pp .Bl -tag -width Fl -compact .It Pa freebsd .Fx Ns -specific @@ -331,6 +315,7 @@ terms, proper names, and jargon .It Pa web2 words from Webster's Second International .El +.Pp .It Pa doc/ miscellaneous documentation .It Pa examples/ @@ -338,9 +323,10 @@ various examples for users and programmers .It Pa firmware/ firmware images loaded by userland programs .It Pa games/ -ASCII text files used by various games +used by various games .It Pa keys/ known trusted and revoked keys +.Pp .Bl -tag -width Fl -compact .It Pa pkg/ fingerprints for @@ -348,25 +334,23 @@ fingerprints for and .Xr pkg 8 .El +.Pp .It Pa locale/ -localization files; -see +localization files; see .Xr setlocale 3 .It Pa man/ manual pages .It Pa misc/ -miscellaneous system-wide ASCII text files +miscellaneous system-wide files +.Pp .Bl -tag -width Fl -compact -.It Pa fonts/ -??? .It Pa termcap -terminal characteristics database; -see +terminal characteristics database; see .Xr termcap 5 .El +.Pp .It Pa mk/ -templates for make; -see +templates for make; see .Xr make 1 .It Pa nls/ national language support files @@ -382,6 +366,7 @@ example (dot) files for new accounts .It Pa snmp/ MIBs, example files and tree definitions for the SNMP daemon +.Pp .Bl -tag -width Fl -compact .It Pa defs/ tree definition files for use with @@ -389,20 +374,19 @@ tree definition files for use with .It Pa mibs/ MIB files .El +.Pp .It Pa syscons/ -files used by syscons; -see .Xr syscons 4 +files +.Pp .Bl -tag -width Fl -compact .It Pa fonts/ -console fonts; -see +console fonts; see .Xr vidcontrol 1 and .Xr vidfont 1 .It Pa keymaps/ -console keyboard maps; -see +console keyboard maps; see .Xr kbdcontrol 1 and .Xr kbdmap 1 @@ -410,36 +394,33 @@ and console screen maps .El .It Pa tabset/ -tab description files for a variety of terminals; used in -the termcap file; +tab description files for a variety of terminals; used in the termcap file; see .Xr termcap 5 .It Pa vi/ localization support and utilities for .Xr vi 1 .It Pa vt/ -files used by vt; -see .Xr vt 4 +files +.Pp .Bl -tag -width Fl -compact .It Pa fonts/ -console fonts; -see +console fonts; see .Xr vidcontrol 1 and .Xr vidfont 1 .It Pa keymaps/ -console keyboard maps; -see +console keyboard maps; see .Xr kbdcontrol 1 and .Xr kbdmap 1 .\" .It Pa scrnmaps/ .\" console screen maps .El +.Pp .It Pa zoneinfo/ -timezone configuration information; -see +timezone configuration information; see .Xr tzfile 5 .El .Pp @@ -452,41 +433,39 @@ The layout of the source tree is described by the top-level file. .Pp .It Pa tests/ -The +the .Fx test suite; see .Xr tests 7 .El .It Pa /var/ -multi-purpose log, temporary, transient, and spool files +log, temporary, transient, and spool files .Pp -.Bl -tag -width "defaults/" -compact +.Bl -tag -width "preserve/" -compact .It Pa account/ system accounting files .Pp .Bl -tag -width Fl -compact .It Pa acct -execution accounting file; -see +execution accounting file; see .Xr acct 5 .El .Pp .It Pa at/ -timed command scheduling files; -see +timed command scheduling files; see .Xr at 1 .Pp .Bl -tag -width Fl -compact .It Pa jobs/ -directory containing job files +job files .It Pa spool/ -directory containing output spool files +output spool files .El .Pp .It Pa backups/ miscellaneous backup files .It Pa cache/ -miscellaneous cached files +miscellaneous cache files .Pp .Bl -tag -width Fl -compact .It Pa pkg/ @@ -495,34 +474,33 @@ cached packages for .El .Pp .It Pa crash/ -default directory to store kernel crash dumps; see +default directory for kernel crash dumps; see .Xr crash 8 and .Xr savecore 8 .It Pa cron/ -files used by cron; -see .Xr cron 8 +files .Pp .Bl -tag -width Fl -compact .It Pa tabs/ -crontab files; -see .Xr crontab 5 +files .El .Pp .It Pa db/ -miscellaneous automatically generated system-specific database files -.Bl -tag -width Fl -compact +miscellaneous automatically-generated system-specific database files +.Pp +.Bl -tag -width "freebsd-update/" -compact .It Pa freebsd-update/ +temporary files and downloads for .Xr freebsd-update 8 -work directory for temporary files and downloaded updates .El +.Pp .It Pa empty/ -empty directory for use by programs that need a specifically empty directory. -Used for instance by +for use by programs that require an empty directory. +Uses include privilege separation by .Xr sshd 8 -for privilege separation .It Pa games/ miscellaneous game status and score files .It Pa heimdal/ @@ -531,33 +509,26 @@ Kerberos server databases; see .It Pa log/ miscellaneous system log files .Pp -.Bl -tag -width Fl -compact +.Bl -tag -width "utx.lastlogin" -compact .It Pa utx.lastlogin -last login log; -see +last login log; see .Xr getutxent 3 .It Pa utx.log -login/logout log; -see +login/logout log; see .Xr getutxent 3 .El .Pp .It Pa mail/ user mailbox files .It Pa msgs/ -system messages database; -see +system messages database; see .Xr msgs 1 .It Pa preserve/ -temporary home of files preserved after an accidental death -of an editor; -see -.Xr ex 1 +unused, present for historical reasons .It Pa quotas/ file system quota information files .It Pa run/ -system information files describing various info about -system since it was booted +files containing information about the operating system since it was booted .Pp .Bl -tag -width Fl -compact .It Pa bhyve/ @@ -570,14 +541,12 @@ writable by the group for command connection sockets; see .Xr ppp 8 .It Pa utx.active -database of current users; -see +database of current users; see .Xr getutxent 3 .El .Pp .It Pa rwho/ -rwho data files; -see +rwho data files; see .Xr rwhod 8 , .Xr rwho 1 , and @@ -585,29 +554,28 @@ and .It Pa spool/ miscellaneous printer and mail system spooling directories .Pp -.Bl -tag -width Fl -compact +.Bl -tag -width "clientmqueue/" -compact .It Pa clientmqueue/ -undelivered submission mail queue; -see +undelivered submission mail queue; see .Xr sendmail 8 .It Pa ftp/ -ftp root directory; -see +ftp root directory; see .Xr ftpd 8 .It Pa mqueue/ -undelivered mail queue; -see +undelivered mail queue; see .Xr sendmail 8 .It Pa output/ line printer spooling directories .El .Pp .It Pa tmp/ -temporary files that are kept between system reboots +temporary files that are not removed by +.Xr rc 8 .Pp -.Bl -tag -width Fl -compact +.Bl -tag -width "vi.recover/" -compact .It Pa vi.recover/ -the directory where recovery files are stored +.Xr vi 1 +recovery files .El .Pp .It Pa yp/ @@ -618,8 +586,8 @@ the NIS maps; see .Sh NOTES This manual page documents the default .Fx -file system layout, but -the actual hierarchy on a given system is defined at the system +file system layout. +The actual hierarchy on a given system is defined at the system administrator's discretion. A well-maintained installation will include a customized version of this document. From nobody Fri Jul 7 19:13:27 2023 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 4QyNN81ttkz4lSKD; Fri, 7 Jul 2023 19:13:28 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QyNN811qGz3kS8; Fri, 7 Jul 2023 19:13:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688757208; 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=MsX3PABwK2INPNWpIk18dDohJ0n76GdTyqwsGtGuBDY=; b=I9dyu2BYiL/ieQ/rz2cGWA4LSwmhR3UwZrWVy3K+0IuZU4FBLOo7qB35qn4b/B941PQCU7 PcaOkF3GLeOwRhJs+NmORi1ctN7j9yaeel5aB3MiVYWEXpQgOoQp5V7ZyTcrxm+jDN9Q7+ K9MZB9Qp4XnG+hcuyc7KK0pU5BKtPbs9BuIsGmtnJ/IWe2ARO8ROdtClFU/cIxd7uqlPBZ euFO0ngnVss7cwK1OVatpAjDrxC6DHz9e475UShoe6XQDUzG/33z/MeWCGmo5E1bcKr6+j J03ewKVfMC19UIKPpcXNYcrzXTk31VHVDkO+lt2laIUf31a+1NXPdSUtXRsDuQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688757208; 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=MsX3PABwK2INPNWpIk18dDohJ0n76GdTyqwsGtGuBDY=; b=fUSnVtNGelCzuJtdXB7hRvkJFJA8h4mxShTs1zrsyNGHilcw38jc30va86DPdd1eVXrIj2 vgEprmrnFqNYuKBFQAkrlPcGcMEz2O9FVgacq3hqp5csczCreX5v4Rnbp3WJ4gm04X7xcD HA4PWVtPcb1LuBkp07Vwkgos2t70t0t/eF6G2QiEniypnHAOrrfS5rMcfnUBA2WfOK1PWv ZgD88Ii665eOknLFUnq2Ys0VQk7RKyVO/3ydlskRXCaYG00s04cQ4mLnDHpF6Ik+/Xjtj3 5Zdc+1dA7TEpj7jZr25wDJmHil7cul3rfJm6M/L86di+qSwteH1JucWJbGIuIg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688757208; a=rsa-sha256; cv=none; b=TMQRmgenPBunh+5f2wSNhUNxtwAPh1FeYGoRjHkMad3UzZ2kfZmnwfT5SwPleqeHxImZkS s+egKD3kuRgAsdx2krAFO0OEWeXxa48EBjlPTgHgRNDz61jzK4BtQNHQ1uWV9lmxvJhHix 8+5fSu6HWFSFF3tFfWdElFbEhbwLTWGPOaIIlx3eWGdhdVMCUs4RTrGED7ArceeAebiHXb 41r5ToN3bm2XY8TIv8M24C+pmXTA4arebi4eSkmX6cPQop2QMFAx6BBvp1NTkoGdC03AoP TMhdH87sTY6CkBUOBMDYvg7gklFdDv0f/VVpjOzz1SNx9ma1WEqRUkf6h1Jfnw== 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 4QyNN803L4zqfr; Fri, 7 Jul 2023 19:13:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 367JDRtG046005; Fri, 7 Jul 2023 19:13:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 367JDRoe046004; Fri, 7 Jul 2023 19:13:27 GMT (envelope-from git) Date: Fri, 7 Jul 2023 19:13:27 GMT Message-Id: <202307071913.367JDRoe046004@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: ac2e58110f63 - stable/13 - hier(7): tweak /media description 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: ac2e58110f63bd28cac516685fbb38086071b47b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=ac2e58110f63bd28cac516685fbb38086071b47b commit ac2e58110f63bd28cac516685fbb38086071b47b Author: Mitchell Horne AuthorDate: 2023-06-28 16:21:28 +0000 Commit: Mitchell Horne CommitDate: 2023-07-07 19:13:02 +0000 hier(7): tweak /media description It comes as an empty directory by default. While here, use a serial (Oxford) comma, per the FDP Primer. PR: 261349 Reported by: karels Reviewed by: grahamperrin, karels Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D40774 (cherry picked from commit acdf666147eea8bf8626d3733087861493d90e23) --- share/man/man7/hier.7 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7 index 0ccc3679b91e..38da58fec3bd 100644 --- a/share/man/man7/hier.7 +++ b/share/man/man7/hier.7 @@ -160,8 +160,8 @@ system utilities that are critical to binaries in and .Pa /sbin .It Pa /media/ -contains subdirectories that are mount points for removable media such as -USB drives, CDs and DVDs +empty directory commonly containing mount points for removable media such as +USB drives, CDs, and DVDs .It Pa /mnt/ empty directory commonly used by system administrators as a temporary mount point From nobody Fri Jul 7 19:13:29 2023 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 4QyNN940Pgz4lSKF; Fri, 7 Jul 2023 19:13:29 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QyNN91r6Fz3kSV; Fri, 7 Jul 2023 19:13:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688757209; 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=4oopW95f3mhblclQm3bvmwWSz/aOfE83seu3mDFXru0=; b=aLsmtRlwSZulMMPhl8N+Mf4axCP3lE8pl2Qon6vT+Yq2dWsze3fUz+q73rFgXTNMH0dzyx JZXJaay9rmaCa+n/S58cZeiPF3axP3Btuwe9pNzbBitinqS6j6sR7h+7ByjXEC/ueVWl/f w98WOD/XXMbNUx5bsGr22ZpmYrktb02YbllB+TipQjHmxtMiw2MFIqkmqWuI8ZA+IT9drq pI2QE6CSU9j+edG4qshza4XliBxnyggGEA6hGjllyZNQ03f5eUBwfDH9wMO050eKrWQuy+ OigxM+uU6lFpDyCkrSyduCnPmr/BQ+PgTVh9HVBf301aquOvqYJCxm0m1L97Zg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688757209; 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=4oopW95f3mhblclQm3bvmwWSz/aOfE83seu3mDFXru0=; b=Ur39LNS4imBREC31FY85598NetlKjmMe79GkVOcdOrtpNsqCc8EuWDOIEhvBxktI1JGi0e 2R6qD56tAdhPJVMUHIQoPcbB8807Rg6A7UhYyK6vvHvXvTsN0zpLEBrevfCyV55AYrkDM0 ZM+F7LB05wbB3iJlyKnUg4rl+Qzgqz+VbpzTCojNIKAl0jUieDsYIHb/WDYwnrvayFds8p vJR+/19wWuVOYp/PLNX3Qohkcz8nV/4iKxo9f4hbDuEH283MAQNp1AtthkpnAGkCgyCnaY ZA6D5rK2v6RFMoS078JlpTT71cUcEpb36gkz0Oroe55BR3HOs4W6jONm4JkkCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688757209; a=rsa-sha256; cv=none; b=Rxa9uQbZqejuO7ejYrVgQSTM/2Z4j05xomdHIKTnZxVkyEA/jHkbNSoo43E4nwU5JUOmfd v6wd3xvqWZUiCp+BARo9TZJCEOnJg6LhW3kB23i5NdKTJm23bbRRUAeLFJxmF95IXwX3sK 4LpJL0ZVF8BKJAiUhIdaYLFZy6s55khsEn8ujzAHVLs+bMIqhcSAr1IrMRQUonGnbgur/3 2ZaGge8iQLtwfQhB/59uY9oniuu3D8pWUpHF9++IzIowPtkG5StW2oqxZXNdJooDoIOTvY hhTTnO4LMzeoHpef0h7t3q2Prive/8ccMJ4vtCd8tkaima2D9re2ijsxrgBU6Q== 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 4QyNN90y8Gzqfs; Fri, 7 Jul 2023 19:13:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 367JDTiV046030; Fri, 7 Jul 2023 19:13:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 367JDTYY046029; Fri, 7 Jul 2023 19:13:29 GMT (envelope-from git) Date: Fri, 7 Jul 2023 19:13:29 GMT Message-Id: <202307071913.367JDTYY046029@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: e3a1fe9acad9 - stable/13 - hier(7): adjust overlays/ subdirectory 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e3a1fe9acad96afbcecae1cd7f677ae64a93f89d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=e3a1fe9acad96afbcecae1cd7f677ae64a93f89d commit e3a1fe9acad96afbcecae1cd7f677ae64a93f89d Author: Mitchell Horne AuthorDate: 2023-06-29 16:53:52 +0000 Commit: Mitchell Horne CommitDate: 2023-07-07 19:13:02 +0000 hier(7): adjust overlays/ subdirectory Device tree overlays are installed in /boot/dtb/overlays by default. Adjust the comment to mention fdt_overlays and loader.conf, but do not repeat what is said in the parent directory's description. PR: 261349 Reviewed by: grahamperrin, kevans MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D40785 (cherry picked from commit 651d1efd96a692a141a4c61d54d6a41ee2c0d851) --- share/man/man7/hier.7 | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7 index 38da58fec3bd..c4097795cf5c 100644 --- a/share/man/man7/hier.7 +++ b/share/man/man7/hier.7 @@ -28,7 +28,7 @@ .\" @(#)hier.7 8.1 (Berkeley) 6/5/93 .\" $FreeBSD$ .\" -.Dd June 27, 2023 +.Dd June 29, 2023 .Dt HIER 7 .Os .Sh NAME @@ -54,6 +54,15 @@ compiled flattened device tree (FDT) files; see .Xr fdt 4 and .Xr dtc 1 +.Pp +.Bl -tag -width "overlays/" -compact +.It Pa overlays/ +compiled flattened device tree (FDT) overlays; these can be applied using the +.Va fdt_overlays +setting in +.Xr loader.conf 5 +.El +.Pp .It Pa efi/ mount point for the EFI System Partition (ESP) on UEFI systems .It Pa firmware/ @@ -65,11 +74,6 @@ and kernel modules .It Pa modules/ third-party loadable kernel modules, such as those associated with .Xr ports 7 -.It Pa overlays/ -compiled flattened device tree (FDT) overlays; see -.Xr fdt 4 -and -.Xr dtc 1 .It Pa zfs/ .Xr zfs 8 pool cache files From nobody Fri Jul 7 19:25:03 2023 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 4QyNdX2W6hz4lW4h; Fri, 7 Jul 2023 19:25:04 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QyNdW6lRzz3qJ2; Fri, 7 Jul 2023 19:25:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688757903; 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=lonBKT7EGTUazlAOFE/g79knPONEyLHUu/Q2tBj4GMk=; b=OuvqQWdQH61F07tKPwYE0ffmXglgpVlFKhixu2FMqauGZLQCD6mLJH0xHgkC//jTj7W7Cx T8VvQ8yP65Zpbgd7orsP8J33f9NMO6fVAv0CSedC5UVFVxIQXthJCjlzzLas9qdALwyYd0 lZOKX3xnBbdc7KN5wo92RBz/A3ArqfqTvwtQuoMqwddHYFndk0mv493EtCsUb/bg3BbztW S7/PnBDqlvIAvSmuGUsOFy5wigdrzMj82FHN93PZGiTelIhI8GP4DhVLJlMT64y4vmXggI 7K2OpjBa4PJmQu8danQSAWyYx0oauX3r2xoQNNkrITz0898w00CY7uYm+gcBaA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688757903; 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=lonBKT7EGTUazlAOFE/g79knPONEyLHUu/Q2tBj4GMk=; b=WFjkO1PKI4y2zVPAtuiCRJAyaiRw/mRqQJJbxRtpVGxYSZ2gX2XkYBxS2C5II8K/ElD4xt p94KjmK4NqUgRB/GVsE4xjH6KrcGzYl8UWN6CSB0G0r38d2UWbNAmu8D4OE4BxOSj+3qXj DOcYOsu1yCJmEtJ+44zRg4kMdLU3O4bUCSM2XFi2hKKU14/B1wcilN5jdxutd0q6AsF7AB jNZG8S29yLSbbDvyCpVBN/fePZTCqFIEM4AhYu8HeRIAIQlvyuFYitPmRZKwHH7D1KHi1S GUxFGK2GzzlHbOwQa5GdtagatEFpkXn2fR0QMkBpCI3lLvyy3mmsTaqPBe38mA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688757903; a=rsa-sha256; cv=none; b=tbeHLIm+Jsk58E5c83JKG4RgIMUZNTB4EAvzzqBcMMnv6mqMQILA44Pa9oOsqbWVNvEMb1 +PpzH5ziZqk2pLeAuMookPsUQ2wOYWQ9TnnotWw+fsbJB/s4qPtticAUUv+aEmyR097X+g l314ucoOI+j2oI9QCPOyNSrE840qQKaj7sToEfzScZpLf0Qsex/u2jIacByjKJtIxkXYNp cK1xDimV70BIi/TrHPwmwL65AWDENLSTmj5wi2t3u6LwQkuJLCXvx3pPYno2/AXyC47Fb2 Lcw8ANnCm+rZFtzsBhzWU/r05zbYTNYZNy5urNRlVgWl1gOwqH/z/X+lhZLpoQ== 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 4QyNdW5pGVzrBB; Fri, 7 Jul 2023 19:25:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 367JP3j7062285; Fri, 7 Jul 2023 19:25:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 367JP3GT062284; Fri, 7 Jul 2023 19:25:03 GMT (envelope-from git) Date: Fri, 7 Jul 2023 19:25:03 GMT Message-Id: <202307071925.367JP3GT062284@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 7b1b44551ff9 - stable/13 - arm64/disassem.c: Add shifted register definitions with ror 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 7b1b44551ff9bc71031a8faebf7c560427f67880 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=7b1b44551ff9bc71031a8faebf7c560427f67880 commit 7b1b44551ff9bc71031a8faebf7c560427f67880 Author: Mykola Hohsadze AuthorDate: 2023-06-17 15:31:25 +0000 Commit: Mitchell Horne CommitDate: 2023-07-07 19:20:50 +0000 arm64/disassem.c: Add shifted register definitions with ror Add disassembly support for the following shifted register instructions: * mvn * orn * orr * and * ands * bic * bics * eon * eor * tst According to Arm64 documenation, operational pseuducode of shifted register instruction must return `UNDEFINED` if shift type is `RESERVED` ('11'). Hence, removed "rsv" from `shift_2` array and add "ror". In case of shift type is 3 and this type is `RESERVED`, we will return `undefined`. Reviewed by: mhorne MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D40386 (cherry picked from commit 9aef25d2686b9e7fb9cb700d63291338e8e30bb6) --- sys/arm64/arm64/disassem.c | 36 +++++++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/sys/arm64/arm64/disassem.c b/sys/arm64/arm64/disassem.c index f1a4f9206c1b..5dc0bf5100ef 100644 --- a/sys/arm64/arm64/disassem.c +++ b/sys/arm64/arm64/disassem.c @@ -53,6 +53,7 @@ __FBSDID("$FreeBSD$"); #define OP_RT_SP (1UL << 8) /* Use sp for RT otherwise xzr */ #define OP_RN_SP (1UL << 9) /* Use sp for RN otherwise xzr */ #define OP_RM_SP (1UL << 10) /* Use sp for RM otherwise xzr */ +#define OP_SHIFT_ROR (1UL << 11) /* Use ror shift type */ static const char *w_reg[] = { "w0", "w1", "w2", "w3", "w4", "w5", "w6", "w7", @@ -69,7 +70,7 @@ static const char *x_reg[] = { }; static const char *shift_2[] = { - "lsl", "lsr", "asr", "rsv" + "lsl", "lsr", "asr", "ror" }; /* @@ -232,6 +233,28 @@ static struct arm64_insn arm64_i[] = { TYPE_01, 0 }, /* negs shifted register */ { "subs", "SF(1)|1101011|SHIFT(2)|0|RM(5)|IMM(6)|RN(5)|RD(5)", TYPE_01, 0 }, /* subs shifted register */ + { "mvn", "SF(1)|0101010|SHIFT(2)|1|RM(5)|IMM(6)|11111|RD(5)", + TYPE_01, OP_SHIFT_ROR }, /* mvn shifted register */ + { "orn", "SF(1)|0101010|SHIFT(2)|1|RM(5)|IMM(6)|RN(5)|RD(5)", + TYPE_01, OP_SHIFT_ROR }, /* orn shifted register */ + { "mov", "SF(1)|0101010000|RM(5)|000000|11111|RD(5)", + TYPE_01, 0 }, /* mov register */ + { "orr", "SF(1)|0101010|SHIFT(2)|0|RM(5)|IMM(6)|RN(5)|RD(5)", + TYPE_01, OP_SHIFT_ROR }, /* orr shifted register */ + { "and", "SF(1)|0001010|SHIFT(2)|0|RM(5)|IMM(6)|RN(5)|RD(5)", + TYPE_01, OP_SHIFT_ROR }, /* and shifted register */ + { "tst", "SF(1)|1101010|SHIFT(2)|0|RM(5)|IMM(6)|RN(5)|11111", + TYPE_01, OP_SHIFT_ROR }, /* tst shifted register */ + { "ands", "SF(1)|1101010|SHIFT(2)|0|RM(5)|IMM(6)|RN(5)|RD(5)", + TYPE_01, OP_SHIFT_ROR }, /* ands shifted register */ + { "bic", "SF(1)|0001010|SHIFT(2)|1|RM(5)|IMM(6)|RN(5)|RD(5)", + TYPE_01, OP_SHIFT_ROR }, /* bic shifted register */ + { "bics", "SF(1)|1101010|SHIFT(2)|1|RM(5)|IMM(6)|RN(5)|RD(5)", + TYPE_01, OP_SHIFT_ROR }, /* bics shifted register */ + { "eon", "SF(1)|1001010|SHIFT(2)|1|RM(5)|IMM(6)|RN(5)|RD(5)", + TYPE_01, OP_SHIFT_ROR }, /* eon shifted register */ + { "eor", "SF(1)|1001010|SHIFT(2)|0|RM(5)|IMM(6)|RN(5)|RD(5)", + TYPE_01, OP_SHIFT_ROR }, /* eor shifted register */ { NULL, NULL } }; @@ -420,6 +443,8 @@ disasm(const struct disasm_interface *di, vm_offset_t loc, int altfmt) int pre; /* Indicate if x31 register should be printed as sp or xzr */ int rm_sp, rt_sp, rd_sp, rn_sp; + /* Indicate if shift type ror is supported */ + bool has_shift_ror; /* Initialize defaults, all are 0 except SF indicating 64bit access */ shift = rd = rm = rn = imm = idx = option = amount = scale = 0; @@ -464,6 +489,8 @@ disasm(const struct disasm_interface *di, vm_offset_t loc, int altfmt) rd_sp = i_ptr->special_ops & OP_RD_SP; rn_sp = i_ptr->special_ops & OP_RN_SP; + has_shift_ror = i_ptr->special_ops & OP_SHIFT_ROR; + /* Print opcode by type */ switch (i_ptr->type) { case TYPE_01: @@ -479,6 +506,13 @@ disasm(const struct disasm_interface *di, vm_offset_t loc, int altfmt) rm_absent = arm64_disasm_read_token(i_ptr, insn, "RM", &rm); arm64_disasm_read_token(i_ptr, insn, "SHIFT", &shift); + /* + * if shift type is RESERVED for shifted register instruction, + * print undefined + */ + if (shift == 3 && !has_shift_ror) + goto undefined; + di->di_printf("%s\t", i_ptr->name); /* From nobody Fri Jul 7 19:25:04 2023 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 4QyNdZ54Hwz4lW4m; Fri, 7 Jul 2023 19:25:06 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QyNdY0YhCz3qJ4; Fri, 7 Jul 2023 19:25:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688757905; 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=V9jWKoLs0DE6gXLcMDb7DbnU0H9rDwloxRAtVEORcoQ=; b=XQb/6wUHyRK8iuSusdm5JhJHl7UMY63Z6z3Gd0IDVomdFA/+4PLCk+WTcAYbuP6ShPvRf2 RODGcaaBcqRFAP8d9pRcPzv57vWaDL/d1rnbBPThQggg25G4qj5ZS5kuRiBTdvagPPKJ9M U8hak+cuI6ZApKsUyqau8r5jdAl+EKxFZA8K3E/NB3ms13F1P3B95u181qh+LCqnIpytsV V7NkAjjHlLmsqmMUa0yKjw8XRyLwZTLg2oQSKdw4Qa4BpKkljsJX9tQiPzhPVbXh9bvkGN BrfWlT5Ps76PUqLGLuJB6JuJrEF6m5190mxYGfWuocj5YJhlDBYJFTvJFQ+Zvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688757905; 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=V9jWKoLs0DE6gXLcMDb7DbnU0H9rDwloxRAtVEORcoQ=; b=wbJ7clD6eTP+VnmBv/bddt/jKwJByHyBGVjaR0PjWmE6V34NfF8aFYKdmaQdNVrS55/fQ2 UjkHFgMYPFDpuEq1KpV2I7T0pcmtVtnKc6CjdCqe9orE2RdVwubOf5MBoyrKvwxDAdSTrX Mp8k1JDIPiIWizycp3J0A4f63cSwgPNF4WJzLSowOnLYDmftV6Nsw/ocR+tfFAIVvKXbwj 0oBP8YjwnlT2nixmdFC46eJuYeFycuKHW/Ct5AIqcOeQv3ylEWDZUyX8VmtBzH/+i+DQG8 IWitLpq4lAbVNau98ktCutR6CB9kz3FCR2BksiEiXfFduS7yNHNShYBnWW/wxA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688757905; a=rsa-sha256; cv=none; b=PRA/33M76dCRoe8F5xUGQRwJS38/KPIniW6i1t10p5XLXW/2tJSplYpgn927wJAGvFd7TQ mW0qhTZqorBCQjv0bit637YHj52yL7+9D42XnoU8nkk7o1/zkFszWetIuKiEUfYrPmERv/ k1Oepwe61HVi/d/eORwzSiQ6gsrA+Fp8WyQ7mqQLTk2zriq7TniY3IbXD5bPbLqDoU1hMF Ws2/nXSDDE8lvfV9r/thTWS949xw3eOcTrK672/WIdbRMeVtiG7aljA9mW9DvSL0uRHpK0 XEs0ZOWxcsYdj3SJj48ZmT3QYoU8vlDm9YGzfKwxZTVT9rWWrdV0CQPVI6ehsA== 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 4QyNdX6k07zrDZ; Fri, 7 Jul 2023 19:25:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 367JP4Il062306; Fri, 7 Jul 2023 19:25:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 367JP4bQ062305; Fri, 7 Jul 2023 19:25:04 GMT (envelope-from git) Date: Fri, 7 Jul 2023 19:25:04 GMT Message-Id: <202307071925.367JP4bQ062305@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: eb08efb821fd - stable/13 - amdtemp: Fix missing 49 degree offset on current EPYC CPUs 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: eb08efb821fd7d3ee599d65c704fb88c28c57842 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=eb08efb821fd7d3ee599d65c704fb88c28c57842 commit eb08efb821fd7d3ee599d65c704fb88c28c57842 Author: Val Packett AuthorDate: 2023-06-17 16:29:53 +0000 Commit: Mitchell Horne CommitDate: 2023-07-07 19:20:50 +0000 amdtemp: Fix missing 49 degree offset on current EPYC CPUs On an EPYC 7313P, the temperature reported by amdtemp was off, because the offset was not applied. Turns out it needs to be applied with one more condition: https://lkml.org/lkml/2023/4/13/1095 Reviewed by: mhorne Tested by: mike.jakubik@gmail.com MFC after: 1 week Sponsored by: https://www.patreon.com/valpackett Pull Request: https://github.com/freebsd/freebsd-src/pull/754 (cherry picked from commit c1cbabe8ae5702a1e54d62401fe3b58a84fcb3e4) --- sys/dev/amdtemp/amdtemp.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sys/dev/amdtemp/amdtemp.c b/sys/dev/amdtemp/amdtemp.c index 493f619c0427..238ae572d096 100644 --- a/sys/dev/amdtemp/amdtemp.c +++ b/sys/dev/amdtemp/amdtemp.c @@ -165,6 +165,12 @@ static const struct amdtemp_product { */ #define AMDTEMP_17H_CUR_TMP 0x59800 #define AMDTEMP_17H_CUR_TMP_RANGE_SEL (1u << 19) +/* + * Bits 16-17, when set, mean that CUR_TMP is read-write. When it is, the + * 49 degree offset should apply as well. This was revealed in a Linux + * patch from an AMD employee. + */ +#define AMDTEMP_17H_CUR_TMP_TJ_SEL ((1u << 17) | (1u << 16)) /* * The following register set was discovered experimentally by Ondrej Čerman * and collaborators, but is not (yet) documented in a PPR/OSRR (other than @@ -732,7 +738,8 @@ amdtemp_decode_fam17h_tctl(int32_t sc_offset, uint32_t val) { bool minus49; - minus49 = ((val & AMDTEMP_17H_CUR_TMP_RANGE_SEL) != 0); + minus49 = ((val & AMDTEMP_17H_CUR_TMP_RANGE_SEL) != 0) + || ((val & AMDTEMP_17H_CUR_TMP_TJ_SEL) == AMDTEMP_17H_CUR_TMP_TJ_SEL); return (amdtemp_decode_fam10h_to_17h(sc_offset, val >> AMDTEMP_REPTMP10H_CURTMP_SHIFT, minus49)); } From nobody Fri Jul 7 19:25:05 2023 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 4QyNdZ60C0z4lVy9; Fri, 7 Jul 2023 19:25:06 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QyNdZ1mFDz3q4v; Fri, 7 Jul 2023 19:25:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688757906; 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=ArK7XRQ/RgzVxOGVnhyJJ3NkJuQknzkyen3lNniamuc=; b=mkNfItwBcvfm9pn2D8DDqLuH0Ou6MXwlWMd/cOy3FN1Zha7mmGuqJ1N017Fgf30owxPyjl R4dwBCmChU08zEm7Ffw7HWOK7cQccTVOBx4pn/DGQYM46V+/W+UPlEbSKwykQC3Lr3WYNh I6BYbAbQ8tsshASHYB0xZkap669c28S3HupEyQYie/uFskedGC1ks8gnYDKmdrImnK1eZ5 pyaVaqHxrozlWe/2gp3CYyTjPHCfcAegn+smB28DaBb+N2vZvfzRDKZuzzQxrgx6IgE1eF IIZpOatbkLJ84FauHX7ylstoIqtiVFciknucg0BWR3aDVk8rtMwDN1xikagDHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688757906; 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=ArK7XRQ/RgzVxOGVnhyJJ3NkJuQknzkyen3lNniamuc=; b=WzqXNt7QKA/61w0+Qf6JEEORU23TrJN6RBSpRw+6o6zNqRrA68M1xizJAC/0W5cqFqP4xC 0hTWfy6FCAXY893zGdxAwS9LFLQbgGIY4IDAU29GtwcWEQOfegXlrK4Rwlp/0sS5Vz6Kk9 CzvZz+mMjB9A0GQon0EDAWTQuBAbeuCJjbdv2YnKYsm/J0mBzjdGVDOI36tcbb2PGzhpHg PuxszpHoERKLolJopmn/btKIdtYpsReLYN2CJ3MqpEx4LsHKxBsfcSz6ujnJiMpr7kOGdY p0oAvJQUiQ6xKkV+tNx2KTgB5bJLqxXg16DqY/NpSl2+GcXdTDdLE8nxGeEwRA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688757906; a=rsa-sha256; cv=none; b=UqVG25J9t53Nmv8yAKM4KhD9rC89UPmdIJFsp+QbsBaFU9CxY5mdwnVfvvRxoqMBP0TjA3 Jyy3ai/mNDvPze0i5u6ajpFqo+XPzOoSUstAynVwVFc8GnttZ5HYduBcpSqNaK35zNvMQ+ CazEun+N1bBJMdIqfnpiRflefWXBYYeJ4Uo2dp2HgL0i5dZRNROQLew6ofMUNdAzMf4BRW OWBL21BDqc82riSP/YuaAaRRY/oIacBUlaJUTu64PAsspfjUGHb4KAREHQBTENhaexJiX/ 0LUwXBZSok75i02UCoqoSeJfT9a1Mj+9Y1zORe3qqET72KIqeT44fDPjO7kg3A== 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 4QyNdZ0XgWzqvC; Fri, 7 Jul 2023 19:25:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 367JP5fE062330; Fri, 7 Jul 2023 19:25:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 367JP5p7062329; Fri, 7 Jul 2023 19:25:05 GMT (envelope-from git) Date: Fri, 7 Jul 2023 19:25:05 GMT Message-Id: <202307071925.367JP5p7062329@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: dfea72b70f3f - stable/13 - riscv: improve KTR_TRAP trace entries 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: dfea72b70f3fd83426d71252fa33f8f04b3d90c9 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=dfea72b70f3fd83426d71252fa33f8f04b3d90c9 commit dfea72b70f3fd83426d71252fa33f8f04b3d90c9 Author: Mitchell Horne AuthorDate: 2023-06-20 14:52:26 +0000 Commit: Mitchell Horne CommitDate: 2023-07-07 19:20:51 +0000 riscv: improve KTR_TRAP trace entries For more informative records of exceptions, include key details such as the exception code and stval register contents. Remove the curthread argument as it is redundant (saved with every ktr entry), and the trapframe as it is somewhat meaningless. Add a new KTR_TRAP trace record for interrupts. Reviewed by: markj, jhb MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D40584 (cherry picked from commit 7756232199adf60343ae0b940e2b27fe363905bc) --- sys/riscv/riscv/intr_machdep.c | 3 +++ sys/riscv/riscv/trap.c | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sys/riscv/riscv/intr_machdep.c b/sys/riscv/riscv/intr_machdep.c index d84f4ea1cb91..1ee2c0984205 100644 --- a/sys/riscv/riscv/intr_machdep.c +++ b/sys/riscv/riscv/intr_machdep.c @@ -163,6 +163,9 @@ riscv_cpu_intr(struct trapframe *frame) active_irq = frame->tf_scause & SCAUSE_CODE; + CTR3(KTR_TRAP, "%s: irq=%d, umode=%d", __func__, active_irq, + TRAPF_USERMODE(frame)); + switch (active_irq) { case IRQ_SOFTWARE_USER: case IRQ_SOFTWARE_SUPERVISOR: diff --git a/sys/riscv/riscv/trap.c b/sys/riscv/riscv/trap.c index 4da6c9d21502..9e75f0e0530d 100644 --- a/sys/riscv/riscv/trap.c +++ b/sys/riscv/riscv/trap.c @@ -292,8 +292,8 @@ do_trap_supervisor(struct trapframe *frame) return; #endif - CTR3(KTR_TRAP, "do_trap_supervisor: curthread: %p, sepc: %lx, frame: %p", - curthread, frame->tf_sepc, frame); + CTR4(KTR_TRAP, "%s: exception=%lu, sepc=%lx, stval=%lx", __func__, + exception, frame->tf_sepc, frame->tf_stval); switch (exception) { case SCAUSE_LOAD_ACCESS_FAULT: @@ -366,8 +366,8 @@ do_trap_user(struct trapframe *frame) } intr_enable(); - CTR3(KTR_TRAP, "do_trap_user: curthread: %p, sepc: %lx, frame: %p", - curthread, frame->tf_sepc, frame); + CTR4(KTR_TRAP, "%s: exception=%lu, sepc=%lx, stval=%lx", __func__, + exception, frame->tf_sepc, frame->tf_stval); switch (exception) { case SCAUSE_LOAD_ACCESS_FAULT: