From nobody Sat Aug 9 00:25:45 2025 X-Original-To: dev-commits-src-main@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 4bzMBj4wSPz64St9; Sat, 09 Aug 2025 00:26:05 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-pf1-x42f.google.com (mail-pf1-x42f.google.com [IPv6:2607:f8b0:4864:20::42f]) (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 "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bzMBh3ZKGz3DVf; Sat, 09 Aug 2025 00:26:04 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20230601 header.b=GWaISYgj; spf=pass (mx1.freebsd.org: domain of yaneurabeya@gmail.com designates 2607:f8b0:4864:20::42f as permitted sender) smtp.mailfrom=yaneurabeya@gmail.com; dmarc=pass (policy=none) header.from=gmail.com Received: by mail-pf1-x42f.google.com with SMTP id d2e1a72fcca58-76bc55f6612so2681964b3a.0; Fri, 08 Aug 2025 17:26:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1754699158; x=1755303958; darn=freebsd.org; h=to:references:message-id:cc:date:in-reply-to:from:subject :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=aFWRMrmzf/SsqDSuQGJsZpvQZhKb5Jykm/5ulR29Scs=; b=GWaISYgjyOvABTWFNwNPOg2XJq51mDnmiZL24gJ+Wfr7ar7UNiZM6wEbeVzkZOaLZh YDADkisrXZK7xEIq0mrNHMaDHM6SS6sdEsfftAqZ+U+rD9Y4bugvBCIEathp4I6dp122 S/1N+pLTEFDlak6g3eKqyKy92wmADIvP16+t/HzIDfryGU3oDMXrALej4E3KmKgYkP9m FltEwVd7rUTZCM20XiZTbrZL24lTLRw8GlxvsCDqMZnenHm1ZkUaZxnpx54iQQNs3vD0 q1S8HztzLv7T8iDOxF43B70X8BBboULiACnDdPZDJvgOVVRLBiBLvahb68CyZ1X5rZUU cKXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754699158; x=1755303958; h=to:references:message-id:cc:date:in-reply-to:from:subject :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=aFWRMrmzf/SsqDSuQGJsZpvQZhKb5Jykm/5ulR29Scs=; b=vTf9/7i3jwt45eUEWmqqbbbqATdxx5YsXCNmnC2lRoDaXbb6kclervvxOx2C7V4Zvt ndylVhaao+zcMG/zTJUr0wdH2dUGOlsflUxtW9tENN0n7EWpVHCtQOLf1M8svdmh93V8 fkyrFnd2fxIfymU78w/3ExZtPqFazUDD3w6CTcZPXV0C33vFrjq62IDCFkP2m3we2XXo ieU1X+mfVvFjRSAr7bIyfUAkkXr9tZSrE+nyJ7q1WlWteSkimxOOCodf1XptWvFyoQ+w e6fpGioutLjBektG7czVw2WU9U/zht8BGxWuzD+k1ZBa2vReU6Dffa/vsjKto4dLGhn/ Yj6Q== X-Forwarded-Encrypted: i=1; AJvYcCUjcech47iNg+0X/wuroj5iUtLl4adgkKsL+QO6Nem/LU3Bbi9BQFfd7YqkYNtIYqPPlvLXOxwskkXenvCDYBS375+08qU=@freebsd.org, AJvYcCX1FqXt0DOzMbg3RIhrz/NOyRSRvwYmm3LMQHt9Pq6QdHigj2d5h52CZ/ockTOo831YvqOSeZthk58/Sn4wD9GH9DPa@freebsd.org X-Gm-Message-State: AOJu0YwdBQN6BApXTSUxREX3mSt5ibgustr7nvNM5j2Qg04R43eW8NZZ UR+M+5iQ54s4RkeiwH6xh+NUvd40sujl2kKuCfigFR9iGMeuDbReX9JYOJTElieD X-Gm-Gg: ASbGncvjeCeN2Jr5FUjoE2ZRLiLzVhnKsOdCukoOh4GfLfRRN6sm/WX0x2btSQ6o/ER JNLZW6bLIc+ZYoKoLoQqLagiSNRGqXD8lgxKkn5GGEY8yRDWp5zFfKaCLpIoToJ3E9+wHf2nHDA dIWdZe2K3ib0T1Qx05EaweGLK0r6mtsSZLhizQvSMww4ehycsNFkwNIDRVkg4Rfi9wF4kx+2yz2 EDhtvNin+cjc2UmPcIA88MctekBm8rCJ35oH6CGKwy6RVMhIYRLqXW+NCBte8VLKKaruAnXpKIC FqCmwg30WKPdQBuxJRY26ZJWuB+4x6ykSdb12cNlf2I+YpevAVpkNzyZ+W38Se0CbQtQPwikaQz IhxXJUbmLiWGRffZoTDuf3O7oczlZAfmjSEq5JaKOXM1lUwMgOUqQdMynjw== X-Google-Smtp-Source: AGHT+IHMHEmZE59L+KqND7K1qZ6goFaTQ/0Ik5+PEsF1jg6FsDzGnkzmsfinqA6aGb227YjlL9n63A== X-Received: by 2002:a05:6a00:2d16:b0:736:9f2e:1357 with SMTP id d2e1a72fcca58-76c46c7d6b4mr6723582b3a.12.1754699157707; Fri, 08 Aug 2025 17:25:57 -0700 (PDT) Received: from smtpclient.apple ([176.100.43.104]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-76bccfbce56sm21479899b3a.82.2025.08.08.17.25.56 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Aug 2025 17:25:56 -0700 (PDT) Content-Type: multipart/signed; boundary="Apple-Mail=_CCE01CD7-03AE-4F03-A16E-AAFB955FF16D"; protocol="application/pgp-signature"; micalg=pgp-sha256 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3826.700.81\)) Subject: Re: git: e7be843b4a16 - main - Merge commit '1095efe41feed8ea5a6fe5ca123c347ae0914801' From: "Enji Cooper (yaneurabeya)" In-Reply-To: <286324B9-1CDF-4D27-9F96-EABA1B9237ED@gmail.com> Date: Fri, 8 Aug 2025 17:25:45 -0700 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Message-Id: References: <202508081922.578JM3A0086462@gitrepo.freebsd.org> <286324B9-1CDF-4D27-9F96-EABA1B9237ED@gmail.com> To: Pierre Pronchery X-Mailer: Apple Mail (2.3826.700.81) X-Spamd-Result: default: False [-6.10 / 15.00]; SIGNED_PGP(-2.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-1.000]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36]; MIME_GOOD(-0.20)[multipart/signed,text/plain]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20230601]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCVD_TLS_LAST(0.00)[]; TO_DN_EQ_ADDR_SOME(0.00)[]; ARC_NA(0.00)[]; TO_DN_SOME(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; FREEMAIL_ENVFROM(0.00)[gmail.com]; FREEMAIL_FROM(0.00)[gmail.com]; DKIM_TRACE(0.00)[gmail.com:+]; RCPT_COUNT_THREE(0.00)[4]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org,dev-commits-src-main@freebsd.org]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; HAS_ATTACHMENT(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; APPLE_MAILER_COMMON(0.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::42f:from] X-Rspamd-Queue-Id: 4bzMBh3ZKGz3DVf X-Spamd-Bar: ------ --Apple-Mail=_CCE01CD7-03AE-4F03-A16E-AAFB955FF16D Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 > On Aug 8, 2025, at 3:39=E2=80=AFPM, Enji Cooper (yaneurabeya) = wrote: >=20 >>=20 >> On Aug 8, 2025, at 12:29=E2=80=AFPM, Enji Cooper (yaneurabeya) = wrote: >>=20 >>=20 >>> On Aug 8, 2025, at 12:22=E2=80=AFPM, Pierre Pronchery = 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 >>> AuthorDate: 2025-08-07 13:50:32 +0000 >>> Commit: Pierre Pronchery >>> 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. >=20 > 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=E2=80=99t 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=E2=80=99m 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 --Apple-Mail=_CCE01CD7-03AE-4F03-A16E-AAFB955FF16D 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----- 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----- --Apple-Mail=_CCE01CD7-03AE-4F03-A16E-AAFB955FF16D--