gentoo resync : 13.10.2019

2 files changed, 61 insertions, 0 deletions

diff --git a/net-misc/freerdp/files/2.0.0-rc4-bitmap-endian.patch b/net-misc/freerdp/files/2.0.0-rc4-bitmap-endian.patch
new file mode 100644
index 000000000000..cd78ba983b7b
--- /dev/null
+++ b/net-misc/freerdp/files/2.0.0-rc4-bitmap-endian.patch
@@ -0,0 +1,30 @@
+From 18b193a1cf083b92279c3952f4f907a07cd92834 Mon Sep 17 00:00:00 2001
+From: Armin Novak <armin.novak@thincast.com>
+Date: Wed, 13 Feb 2019 09:30:34 +0100
+Subject: [PATCH] Fixed endianess issue with GETPIXEL16 and GETPIXEL32
+
+---
+ libfreerdp/codec/bitmap.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/libfreerdp/codec/bitmap.c b/libfreerdp/codec/bitmap.c
+index 7524bb99ce..479c965e52 100644
+--- a/libfreerdp/codec/bitmap.c
++++ b/libfreerdp/codec/bitmap.c
+@@ -26,12 +26,14 @@
+ 
+ static INLINE UINT16 GETPIXEL16(const void* d, UINT32 x, UINT32 y, UINT32 w)
+ {
+-	return (*(((const unsigned short*)d) + ((y) * (w) + (x))));
++	const BYTE* src = (const BYTE*)d + ((y * w + x) * sizeof(UINT16));
++	return (UINT16)(((UINT16)src[1] << 8) | (UINT16)src[0]);
+ }
+ 
+ static INLINE UINT32 GETPIXEL32(const void* d, UINT32 x, UINT32 y, UINT32 w)
+ {
+-	return (*(((const unsigned int*)d) + ((y) * (w) + (x))));
++	const BYTE* src = (const BYTE*)d + ((y * w + x) * sizeof(UINT32));
++	return (((UINT32)src[3]) << 24) | (((UINT32)src[2]) << 16) | (((UINT32)src[1]) << 8) | (src[0] & 0xFF);
+ }
+ 
+ /*****************************************************************************/
diff --git a/net-misc/freerdp/files/2.0.0-rc4-libressl.patch b/net-misc/freerdp/files/2.0.0-rc4-libressl.patch
index f666e0d4d671..fd6e6148607a 100644
--- a/net-misc/freerdp/files/2.0.0-rc4-libressl.patch
+++ b/net-misc/freerdp/files/2.0.0-rc4-libressl.patch
@@ -45,3 +45,34 @@ index 76f51701fe..ded41f127e 100644
  	SSL_CTX_set_security_level(tls->ctx, settings->TlsSecLevel);
  #endif
  
+From 0c83efa753d0457eb319624f87b491badf75105f Mon Sep 17 00:00:00 2001
+From: Armin Novak <armin.novak@thincast.com>
+Date: Mon, 7 Jan 2019 14:18:14 +0100
+Subject: [PATCH] Fix #5170: Disable custom TLS alert for libressl > 2.8.3
+
+---
+ libfreerdp/crypto/tls.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libfreerdp/crypto/tls.c b/libfreerdp/crypto/tls.c
+index b2cf5416c8..56e16bacb4 100644
+--- a/libfreerdp/crypto/tls.c
++++ b/libfreerdp/crypto/tls.c
+@@ -1030,7 +1030,8 @@ BOOL tls_send_alert(rdpTls* tls)
+ 	 * FIXME: The following code does not work on OpenSSL > 1.1.0 because the
+ 	 *        SSL struct is opaqe now
+ 	 */
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
++#if (!defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER < 0x10100000L)) || \
++	(defined(LIBRESSL_VERSION_NUMBER) && (LIBRESSL_VERSION_NUMBER <= 0x2080300fL))
+ 
+ 	if (tls->alertDescription != TLS_ALERT_DESCRIPTION_CLOSE_NOTIFY)
+ 	{
+@@ -1057,7 +1058,6 @@ BOOL tls_send_alert(rdpTls* tls)
+ 		if (tls->ssl->s3->wbuf.left == 0)
+ 			tls->ssl->method->ssl_dispatch_alert(tls->ssl);
+ 	}
+-
+ #endif
+ 	return TRUE;
+ }