diff options
| author |   Patrick McLean <chutzpah@gentoo.org> | 2018-01-31 10:48:42 -0800 |
|---|---|---|
| committer | Patrick McLean <chutzpah@gentoo.org> | 2018-01-31 10:48:42 -0800 |
| commit | 324f88fc8ab4826980042078580e0f0fab644ca2 (patch) | |
| tree | 86dc8ac6dc6d1dc06da15dfaf05b78e0df195d72 /net-misc | |
| parent | sys-libs/binutils-libs: Correctly apply patches (diff) | |
| download | gentoo-324f88fc8ab4826980042078580e0f0fab644ca2.tar.gz gentoo-324f88fc8ab4826980042078580e0f0fab644ca2.tar.bz2 gentoo-324f88fc8ab4826980042078580e0f0fab644ca2.zip | |
net-misc/openssh: Forward port libressl patch to 7.6_p1-r3
Package-Manager: Portage-2.3.20, Repoman-2.3.6
Diffstat (limited to 'net-misc')
| -rw-r--r-- | net-misc/openssh/files/openssh-7.6_p1-x509-11.1-libressl.patch | 11 | ||||
| -rw-r--r-- | net-misc/openssh/openssh-7.6_p1-r3.ebuild | 1 |
2 files changed, 12 insertions, 0 deletions
diff --git a/net-misc/openssh/files/openssh-7.6_p1-x509-11.1-libressl.patch b/net-misc/openssh/files/openssh-7.6_p1-x509-11.1-libressl.patch new file mode 100644 index 000000000000..c3b6b4d61a3e --- /dev/null +++ b/net-misc/openssh/files/openssh-7.6_p1-x509-11.1-libressl.patch @@ -0,0 +1,11 @@ +--- a/openssh-7.6p1+x509-11.1.diff 2017-11-06 17:16:28.334140140 -0800 ++++ b/openssh-7.6p1+x509-11.1.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-r3.ebuild b/net-misc/openssh/openssh-7.6_p1-r3.ebuild index 0fb4aa2b639f..131e6e1da0d8 100644 --- a/net-misc/openssh/openssh-7.6_p1-r3.ebuild +++ b/net-misc/openssh/openssh-7.6_p1-r3.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 save_version X509 fi |