From nobody Wed May 22 21:10:10 2024 X-Original-To: dev-commits-src-main@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 4Vl3q66vQFz5L0wG; Wed, 22 May 2024 21:10: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 4Vl3q669xwz4J2T; Wed, 22 May 2024 21:10:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716412210; 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=Syo6tbMr8URKRzWu12JyPQBojZm+NCrlp6lISHNXxMM=; b=eubN8kLKNomLr8rU6J6dwy/s/urFCxWhzx7aQpXYDlhV12z8b1ZOthHsbpih+o3F2UZ2B/ s6fSeG2+EXDIO71SLgbBdWQDnGRvOHfK0AoSllDpvzYP5KUuO34EMfqDjjIDrGzPbpLJPo bKiybPhYpwIA5HUG6cp/gKcdPXTsYgWl6ghJmwwY7jr8TtUDBkbPp0j+4qetawoB8j3/2N cXBNKII9DsnSyg1urk1KCKfQLGxknM6jNUav4DM571GmWJyRAoVnRbbSet1TsqJ4KuXF3q 45gpEE/ak++0NYgbfjKmfWKGFiwsBA1b0izfRVEFw5i9+wMGSbjiQvcGBkKG3Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716412210; a=rsa-sha256; cv=none; b=OToLkkMtMWJD/Jo9xvEdQklNmRpIuwV3B0xFow9sIio9LAwvb54yxijipHZ0y6+E7ITjaa jSkH5xFP7Bc0urDjzns5MCV7vGXvZ4ozbsBbPfRWIyqTU+bVtV+As0pEbjpeA5uUbdFz5L 17+5IRlEZcldcOWT4zH9FG17cbSBr2yGaptM51MTlkSQRVmcku0gQ8CWvI74h2r5+weumw nFpHOP+VZqrRfbRDeK5DgrOE4HmTmZG8YO2GenycpSe4UV6AViKEhhmr3x1GW84LocSP8k ln2RfRK16AImbtw8am3yjvKfdQ0d0I0CS3+yLZkb78u7IaaPAtPcLdSiaA0EyQ== 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=1716412210; 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=Syo6tbMr8URKRzWu12JyPQBojZm+NCrlp6lISHNXxMM=; b=ly5FtIodc3sVlg0jpeNkrBg0TTTcYbRTEJa5UxP5mSOT+FAEGE7J++6avDBs68+w+XH7M6 UHnEz9E9mfjVOyuGCV5YCv4WPS+KhOwvh2/bYgK0KG+B4GDHUeajyeh5Db4pF80QWA0giO Wyyapg5732XSv2iRD19VwfydJFjodoENzjDZootsW1BQNEXqXGNbZ8fMu5yyXxXHjImcO/ ftW2EGEnxx1X6jIGTsOvbl+Pez8XW1PMLYEBaUyZPBAXaDUSWAd46ktSxDh/AunjeR+mA0 dMp/kyBksQIybkDtAPVQaAuy6wwK7EmC9RquLAsjNjwr4syJzIyGwq1sYD4EQg== 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 4Vl3q65nQmzLYq; Wed, 22 May 2024 21:10: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 44MLAAvc087909; Wed, 22 May 2024 21:10:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44MLAAdf087895; Wed, 22 May 2024 21:10:10 GMT (envelope-from git) Date: Wed, 22 May 2024 21:10:10 GMT Message-Id: <202405222110.44MLAAdf087895@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 0115ad61d859 - main - autofs: Fix cross-threading on file to delete List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0115ad61d859b5fe107c84abce6673c153800bda Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=0115ad61d859b5fe107c84abce6673c153800bda commit 0115ad61d859b5fe107c84abce6673c153800bda Author: Warner Losh AuthorDate: 2024-05-22 20:44:05 +0000 Commit: Warner Losh CommitDate: 2024-05-22 21:10:08 +0000 autofs: Fix cross-threading on file to delete We want to delete the new file, which is installed in man4 not man5. Noticed by: Gary Jennejohn Fixes: a03e8a40d404 Sponsored by: Netflix --- tools/build/mk/OptionalObsoleteFiles.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 82227eef5d50..c0118bcbf6cb 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -134,7 +134,7 @@ OLD_FILES+=etc/rc.d/autounmountd OLD_FILES+=usr/sbin/automount OLD_FILES+=usr/sbin/automountd OLD_FILES+=usr/sbin/autounmountd -OLD_FILES+=usr/share/man/man5/autofs.4.gz +OLD_FILES+=usr/share/man/man4/autofs.4.gz OLD_FILES+=usr/share/man/man5/auto_master.5.gz OLD_FILES+=usr/share/man/man8/automount.8.gz OLD_FILES+=usr/share/man/man8/automountd.8.gz