diff options
| author |   Patrick McLean <chutzpah@gentoo.org> | 2017-11-06 17:29:03 -0800 |
|---|---|---|
| committer | Patrick McLean <chutzpah@gentoo.org> | 2017-11-06 17:29:03 -0800 |
| commit | d657309748c91e5d9da246b434ed51916448b38a (patch) | |
| tree | 4d0f7dc44fbe55977522ba02e6fd101673d5b5a6 /net-misc/openssh | |
| parent | app-vim/pydoc: clean up old. (diff) | |
| download | gentoo-d657309748c91e5d9da246b434ed51916448b38a.tar.gz gentoo-d657309748c91e5d9da246b434ed51916448b38a.tar.bz2 gentoo-d657309748c91e5d9da246b434ed51916448b38a.zip | |
net-misc/openssh: Make the 7.6p1 X509 patchset play nice with libressl
Package-Manager: Portage-2.3.13, Repoman-2.3.4
Diffstat (limited to 'net-misc/openssh')
| -rw-r--r-- | net-misc/openssh/files/openssh-7.6_p1-x509-11.0-libressl.patch | 11 | ||||
| -rw-r--r-- | net-misc/openssh/openssh-7.6_p1.ebuild | 1 |
2 files changed, 12 insertions, 0 deletions
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 000000000000..b84ee64e4f7c --- /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 a15c07cdc85d..a932f59b746c 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 |