Date: Fri, 8 Aug 2025 15:39:55 -0700 From: "Enji Cooper (yaneurabeya)" <yaneurabeya@gmail.com> To: Pierre Pronchery <khorben@FreeBSD.org> Cc: "src-committers@freebsd.org" <src-committers@FreeBSD.org>, "dev-commits-src-all@freebsd.org" <dev-commits-src-all@FreeBSD.org>, "dev-commits-src-main@freebsd.org" <dev-commits-src-main@FreeBSD.org> Subject: Re: git: e7be843b4a16 - main - Merge commit '1095efe41feed8ea5a6fe5ca123c347ae0914801' Message-ID: <286324B9-1CDF-4D27-9F96-EABA1B9237ED@gmail.com> In-Reply-To: <BCA9AECD-F1B7-42F2-B2C4-AD52FE0AAC24@gmail.com> References: <202508081922.578JM3A0086462@gitrepo.freebsd.org> <BCA9AECD-F1B7-42F2-B2C4-AD52FE0AAC24@gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--Apple-Mail=_2BA6FA3C-070A-4A8D-AD32-610F3BF80E84 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 > On Aug 8, 2025, at 12:29=E2=80=AFPM, Enji Cooper (yaneurabeya) = <yaneurabeya@gmail.com> wrote: >=20 >=20 >> On Aug 8, 2025, at 12:22=E2=80=AFPM, Pierre Pronchery = <khorben@FreeBSD.org> wrote: >>=20 >> The branch main has been updated by khorben: >>=20 >> URL: = https://cgit.FreeBSD.org/src/commit/?id=3De7be843b4a162e68651d3911f0357ed4= 64915629 >>=20 >> commit e7be843b4a162e68651d3911f0357ed464915629 >> Merge: d0ff5773cefa 1095efe41fee >> Author: Pierre Pronchery <khorben@FreeBSD.org> >> AuthorDate: 2025-08-07 13:50:32 +0000 >> Commit: Pierre Pronchery <khorben@FreeBSD.org> >> CommitDate: 2025-08-07 13:50:32 +0000 >>=20 >> Merge commit '1095efe41feed8ea5a6fe5ca123c347ae0914801' >>=20 >> Approved by: philip (mentor) >> Sponsored by: Alpha-Omega Beach Cleaning Project >> Sponsored by: The FreeBSD Foundation >=20 > This commit didn=E2=80=99t note that OpenSSL 3.5.1 was imported. I = think it=E2=80=99s best to revert the merge commit and correct the = commit message. Feel free to copy the commit message from the original = import, adding more details as needed. The ossl module is broken on several architectures as well after = this change: secure/lib/libcrypto/Makefile.asm was updated, but the = files under sys/conf/files* and sys/modules/ossl/Makefile need to be = updated. Cheers, -Enji= --Apple-Mail=_2BA6FA3C-070A-4A8D-AD32-610F3BF80E84 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----- iQIzBAEBCAAdFiEEkHfexGRJ3gYRdA2gGpE5DjPsNJgFAmiWfLsACgkQGpE5DjPs NJia5Q/9GcOysK0ZOiR1LIjrZFJtnhr0kDQ9hpgeIonNpinq4O18iyUFISGFs4x5 fcAH9kPMARFpK/CEQ8e+SrHCRzoigH8FgwgPPhhfe2xgZYHQZCP/VvrYI93xzvau C5gEp+0DlgDysSrp4qM2R0OjmKyk0hdZTTbTWtQOL1i00daEP8JblTYxCZiW7+Rn 8IzWENpAt5BNJL2yUnUS9tBu43OFh2Pdlp2HuqjHegy6khWZ8k14yknTdiFOxLtx gZj0JVMcqrJ6zQO0GDpr2IUhXNNn9qqFHBV8+grxgo1YsYg3JykOFZ4VqyOI9Gei shOW3EysrgowiOIVtzUHt+Z343LZJ4IB8r7sNdNaXihOgrvOCCcSkidcXCg6spz4 15rp15/U+8WA1jAWY1QSyfeCKSWPl0TOxtKTCfQNwJdQEbMOGLlBXZT4Om4y1try j0FIh3BqXLydg9J5sXOIe/EcY6nH5s2zRaUE+7I+M3PCQ+typR4gQOhVRU+yM/ar hyMS5Ked0TCjhv3kcXZfOLJegoV10VNj+EsGkA8+7XTdGkFtdp0I2ByOmqiZVZqE cOiDh6avLZfLFdJTUq/Rw7NZ8PjgVKCRd3QBzNignnvzUK+nZadIP2GPPywn5XtT 7d12jWYwJcgf9YjhS57qPfwLvjvgCDYs9BX2xX0OSQ6qugFNBW8= =Reh4 -----END PGP SIGNATURE----- --Apple-Mail=_2BA6FA3C-070A-4A8D-AD32-610F3BF80E84--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?286324B9-1CDF-4D27-9F96-EABA1B9237ED>