From nobody Tue May 28 10:20:38 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 4VpT6t20cYz5Lx5T; Tue, 28 May 2024 10:20: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 4VpT6t1DtXz4GHg; Tue, 28 May 2024 10:20:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716891638; 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=o83YnrGjtl11a4bV+pcZbhYfvoPK9awKt538m0f9uDw=; b=Pk7OLFEoq1ajhLgnKFwKsUNEnSo7johWb/7YGpgWxCcT6jYtmBwpUhSUcgvY40Qp2Pt6mG f36Pi71SYEEuqmTSPfsdnpq5Psds4KikhrEVp847eFaQY6XivUKdAedmEiO8+XDZo8lb17 TtnEar9Xse5LmIMjin7qHSK4MSoZxhLu8q2VqdgvC5ANa0+Uju1d7y+CeLdD7l8WsdGQQ5 4Q7yZo+zEPf4H1bR18mOJbBF/nfxcWHcxJnmDBSHjgTJVT80XN7Gu3+BR91AP8CCLrVO2B 1PMrz0emuFls09sAP+4FRcKZjv/qwTLXT+wsGAmnoY576ZeUADxdQgDuIS3b/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716891638; a=rsa-sha256; cv=none; b=LmUyADu1CJFu9Xos+zAtqQ8TIxzHt/E8Fx79zOSJsS/fQ1b7IeYU2cGTi8QJVSGZAZsEoT wGULugH7wWN1jr1OpIOhR1T7j1k8Fh006jyvK2L3pcPFZi7iM0GkaHJZpD+UW2JUYnKsex ybubrIlJj8HxiULCIvkYg40KyKPuMcPYrM/b7iFly2Fn38K+znS50zW2tdc+1zKQY8SwGB +p0cGguAMoR0KIWyfFsLDeBqeFuXGYYoCCjTYu8MUeszhuT5DysPLG7dWekPOXyaWETP4w W/HjMFegQreiiZm7MNdHUuS+rnJ4IBMM/Mhq4o8BOhESNF+Q7Q24DMTVYmfe6g== 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=1716891638; 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=o83YnrGjtl11a4bV+pcZbhYfvoPK9awKt538m0f9uDw=; b=gpBoijXcz7qlNLFRZPEBHwRmG6JRmS2QhzzaQor0odw3lJMhPlcMMSUsJoWYxV+QZi+Gka /Ce3qN6+xGbqlWkmymw13F3VCAe6DmBzcNt3j9sV8ckZVmOnWecFJtgNxppA/HdUeH7dF4 V34SmaRF/owAXex3p7/vLsNfvVPgqre7yPLl7FGzGiu70AxQkPisJ9xzQp7NcGTdJyMQao ICArNxvE8vX2jBwuMLdpqWLGbdmopHNYhiMjXyYI0uTRepMELIe27yXysfi1nmFRHW/ouW 109l5+jPSH/lOpliwiHaA16eodA9PF5e0+7wWfOjJP8Tlk9iOtqtL2lScwjlOw== 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 4VpT6t0rTGz1NJW; Tue, 28 May 2024 10:20:38 +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 44SAKcmA020811; Tue, 28 May 2024 10:20:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44SAKcPP020808; Tue, 28 May 2024 10:20:38 GMT (envelope-from git) Date: Tue, 28 May 2024 10:20:38 GMT Message-Id: <202405281020.44SAKcPP020808@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Matthew Seaman Subject: git: 4354163e5fe8 - main - Don't package /var/db/locate.database 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: matthew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4354163e5fe8e180f62b892cdc3e51e3d7e4706f Auto-Submitted: auto-generated The branch main has been updated by matthew: URL: https://cgit.FreeBSD.org/src/commit/?id=4354163e5fe8e180f62b892cdc3e51e3d7e4706f commit 4354163e5fe8e180f62b892cdc3e51e3d7e4706f Author: Matthew Seaman AuthorDate: 2024-05-27 08:14:15 +0000 Commit: Matthew Seaman CommitDate: 2024-05-28 10:20:07 +0000 Don't package /var/db/locate.database ... or install an empty file. The locate database is a mutable working file, and unsuitable to be managed by pkg(8). locate(1) copes gracefully with the absence of this file. Running /etc/periodic/weekly/310.locate will create the locate database with the correct ownership and permissions. Having the locate.database file as part of the FreeBSD-runtime package means it gets zeroed if ever that package gets updated, which is excessive, given that updating packages will typically only change a relatively small number of the _filenames_ on the system -- unlike the file contents. Plus it always causes it to flag as modified when verifying checksums, but /var/db/locate.database is expected to be modified by the user. MFC after: 1 week Reviewed by: manu Differential Revision: https://reviews.freebsd.org/D45384 --- etc/Makefile | 4 ---- 1 file changed, 4 deletions(-) diff --git a/etc/Makefile b/etc/Makefile index 848176fef914..f2b37fb02817 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -88,10 +88,6 @@ distribution: .if ${MK_SENDMAIL} != "no" cd ${.CURDIR}/mail; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ -T "package=sendmail" ${ETCMAIL_SENDMAIL} ${DESTDIR}/etc/mail -.endif -.if ${MK_LOCATE} != "no" - ${INSTALL} -o nobody -g ${BINGRP} -m 644 -T "package=runtime"\ - /dev/null ${DESTDIR}/var/db/locate.database .endif cd ${.CURDIR}/..; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \ -T "package=runtime" ${FREEBSD} ${DESTDIR}/