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

2024-07-23 Thread Mike Gilbert 
commit: ce00779b11562ced94ae12e97007830e32cac4f6
Author: Mike Gilbert  gentoo  org>
AuthorDate: Tue Jul 23 14:23:26 2024 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Tue Jul 23 14:23:26 2024 +
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  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 ..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 
+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
+

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

2024-03-24 Thread Mike Gilbert 
commit: b7bbba6ba542f531dabd8e9091c5d09fc4f85dc5
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sun Mar 24 19:30:54 2024 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sun Mar 24 19:59:08 2024 +
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  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 ..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 
+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 
+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 
+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)))
+   {
+-

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

2023-12-21 Thread Mike Gilbert 
commit: d05a4c3e53d6bfb1b71c16f31d7028b6b37b44be
Author: Mike Gilbert  gentoo  org>
AuthorDate: Thu Dec 21 20:48:18 2023 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Thu Dec 21 20:49:09 2023 +
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  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..
--- 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 
-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..
--- 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} == * ]]; 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

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

2023-12-06 Thread Mike Gilbert 
commit: dd1faced71b23f460c067320c785b0133570ca76
Author: Mike Gilbert  gentoo  org>
AuthorDate: Wed Dec  6 18:58:49 2023 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Wed Dec  6 18:58:49 2023 +
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  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 ..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 
+Date: Mon, 11 Sep 2023 00:31:54 +
+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 
+---
+ 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

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

2021-10-31 Thread Mike Gilbert 
commit: a9e5d89979dafa0a40c504d193c430b42785c5e6
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sun Oct 31 21:40:41 2021 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sun Oct 31 21:40:41 2021 +
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  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..000
--- 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 
-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 
-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..000
--- 
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 
-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 c

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

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

net-misc/freerdp: backport bug fix

Signed-off-by: Mike Gilbert  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 000..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 
+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
 }

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

2018-03-14 Thread Mike Gilbert 
commit: 80ed7e534b05809a0ab3dc4a6d69bec4b98f02d0
Author: Mike Gilbert  gentoo  org>
AuthorDate: Wed Mar 14 21:06:52 2018 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Wed Mar 14 21:08:02 2018 +
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 000..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 
+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() {

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

2016-12-15 Thread Lars Wendler 
commit: ff94920758712c9f107e710cc5095eb6500c5cd0
Author: Lars Wendler  gentoo  org>
AuthorDate: Thu Dec 15 17:32:38 2016 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu Dec 15 17:33:28 2016 +
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 
2f7c04bde54293fc8fc85ba03baf7dc64e5da4cecdc872ff316127abc43f0b56d70e14652f97f2e97a8f43bee8880837a94230448397dfad5f4ddbd055b1
 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..
--- 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 
-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/fastpat