From nobody Tue Oct 3 22:14:09 2023 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 4S0XD16CTxz4w4F9; Tue, 3 Oct 2023 22:14:09 +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 4S0XD15MBbz4s7F; Tue, 3 Oct 2023 22:14:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696371249; 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=HDS74KMeLxvXnPYvZ/7X8C/1pnB2QK+YnREtvtRhHV0=; b=rUBbV1BkeKJlFVVZQn3vQgIbykkdomGFWcwrXVVlEGkPaUFeLy3IYKE5FeZhzhDk4Q1YrF CL/sALYxwbBKYM2uT2BX+Arulrb+vgr8Sfun9/72aM4maVnNSwLOjsv3UN3tbQTM6BNclH IIw/2Te//ru5jAVtMHl8C66Hqs519BnXCaS1r3uLcPtWHkmECST3mxRi7nNtF4Q0HT2lEi iGpPgt21a6mezYG2GbCil0nV9J3PbTlf9AYF0mAbeIr8HN8+EVL/PKmdrPPkrqzCtnjGnZ 3rRkKZ8eBHDxpSk2WYZNNWdM4uE0JeqRpfLY/2c6AOvnl9Zr1TktLCKeW7V4Aw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696371249; a=rsa-sha256; cv=none; b=AORZn1A3FZyW0inzxF46bMJWgVfnhF3pHV9TUZ/vc58b2Y0x4AfrivVKU7pqYmAN3XybRY vO2B/SGuHb+sz4+Vm/gR2vZ23KOB2uRuL8mUtaqHMqhUYLpDL83YEbqMNy9Lpu/6xaQrPL jpWTWUKrNJyxFfkmBXEk3lOVEkE6I5tidV1xqUlE0+kbaOgQvjWh/p5E5i9pNSITRMPbT9 94GhLS3TThk3nKoctbpRG3zJ/Xp2qvUG5l9PRNIJAmsNq92KSfHPs/K6WWkF/bNFpu8pvt UZYJNNF9X3Gm9ES8Num2UhmawwMabNocP53k0yD/R9A4NT/uHHz64x+0BntlhQ== 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=1696371249; 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=HDS74KMeLxvXnPYvZ/7X8C/1pnB2QK+YnREtvtRhHV0=; b=RpG4iatoOP6xgdvJDZzv377x9TcZ3yv90jrvCloWnWN4HXqsDuSkEXP0kTz1S5sUByXkhH +F7d9tcUkMgGLOs0gIJHf9LL0UeWS0knYwc6WigjTpOMOIVec45dzcTcX+L/NOLn+kwhrj 2JMXXsldPDCDkzqdOsZrS8j1q69pg7zxE9OQFDQ4N3M/Ywx82eCLJZMEesJzJOXaoGR16/ A1JX7FtCvCMrXoXrC/vWJrZx8W7LzmKLGD3vCIUVImlivef2zRpwpk2wxF/xhkZX+O3/fV x2c6m7RuAZyCSMS/35p7hKizp37BTOoMm4JzVRRNT5a/8SdIAB6yAs2pYHlGIA== 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 4S0XD14Rt3z1BrC; Tue, 3 Oct 2023 22:14:09 +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 393ME9So071326; Tue, 3 Oct 2023 22:14:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 393ME9dY071323; Tue, 3 Oct 2023 22:14:09 GMT (envelope-from git) Date: Tue, 3 Oct 2023 22:14:09 GMT Message-Id: <202310032214.393ME9dY071323@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Tetlow Subject: git: 193b7e3d0af5 - releng/12.4 - freebsd-update: Fix merging already-updated files 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gordon X-Git-Repository: src X-Git-Refname: refs/heads/releng/12.4 X-Git-Reftype: branch X-Git-Commit: 193b7e3d0af5205f770c30620711889eff324ae8 Auto-Submitted: auto-generated The branch releng/12.4 has been updated by gordon: URL: https://cgit.FreeBSD.org/src/commit/?id=193b7e3d0af5205f770c30620711889eff324ae8 commit 193b7e3d0af5205f770c30620711889eff324ae8 Author: Colin Percival AuthorDate: 2023-05-05 03:00:58 +0000 Commit: Gordon Tetlow CommitDate: 2023-10-03 21:08:36 +0000 freebsd-update: Fix merging already-updated files When performing an "upgrade" (moving between FreeBSD releases, as opposed to "update" which merely applies security/errata updates to the installed release) FreeBSD Update: 1. Generates a list of "files needing to be merged", namely those files which don't match the version installed in the "old" release and have paths matching the MergeChanges configuration directive (by default, /boot/device.hints and everything under /etc/). and later on, 2. Compares the currently-installed files to the versions in the "new" release, removing index entries for files which "don't need to be updated because they're not changing". Unfortunately if a file falls into both of these categories -- that is to say, if a file in /etc/ is the same as the version in the new release and not the same as the version in the old release -- the resulting "merge" step saw that the file was no longer listed as being part of the new release, resulting in the file being deleted. For the first 18 years of FreeBSD Update's existence, this never happened, since $FreeBSD$ tags resulted in "new release" files always being different from any files systems would already have installed. This commit fixes this behaviour by only placing a file into the "files needing to be merged" list if it does not match the version in the old release *or* the version in the new release. Reported by: des Reviewed by: delphij (earlier version), des, emaste Approved by: so Security: FreeBSD-EN-23:09.freebsd-update Differential Revision: https://reviews.freebsd.org/D39973 (cherry picked from commit c55b7e522629cb78adeb54bd9964304481d55eab) (cherry picked from commit 5f446a12dac2a8be8a1b4fc53a383d18896df611) --- usr.sbin/freebsd-update/freebsd-update.sh | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/usr.sbin/freebsd-update/freebsd-update.sh b/usr.sbin/freebsd-update/freebsd-update.sh index 9743cd652d16..57d94a25881a 100644 --- a/usr.sbin/freebsd-update/freebsd-update.sh +++ b/usr.sbin/freebsd-update/freebsd-update.sh @@ -1677,11 +1677,12 @@ fetch_inspect_system () { echo "done." } -# For any paths matching ${MERGECHANGES}, compare $1 and $2 and find any -# files which differ; generate $3 containing these paths and the old hashes. +# For any paths matching ${MERGECHANGES}, compare $2 against $1 and $3 and +# find any files with values unique to $2; generate $4 containing these paths +# and their corresponding hashes from $1. fetch_filter_mergechanges () { # Pull out the paths and hashes of the files matching ${MERGECHANGES}. - for F in $1 $2; do + for F in $1 $2 $3; do for X in ${MERGECHANGES}; do grep -E "^${X}" ${F} done | @@ -1689,9 +1690,10 @@ fetch_filter_mergechanges () { sort > ${F}-values done - # Any line in $2-values which doesn't appear in $1-values and is a - # file means that we should list the path in $3. - comm -13 $1-values $2-values | + # Any line in $2-values which doesn't appear in $1-values or $3-values + # and is a file means that we should list the path in $3. + sort $1-values $3-values | + comm -13 - $2-values | fgrep '|f|' | cut -f 1 -d '|' > $2-paths @@ -1703,10 +1705,10 @@ fetch_filter_mergechanges () { while read X; do look "${X}|" $1-values | head -1 - done < $2-paths > $3 + done < $2-paths > $4 # Clean up - rm $1-values $2-values $2-paths + rm $1-values $2-values $3-values $2-paths } # For any paths matching ${UPDATEIFUNMODIFIED}, remove lines from $[123] @@ -2698,7 +2700,7 @@ upgrade_run () { # Based on ${MERGECHANGES}, generate a file tomerge-old with the # paths and hashes of old versions of files to merge. - fetch_filter_mergechanges INDEX-OLD INDEX-PRESENT tomerge-old + fetch_filter_mergechanges INDEX-OLD INDEX-PRESENT INDEX-NEW tomerge-old # Based on ${UPDATEIFUNMODIFIED}, remove lines from INDEX-* which # correspond to lines in INDEX-PRESENT with hashes not appearing