From nobody Tue Jun 04 05:11: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 4Vtdx64dgzz5MMlp; Tue, 04 Jun 2024 05:11: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 4Vtdx646nPz4cqp; Tue, 4 Jun 2024 05:11:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717477898; 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=cLt76yiSctsiG59WRzlWmn2UjFXIWvKZetHgH3vBi3U=; b=AMgilRE9wJ5Sbgo+JK+jOdJmkFSSm+d2ToKF22IWspk5tcW+6pXjEXi0eXWLQBXJBC87Wa iTiD1rjqtushog0vkaW48mfpcuQgm7CnoRSJzAB/oecQ2wsEfpoD2o4GgZAmdJpjl8k6wq Yo08BWdn/ruZV+BnAYK6PDhlgyBrDaKez1ZFyOhXOBWThgBXgpA8gZ881y89NMcqy+EHGa Q2Ut7i4Ls9GpxeRL7L0ohdRbfV967LpiN4KYy2k110qOqn2W9xU0JWEDS9hLu6BzGdLI6h 2scsQFXR0kCoY55FeDdP5YcwIlGCVlrfSY15MWuRCsD2K+ElMH+NcB12FgcZEw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717477898; a=rsa-sha256; cv=none; b=aTXOZZEwlFzWUMe1cMNmvOPaSH7pYON57zcaeaEKVeYzoMuu1rOtlzX0ZDAL2Jhxjk0wHs WD0XwUf4TglmQupCOPHseDdl8ex00gqtyqW4e7vDNlAKWDFTem+Xe6D2NlA90+OFrXhX2V j6hAjbczqI1nVwztH53nUeK1XCr75AhVdTqEeIZwpQb1YpMh/iy0OkZtpRKw8BUkbtXa83 LxwygJWMDj2HcNQ35ih4hdpG6GWU7MPiw5hhwfc/eQr4DtsR0hpRrSH7nL3V3gUAAyHcDG sfffq7WriJVcZ4NWqrXcGv8CQb5l/hkZDTIZJ9F+M/L/AP8uJknj8Q+GP3+p8w== 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=1717477898; 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=cLt76yiSctsiG59WRzlWmn2UjFXIWvKZetHgH3vBi3U=; b=OHs6V+P1wE51frdSdv6Zzytcru/v1ty7N4IwOVP33nAYWIgqUAFXuTk3f2+w/OcdiYYXOL t5yYp9YmKwJdPoRbz0ouYbDgZYI75kKC41Wa79J4mEa7VQ2ofSiVpNBUoGxEE1txvuV8ho 20u+WfYqcxXvPsv9Z1Uy8xzTXVRVctHv7hSHaYuafrux58UUYi6JcWIr7js5aTFpsSfhvd EATTDqSkqNihn987RHJb151wU3+j4m4VtpSpfzmE/WZUOVVZTRHAuAl9Pj1Ot1WOR8jpLX BpJdIhuBL0EnNM8E4/bGzZMHORg6a9AKnQ/kTiggUOBniHjynoXOIIrIRuRW+g== 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 4Vtdx63hFdz15HP; Tue, 4 Jun 2024 05:11: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 4545BccS065101; Tue, 4 Jun 2024 05:11:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4545BcVW065098; Tue, 4 Jun 2024 05:11:38 GMT (envelope-from git) Date: Tue, 4 Jun 2024 05:11:38 GMT Message-Id: <202406040511.4545BcVW065098@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Matthew Seaman Subject: git: a30b941ea739 - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: a30b941ea73995e7a92bdc925b6267652a6b3ee2 Auto-Submitted: auto-generated The branch stable/13 has been updated by matthew: URL: https://cgit.FreeBSD.org/src/commit/?id=a30b941ea73995e7a92bdc925b6267652a6b3ee2 commit a30b941ea73995e7a92bdc925b6267652a6b3ee2 Author: Matthew Seaman AuthorDate: 2024-05-27 08:14:15 +0000 Commit: Matthew Seaman CommitDate: 2024-06-04 05:11:10 +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 (cherry picked from commit 4354163e5fe8e180f62b892cdc3e51e3d7e4706f) --- etc/Makefile | 4 ---- 1 file changed, 4 deletions(-) diff --git a/etc/Makefile b/etc/Makefile index 05632e8ce710..6d53b64a79eb 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -81,10 +81,6 @@ distribution: ${INSTALL_SYMLINK} -T "package=sendmail" \ mail/aliases ${DESTDIR}/etc/aliases; \ fi -.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}/