svn commit: r556185 - in head/security/openssh-portable: . files
Bryan Drewery
bdrewery at FreeBSD.org
Tue Nov 24 20:46:21 UTC 2020
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 <openssl/crypto.h>
+ #include <openssl/bn.h>
+
++#include <openssl/dh.h>
++#include "openbsd-compat/openssl-compat.h"
++
+ #include <string.h>
+
+ #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 <openssl/crypto.h>
+ #include <openssl/bn.h>
+
++#include <openssl/dh.h>
++#include "openbsd-compat/openssl-compat.h"
++
+ #include "xmalloc.h"
+ #include "sshbuf.h"
+ #include "ssh2.h"
More information about the svn-ports-all
mailing list