From owner-svn-ports-all@freebsd.org Tue Nov 24 20:46:21 2020 Return-Path: Delivered-To: svn-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 B6B7E469261; Tue, 24 Nov 2020 20:46:21 +0000 (UTC) (envelope-from bdrewery@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Cgbf54rkBz3DHf; Tue, 24 Nov 2020 20:46:21 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 94D9B2544A; Tue, 24 Nov 2020 20:46:21 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0AOKkLrY028389; Tue, 24 Nov 2020 20:46:21 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0AOKkL9u028386; Tue, 24 Nov 2020 20:46:21 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <202011242046.0AOKkL9u028386@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Tue, 24 Nov 2020 20:46:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r556185 - in head/security/openssh-portable: . files X-SVN-Group: ports-head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: in head/security/openssh-portable: . files X-SVN-Commit-Revision: 556185 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Nov 2020 20:46:21 -0000 Author: bdrewery Date: Tue Nov 24 20:46:20 2020 New Revision: 556185 URL: https://svnweb.freebsd.org/changeset/ports/556185 Log: - Fix KERB_GSSAPI build; missing prototypes for DH openssl-compat. PR: 212151 (maybe) Added: head/security/openssh-portable/files/extra-patch-gssapi-kexgssc.c (contents, props changed) head/security/openssh-portable/files/extra-patch-gssapi-kexgsss.c (contents, props changed) Modified: head/security/openssh-portable/Makefile Modified: head/security/openssh-portable/Makefile ============================================================================== --- head/security/openssh-portable/Makefile Tue Nov 24 20:35:40 2020 (r556184) +++ head/security/openssh-portable/Makefile Tue Nov 24 20:46:20 2020 (r556185) @@ -3,7 +3,7 @@ PORTNAME= openssh DISTVERSION= 8.4p1 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= security MASTER_SITES= OPENBSD/OpenSSH/portable @@ -115,6 +115,8 @@ PATCH_SITES+= https://sources.debian.org/data/main/o/o GSSAPI_UPDATE_DATE= 20200607 PATCHFILES+= openssh-${DISTVERSION}-gsskex-all-20141021-debian-rh-${GSSAPI_UPDATE_DATE}.patch:-p1:gsskex EXTRA_PATCHES+= ${FILESDIR}/extra-patch-gssapi-sshconnect2.c +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-gssapi-kexgssc.c +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-gssapi-kexgsss.c .endif .if ${PORT_OPTIONS:MBLACKLISTD} Added: head/security/openssh-portable/files/extra-patch-gssapi-kexgssc.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/openssh-portable/files/extra-patch-gssapi-kexgssc.c Tue Nov 24 20:46:20 2020 (r556185) @@ -0,0 +1,14 @@ +Fix prototype for DH_get0_key() in kexgssgex_client(). + +--- kexgssc.c.orig 2020-11-24 12:26:37.222092000 -0800 ++++ kexgssc.c 2020-11-24 12:26:54.801490000 -0800 +@@ -31,6 +31,9 @@ + #include + #include + ++#include ++#include "openbsd-compat/openssl-compat.h" ++ + #include + + #include "xmalloc.h" Added: head/security/openssh-portable/files/extra-patch-gssapi-kexgsss.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/openssh-portable/files/extra-patch-gssapi-kexgsss.c Tue Nov 24 20:46:20 2020 (r556185) @@ -0,0 +1,14 @@ +Fix prototype for DH_get0_key() in kexgssgex_server(). + +--- kexgsss.c.orig 2020-11-24 12:39:25.548427000 -0800 ++++ kexgsss.c 2020-11-24 12:39:47.591119000 -0800 +@@ -31,6 +31,9 @@ + #include + #include + ++#include ++#include "openbsd-compat/openssl-compat.h" ++ + #include "xmalloc.h" + #include "sshbuf.h" + #include "ssh2.h"