From nobody Thu Nov 27 19:27:32 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 4dHRKQ2DDXz6Hx6J for ; Thu, 27 Nov 2025 19:27:54 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic304-25.consmr.mail.gq1.yahoo.com (sonic304-25.consmr.mail.gq1.yahoo.com [98.137.68.206]) (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 did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4dHRKM486qz3RWg for ; Thu, 27 Nov 2025 19:27:51 +0000 (UTC) (envelope-from marklmi@yahoo.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=yahoo.com header.s=s2048 header.b=uZbbqRuy; dmarc=pass (policy=reject) header.from=yahoo.com; spf=pass (mx1.freebsd.org: domain of marklmi@yahoo.com designates 98.137.68.206 as permitted sender) smtp.mailfrom=marklmi@yahoo.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1764271667; bh=AVbNia9uBbZ0AhkaWftluf7EOAn5opmfghkRECqBqMU=; h=From:Subject:Date:To:References:From:Subject:Reply-To; b=uZbbqRuyy0R+mWbd3shx1qKTCh9bxyQyfZTbUucqG6qRhw5pq8k6t6cZN2YvPlsEpd1/zFf3XnFrT/7KsDrfFBKv+LfVmhMvd+w+Zk0XmcjRmDQo69Zfk05hZILzxVzyvtdWXvcCzJnElQg988QtE0SvvnPjdxe3/fJuqBG/bcthQ1xr8QWYkBc8eiaRpUPmJ4W5M8riFa05MfYZ1LLRSoRqW+uNOiZKdYDVbAHzb8dkjSGDfoidOKV+/uDhS6DW2phtlh+dQwXgW8TNtWmU7+/ETg+nYEmEWr50fdZmuJaXwviOoLlwf5QFZrndRVZRt+n5W57k7MrMqowMFVjG+Q== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1764271667; bh=cvEMVCnSsEOxKdqEWML38Lt0NktRe+Qm47FiZRtQaSn=; h=X-Sonic-MF:From:Subject:Date:To:From:Subject; b=ZPKV07g9wJMKlLtZ/K1lqlUA18smNmaBb5IqdtIbnEXNVR6KU2mgWq2A/JswSrzCREkYGi5gTMUY0DYneKvfXLWUhUVo6TuSvQ9dVCExa7W/9XgNWneeC32RMC7PkufwMjKoGAiRNSv/YUpwq/BjSaZ26F7aGjIO6myZfkO4Hsj1SLNQ5Rqp/pce2HO4k6BCPkwQCL7MRPwrLzqKKNvetITxWIe3sTE5iUilkDUyD5MFaMZ/ne8GuoKE8XpOybOMcKirt43y3IMA4g+bL6z2NgfI+47v6RDW3gLjtCO9Cz2Kf9Rne/RanGEJlzJcm4FAKX1w3JtN5RQDAPhAmenEKQ== X-YMail-OSG: ibiT7T8VM1lC1z65wuLHlwtUSPlemey7QwGkQA4g8FBirX4quZM3HbQkEcOBzAQ axtLeZt8x8GP1LTJtu4WCLDrZ9FiyW.p9PzmT93jOu0rbTG3.3CdaCIEs2Q7KcvDH7FX.6A5K7y9 5TGUQ67T94gZwMCUAijUdgH7KcMsnvXreYVdJMiuWAhvvliki8naDfHux0hT0m7Q12voHmMILx7p E3TbpzV.5Ov9DHcSYzUs53WP_gGz.AD.yw_NbSy6tDkKiO30dHk1Woaxqzm3wBeBiqf1qSlyDKCV VVatfSKzXVEQcFi5dmeqbiqlnBG2nO0Li0WBbBBEh950eimWvX4s63sJSyPUauBfFkWbIK1Ut8e2 zZGFVY5YMyYCrzZKaxy8ovICE8GenEYfUO1Ypco1EdA_X8ubRFIfUVAtz4DRlWqBQVgctw5ODfJW IZaAWwl.Rc0mRw_ioQfa3GKK3OjQs4zGY12HbC6PYrOu38T78Elauz6WU0yPHvVwEYjqW_cg7SXJ fFlkq6ltPDKC5FdyGC3V8s7h_LWX8lg7quLS0.PVG6GV5nSArQwR9i5YI.9mYEJHyUGPb6pYW2Nh sDW_qJ69h7ojawGCOKl7GQ8Wut8nncKxRrGNk.itwqYpH7NCgIkmor3Ftnu1i82iUwFD7qGbcqKj LHLvNfuuAHBm1axX__oECLvx9iHhbfJiRh4uBoLZ7QWeUnBQjmgE4.ofn8caaoF6CZpBPzRsl.Dc m_PBI4_PzT02I4CY8Zw7Z2pAbwkbNx8Y9W0Yi97Ow5GoIAPhbFTOHrH6qx9EKexi37sCbMXYu3OU yLtUF2VRCf8iqNseuSWpfZ5w_R9FRfYZYArXaLulKnm3.SloSpi_CZr51CYQLa8dpLh4abCZvoQP sLLbhYpv1rr3q4EgoTjnrNpQIQpviARb2kM7PTl9ArmpyUuKR8I5BhrvHSOjC.vVrAcr5BfbCSfO IQ6KDwEG8kPvOnff.98VlZwyG3NwYIcilsjfSCOEyurjL9MCIQwdYQ4KTr3mdAASlo2XK1cQ5vSZ Ih0zp5PAUndo10l6KfURnoyLw5sQwCzhUnluHnReu3jU9I9iVQHrDYzflmqh2piBCH22COOUWwh_ SYblzXQoMoBKLUtrlDd52mejC_86D6fyeVNOONoczxev.T.JPxvj.TC4sNdHpB7RP.m13gjY1ZL3 f09SDKOgALXa9F2A46xd4c2_lnCme.EdggS5xEnFyNqfeHK5LZ2Rk0OzutamTe_SVL0WT_7ROOt. wMeaYVPVy2sjZS9o5HyciuVf4_TWQJjm2v6KfSwR8hLvKWWHoOxeh3pl96lVys5ipoaOFm2q.YaX Ek4GdAwCPrjRqkV4KcVadz4i9ci2i9gJ6tvt0f39f5dPQffMmJTZJxc3.Q0sRqAxj9PxUqIY6Oay Bt0C.jJ4gki4zQbl_F89fgdxl61Sa05s3zBwEgYKcFYQK80QKTOADkhML7dQtVzCfHRNCIeOlJY5 bHwizD8EssKba_EoaMSuWwwy7FZVctxfZLI9inqWd.g.YHop0LXRzpv_6A9BgoItGg12hCoEFVsj lKkSQ3ifVAz.gwKFZD1bKWmFkHx3mDdyFPrpEOgtVHE3PgnQSNmsx5NAy1HBHx66jyqc7JSpG9JA Z8Vt0GEKIQ4qhpmWGj9Zek8K4X9LQG7EJ5l8qt0xz3GWQ3UiuamPZJ7XHOu86GTZ5YJTacUEVWMV 8dQV82uSO3hR8PyK9T6Tu_6OHz4fsM4LihSbgAMMUX14FBFgstS7q1l5jLEgVKXAnHAZL6iOHnPJ r7oD4KeIYe5nSqnyhEFXeBDfwQz.dMAB.BJZa600Bwu6waQ8Ue10riqv1gLwhDXaDqopXdhK7NN5 qObiRfjDpMqpeH_kv5hn33AId._VKhxhxbTk21ddiwT8laHWXG4Ft0nD9T7dBVFHOdRcKPUUOta4 bUV6Lk2Bj1awuWiBWYtyj.jrO9hA31pn1RNntkJje9uqtyqTWJ6pzTqq6xad_YkoTUzJplCrxiMg 320rGbjoo9YYNgbXYJt2pG3jgSCm8j1FimRVlzM9GecskE4JtfIfiEDnmE6R1o7Y5y_w2luJeoVW EZzw7Qda.HBHJUxPodDBtYh82LeLYZy4JGDEDtXpSiXdFymPC340nM3CG5B9SIU488e6TgtOUc1e Ig2FDIWjd9zvsspN.jV9FdeP_HU9N1r8QPzlvvH3X52V0Ik7HuknhtskRlTDp3NYjQXr19Z_gymF iatjSw0P4XUaBk7gX8NrFu6xHkQbJsTlJm.hUTCN_W1YnX42DLsVRmqLzwfFA152lz0t6Olq1kQH THOKx_mpa6WlWgPTiGnsT1Q-- X-Sonic-MF: X-Sonic-ID: 997a7c27-1eee-4118-ae7a-9b730d0aa259 Received: from sonic.gate.mail.ne1.yahoo.com by sonic304.consmr.mail.gq1.yahoo.com with HTTP; Thu, 27 Nov 2025 19:27:47 +0000 Received: by hermes--production-gq1-fdb64d996-8w8lr (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID 45c11c44500d4493e7182a9d75075cc0; Thu, 27 Nov 2025 19:27:43 +0000 (UTC) From: Mark Millard Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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: b3e53f9fff11 - main - git-arc: Don't require devel/arcanist Message-Id: <036233AD-5FE7-49AE-B0DA-AF52F321011E@yahoo.com> Date: Thu, 27 Nov 2025 11:27:32 -0800 To: "des@freebsd.org" , dev-commits-src-main X-Mailer: Apple Mail (2.3826.700.81) References: <036233AD-5FE7-49AE-B0DA-AF52F321011E.ref@yahoo.com> X-Spamd-Bar: --- X-Spamd-Result: default: False [-4.00 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-0.999]; DMARC_POLICY_ALLOW(-0.50)[yahoo.com,reject]; R_DKIM_ALLOW(-0.20)[yahoo.com:s=s2048]; R_SPF_ALLOW(-0.20)[+ptr:yahoo.com]; MIME_GOOD(-0.10)[text/plain]; TO_DN_SOME(0.00)[]; DWL_DNSWL_NONE(0.00)[yahoo.com:dkim]; FREEMAIL_FROM(0.00)[yahoo.com]; RCPT_COUNT_TWO(0.00)[2]; RCVD_TLS_LAST(0.00)[]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; TO_DN_EQ_ADDR_SOME(0.00)[]; FROM_HAS_DN(0.00)[]; FREEMAIL_ENVFROM(0.00)[yahoo.com]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; DKIM_TRACE(0.00)[yahoo.com:+]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org]; APPLE_MAILER_COMMON(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RWL_MAILSPIKE_POSSIBLE(0.00)[98.137.68.206:from]; RCVD_IN_DNSWL_NONE(0.00)[98.137.68.206:from] X-Rspamd-Queue-Id: 4dHRKM486qz3RWg Dag-Erling Sm=C3=B8rgrav wrote on Date: Thu, 27 Nov 2025 18:07:35 UTC : > The branch main has been updated by des: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3Db3e53f9fff11e2e6289f5c69ad08f5ac= d727abd6 >=20 > commit b3e53f9fff11e2e6289f5c69ad08f5acd727abd6 > Author: Dag-Erling Sm=C3=B8rgrav > AuthorDate: 2025-11-27 18:07:15 +0000 > Commit: Dag-Erling Sm=C3=B8rgrav > CommitDate: 2025-11-27 18:07:15 +0000 >=20 > git-arc: Don't require devel/arcanist >=20 > Instead of invoking just =E2=80=9Carc=E2=80=9D, which requires = devel/arcanist, which > conflicts with archivers/arc, invoke the underlying script installed = by > devel/arcanist-lib. >=20 > Reviewed by: markj > Differential Revision: https://reviews.freebsd.org/D53942 > --- > tools/tools/git/git-arc.sh | 14 ++++++++++++++ > 1 file changed, 14 insertions(+) >=20 > diff --git a/tools/tools/git/git-arc.sh b/tools/tools/git/git-arc.sh > index fa618cdcbc22..f33a73334799 100644 > --- a/tools/tools/git/git-arc.sh > +++ b/tools/tools/git/git-arc.sh > @@ -171,6 +171,20 @@ get_bool_config() > test "$(git config --bool --get $1 2>/dev/null || echo $2)" !=3D = "false" > } >=20 > +# > +# Invoke the actual arc command. This allows us to only rely on the > +# devel/arcanist-lib port, which installs the actual script, rather = than > +# the devel/arcanist-port, which installs a symlink in = ${LOCALBASE}/bin > +# but conflicts with the archivers/arc port. > +# > +: ${LOCALBASE:=3D$(sysctl -n user.localbase)} > +: ${LOCALBASE:=3D/usr/local} > +: ${ARC_CMD:=3D${LOCALBASE}/lib/php/arcanist/bin/arc} > +arc() > +{ > + ${ARC_CMD} "$@" > +} > + > # > # Filter the output of call-conduit to remove the warnings that are = generated > # for some installations where openssl module is mysteriously = installed twice so The committed source update still leaves it with: which arc >/dev/null 2>&1 || err "arc is required, install = devel/arcanist" instead of: [ -x "${ARC_CMD}" ] || err "arc is required, install devel/arcanist-lib" Somehow the "fix existence check" based diff from: https://reviews.freebsd.org/D53942 is not what was committed. =3D=3D=3D Mark Millard marklmi at yahoo.com