1 |
commit: a9e5d89979dafa0a40c504d193c430b42785c5e6 |
2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Oct 31 21:40:41 2021 +0000 |
4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Oct 31 21:40:41 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9e5d899 |
7 |
|
8 |
net-misc/freerdp: drop 2.3.2 |
9 |
|
10 |
Bug: https://bugs.gentoo.org/819534 |
11 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
12 |
|
13 |
net-misc/freerdp/Manifest | 1 - |
14 |
net-misc/freerdp/files/freerdp-2-openssl-3.0.patch | 61 ---------- |
15 |
...dp-2.4.0-TestUnicodeConversion-big-endian.patch | 28 ----- |
16 |
net-misc/freerdp/freerdp-2.3.2.ebuild | 123 --------------------- |
17 |
4 files changed, 213 deletions(-) |
18 |
|
19 |
diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest |
20 |
index 0740be54ebc..b476f9d6e9a 100644 |
21 |
--- a/net-misc/freerdp/Manifest |
22 |
+++ b/net-misc/freerdp/Manifest |
23 |
@@ -1,2 +1 @@ |
24 |
-DIST freerdp-2.3.2.tar.gz 7284490 BLAKE2B f6017752993fcd9213117016825344953872b3ad6b6717039ba78555bbeeb276eb548c2c097c5df46d25d19678b8e275ac25a4c62e212c087e1b52d9ce672de9 SHA512 b8502d34c73113a42bf2dc240431967829064d68f507cc42ff06432a784213eee4a2c001b174f1b970545aec75b3caf21ba5f4ee1ca8c07c7ef834131413204b |
25 |
DIST freerdp-2.4.1.tar.gz 7300797 BLAKE2B cd14cadfbad9f30ab6ee6ba80c3a3bfb191b68dc0cf576082044a20489f558e222e618ed314a7fefdefcb480f201f384df5d77db8699d2e4530559fd3d5b4398 SHA512 9bacd6a7219690ed62d6a646616a54770293ff45b59211aff73dc8d67300a79ba22e72cbe56803d301b60964e4acccea9b7c6d7e2d698b91eafcf6ba561cd66a |
26 |
|
27 |
diff --git a/net-misc/freerdp/files/freerdp-2-openssl-3.0.patch b/net-misc/freerdp/files/freerdp-2-openssl-3.0.patch |
28 |
deleted file mode 100644 |
29 |
index e4662751e5c..00000000000 |
30 |
--- a/net-misc/freerdp/files/freerdp-2-openssl-3.0.patch |
31 |
+++ /dev/null |
32 |
@@ -1,61 +0,0 @@ |
33 |
-From 26bf2816c3e0daeaf524c47cf0fcda8ae13b65ad Mon Sep 17 00:00:00 2001 |
34 |
-From: Ondrej Holy <oholy@××××××.com> |
35 |
-Date: Wed, 12 May 2021 12:48:15 +0200 |
36 |
-Subject: [PATCH] Fix FIPS mode support and build with OpenSSL 3.0 |
37 |
- |
38 |
-FreeRDP fails to build with OpenSSL 3.0 because of usage of the `FIPS_mode` |
39 |
-and `FIPS_mode_set` functions, which were removed there. Just a note that |
40 |
-the FIPS mode is not supported by OpenSSL 1.1.* although the mentioned |
41 |
-functions are still there (see https://wiki.openssl.org/index.php/FIPS_modules). |
42 |
-Let's make FreeRDP build with OpenSSL 3.0 and fix the FIPS mode support. |
43 |
- |
44 |
-See: https://bugzilla.redhat.com/show_bug.cgi?id=1952937 |
45 |
---- |
46 |
- winpr/libwinpr/utils/ssl.c | 8 ++++++++ |
47 |
- 1 file changed, 8 insertions(+) |
48 |
- |
49 |
-diff --git a/winpr/libwinpr/utils/ssl.c b/winpr/libwinpr/utils/ssl.c |
50 |
-index 3a859039034..03b23af43ac 100644 |
51 |
---- a/winpr/libwinpr/utils/ssl.c |
52 |
-+++ b/winpr/libwinpr/utils/ssl.c |
53 |
-@@ -244,9 +244,17 @@ static BOOL winpr_enable_fips(DWORD flags) |
54 |
- #else |
55 |
- WLog_DBG(TAG, "Ensuring openssl fips mode is ENabled"); |
56 |
- |
57 |
-+#if defined(OPENSSL_VERSION_MAJOR) && (OPENSSL_VERSION_MAJOR >= 3) |
58 |
-+ if (!EVP_default_properties_is_fips_enabled(NULL)) |
59 |
-+#else |
60 |
- if (FIPS_mode() != 1) |
61 |
-+#endif |
62 |
- { |
63 |
-+#if defined(OPENSSL_VERSION_MAJOR) && (OPENSSL_VERSION_MAJOR >= 3) |
64 |
-+ if (EVP_set_default_properties(NULL, "fips=yes")) |
65 |
-+#else |
66 |
- if (FIPS_mode_set(1)) |
67 |
-+#endif |
68 |
- WLog_INFO(TAG, "Openssl fips mode ENabled!"); |
69 |
- else |
70 |
- { |
71 |
-From e59acc13c8f9b522a15fd586e643f04af1a79d9a Mon Sep 17 00:00:00 2001 |
72 |
-From: Mike Gilbert <floppym@g.o> |
73 |
-Date: Sun, 1 Aug 2021 12:14:43 -0400 |
74 |
-Subject: [PATCH] winpr: avoid calling FIPS_mode() with OpenSSL 3.0 |
75 |
- |
76 |
-Fixes: 26bf2816c3e0daeaf524c47cf0fcda8ae13b65ad |
77 |
---- |
78 |
- winpr/libwinpr/utils/ssl.c | 2 ++ |
79 |
- 1 file changed, 2 insertions(+) |
80 |
- |
81 |
-diff --git a/winpr/libwinpr/utils/ssl.c b/winpr/libwinpr/utils/ssl.c |
82 |
-index 03b23af43ac..74ef156e7b0 100644 |
83 |
---- a/winpr/libwinpr/utils/ssl.c |
84 |
-+++ b/winpr/libwinpr/utils/ssl.c |
85 |
-@@ -364,6 +364,8 @@ BOOL winpr_FIPSMode(void) |
86 |
- { |
87 |
- #if (OPENSSL_VERSION_NUMBER < 0x10001000L) || defined(LIBRESSL_VERSION_NUMBER) |
88 |
- return FALSE; |
89 |
-+#elif defined(OPENSSL_VERSION_MAJOR) && (OPENSSL_VERSION_MAJOR >= 3) |
90 |
-+ return (EVP_default_properties_is_fips_enabled(NULL) == 1); |
91 |
- #else |
92 |
- return (FIPS_mode() == 1); |
93 |
- #endif |
94 |
|
95 |
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 |
96 |
deleted file mode 100644 |
97 |
index b8977aecd56..00000000000 |
98 |
--- a/net-misc/freerdp/files/freerdp-2.4.0-TestUnicodeConversion-big-endian.patch |
99 |
+++ /dev/null |
100 |
@@ -1,28 +0,0 @@ |
101 |
-From 7f53e1c6c8503e9d3966c96bd403573f44879b0c Mon Sep 17 00:00:00 2001 |
102 |
-From: Mike Gilbert <floppym@g.o> |
103 |
-Date: Sat, 7 Aug 2021 21:49:12 -0400 |
104 |
-Subject: [PATCH] Fix TestUnicodeConversion on big endian machines |
105 |
- |
106 |
-Wide character literals are stored in native byte order. |
107 |
-Use an array of bytes as a reference instead. |
108 |
- |
109 |
-Fixes: https://github.com/FreeRDP/FreeRDP/issues/6968 |
110 |
---- |
111 |
- winpr/libwinpr/crt/test/TestUnicodeConversion.c | 4 ++-- |
112 |
- 1 file changed, 2 insertions(+), 2 deletions(-) |
113 |
- |
114 |
-diff --git a/winpr/libwinpr/crt/test/TestUnicodeConversion.c b/winpr/libwinpr/crt/test/TestUnicodeConversion.c |
115 |
-index 3bc9c245181..cc2a2597dd8 100644 |
116 |
---- a/winpr/libwinpr/crt/test/TestUnicodeConversion.c |
117 |
-+++ b/winpr/libwinpr/crt/test/TestUnicodeConversion.c |
118 |
-@@ -403,8 +403,8 @@ static BOOL test_ConvertToUnicode_wrapper(void) |
119 |
- /* Test static string buffers of differing sizes */ |
120 |
- { |
121 |
- char name[] = "someteststring"; |
122 |
-- const WCHAR cmp[] = { L's', L'o', L'm', L'e', L't', L'e', L's', L't', |
123 |
-- L's', L't', L'r', L'i', L'n', L'g', 0 }; |
124 |
-+ const BYTE cmp[] = { 's', 0, 'o', 0, 'm', 0, 'e', 0, 't', 0, 'e', 0, 's', 0, 't', 0, |
125 |
-+ 's', 0, 't', 0, 'r', 0, 'i', 0, 'n', 0, 'g', 0, 0, 0 }; |
126 |
- WCHAR xname[128] = { 0 }; |
127 |
- LPWSTR aname = NULL; |
128 |
- LPWSTR wname = &xname[0]; |
129 |
|
130 |
diff --git a/net-misc/freerdp/freerdp-2.3.2.ebuild b/net-misc/freerdp/freerdp-2.3.2.ebuild |
131 |
deleted file mode 100644 |
132 |
index 89821d9aa7a..00000000000 |
133 |
--- a/net-misc/freerdp/freerdp-2.3.2.ebuild |
134 |
+++ /dev/null |
135 |
@@ -1,123 +0,0 @@ |
136 |
-# Copyright 2011-2021 Gentoo Authors |
137 |
-# Distributed under the terms of the GNU General Public License v2 |
138 |
- |
139 |
-EAPI=7 |
140 |
- |
141 |
-inherit cmake |
142 |
- |
143 |
-if [[ ${PV} == *9999 ]]; then |
144 |
- inherit git-r3 |
145 |
- EGIT_REPO_URI="https://github.com/FreeRDP/FreeRDP.git" |
146 |
- case ${PV} in |
147 |
- 2.*) EGIT_BRANCH="stable-2.0";; |
148 |
- esac |
149 |
-else |
150 |
- MY_P=${P/_/-} |
151 |
- S="${WORKDIR}/${MY_P}" |
152 |
- SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz" |
153 |
- KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 x86" |
154 |
-fi |
155 |
- |
156 |
-DESCRIPTION="Free implementation of the Remote Desktop Protocol" |
157 |
-HOMEPAGE="http://www.freerdp.com/" |
158 |
- |
159 |
-LICENSE="Apache-2.0" |
160 |
-SLOT="0/2" |
161 |
-IUSE="alsa cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer jpeg openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv" |
162 |
-RESTRICT="!test? ( test )" |
163 |
- |
164 |
-RDEPEND=" |
165 |
- dev-libs/openssl:0= |
166 |
- sys-libs/zlib:0 |
167 |
- alsa? ( media-libs/alsa-lib ) |
168 |
- cups? ( net-print/cups ) |
169 |
- usb? ( |
170 |
- virtual/libudev:0= |
171 |
- sys-apps/util-linux:0= |
172 |
- dev-libs/dbus-glib:0= |
173 |
- virtual/libusb:1= |
174 |
- ) |
175 |
- X? ( |
176 |
- x11-libs/libXcursor |
177 |
- x11-libs/libXext |
178 |
- x11-libs/libXi |
179 |
- x11-libs/libXrender |
180 |
- xinerama? ( x11-libs/libXinerama ) |
181 |
- xv? ( x11-libs/libXv ) |
182 |
- ) |
183 |
- ffmpeg? ( media-video/ffmpeg:0= ) |
184 |
- !ffmpeg? ( |
185 |
- x11-libs/cairo:0= |
186 |
- ) |
187 |
- gstreamer? ( |
188 |
- media-libs/gstreamer:1.0 |
189 |
- media-libs/gst-plugins-base:1.0 |
190 |
- x11-libs/libXrandr |
191 |
- ) |
192 |
- jpeg? ( virtual/jpeg:0 ) |
193 |
- openh264? ( media-libs/openh264:0= ) |
194 |
- pulseaudio? ( media-sound/pulseaudio ) |
195 |
- server? ( |
196 |
- X? ( |
197 |
- x11-libs/libXcursor |
198 |
- x11-libs/libXdamage |
199 |
- x11-libs/libXext |
200 |
- x11-libs/libXfixes |
201 |
- x11-libs/libXrandr |
202 |
- x11-libs/libXtst |
203 |
- xinerama? ( x11-libs/libXinerama ) |
204 |
- ) |
205 |
- ) |
206 |
- smartcard? ( sys-apps/pcsc-lite ) |
207 |
- systemd? ( sys-apps/systemd:0= ) |
208 |
- wayland? ( |
209 |
- dev-libs/wayland |
210 |
- x11-libs/libxkbcommon |
211 |
- ) |
212 |
- X? ( |
213 |
- x11-libs/libX11 |
214 |
- x11-libs/libxkbfile |
215 |
- ) |
216 |
-" |
217 |
-DEPEND="${RDEPEND}" |
218 |
-BDEPEND=" |
219 |
- virtual/pkgconfig |
220 |
- X? ( doc? ( |
221 |
- app-text/docbook-xml-dtd:4.1.2 |
222 |
- app-text/xmlto |
223 |
- ) ) |
224 |
-" |
225 |
- |
226 |
-PATCHES=( |
227 |
- "${FILESDIR}/freerdp-2-openssl-3.0.patch" |
228 |
- "${FILESDIR}/freerdp-2.4.0-TestUnicodeConversion-big-endian.patch" |
229 |
-) |
230 |
- |
231 |
-src_configure() { |
232 |
- local mycmakeargs=( |
233 |
- -DBUILD_TESTING=$(usex test ON OFF) |
234 |
- -DCHANNEL_URBDRC=$(usex usb ON OFF) |
235 |
- -DWITH_ALSA=$(usex alsa ON OFF) |
236 |
- -DWITH_CCACHE=OFF |
237 |
- -DWITH_CUPS=$(usex cups ON OFF) |
238 |
- -DWITH_DEBUG_ALL=$(usex debug ON OFF) |
239 |
- -DWITH_MANPAGES=$(usex doc ON OFF) |
240 |
- -DWITH_FFMPEG=$(usex ffmpeg ON OFF) |
241 |
- -DWITH_SWSCALE=$(usex ffmpeg ON OFF) |
242 |
- -DWITH_CAIRO=$(usex ffmpeg OFF ON) |
243 |
- -DWITH_DSP_FFMPEG=$(usex ffmpeg ON OFF) |
244 |
- -DWITH_GSTREAMER_1_0=$(usex gstreamer ON OFF) |
245 |
- -DWITH_JPEG=$(usex jpeg ON OFF) |
246 |
- -DWITH_NEON=$(usex cpu_flags_arm_neon ON OFF) |
247 |
- -DWITH_OPENH264=$(usex openh264 ON OFF) |
248 |
- -DWITH_PULSE=$(usex pulseaudio ON OFF) |
249 |
- -DWITH_SERVER=$(usex server ON OFF) |
250 |
- -DWITH_PCSC=$(usex smartcard ON OFF) |
251 |
- -DWITH_LIBSYSTEMD=$(usex systemd ON OFF) |
252 |
- -DWITH_X11=$(usex X ON OFF) |
253 |
- -DWITH_XINERAMA=$(usex xinerama ON OFF) |
254 |
- -DWITH_XV=$(usex xv ON OFF) |
255 |
- -DWITH_WAYLAND=$(usex wayland ON OFF) |
256 |
- ) |
257 |
- cmake_src_configure |
258 |
-} |