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

[Mike Gilbert]

commit:     ff750a92de5a11f3e16e9e324465e407be7455d5
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 23 16:08:34 2021 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat Oct 23 16:09:39 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff750a92

net-misc/freerdp: add 2.4.1, drop 2.4.0

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

 net-misc/freerdp/Manifest                          |  2 +-
 net-misc/freerdp/files/freerdp-2-openssl-3.0.patch | 61 ----------------------
 ...dp-2.4.0-TestUnicodeConversion-big-endian.patch | 28 ----------
 .../{freerdp-2.4.0.ebuild => freerdp-2.4.1.ebuild} |  5 --
 4 files changed, 1 insertion(+), 95 deletions(-)

diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest
index aa3ce09c0f5..5509edcadb4 100644
--- a/net-misc/freerdp/Manifest
+++ b/net-misc/freerdp/Manifest
@@ -1,3 +1,3 @@
 DIST freerdp-2.2.0.tar.gz 6878427 BLAKE2B 0a2a4e4724e9875ce5d975b2c9a0b89ce9467e5950ee4d2d007596269683fa834bfce83e2bf92558887e4fe9418186a5e69708e859649cd0ed095029167a7e12 SHA512 8917378f74b5fee1ddc607b152b29783855f7e1e838fde68bf4d55177295c15fdccece02356d83f998e3bef2abd75b8354d4bbd26a7631ed296a1daf46864aae
 DIST freerdp-2.3.2.tar.gz 7284490 BLAKE2B f6017752993fcd9213117016825344953872b3ad6b6717039ba78555bbeeb276eb548c2c097c5df46d25d19678b8e275ac25a4c62e212c087e1b52d9ce672de9 SHA512 b8502d34c73113a42bf2dc240431967829064d68f507cc42ff06432a784213eee4a2c001b174f1b970545aec75b3caf21ba5f4ee1ca8c07c7ef834131413204b
-DIST freerdp-2.4.0.tar.gz 7244549 BLAKE2B a48c48ca7af044a8421d15b7cae971e3f568b55b26b2bc44c99dfb5cbcd7558fe73ae8b59ee127f40cfafa30fc26fc45bf34cc86ae71cba9b3b9c450c88b131d SHA512 5dc34e66ae7185393981ae33676d689e3e3e8d7f738b37d53675ab991a762a42450d02d738166fc49f196d32453249eb36e35728f86edae6ddec866a913551f3
+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@××××××.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@g.o>
-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@g.o>
-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.4.0.ebuild b/net-misc/freerdp/freerdp-2.4.1.ebuild
similarity index 95%
rename from net-misc/freerdp/freerdp-2.4.0.ebuild
rename to net-misc/freerdp/freerdp-2.4.1.ebuild
index 963570637e5..30cd72a4a8d 100644
--- a/net-misc/freerdp/freerdp-2.4.0.ebuild
+++ b/net-misc/freerdp/freerdp-2.4.1.ebuild
@@ -88,11 +88,6 @@ BDEPEND="
 	) )
 "
 
-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)