[gentoo-commits] repo/gentoo:master commit in: net-misc/freerdp/, net-misc/freerdp/files/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: net-misc/freerdp/, net-misc/freerdp/files/
@ 2016-12-15 17:33 Lars Wendler
  0 siblings, 0 replies; 8+ messages in thread
From: Lars Wendler @ 2016-12-15 17:33 UTC (permalink / raw
  To: gentoo-commits

commit:     ff94920758712c9f107e710cc5095eb6500c5cd0
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 15 17:32:38 2016 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Dec 15 17:33:28 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff949207

net-misc/freerdp: Removed old.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 net-misc/freerdp/Manifest                          |   1 -
 .../freerdp/files/freerdp-1.1-CVE-2014-0250.patch  | 308 ---------------------
 net-misc/freerdp/files/freerdp-1.1-cmake-3.1.patch |  68 -----
 .../freerdp/files/freerdp-1.1.0_beta1-avx.patch    |  61 ----
 .../freerdp-1.1.0_beta1_p20130710-cmake.patch      |  25 --
 .../freerdp-1.1.0_beta1_p20130710-ffmpeg.patch     | 127 ---------
 .../freerdp-1.1.0_beta1_p20130710-uclibc.patch     |  66 -----
 net-misc/freerdp/files/freerdp-cmake-3.1.patch     |  98 -------
 .../freerdp-1.1.0_beta1_p20130710-r2.ebuild        | 117 --------
 9 files changed, 871 deletions(-)

diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest
index b707eea..5d06680 100644
--- a/net-misc/freerdp/Manifest
+++ b/net-misc/freerdp/Manifest
@@ -1,3 +1,2 @@
-DIST freerdp-1.1.0_beta1_p20130710.tar.gz 6682149 SHA256 0d0d2eec7e78b61458415ee98ad54379b31e9fc269b8bacf3e939bd048ac5e61 SHA512 89ec08acff5c9bbafe107cd079005146b6c4447fbe3172d8f774a20ab6b5e1f24abdeab2d7cb0d7694251aaea2924b0a10f1c0b4b660994cdfa51e8428b90440 WHIRLPOOL 2f7c04bde54293fc8fc85ba03baf7dc64e5da4cecdc87aaaa2ff316127abc43f0b56d70e14652f97f2e97a8f43bee8880837a94230448397dfad5f4ddbd055b1
 DIST freerdp-1.2.1_pre20150326.tar.gz 6146857 SHA256 c0646f224ea30a485e165fb31eb8a039af2ca3f257cdf784b319e1b5c13e0425 SHA512 ca1499d56ecb9c9bc624de2ecc976eb9633b795050ac01e16fcc9e0a8951d274cc63644a0e2b830e75f66de894f6a22274864fd20a9351834f6d664874e65ec8 WHIRLPOOL 1ff6ce70d454a7e0cbb3cd4fbafe1fb4191dadc3b2f8a6dbff10d8c725b8fc2838a863837d9b01f6daa670483fe40266fb57569904ad8ac8503549d6605c9e64
 DIST freerdp-2.0.0_pre20160722.tar.gz 6412437 SHA256 17d6b7b9ec6bcfbb78d72ecda034e1ed6bdae4f95a8100297096a5e5e095463a SHA512 3b67de8f31740ccba0ce59f0035328bda6c1602e6197a31008bdd5bcab15e85f473c6c4eca5cb87670b34fa174e4b0da21a7f75be99686df485bb7f9cda6f589 WHIRLPOOL b494070185435da954e9d998915fbe4b47286c803c03bc4839afa583082434fc4d51776b62db27255b9ba62ecb8ef9c95af96e2920414e0fff9b27dceecb4cd4

diff --git a/net-misc/freerdp/files/freerdp-1.1-CVE-2014-0250.patch b/net-misc/freerdp/files/freerdp-1.1-CVE-2014-0250.patch
deleted file mode 100644
index ce4d3d9..00000000
--- a/net-misc/freerdp/files/freerdp-1.1-CVE-2014-0250.patch
+++ /dev/null
@@ -1,308 +0,0 @@
-From 5ad707ddf33d1d785a8ca1fbeec91d2eee985820 Mon Sep 17 00:00:00 2001
-From: Hardening <rdp.effort@gmail.com>
-Date: Fri, 6 Jun 2014 23:24:16 +0200
-Subject: [PATCH] Fix CVE-2014-0250
-
-This patch fixes CVE-2014-0250 by checking width, height and bpp when
-receiving a new pointer.
----
- client/X11/xf_cliprdr.c    | 11 +++++--
- libfreerdp/core/fastpath.c |  2 +-
- libfreerdp/core/orders.c   | 21 ++++++++++++
- libfreerdp/core/surface.c  |  6 ++++
- libfreerdp/core/update.c   | 82 +++++++++++++++++++++++++++++++++++++++-------
- libfreerdp/core/update.h   |  2 +-
- libfreerdp/core/window.c   |  5 +++
- 7 files changed, 114 insertions(+), 15 deletions(-)
-
-diff --git a/client/X11/xf_cliprdr.c b/client/X11/xf_cliprdr.c
-index 19c4332..8fb49f9 100644
---- a/client/X11/xf_cliprdr.c
-+++ b/client/X11/xf_cliprdr.c
-@@ -914,7 +914,7 @@ static void xf_cliprdr_process_unicodetext(clipboardContext* cb, BYTE* data, int
- 	crlf2lf(cb->data, &cb->data_length);
- }
- 
--static void xf_cliprdr_process_dib(clipboardContext* cb, BYTE* data, int size)
-+static BOOL xf_cliprdr_process_dib(clipboardContext* cb, BYTE* data, int size)
- {
- 	wStream* s;
- 	UINT16 bpp;
-@@ -926,12 +926,18 @@ static void xf_cliprdr_process_dib(clipboardContext* cb, BYTE* data, int size)
- 	if (size < 40)
- 	{
- 		DEBUG_X11_CLIPRDR("dib size %d too short", size);
--		return;
-+		return FALSE;
- 	}
- 
- 	s = Stream_New(data, size);
- 	Stream_Seek(s, 14);
- 	Stream_Read_UINT16(s, bpp);
-+	if ((bpp < 1) || (bpp > 32))
-+	{
-+		fprintf(stderr, "%s: invalid bpp value %d", __FUNCTION__, bpp);
-+		return FALSE;
-+	}
-+
- 	Stream_Read_UINT32(s, ncolors);
- 	offset = 14 + 40 + (bpp <= 8 ? (ncolors == 0 ? (1 << bpp) : ncolors) * 4 : 0);
- 	Stream_Free(s, FALSE);
-@@ -949,6 +955,7 @@ static void xf_cliprdr_process_dib(clipboardContext* cb, BYTE* data, int size)
- 	cb->data = Stream_Buffer(s);
- 	cb->data_length = Stream_GetPosition(s);
- 	Stream_Free(s, FALSE);
-+	return TRUE;
- }
- 
- static void xf_cliprdr_process_html(clipboardContext* cb, BYTE* data, int size)
-diff --git a/libfreerdp/core/fastpath.c b/libfreerdp/core/fastpath.c
-index 8448160..dcc7117 100644
---- a/libfreerdp/core/fastpath.c
-+++ b/libfreerdp/core/fastpath.c
-@@ -254,7 +254,7 @@ static int fastpath_recv_update(rdpFastPath* fastpath, BYTE updateCode, UINT32 s
- 			break;
- 
- 		case FASTPATH_UPDATETYPE_COLOR:
--			if (!update_read_pointer_color(s, &pointer->pointer_color))
-+			if (!update_read_pointer_color(s, &pointer->pointer_color, 24))
- 				return -1;
- 			IFCALL(pointer->PointerColor, context, &pointer->pointer_color);
- 			break;
-diff --git a/libfreerdp/core/orders.c b/libfreerdp/core/orders.c
-index e5cc520..f22407f 100644
---- a/libfreerdp/core/orders.c
-+++ b/libfreerdp/core/orders.c
-@@ -1830,6 +1830,11 @@ BOOL update_read_cache_bitmap_order(wStream* s, CACHE_BITMAP_ORDER* cache_bitmap
- 	Stream_Read_UINT8(s, cache_bitmap->bitmapWidth); /* bitmapWidth (1 byte) */
- 	Stream_Read_UINT8(s, cache_bitmap->bitmapHeight); /* bitmapHeight (1 byte) */
- 	Stream_Read_UINT8(s, cache_bitmap->bitmapBpp); /* bitmapBpp (1 byte) */
-+	if ((cache_bitmap->bitmapBpp < 1) || (cache_bitmap->bitmapBpp > 32))
-+	{
-+		fprintf(stderr, "%s: invalid bitmap bpp %d\n", __FUNCTION__, cache_bitmap->bitmapBpp);
-+		return FALSE;
-+	}
- 	Stream_Read_UINT16(s, cache_bitmap->bitmapLength); /* bitmapLength (2 bytes) */
- 	Stream_Read_UINT16(s, cache_bitmap->cacheIndex); /* cacheIndex (2 bytes) */
- 
-@@ -2068,6 +2073,11 @@ BOOL update_read_cache_bitmap_v3_order(wStream* s, CACHE_BITMAP_V3_ORDER* cache_
- 	bitmapData = &cache_bitmap_v3->bitmapData;
- 
- 	Stream_Read_UINT8(s, bitmapData->bpp);
-+	if ((bitmapData->bpp < 1) || (bitmapData->bpp > 32))
-+	{
-+		fprintf(stderr, "%s: invalid bpp value %d", __FUNCTION__, bitmapData->bpp);
-+		return FALSE;
-+	}
- 	Stream_Seek_UINT8(s); /* reserved1 (1 byte) */
- 	Stream_Seek_UINT8(s); /* reserved2 (1 byte) */
- 	Stream_Read_UINT8(s, bitmapData->codecID); /* codecID (1 byte) */
-@@ -2672,6 +2682,11 @@ BOOL update_read_create_nine_grid_bitmap_order(wStream* s, CREATE_NINE_GRID_BITM
- 		return FALSE;
- 
- 	Stream_Read_UINT8(s, create_nine_grid_bitmap->bitmapBpp); /* bitmapBpp (1 byte) */
-+	if ((create_nine_grid_bitmap->bitmapBpp < 1) || (create_nine_grid_bitmap->bitmapBpp > 32))
-+	{
-+		fprintf(stderr, "%s: invalid bpp value %d", __FUNCTION__, create_nine_grid_bitmap->bitmapBpp);
-+		return FALSE;
-+	}
- 	Stream_Read_UINT16(s, create_nine_grid_bitmap->bitmapId); /* bitmapId (2 bytes) */
- 
- 	nineGridInfo = &(create_nine_grid_bitmap->nineGridInfo);
-@@ -2707,6 +2722,12 @@ BOOL update_read_stream_bitmap_first_order(wStream* s, STREAM_BITMAP_FIRST_ORDER
- 
- 	Stream_Read_UINT8(s, stream_bitmap_first->bitmapFlags); /* bitmapFlags (1 byte) */
- 	Stream_Read_UINT8(s, stream_bitmap_first->bitmapBpp); /* bitmapBpp (1 byte) */
-+	if ((stream_bitmap_first->bitmapBpp < 1) || (stream_bitmap_first->bitmapBpp > 32))
-+	{
-+		fprintf(stderr, "%s: invalid bpp value %d", __FUNCTION__, stream_bitmap_first->bitmapBpp);
-+		return FALSE;
-+	}
-+
- 	Stream_Read_UINT16(s, stream_bitmap_first->bitmapType); /* bitmapType (2 bytes) */
- 	Stream_Read_UINT16(s, stream_bitmap_first->bitmapWidth); /* bitmapWidth (2 bytes) */
- 	Stream_Read_UINT16(s, stream_bitmap_first->bitmapHeight); /* bitmapHeigth (2 bytes) */
-diff --git a/libfreerdp/core/surface.c b/libfreerdp/core/surface.c
-index 7d0fb22..992a3dd 100644
---- a/libfreerdp/core/surface.c
-+++ b/libfreerdp/core/surface.c
-@@ -38,6 +38,12 @@ static int update_recv_surfcmd_surface_bits(rdpUpdate* update, wStream* s, UINT3
- 	Stream_Read_UINT16(s, cmd->destRight);
- 	Stream_Read_UINT16(s, cmd->destBottom);
- 	Stream_Read_UINT8(s, cmd->bpp);
-+	if ((cmd->bpp < 1) || (cmd->bpp > 32))
-+	{
-+		fprintf(stderr, "%s: invalid bpp value %d", __FUNCTION__, cmd->bpp);
-+		return FALSE;
-+	}
-+
- 	Stream_Seek(s, 2); /* reserved1, reserved2 */
- 	Stream_Read_UINT8(s, cmd->codecID);
- 	Stream_Read_UINT16(s, cmd->width);
-diff --git a/libfreerdp/core/update.c b/libfreerdp/core/update.c
-index c4eaede..27c36e3 100644
---- a/libfreerdp/core/update.c
-+++ b/libfreerdp/core/update.c
-@@ -219,16 +219,32 @@ BOOL update_read_pointer_system(wStream* s, POINTER_SYSTEM_UPDATE* pointer_syste
- 	return TRUE;
- }
- 
--BOOL update_read_pointer_color(wStream* s, POINTER_COLOR_UPDATE* pointer_color)
-+BOOL update_read_pointer_color(wStream* s, POINTER_COLOR_UPDATE* pointer_color, int xorBpp)
- {
-+	BYTE *newMask;
-+	int scanlineSize;
-+
- 	if (Stream_GetRemainingLength(s) < 14)
- 		return FALSE;
- 
- 	Stream_Read_UINT16(s, pointer_color->cacheIndex); /* cacheIndex (2 bytes) */
- 	Stream_Read_UINT16(s, pointer_color->xPos); /* xPos (2 bytes) */
- 	Stream_Read_UINT16(s, pointer_color->yPos); /* yPos (2 bytes) */
-+
-+	/**
-+	 *  As stated in 2.2.9.1.1.4.4 Color Pointer Update:
-+	 *  The maximum allowed pointer width/height is 96 pixels if the client indicated support
-+	 *  for large pointers by setting the LARGE_POINTER_FLAG (0x00000001) in the Large
-+	 *  Pointer Capability Set (section 2.2.7.2.7). If the LARGE_POINTER_FLAG was not
-+	 *  set, the maximum allowed pointer width/height is 32 pixels.
-+	 *
-+	 *  So we check for a maximum of 96 for CVE-2014-0250.
-+	 */
- 	Stream_Read_UINT16(s, pointer_color->width); /* width (2 bytes) */
- 	Stream_Read_UINT16(s, pointer_color->height); /* height (2 bytes) */
-+	if ((pointer_color->width > 96) || (pointer_color->height > 96))
-+		return FALSE;
-+
- 	Stream_Read_UINT16(s, pointer_color->lengthAndMask); /* lengthAndMask (2 bytes) */
- 	Stream_Read_UINT16(s, pointer_color->lengthXorMask); /* lengthXorMask (2 bytes) */
- 
-@@ -245,26 +261,65 @@ BOOL update_read_pointer_color(wStream* s, POINTER_COLOR_UPDATE* pointer_color)
- 
- 	if (pointer_color->lengthXorMask > 0)
- 	{
-+		/**
-+		 * Spec states that:
-+		 *
-+		 * xorMaskData (variable): A variable-length array of bytes. Contains the 24-bpp, bottom-up
-+		 * XOR mask scan-line data. The XOR mask is padded to a 2-byte boundary for each encoded
-+		 * scan-line. For example, if a 3x3 pixel cursor is being sent, then each scan-line will consume 10
-+		 * bytes (3 pixels per scan-line multiplied by 3 bytes per pixel, rounded up to the next even
-+		 * number of bytes).
-+		 *
-+		 * In fact instead of 24-bpp, the bpp parameter is given by the containing packet.
-+		 */
- 		if (Stream_GetRemainingLength(s) < pointer_color->lengthXorMask)
- 			return FALSE;
- 
--		if (!pointer_color->xorMaskData)
--			pointer_color->xorMaskData = malloc(pointer_color->lengthXorMask);
--		else
--			pointer_color->xorMaskData = realloc(pointer_color->xorMaskData, pointer_color->lengthXorMask);
-+		scanlineSize = (7 + xorBpp * pointer_color->width) / 8;
-+		scanlineSize = ((scanlineSize + 1) / 2) * 2;
-+		if (scanlineSize * pointer_color->height != pointer_color->lengthXorMask)
-+		{
-+			fprintf(stderr, "%s: invalid lengthXorMask: width=%d height=%d, %d instead of %d\n", __FUNCTION__,
-+					pointer_color->width, pointer_color->height,
-+					pointer_color->lengthXorMask, scanlineSize * pointer_color->height);
-+			return FALSE;
-+		}
-+
-+		newMask = realloc(pointer_color->xorMaskData, pointer_color->lengthXorMask);
-+		if (!newMask)
-+			return FALSE;
-+
-+		pointer_color->xorMaskData = newMask;
- 
- 		Stream_Read(s, pointer_color->xorMaskData, pointer_color->lengthXorMask);
- 	}
- 
- 	if (pointer_color->lengthAndMask > 0)
- 	{
-+		/**
-+		 * andMaskData (variable): A variable-length array of bytes. Contains the 1-bpp, bottom-up
-+		 * AND mask scan-line data. The AND mask is padded to a 2-byte boundary for each encoded
-+		 * scan-line. For example, if a 7x7 pixel cursor is being sent, then each scan-line will consume 2
-+		 * bytes (7 pixels per scan-line multiplied by 1 bpp, rounded up to the next even number of
-+		 * bytes).
-+		 */
- 		if (Stream_GetRemainingLength(s) < pointer_color->lengthAndMask)
- 			return FALSE;
- 
--		if (!pointer_color->andMaskData)
--			pointer_color->andMaskData = malloc(pointer_color->lengthAndMask);
--		else
--			pointer_color->andMaskData = realloc(pointer_color->andMaskData, pointer_color->lengthAndMask);
-+		scanlineSize = ((7 + pointer_color->width) / 8);
-+		scanlineSize = ((1 + scanlineSize) / 2) * 2;
-+		if (scanlineSize * pointer_color->height != pointer_color->lengthAndMask)
-+		{
-+			fprintf(stderr, "%s: invalid lengthAndMask: %d instead of %d\n", __FUNCTION__,
-+					pointer_color->lengthAndMask, scanlineSize * pointer_color->height);
-+			return FALSE;
-+		}
-+
-+		newMask = realloc(pointer_color->andMaskData, pointer_color->lengthAndMask);
-+		if (!newMask)
-+			return FALSE;
-+
-+		pointer_color->andMaskData = newMask;
- 
- 		Stream_Read(s, pointer_color->andMaskData, pointer_color->lengthAndMask);
- 	}
-@@ -281,7 +336,12 @@ BOOL update_read_pointer_new(wStream* s, POINTER_NEW_UPDATE* pointer_new)
- 		return FALSE;
- 
- 	Stream_Read_UINT16(s, pointer_new->xorBpp); /* xorBpp (2 bytes) */
--	return update_read_pointer_color(s, &pointer_new->colorPtrAttr); /* colorPtrAttr */
-+	if ((pointer_new->xorBpp < 1) || (pointer_new->xorBpp > 32))
-+	{
-+		fprintf(stderr, "%s: invalid xorBpp %d\n", __FUNCTION__, pointer_new->xorBpp);
-+		return FALSE;
-+	}
-+	return update_read_pointer_color(s, &pointer_new->colorPtrAttr, pointer_new->xorBpp); /* colorPtrAttr */
- }
- 
- BOOL update_read_pointer_cached(wStream* s, POINTER_CACHED_UPDATE* pointer_cached)
-@@ -320,7 +380,7 @@ BOOL update_recv_pointer(rdpUpdate* update, wStream* s)
- 			break;
- 
- 		case PTR_MSG_TYPE_COLOR:
--			if (!update_read_pointer_color(s, &pointer->pointer_color))
-+			if (!update_read_pointer_color(s, &pointer->pointer_color, 24))
- 				return FALSE;
- 			IFCALL(pointer->PointerColor, context, &pointer->pointer_color);
- 			break;
-diff --git a/libfreerdp/core/update.h b/libfreerdp/core/update.h
-index c3088f2..d6c2d59 100644
---- a/libfreerdp/core/update.h
-+++ b/libfreerdp/core/update.h
-@@ -53,7 +53,7 @@ BOOL update_recv(rdpUpdate* update, wStream* s);
- 
- BOOL update_read_pointer_position(wStream* s, POINTER_POSITION_UPDATE* pointer_position);
- BOOL update_read_pointer_system(wStream* s, POINTER_SYSTEM_UPDATE* pointer_system);
--BOOL update_read_pointer_color(wStream* s, POINTER_COLOR_UPDATE* pointer_color);
-+BOOL update_read_pointer_color(wStream* s, POINTER_COLOR_UPDATE* pointer_color, int xorBpp);
- BOOL update_read_pointer_new(wStream* s, POINTER_NEW_UPDATE* pointer_new);
- BOOL update_read_pointer_cached(wStream* s, POINTER_CACHED_UPDATE* pointer_cached);
- 
-diff --git a/libfreerdp/core/window.c b/libfreerdp/core/window.c
-index 7422f5b..c10fa33 100644
---- a/libfreerdp/core/window.c
-+++ b/libfreerdp/core/window.c
-@@ -35,6 +35,11 @@ BOOL update_read_icon_info(wStream* s, ICON_INFO* icon_info)
- 	Stream_Read_UINT16(s, icon_info->cacheEntry); /* cacheEntry (2 bytes) */
- 	Stream_Read_UINT8(s, icon_info->cacheId); /* cacheId (1 byte) */
- 	Stream_Read_UINT8(s, icon_info->bpp); /* bpp (1 byte) */
-+	if ((icon_info->bpp < 1) || (icon_info->bpp > 32))
-+	{
-+		fprintf(stderr, "%s: invalid bpp %d\n", __FUNCTION__, icon_info->bpp);
-+		return FALSE;
-+	}
- 	Stream_Read_UINT16(s, icon_info->width); /* width (2 bytes) */
- 	Stream_Read_UINT16(s, icon_info->height); /* height (2 bytes) */
- 
--- 
-1.9.3
-

diff --git a/net-misc/freerdp/files/freerdp-1.1-cmake-3.1.patch b/net-misc/freerdp/files/freerdp-1.1-cmake-3.1.patch
deleted file mode 100644
index aedfeb0..00000000
--- a/net-misc/freerdp/files/freerdp-1.1-cmake-3.1.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 1b663ceffe51008af7ae9749e5b7999b2f7d6698 Mon Sep 17 00:00:00 2001
-From: Bernhard Miklautz <bernhard.miklautz@shacknet.at>
-Date: Fri, 12 Dec 2014 18:26:45 +0100
-Subject: [PATCH] build: cmake 3.1 compatibility
-
-* fix problem with REMOVE_DUPLICATES on undefined lists
-* since 3.1 file(GLOB FILEPATHS RELATIVE .. returns single / instead of // as
-  previously - necessary adoptions for regex and matches done. Should
-	work with all cmake versions.
-
-Tested with 3.1.0-rc3
----
- channels/CMakeLists.txt        | 4 ++--
- channels/client/CMakeLists.txt | 2 ++
- client/CMakeLists.txt          | 4 ++--
- server/CMakeLists.txt          | 4 ++--
- third-party/CMakeLists.txt     | 6 +++---
- 5 files changed, 11 insertions(+), 9 deletions(-)
-
-diff --git a/channels/CMakeLists.txt b/channels/CMakeLists.txt
-index c4e6048..540b1ac 100644
---- a/channels/CMakeLists.txt
-+++ b/channels/CMakeLists.txt
-@@ -253,8 +253,8 @@ set(FILENAME "ChannelOptions.cmake")
- file(GLOB FILEPATHS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*/${FILENAME}")
- 
- foreach(FILEPATH ${FILEPATHS})
--	if(${FILEPATH} MATCHES "^([^/]*)//${FILENAME}")
--		string(REGEX REPLACE "^([^/]*)//${FILENAME}" "\\1" DIR ${FILEPATH})
-+	if(${FILEPATH} MATCHES "^([^/]*)/+${FILENAME}")
-+		string(REGEX REPLACE "^([^/]*)/+${FILENAME}" "\\1" DIR ${FILEPATH})
- 		set(CHANNEL_OPTION)
- 		include(${FILEPATH})
- 		if(${CHANNEL_OPTION})
-diff --git a/channels/client/CMakeLists.txt b/channels/client/CMakeLists.txt
-index 049bc7b..2db18e8 100644
---- a/channels/client/CMakeLists.txt
-+++ b/channels/client/CMakeLists.txt
-@@ -24,7 +24,9 @@ set(${MODULE_PREFIX}_SRCS
- 	${CMAKE_CURRENT_SOURCE_DIR}/addin.c
- 	${CMAKE_CURRENT_SOURCE_DIR}/addin.h)
- 
-+if(CHANNEL_STATIC_CLIENT_ENTRIES)
- list(REMOVE_DUPLICATES CHANNEL_STATIC_CLIENT_ENTRIES)
-+endif()
- 
- foreach(STATIC_ENTRY ${CHANNEL_STATIC_CLIENT_ENTRIES})
- 	foreach(STATIC_MODULE ${CHANNEL_STATIC_CLIENT_MODULES})
-diff --git a/third-party/CMakeLists.txt b/third-party/CMakeLists.txt
-index 09b1fd4..610f35e 100644
---- a/third-party/CMakeLists.txt
-+++ b/third-party/CMakeLists.txt
-@@ -22,11 +22,11 @@
- file(GLOB all_valid_subdirs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*/CMakeLists.txt")
- 
- foreach(dir ${all_valid_subdirs})
--	if(${dir} MATCHES "^([^/]*)//CMakeLists.txt")
--		string(REGEX REPLACE "^([^/]*)//CMakeLists.txt" "\\1" dir_trimmed ${dir})
-+	if(${dir} MATCHES "^([^/]*)/+CMakeLists.txt")
-+		string(REGEX REPLACE "^([^/]*)/+CMakeLists.txt" "\\1" dir_trimmed ${dir})
- 		message(STATUS "Adding third-party component ${dir_trimmed}")
- 		add_subdirectory(${dir_trimmed})
- 	endif()
- endforeach(dir)
- 
--set(THIRD_PARTY_INCLUDES ${THIRD_PARTY_INCLUDES} PARENT_SCOPE)
-\ No newline at end of file
-+set(THIRD_PARTY_INCLUDES ${THIRD_PARTY_INCLUDES} PARENT_SCOPE)

diff --git a/net-misc/freerdp/files/freerdp-1.1.0_beta1-avx.patch b/net-misc/freerdp/files/freerdp-1.1.0_beta1-avx.patch
deleted file mode 100644
index 8a07e8a..00000000
--- a/net-misc/freerdp/files/freerdp-1.1.0_beta1-avx.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-commit 81580f10d910a8e88bc09c1fc692a2e14161ffa1
-Author: Bernhard Miklautz <bernhard.miklautz@shacknet.at>
-Date:   Thu Mar 14 23:18:21 2013 +0100
-
-    winpr/sysinfo: fixed build and detection when build with AVX
-
-diff --git a/winpr/libwinpr/sysinfo/sysinfo.c b/winpr/libwinpr/sysinfo/sysinfo.c
-index 947dc24..59200cc 100644
---- a/winpr/libwinpr/sysinfo/sysinfo.c
-+++ b/winpr/libwinpr/sysinfo/sysinfo.c
-@@ -662,32 +662,29 @@ BOOL IsProcessorFeaturePresentEx(DWORD ProcessorFeature)
- 		case PF_EX_AVX_AES:
- 			{
- 				if ((c & C_BITS_AVX) != C_BITS_AVX)
--					ret = FALSE;
-+					break;
- 
--					int e, f;
--					xgetbv(0, e, f);
-+				int e, f;
-+				xgetbv(0, e, f);
- 
--					if ((e & E_BITS_AVX) == E_BITS_AVX)
-+				if ((e & E_BITS_AVX) == E_BITS_AVX)
-+				{
-+					switch (ProcessorFeature)
- 					{
--						switch (ProcessorFeature)
--						{
--							case: PF_EX_AVX:
--								ret = TRUE;
--								break;
--							case: PF_EX_FMA:
--								if (c & C_BIT_FMA)
--									ret = TRUE;
--								break;
--							case: PF_EX_AVX_AES:
--								if (c & C_BIT_AVX_AES)
--									ret = TRUE;
--								break;
--						{
-+						case PF_EX_AVX:
- 							ret = TRUE;
- 							break;
--						}
--        }
--			}
-+						case PF_EX_FMA:
-+							if (c & C_BIT_FMA)
-+								ret = TRUE;
-+							break;
-+						case PF_EX_AVX_AES:
-+							if (c & C_BIT_AVX_AES)
-+								ret = TRUE;
-+							break;
-+					}
-+				}
-+      }
- 			break;
- #endif //__AVX__
- 		default:

diff --git a/net-misc/freerdp/files/freerdp-1.1.0_beta1_p20130710-cmake.patch b/net-misc/freerdp/files/freerdp-1.1.0_beta1_p20130710-cmake.patch
deleted file mode 100644
index 4ab536a..00000000
--- a/net-misc/freerdp/files/freerdp-1.1.0_beta1_p20130710-cmake.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From a668a644889bd58405b92c72a91c308c2bad8022 Mon Sep 17 00:00:00 2001
-From: Bernhard Miklautz <bernhard.miklautz@thincast.com>
-Date: Tue, 11 Nov 2014 14:40:31 +0100
-Subject: [PATCH] Don't include CMakeDetermineSystem
-
-According to [1] this is an cmake "internal" module and shouldn't be
-included directly.
-
-[1]  http://public.kitware.com/Bug/view.php?id=13796#c31892
----
- CMakeLists.txt | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 79f17bd..5f6859c 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -44,7 +44,6 @@ include(CheckCmakeCompat)
- include(CheckIncludeFiles)
- include(CheckLibraryExists)
- include(CheckStructHasMember)
--include(CMakeDetermineSystem)
- include(FindPkgConfig)
- include(TestBigEndian)
- 

diff --git a/net-misc/freerdp/files/freerdp-1.1.0_beta1_p20130710-ffmpeg.patch b/net-misc/freerdp/files/freerdp-1.1.0_beta1_p20130710-ffmpeg.patch
deleted file mode 100644
index 0e08c60..00000000
--- a/net-misc/freerdp/files/freerdp-1.1.0_beta1_p20130710-ffmpeg.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-From bf065f3e892e0a94e442de9a7155a7ac170f2add Mon Sep 17 00:00:00 2001
-From: eroen <eroen@falcon.eroen.eu>
-Date: Thu, 21 Nov 2013 11:35:53 +0100
-Subject: [PATCH 1/3] ffmpeg-2 -- AVCODEC_MAX_AUDIO_FRAME_SIZE
-
-deprecated:
-http://git.videolan.org/?p=ffmpeg.git;a=commit;h=0eea212943544d40f99b05571aa7159d78667154
-
-broken with libavcodec 54
----
- channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c b/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
-index adf8e04..0d5b956 100644
---- a/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
-+++ b/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
-@@ -43,6 +43,12 @@
- #define AVMEDIA_TYPE_AUDIO 1
- #endif
- 
-+#if LIBAVCODEC_VERSION_MAJOR < 54
-+#define MAX_AUDIO_FRAME_SIZE AVCODEC_MAX_AUDIO_FRAME_SIZE
-+#else
-+#define MAX_AUDIO_FRAME_SIZE 192000
-+#endif
-+
- typedef struct _TSMFFFmpegDecoder
- {
- 	ITSMFDecoder iface;
-@@ -351,7 +357,7 @@ static BOOL tsmf_ffmpeg_decode_audio(ITSMFDecoder* decoder, const BYTE* data, UI
- #endif
- 
- 	if (mdecoder->decoded_size_max == 0)
--		mdecoder->decoded_size_max = AVCODEC_MAX_AUDIO_FRAME_SIZE + 16;
-+		mdecoder->decoded_size_max = MAX_AUDIO_FRAME_SIZE + 16;
- 	mdecoder->decoded_data = malloc(mdecoder->decoded_size_max);
- 	ZeroMemory(mdecoder->decoded_data, mdecoder->decoded_size_max);
- 	/* align the memory for SSE2 needs */
-@@ -363,7 +369,7 @@ static BOOL tsmf_ffmpeg_decode_audio(ITSMFDecoder* decoder, const BYTE* data, UI
- 	while (src_size > 0)
- 	{
- 		/* Ensure enough space for decoding */
--		if (mdecoder->decoded_size_max - mdecoder->decoded_size < AVCODEC_MAX_AUDIO_FRAME_SIZE)
-+		if (mdecoder->decoded_size_max - mdecoder->decoded_size < MAX_AUDIO_FRAME_SIZE)
- 		{
- 			mdecoder->decoded_size_max = mdecoder->decoded_size_max * 2 + 16;
- 			mdecoder->decoded_data = realloc(mdecoder->decoded_data, mdecoder->decoded_size_max);
--- 
-1.8.4
-
-
-From cbcf0de3fac985afaeeef7daf104c94ad8cdca26 Mon Sep 17 00:00:00 2001
-From: eroen <eroen@falcon.eroen.eu>
-Date: Thu, 21 Nov 2013 13:14:04 +0100
-Subject: [PATCH 2/3] ffmpeg-2 -- dsp_mask
-
-deprecated:
-http://git.videolan.org/?p=ffmpeg.git;a=commit;h=95510be8c35753da8f48062b28b65e7acdab965f
-
-broken with libavcodec 55
----
- channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c b/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
-index 0d5b956..1f99ec3 100644
---- a/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
-+++ b/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
-@@ -104,6 +104,7 @@ static BOOL tsmf_ffmpeg_init_audio_stream(ITSMFDecoder* decoder, const TS_AM_MED
- 	mdecoder->codec_context->channels = media_type->Channels;
- 	mdecoder->codec_context->block_align = media_type->BlockAlign;
- 
-+#if LIBAVCODEC_VERSION_MAJOR < 55
- #ifdef AV_CPU_FLAG_SSE2
- 	mdecoder->codec_context->dsp_mask = AV_CPU_FLAG_SSE2 | AV_CPU_FLAG_MMX2;
- #else
-@@ -113,6 +114,13 @@ static BOOL tsmf_ffmpeg_init_audio_stream(ITSMFDecoder* decoder, const TS_AM_MED
- 	mdecoder->codec_context->dsp_mask = FF_MM_SSE2 | FF_MM_MMX2;
- #endif
- #endif
-+#else  /* LIBAVCODEC_VERSION_MAJOR < 55 */
-+#ifdef AV_CPU_FLAG_SSE2
-+	av_set_cpu_flags_mask(AV_CPU_FLAG_SSE2 | AV_CPU_FLAG_MMX2);
-+#else
-+	av_set_cpu_flags_mask(FF_MM_SSE2 | FF_MM_MMX2);
-+#endif
-+#endif /* LIBAVCODEC_VERSION_MAJOR < 55 */
- 
- 	return TRUE;
- }
--- 
-1.8.4
-
-
-From 6fe23e1a3860528a8ecdfc8e9ccfdbd0e3945869 Mon Sep 17 00:00:00 2001
-From: eroen <eroen@falcon.eroen.eu>
-Date: Thu, 21 Nov 2013 13:26:03 +0100
-Subject: [PATCH 3/3] ffmpeg-2 -- CodecID
-
-deprecated:
-http://git.videolan.org/?p=ffmpeg.git;a=commit;h=104e10fb426f903ba9157fdbfe30292d0e4c3d72
-
-broken with libavcodec 55
----
- channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c b/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
-index 1f99ec3..09b4f68 100644
---- a/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
-+++ b/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
-@@ -54,7 +54,11 @@
- 	ITSMFDecoder iface;
- 
- 	int media_type;
-+#if LIBAVCODEC_VERSION_MAJOR < 55
- 	enum CodecID codec_id;
-+#else
-+	enum AVCodecID codec_id;
-+#endif
- 	AVCodecContext* codec_context;
- 	AVCodec* codec;
- 	AVFrame* frame;
--- 
-1.8.4
-

diff --git a/net-misc/freerdp/files/freerdp-1.1.0_beta1_p20130710-uclibc.patch b/net-misc/freerdp/files/freerdp-1.1.0_beta1_p20130710-uclibc.patch
deleted file mode 100644
index f4f28b2..00000000
--- a/net-misc/freerdp/files/freerdp-1.1.0_beta1_p20130710-uclibc.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=497808
-https://github.com/FreeRDP/FreeRDP/pull/2024
-
---- FreeRDP-780d451afad21a22d2af6bd030ee71311856f038/channels/drive/client/drive_file.c
-+++ FreeRDP-780d451afad21a22d2af6bd030ee71311856f038-uclibc/channels/drive/client/drive_file.c
-@@ -436,7 +436,11 @@ BOOL drive_file_set_information(DRIVE_FI
- 	int status;
- 	char* fullpath;
- 	struct STAT st;
-+#if defined(__linux__) && !defined(ANDROID)
-+	struct timespec tv[2];
-+#else
- 	struct timeval tv[2];
-+#endif
- 	UINT64 LastWriteTime;
- 	UINT32 FileAttributes;
- 	UINT32 FileNameLength;
-@@ -457,14 +461,21 @@ BOOL drive_file_set_information(DRIVE_FI
- 				return FALSE;
- 
- 			tv[0].tv_sec = st.st_atime;
--			tv[0].tv_usec = 0;
--			tv[1].tv_sec = (LastWriteTime > 0 ? FILE_TIME_RDP_TO_SYSTEM(LastWriteTime) : st.st_mtime);
--			tv[1].tv_usec = 0;
-+			tv[1].tv_sec = (LastWriteTime > 0 ? FILE_TIME_RDP_TO_SYSTEM(LastWriteTime) : st.st_mtime);			
-+			
- #ifndef WIN32
--/* TODO on win32 */                        
-+/* TODO on win32 */
- #ifdef ANDROID
-+			tv[0].tv_usec = 0;
-+			tv[1].tv_usec = 0;
- 			utimes(file->fullpath, tv);
-+#elif defined (__linux__)
-+			tv[0].tv_nsec = 0;
-+			tv[1].tv_nsec = 0;
-+			futimens(file->fd, tv);
- #else
-+			tv[0].tv_usec = 0;
-+			tv[1].tv_usec = 0;
- 			futimes(file->fd, tv);
- #endif
- 
---- FreeRDP-780d451afad21a22d2af6bd030ee71311856f038/winpr/libwinpr/synch/event.c
-+++ FreeRDP-780d451afad21a22d2af6bd030ee71311856f038-uclibc/winpr/libwinpr/synch/event.c
-@@ -115,6 +115,20 @@ HANDLE OpenEventA(DWORD dwDesiredAccess,
- 	return NULL;
- }
- 
-+#ifdef HAVE_EVENTFD_H
-+#if defined(__UCLIBC__)
-+static int eventfd_read(int fd, eventfd_t* value)
-+{
-+	return (read(fd, value, sizeof(*value)) == sizeof(*value)) ? 0 : -1;
-+}
-+
-+static int eventfd_write(int fd, eventfd_t value)
-+{
-+	return (write(fd, &value, sizeof(value)) == sizeof(value)) ? 0 : -1;
-+}
-+#endif
-+#endif
-+
- BOOL SetEvent(HANDLE hEvent)
- {
- 	ULONG Type;

diff --git a/net-misc/freerdp/files/freerdp-cmake-3.1.patch b/net-misc/freerdp/files/freerdp-cmake-3.1.patch
deleted file mode 100644
index 462fb56..00000000
--- a/net-misc/freerdp/files/freerdp-cmake-3.1.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-From 1b663ceffe51008af7ae9749e5b7999b2f7d6698 Mon Sep 17 00:00:00 2001
-From: Bernhard Miklautz <bernhard.miklautz@shacknet.at>
-Date: Fri, 12 Dec 2014 18:26:45 +0100
-Subject: [PATCH] build: cmake 3.1 compatibility
-
-* fix problem with REMOVE_DUPLICATES on undefined lists
-* since 3.1 file(GLOB FILEPATHS RELATIVE .. returns single / instead of // as
-  previously - necessary adoptions for regex and matches done. Should
-	work with all cmake versions.
-
-Tested with 3.1.0-rc3
----
- channels/CMakeLists.txt        | 4 ++--
- channels/client/CMakeLists.txt | 2 ++
- client/CMakeLists.txt          | 4 ++--
- server/CMakeLists.txt          | 4 ++--
- third-party/CMakeLists.txt     | 6 +++---
- 5 files changed, 11 insertions(+), 9 deletions(-)
-
-diff --git a/channels/CMakeLists.txt b/channels/CMakeLists.txt
-index c4e6048..540b1ac 100644
---- a/channels/CMakeLists.txt
-+++ b/channels/CMakeLists.txt
-@@ -253,8 +253,8 @@ set(FILENAME "ChannelOptions.cmake")
- file(GLOB FILEPATHS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*/${FILENAME}")
- 
- foreach(FILEPATH ${FILEPATHS})
--	if(${FILEPATH} MATCHES "^([^/]*)//${FILENAME}")
--		string(REGEX REPLACE "^([^/]*)//${FILENAME}" "\\1" DIR ${FILEPATH})
-+	if(${FILEPATH} MATCHES "^([^/]*)/+${FILENAME}")
-+		string(REGEX REPLACE "^([^/]*)/+${FILENAME}" "\\1" DIR ${FILEPATH})
- 		set(CHANNEL_OPTION)
- 		include(${FILEPATH})
- 		if(${CHANNEL_OPTION})
-diff --git a/channels/client/CMakeLists.txt b/channels/client/CMakeLists.txt
-index 049bc7b..2db18e8 100644
---- a/channels/client/CMakeLists.txt
-+++ b/channels/client/CMakeLists.txt
-@@ -24,7 +24,9 @@ set(${MODULE_PREFIX}_SRCS
- 	${CMAKE_CURRENT_SOURCE_DIR}/addin.c
- 	${CMAKE_CURRENT_SOURCE_DIR}/addin.h)
- 
-+if(CHANNEL_STATIC_CLIENT_ENTRIES)
- list(REMOVE_DUPLICATES CHANNEL_STATIC_CLIENT_ENTRIES)
-+endif()
- 
- foreach(STATIC_ENTRY ${CHANNEL_STATIC_CLIENT_ENTRIES})
- 	foreach(STATIC_MODULE ${CHANNEL_STATIC_CLIENT_MODULES})
-diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
-index 14ed363..b8b7699 100644
---- a/client/CMakeLists.txt
-+++ b/client/CMakeLists.txt
-@@ -63,8 +63,8 @@ set(FILENAME "ModuleOptions.cmake")
- file(GLOB FILEPATHS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*/${FILENAME}")
- 
- foreach(FILEPATH ${FILEPATHS})
--	if(${FILEPATH} MATCHES "^([^/]*)//${FILENAME}")
--		string(REGEX REPLACE "^([^/]*)//${FILENAME}" "\\1" FREERDP_CLIENT ${FILEPATH})
-+	if(${FILEPATH} MATCHES "^([^/]*)/+${FILENAME}")
-+		string(REGEX REPLACE "^([^/]*)/+${FILENAME}" "\\1" FREERDP_CLIENT ${FILEPATH})
- 		set(FREERDP_CLIENT_ENABLED 0)
- 		include(${FILEPATH})
- 		if(FREERDP_CLIENT_ENABLED)
-diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
-index cda14ba..ee9458e 100644
---- a/server/CMakeLists.txt
-+++ b/server/CMakeLists.txt
-@@ -48,8 +48,8 @@ set(FILENAME "ModuleOptions.cmake")
- file(GLOB FILEPATHS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*/${FILENAME}")
- 
- foreach(FILEPATH ${FILEPATHS})
--	if(${FILEPATH} MATCHES "^([^/]*)//${FILENAME}")
--		string(REGEX REPLACE "^([^/]*)//${FILENAME}" "\\1" FREERDP_SERVER ${FILEPATH})
-+	if(${FILEPATH} MATCHES "^([^/]*)/+${FILENAME}")
-+		string(REGEX REPLACE "^([^/]*)/+${FILENAME}" "\\1" FREERDP_SERVER ${FILEPATH})
- 		set(FREERDP_SERVER_ENABLED 0)
- 		include(${FILEPATH})
- 		if(FREERDP_SERVER_ENABLED)
-diff --git a/third-party/CMakeLists.txt b/third-party/CMakeLists.txt
-index 09b1fd4..610f35e 100644
---- a/third-party/CMakeLists.txt
-+++ b/third-party/CMakeLists.txt
-@@ -22,11 +22,11 @@
- file(GLOB all_valid_subdirs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*/CMakeLists.txt")
- 
- foreach(dir ${all_valid_subdirs})
--	if(${dir} MATCHES "^([^/]*)//CMakeLists.txt")
--		string(REGEX REPLACE "^([^/]*)//CMakeLists.txt" "\\1" dir_trimmed ${dir})
-+	if(${dir} MATCHES "^([^/]*)/+CMakeLists.txt")
-+		string(REGEX REPLACE "^([^/]*)/+CMakeLists.txt" "\\1" dir_trimmed ${dir})
- 		message(STATUS "Adding third-party component ${dir_trimmed}")
- 		add_subdirectory(${dir_trimmed})
- 	endif()
- endforeach(dir)
- 
--set(THIRD_PARTY_INCLUDES ${THIRD_PARTY_INCLUDES} PARENT_SCOPE)
-\ No newline at end of file
-+set(THIRD_PARTY_INCLUDES ${THIRD_PARTY_INCLUDES} PARENT_SCOPE)

diff --git a/net-misc/freerdp/freerdp-1.1.0_beta1_p20130710-r2.ebuild b/net-misc/freerdp/freerdp-1.1.0_beta1_p20130710-r2.ebuild
deleted file mode 100644
index f9cb9db..00000000
--- a/net-misc/freerdp/freerdp-1.1.0_beta1_p20130710-r2.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit cmake-utils vcs-snapshot
-
-if [[ ${PV} != 9999* ]]; then
-	COMMIT="780d451afad21a22d2af6bd030ee71311856f038"
-	SRC_URI="https://github.com/FreeRDP/FreeRDP/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86"
-else
-	inherit git-2
-	SRC_URI=""
-	EGIT_REPO_URI="git://github.com/FreeRDP/FreeRDP.git
-		https://github.com/FreeRDP/FreeRDP.git"
-	KEYWORDS=""
-fi
-
-DESCRIPTION="Free implementation of the Remote Desktop Protocol"
-HOMEPAGE="http://www.freerdp.com/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="alsa +client cups debug directfb doc ffmpeg gstreamer jpeg libav
-	pulseaudio server smartcard cpu_flags_x86_sse2 test usb X xinerama xv"
-
-RDEPEND="
-	dev-libs/openssl:0
-	sys-libs/zlib
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	client? (
-		usb? (
-			virtual/libudev:0=
-			sys-apps/util-linux:0=
-			dev-libs/dbus-glib:0=
-			virtual/libusb:1=
-		)
-		X? (
-			x11-libs/libXcursor
-			x11-libs/libXext
-			x11-libs/libXi
-			x11-libs/libXrender
-			xinerama? ( x11-libs/libXinerama )
-			xv? ( x11-libs/libXv )
-		)
-	)
-	directfb? ( dev-libs/DirectFB )
-	ffmpeg? (
-		libav? ( media-video/libav:0= )
-		!libav? ( media-video/ffmpeg:0= )
-	)
-	gstreamer? (
-		media-libs/gstreamer:0.10
-		media-libs/gst-plugins-base:0.10
-		x11-libs/libXrandr
-	)
-	jpeg? ( virtual/jpeg:0 )
-	pulseaudio? ( media-sound/pulseaudio )
-	server? (
-		X? (
-			x11-libs/libXcursor
-			x11-libs/libXdamage
-			x11-libs/libXext
-			x11-libs/libXfixes
-			xinerama? ( x11-libs/libXinerama )
-		)
-	)
-	smartcard? ( sys-apps/pcsc-lite )
-	X? (
-		x11-libs/libX11
-		x11-libs/libxkbfile
-	)
-"
-DEPEND="${RDEPEND}
-	<dev-util/cmake-3.1
-	virtual/pkgconfig
-	client? ( X? ( doc? (
-		app-text/docbook-xml-dtd:4.1.2
-		app-text/xmlto
-	) ) )
-"
-
-DOCS=( README )
-
-PATCHES=(
-	"${FILESDIR}/${P}-ffmpeg.patch"
-	"${FILESDIR}/${PN}-1.1-CVE-2014-0250.patch"
-	"${FILESDIR}/${P}-uclibc.patch"
-	"${FILESDIR}/${P}-cmake.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_with alsa ALSA)
-		$(cmake-utils_use_with client CLIENT)
-		$(cmake-utils_use_with cups CUPS)
-		$(cmake-utils_use_with debug DEBUG_ALL)
-		$(cmake-utils_use_with doc MANPAGES)
-		$(cmake-utils_use_with directfb DIRECTFB)
-		$(cmake-utils_use_with ffmpeg FFMPEG)
-		$(cmake-utils_use_with gstreamer GSTREAMER)
-		$(cmake-utils_use_with jpeg JPEG)
-		$(cmake-utils_use_with pulseaudio PULSE)
-		$(cmake-utils_use_with server SERVER)
-		$(cmake-utils_use_with smartcard PCSC)
-		$(cmake-utils_use_with cpu_flags_x86_sse2 SSE2)
-		$(cmake-utils_use usb CHANNEL_URBDRC)
-		$(cmake-utils_use_with X X11)
-		$(cmake-utils_use_with xinerama XINERAMA)
-		$(cmake-utils_use_with xv XV)
-		$(cmake-utils_use_build test TESTING)
-	)
-	cmake-utils_src_configure
-}


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-misc/freerdp/, net-misc/freerdp/files/
@ 2018-03-14 21:08 Mike Gilbert
  0 siblings, 0 replies; 8+ messages in thread
From: Mike Gilbert @ 2018-03-14 21:08 UTC (permalink / raw
  To: gentoo-commits

commit:     80ed7e534b05809a0ab3dc4a6d69bec4b98f02d0
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 14 21:06:52 2018 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Wed Mar 14 21:08:02 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80ed7e53

net-misc/freerdp: backport CredSSP protocol version fix

Package-Manager: Portage-2.3.24, Repoman-2.3.6_p81

 .../files/2.0.0-rc1-CredSSP-protocol-version.patch | 49 ++++++++++++++++++++++
 ....0.0_rc1.ebuild => freerdp-2.0.0_rc1-r1.ebuild} |  3 +-
 2 files changed, 51 insertions(+), 1 deletion(-)

diff --git a/net-misc/freerdp/files/2.0.0-rc1-CredSSP-protocol-version.patch b/net-misc/freerdp/files/2.0.0-rc1-CredSSP-protocol-version.patch
new file mode 100644
index 00000000000..59887f698ec
--- /dev/null
+++ b/net-misc/freerdp/files/2.0.0-rc1-CredSSP-protocol-version.patch
@@ -0,0 +1,49 @@
+From 088c3940d9b488e8a83b9cefaa7271f955d1971c Mon Sep 17 00:00:00 2001
+From: Bernhard Miklautz <bernhard.miklautz@thincast.com>
+Date: Wed, 14 Mar 2018 13:39:23 +0100
+Subject: [PATCH] fix nla: don't use server version
+
+FreeRDP currently only supports CredSSP protocol version 3. However the
+current implementation always sent back the version received by the
+server indicating that this version was supported.
+With recent windows updates applied the protocol changed and this approach
+doesn't work anymore (see
+https://msdn.microsoft.com/en-us/library/mt752485.aspx for protocol changes).
+
+With this fix FreeRDP always sends version 3 as supported version.
+
+Credit goes to @mfleisz.
+
+Fixes #4449
+---
+ libfreerdp/core/nla.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/libfreerdp/core/nla.c b/libfreerdp/core/nla.c
+index 47e087062..8a69f2f6e 100644
+--- a/libfreerdp/core/nla.c
++++ b/libfreerdp/core/nla.c
+@@ -1663,15 +1663,19 @@ BOOL nla_send(rdpNla* nla)
+ static int nla_decode_ts_request(rdpNla* nla, wStream* s)
+ {
+ 	int length;
++	UINT32 version = 0;
+ 
+ 	/* TSRequest */
+ 	if (!ber_read_sequence_tag(s, &length) ||
+ 	    !ber_read_contextual_tag(s, 0, &length, TRUE) ||
+-	    !ber_read_integer(s, &nla->version))
++	    !ber_read_integer(s, &version))
+ 	{
+ 		return -1;
+ 	}
+ 
++	if (version < nla->version)
++		nla->version = version;
++
+ 	/* [1] negoTokens (NegoData) */
+ 	if (ber_read_contextual_tag(s, 1, &length, TRUE) != FALSE)
+ 	{
+-- 
+2.16.2
+

diff --git a/net-misc/freerdp/freerdp-2.0.0_rc1.ebuild b/net-misc/freerdp/freerdp-2.0.0_rc1-r1.ebuild
similarity index 96%
rename from net-misc/freerdp/freerdp-2.0.0_rc1.ebuild
rename to net-misc/freerdp/freerdp-2.0.0_rc1-r1.ebuild
index c8a6ae3b610..6a24709e340 100644
--- a/net-misc/freerdp/freerdp-2.0.0_rc1.ebuild
+++ b/net-misc/freerdp/freerdp-2.0.0_rc1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -90,6 +90,7 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}/2.0.0-rc1-libressl.patch"
+	"${FILESDIR}/2.0.0-rc1-CredSSP-protocol-version.patch"
 )
 
 src_configure() {


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-misc/freerdp/, net-misc/freerdp/files/
@ 2020-06-30 14:23 Mike Gilbert
  0 siblings, 0 replies; 8+ messages in thread
From: Mike Gilbert @ 2020-06-30 14:23 UTC (permalink / raw
  To: gentoo-commits

commit:     45a3c66532de7f6623828424ec0ee2fe9f64b24b
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 30 14:22:57 2020 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Tue Jun 30 14:22:57 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45a3c665

net-misc/freerdp: backport bug fix

Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 .../freerdp/files/2.1.2-mask-cached_brush.patch    | 23 ++++++++++++++++++++++
 ...reerdp-2.1.2.ebuild => freerdp-2.1.2-r1.ebuild} |  3 +++
 2 files changed, 26 insertions(+)

diff --git a/net-misc/freerdp/files/2.1.2-mask-cached_brush.patch b/net-misc/freerdp/files/2.1.2-mask-cached_brush.patch
new file mode 100644
index 00000000000..bb8fedb1992
--- /dev/null
+++ b/net-misc/freerdp/files/2.1.2-mask-cached_brush.patch
@@ -0,0 +1,23 @@
+From ce1a9d8d1969ecbb4d24b9f4812654638a44abc2 Mon Sep 17 00:00:00 2001
+From: Armin Novak <armin.novak@thincast.com>
+Date: Tue, 23 Jun 2020 09:24:35 +0200
+Subject: [PATCH] Fixed #6298: Mask CACHED_BRUSH when checking brush style
+
+---
+ libfreerdp/core/orders.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/libfreerdp/core/orders.c b/libfreerdp/core/orders.c
+index dc4e51a873..537e694264 100644
+--- a/libfreerdp/core/orders.c
++++ b/libfreerdp/core/orders.c
+@@ -139,7 +139,8 @@ static BYTE get_bmf_bpp(UINT32 bmf, BOOL* pValid)
+ {
+ 	if (pValid)
+ 		*pValid = TRUE;
+-	switch (bmf)
++	/* Mask out highest bit */
++	switch (bmf & (~CACHED_BRUSH))
+ 	{
+ 		case 1:
+ 			return 1;

diff --git a/net-misc/freerdp/freerdp-2.1.2.ebuild b/net-misc/freerdp/freerdp-2.1.2-r1.ebuild
similarity index 97%
rename from net-misc/freerdp/freerdp-2.1.2.ebuild
rename to net-misc/freerdp/freerdp-2.1.2-r1.ebuild
index 0370121a8a9..539d21bc322 100644
--- a/net-misc/freerdp/freerdp-2.1.2.ebuild
+++ b/net-misc/freerdp/freerdp-2.1.2-r1.ebuild
@@ -90,6 +90,9 @@ BDEPEND="
 "
 
 src_prepare() {
+	local PATCHES=(
+		"${FILESDIR}/2.1.2-mask-cached_brush.patch"
+	)
 	cmake_src_prepare
 	echo "${PV}" > .source_version || die
 }


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-misc/freerdp/, net-misc/freerdp/files/
@ 2021-10-31 21:41 Mike Gilbert
  0 siblings, 0 replies; 8+ messages in thread
From: Mike Gilbert @ 2021-10-31 21:41 UTC (permalink / raw
  To: gentoo-commits

commit:     a9e5d89979dafa0a40c504d193c430b42785c5e6
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 31 21:40:41 2021 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Oct 31 21:40:41 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9e5d899

net-misc/freerdp: drop 2.3.2

Bug: https://bugs.gentoo.org/819534
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 net-misc/freerdp/Manifest                          |   1 -
 net-misc/freerdp/files/freerdp-2-openssl-3.0.patch |  61 ----------
 ...dp-2.4.0-TestUnicodeConversion-big-endian.patch |  28 -----
 net-misc/freerdp/freerdp-2.3.2.ebuild              | 123 ---------------------
 4 files changed, 213 deletions(-)

diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest
index 0740be54ebc..b476f9d6e9a 100644
--- a/net-misc/freerdp/Manifest
+++ b/net-misc/freerdp/Manifest
@@ -1,2 +1 @@
-DIST freerdp-2.3.2.tar.gz 7284490 BLAKE2B f6017752993fcd9213117016825344953872b3ad6b6717039ba78555bbeeb276eb548c2c097c5df46d25d19678b8e275ac25a4c62e212c087e1b52d9ce672de9 SHA512 b8502d34c73113a42bf2dc240431967829064d68f507cc42ff06432a784213eee4a2c001b174f1b970545aec75b3caf21ba5f4ee1ca8c07c7ef834131413204b
 DIST freerdp-2.4.1.tar.gz 7300797 BLAKE2B cd14cadfbad9f30ab6ee6ba80c3a3bfb191b68dc0cf576082044a20489f558e222e618ed314a7fefdefcb480f201f384df5d77db8699d2e4530559fd3d5b4398 SHA512 9bacd6a7219690ed62d6a646616a54770293ff45b59211aff73dc8d67300a79ba22e72cbe56803d301b60964e4acccea9b7c6d7e2d698b91eafcf6ba561cd66a

diff --git a/net-misc/freerdp/files/freerdp-2-openssl-3.0.patch b/net-misc/freerdp/files/freerdp-2-openssl-3.0.patch
deleted file mode 100644
index e4662751e5c..00000000000
--- a/net-misc/freerdp/files/freerdp-2-openssl-3.0.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 26bf2816c3e0daeaf524c47cf0fcda8ae13b65ad Mon Sep 17 00:00:00 2001
-From: Ondrej Holy <oholy@redhat.com>
-Date: Wed, 12 May 2021 12:48:15 +0200
-Subject: [PATCH] Fix FIPS mode support and build with OpenSSL 3.0
-
-FreeRDP fails to build with OpenSSL 3.0 because of usage of the `FIPS_mode`
-and `FIPS_mode_set` functions, which were removed there. Just a note that
-the FIPS mode is not supported by OpenSSL 1.1.* although the mentioned
-functions are still there (see https://wiki.openssl.org/index.php/FIPS_modules).
-Let's make FreeRDP build with OpenSSL 3.0 and fix the FIPS mode support.
-
-See: https://bugzilla.redhat.com/show_bug.cgi?id=1952937
----
- winpr/libwinpr/utils/ssl.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/winpr/libwinpr/utils/ssl.c b/winpr/libwinpr/utils/ssl.c
-index 3a859039034..03b23af43ac 100644
---- a/winpr/libwinpr/utils/ssl.c
-+++ b/winpr/libwinpr/utils/ssl.c
-@@ -244,9 +244,17 @@ static BOOL winpr_enable_fips(DWORD flags)
- #else
- 		WLog_DBG(TAG, "Ensuring openssl fips mode is ENabled");
- 
-+#if defined(OPENSSL_VERSION_MAJOR) && (OPENSSL_VERSION_MAJOR >= 3)
-+		if (!EVP_default_properties_is_fips_enabled(NULL))
-+#else
- 		if (FIPS_mode() != 1)
-+#endif
- 		{
-+#if defined(OPENSSL_VERSION_MAJOR) && (OPENSSL_VERSION_MAJOR >= 3)
-+			if (EVP_set_default_properties(NULL, "fips=yes"))
-+#else
- 			if (FIPS_mode_set(1))
-+#endif
- 				WLog_INFO(TAG, "Openssl fips mode ENabled!");
- 			else
- 			{
-From e59acc13c8f9b522a15fd586e643f04af1a79d9a Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Sun, 1 Aug 2021 12:14:43 -0400
-Subject: [PATCH] winpr: avoid calling FIPS_mode() with OpenSSL 3.0
-
-Fixes: 26bf2816c3e0daeaf524c47cf0fcda8ae13b65ad
----
- winpr/libwinpr/utils/ssl.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/winpr/libwinpr/utils/ssl.c b/winpr/libwinpr/utils/ssl.c
-index 03b23af43ac..74ef156e7b0 100644
---- a/winpr/libwinpr/utils/ssl.c
-+++ b/winpr/libwinpr/utils/ssl.c
-@@ -364,6 +364,8 @@ BOOL winpr_FIPSMode(void)
- {
- #if (OPENSSL_VERSION_NUMBER < 0x10001000L) || defined(LIBRESSL_VERSION_NUMBER)
- 	return FALSE;
-+#elif defined(OPENSSL_VERSION_MAJOR) && (OPENSSL_VERSION_MAJOR >= 3)
-+	return (EVP_default_properties_is_fips_enabled(NULL) == 1);
- #else
- 	return (FIPS_mode() == 1);
- #endif

diff --git a/net-misc/freerdp/files/freerdp-2.4.0-TestUnicodeConversion-big-endian.patch b/net-misc/freerdp/files/freerdp-2.4.0-TestUnicodeConversion-big-endian.patch
deleted file mode 100644
index b8977aecd56..00000000000
--- a/net-misc/freerdp/files/freerdp-2.4.0-TestUnicodeConversion-big-endian.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 7f53e1c6c8503e9d3966c96bd403573f44879b0c Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Sat, 7 Aug 2021 21:49:12 -0400
-Subject: [PATCH] Fix TestUnicodeConversion on big endian machines
-
-Wide character literals are stored in native byte order.
-Use an array of bytes as a reference instead.
-
-Fixes: https://github.com/FreeRDP/FreeRDP/issues/6968
----
- winpr/libwinpr/crt/test/TestUnicodeConversion.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/winpr/libwinpr/crt/test/TestUnicodeConversion.c b/winpr/libwinpr/crt/test/TestUnicodeConversion.c
-index 3bc9c245181..cc2a2597dd8 100644
---- a/winpr/libwinpr/crt/test/TestUnicodeConversion.c
-+++ b/winpr/libwinpr/crt/test/TestUnicodeConversion.c
-@@ -403,8 +403,8 @@ static BOOL test_ConvertToUnicode_wrapper(void)
- 	/* Test static string buffers of differing sizes */
- 	{
- 		char name[] = "someteststring";
--		const WCHAR cmp[] = { L's', L'o', L'm', L'e', L't', L'e', L's', L't',
--			                  L's', L't', L'r', L'i', L'n', L'g', 0 };
-+		const BYTE cmp[] = { 's', 0, 'o', 0, 'm', 0, 'e', 0, 't', 0, 'e', 0, 's', 0, 't', 0,
-+				     's', 0, 't', 0, 'r', 0, 'i', 0, 'n', 0, 'g', 0, 0, 0 };
- 		WCHAR xname[128] = { 0 };
- 		LPWSTR aname = NULL;
- 		LPWSTR wname = &xname[0];

diff --git a/net-misc/freerdp/freerdp-2.3.2.ebuild b/net-misc/freerdp/freerdp-2.3.2.ebuild
deleted file mode 100644
index 89821d9aa7a..00000000000
--- a/net-misc/freerdp/freerdp-2.3.2.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 2011-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/FreeRDP/FreeRDP.git"
-	case ${PV} in
-		2.*) EGIT_BRANCH="stable-2.0";;
-	esac
-else
-	MY_P=${P/_/-}
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 x86"
-fi
-
-DESCRIPTION="Free implementation of the Remote Desktop Protocol"
-HOMEPAGE="http://www.freerdp.com/"
-
-LICENSE="Apache-2.0"
-SLOT="0/2"
-IUSE="alsa cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer jpeg openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/openssl:0=
-	sys-libs/zlib:0
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	usb? (
-		virtual/libudev:0=
-		sys-apps/util-linux:0=
-		dev-libs/dbus-glib:0=
-		virtual/libusb:1=
-	)
-	X? (
-		x11-libs/libXcursor
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXrender
-		xinerama? ( x11-libs/libXinerama )
-		xv? ( x11-libs/libXv )
-	)
-	ffmpeg? ( media-video/ffmpeg:0= )
-	!ffmpeg? (
-		x11-libs/cairo:0=
-	)
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		x11-libs/libXrandr
-	)
-	jpeg? ( virtual/jpeg:0 )
-	openh264? ( media-libs/openh264:0= )
-	pulseaudio? ( media-sound/pulseaudio )
-	server? (
-		X? (
-			x11-libs/libXcursor
-			x11-libs/libXdamage
-			x11-libs/libXext
-			x11-libs/libXfixes
-			x11-libs/libXrandr
-			x11-libs/libXtst
-			xinerama? ( x11-libs/libXinerama )
-		)
-	)
-	smartcard? ( sys-apps/pcsc-lite )
-	systemd? ( sys-apps/systemd:0= )
-	wayland? (
-		dev-libs/wayland
-		x11-libs/libxkbcommon
-	)
-	X? (
-		x11-libs/libX11
-		x11-libs/libxkbfile
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	X? ( doc? (
-		app-text/docbook-xml-dtd:4.1.2
-		app-text/xmlto
-	) )
-"
-
-PATCHES=(
-	"${FILESDIR}/freerdp-2-openssl-3.0.patch"
-	"${FILESDIR}/freerdp-2.4.0-TestUnicodeConversion-big-endian.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test ON OFF)
-		-DCHANNEL_URBDRC=$(usex usb ON OFF)
-		-DWITH_ALSA=$(usex alsa ON OFF)
-		-DWITH_CCACHE=OFF
-		-DWITH_CUPS=$(usex cups ON OFF)
-		-DWITH_DEBUG_ALL=$(usex debug ON OFF)
-		-DWITH_MANPAGES=$(usex doc ON OFF)
-		-DWITH_FFMPEG=$(usex ffmpeg ON OFF)
-		-DWITH_SWSCALE=$(usex ffmpeg ON OFF)
-		-DWITH_CAIRO=$(usex ffmpeg OFF ON)
-		-DWITH_DSP_FFMPEG=$(usex ffmpeg ON OFF)
-		-DWITH_GSTREAMER_1_0=$(usex gstreamer ON OFF)
-		-DWITH_JPEG=$(usex jpeg ON OFF)
-		-DWITH_NEON=$(usex cpu_flags_arm_neon ON OFF)
-		-DWITH_OPENH264=$(usex openh264 ON OFF)
-		-DWITH_PULSE=$(usex pulseaudio ON OFF)
-		-DWITH_SERVER=$(usex server ON OFF)
-		-DWITH_PCSC=$(usex smartcard ON OFF)
-		-DWITH_LIBSYSTEMD=$(usex systemd ON OFF)
-		-DWITH_X11=$(usex X ON OFF)
-		-DWITH_XINERAMA=$(usex xinerama ON OFF)
-		-DWITH_XV=$(usex xv ON OFF)
-		-DWITH_WAYLAND=$(usex wayland ON OFF)
-	)
-	cmake_src_configure
-}


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-misc/freerdp/, net-misc/freerdp/files/
@ 2023-12-06 18:59 Mike Gilbert
  0 siblings, 0 replies; 8+ messages in thread
From: Mike Gilbert @ 2023-12-06 18:59 UTC (permalink / raw
  To: gentoo-commits

commit:     dd1faced71b23f460c067320c785b0133570ca76
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Wed Dec  6 18:58:49 2023 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Wed Dec  6 18:58:49 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd1faced

net-misc/freerdp: fix build with clang

Closes: https://bugs.gentoo.org/916515
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 net-misc/freerdp/files/freerdp-2.11.2-clang.patch | 29 +++++++++++++++++++++++
 net-misc/freerdp/freerdp-2.11.1.ebuild            |  4 ++++
 net-misc/freerdp/freerdp-2.11.2.ebuild            |  4 ++++
 3 files changed, 37 insertions(+)

diff --git a/net-misc/freerdp/files/freerdp-2.11.2-clang.patch b/net-misc/freerdp/files/freerdp-2.11.2-clang.patch
new file mode 100644
index 000000000000..b05492a3effd
--- /dev/null
+++ b/net-misc/freerdp/files/freerdp-2.11.2-clang.patch
@@ -0,0 +1,29 @@
+https://github.com/FreeRDP/FreeRDP/pull/9373
+https://bugs.gentoo.org/916515
+
+From 88dd68153c834e1d5f59beb59496bfd1bf9697a8 Mon Sep 17 00:00:00 2001
+From: Wang Mingyu <wangmy@cn.fujitsu.com>
+Date: Mon, 11 Sep 2023 00:31:54 +0000
+Subject: [PATCH] Fixes clang error error: incompatible function pointer types
+ assigning to 'OBJECT_NEW_FN' (aka 'void *(*)(void *)') from 'void *(const
+ void *)' [-Wincompatible-function-pointer-types] |         obj->fnObjectNew =
+ uwac_event_clone; |                          ^ ~~~~~~~~~~~~~~~~
+
+Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com>
+---
+ client/Wayland/wlfreerdp.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/client/Wayland/wlfreerdp.c b/client/Wayland/wlfreerdp.c
+index 5be10aae2c1b..ef3539383f55 100644
+--- a/client/Wayland/wlfreerdp.c
++++ b/client/Wayland/wlfreerdp.c
+@@ -598,7 +598,7 @@ static void wlf_client_free(freerdp* instance, rdpContext* context)
+ 	DeleteCriticalSection(&wlf->critical);
+ }
+ 
+-static void* uwac_event_clone(const void* val)
++static void* uwac_event_clone(void* val)
+ {
+ 	UwacEvent* copy;
+ 	const UwacEvent* ev = (const UwacEvent*)val;

diff --git a/net-misc/freerdp/freerdp-2.11.1.ebuild b/net-misc/freerdp/freerdp-2.11.1.ebuild
index c02216b06c7b..83943a4cf418 100644
--- a/net-misc/freerdp/freerdp-2.11.1.ebuild
+++ b/net-misc/freerdp/freerdp-2.11.1.ebuild
@@ -93,6 +93,10 @@ BDEPEND="
 	) )
 "
 
+PATCHES=(
+	"${FILESDIR}/freerdp-2.11.2-clang.patch"
+)
+
 src_configure() {
 	# bug #881695
 	filter-lto

diff --git a/net-misc/freerdp/freerdp-2.11.2.ebuild b/net-misc/freerdp/freerdp-2.11.2.ebuild
index 2a906f8c6a0d..86d7791ad99e 100644
--- a/net-misc/freerdp/freerdp-2.11.2.ebuild
+++ b/net-misc/freerdp/freerdp-2.11.2.ebuild
@@ -93,6 +93,10 @@ BDEPEND="
 	) )
 "
 
+PATCHES=(
+	"${FILESDIR}/freerdp-2.11.2-clang.patch"
+)
+
 src_configure() {
 	# bug #881695
 	filter-lto


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-misc/freerdp/, net-misc/freerdp/files/
@ 2023-12-21 20:49 Mike Gilbert
  0 siblings, 0 replies; 8+ messages in thread
From: Mike Gilbert @ 2023-12-21 20:49 UTC (permalink / raw
  To: gentoo-commits

commit:     d05a4c3e53d6bfb1b71c16f31d7028b6b37b44be
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 21 20:48:18 2023 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Dec 21 20:49:09 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d05a4c3e

net-misc/freerdp: drop 2.10.0-r3, 2.11.0-r1

Bug: https://bugs.gentoo.org/918546
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 net-misc/freerdp/Manifest                          |   2 -
 .../freerdp/files/freerdp-2.10.0-ffmpeg-6.patch    |  37 ------
 net-misc/freerdp/freerdp-2.10.0-r3.ebuild          | 137 ---------------------
 net-misc/freerdp/freerdp-2.11.0-r1.ebuild          | 137 ---------------------
 4 files changed, 313 deletions(-)

diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest
index 6190d97c3e83..2f956fab7642 100644
--- a/net-misc/freerdp/Manifest
+++ b/net-misc/freerdp/Manifest
@@ -1,5 +1,3 @@
-DIST freerdp-2.10.0.tar.gz 7321489 BLAKE2B 92b4b45670a5ed3b41713d1e036d41a9ef5714ddf9273a4b88fadf5c8435a467a53144f42bd969a44e641995a7f94b6c7b43b85f0ede738b1a1213e3bada9788 SHA512 a5749e3140d74c66d51869b405852bdaa776ca7d82e50a1e3ed19ccf56ed91a4ad9c3ce2c8ee6ff0abbb29d915c2e7278a1fcea04d73fd5ba4014f6590484477
-DIST freerdp-2.11.0.tar.gz 7325731 BLAKE2B 7cf2805065b870d959461a41b2b5cc7a5d00121078c0a5f51db0f2d83c4a5eb64aba75d0c1e184edf3546b4df87150b30f81ad88b301366ccaeaec59120085ca SHA512 97ce19f392e2b197830e22f12870e787fce85a7d9342cd7b7043c1efc45f5773410901b27de11bf1b70ca36dd6d7d102b3dd34eace813892a72d44dc290a8703
 DIST freerdp-2.11.1.tar.gz 7325835 BLAKE2B 2b6e62cd46627c60c3e815216711d3c5c9839d232aa5cb8653d92870bb46d93c40f2f44e0abf7ef6e5f44d92239541ae44d37366f343a1992fdbc8f09452fba0 SHA512 efd9d44bdc15047322600046fdcd17e37f14c84d75badc77e8ea53da6e065f33725be2f3c03e02031867124b62b32ad9deeabf8cc8f79321e7a866f552e63f2d
 DIST freerdp-2.11.2.tar.gz 7326213 BLAKE2B 5d044d660df1e5115ffde13389be79e852711161ad1969017a9ba662e5f278fc98b86efbc59a24c3ea32a137c24ed308ef5c9eb89db1c24f37f1b8b41bfd3c45 SHA512 2e0e74cba22ed0b33fd6453dd76f6a1ffb3107d1868276faf3eea25bd58d3d869c2ce7c6c467896ecc94ca71c0582beb029a0d44f50df38cc26661f85d0822fb
 DIST freerdp-3.0.0-beta3.tar.gz 8950651 BLAKE2B f5171d76da635bd05b4a267383ffb150b4c214820b79624b1988d297e44a4bfd3d7b34fbc4ac88f79d973e6eb4372700fe53910078eaf36ea7fc553cc6ed6e4f SHA512 a9e61c30254ba5e894c70b981fae4d6311d20546d4352e5a584361b3b7232f6cc075bf7d7c1e9e5a52c820c36a185120f095306ec36ff72489f7dce0cb7e0fbb

diff --git a/net-misc/freerdp/files/freerdp-2.10.0-ffmpeg-6.patch b/net-misc/freerdp/files/freerdp-2.10.0-ffmpeg-6.patch
deleted file mode 100644
index 586ae641b58e..000000000000
--- a/net-misc/freerdp/files/freerdp-2.10.0-ffmpeg-6.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-https://bugs.gentoo.org/901003
-https://github.com/FreeRDP/FreeRDP/issues/8686
-https://github.com/FreeRDP/FreeRDP/commit/7f55c97d60453738323e0ecafe6d357019528227
-
-From 7f55c97d60453738323e0ecafe6d357019528227 Mon Sep 17 00:00:00 2001
-From: akallabeth <akallabeth@posteo.net>
-Date: Tue, 14 Feb 2023 07:48:54 +0100
-Subject: [PATCH] Fixed #8686: Update h264 to use new FFMPEG API
-
---- a/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
-+++ b/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
-@@ -235,8 +235,10 @@ static BOOL tsmf_ffmpeg_init_stream(ITSMFDecoder* decoder, const TS_AM_MEDIA_TYP
- 		}
- 	}
- 
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(59, 18, 100)
- 	if (mdecoder->codec->capabilities & AV_CODEC_CAP_TRUNCATED)
- 		mdecoder->codec_context->flags |= AV_CODEC_FLAG_TRUNCATED;
-+#endif
- 
- 	return TRUE;
- }
---- a/libfreerdp/codec/h264_ffmpeg.c
-+++ b/libfreerdp/codec/h264_ffmpeg.c
-@@ -529,10 +529,12 @@ static BOOL libavcodec_init(H264_CONTEXT* h264)
- 			goto EXCEPTION;
- 		}
- 
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(59, 18, 100)
- 		if (sys->codecDecoder->capabilities & AV_CODEC_CAP_TRUNCATED)
- 		{
- 			sys->codecDecoderContext->flags |= AV_CODEC_FLAG_TRUNCATED;
- 		}
-+#endif
- 
- #ifdef WITH_VAAPI
- 

diff --git a/net-misc/freerdp/freerdp-2.10.0-r3.ebuild b/net-misc/freerdp/freerdp-2.10.0-r3.ebuild
deleted file mode 100644
index ca7d9504ea65..000000000000
--- a/net-misc/freerdp/freerdp-2.10.0-r3.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 2011-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/FreeRDP/FreeRDP.git"
-	case ${PV} in
-		2.*) EGIT_BRANCH="stable-2.0";;
-	esac
-else
-	MY_P=${P/_/-}
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
-fi
-
-DESCRIPTION="Free implementation of the Remote Desktop Protocol"
-HOMEPAGE="https://www.freerdp.com/"
-
-LICENSE="Apache-2.0"
-SLOT="0/2"
-IUSE="alsa cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer jpeg kerberos openh264 pulseaudio server smartcard systemd test usb valgrind wayland X xinerama xv"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/openssl:0=
-	sys-libs/zlib:0
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	usb? (
-		virtual/libudev:0=
-		sys-apps/util-linux:0=
-		dev-libs/dbus-glib:0=
-		virtual/libusb:1=
-	)
-	X? (
-		x11-libs/libXcursor
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXrender
-		xinerama? ( x11-libs/libXinerama )
-		xv? ( x11-libs/libXv )
-	)
-	ffmpeg? ( media-video/ffmpeg:0= )
-	!ffmpeg? (
-		x11-libs/cairo:0=
-	)
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		x11-libs/libXrandr
-	)
-	jpeg? ( media-libs/libjpeg-turbo:0= )
-	kerberos? ( virtual/krb5 )
-	openh264? ( media-libs/openh264:0= )
-	pulseaudio? ( media-libs/libpulse )
-	server? (
-		X? (
-			x11-libs/libXcursor
-			x11-libs/libXdamage
-			x11-libs/libXext
-			x11-libs/libXfixes
-			x11-libs/libXrandr
-			x11-libs/libXtst
-			xinerama? ( x11-libs/libXinerama )
-		)
-	)
-	smartcard? ( sys-apps/pcsc-lite )
-	systemd? ( sys-apps/systemd:0= )
-	wayland? (
-		dev-libs/wayland
-		x11-libs/libxkbcommon
-	)
-	X? (
-		x11-libs/libX11
-		x11-libs/libxkbfile
-	)
-"
-DEPEND="
-	${RDEPEND}
-	valgrind? ( dev-util/valgrind )
-"
-BDEPEND="
-	virtual/pkgconfig
-	X? ( doc? (
-		app-text/docbook-xml-dtd:4.1.2
-		app-text/xmlto
-	) )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-ffmpeg-6.patch
-)
-
-src_configure() {
-	# bug #881695
-	filter-lto
-
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test ON OFF)
-		-DCHANNEL_URBDRC=$(usex usb ON OFF)
-		-DWITH_ALSA=$(usex alsa ON OFF)
-		-DWITH_CCACHE=OFF
-		-DWITH_CUPS=$(usex cups ON OFF)
-		-DWITH_DEBUG_ALL=$(usex debug ON OFF)
-		-DWITH_MANPAGES=$(usex doc ON OFF)
-		-DWITH_FFMPEG=$(usex ffmpeg ON OFF)
-		-DWITH_SWSCALE=$(usex ffmpeg ON OFF)
-		-DWITH_CAIRO=$(usex ffmpeg OFF ON)
-		-DWITH_DSP_FFMPEG=$(usex ffmpeg ON OFF)
-		-DWITH_GSTREAMER_1_0=$(usex gstreamer ON OFF)
-		-DWITH_JPEG=$(usex jpeg ON OFF)
-		-DWITH_GSSAPI=$(usex kerberos ON OFF)
-		-DWITH_NEON=$(usex cpu_flags_arm_neon ON OFF)
-		-DWITH_OPENH264=$(usex openh264 ON OFF)
-		-DWITH_PULSE=$(usex pulseaudio ON OFF)
-		-DWITH_SERVER=$(usex server ON OFF)
-		-DWITH_PCSC=$(usex smartcard ON OFF)
-		-DWITH_LIBSYSTEMD=$(usex systemd ON OFF)
-		-DWITH_VALGRIND_MEMCHECK=$(usex valgrind ON OFF)
-		-DWITH_X11=$(usex X ON OFF)
-		-DWITH_XINERAMA=$(usex xinerama ON OFF)
-		-DWITH_XV=$(usex xv ON OFF)
-		-DWITH_WAYLAND=$(usex wayland ON OFF)
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	local myctestargs=()
-	use elibc_musl && myctestargs+=( -E TestBacktrace )
-	cmake_src_test
-}

diff --git a/net-misc/freerdp/freerdp-2.11.0-r1.ebuild b/net-misc/freerdp/freerdp-2.11.0-r1.ebuild
deleted file mode 100644
index 2a906f8c6a0d..000000000000
--- a/net-misc/freerdp/freerdp-2.11.0-r1.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 2011-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/FreeRDP/FreeRDP.git"
-	case ${PV} in
-		2.*) EGIT_BRANCH="stable-2.0";;
-	esac
-else
-	MY_P=${P/_/-}
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
-fi
-
-DESCRIPTION="Free implementation of the Remote Desktop Protocol"
-HOMEPAGE="https://www.freerdp.com/"
-
-LICENSE="Apache-2.0"
-SLOT="0/2"
-IUSE="alsa cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer icu jpeg kerberos openh264 pulseaudio server smartcard systemd test usb valgrind wayland X xinerama xv"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/openssl:0=
-	sys-libs/zlib:0
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	usb? (
-		virtual/libudev:0=
-		sys-apps/util-linux:0=
-		dev-libs/dbus-glib:0=
-		virtual/libusb:1=
-	)
-	X? (
-		x11-libs/libXcursor
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXrender
-		xinerama? ( x11-libs/libXinerama )
-		xv? ( x11-libs/libXv )
-	)
-	ffmpeg? ( media-video/ffmpeg:0= )
-	!ffmpeg? (
-		x11-libs/cairo:0=
-	)
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		x11-libs/libXrandr
-	)
-	icu? ( dev-libs/icu:0= )
-	jpeg? ( media-libs/libjpeg-turbo:0= )
-	kerberos? ( virtual/krb5 )
-	openh264? ( media-libs/openh264:0= )
-	pulseaudio? ( media-libs/libpulse )
-	server? (
-		X? (
-			x11-libs/libXcursor
-			x11-libs/libXdamage
-			x11-libs/libXext
-			x11-libs/libXfixes
-			x11-libs/libXrandr
-			x11-libs/libXtst
-			xinerama? ( x11-libs/libXinerama )
-		)
-	)
-	smartcard? ( sys-apps/pcsc-lite )
-	systemd? ( sys-apps/systemd:0= )
-	wayland? (
-		dev-libs/wayland
-		x11-libs/libxkbcommon
-	)
-	X? (
-		x11-libs/libX11
-		x11-libs/libxkbfile
-	)
-"
-DEPEND="
-	${RDEPEND}
-	valgrind? ( dev-util/valgrind )
-"
-BDEPEND="
-	virtual/pkgconfig
-	X? ( doc? (
-		app-text/docbook-xml-dtd:4.1.2
-		app-text/xmlto
-	) )
-"
-
-src_configure() {
-	# bug #881695
-	filter-lto
-
-	local mycmakeargs=(
-		-Wno-dev
-		-DBUILD_TESTING=$(usex test ON OFF)
-		-DCHANNEL_URBDRC=$(usex usb ON OFF)
-		-DWITH_ALSA=$(usex alsa ON OFF)
-		-DWITH_CCACHE=OFF
-		-DWITH_CUPS=$(usex cups ON OFF)
-		-DWITH_DEBUG_ALL=$(usex debug ON OFF)
-		-DWITH_MANPAGES=$(usex doc ON OFF)
-		-DWITH_FFMPEG=$(usex ffmpeg ON OFF)
-		-DWITH_SWSCALE=$(usex ffmpeg ON OFF)
-		-DWITH_CAIRO=$(usex ffmpeg OFF ON)
-		-DWITH_DSP_FFMPEG=$(usex ffmpeg ON OFF)
-		-DWITH_GSTREAMER_1_0=$(usex gstreamer ON OFF)
-		-DWITH_ICU=$(usex icu ON OFF)
-		-DWITH_JPEG=$(usex jpeg ON OFF)
-		-DWITH_GSSAPI=$(usex kerberos ON OFF)
-		-DWITH_NEON=$(usex cpu_flags_arm_neon ON OFF)
-		-DWITH_OPENH264=$(usex openh264 ON OFF)
-		-DWITH_OSS=OFF
-		-DWITH_PULSE=$(usex pulseaudio ON OFF)
-		-DWITH_SERVER=$(usex server ON OFF)
-		-DWITH_PCSC=$(usex smartcard ON OFF)
-		-DWITH_LIBSYSTEMD=$(usex systemd ON OFF)
-		-DWITH_VALGRIND_MEMCHECK=$(usex valgrind ON OFF)
-		-DWITH_X11=$(usex X ON OFF)
-		-DWITH_XINERAMA=$(usex xinerama ON OFF)
-		-DWITH_XV=$(usex xv ON OFF)
-		-DWITH_WAYLAND=$(usex wayland ON OFF)
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	local myctestargs=()
-	use elibc_musl && myctestargs+=( -E TestBacktrace )
-	cmake_src_test
-}


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-misc/freerdp/, net-misc/freerdp/files/
@ 2024-03-24 19:59 Mike Gilbert
  0 siblings, 0 replies; 8+ messages in thread
From: Mike Gilbert @ 2024-03-24 19:59 UTC (permalink / raw
  To: gentoo-commits

commit:     b7bbba6ba542f531dabd8e9091c5d09fc4f85dc5
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 24 19:30:54 2024 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Mar 24 19:59:08 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7bbba6b

net-misc/freerdp: backport pointer fixes

Closes: https://bugs.gentoo.org/921252
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 .../files/freerdp-3.4.0-incompatible-pointer.patch | 279 +++++++++++++++++++++
 net-misc/freerdp/freerdp-3.4.0-r11.ebuild          |   7 +
 2 files changed, 286 insertions(+)

diff --git a/net-misc/freerdp/files/freerdp-3.4.0-incompatible-pointer.patch b/net-misc/freerdp/files/freerdp-3.4.0-incompatible-pointer.patch
new file mode 100644
index 000000000000..549c813f774b
--- /dev/null
+++ b/net-misc/freerdp/files/freerdp-3.4.0-incompatible-pointer.patch
@@ -0,0 +1,279 @@
+https://github.com/FreeRDP/FreeRDP/pull/9992
+https://bugs.gentoo.org/921252
+
+From 0242240ba7a61945607b835f378ff077e4582780 Mon Sep 17 00:00:00 2001
+From: akallabeth <akallabeth@posteo.net>
+Date: Mon, 18 Mar 2024 10:05:30 +0100
+Subject: [PATCH 1/8] [winpr,clipboard] fix incompatible WCHAR pointer
+
+---
+ winpr/libwinpr/clipboard/synthetic_file.c | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/winpr/libwinpr/clipboard/synthetic_file.c b/winpr/libwinpr/clipboard/synthetic_file.c
+index 14219806c76e..e748f8bea399 100644
+--- a/winpr/libwinpr/clipboard/synthetic_file.c
++++ b/winpr/libwinpr/clipboard/synthetic_file.c
+@@ -276,7 +276,13 @@ static BOOL add_directory_contents_to_list(wClipboard* clipboard, const WCHAR* l
+                                            const WCHAR* remote_name, wArrayList* files)
+ {
+ 	BOOL result = FALSE;
+-	const WCHAR* wildcard = "/\0*\0\0\0";
++	union
++	{
++		const char* c;
++		const WCHAR* w;
++	} wildcard;
++	const char buffer[4] = "/\0*\0\0\0";
++	wildcard.c = buffer;
+ 	const size_t wildcardLen = 3;
+ 
+ 	WINPR_ASSERT(clipboard);
+@@ -290,7 +296,7 @@ static BOOL add_directory_contents_to_list(wClipboard* clipboard, const WCHAR* l
+ 		return FALSE;
+ 
+ 	_wcsncat(namebuf, local_name, len);
+-	_wcsncat(namebuf, wildcard, wildcardLen);
++	_wcsncat(namebuf, wildcard.w, wildcardLen);
+ 
+ 	result = do_add_directory_contents_to_list(clipboard, local_name, remote_name, namebuf, files);
+ 
+
+From b1f60a1d117da2a6775dc12ab7e9b62c95615550 Mon Sep 17 00:00:00 2001
+From: akallabeth <akallabeth@posteo.net>
+Date: Mon, 18 Mar 2024 10:07:17 +0100
+Subject: [PATCH 2/8] [winpr,smartcard] fix incompatible PCSC_SCardListReaders
+ pointer
+
+---
+ winpr/libwinpr/smartcard/smartcard_pcsc.c | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/winpr/libwinpr/smartcard/smartcard_pcsc.c b/winpr/libwinpr/smartcard/smartcard_pcsc.c
+index fb04d5684aa0..c94b4caafe1e 100644
+--- a/winpr/libwinpr/smartcard/smartcard_pcsc.c
++++ b/winpr/libwinpr/smartcard/smartcard_pcsc.c
+@@ -992,8 +992,14 @@ static LONG WINAPI PCSC_SCardListReadersW(SCARDCONTEXT hContext, LPCWSTR mszGrou
+ 			return SCARD_E_NO_MEMORY;
+ 	}
+ 
+-	status =
+-	    PCSC_SCardListReaders_Internal(hContext, mszGroupsA, (LPSTR*)&mszReadersA, pcchReaders);
++	union
++	{
++		LPSTR* ppc;
++		LPSTR pc;
++	} cnv;
++	cnv.ppc = &mszReadersA;
++
++	status = PCSC_SCardListReaders_Internal(hContext, mszGroupsA, cnv.pc, pcchReaders);
+ 	if (status == SCARD_S_SUCCESS)
+ 	{
+ 		size_t size = 0;
+
+From 48eaca08048918260d4dca05e9522118657e8210 Mon Sep 17 00:00:00 2001
+From: akallabeth <akallabeth@posteo.net>
+Date: Mon, 18 Mar 2024 10:10:39 +0100
+Subject: [PATCH 3/8] [core,license] fix incompatible WCHAR pointer
+
+---
+ libfreerdp/core/license.c | 17 ++++++++++++-----
+ 1 file changed, 12 insertions(+), 5 deletions(-)
+
+diff --git a/libfreerdp/core/license.c b/libfreerdp/core/license.c
+index 99d4fa25fc84..e6c622a6b087 100644
+--- a/libfreerdp/core/license.c
++++ b/libfreerdp/core/license.c
+@@ -2802,18 +2802,25 @@ BOOL license_server_send_request(rdpLicense* license)
+ 	return license_set_state(license, LICENSE_STATE_REQUEST);
+ }
+ 
+-static BOOL license_set_string(const char* what, const char* value, WCHAR** dst, UINT32* dstLen)
++static BOOL license_set_string(const char* what, const char* value, BYTE** bdst, UINT32* dstLen)
+ {
+ 	WINPR_ASSERT(what);
+ 	WINPR_ASSERT(value);
+-	WINPR_ASSERT(dst);
++	WINPR_ASSERT(bdst);
+ 	WINPR_ASSERT(dstLen);
+ 
++	union
++	{
++		WCHAR** w;
++		BYTE** b;
++	} cnv;
++	cnv.b = bdst;
++
+ 	size_t len = 0;
+-	*dst = (BYTE*)ConvertUtf8ToWCharAlloc(value, &len);
+-	if (!*dst || (len > UINT32_MAX / sizeof(WCHAR)))
++	*cnv.w = ConvertUtf8ToWCharAlloc(value, &len);
++	if (!*cnv.w || (len > UINT32_MAX / sizeof(WCHAR)))
+ 	{
+-		WLog_ERR(TAG, "license->ProductInfo: %s == %p || %" PRIu32 " > UINT32_MAX", what, *dst,
++		WLog_ERR(TAG, "license->ProductInfo: %s == %p || %" PRIu32 " > UINT32_MAX", what, *cnv.w,
+ 		         len);
+ 		return FALSE;
+ 	}
+
+From 0717b4de1549390a3404af823bd36db66772abd2 Mon Sep 17 00:00:00 2001
+From: akallabeth <akallabeth@posteo.net>
+Date: Mon, 18 Mar 2024 10:10:59 +0100
+Subject: [PATCH 4/8] [winpr,crt] fix incompatible WCHAR pointer
+
+---
+ winpr/libwinpr/crt/test/TestUnicodeConversion.c | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/winpr/libwinpr/crt/test/TestUnicodeConversion.c b/winpr/libwinpr/crt/test/TestUnicodeConversion.c
+index a5c4c75e8f71..187a068aedaa 100644
+--- a/winpr/libwinpr/crt/test/TestUnicodeConversion.c
++++ b/winpr/libwinpr/crt/test/TestUnicodeConversion.c
+@@ -24,10 +24,12 @@ typedef struct
+ // TODO: The unit tests do not check for valid code points, so always end the test
+ // strings with a simple ASCII symbol for now.
+ static const testcase_t unit_testcases[] = {
+-	{ "foo", 3, "f\x00o\x00o\x00\x00\x00", 3 },
+-	{ "foo", 4, "f\x00o\x00o\x00\x00\x00", 4 },
++	{ "foo", 3, (const WCHAR*)"f\x00o\x00o\x00\x00\x00", 3 },
++	{ "foo", 4, (const WCHAR*)"f\x00o\x00o\x00\x00\x00", 4 },
+ 	{ "✊🎅ęʥ꣸𑗊a", 19,
+-	  "\x0a\x27\x3c\xd8\x85\xdf\x19\x01\xa5\x02\xf8\xa8\x05\xd8\xca\xdd\x61\x00\x00\x00", 9 }
++	  (const WCHAR*)"\x0a\x27\x3c\xd8\x85\xdf\x19\x01\xa5\x02\xf8\xa8\x05\xd8\xca\xdd\x61\x00\x00"
++	                "\x00",
++	  9 }
+ };
+ 
+ static void create_prefix(char* prefix, size_t prefixlen, size_t buffersize, SSIZE_T rc,
+
+From cab7b59fccabc0f09d659bd499c03dab7e911ffa Mon Sep 17 00:00:00 2001
+From: akallabeth <akallabeth@posteo.net>
+Date: Mon, 18 Mar 2024 10:13:40 +0100
+Subject: [PATCH 5/8] [codec,rfx] explicitly cast return
+
+cast to avoid compilation issues with incompatible-pointer-types
+---
+ libfreerdp/codec/rfx.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libfreerdp/codec/rfx.c b/libfreerdp/codec/rfx.c
+index c83cfd5c1ac3..66ed1e04aea2 100644
+--- a/libfreerdp/codec/rfx.c
++++ b/libfreerdp/codec/rfx.c
+@@ -1368,7 +1368,7 @@ const RFX_TILE** rfx_message_get_tiles(const RFX_MESSAGE* message, UINT16* numTi
+ 	WINPR_ASSERT(message);
+ 	if (numTiles)
+ 		*numTiles = message->numTiles;
+-	return message->tiles;
++	return (const RFX_TILE**)message->tiles;
+ }
+ 
+ UINT16 rfx_message_get_tile_count(const RFX_MESSAGE* message)
+
+From 86966912502a3667c111d35dc9ba577a8b209a6d Mon Sep 17 00:00:00 2001
+From: akallabeth <akallabeth@posteo.net>
+Date: Mon, 18 Mar 2024 10:17:29 +0100
+Subject: [PATCH 6/8] [client,common] fix incompatible-pointer-types
+
+use a union to cast to expected types.
+---
+ client/common/file.c | 12 +++++++++---
+ 1 file changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/client/common/file.c b/client/common/file.c
+index feb37967fc5a..39b08f18c916 100644
+--- a/client/common/file.c
++++ b/client/common/file.c
+@@ -2299,9 +2299,15 @@ BOOL freerdp_client_populate_settings_from_rdp_file(const rdpFile* file, rdpSett
+ 	if (~file->RedirectLocation)
+ 	{
+ 		size_t count = 0;
+-		char** str = CommandLineParseCommaSeparatedValuesEx(LOCATION_CHANNEL_NAME, NULL, &count);
+-		const BOOL rc = freerdp_client_add_dynamic_channel(settings, count, str);
+-		free(str);
++		union
++		{
++			void* pv;
++			char** str;
++			const char** cstr;
++		} cnv;
++		cnv.str = CommandLineParseCommaSeparatedValuesEx(LOCATION_CHANNEL_NAME, NULL, &count);
++		const BOOL rc = freerdp_client_add_dynamic_channel(settings, count, cnv.cstr);
++		free(cnv.pv);
+ 		if (!rc)
+ 			return FALSE;
+ 	}
+
+From dfdb8a849ef78a6e5d1530489ad7f899c62c9c22 Mon Sep 17 00:00:00 2001
+From: akallabeth <akallabeth@posteo.net>
+Date: Mon, 18 Mar 2024 10:18:09 +0100
+Subject: [PATCH 7/8] [channels,drive] fix wrong function usage
+
+_wcslen is for WCHAR, wcslen for wchar_t
+---
+ channels/drive/client/drive_main.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/channels/drive/client/drive_main.c b/channels/drive/client/drive_main.c
+index 0fdc2e08ff50..04f8d837fa6b 100644
+--- a/channels/drive/client/drive_main.c
++++ b/channels/drive/client/drive_main.c
+@@ -511,7 +511,7 @@ static UINT drive_process_irp_query_volume_information(DRIVE_DEVICE* drive, IRP*
+ 			/* http://msdn.microsoft.com/en-us/library/cc232101.aspx */
+ 			const WCHAR* diskType =
+ 			    InitializeConstWCharFromUtf8("FAT32", LabelBuffer, ARRAYSIZE(LabelBuffer));
+-			const size_t diskTypeLen = (wcslen(diskType) + 1) * sizeof(WCHAR);
++			const size_t diskTypeLen = (_wcslen(diskType) + 1) * sizeof(WCHAR);
+ 			const size_t length = 12ul + diskTypeLen;
+ 			Stream_Write_UINT32(output, length); /* Length */
+ 
+
+From 00ec91dc16724f7aad8866b4f988baad4c1216a8 Mon Sep 17 00:00:00 2001
+From: akallabeth <akallabeth@posteo.net>
+Date: Mon, 18 Mar 2024 10:25:00 +0100
+Subject: [PATCH 8/8] [server,shadow] cast incompatible pointer
+
+the context pointer to WTSOpenServerA is intentional, cast to LPSTR to
+match definition
+---
+ server/shadow/shadow_client.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/server/shadow/shadow_client.c b/server/shadow/shadow_client.c
+index 0fd52363eb6d..f2a5f63cb188 100644
+--- a/server/shadow/shadow_client.c
++++ b/server/shadow/shadow_client.c
+@@ -252,7 +252,7 @@ static BOOL shadow_client_context_new(freerdp_peer* peer, rdpContext* context)
+ 		goto fail;
+ 
+ 	region16_init(&(client->invalidRegion));
+-	client->vcm = WTSOpenServerA(peer->context);
++	client->vcm = WTSOpenServerA((LPSTR)peer->context);
+ 
+ 	if (!client->vcm || client->vcm == INVALID_HANDLE_VALUE)
+ 		goto fail;
+From 00f4c9612a924f1b87a7dcdd2a5728d9e9616ee6 Mon Sep 17 00:00:00 2001
+From: akallabeth <akallabeth@posteo.net>
+Date: Mon, 18 Mar 2024 19:57:02 +0100
+Subject: [PATCH] [winpr,clipboard] fix WCHAR buffer size
+
+---
+ winpr/libwinpr/clipboard/synthetic_file.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/winpr/libwinpr/clipboard/synthetic_file.c b/winpr/libwinpr/clipboard/synthetic_file.c
+index e748f8bea399..ce70e1efc26e 100644
+--- a/winpr/libwinpr/clipboard/synthetic_file.c
++++ b/winpr/libwinpr/clipboard/synthetic_file.c
+@@ -281,9 +281,9 @@ static BOOL add_directory_contents_to_list(wClipboard* clipboard, const WCHAR* l
+ 		const char* c;
+ 		const WCHAR* w;
+ 	} wildcard;
+-	const char buffer[4] = "/\0*\0\0\0";
++	const char buffer[6] = "/\0*\0\0\0";
+ 	wildcard.c = buffer;
+-	const size_t wildcardLen = 3;
++	const size_t wildcardLen = ARRAYSIZE(buffer) / sizeof(WCHAR);
+ 
+ 	WINPR_ASSERT(clipboard);
+ 	WINPR_ASSERT(local_name);

diff --git a/net-misc/freerdp/freerdp-3.4.0-r11.ebuild b/net-misc/freerdp/freerdp-3.4.0-r11.ebuild
index 8285a658a86c..598807c184a5 100644
--- a/net-misc/freerdp/freerdp-3.4.0-r11.ebuild
+++ b/net-misc/freerdp/freerdp-3.4.0-r11.ebuild
@@ -106,6 +106,13 @@ RDEPEND="${COMMON_DEPEND}
 	server? ( !net-misc/freerdp:2[server] )
 "
 
+src_prepare() {
+	local PATCHES=(
+		"${FILESDIR}/freerdp-3.4.0-incompatible-pointer.patch"
+	)
+	default
+}
+
 option() {
 	usex "$1" ON OFF
 }


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-misc/freerdp/, net-misc/freerdp/files/
@ 2024-07-23 14:24 Mike Gilbert
  0 siblings, 0 replies; 8+ messages in thread
From: Mike Gilbert @ 2024-07-23 14:24 UTC (permalink / raw
  To: gentoo-commits

commit:     ce00779b11562ced94ae12e97007830e32cac4f6
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 23 14:23:26 2024 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Tue Jul 23 14:23:26 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce00779b

net-misc/freerdp: backport build fix

Closes: https://bugs.gentoo.org/963406
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 .../freerdp/files/freerdp-3.6.3-backports.patch    | 224 +++++++++++++++++++++
 net-misc/freerdp/freerdp-3.6.3.ebuild              |   4 +
 2 files changed, 228 insertions(+)

diff --git a/net-misc/freerdp/files/freerdp-3.6.3-backports.patch b/net-misc/freerdp/files/freerdp-3.6.3-backports.patch
new file mode 100644
index 000000000000..473b27cbab02
--- /dev/null
+++ b/net-misc/freerdp/files/freerdp-3.6.3-backports.patch
@@ -0,0 +1,224 @@
+https://bugs.gentoo.org/936406
+https://github.com/FreeRDP/FreeRDP/pull/10410
+
+From 776083234b61224f8e3412c31be406b11509b7db Mon Sep 17 00:00:00 2001
+From: akallabeth <akallabeth@posteo.net>
+Date: Tue, 23 Jul 2024 09:14:04 +0200
+Subject: [PATCH 1/2] [warnings] fix unused-but-set-variable
+
+---
+ channels/parallel/client/parallel_main.c | 4 ++++
+ channels/printer/client/printer_main.c   | 2 ++
+ channels/serial/client/serial_main.c     | 4 ++++
+ channels/tsmf/client/tsmf_media.c        | 2 +-
+ channels/urbdrc/client/data_transfer.c   | 3 +--
+ libfreerdp/core/gateway/tsg.c            | 3 +--
+ libfreerdp/core/heartbeat.c              | 3 +--
+ libfreerdp/gdi/gfx.c                     | 7 ++-----
+ winpr/libwinpr/ncrypt/ncrypt_pkcs11.c    | 3 ---
+ 9 files changed, 16 insertions(+), 15 deletions(-)
+
+diff --git a/channels/parallel/client/parallel_main.c b/channels/parallel/client/parallel_main.c
+index ce574b87b084..4be078693870 100644
+--- a/channels/parallel/client/parallel_main.c
++++ b/channels/parallel/client/parallel_main.c
+@@ -160,6 +160,8 @@ static UINT parallel_process_irp_read(PARALLEL_DEVICE* parallel, IRP* irp)
+ 		return ERROR_INVALID_DATA;
+ 	Stream_Read_UINT32(irp->input, Length);
+ 	Stream_Read_UINT64(irp->input, Offset);
++	(void)Offset; /* [MS-RDPESP] 3.2.5.1.4 Processing a Server Read Request Message
++	               * ignored */
+ 	buffer = (BYTE*)calloc(Length, sizeof(BYTE));
+ 
+ 	if (!buffer)
+@@ -220,6 +222,8 @@ static UINT parallel_process_irp_write(PARALLEL_DEVICE* parallel, IRP* irp)
+ 
+ 	Stream_Read_UINT32(irp->input, Length);
+ 	Stream_Read_UINT64(irp->input, Offset);
++	(void)Offset; /* [MS-RDPESP] 3.2.5.1.5 Processing a Server Write Request Message
++	               * ignore offset */
+ 	if (!Stream_SafeSeek(irp->input, 20)) /* Padding */
+ 		return ERROR_INVALID_DATA;
+ 	const void* ptr = Stream_ConstPointer(irp->input);
+diff --git a/channels/printer/client/printer_main.c b/channels/printer/client/printer_main.c
+index 8d11f9b5ccd3..c458c0fdcfca 100644
+--- a/channels/printer/client/printer_main.c
++++ b/channels/printer/client/printer_main.c
+@@ -515,6 +515,8 @@ static UINT printer_process_irp_write(PRINTER_DEVICE* printer_dev, IRP* irp)
+ 		return ERROR_INVALID_DATA;
+ 	Stream_Read_UINT32(irp->input, Length);
+ 	Stream_Read_UINT64(irp->input, Offset);
++	(void)Offset; /* [MS-RDPEPC] 2.2.2.9 Server Printer Write Request (DR_PRN_WRITE_REQ)
++	               * reserved for future use, ignore */
+ 	Stream_Seek(irp->input, 20); /* Padding */
+ 	const void* ptr = Stream_ConstPointer(irp->input);
+ 	if (!Stream_SafeSeek(irp->input, Length))
+diff --git a/channels/serial/client/serial_main.c b/channels/serial/client/serial_main.c
+index 22f799a16ba6..c98a27ea9040 100644
+--- a/channels/serial/client/serial_main.c
++++ b/channels/serial/client/serial_main.c
+@@ -241,6 +241,8 @@ static UINT serial_process_irp_read(SERIAL_DEVICE* serial, IRP* irp)
+ 
+ 	Stream_Read_UINT32(irp->input, Length); /* Length (4 bytes) */
+ 	Stream_Read_UINT64(irp->input, Offset); /* Offset (8 bytes) */
++	(void)Offset; /* [MS-RDPESP] 3.2.5.1.4 Processing a Server Read Request Message
++	               * ignored */
+ 	Stream_Seek(irp->input, 20);            /* Padding (20 bytes) */
+ 	buffer = (BYTE*)calloc(Length, sizeof(BYTE));
+ 
+@@ -301,6 +303,8 @@ static UINT serial_process_irp_write(SERIAL_DEVICE* serial, IRP* irp)
+ 
+ 	Stream_Read_UINT32(irp->input, Length); /* Length (4 bytes) */
+ 	Stream_Read_UINT64(irp->input, Offset); /* Offset (8 bytes) */
++	(void)Offset; /* [MS-RDPESP] 3.2.5.1.4 Processing a Server Read Request Message
++	               * ignored */
+ 	if (!Stream_SafeSeek(irp->input, 20))   /* Padding (20 bytes) */
+ 		return ERROR_INVALID_DATA;
+ 
+diff --git a/channels/tsmf/client/tsmf_media.c b/channels/tsmf/client/tsmf_media.c
+index 5f47090ae37b..b20db415944d 100644
+--- a/channels/tsmf/client/tsmf_media.c
++++ b/channels/tsmf/client/tsmf_media.c
+@@ -1161,7 +1161,7 @@ BOOL tsmf_stream_flush(TSMF_STREAM* stream)
+ 		stream->presentation->audio_end_time = 0;
+ 	}
+ 
+-	return TRUE;
++	return ret;
+ }
+ 
+ void _tsmf_presentation_free(void* obj)
+diff --git a/channels/urbdrc/client/data_transfer.c b/channels/urbdrc/client/data_transfer.c
+index 56f3267ccc35..5f9a6e0e479e 100644
+--- a/channels/urbdrc/client/data_transfer.c
++++ b/channels/urbdrc/client/data_transfer.c
+@@ -1038,7 +1038,6 @@ static UINT urb_control_vendor_or_class_request(IUDEVICE* pdev, GENERIC_CHANNEL_
+ 	BYTE bmRequestType = 0;
+ 	UINT16 Value = 0;
+ 	UINT16 Index = 0;
+-	UINT16 Padding = 0;
+ 	wStream* out = NULL;
+ 	URBDRC_PLUGIN* urbdrc = NULL;
+ 	const BOOL noAck = (RequestField & 0x80000000U) != 0;
+@@ -1061,7 +1060,7 @@ static UINT urb_control_vendor_or_class_request(IUDEVICE* pdev, GENERIC_CHANNEL_
+ 	Stream_Read_UINT8(s, Request);             /** Request */
+ 	Stream_Read_UINT16(s, Value);              /** value */
+ 	Stream_Read_UINT16(s, Index);              /** index */
+-	Stream_Read_UINT16(s, Padding);            /** Padding */
++	Stream_Seek_UINT16(s);                     /** Padding */
+ 	Stream_Read_UINT32(s, OutputBufferSize);
+ 	if (OutputBufferSize > UINT32_MAX - 36)
+ 		return ERROR_INVALID_DATA;
+diff --git a/libfreerdp/core/gateway/tsg.c b/libfreerdp/core/gateway/tsg.c
+index fdd01089810a..60ccdc5a63c6 100644
+--- a/libfreerdp/core/gateway/tsg.c
++++ b/libfreerdp/core/gateway/tsg.c
+@@ -693,14 +693,13 @@ static BOOL tsg_ndr_read_packet_response(wLog* log, wStream* s, UINT32* index,
+ 	UINT32 MaxSizeValue = 0;
+ 	UINT32 MaxOffsetValue = 0;
+ 	UINT32 idleTimeout = 0;
+-	UINT32 reserved = 0;
+ 
+ 	WINPR_ASSERT(response);
+ 
+ 	if (!Stream_CheckAndLogRequiredLengthOfSizeWLog(log, s, 2, sizeof(UINT32)))
+ 		return FALSE;
+ 	Stream_Read_UINT32(s, response->flags); /* Flags (4 bytes) */
+-	Stream_Read_UINT32(s, reserved);        /* Reserved (4 bytes) */
++	Stream_Seek_UINT32(s);                  /* Reserved (4 bytes) */
+ 
+ 	if (response->flags != TSG_PACKET_TYPE_QUARREQUEST)
+ 	{
+diff --git a/libfreerdp/core/heartbeat.c b/libfreerdp/core/heartbeat.c
+index 1fb608962f0a..6a77bd562ceb 100644
+--- a/libfreerdp/core/heartbeat.c
++++ b/libfreerdp/core/heartbeat.c
+@@ -25,7 +25,6 @@
+ 
+ state_run_t rdp_recv_heartbeat_packet(rdpRdp* rdp, wStream* s)
+ {
+-	BYTE reserved = 0;
+ 	BYTE period = 0;
+ 	BYTE count1 = 0;
+ 	BYTE count2 = 0;
+@@ -38,7 +37,7 @@ state_run_t rdp_recv_heartbeat_packet(rdpRdp* rdp, wStream* s)
+ 	if (!Stream_CheckAndLogRequiredLength(AUTODETECT_TAG, s, 4))
+ 		return STATE_RUN_FAILED;
+ 
+-	Stream_Read_UINT8(s, reserved); /* reserved (1 byte) */
++	Stream_Seek_UINT8(s);           /* reserved (1 byte) */
+ 	Stream_Read_UINT8(s, period);   /* period (1 byte) */
+ 	Stream_Read_UINT8(s, count1);   /* count1 (1 byte) */
+ 	Stream_Read_UINT8(s, count2);   /* count2 (1 byte) */
+diff --git a/libfreerdp/gdi/gfx.c b/libfreerdp/gdi/gfx.c
+index c9016a995e6b..59c7a377f8db 100644
+--- a/libfreerdp/gdi/gfx.c
++++ b/libfreerdp/gdi/gfx.c
+@@ -1855,14 +1855,11 @@ BOOL gdi_graphics_pipeline_init_ex(rdpGdi* gdi, RdpgfxClientContext* gfx,
+                                    pcRdpgfxUnmapWindowForSurface unmap,
+                                    pcRdpgfxUpdateSurfaceArea update)
+ {
+-	rdpContext* context = NULL;
+-	const rdpSettings* settings = NULL;
+-
+ 	if (!gdi || !gfx || !gdi->context || !gdi->context->settings)
+ 		return FALSE;
+ 
+-	context = gdi->context;
+-	settings = gdi->context->settings;
++	rdpContext* context = gdi->context;
++	rdpSettings* settings = context->settings;
+ 
+ 	gdi->gfx = gfx;
+ 	gfx->custom = (void*)gdi;
+diff --git a/winpr/libwinpr/ncrypt/ncrypt_pkcs11.c b/winpr/libwinpr/ncrypt/ncrypt_pkcs11.c
+index 5f0a80262a30..74ee99ec3a2c 100644
+--- a/winpr/libwinpr/ncrypt/ncrypt_pkcs11.c
++++ b/winpr/libwinpr/ncrypt/ncrypt_pkcs11.c
+@@ -356,7 +356,6 @@ static void log_(const char* tag, const char* msg, CK_RV rv, CK_ULONG index, CK_
+ static SECURITY_STATUS collect_keys(NCryptP11ProviderHandle* provider, P11EnumKeysState* state)
+ {
+ 	CK_OBJECT_HANDLE slotObjects[MAX_KEYS_PER_SLOT] = { 0 };
+-	const char* step = NULL;
+ 
+ 	WINPR_ASSERT(provider);
+ 
+@@ -418,7 +417,6 @@ static SECURITY_STATUS collect_keys(NCryptP11ProviderHandle* provider, P11EnumKe
+ 		{
+ 			// TODO: shall it be fatal ?
+ 			loge(TAG, "unable to initiate search", rv, i, state->slots[i]);
+-			step = "C_FindObjectsInit";
+ 			goto cleanup_FindObjectsInit;
+ 		}
+ 
+@@ -428,7 +426,6 @@ static SECURITY_STATUS collect_keys(NCryptP11ProviderHandle* provider, P11EnumKe
+ 		if (rv != CKR_OK)
+ 		{
+ 			loge(TAG, "unable to findObjects", rv, i, state->slots[i]);
+-			step = "C_FindObjects";
+ 			goto cleanup_FindObjects;
+ 		}
+ 
+
+From f22974a95a6b2d647174f4195f2ba4789105afaa Mon Sep 17 00:00:00 2001
+From: akallabeth <akallabeth@posteo.net>
+Date: Tue, 23 Jul 2024 09:15:00 +0200
+Subject: [PATCH 2/2] [winpr,utils] include current source dir
+
+---
+ winpr/libwinpr/utils/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/winpr/libwinpr/utils/CMakeLists.txt b/winpr/libwinpr/utils/CMakeLists.txt
+index 2c5efb3295a5..6bf40e77b1a6 100644
+--- a/winpr/libwinpr/utils/CMakeLists.txt
++++ b/winpr/libwinpr/utils/CMakeLists.txt
+@@ -18,7 +18,7 @@
+ include(CheckFunctionExists)
+ include(CMakeDependentOption)
+ 
+-set(CMAKE_INCLUDE_CURRENT_DIR ON)
++winpr_include_directory_add(${CMAKE_CURRENT_SOURCE_DIR})
+ 
+ option(WITH_LODEPNG "build WinPR with PNG support" OFF)
+ if (WITH_LODEPNG)

diff --git a/net-misc/freerdp/freerdp-3.6.3.ebuild b/net-misc/freerdp/freerdp-3.6.3.ebuild
index 54782cebb998..2603e73e7407 100644
--- a/net-misc/freerdp/freerdp-3.6.3.ebuild
+++ b/net-misc/freerdp/freerdp-3.6.3.ebuild
@@ -108,6 +108,10 @@ RDEPEND="${COMMON_DEPEND}
 	smartcard? ( app-crypt/p11-kit )
 "
 
+PATCHES=(
+	"${FILESDIR}/freerdp-3.6.3-backports.patch"
+)
+
 option() {
 	usex "$1" ON OFF
 }


^ permalink raw reply related	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2024-07-23 14:24 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-12-06 18:59 [gentoo-commits] repo/gentoo:master commit in: net-misc/freerdp/, net-misc/freerdp/files/ Mike Gilbert
  -- strict thread matches above, loose matches on Subject: below --
2024-07-23 14:24 Mike Gilbert
2024-03-24 19:59 Mike Gilbert
2023-12-21 20:49 Mike Gilbert
2021-10-31 21:41 Mike Gilbert
2020-06-30 14:23 Mike Gilbert
2018-03-14 21:08 Mike Gilbert
2016-12-15 17:33 Lars Wendler

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox