From owner-freebsd-git@freebsd.org Thu Dec 17 20:48:15 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 5A85C4C4123 for ; Thu, 17 Dec 2020 20:48:15 +0000 (UTC) (envelope-from delphij@delphij.net) Received: from anubis.delphij.net (anubis.delphij.net [64.62.153.212]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "anubis.delphij.net", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Cxkbf1rgSz4mCl; Thu, 17 Dec 2020 20:48:13 +0000 (UTC) (envelope-from delphij@delphij.net) Received: from odin.corp.delphij.net (unknown [IPv6:2601:646:8601:f4a:9886:3dcc:c5b5:773]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by anubis.delphij.net (Postfix) with ESMTPSA id B48A547717; Thu, 17 Dec 2020 12:48:06 -0800 (PST) Reply-To: d@delphij.net To: freebsd-git@freebsd.org Cc: Cy Schubert , uqs@FreeBSD.org, Warner Losh From: Xin Li Subject: Intention to import a vendor change to contrib/unbound Message-ID: <5fb0ce7c-10eb-2e3e-af3b-ccb9728e9c1b@delphij.net> Date: Thu, 17 Dec 2020 12:48:05 -0800 User-Agent: Thunderbird MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="FaTLd6DhcN0TthV5QRe3f3FL1kYP5LaFP" X-Rspamd-Queue-Id: 4Cxkbf1rgSz4mCl X-Spamd-Bar: ------ X-Spamd-Result: default: False [-6.09 / 15.00]; HAS_REPLYTO(0.00)[d@delphij.net]; RCVD_VIA_SMTP_AUTH(0.00)[]; XM_UA_NO_VERSION(0.01)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+mx]; HAS_ATTACHMENT(0.00)[]; DKIM_TRACE(0.00)[delphij.net:+]; DMARC_POLICY_ALLOW(-0.50)[delphij.net,reject]; NEURAL_HAM_SHORT(-1.00)[-1.000]; SIGNED_PGP(-2.00)[]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:+,3:~]; RBL_DBL_DONT_QUERY_IPS(0.00)[64.62.153.212:from]; ASN(0.00)[asn:6939, ipnet:64.62.128.0/18, country:US]; MID_RHS_MATCH_FROM(0.00)[]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[delphij.net:s=m7e2]; FREEFALL_USER(0.00)[delphij]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.20)[multipart/signed,multipart/mixed,text/plain]; REPLYTO_DOM_EQ_FROM_DOM(0.00)[]; SPAMHAUS_ZRD(0.00)[64.62.153.212:from:127.0.2.255]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[freebsd-git] 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:48:15 -0000 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. 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--