From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 18058138334 for ; Tue, 23 Oct 2018 23:27:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9D72CE0917; Tue, 23 Oct 2018 23:27:22 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6D777E0917 for ; Tue, 23 Oct 2018 23:27:21 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 643A2335CD2 for ; Tue, 23 Oct 2018 23:27:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2F93A43B for ; Tue, 23 Oct 2018 23:27:18 +0000 (UTC) From: "Patrick McLean" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Patrick McLean" Message-ID: <1540337225.09cfa8e77bf5c560f64e750c71df8a0099e40a14.chutzpah@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/openssh/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/openssh/files/openssh-7.9_p1-X509-glue.patch X-VCS-Directories: net-misc/openssh/files/ X-VCS-Committer: chutzpah X-VCS-Committer-Name: Patrick McLean X-VCS-Revision: 09cfa8e77bf5c560f64e750c71df8a0099e40a14 X-VCS-Branch: master Date: Tue, 23 Oct 2018 23:27:18 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 2b700252-b436-4b8a-b26f-a754e2f4b026 X-Archives-Hash: 483a70857830b4680f0281fe6a02b22b commit: 09cfa8e77bf5c560f64e750c71df8a0099e40a14 Author: Patrick McLean sony com> AuthorDate: Tue Oct 23 23:26:55 2018 +0000 Commit: Patrick McLean gentoo org> CommitDate: Tue Oct 23 23:27:05 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09cfa8e7 net-misc/openssh: Fix X509 glue patch in 7.9_p1 Fixes: 7e539010154b1efd978198ddd8902cfc0a5be957 Signed-off-by: Patrick McLean gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 net-misc/openssh/files/openssh-7.9_p1-X509-glue.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 e1d63ecc8ae..1f1ec4a4d77 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