commit: d657309748c91e5d9da246b434ed51916448b38a
Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 7 01:29:03 2017 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Tue Nov 7 01:29:03 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6573097
net-misc/openssh: Make the 7.6p1 X509 patchset play nice with libressl
Package-Manager: Portage-2.3.13, Repoman-2.3.4
.../openssh/files/openssh-7.6_p1-x509-11.0-libressl.patch | 11 +++++++++++
net-misc/openssh/openssh-7.6_p1.ebuild | 1 +
2 files changed, 12 insertions(+)
diff --git a/net-misc/openssh/files/openssh-7.6_p1-x509-11.0-libressl.patch
b/net-misc/openssh/files/openssh-7.6_p1-x509-11.0-libressl.patch
new file mode 100644
index 00000000000..b84ee64e4f7
--- /dev/null
+++ b/net-misc/openssh/files/openssh-7.6_p1-x509-11.0-libressl.patch
@@ -0,0 +1,11 @@
+--- a/openssh-7.6p1+x509-11.0.diff 2017-11-06 17:16:28.334140140 -0800
++++ b/openssh-7.6p1+x509-11.0.diff 2017-11-06 17:16:55.338223563 -0800
+@@ -54732,7 +54732,7 @@
+ +int/*bool*/ ssh_x509store_addlocations(const X509StoreOptions *locations);
+ +
+ +typedef char SSHXSTOREPATH;
+-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ +DECLARE_STACK_OF(SSHXSTOREPATH)
+ +# define sk_SSHXSTOREPATH_new_null() SKM_sk_new_null(SSHXSTOREPATH)
+ +# define sk_SSHXSTOREPATH_num(st) SKM_sk_num(SSHXSTOREPATH, (st))
diff --git a/net-misc/openssh/openssh-7.6_p1.ebuild
b/net-misc/openssh/openssh-7.6_p1.ebuild
index a15c07cdc85..a932f59b746 100644
--- a/net-misc/openssh/openssh-7.6_p1.ebuild
+++ b/net-misc/openssh/openssh-7.6_p1.ebuild
@@ -118,6 +118,7 @@ src_prepare() {
if use hpn ; then
pushd "${WORKDIR}" >/dev/null
eapply
"${FILESDIR}"/${P}-hpn-x509-${X509_VER}-glue.patch
+ eapply
"${FILESDIR}"/${P}-x509-${X509_VER}-libressl.patch
popd >/dev/null
fi
save_version X509
