From nobody Mon Jun 03 16:04:48 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 4VtJTF2rJyz5MmDv; Mon, 03 Jun 2024 16:04:49 +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 4VtJTF0Pwlz42RP; Mon, 3 Jun 2024 16:04:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717430689; 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=CKKMdtGCn2AkIzImopcd2RKmAMOCTsSiO/kBs++wF8A=; b=Nguc6xHtAU1haF/7jnJ85pNBd6Ohxwxyeky23XIvAQXOxoFoOF/MpoU5cDa9md5MN0Vpk/ fsU7sRXFGg/7O5YDHY+RN9eDqcRHLGoPpxioNWjiSzBCsUNoNYYwJvxrRXCHT8m6EaibMG awHnBmTtGJ7Jp6fEV2lmwR/pRqJ1lr9VBsCrAiSp76WJQUGz/vNpBNPyN2bu2jF8MoxJ/7 wHMy+EYzVYlvcWvxnJ7IHUhJ553JJsqrmxgVtWFLDPn4jS3T1NDAAFMktH4mpzbXvay3QY XDZFn7oyssB0/7ahaJhoHkptYJtMAHNNeKdR3qmJhvxewH326M0eILQDq43JIg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717430689; a=rsa-sha256; cv=none; b=s6maDrhKVKjQMY9cXI8luNYb7jvYChRCj9pfyPMjqc7I1GUDq14tOL/HvtQ7uMg8xjDnsJ j7i0qSu12pLFPkJlRulHivtWxQnSio94ehRXUBbNL3mDe2TOV9guvZkBRRFwYbKIBJL2US x7e09fSXWWzCzSgScdf9sYELGBRSFqCfkUqcMyAX/m3LqhU+iGdlykP3FYZWQ2i7bcIGmr 8MEK6wIyiDWPQa3h2IlUZqbjW1iI0wsx/JuEGPPsid4Wug6hjFgsG26l2SXAE2SRivXLJl muMB3ZIfIJWQ0zQmD+1BgkH8q+B+1JVqcN90cim+Sbq/ITSa5zsBk7hTfEKDTQ== 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=1717430689; 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=CKKMdtGCn2AkIzImopcd2RKmAMOCTsSiO/kBs++wF8A=; b=msc4S0zcn/YQJopTwC/dDMGsrF8GsWkeXJFAyo9lYIOpmPa/t12VEF4VQaTAcvGAhNKD1/ kqhqXPE4JiVhU/MBmDU+NIUU9hFI1xaAUe8bxf06S+91J2lDQW1SKKOELxuyarCHW/I+Aa WsscPE96PFbpJ6OH9GNrwhl1XDdVHFYncifDHoCYQVaYLJo403MurD70sqVEEg0xoYiCq4 OofvT1ks0BQlxKW4ZkcVAoNceue75iYGkrAb2/Vnkde88UPWDWMQF3Nlrnoax2UmePXxoc Ghjr57cNxqEJmhSMkLCRvsZJuJzihBev9TiCNWn7T9zO+/E1mrf5n/rICnXAVQ== 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 4VtJTF014DzhlL; Mon, 3 Jun 2024 16:04:49 +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 453G4mLh027974; Mon, 3 Jun 2024 16:04:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 453G4mGY027971; Mon, 3 Jun 2024 16:04:48 GMT (envelope-from git) Date: Mon, 3 Jun 2024 16:04:48 GMT Message-Id: <202406031604.453G4mGY027971@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Wolfram Schneider Subject: git: 965fff98260f - main - man(1): ignore absolute path for .so include 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/main X-Git-Reftype: branch X-Git-Commit: 965fff98260ff53707b4ba38ff44fc5683a7189f Auto-Submitted: auto-generated The branch main has been updated by wosch: URL: https://cgit.FreeBSD.org/src/commit/?id=965fff98260ff53707b4ba38ff44fc5683a7189f commit 965fff98260ff53707b4ba38ff44fc5683a7189f Author: Wolfram Schneider AuthorDate: 2024-06-03 16:00:42 +0000 Commit: Wolfram Schneider CommitDate: 2024-06-03 16:00:42 +0000 man(1): ignore absolute path for .so include We want only a relative include, as ".so man1/foobar.1" MFC after: 1 week --- usr.bin/man/man.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/usr.bin/man/man.sh b/usr.bin/man/man.sh index 24a0464689cc..7461153942f5 100755 --- a/usr.bin/man/man.sh +++ b/usr.bin/man/man.sh @@ -324,7 +324,8 @@ man_check_for_so() { do line=$($cattool "$manpage" 2>/dev/null | grep -E -m1 -v '^\.\\"[ ]*|^[ ]*$') case "$line" in - .so*) trim "${line#.so}" + '.so /'*) break ;; # ignore absolute path + '.so '*) trim "${line#.so}" decho "$manpage includes $tstr" # Glob and check for the file. if ! check_man "$1/$tstr" ""; then