* [gentoo-commits] repo/gentoo:master commit in: net-misc/freerdp/files/
@ 2015-09-17 8:39 Alexis Ballier
0 siblings, 0 replies; 6+ messages in thread
From: Alexis Ballier @ 2015-09-17 8:39 UTC (permalink / raw
To: gentoo-commits
commit: 1bbaf66e9c5b8a4d3c8a43a48583aaae2be6e1d9
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 17 08:38:56 2015 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Thu Sep 17 08:38:56 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bbaf66e
net-misc/freerdp: Add ref to upstream PR for the ffmpeg patch.
Package-Manager: portage-2.2.20.1
net-misc/freerdp/files/freerdp-ffmpeg29.patch | 2 ++
1 file changed, 2 insertions(+)
diff --git a/net-misc/freerdp/files/freerdp-ffmpeg29.patch b/net-misc/freerdp/files/freerdp-ffmpeg29.patch
index 6113c3b..e4d81bd 100644
--- a/net-misc/freerdp/files/freerdp-ffmpeg29.patch
+++ b/net-misc/freerdp/files/freerdp-ffmpeg29.patch
@@ -1,3 +1,5 @@
+https://github.com/FreeRDP/FreeRDP/pull/2895
+
Index: freerdp-1.2.1_pre20150326/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
===================================================================
--- freerdp-1.2.1_pre20150326.orig/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/freerdp/files/
@ 2017-12-31 17:08 Mike Gilbert
0 siblings, 0 replies; 6+ messages in thread
From: Mike Gilbert @ 2017-12-31 17:08 UTC (permalink / raw
To: gentoo-commits
commit: dba1cb37dfe1c77fdfff7bf9145abf0b638389d7
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Wed Dec 27 08:56:26 2017 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Dec 31 17:07:55 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dba1cb37
net-misc/freerdp: remove unused patch
Closes: https://github.com/gentoo/gentoo/pull/6655
net-misc/freerdp/files/freerdp-libressl.patch | 148 --------------------------
1 file changed, 148 deletions(-)
diff --git a/net-misc/freerdp/files/freerdp-libressl.patch b/net-misc/freerdp/files/freerdp-libressl.patch
deleted file mode 100644
index cbb79bcc1d3..00000000000
--- a/net-misc/freerdp/files/freerdp-libressl.patch
+++ /dev/null
@@ -1,148 +0,0 @@
-From 70ab61c8e6083080093fc42e8e7172969864e2bd Mon Sep 17 00:00:00 2001
-From: Aric Belsito <lluixhi@gmail.com>
-Date: Sun, 19 Mar 2017 13:58:24 -0700
-Subject: [PATCH] Support LibreSSL
-
-Broken by the addition of OpenSSL 1.1.0 support.
----
- libfreerdp/crypto/opensslcompat.c | 4 ++--
- libfreerdp/crypto/opensslcompat.h | 4 ++--
- libfreerdp/crypto/tls.c | 8 ++++----
- winpr/libwinpr/crypto/hash.c | 8 ++++----
- winpr/libwinpr/utils/ssl.c | 2 +-
- 5 files changed, 13 insertions(+), 13 deletions(-)
-
-diff --git a/libfreerdp/crypto/opensslcompat.c b/libfreerdp/crypto/opensslcompat.c
-index bb5aff7..701902d 100644
---- a/libfreerdp/crypto/opensslcompat.c
-+++ b/libfreerdp/crypto/opensslcompat.c
-@@ -19,7 +19,7 @@
-
- #include "opensslcompat.h"
-
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-
- BIO_METHOD* BIO_meth_new(int type, const char* name)
- {
-@@ -41,4 +41,4 @@ void RSA_get0_key(const RSA* r, const BIGNUM** n, const BIGNUM** e, const BIGNUM
- *d = r->d;
- }
-
--#endif /* OPENSSL < 1.1.0 */
-+#endif /* OPENSSL < 1.1.0 || LIBRESSL */
-diff --git a/libfreerdp/crypto/opensslcompat.h b/libfreerdp/crypto/opensslcompat.h
-index a599863..b42d32f 100644
---- a/libfreerdp/crypto/opensslcompat.h
-+++ b/libfreerdp/crypto/opensslcompat.h
-@@ -30,7 +30,7 @@
-
- #include <openssl/opensslv.h>
-
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-
- #include <openssl/bio.h>
- #include <openssl/rsa.h>
-@@ -59,7 +59,7 @@
- BIO_METHOD* BIO_meth_new(int type, const char* name);
- void RSA_get0_key(const RSA* r, const BIGNUM** n, const BIGNUM** e, const BIGNUM** d);
-
--#endif /* OPENSSL < 1.1.0 */
-+#endif /* OPENSSL < 1.1.0 || LIBRESSL */
- #endif /* WITH_OPENSSL */
-
- #endif /* FREERDP_CRYPTO_OPENSSLCOMPAT_H */
-diff --git a/libfreerdp/crypto/tls.c b/libfreerdp/crypto/tls.c
-index 1071a2e..c415763 100644
---- a/libfreerdp/crypto/tls.c
-+++ b/libfreerdp/crypto/tls.c
-@@ -323,7 +323,7 @@ static long bio_rdp_tls_ctrl(BIO* bio, int cmd, long num, void* ptr)
- case BIO_CTRL_PUSH:
- if (next_bio && (next_bio != ssl_rbio))
- {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- SSL_set_bio(tls->ssl, next_bio, next_bio);
- CRYPTO_add(&(bio->next_bio->references), 1, CRYPTO_LOCK_BIO);
- #else
-@@ -346,7 +346,7 @@ static long bio_rdp_tls_ctrl(BIO* bio, int cmd, long num, void* ptr)
- if (ssl_rbio != ssl_wbio)
- BIO_free_all(ssl_wbio);
-
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- if (next_bio)
- CRYPTO_add(&(bio->next_bio->references), -1, CRYPTO_LOCK_BIO);
- tls->ssl->wbio = tls->ssl->rbio = NULL;
-@@ -384,7 +384,7 @@ static long bio_rdp_tls_ctrl(BIO* bio, int cmd, long num, void* ptr)
- BIO_push(ssl_rbio, next_bio);
-
- BIO_set_next(bio, ssl_rbio);
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- CRYPTO_add(&(ssl_rbio->references), 1, CRYPTO_LOCK_BIO);
- #else
- BIO_up_ref(ssl_rbio);
-@@ -1021,7 +1021,7 @@ BOOL tls_send_alert(rdpTls* tls)
- * SSL struct is opaqe now
- */
-
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- if (tls->alertDescription != TLS_ALERT_DESCRIPTION_CLOSE_NOTIFY)
- {
- /**
-diff --git a/winpr/libwinpr/crypto/hash.c b/winpr/libwinpr/crypto/hash.c
-index 949d687..27eb434 100644
---- a/winpr/libwinpr/crypto/hash.c
-+++ b/winpr/libwinpr/crypto/hash.c
-@@ -146,7 +146,7 @@ WINPR_HMAC_CTX* winpr_HMAC_New(void)
-
- #if defined(WITH_OPENSSL)
- HMAC_CTX* hmac = NULL;
--#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
- if (!(hmac = (HMAC_CTX*) calloc(1, sizeof(HMAC_CTX))))
- return NULL;
- HMAC_CTX_init(hmac);
-@@ -267,7 +267,7 @@ void winpr_HMAC_Free(WINPR_HMAC_CTX* ctx)
- HMAC_CTX* hmac = (HMAC_CTX*) ctx;
- if (hmac)
- {
--#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
- HMAC_CTX_cleanup(hmac);
- free(hmac);
- #else
-@@ -317,7 +317,7 @@ WINPR_DIGEST_CTX* winpr_Digest_New(void)
-
- #if defined(WITH_OPENSSL)
- EVP_MD_CTX* mdctx;
--#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
- mdctx = EVP_MD_CTX_create();
- #else
- mdctx = EVP_MD_CTX_new();
-@@ -406,7 +406,7 @@ void winpr_Digest_Free(WINPR_DIGEST_CTX* ctx)
- EVP_MD_CTX* mdctx = (EVP_MD_CTX*) ctx;
- if (mdctx)
- {
--#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
- EVP_MD_CTX_destroy(mdctx);
- #else
- EVP_MD_CTX_free(mdctx);
-diff --git a/winpr/libwinpr/utils/ssl.c b/winpr/libwinpr/utils/ssl.c
-index 2f8100f..5fd6ac6 100644
---- a/winpr/libwinpr/utils/ssl.c
-+++ b/winpr/libwinpr/utils/ssl.c
-@@ -45,7 +45,7 @@ static BOOL g_winpr_openssl_initialized_by_winpr = FALSE;
- * set locking callbacks to use OpenSSL in a multi-threaded environment.
- */
-
--#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
-
- #define WINPR_OPENSSL_LOCKING_REQUIRED 1
-
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/freerdp/files/
@ 2019-09-29 20:48 Mike Gilbert
0 siblings, 0 replies; 6+ messages in thread
From: Mike Gilbert @ 2019-09-29 20:48 UTC (permalink / raw
To: gentoo-commits
commit: 6b4e5c994bbd5233a937240df9a3ff6c522703ac
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 29 20:48:11 2019 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Sep 29 20:48:11 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b4e5c99
net-misc/freerdp: another libressl fix
Closes: https://bugs.gentoo.org/684294
Package-Manager: Portage-2.3.75_p7, Repoman-2.3.17_p49
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
net-misc/freerdp/files/2.0.0-rc4-libressl.patch | 31 +++++++++++++++++++++++++
1 file changed, 31 insertions(+)
diff --git a/net-misc/freerdp/files/2.0.0-rc4-libressl.patch b/net-misc/freerdp/files/2.0.0-rc4-libressl.patch
index f666e0d4d67..fd6e6148607 100644
--- a/net-misc/freerdp/files/2.0.0-rc4-libressl.patch
+++ b/net-misc/freerdp/files/2.0.0-rc4-libressl.patch
@@ -45,3 +45,34 @@ index 76f51701fe..ded41f127e 100644
SSL_CTX_set_security_level(tls->ctx, settings->TlsSecLevel);
#endif
+From 0c83efa753d0457eb319624f87b491badf75105f Mon Sep 17 00:00:00 2001
+From: Armin Novak <armin.novak@thincast.com>
+Date: Mon, 7 Jan 2019 14:18:14 +0100
+Subject: [PATCH] Fix #5170: Disable custom TLS alert for libressl > 2.8.3
+
+---
+ libfreerdp/crypto/tls.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libfreerdp/crypto/tls.c b/libfreerdp/crypto/tls.c
+index b2cf5416c8..56e16bacb4 100644
+--- a/libfreerdp/crypto/tls.c
++++ b/libfreerdp/crypto/tls.c
+@@ -1030,7 +1030,8 @@ BOOL tls_send_alert(rdpTls* tls)
+ * FIXME: The following code does not work on OpenSSL > 1.1.0 because the
+ * SSL struct is opaqe now
+ */
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
++#if (!defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER < 0x10100000L)) || \
++ (defined(LIBRESSL_VERSION_NUMBER) && (LIBRESSL_VERSION_NUMBER <= 0x2080300fL))
+
+ if (tls->alertDescription != TLS_ALERT_DESCRIPTION_CLOSE_NOTIFY)
+ {
+@@ -1057,7 +1058,6 @@ BOOL tls_send_alert(rdpTls* tls)
+ if (tls->ssl->s3->wbuf.left == 0)
+ tls->ssl->method->ssl_dispatch_alert(tls->ssl);
+ }
+-
+ #endif
+ return TRUE;
+ }
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/freerdp/files/
@ 2021-08-01 16:23 Mike Gilbert
0 siblings, 0 replies; 6+ messages in thread
From: Mike Gilbert @ 2021-08-01 16:23 UTC (permalink / raw
To: gentoo-commits
commit: 27f2beec2a9bf4e328b1b19fb8790e26e1d6c1c7
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 1 16:21:37 2021 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Aug 1 16:21:37 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27f2beec
net-misc/freerdp: another openssl-3.0 fix
Closes: https://bugs.gentoo.org/805893
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
net-misc/freerdp/files/freerdp-2-openssl-3.0.patch | 23 ++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/net-misc/freerdp/files/freerdp-2-openssl-3.0.patch b/net-misc/freerdp/files/freerdp-2-openssl-3.0.patch
index 74b9d406130..e4662751e5c 100644
--- a/net-misc/freerdp/files/freerdp-2-openssl-3.0.patch
+++ b/net-misc/freerdp/files/freerdp-2-openssl-3.0.patch
@@ -36,3 +36,26 @@ index 3a859039034..03b23af43ac 100644
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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/freerdp/files/
@ 2021-10-25 17:15 Mike Gilbert
0 siblings, 0 replies; 6+ messages in thread
From: Mike Gilbert @ 2021-10-25 17:15 UTC (permalink / raw
To: gentoo-commits
commit: 2da095fbd2e42aab959832bb9634e2dfe591ee69
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 25 17:15:05 2021 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Oct 25 17:15:05 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2da095fb
net-misc/freerdp: restore patches
Closes: https://bugs.gentoo.org/820239
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
net-misc/freerdp/files/freerdp-2-openssl-3.0.patch | 61 ++++++++++++++++++++++
...dp-2.4.0-TestUnicodeConversion-big-endian.patch | 28 ++++++++++
2 files changed, 89 insertions(+)
diff --git a/net-misc/freerdp/files/freerdp-2-openssl-3.0.patch b/net-misc/freerdp/files/freerdp-2-openssl-3.0.patch
new file mode 100644
index 00000000000..e4662751e5c
--- /dev/null
+++ b/net-misc/freerdp/files/freerdp-2-openssl-3.0.patch
@@ -0,0 +1,61 @@
+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
new file mode 100644
index 00000000000..b8977aecd56
--- /dev/null
+++ b/net-misc/freerdp/files/freerdp-2.4.0-TestUnicodeConversion-big-endian.patch
@@ -0,0 +1,28 @@
+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];
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/freerdp/files/
@ 2024-05-22 21:10 Mike Gilbert
0 siblings, 0 replies; 6+ messages in thread
From: Mike Gilbert @ 2024-05-22 21:10 UTC (permalink / raw
To: gentoo-commits
commit: 6343c03ccd88138d77e8c6fb644440e71133272b
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Wed May 22 21:10:07 2024 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Wed May 22 21:10:07 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6343c03c
net-misc/freerdp: fix patch
Bug: https://bugs.gentoo.org/932407
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
net-misc/freerdp/files/freerdp-2.11.7-type-mismatch.patch | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/net-misc/freerdp/files/freerdp-2.11.7-type-mismatch.patch b/net-misc/freerdp/files/freerdp-2.11.7-type-mismatch.patch
index 731bbee4cb3c..34720aef4b5b 100644
--- a/net-misc/freerdp/files/freerdp-2.11.7-type-mismatch.patch
+++ b/net-misc/freerdp/files/freerdp-2.11.7-type-mismatch.patch
@@ -1,16 +1,15 @@
-From b50f3818ab4dfca852e8c1dd009b6b64c31a0382 Mon Sep 17 00:00:00 2001
+From d2b6771c748e54e659d5f1243a92e499c3beaa36 Mon Sep 17 00:00:00 2001
From: Mike Gilbert <floppym@gentoo.org>
-Date: Wed, 22 May 2024 13:23:36 -0400
+Date: Wed, 22 May 2024 17:04:43 -0400
Subject: [PATCH] X11: fix pointer/integer type mismatch
-This was fixed on master as part of
-641022b7953bb04e80b5058cd07149d0cf454aee.
+Fixed on master in 2da280b8a1748052b70b3f5a1ef0d8e932c33adc.
---
client/X11/xf_graphics.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/client/X11/xf_graphics.c b/client/X11/xf_graphics.c
-index 5aa1fd48b5a3..a3793e64d9f1 100644
+index 5aa1fd48b5a3..fe81e0ed91cb 100644
--- a/client/X11/xf_graphics.c
+++ b/client/X11/xf_graphics.c
@@ -438,7 +438,7 @@ static BOOL xf_Pointer_New(rdpContext* context, rdpPointer* pointer)
@@ -18,7 +17,7 @@ index 5aa1fd48b5a3..a3793e64d9f1 100644
#endif
fail:
- WLog_DBG(TAG, "%s: %ld", __func__, rc ? pointer : -1);
-+ WLog_DBG(TAG, "%s: %ld", __func__, rc ? pointer : NULL);
++ WLog_DBG(TAG, "%s: %p", __func__, rc ? pointer : NULL);
return rc;
}
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-05-22 21:10 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-09-29 20:48 [gentoo-commits] repo/gentoo:master commit in: net-misc/freerdp/files/ Mike Gilbert
-- strict thread matches above, loose matches on Subject: below --
2024-05-22 21:10 Mike Gilbert
2021-10-25 17:15 Mike Gilbert
2021-08-01 16:23 Mike Gilbert
2017-12-31 17:08 Mike Gilbert
2015-09-17 8:39 Alexis Ballier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox