From owner-dev-commits-ports-all@freebsd.org  Wed Apr 21 17:53:48 2021
Return-Path: <owner-dev-commits-ports-all@freebsd.org>
Delivered-To: dev-commits-ports-all@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 95F035ED5F0;
 Wed, 21 Apr 2021 17:53:48 +0000 (UTC)
 (envelope-from mandree@FreeBSD.org)
Received: from smtp.freebsd.org (smtp.freebsd.org
 [IPv6:2610:1c1:1:606c::24b:4])
 (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 "smtp.freebsd.org", Issuer "R3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 4FQSph3vByz3rMt;
 Wed, 21 Apr 2021 17:53:48 +0000 (UTC)
 (envelope-from mandree@FreeBSD.org)
Received: from mandree.no-ip.org (p4fe5242b.dip0.t-ipconnect.de [79.229.36.43])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 (Authenticated sender: mandree/mail)
 by smtp.freebsd.org (Postfix) with ESMTPSA id 5DC7029A09;
 Wed, 21 Apr 2021 17:53:48 +0000 (UTC)
 (envelope-from mandree@FreeBSD.org)
Received: from ryzen.an3e.de (localhost [IPv6:::1])
 by ryzen.an3e.de (Postfix) with ESMTP id 6E056120647;
 Wed, 21 Apr 2021 19:53:47 +0200 (CEST)
Subject: Re: git: 08c22f24c94d - 2021Q2 - security/openvpn: security update to
 v2.5.2
From: Matthias Andree <mandree@FreeBSD.org>
To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org,
 dev-commits-ports-branches@FreeBSD.org
References: <202104211749.13LHnDok003531@gitrepo.freebsd.org>
Message-ID: <129910f9-cab1-c219-e8d5-52fd3776e429@FreeBSD.org>
Date: Wed, 21 Apr 2021 19:53:47 +0200
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101
 Thunderbird/78.8.1
MIME-Version: 1.0
In-Reply-To: <202104211749.13LHnDok003531@gitrepo.freebsd.org>
Content-Type: text/plain; charset=utf-8
Content-Language: en-US
Content-Transfer-Encoding: 7bit
X-BeenThere: dev-commits-ports-all@freebsd.org
X-Mailman-Version: 2.1.34
Precedence: list
List-Id: Commit messages for all branches of the ports repository
 <dev-commits-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-ports-all>, 
 <mailto:dev-commits-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-ports-all/>
List-Post: <mailto:dev-commits-ports-all@freebsd.org>
List-Help: <mailto:dev-commits-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-ports-all>, 
 <mailto:dev-commits-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 21 Apr 2021 17:53:48 -0000

Am 21.04.21 um 19:49 schrieb Matthias Andree:
> The branch 2021Q2 has been updated by mandree:
> 
> URL: https://cgit.FreeBSD.org/ports/commit/?id=08c22f24c94d9310d984e2ce0aa3c840bb5accd2
> 
> commit 08c22f24c94d9310d984e2ce0aa3c840bb5accd2
> Author:     Matthias Andree <mandree@FreeBSD.org>
> AuthorDate: 2021-04-21 17:46:21 +0000
> Commit:     Matthias Andree <mandree@FreeBSD.org>
> CommitDate: 2021-04-21 17:48:38 +0000
> 
...
>     (cherry picked from commit 6271ca01ce9d0733b650b42cdf98813b27758370)

Lesson learned:
pull --rebase and push main first, then cherry-pick the MFH.