Date: Thu, 17 Dec 2020 12:57:21 -0800 From: Cy Schubert <Cy.Schubert@cschubert.com> To: d@delphij.net Cc: freebsd-git@freebsd.org, Cy Schubert <cy@freebsd.org>, uqs@FreeBSD.org, Warner Losh <imp@FreeBSD.org> Subject: Re: Intention to import a vendor change to contrib/unbound Message-ID: <202012172057.0BHKvLGq027689@slippy.cwsent.com> In-Reply-To: <5fb0ce7c-10eb-2e3e-af3b-ccb9728e9c1b@delphij.net> References: <5fb0ce7c-10eb-2e3e-af3b-ccb9728e9c1b@delphij.net>
next in thread | previous in thread | raw e-mail | index | archive | help
In message <5fb0ce7c-10eb-2e3e-af3b-ccb9728e9c1b@delphij.net>, Xin Li writes: > This is an OpenPGP/MIME signed message (RFC 4880 and 3156) > --FaTLd6DhcN0TthV5QRe3f3FL1kYP5LaFP > Content-Type: multipart/mixed; boundary="0bhGmWmlsfFe8LIkTd9izlGc2sw0EQYlD"; > protected-headers="v1" > From: Xin Li <delphij@delphij.net> > Reply-To: d@delphij.net > To: freebsd-git@freebsd.org > Cc: Cy Schubert <cy@freebsd.org>, uqs@FreeBSD.org, > Warner Losh <imp@FreeBSD.org> > Message-ID: <5fb0ce7c-10eb-2e3e-af3b-ccb9728e9c1b@delphij.net> > Subject: Intention to import a vendor change to contrib/unbound > > --0bhGmWmlsfFe8LIkTd9izlGc2sw0EQYlD > Content-Type: text/plain; charset=utf-8 > Content-Language: en-US > Content-Transfer-Encoding: quoted-printable > > Hi, > > There is a bugfix that needs to be applied to contrib/unbound (and > subsequently MFC'ed to stable/12) and I'd like to check with you before > proceeding. Basically what I would propose to do is: > > 1) Apply 08968baec1122a58bb90d8f97ad948a75f8a5d69 on vendor/unbound/dist > > This fixes a relatively serious reliability bug that would make unbound > crash when udp-connect is used. > > 2) Perform a regular svn merge from vendor/unbound/dist to > head/contrib/unbound, with that revision only. After merge, check the > svn:mergeinfo change contained only: > > /vendor/unbound/dist: X > > where X is the revision number. > > 3) Regular test, etc., then commit. > > The alternative to a full vendor import would be to commit the change to > head/contrib/unbound directly without merge, but it might require a > little bit more work for future imports. Thanks. I was just about to do this myself. Thanks for taking are of this for us. cc'd you on the email to the person who notified me of it. -- Cheers, Cy Schubert <Cy.Schubert@cschubert.com> FreeBSD UNIX: <cy@FreeBSD.org> Web: https://FreeBSD.org NTP: <cy@nwtime.org> Web: https://nwtime.org The need of the many outweighs the greed of the few.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202012172057.0BHKvLGq027689>