public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Bernard Cafarelli" <voyageur@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/rdesktop/files/
Date: Tue, 21 Aug 2018 20:34:21 +0000 (UTC)	[thread overview]
Message-ID: <1534883650.c987c9feec42910b20ffdee9b72dddbf5a6978ca.voyageur@gentoo> (raw)

commit:     c987c9feec42910b20ffdee9b72dddbf5a6978ca
Author:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 21 20:33:59 2018 +0000
Commit:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Tue Aug 21 20:34:10 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c987c9fe

net-misc/rdesktop: support libressl in openssl 1.1 patch

This patch uses openssl-1.1 specific functions when openssl version is
new enough. This fails for libressl (reporting itself as higher
version), the patch is updated to check for libressl version number too

Package-Manager: Portage-2.3.48, Repoman-2.3.10

 net-misc/rdesktop/files/rdesktop-1.8.3-openssl-1.1.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/rdesktop/files/rdesktop-1.8.3-openssl-1.1.patch b/net-misc/rdesktop/files/rdesktop-1.8.3-openssl-1.1.patch
index bea047cce9a..c74bd48c5aa 100644
--- a/net-misc/rdesktop/files/rdesktop-1.8.3-openssl-1.1.patch
+++ b/net-misc/rdesktop/files/rdesktop-1.8.3-openssl-1.1.patch
@@ -94,7 +94,7 @@ index 48751255..032e9b9e 100644
 +	BIGNUM *e = NULL;
 +	BIGNUM *n = NULL;
 +
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER))
 +	e = rkey->e;
 +	n = rkey->n;
 +#else


                 reply	other threads:[~2018-08-21 20:34 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1534883650.c987c9feec42910b20ffdee9b72dddbf5a6978ca.voyageur@gentoo \
    --to=voyageur@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox