Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 21 Aug 2025 09:13:03 -0600
From:      Warner Losh <imp@bsdimp.com>
To:        Cy Schubert <Cy.Schubert@cschubert.com>
Cc:        Mark Johnston <markj@freebsd.org>, =?UTF-8?Q?Dag=2DErling_Sm=C3=B8rgrav?= <des@freebsd.org>,  freebsd-current@freebsd.org, ivy@freebsd.org
Subject:   Re: HEADS UP: MIT KRB5 1.22.1 Import
Message-ID:  <CANCZdfo9_D-D43JnoTxt1ivN_SZ2smpHQTJRL2oqp9q%2BYZEqfQ@mail.gmail.com>
In-Reply-To: <20250821151023.39D09205@slippy.cwsent.com>
References:  <20250821055519.65D8B684@slippy.cwsent.com> <86frdlkw30.fsf@ltc.des.dev> <20250821093615.B4293211@slippy.cwsent.com> <aKcqsXIyYobdRIlY@nuc> <20250821151023.39D09205@slippy.cwsent.com>

index | next in thread | previous in thread | raw e-mail

[-- Attachment #1 --]
On Thu, Aug 21, 2025 at 9:10 AM Cy Schubert <Cy.Schubert@cschubert.com>
wrote:

> In message <aKcqsXIyYobdRIlY@nuc>, Mark Johnston writes:
> > On Thu, Aug 21, 2025 at 02:36:15AM -0700, Cy Schubert wrote:
> > > In message <86frdlkw30.fsf@ltc.des.dev>,
> =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav
> > ?
> > > = w
> > > rites:
> > > > Cy Schubert <Cy.Schubert@cschubert.com> writes:
> > > > > KRB5 1.22.0 released with a GSSAPI bug (CVE-2025-57736). The point
> patc
> > h=
> > > > =20
> > > > > was applied on Aug 19 (f96110babbe1). 1.22.1 contains the point
> patch p
> > lu=
> > > > s=20
> > > > > an additional GSSAPI patch. I intend to commit it to HEAD after a
> few d
> > ay=
> > > > s=20
> > > > > of testing on Aug 25.
> > > >
> > > > Please post your patch for review (using git arc, as described in the
> > > > committers guide) so others can test it too.
> > >
> > > git arc does not work with vendor merges. There is a way to trick it
> though
> > .
> >
> > What problem do you run into exactly?  Could you provide a recipe for me
> > to reproduce it locally?
>
> It's a vendor import. It's the same problem we have with git rebase and
> git
> diff of a vendor import. (This is why vendor imports use a special
> procedure [see committers guide].)
>

I think you just need to tell arc to use the first parent....

I've created a generic patch and have created a revision with it. But it
> will not be used for the commit because it affects history.
>

Warner

[-- Attachment #2 --]
<div dir="ltr"><div dir="ltr"><br></div><br><div class="gmail_quote gmail_quote_container"><div dir="ltr" class="gmail_attr">On Thu, Aug 21, 2025 at 9:10 AM Cy Schubert &lt;<a href="mailto:Cy.Schubert@cschubert.com">Cy.Schubert@cschubert.com</a>&gt; wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">In message &lt;aKcqsXIyYobdRIlY@nuc&gt;, Mark Johnston writes:<br>
&gt; On Thu, Aug 21, 2025 at 02:36:15AM -0700, Cy Schubert wrote:<br>
&gt; &gt; In message &lt;<a href="mailto:86frdlkw30.fsf@ltc.des.dev" target="_blank">86frdlkw30.fsf@ltc.des.dev</a>&gt;, =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav<br>
&gt; ?<br>
&gt; &gt; = w<br>
&gt; &gt; rites:<br>
&gt; &gt; &gt; Cy Schubert &lt;<a href="mailto:Cy.Schubert@cschubert.com" target="_blank">Cy.Schubert@cschubert.com</a>&gt; writes:<br>
&gt; &gt; &gt; &gt; KRB5 1.22.0 released with a GSSAPI bug (CVE-2025-57736). The point patc<br>
&gt; h=<br>
&gt; &gt; &gt; =20<br>
&gt; &gt; &gt; &gt; was applied on Aug 19 (f96110babbe1). 1.22.1 contains the point patch p<br>
&gt; lu=<br>
&gt; &gt; &gt; s=20<br>
&gt; &gt; &gt; &gt; an additional GSSAPI patch. I intend to commit it to HEAD after a few d<br>
&gt; ay=<br>
&gt; &gt; &gt; s=20<br>
&gt; &gt; &gt; &gt; of testing on Aug 25.<br>
&gt; &gt; &gt;<br>
&gt; &gt; &gt; Please post your patch for review (using git arc, as described in the<br>
&gt; &gt; &gt; committers guide) so others can test it too.<br>
&gt; &gt; <br>
&gt; &gt; git arc does not work with vendor merges. There is a way to trick it though<br>
&gt; .<br>
&gt;<br>
&gt; What problem do you run into exactly?  Could you provide a recipe for me<br>
&gt; to reproduce it locally?<br>
<br>
It&#39;s a vendor import. It&#39;s the same problem we have with git rebase and git <br>
diff of a vendor import. (This is why vendor imports use a special <br>
procedure [see committers guide].)<br></blockquote><div><br></div><div>I think you just need to tell arc to use the first parent....</div><div><br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">I&#39;ve created a generic patch and have created a revision with it. But it <br>
will not be used for the commit because it affects history.<br></blockquote><div><br></div><div>Warner </div></div></div>
home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CANCZdfo9_D-D43JnoTxt1ivN_SZ2smpHQTJRL2oqp9q%2BYZEqfQ>