public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Mike Gilbert" <floppym@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/freerdp/files/, net-misc/freerdp/
Date: Thu, 14 Dec 2017 20:04:09 +0000 (UTC)	[thread overview]
Message-ID: <1513281845.9c7939e92210deb470bddaf8f293a7b3fd2dc36e.floppym@gentoo> (raw)

commit:     9c7939e92210deb470bddaf8f293a7b3fd2dc36e
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 14 20:03:37 2017 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Dec 14 20:04:05 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c7939e9

net-misc/freerdp: fix build with libressl

Closes: https://bugs.gentoo.org/640988
Package-Manager: Portage-2.3.18, Repoman-2.3.6_p30

 net-misc/freerdp/files/2.0.0-rc1-libressl.patch | 35 +++++++++++++++++++++++++
 net-misc/freerdp/freerdp-2.0.0_rc1.ebuild       |  4 +++
 2 files changed, 39 insertions(+)

diff --git a/net-misc/freerdp/files/2.0.0-rc1-libressl.patch b/net-misc/freerdp/files/2.0.0-rc1-libressl.patch
new file mode 100644
index 00000000000..76e2514ef2b
--- /dev/null
+++ b/net-misc/freerdp/files/2.0.0-rc1-libressl.patch
@@ -0,0 +1,35 @@
+From bfe3af4c72b45e33321962644d864843e1c9ce3d Mon Sep 17 00:00:00 2001
+From: Greg V <greg@unrelenting.technology>
+Date: Fri, 1 Dec 2017 18:34:48 +0300
+Subject: [PATCH] Fix LibreSSL build
+
+LibreSSL does not support FIPS mode.
+---
+ winpr/libwinpr/utils/ssl.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/winpr/libwinpr/utils/ssl.c b/winpr/libwinpr/utils/ssl.c
+index f749939ac..194f82609 100644
+--- a/winpr/libwinpr/utils/ssl.c
++++ b/winpr/libwinpr/utils/ssl.c
+@@ -279,7 +279,7 @@ static BOOL CALLBACK _winpr_openssl_initialize(PINIT_ONCE once, PVOID param, PVO
+ 
+ 	if (flags & WINPR_SSL_INIT_ENABLE_FIPS)
+ 	{
+-#if (OPENSSL_VERSION_NUMBER < 0x10001000L)
++#if (OPENSSL_VERSION_NUMBER < 0x10001000L) || defined(LIBRESSL_VERSION_NUMBER)
+ 		WLog_ERR(TAG, "Openssl fips mode ENable not available on openssl versions less than 1.0.1!");
+ #else
+ 		WLog_DBG(TAG, "Ensuring openssl fips mode is ENabled");
+@@ -348,7 +348,7 @@ BOOL winpr_CleanupSSL(DWORD flags)
+ 
+ BOOL winpr_FIPSMode(void)
+ {
+-#if (OPENSSL_VERSION_NUMBER < 0x10001000L)
++#if (OPENSSL_VERSION_NUMBER < 0x10001000L) || defined(LIBRESSL_VERSION_NUMBER)
+ 	return FALSE;
+ #else
+ 	return (FIPS_mode() == 1);
+-- 
+2.15.1
+

diff --git a/net-misc/freerdp/freerdp-2.0.0_rc1.ebuild b/net-misc/freerdp/freerdp-2.0.0_rc1.ebuild
index 631b7548fe1..c8a6ae3b610 100644
--- a/net-misc/freerdp/freerdp-2.0.0_rc1.ebuild
+++ b/net-misc/freerdp/freerdp-2.0.0_rc1.ebuild
@@ -88,6 +88,10 @@ DEPEND="${RDEPEND}
 	) ) )
 "
 
+PATCHES=(
+	"${FILESDIR}/2.0.0-rc1-libressl.patch"
+)
+
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_TESTING=$(usex test)


             reply	other threads:[~2017-12-14 20:04 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-12-14 20:04 Mike Gilbert [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-10-12 19:17 [gentoo-commits] repo/gentoo:master commit in: net-misc/freerdp/files/, net-misc/freerdp/ Mike Gilbert
2025-02-18 19:46 Mike Gilbert
2024-05-22 17:33 Mike Gilbert
2023-12-07 21:00 Mike Gilbert
2023-06-07 10:34 Sam James
2022-05-02 21:25 Mike Gilbert
2021-10-24 14:29 Mike Gilbert
2021-10-23 16:09 Mike Gilbert
2021-08-11 15:04 Mike Gilbert
2021-07-31 19:57 Mike Gilbert
2020-08-30 21:42 Mike Gilbert
2020-07-18 13:19 Mike Gilbert
2020-06-08 17:25 Mike Gilbert
2020-05-14 22:15 Thomas Deutschmann
2020-05-09  4:15 Mike Gilbert
2020-04-10 14:49 Mike Gilbert
2019-12-12 20:15 Mike Gilbert
2019-10-07 17:18 Mike Gilbert
2018-12-04 17:31 Mike Gilbert
2018-12-02 17:15 Mike Gilbert
2018-05-16 21:19 Mike Gilbert
2017-08-26 19:05 Mike Gilbert
2017-07-28 21:03 Mike Gilbert
2017-03-20 20:58 Mike Gilbert
2015-11-08 17:44 Mike Gilbert
2015-09-16 20:57 Alexis Ballier

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=1513281845.9c7939e92210deb470bddaf8f293a7b3fd2dc36e.floppym@gentoo \
    --to=floppym@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