gentoo resync : 15.12.2017

4 files changed, 41 insertions, 5 deletions

diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest
index 565196d016fd..be2a5fd65895 100644
--- a/net-misc/freerdp/Manifest
+++ b/net-misc/freerdp/Manifest
@@ -1,5 +1,6 @@
 AUX 1.2.1-gstreamer.patch 3675 BLAKE2B 7e9ead69d46288a96e060451ed17e445e0feb27886d248e761b9bb0a2f25ba4b2c266e3cf9fd5a91429e3ea38cf78dec94c4a8b4fc6e2e2e23e8eeea3c718206 SHA512 758675e9f9292acc9877c37e240c8144a2e4f2f0440f9a75b64895f0f8514bb991cab4295250107b85df2058f07988c93f399690c8e06dbcfcb023d9dfde921e
 AUX 2.0.0-rc0-libressl.patch 3404 BLAKE2B 0365d3235e939917d4bc53ae4561d2085c4b7a99b8c585eddb8e5dea26a5038ea0a7f09b7ce1571516a4ce9e93b29113f2d35a1ff535a9a40a484352867bcb23 SHA512 b7b1018da4469de6c688e5894b200ec6846090e7e04ccd3e8e38b6f500832e75ffb30eef84845628eb26ed9ca64a4768dfd5c6a2f44d1fd13ad58b60074be21b
+AUX 2.0.0-rc1-libressl.patch 1196 BLAKE2B 73d75cb75f2ec3b7e4fe8a4f410f76ec69be4bae256dbed641796000a023c9f9516ec0815d3bdf968fab0fb92a12a8756221afd528280074aa7e96a8b39e8827 SHA512 e1404580a644253ef681a51c187fd8a3e983aa406276bf8420af7b5bdff2a42446e6ebd3c922d08fe0481ad1f7edf1a648d4be6eaa0fb6f2be4af8fd27aad7e0
 AUX freerdp-Fix-gstreamer-1.0-detection.patch 989 BLAKE2B 97989faf7984ed4b2f5720e45c590fb2f7751b6ebb18b244bf4e328d46856fc954020842aba49af75ac4bc2759f34687d95177ae8d7d7dfdef64a09f024f8315 SHA512 50fb859ce7dfb2af89efe5f40f0cf318da3fd32503b51e133e296420bde16bbc090f0aa10f6df09dce5ff9769e79fcabc1535f89413d962b7b06f6461dfcfb77
 AUX freerdp-armfp.patch 2930 BLAKE2B 33f324a88bcaa0f5340e9becdbc4c50589d8ecbc57c2f74da471b1b472e3b9895b8d26884df2b7d559c1b51b7e1d49450e710587d8b9a529755501af67e3c25f SHA512 57dd03e82b822fed95a5379aa79ada99910ef6c2a9cfaab1dc721181f76aa249d839576d31aa83e3568a37abc5b81a3ff8c5c2d0d15e6a5e457d254660581a48
 AUX freerdp-ffmpeg29.patch 1778 BLAKE2B a34acaa93eb59c01623151989ef8dd97e0aecc394219249d33ab6815b295e105a5d7db4baeca44a4a43f53665919a65466f9423b002e40648b02aaf6c1ea879b SHA512 c58acc5ddab34fe664d38649b7271ad793430cb1c9ad8e6b78f1924a8b70e1b8d76c426fb633cf6dd97fe3277664649fd7254e2e4377330c64234d23f1b26fd1
@@ -13,6 +14,6 @@ EBUILD freerdp-1.2.1_pre20150326-r1.ebuild 2786 BLAKE2B fe5e87301c14a9f29b33ca49
 EBUILD freerdp-2.0.0_pre20160722.ebuild 2618 BLAKE2B 687841e36c0c42a2f3e148b70d3b8d278d3ea6e715c26b3e07de5ed960c34672109756efef8f0d25389e834f6f47f1fe741cac039674364565ab69321e281403 SHA512 0b287c9c0aa5cc661077aba27d19b66e7df14286b026e096a8bc6caf29089130af8e8a8c07972157698ed6e2718d7c4ec2e98771688c49084d4ae9157913df25
 EBUILD freerdp-2.0.0_pre20161219.ebuild 2717 BLAKE2B c7c3832ce7386292bb6e30efcc4018b371daf6325d0eb3e51ad7fb82a46601e69094ab47a9914c31d3462536083092015c801f028e792eb50136af351959dabb SHA512 9b9c7c9183248983953e9dd654c804809f9c0be94eff4738d2d302e139e54aebdc76cadec90cd5fe0f54d3f687b1c68eb129316eb16e50df513fd343136570c2
 EBUILD freerdp-2.0.0_rc0.ebuild 2908 BLAKE2B c87595a615188f8f58fbb4e32b4feeead38f40a29b1ffdccadbeb899d839e6e797b46718a4de20714595c73f852cf9458e167e5b9e383256a61588437317eb9a SHA512 8192219991a7b3e1f1b7446b73146fccd5f16a1423567c16ea4b85182b70d4fd0441d82f7ad4ab37ab3ab94c8d703cca0b93717a283a360a78dec2292a7681e3
-EBUILD freerdp-2.0.0_rc1.ebuild 2804 BLAKE2B 40bd65365c6c4012b6e4dd14dfa7a7ffbd7b41e0b142e13c7f3d68f808a5e189c2ce45da9484dc591cc255f22774fbc55b65f5597fadd5ecf6c8a262bf38a545 SHA512 ae6d88b4550a423cdd0be6cb2969e965efb730fd44b9e3cc08e8fb067f4efc704832346c76dc90b90ba7cc1c7d7bb7d569c4a3e476bb0ad4a81786bc90baecfe
-EBUILD freerdp-9999.ebuild 2804 BLAKE2B 40bd65365c6c4012b6e4dd14dfa7a7ffbd7b41e0b142e13c7f3d68f808a5e189c2ce45da9484dc591cc255f22774fbc55b65f5597fadd5ecf6c8a262bf38a545 SHA512 ae6d88b4550a423cdd0be6cb2969e965efb730fd44b9e3cc08e8fb067f4efc704832346c76dc90b90ba7cc1c7d7bb7d569c4a3e476bb0ad4a81786bc90baecfe
+EBUILD freerdp-2.0.0_rc1.ebuild 2840 BLAKE2B 8d24bc59910e217d7e7629931dfc8f96cdacac922fbb37948dd0174906e7d090135f7774db668764c676fc5492ae88632bc2ebdccac8ded24126c9d93359b541 SHA512 f89c3b2b7715c895b461de05980af62e7ffdb42b7760d74945b34c425cc00585eb41adfb2b05360f4726c37c0515f6bedef727b229170714b80ca8308a6d4ae4
+EBUILD freerdp-9999.ebuild 2787 BLAKE2B 41da0f454a18824f8c490d45b8d9f56e14ea31605e5197c6334e9468220014c319563590fc07c51043e14521847a3f8912972021d9954b2742e69b33da3d2384 SHA512 c5f2fa5418e191aca81f2a5b8d69101d5ed09d44cfac1f8fb087f84b074098630d8860e69e7d818e921c35017a5293e4f881e59030dc926cf60ed90e9ea3c3a9
 MISC metadata.xml 532 BLAKE2B fc894629c3fa7e1e83f4b3a2e7697e820e705a4616de55d00c6c79a6d23438e5b7e4e192019dff50f17b102280802dc8d2742284b530fcb9e63935c13d95ae72 SHA512 7e80224d494d65b4215f157266512649803df82de87a73a68e08f8cc1a62b7e87b966641b75779179ed26fc124d4235e4efe9b239c13701c96f92de09bcab3b0
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 000000000000..76e2514ef2b0
--- /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 3c043ec465cd..c8a6ae3b610d 100644
--- a/net-misc/freerdp/freerdp-2.0.0_rc1.ebuild
+++ b/net-misc/freerdp/freerdp-2.0.0_rc1.ebuild
@@ -88,7 +88,9 @@ DEPEND="${RDEPEND}
 	) ) )
 "
 
-DOCS=( README )
+PATCHES=(
+	"${FILESDIR}/2.0.0-rc1-libressl.patch"
+)
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/net-misc/freerdp/freerdp-9999.ebuild b/net-misc/freerdp/freerdp-9999.ebuild
index 3c043ec465cd..631b7548fe13 100644
--- a/net-misc/freerdp/freerdp-9999.ebuild
+++ b/net-misc/freerdp/freerdp-9999.ebuild
@@ -88,8 +88,6 @@ DEPEND="${RDEPEND}
 	) ) )
 "
 
-DOCS=( README )
-
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_TESTING=$(usex test)