From owner-dev-commits-ports-all@freebsd.org Thu Jun 3 12:35:19 2021 Return-Path: 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 1FE006388F9; Thu, 3 Jun 2021 12:35:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FwljM0Dmbz3CVw; Thu, 3 Jun 2021 12:35:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E0B311A45; Thu, 3 Jun 2021 12:35:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 153CZIFl050530; Thu, 3 Jun 2021 12:35:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 153CZIUN050529; Thu, 3 Jun 2021 12:35:18 GMT (envelope-from git) Date: Thu, 3 Jun 2021 12:35:18 GMT Message-Id: <202106031235.153CZIUN050529@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Matthias Andree Subject: git: c306c212d40f - 2021Q2 - security/openvpn: band-aid fix for SIGSEGV on push echo MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mandree X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: c306c212d40f2112cd0713e53add1e7851393dc3 Auto-Submitted: auto-generated 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Jun 2021 12:35:19 -0000 The branch 2021Q2 has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=c306c212d40f2112cd0713e53add1e7851393dc3 commit c306c212d40f2112cd0713e53add1e7851393dc3 Author: Matthias Andree AuthorDate: 2021-06-03 10:47:16 +0000 Commit: Matthias Andree CommitDate: 2021-06-03 12:34:57 +0000 security/openvpn: band-aid fix for SIGSEGV on push echo PR: 256331 Reported by: peo@nethead.se (cherry picked from commit 6c20c4906a3b0f805c932f4e74ef7f62086e704d) --- security/openvpn/Makefile | 2 +- security/openvpn/files/patch-src_openvpn_options.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/security/openvpn/Makefile b/security/openvpn/Makefile index 4a82851e65f1..9119e2dfa9ab 100644 --- a/security/openvpn/Makefile +++ b/security/openvpn/Makefile @@ -2,7 +2,7 @@ PORTNAME= openvpn DISTVERSION= 2.5.2 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES= security net net-vpn MASTER_SITES= https://swupdate.openvpn.org/community/releases/ \ https://build.openvpn.net/downloads/releases/ \ diff --git a/security/openvpn/files/patch-src_openvpn_options.c b/security/openvpn/files/patch-src_openvpn_options.c new file mode 100644 index 000000000000..e46faee8efd0 --- /dev/null +++ b/security/openvpn/files/patch-src_openvpn_options.c @@ -0,0 +1,11 @@ +--- src/openvpn/options.c.orig 2021-04-21 04:02:50 UTC ++++ src/openvpn/options.c +@@ -5319,7 +5319,7 @@ add_option(struct options *options, + { + /* only message-related ECHO are logged, since other ECHOs + * can potentially include security-sensitive strings */ +- if (strncmp(p[1], "msg", 3) == 0) ++ if (p[1] && strncmp(p[1], "msg", 3) == 0) + { + msg(M_INFO, "%s:%s", + pull_mode ? "ECHO-PULL" : "ECHO",