Date: Thu, 17 Dec 2020 12:48:05 -0800 From: Xin Li <delphij@delphij.net> To: freebsd-git@freebsd.org Cc: Cy Schubert <cy@freebsd.org>, uqs@FreeBSD.org, Warner Losh <imp@FreeBSD.org> Subject: Intention to import a vendor change to contrib/unbound Message-ID: <5fb0ce7c-10eb-2e3e-af3b-ccb9728e9c1b@delphij.net>
next in thread | raw e-mail | index | archive | help
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. Cheers, --0bhGmWmlsfFe8LIkTd9izlGc2sw0EQYlD-- --FaTLd6DhcN0TthV5QRe3f3FL1kYP5LaFP Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wsF5BAABCAAjFiEEceNg5NEMZIki80nQQHl/fJX0g08FAl/bxAUFAwAAAAAACgkQQHl/fJX0g0+q 4A/+KsSHQTwMpzF2xl4StvcN0uwOFUyylQ23erR+MnhZ9+dhOLRk4boG09HQu+9KUq6HGjIDa3mD YjrDtZ66HqzDf6Z7x5bbUCNrou7hMetT74YrMbJ7/PrOQupfTGu1lg7QkxRwrmvY3IM7E0PLpdy1 fAjtDfwYxmmfTfJiqtDTrn153t5SdCzBSKMZFegVUdObhsHB36yBkcnxTFsjbpk+Shyx+s0SpzoJ JKhO+6z4PtNCjWJUuQnKBkPCmhu2nuNZXWRYIqdmR5TysFp8v+lYlTMx21bl7EVKsOW1WdyOc6bb avUoG10R0A53izYxoYyOVrDkuC4Wiu97TPJNfkUBmQUz4bbAgB7Sws6G481Fe0OLA+R6soO1Hy8A 3P1YqEkHgPbRIQg9iZcJhCSJErbG4ZIkQDSgUZi31i5jv8BjT7MF+jreMr2Re7Yuvd0v6iTJSsJf paC0KXhuPRzTDcyQ99DzSTt4j69u0YZYZy50SA31E6J0jhteXNlXEbCvz6a/qtmyS483QqxbQ5ZE Aa7rBNOnmGbUxR1fnhx/K3n9rBT55Q6ue7bBgqpGulpPGPjB4wmdSauR7XYXTAFa/XwIAX9ZeYw3 6GM82vJvuxn/rOTWcQEoa2Rhwpi42syXD7JZEUuLL8LJOBsEnVhClOt3q7JM06DxFNTv+K/XMDmy pcE= =jmtv -----END PGP SIGNATURE----- --FaTLd6DhcN0TthV5QRe3f3FL1kYP5LaFP--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?5fb0ce7c-10eb-2e3e-af3b-ccb9728e9c1b>