Date: Fri, 8 Aug 2025 17:25:45 -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: <B7DD4729-2C8F-4A4D-B5EC-EE16462BD5A5@gmail.com> In-Reply-To: <286324B9-1CDF-4D27-9F96-EABA1B9237ED@gmail.com> References: <202508081922.578JM3A0086462@gitrepo.freebsd.org> <BCA9AECD-F1B7-42F2-B2C4-AD52FE0AAC24@gmail.com> <286324B9-1CDF-4D27-9F96-EABA1B9237ED@gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --] > On Aug 8, 2025, at 3:39 PM, Enji Cooper (yaneurabeya) <yaneurabeya@gmail.com> wrote: > >> >> On Aug 8, 2025, at 12:29 PM, Enji Cooper (yaneurabeya) <yaneurabeya@gmail.com> wrote: >> >> >>> On Aug 8, 2025, at 12:22 PM, Pierre Pronchery <khorben@FreeBSD.org> wrote: >>> >>> The branch main has been updated by khorben: >>> >>> URL: https://cgit.FreeBSD.org/src/commit/?id=e7be843b4a162e68651d3911f0357ed464915629 >>> >>> 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 >>> >>> Merge commit '1095efe41feed8ea5a6fe5ca123c347ae0914801' >>> >>> Approved by: philip (mentor) >>> Sponsored by: Alpha-Omega Beach Cleaning Project >>> Sponsored by: The FreeBSD Foundation >> >> This commit didn’t note that OpenSSL 3.5.1 was imported. I think it’s 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. This should fix the ossl module (in theory), but sys/conf/files.* needs to be regenerated too: https://gist.github.com/ngie-eign/785663f814c3d56e6dc721e5e96457ca (I haven’t gotten around to automating this piece). All of the entries for sys/modules/ossl/Makefile were done with something like the following: % find -s ../../../sys/crypto/openssl/powerpc64le -name \*.S -exec basename {} \; | sed -e 's/^/\t/' -e 's/$/ \\/g' >> sys/modules/ossl/Makefile I’m going to look into shuffling the files.* pieces out into their own files so they can be touched without having to modify the top-level per-architecture conf files. Thanks, -Enji [-- Attachment #2 --] -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEkHfexGRJ3gYRdA2gGpE5DjPsNJgFAmiWlYkACgkQGpE5DjPs NJhQ9w//dN1GsKVGYsaKuTrwV/qSfkS7phpCAag2iSyqDl1KcZsid9u3N3yNsr5D 5543IWaO4MRWSQ08WYVkP2VkAF38q404p4Bm4cMnwYiay4uPmrXYPloWk+5Xququ +iPTd5coJtGuSXE01xknn3qv3ogwSgQmbZe66C8FqbhsZkJiyX/dCsZU5j9sCeXv MCzfupYHRzYU1oMRX+4Jkavoz491Y/AXKMGEEWYpwrRfj2BzNMV/IzT/2iUyAIqb mQqpUeF8w1Rso/2gGulevTQJx2AhZxCSXzRGdKB4bqW2npX5cLofmgi1qadxtS11 LWF4RFBfKRcMNeU3cpgO0O+ikvb44pT0whiFyHsgEkzMxbfVCr4kJadhJr/JgrOo zgw8wbf+CXDfnEFTzM3Gr0y1MnLV4eAITNlsqZEPLlPzJtgT9cBdnKmWV40QMVpR BSYweA2H33BRbDVNU3SLmvQohACnVTKngIvNIDCarIbSMfTOVmriK5try9F6y/Q6 CfCAIO5JyXD8DAVk8qQw3jQ0qGaoh6bFWkGf/fauVCaNrgVC31LJeN12iezMgEM9 hxEcb/r1tH0VREuzAHEMIDV65cvf3TNnuG/j30wi9l2OI6ZD9AzWqSUi3VB2BpuV o4CoQJmdZ3wwiy0LrmyXl70q3+8ZPWa4/a3111Zx75uI7Ugym4A= =Ea5l -----END PGP SIGNATURE-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?B7DD4729-2C8F-4A4D-B5EC-EE16462BD5A5>