From nobody Wed Oct 04 02:13:51 2023 X-Original-To: freebsd-stable@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 4S0dXf3Yf7z4wQRZ for ; Wed, 4 Oct 2023 02:13:54 +0000 (UTC) (envelope-from monochrome@twcny.rr.com) Received: from p-impout001.msg.pkvw.co.charter.net (p-impout010aa.msg.pkvw.co.charter.net [47.43.26.141]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S0dXd5zjPz4gJQ for ; Wed, 4 Oct 2023 02:13:53 +0000 (UTC) (envelope-from monochrome@twcny.rr.com) Authentication-Results: mx1.freebsd.org; none Received: from [192.168.3.3] ([45.47.33.66]) by cmsmtp with ESMTP id nrOZqnsOZFdXFnrOZqJqnk; Wed, 04 Oct 2023 02:13:52 +0000 X-Authority-Analysis: v=2.4 cv=Ap39YcxP c=1 sm=1 tr=0 ts=651cca60 a=0w5A2dmu08iCZsbkmUyUaQ==:117 a=0w5A2dmu08iCZsbkmUyUaQ==:17 a=r77TgQKjGQsHNAKrUKIA:9 a=6I5d2MoRAAAA:8 a=WMHyOQ9UX6_Y_BaFkEAA:9 a=QEXdDO2ut3YA:10 a=m4vhytmeETAA:10 a=CpdSp6Bn4HcA:10 a=ayC55rCoAAAA:8 a=AO2IFpjaKTJgiPS9C7kA:9 a=oihMQpoKpHomih6J:21 a=_W_S_7VecoQA:10 a=lqcHg5cX4UMA:10 a=5vqMiQPO1cogrVY4-KUA:9 a=T6a71-JsGAwA:10 a=WaXprnUgR1lZEA89JHoA:9 a=IjZwj45LgO3ly-622nXo:22 Content-Type: multipart/alternative; boundary="------------Uen9B3VChif112SHEUvlomsA" Message-ID: Date: Tue, 3 Oct 2023 22:13:51 -0400 List-Id: Production branch of FreeBSD source code List-Archive: https://lists.freebsd.org/archives/freebsd-stable List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-stable@freebsd.org X-BeenThere: freebsd-stable@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: FreeBSD Errata Notice FreeBSD-EN-23:09.freebsd-update [REVISED] Content-Language: en-US To: freebsd-stable@freebsd.org References: <20231003230335.0B92113333@freefall.freebsd.org> From: monochrome In-Reply-To: <20231003230335.0B92113333@freefall.freebsd.org> X-CMAE-Envelope: MS4xfFaarviBANgBH3i89yAQnvF2GZoyNFThfLQG3a6GPg+/9yWqNBE9CFVXkV5gVIuva1NruO+Js42dCW6nIoH4D10yshuLvo9wnPJ/c9Tc6J6rCx1I3El6 UfeTQ5TCy1ja0T8eiX+rlI0q8jfYxFHr/R64arSw1EYmtW8d8RYZMYnQD8YxqeWu2a0dQuCvywnUzVKKrm02Mw9i1Q4gvOROgYI= X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:40294, ipnet:47.43.24.0/21, country:US] X-Rspamd-Queue-Id: 4S0dXd5zjPz4gJQ 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 > . > > 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 . > > 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 > > Or visit the following URL, replacing NNNNNN with the hash: > > > > 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: > > > > VII. References > > > > The latest revision of this advisory is available at > > --------------Uen9B3VChif112SHEUvlomsA Content-Type: multipart/related; boundary="------------N16B4OKj07ZqDI08tQa0Txw3" --------------N16B4OKj07ZqDI08tQa0Txw3 Content-Type: text/html; charset=UTF-8 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>
>
--------------N16B4OKj07ZqDI08tQa0Txw3 Content-Type: image/png; name="ecRV9YIelkR0MQGe.png" Content-Disposition: inline; filename="ecRV9YIelkR0MQGe.png" Content-Id: Content-Transfer-Encoding: base64 VGhlIGZvbGxvd2luZyBmaWxlcyBhcmUgYWZmZWN0ZWQgYnkgdXBkYXRlcy4gTm8gY2hhbmdl cyBoYXZlCmJlZW4gZG93bmxvYWRlZCwgaG93ZXZlciwgYmVjYXVzZSB0aGUgZmlsZXMgaGF2 ZSBiZWVuIG1vZGlmaWVkCmxvY2FsbHk6Ci9ldGMvc3NoL3NzaGRfY29uZmlnCg== --------------N16B4OKj07ZqDI08tQa0Txw3 Content-Type: image/png; name="cDK2pd07H0DkdvFY.png" Content-Disposition: inline; filename="cDK2pd07H0DkdvFY.png" Content-Id: Content-Transfer-Encoding: base64 RnJlZUJTRCBxdWFydHpvbiAxMy4yLVJFTEVBU0UtcDQgRnJlZUJTRCAxMy4yLVJFTEVBU0Ut cDQgR0VORVJJQyBhbWQ2NAo= --------------N16B4OKj07ZqDI08tQa0Txw3-- --------------Uen9B3VChif112SHEUvlomsA--