Date: Thu, 17 Dec 2020 22:31:02 +0100 From: Ulrich =?utf-8?B?U3DDtnJsZWlu?= <uqs@freebsd.org> To: Xin Li <delphij@delphij.net> Cc: freebsd-git@freebsd.org, Cy Schubert <cy@freebsd.org>, Warner Losh <imp@freebsd.org> Subject: Re: Intention to import a vendor change to contrib/unbound Message-ID: <X9vOFl9xyv5hH1c0@acme.spoerlein.net> 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
On Thu, 2020-12-17 at 12:48:05 -0800, Xin Li wrote: >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. Consider this approved, as long as it happens within the next 18h or so. As for a direct commit to head, I don't think it'll make a later merge harder, as git doesn't track what has and hasn't been merged anyway and will have to make a conflict-merge happen either way. Good luck! Uli
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?X9vOFl9xyv5hH1c0>