Date: Tue, 3 Oct 2023 22:13:51 -0400 From: monochrome <monochrome@twcny.rr.com> To: freebsd-stable@freebsd.org Subject: Re: FreeBSD Errata Notice FreeBSD-EN-23:09.freebsd-update [REVISED] Message-ID: <aaabb189-b0df-4bd2-94d2-12d407b080b1@twcny.rr.com> In-Reply-To: <20231003230335.0B92113333@freefall.freebsd.org> References: <20231003230335.0B92113333@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format. --------------Uen9B3VChif112SHEUvlomsA Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit not sure if this is related or appropriate here, but for the last 2 or 3 updates freebsd-update has been hanging on this: The following files are affected by updates. No changes have been downloaded, however, because the files have been modified locally: /etc/ssh/sshd_config a minor annoyance, but is this the new normal? this file will obviously be changed on most systems, why do I seem like the only one with this problem? as of today its still doing it: FreeBSD quartzon 13.2-RELEASE-p4 FreeBSD 13.2-RELEASE-p4 GENERIC amd64 On 10/3/23 19:03, FreeBSD Errata Notices wrote: > ============================================================================= > FreeBSD-EN-23:09.freebsd-update Errata Notice > The FreeBSD > Project > > Topic: freebsd-update incorrectly merges files on upgrade > > Category: core > Module: freebsd-update > Announced: 2023-09-06 > Affects: FreeBSD 13.2 > Corrected: 2023-05-16 21:34:10 UTC (stable/13, 13.2-STABLE) > 2023-09-06 16:56:24 UTC (releng/13.2, 13.2-RELEASE-p3) > 2023-09-28 13:42:18 UTC (stable/12, 12.4-STABLE) > 2023-10-03 22:15:35 UTC (releng/12.4, 12.4-RELEASE-p6) > > For general information regarding FreeBSD Errata Notices and Security > Advisories, including descriptions of the fields above, security > branches, and the following sections, please visit > <URL:https://security.FreeBSD.org/>. > > 2023-09-06 Initial Revision > 2023-10-03 Updated to include the patch for 12.4-RELEASE. > > I. Background > > freebsd-update provides binary updates for supported releases of > FreeBSD on > amd64, arm64, and i386. > > II. Problem Description > > freebsd-update incorrectly deleted files in /etc/ in the event the > file to be > updated matched the new release and was different than the old > release. This > has not been an issue previously because the $FreeBSD$ tag expansion from > subversion virtually guaranteed the existing file was going to be > different > from the new release. With the conversion to git in the 13.x releases, > $FreeBSD$ is no longer expanded, making it much more likely that a > file would > find this issue. > > III. Impact > > Unmodified files in /etc/ may be deleted on running freebsd-update > upgrade. > > IV. Workaround > > No workaround is available. > > V. Solution > > Upgrade your system to a supported FreeBSD stable or release / security > branch (releng) dated after the correction date. > > Perform one of the following: > > 1) To update your system via a binary patch: > > Systems running a RELEASE version of FreeBSD on the amd64, i386, or > (on FreeBSD 13 and later) arm64 platforms can be updated via the > freebsd-update(8) utility: > > # freebsd-update fetch > # freebsd-update install > > 2) To update your system via a source code patch: > > The following patches have been verified to apply to the applicable > FreeBSD release branches. > > a) Download the relevant patch from the location below, and verify the > detached PGP signature using your PGP utility. > > # fetch https://security.FreeBSD.org/patches/EN-23:09/freebsd-update.patch > # fetch > https://security.FreeBSD.org/patches/EN-23:09/freebsd-update.patch.asc > # gpg --verify freebsd-update.patch.asc > > b) Apply the patch. Execute the following commands as root: > > # cd /usr/src > # patch < /path/to/patch > > c) Recompile the operating system using buildworld and installworld as > described in <URL:https://www.FreeBSD.org/handbook/makeworld.html>. > > VI. Correction details > > This issue is corrected by the corresponding Git commit hash or Subversion > revision number in the following stable and release branches: > > Branch/path Hash Revision > ------------------------------------------------------------------------- > stable/13/ 866e5c6b3ce7 stable/13-n255386 > releng/13.2/ 0b39d9de2e71 releng/13.2-n254628 > stable/12/ r373221 > releng/12.4/ r373231 > ------------------------------------------------------------------------- > > For FreeBSD 13 and later: > > Run the following command to see which files were modified by a > particular commit: > > # git show --stat <commit hash> > > Or visit the following URL, replacing NNNNNN with the hash: > > <URL:https://cgit.freebsd.org/src/commit/?id=NNNNNN>; > > To determine the commit count in a working tree (for comparison against > nNNNNNN in the table above), run: > > # git rev-list --count --first-parent HEAD > > For FreeBSD 12 and earlier: > > Run the following command to see which files were modified by a particular > revision, replacing NNNNNN with the revision number: > > # svn diff -cNNNNNN --summarize svn://svn.freebsd.org/base > > Or visit the following URL, replacing NNNNNN with the revision number: > > <URL:https://svnweb.freebsd.org/base?view=revision&revision=NNNNNN>; > > VII. References > > <URL:https://reviews.freebsd.org/D39973>; > > The latest revision of this advisory is available at > <URL:https://security.FreeBSD.org/advisories/FreeBSD-EN-23:09.freebsd-update.asc>; > --------------Uen9B3VChif112SHEUvlomsA Content-Type: multipart/related; boundary="------------N16B4OKj07ZqDI08tQa0Txw3" --------------N16B4OKj07ZqDI08tQa0Txw3 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: 8bit <!DOCTYPE html> <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> </head> <body> <p>not sure if this is related or appropriate here, but for the last 2 or 3 updates freebsd-update has been hanging on this:</p> <p>The following files are affected by updates. No changes have<br> been downloaded, however, because the files have been modified<br> locally:<br> /etc/ssh/sshd_config</p> <p><br> </p> <p>a minor annoyance, but is this the new normal?<img src="cid:part1.Y6ikkSBw.l4ogKRvb@twcny.rr.com" alt=""> this file will obviously be changed on most systems, why do I seem like the only one with this problem?</p> <p><img src="cid:part2.4orTk5Q0.0Iuzfk5b@twcny.rr.com" alt=""></p> <p>as of today its still doing it: FreeBSD quartzon 13.2-RELEASE-p4 FreeBSD 13.2-RELEASE-p4 GENERIC amd64<br> <br> </p> On 10/3/23 19:03, FreeBSD Errata Notices wrote:<br> <blockquote type="cite">=============================================================================<br> FreeBSD-EN-23:09.freebsd-update Errata Notice<br> The FreeBSD Project<br> <br> Topic: freebsd-update incorrectly merges files on upgrade<br> <br> Category: core<br> Module: freebsd-update<br> Announced: 2023-09-06<br> Affects: FreeBSD 13.2<br> Corrected: 2023-05-16 21:34:10 UTC (stable/13, 13.2-STABLE)<br> 2023-09-06 16:56:24 UTC (releng/13.2, 13.2-RELEASE-p3)<br> 2023-09-28 13:42:18 UTC (stable/12, 12.4-STABLE)<br> 2023-10-03 22:15:35 UTC (releng/12.4, 12.4-RELEASE-p6)<br> <br> For general information regarding FreeBSD Errata Notices and Security<br> Advisories, including descriptions of the fields above, security<br> branches, and the following sections, please visit<br> <a class="moz-txt-link-rfc1738" href="https://security.FreeBSD.org/"><URL:https://security.FreeBSD.org/></a>.<br>; <br> 2023-09-06 Initial Revision<br> 2023-10-03 Updated to include the patch for 12.4-RELEASE.<br> <br> I. Background<br> <br> freebsd-update provides binary updates for supported releases of FreeBSD on<br> amd64, arm64, and i386.<br> <br> II. Problem Description<br> <br> freebsd-update incorrectly deleted files in /etc/ in the event the file to be<br> updated matched the new release and was different than the old release. This<br> has not been an issue previously because the $FreeBSD$ tag expansion from<br> subversion virtually guaranteed the existing file was going to be different<br> from the new release. With the conversion to git in the 13.x releases,<br> $FreeBSD$ is no longer expanded, making it much more likely that a file would<br> find this issue.<br> <br> III. Impact<br> <br> Unmodified files in /etc/ may be deleted on running freebsd-update upgrade.<br> <br> IV. Workaround<br> <br> No workaround is available.<br> <br> V. Solution<br> <br> Upgrade your system to a supported FreeBSD stable or release / security<br> branch (releng) dated after the correction date.<br> <br> Perform one of the following:<br> <br> 1) To update your system via a binary patch:<br> <br> Systems running a RELEASE version of FreeBSD on the amd64, i386, or<br> (on FreeBSD 13 and later) arm64 platforms can be updated via the<br> freebsd-update(8) utility:<br> <br> # freebsd-update fetch<br> # freebsd-update install<br> <br> 2) To update your system via a source code patch:<br> <br> The following patches have been verified to apply to the applicable<br> FreeBSD release branches.<br> <br> a) Download the relevant patch from the location below, and verify the<br> detached PGP signature using your PGP utility.<br> <br> # fetch <a class="moz-txt-link-freetext" href="https://security.FreeBSD.org/patches/EN-23:09/freebsd-update.patch">https://security.FreeBSD.org/patches/EN-23:09/freebsd-update.patch</a><br>; # fetch <a class="moz-txt-link-freetext" href="https://security.FreeBSD.org/patches/EN-23:09/freebsd-update.patch.asc">https://security.FreeBSD.org/patches/EN-23:09/freebsd-update.patch.asc</a><br>; # gpg --verify freebsd-update.patch.asc<br> <br> b) Apply the patch. Execute the following commands as root:<br> <br> # cd /usr/src<br> # patch < /path/to/patch<br> <br> c) Recompile the operating system using buildworld and installworld as<br> described in <a class="moz-txt-link-rfc1738" href="https://www.FreeBSD.org/handbook/makeworld.html"><URL:https://www.FreeBSD.org/handbook/makeworld.html></a>.<br>; <br> VI. Correction details<br> <br> This issue is corrected by the corresponding Git commit hash or Subversion<br> revision number in the following stable and release branches:<br> <br> Branch/path Hash Revision<br> -------------------------------------------------------------------------<br> stable/13/ 866e5c6b3ce7 stable/13-n255386<br> releng/13.2/ 0b39d9de2e71 releng/13.2-n254628<br> stable/12/ r373221<br> releng/12.4/ r373231<br> -------------------------------------------------------------------------<br> <br> For FreeBSD 13 and later:<br> <br> Run the following command to see which files were modified by a<br> particular commit:<br> <br> # git show --stat <commit hash><br> <br> Or visit the following URL, replacing NNNNNN with the hash:<br> <br> <a class="moz-txt-link-rfc1738" href="https://cgit.freebsd.org/src/commit/?id=NNNNNN"><URL:https://cgit.freebsd.org/src/commit/?id=NNNNNN></a><br>; <br> To determine the commit count in a working tree (for comparison against<br> nNNNNNN in the table above), run:<br> <br> # git rev-list --count --first-parent HEAD<br> <br> For FreeBSD 12 and earlier:<br> <br> Run the following command to see which files were modified by a particular<br> revision, replacing NNNNNN with the revision number:<br> <br> # svn diff -cNNNNNN --summarize svn://svn.freebsd.org/base<br> <br> Or visit the following URL, replacing NNNNNN with the revision number:<br> <br> <a class="moz-txt-link-rfc1738" href="https://svnweb.freebsd.org/base?view=revision&revision=NNNNNN"><URL:https://svnweb.freebsd.org/base?view=revision&revision=NNNNNN></a><br>; <br> VII. References<br> <br> <a class="moz-txt-link-rfc1738" href="https://reviews.freebsd.org/D39973"><URL:https://reviews.freebsd.org/D39973></a><br>; <br> The latest revision of this advisory is available at<br> <a class="moz-txt-link-rfc1738" href="https://security.FreeBSD.org/advisories/FreeBSD-EN-23:09.freebsd-update.asc"><URL:https://security.FreeBSD.org/advisories/FreeBSD-EN-23:09.freebsd-update.asc></a><br>; </blockquote> <span style="white-space: pre-wrap; display: block; width: 98vw;">> </span><br> </body> </html> --------------N16B4OKj07ZqDI08tQa0Txw3 Content-Type: image/png; name="ecRV9YIelkR0MQGe.png" Content-Disposition: inline; filename="ecRV9YIelkR0MQGe.png" Content-Id: <part1.Y6ikkSBw.l4ogKRvb@twcny.rr.com> Content-Transfer-Encoding: base64 VGhlIGZvbGxvd2luZyBmaWxlcyBhcmUgYWZmZWN0ZWQgYnkgdXBkYXRlcy4gTm8gY2hhbmdl cyBoYXZlCmJlZW4gZG93bmxvYWRlZCwgaG93ZXZlciwgYmVjYXVzZSB0aGUgZmlsZXMgaGF2 ZSBiZWVuIG1vZGlmaWVkCmxvY2FsbHk6Ci9ldGMvc3NoL3NzaGRfY29uZmlnCg== --------------N16B4OKj07ZqDI08tQa0Txw3 Content-Type: image/png; name="cDK2pd07H0DkdvFY.png" Content-Disposition: inline; filename="cDK2pd07H0DkdvFY.png" Content-Id: <part2.4orTk5Q0.0Iuzfk5b@twcny.rr.com> Content-Transfer-Encoding: base64 RnJlZUJTRCBxdWFydHpvbiAxMy4yLVJFTEVBU0UtcDQgRnJlZUJTRCAxMy4yLVJFTEVBU0Ut cDQgR0VORVJJQyBhbWQ2NAo= --------------N16B4OKj07ZqDI08tQa0Txw3-- --------------Uen9B3VChif112SHEUvlomsA--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?aaabb189-b0df-4bd2-94d2-12d407b080b1>