From owner-freebsd-git@freebsd.org  Thu Dec 17 21:31:16 2020
Return-Path: <owner-freebsd-git@freebsd.org>
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 E38884C5500
 for <freebsd-git@mailman.nyi.freebsd.org>;
 Thu, 17 Dec 2020 21:31:16 +0000 (UTC) (envelope-from uqs@freebsd.org)
Received: from acme.spoerlein.net (acme.spoerlein.net [IPv6:2a05:fc87:1:5::15])
 (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 (2048 bits) client-digest SHA256)
 (Client CN "www.spoerlein.net", Issuer "R3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 4CxlYJ510Dz4qD5;
 Thu, 17 Dec 2020 21:31:16 +0000 (UTC) (envelope-from uqs@freebsd.org)
Received: from localhost (acme.spoerlein.net [IPv6:2a05:fc87:1:5:0:0:0:15])
 by acme.spoerlein.net (8.16.1/8.15.2) with ESMTPS id 0BHLV2hx035885
 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO);
 Thu, 17 Dec 2020 22:31:02 +0100 (CET) (envelope-from uqs@freebsd.org)
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>
References: <5fb0ce7c-10eb-2e3e-af3b-ccb9728e9c1b@delphij.net>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Disposition: inline
In-Reply-To: <5fb0ce7c-10eb-2e3e-af3b-ccb9728e9c1b@delphij.net>
User-Agent: Mutt/2.0.1 (2020-11-14)
X-Rspamd-Queue-Id: 4CxlYJ510Dz4qD5
X-Spamd-Bar: /
Authentication-Results: mx1.freebsd.org;
	none
X-Spamd-Result: default: False [0.00 / 15.00];
 ASN(0.00)[asn:39540, ipnet:2a05:fc87::/32, country:CH];
 local_wl_from(0.00)[freebsd.org]
X-BeenThere: freebsd-git@freebsd.org
X-Mailman-Version: 2.1.34
Precedence: list
List-Id: Discussion of git use in the FreeBSD project <freebsd-git.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/freebsd-git>,
 <mailto:freebsd-git-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-git/>
List-Post: <mailto:freebsd-git@freebsd.org>
List-Help: <mailto:freebsd-git-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/freebsd-git>,
 <mailto:freebsd-git-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 17 Dec 2020 21:31:16 -0000

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