From nobody Mon Jun 03 16:34:37 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VtK7f0xQTz5MpZG; Mon, 03 Jun 2024 16:34:38 +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 4VtK7d6Zdnz4778; Mon, 3 Jun 2024 16:34:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717432477; 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=5ycGEYSIpzAE2cf8lqUQ3R+5hj0SmsvdyrkGG8Z9N44=; b=GM7VSZLM8sLbRpyUnQpbYvhg0RGsd8Ind2P/L26F5Kw80zftPYB80aHhOUb3awVbm9nS+c 6cFNMkCNwTlNUDlcx5jNmUHXfIg1Uw48Piw/SigQnJyTAMQ5II1zlgncL2+j6i4nH6SMmW T/SVXJz+y0JcRcrqRDhHXPWngqLsmTj3XM1O4zYNWsmC3R6+d1lGm1UiPlKcuScAcP/srr rAC6MAAtDd5xB9wK3wiR/UVny25Y+f2IAuzxyVtpWVFZ49ResTHEsCvRguUHNAXPKeochB iXjAWJanS7K1PN0jefXwJoO8xSChyuv15lv2KV9dSLH6zBwZHfwabmOLaD93+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717432477; a=rsa-sha256; cv=none; b=oYAKXOwuzOwulK4xMdU4DL2FPYtqkCHpVUZMefZz6uJgEYR0EPLimJqF2HzUDA1dgldSar FDkwCI33OZD/iWV/7oLNWBAdBP+WbCAoHFjhv/GRoT076p3fNZM+oQzt38lIfo51BZHP0U EeVBySbXaUucL7q9Db3nWFtJCsCFZFBXu+SgdWI5LYeRpYa79ev/b0rclWUea/f6KhK12k 0vBEbSl8A4Bd6UT/A7IlLzlqoa+wjnterezPE5iD/UaRVD96GUpJ4klG+hlWQ5YELIHSje qTvpiISePMd2fN6lJOhtxcm+/9I6Cm0vcqf9hn7V3LviKbK3l86r6i9drd2Hyg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717432477; 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=5ycGEYSIpzAE2cf8lqUQ3R+5hj0SmsvdyrkGG8Z9N44=; b=tD4SCxKLAwrnMxcWWsOLwhfrMF2u3XARZE0Hq/sH/GCMfwUH8+qlR+L97Uw4wfiXAVyBz7 PcVNigLxIei/B92ZIUlBWRSjb8uFpZOHc/zpri8QahntkLwKAW5Qc1HK56HHtO8+tgi/8I IUP96PKun68RMQH79LASzuYwjuuBBeW1hl9L+s6Pk3M3ZB3sverIg8N2s1V3kEvcd17zJI OXSU60nOpcN5IomF8to8WIfEyXHQ1hMvurbn2CBuuNwhFcvwCYAfz6wEXH2//1ztMKsyQd K+U722M5LVM98kDbbofLy6dFLfOffRqvxm7/WwIce91ykx0sbPydTuMAuC+DQg== 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 4VtK7d5pw7zjTr; Mon, 3 Jun 2024 16:34:37 +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 453GYbKT078629; Mon, 3 Jun 2024 16:34:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 453GYbtt078626; Mon, 3 Jun 2024 16:34:37 GMT (envelope-from git) Date: Mon, 3 Jun 2024 16:34:37 GMT Message-Id: <202406031634.453GYbtt078626@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Wolfram Schneider Subject: git: e1f5c22be431 - stable/14 - man(1) needs to check for .so files not only in the first line PR: 279182 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wosch X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e1f5c22be4317523102a98f7f62c780fbe73b40f Auto-Submitted: auto-generated The branch stable/14 has been updated by wosch: URL: https://cgit.FreeBSD.org/src/commit/?id=e1f5c22be4317523102a98f7f62c780fbe73b40f commit e1f5c22be4317523102a98f7f62c780fbe73b40f Author: Wolfram Schneider AuthorDate: 2024-05-26 05:48:40 +0000 Commit: Wolfram Schneider CommitDate: 2024-06-03 16:23:05 +0000 man(1) needs to check for .so files not only in the first line PR: 279182 Some manual pages have a copyright notice or commit id before including other files with the .so macro. We need to skip comments and empty lines at the beginning of the manpage while checking for the first .so macro. MFC after: 1 week (cherry picked from commit 73eb53813fe3a2245edbeb670902e4bb9d41e288) --- usr.bin/man/man.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/man/man.sh b/usr.bin/man/man.sh index e8eb27850873..ec14fe08cf67 100755 --- a/usr.bin/man/man.sh +++ b/usr.bin/man/man.sh @@ -322,7 +322,7 @@ man_check_for_so() { # We need to loop to accommodate multiple .so directives. while true do - line=$($cattool "$manpage" 2>/dev/null | head -n1) + line=$($cattool "$manpage" 2>/dev/null | grep -E -m1 -v '^\.\\"[ ]*|^[ ]*$') case "$line" in .so*) trim "${line#.so}" decho "$manpage includes $tstr"