From: Patrick McLean Date: Tue, 23 Oct 2018 23:26:55 +0000 (-0700) Subject: net-misc/openssh: Fix X509 glue patch in 7.9_p1 X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=09cfa8e77bf5c560f64e750c71df8a0099e40a14;p=gentoo.git net-misc/openssh: Fix X509 glue patch in 7.9_p1 Fixes: 7e539010154b1efd978198ddd8902cfc0a5be957 Signed-off-by: Patrick McLean Package-Manager: Portage-2.3.51, Repoman-2.3.11 --- diff --git a/net-misc/openssh/files/openssh-7.9_p1-X509-glue.patch b/net-misc/openssh/files/openssh-7.9_p1-X509-glue.patch index e1d63ecc8aef..1f1ec4a4d773 100644 --- a/net-misc/openssh/files/openssh-7.9_p1-X509-glue.patch +++ b/net-misc/openssh/files/openssh-7.9_p1-X509-glue.patch @@ -1,11 +1,11 @@ ---- a/openssh-7.9p1+x509-11.5.diff 2018-10-19 11:41:13.791285390 -0700 -+++ b/openssh-7.9p1+x509-11.5.diff 2018-10-19 11:45:42.584694215 -0700 +--- a/openssh-7.9p1+x509-11.5.diff 2018-10-23 16:21:22.580154353 -0700 ++++ b/openssh-7.9p1+x509-11.5.diff 2018-10-23 16:22:39.600652048 -0700 @@ -44045,7 +44045,7 @@ ENGINE_register_all_complete(); +#endif --#if OPENSSL_VERSION_NUMBER < 0x10001000L -+-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + /* OPENSSL_config will load buildin engines and engines + * specified in configuration file, i.e. method call + * ENGINE_load_builtin_engines. Latter is only for