From nobody Tue May 23 06:06:53 2023 X-Original-To: freebsd-current@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 4QQP3R2dXgz4T6H6 for ; Tue, 23 May 2023 06:06:59 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-pf1-x434.google.com (mail-pf1-x434.google.com [IPv6:2607:f8b0:4864:20::434]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QQP3Q0ghPz43rq for ; Tue, 23 May 2023 06:06:58 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20221208 header.b=Ok04AhVR; spf=pass (mx1.freebsd.org: domain of yaneurabeya@gmail.com designates 2607:f8b0:4864:20::434 as permitted sender) smtp.mailfrom=yaneurabeya@gmail.com; dmarc=pass (policy=none) header.from=gmail.com Received: by mail-pf1-x434.google.com with SMTP id d2e1a72fcca58-64a9335a8e7so3018718b3a.0 for ; Mon, 22 May 2023 23:06:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684822015; x=1687414015; h=references:to:cc:in-reply-to:date:subject:mime-version:message-id :from:from:to:cc:subject:date:message-id:reply-to; bh=fAwQj+KB1GmOrO/uyG1HYiqVYAFHZVaMhPnnZZUIDco=; b=Ok04AhVRfuZQFQdNnlTxG+8TeaXL4IHPx+ieLW89WjIWAoPP7F1UcxS7/zt9Ec4oyG A+C5iT+LFDoI5WPNhwWQU3ZIb8OT+wo/neW7w50vqmwjw//s7SMCHcecl67AhoTMROT1 OyyQC7+OOs5YJ/L3bhLIILjcHmyp8veXU3hYrr7jbPHMrmUKZzqvkTYzZpaXXQ+1CGhL FqUqOL3+QjzGpGxdSrN9DCaf+BimIMFPGvGaP7pF7yQaVISICGOWAK2K90WDFXIUzB8U ympWJSspfUcHDAFsQeQTXFCkkVF/cK4CHDKc+byuKbQ/tc8DK1VgnPeSE62h3nN8sx5q OhGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684822015; x=1687414015; h=references:to:cc:in-reply-to:date:subject:mime-version:message-id :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=fAwQj+KB1GmOrO/uyG1HYiqVYAFHZVaMhPnnZZUIDco=; b=ZHRUzAcGnxZxVK9mLYzVLMIXbA68S8C1HNN2XmF5xWqrMUoJnFHOtd19kCYRpd8ZNu yo7PoPiIuakvraafqHDr/tujYxjeL66/zIgDQO2+rmiMZX6/AchRjZJrApHfQ0SaRU/D fzY81DVZeeOAW2pPWHV3rhrfv3oxZIlEFk2rXR09BxyyXDVsdJAkXuqJcrTFvdCv8CeZ vwwoJkBV/hJSRTp7iF02oQU8C2CdVGaW+5+VKnekj2BYSmIpodnXGpMlRquiArsmEeG6 fyKx1/6/lAePLFBRIO7AOZoWfU4aU/T58udCyjMJSV1oXJXzqUgYHEEIeynL9OH6Edum RfFg== X-Gm-Message-State: AC+VfDyag68xIdRvS/K2x1R1PH8HCejDAAm0X3UAFpLaV/G31agnSMSC tQP0FS6JaLtlOnj5VkvgwDVZtZoKhc7KnQ== X-Google-Smtp-Source: ACHHUZ5gbRgafKPH7lbhoz0p1W7ukqEf/FGMUtrGQtm8x+LxK01Gip45uG51zNEXH7527iIEqg7/vw== X-Received: by 2002:a17:902:da92:b0:1ac:94b3:3ab4 with SMTP id j18-20020a170902da9200b001ac94b33ab4mr18088956plx.27.1684822015264; Mon, 22 May 2023 23:06:55 -0700 (PDT) Received: from smtpclient.apple (c-73-19-52-228.hsd1.wa.comcast.net. [73.19.52.228]) by smtp.gmail.com with ESMTPSA id je3-20020a170903264300b001a9581d3ef5sm5894793plb.97.2023.05.22.23.06.54 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 May 2023 23:06:54 -0700 (PDT) From: Enji Cooper Message-Id: Content-Type: multipart/signed; boundary="Apple-Mail=_9248556B-B6EB-43DF-997E-D359F5765F66"; protocol="application/pgp-signature"; micalg=pgp-sha256 List-Id: Discussions about the use of FreeBSD-current List-Archive: https://lists.freebsd.org/archives/freebsd-current List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-current@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3696.120.41.1.3\)) Subject: Re: MOTD is not created correctly (since 2022/02/18) Date: Mon, 22 May 2023 23:06:53 -0700 In-Reply-To: <1FA0E3FF-9DF6-46BA-81C1-4DCE5542CAD5@gmail.com> Cc: freebsd-current@freebsd.org To: Jamie Landeg-Jones References: <202305230318.34N3IOaX056503@donotpassgo.dyslexicfish.net> <1FA0E3FF-9DF6-46BA-81C1-4DCE5542CAD5@gmail.com> X-Mailer: Apple Mail (2.3696.120.41.1.3) X-Spamd-Result: default: False [-5.51 / 15.00]; SIGNED_PGP(-2.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.91)[-0.911]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; MV_CASE(0.50)[]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36:c]; MIME_GOOD(-0.20)[multipart/signed,multipart/alternative,text/plain]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20221208]; ARC_NA(0.00)[]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_HAS_DN(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[freebsd-current@freebsd.org]; RCVD_TLS_LAST(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::434:from]; HAS_ATTACHMENT(0.00)[]; FREEMAIL_FROM(0.00)[gmail.com]; TO_DN_SOME(0.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; RCVD_COUNT_THREE(0.00)[3]; RCPT_COUNT_TWO(0.00)[2]; DKIM_TRACE(0.00)[gmail.com:+]; MIME_TRACE(0.00)[0:+,1:+,2:+,3:~,4:~]; FROM_EQ_ENVFROM(0.00)[]; MLMMJ_DEST(0.00)[freebsd-current@freebsd.org] X-Rspamd-Queue-Id: 4QQP3Q0ghPz43rq X-Spamd-Bar: ----- X-ThisMailContainsUnwantedMimeParts: N --Apple-Mail=_9248556B-B6EB-43DF-997E-D359F5765F66 Content-Type: multipart/alternative; boundary="Apple-Mail=_2552AE10-6A8D-4B1A-8C25-3D92120C927E" --Apple-Mail=_2552AE10-6A8D-4B1A-8C25-3D92120C927E Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 > On May 22, 2023, at 11:06 PM, Enji Cooper = wrote: >=20 >>=20 >> On May 22, 2023, at 8:18 PM, Jamie Landeg-Jones = wrote: >>=20 >> I've just finally updated to 13-stable, and can't be the first to = notice this?! >>=20 >> /etc/rc.d/motd contains the line: >>=20 >> uname -v | sed -e 's,^\([^#]*\) #\(.* = [1-2][0-9][0-9][0-9]\).*/\([^\]*\) $,\1 (\3) #\2,' >>=20 >> Note the space before the "$" - needed because the uname -v output = used >> to have a trailing space. This was fixed and comitted on 2022/02/18: >>=20 >> = https://cgit.freebsd.org/src/commit/usr.bin/uname/uname.c?id=3D7e05fa3b449= 007adaa6e588ebb3b8d76f30b355c >>=20 >> Since then, the sed doesn't match, so the uname(1) output is = unchanged. >>=20 >> There's no point altering the sed to work with both posibilities, so = can >> someone commit the fix of removing the ' ' before the '$' in = /etc/rc.d/motd ? >=20 > Hi Jamie, > Thank you for the note =E2=80=94 could you please file a PR and = reference it in a reply? Ah, never mind. I see that it=E2=80=99s been fixed recently on main. -Enji --Apple-Mail=_2552AE10-6A8D-4B1A-8C25-3D92120C927E Content-Transfer-Encoding: quoted-printable Content-Type: text/html; charset=utf-8

On May 22, 2023, at 11:06 PM, Enji Cooper <yaneurabeya@gmail.com> wrote:


On May 22, 2023, at 8:18 PM, Jamie = Landeg-Jones <jamie@catflap.org> wrote:

I've just finally updated to 13-stable, and can't be the = first to notice this?!

/etc/rc.d/motd = contains the line:

uname -v | sed -e = 's,^\([^#]*\) #\(.* [1-2][0-9][0-9][0-9]\).*/\([^\]*\) $,\1 (\3) = #\2,'

Note the space before the "$" - = needed because the uname -v output used
to have a trailing = space. This was fixed and comitted on 2022/02/18:

https://cgit.freebsd.org/src/commit/usr.bin/uname/uname.c?id=3D= 7e05fa3b449007adaa6e588ebb3b8d76f30b355c

Since then, the sed doesn't match, so the uname(1) output is = unchanged.

There's no point altering the = sed to work with both posibilities, so can
someone commit = the fix of removing the ' ' before the '$' in /etc/rc.d/motd ?

Hi Jamie,
= Thank you for = the note =E2=80=94 could you please file a PR and reference it in a = reply?

Ah, never mind. I see that it=E2=80=99s been fixed = recently on main.
-Enji
= --Apple-Mail=_2552AE10-6A8D-4B1A-8C25-3D92120C927E-- --Apple-Mail=_9248556B-B6EB-43DF-997E-D359F5765F66 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEtvtxN6kOllEF3nmX5JFNMZeDGN4FAmRsV/0ACgkQ5JFNMZeD GN4o2xAAiQNac3RUOM/JYASafen9TgXRhS6JmTPYL3EdQrUiaMcRk/l5TQos5PYq mOcJsw05XTviPrSgL6z/44SGbYcsvv5QM8qB2P5mpHqVOV1eT16Jxyo6sha+QGlP oF5p1cRblJsfFX55Iml8uIBlmCpzmAt7OSXaEHfQLfhaNDiN4YSXoSSO5DQLzCoT 4b7BwRP2AQqWDnJTdbqcMnsQWMvO3ZjVj2wgnj9Fl955BiwZaTtCQpoqxelBALTa dhk5Mn4DOwWplqz8ADZxH5Kd1UpgQLb1AoNBvxFdoTUKVc9kZV9S90YMPpxJL3i9 sr99n8DrVzk7t9PB3GJQVwvRWlEy562w60SYZmCq0wRqscsJxiur5vNBNT0vZsM0 Q9QYjEiidTUQlYnpoowRH11TNbu70nzlsoUXAfxmCG/TI8YjtlRnBt1EVt2Q+4wu XofpAeN2cmmY5c7Zwm1rZT75kRot+to3XzB/TNQjtijCZuxHKRmyp0VVLazGDr3C W0YlcQ92jYx73Z8EqmRgF7jeF+GjHNui2z391kPj9RJrTvp70MGhY+jwB4ATCxNO zKiUsXG9FeLnUbWOwFvbrS9OdwzM7514EARV5pz6Xq1VOU6J4rMrpfBy8v26w/uV /YrZ/bVwbDh2MK+/2/gOLt+EYxHhh5kgXYUdGJJz2mbGWt1PMGw= =ELQ+ -----END PGP SIGNATURE----- --Apple-Mail=_9248556B-B6EB-43DF-997E-D359F5765F66--