From owner-freebsd-git@freebsd.org Thu Dec 17 20:57:25 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C141A4C4397 for ; Thu, 17 Dec 2020 20:57:25 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from smtp-out-no.shaw.ca (smtp-out-no.shaw.ca [64.59.134.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CxkpF2jkWz4mbC; Thu, 17 Dec 2020 20:57:24 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from spqr.komquats.com ([70.67.229.168]) by shaw.ca with ESMTPA id q0KwkTWsatdldq0KxkTTt9; Thu, 17 Dec 2020 13:57:24 -0700 X-Authority-Analysis: v=2.4 cv=INe8tijG c=1 sm=1 tr=0 ts=5fdbc634 a=7AlCcx2GqMg+lh9P3BclKA==:117 a=7AlCcx2GqMg+lh9P3BclKA==:17 a=xqWC_Br6kY4A:10 a=kj9zAlcOel0A:10 a=zTNgK-yGK50A:10 a=SWg00rOMAAAA:8 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=EkcXrb_YAAAA:8 a=P223rL09e3ntA5xNHM4A:9 a=CjuIK1q_8ugA:10 a=uT1z2e2TMlQA:10 a=nWvTgx2JuP7DHgfbJPXu:22 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from slippy.cwsent.com (slippy [IPv6:fc00:1:1:1::5b]) by spqr.komquats.com (Postfix) with ESMTPS id 60DBD6F3; Thu, 17 Dec 2020 12:57:22 -0800 (PST) Received: from slippy (localhost [127.0.0.1]) by slippy.cwsent.com (8.16.1/8.16.1) with ESMTP id 0BHKvLGq027689; Thu, 17 Dec 2020 12:57:21 -0800 (PST) (envelope-from Cy.Schubert@cschubert.com) Message-Id: <202012172057.0BHKvLGq027689@slippy.cwsent.com> X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.7.1 Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: d@delphij.net cc: freebsd-git@freebsd.org, Cy Schubert , uqs@FreeBSD.org, Warner Losh Subject: Re: Intention to import a vendor change to contrib/unbound In-reply-to: <5fb0ce7c-10eb-2e3e-af3b-ccb9728e9c1b@delphij.net> References: <5fb0ce7c-10eb-2e3e-af3b-ccb9728e9c1b@delphij.net> Comments: In-reply-to Xin Li message dated "Thu, 17 Dec 2020 12:48:05 -0800." Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Thu, 17 Dec 2020 12:57:21 -0800 X-CMAE-Envelope: MS4xfEF+0IsWtFh+UYZvKVSfEMAlVW76aivAIAgLO6BiiwLpvpJvwhl8DV/z8cPRHEtZnw7MmOm3DXQ0mZ6MOjXOuamesrYcuIvarXuLvjmetUBqxw6pHkDP B3u3M9A4NxWG5E7ksgKEI/PKp8MgoQ6v6kMmdM3w92z2k5+ZuvfbaZOu6anNqOA2wRmAwUDnxN4tMpS1+we8KVkR7EANjnx++5R2adaxacB5jtzfQ3CkOyK0 6lrNwX8IX9ls1I5kfh5pjiBbW6FHzEVf/9GCNSrl4Sq3YT7zl/QOMuIwdpmCRRHVWgXu2fXJ/bP8wSyoniTtSQ== X-Rspamd-Queue-Id: 4CxkpF2jkWz4mbC X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Dec 2020 20:57:25 -0000 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 > Reply-To: d@delphij.net > To: freebsd-git@freebsd.org > Cc: Cy Schubert , uqs@FreeBSD.org, > Warner Losh > 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 FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org The need of the many outweighs the greed of the few.