Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Mike Gilbert <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/freerdp/files/, net-misc/freerdp/
Date: Sat, 09 May 2020 04:15:58
Message-Id: 1588997751.049c86b6a13a1c9913cc01e4110313fb683eaac8.floppym@gentoo
1 commit: 049c86b6a13a1c9913cc01e4110313fb683eaac8
2 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
3 AuthorDate: Sat May 9 04:15:13 2020 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Sat May 9 04:15:51 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=049c86b6
7
8 net-misc/freerdp: remove old
9
10 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
11
12 net-misc/freerdp/Manifest | 3 -
13 .../freerdp/files/2.0.0-rc4-bitmap-endian.patch | 30 -----
14 net-misc/freerdp/files/2.0.0-rc4-libressl.patch | 78 -------------
15 net-misc/freerdp/freerdp-2.0.0_rc4.ebuild | 121 ---------------------
16 net-misc/freerdp/freerdp-2.0.0_rc4_p1129.ebuild | 119 --------------------
17 5 files changed, 351 deletions(-)
18
19 diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest
20 index 3fd51796e61..9e59f87b53e 100644
21 --- a/net-misc/freerdp/Manifest
22 +++ b/net-misc/freerdp/Manifest
23 @@ -1,5 +1,2 @@
24 -DIST freerdp-2.0.0-rc4-fix-NTLM-AvPair-lists.patch 20553 BLAKE2B 17ba83ba2dc05f2179df3aa8805877e15b353d4c6bbe88fa0553f7412baf85849a834032143ebd22ff3d27dd12ffdfddfc802868e10ca2718145a58378940ec4 SHA512 b3b548e98422362f63aedfefca399e4008a4b571e6cd786603418c5a3d1c4d832d5148ddee2f62d6bc1259c66020ee01ced6357d72333f49fc34a1059f4f804e
25 -DIST freerdp-2.0.0-rc4.tar.gz 6662044 BLAKE2B 50bc72336841e421b8fd89ce4f2be6a0b1a9f052933c4cd5bad33261689e6a6b54bc5563fb1ace8cc7a2271990c0ff4c7fe239243f5d75140af497ee6ff9bcd6 SHA512 63cf89aecc6d7ac55db8c7aca60f4ba29cfa54ad70d0fa87fdab011cd16500a3d184659119cd08b7596b7236346db3b61b46282c5325d7f0ca6da09b42d0df20
26 DIST freerdp-2.0.0.tar.gz 6857730 BLAKE2B 2873a228b82874d3efae3ea922c83c7d32692ae17da2b7b85a9dd570d8d3f4df7f4943920474cb6711c32c6e8863429a165a6f4b65c834fda1320bcb804b38db SHA512 4babb7b3a5e7b39b89c4e1dbcd5a58b5fbfb8d48083dbafc2c6455d8b739f4c444715286cc10f2f7446f96053d3f5ff4ac2cff1af9708cbc48ef07a6fee5bee6
27 -DIST freerdp-2.0.0_rc4_p1129.tar.gz 6774330 BLAKE2B 728a4d0f0d7ee4a6cf8a7d0d4ed6f2e0f13a76ceb1c16e7cb48ad0f3d6b6f36194839129bd57e73e02d2a6ae89a83d9d571f515ab2f46cb26f611424dd5b23b5 SHA512 407b06ca7607e01d52b7b89337dbcd5dc15633de197ea91443825672963cbb6d966a187dee022afb5f9979e8d08577ee62b681f37419e5b986f9c2f5e8a3e285
28 DIST freerdp-2.1.0.tar.gz 21772624 BLAKE2B d3491cb9f08a34fd5b2a5b00b46494e4e0524715d73ad46e92812578fbe9843504d937dc634f1597a7f0785494fd2c68f964125b438328105e4db41191eeb166 SHA512 c0abecf3d52bf8388538f0bb60a0852b6f92c9172feda06efa96eb49a354913c7a10b9852efb0de6e545658043d0d3568cb79a54fc1d324a14e8ed2c9c9e6e3b
29
30 diff --git a/net-misc/freerdp/files/2.0.0-rc4-bitmap-endian.patch b/net-misc/freerdp/files/2.0.0-rc4-bitmap-endian.patch
31 deleted file mode 100644
32 index cd78ba983b7..00000000000
33 --- a/net-misc/freerdp/files/2.0.0-rc4-bitmap-endian.patch
34 +++ /dev/null
35 @@ -1,30 +0,0 @@
36 -From 18b193a1cf083b92279c3952f4f907a07cd92834 Mon Sep 17 00:00:00 2001
37 -From: Armin Novak <armin.novak@××××××××.com>
38 -Date: Wed, 13 Feb 2019 09:30:34 +0100
39 -Subject: [PATCH] Fixed endianess issue with GETPIXEL16 and GETPIXEL32
40 -
41 ----
42 - libfreerdp/codec/bitmap.c | 6 ++++--
43 - 1 file changed, 4 insertions(+), 2 deletions(-)
44 -
45 -diff --git a/libfreerdp/codec/bitmap.c b/libfreerdp/codec/bitmap.c
46 -index 7524bb99ce..479c965e52 100644
47 ---- a/libfreerdp/codec/bitmap.c
48 -+++ b/libfreerdp/codec/bitmap.c
49 -@@ -26,12 +26,14 @@
50 -
51 - static INLINE UINT16 GETPIXEL16(const void* d, UINT32 x, UINT32 y, UINT32 w)
52 - {
53 -- return (*(((const unsigned short*)d) + ((y) * (w) + (x))));
54 -+ const BYTE* src = (const BYTE*)d + ((y * w + x) * sizeof(UINT16));
55 -+ return (UINT16)(((UINT16)src[1] << 8) | (UINT16)src[0]);
56 - }
57 -
58 - static INLINE UINT32 GETPIXEL32(const void* d, UINT32 x, UINT32 y, UINT32 w)
59 - {
60 -- return (*(((const unsigned int*)d) + ((y) * (w) + (x))));
61 -+ const BYTE* src = (const BYTE*)d + ((y * w + x) * sizeof(UINT32));
62 -+ return (((UINT32)src[3]) << 24) | (((UINT32)src[2]) << 16) | (((UINT32)src[1]) << 8) | (src[0] & 0xFF);
63 - }
64 -
65 - /*****************************************************************************/
66
67 diff --git a/net-misc/freerdp/files/2.0.0-rc4-libressl.patch b/net-misc/freerdp/files/2.0.0-rc4-libressl.patch
68 deleted file mode 100644
69 index fd6e6148607..00000000000
70 --- a/net-misc/freerdp/files/2.0.0-rc4-libressl.patch
71 +++ /dev/null
72 @@ -1,78 +0,0 @@
73 -From 649f49fa61ca98a05b26c3b2a26a1c30ca24ea26 Mon Sep 17 00:00:00 2001
74 -From: Armin Novak <armin.novak@××××××××.com>
75 -Date: Thu, 22 Nov 2018 09:23:46 +0100
76 -Subject: [PATCH] Fix #5049: LibreSSL does not have SSL_CTX_set_security_level
77 -
78 ----
79 - libfreerdp/crypto/tls.c | 2 +-
80 - 1 file changed, 1 insertion(+), 1 deletion(-)
81 -
82 -diff --git a/libfreerdp/crypto/tls.c b/libfreerdp/crypto/tls.c
83 -index 20fde415d8..76f51701fe 100644
84 ---- a/libfreerdp/crypto/tls.c
85 -+++ b/libfreerdp/crypto/tls.c
86 -@@ -656,7 +656,7 @@ static BOOL tls_prepare(rdpTls* tls, BIO* underlying, SSL_METHOD* method,
87 - #endif
88 -
89 -
90 --#if OPENSSL_VERSION_NUMBER >= 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
91 -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
92 - SSL_CTX_set_security_level(tls->ctx, settings->TlsSecLevel);
93 - #endif
94 -
95 -From effa8b8562d5e4b017570815c7e4d8faa0dd9a9e Mon Sep 17 00:00:00 2001
96 -From: akallabeth <akallabeth@××××××.net>
97 -Date: Thu, 22 Nov 2018 19:10:05 +0100
98 -Subject: [PATCH] Fix #5049: Libressl declares OPENSSL_VERSION_NUMBER too high
99 -
100 -Need to check specifically for LIBRESSL_VERSION_NUMBER as they
101 -set the version higher than OpenSSL 1.1 but without API support.
102 ----
103 - libfreerdp/crypto/tls.c | 3 +--
104 - 1 file changed, 1 insertion(+), 2 deletions(-)
105 -
106 -diff --git a/libfreerdp/crypto/tls.c b/libfreerdp/crypto/tls.c
107 -index 76f51701fe..ded41f127e 100644
108 ---- a/libfreerdp/crypto/tls.c
109 -+++ b/libfreerdp/crypto/tls.c
110 -@@ -655,8 +655,7 @@ static BOOL tls_prepare(rdpTls* tls, BIO* underlying, SSL_METHOD* method,
111 - SSL_CTX_set_max_proto_version(tls->ctx, 0); /* highest supported version by library */
112 - #endif
113 -
114 --
115 --#if OPENSSL_VERSION_NUMBER >= 0x10100000L
116 -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
117 - SSL_CTX_set_security_level(tls->ctx, settings->TlsSecLevel);
118 - #endif
119 -
120 -From 0c83efa753d0457eb319624f87b491badf75105f Mon Sep 17 00:00:00 2001
121 -From: Armin Novak <armin.novak@××××××××.com>
122 -Date: Mon, 7 Jan 2019 14:18:14 +0100
123 -Subject: [PATCH] Fix #5170: Disable custom TLS alert for libressl > 2.8.3
124 -
125 ----
126 - libfreerdp/crypto/tls.c | 4 ++--
127 - 1 file changed, 2 insertions(+), 2 deletions(-)
128 -
129 -diff --git a/libfreerdp/crypto/tls.c b/libfreerdp/crypto/tls.c
130 -index b2cf5416c8..56e16bacb4 100644
131 ---- a/libfreerdp/crypto/tls.c
132 -+++ b/libfreerdp/crypto/tls.c
133 -@@ -1030,7 +1030,8 @@ BOOL tls_send_alert(rdpTls* tls)
134 - * FIXME: The following code does not work on OpenSSL > 1.1.0 because the
135 - * SSL struct is opaqe now
136 - */
137 --#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
138 -+#if (!defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER < 0x10100000L)) || \
139 -+ (defined(LIBRESSL_VERSION_NUMBER) && (LIBRESSL_VERSION_NUMBER <= 0x2080300fL))
140 -
141 - if (tls->alertDescription != TLS_ALERT_DESCRIPTION_CLOSE_NOTIFY)
142 - {
143 -@@ -1057,7 +1058,6 @@ BOOL tls_send_alert(rdpTls* tls)
144 - if (tls->ssl->s3->wbuf.left == 0)
145 - tls->ssl->method->ssl_dispatch_alert(tls->ssl);
146 - }
147 --
148 - #endif
149 - return TRUE;
150 - }
151
152 diff --git a/net-misc/freerdp/freerdp-2.0.0_rc4.ebuild b/net-misc/freerdp/freerdp-2.0.0_rc4.ebuild
153 deleted file mode 100644
154 index 862fb22e38c..00000000000
155 --- a/net-misc/freerdp/freerdp-2.0.0_rc4.ebuild
156 +++ /dev/null
157 @@ -1,121 +0,0 @@
158 -# Copyright 2011-2020 Gentoo Authors
159 -# Distributed under the terms of the GNU General Public License v2
160 -
161 -EAPI="6"
162 -
163 -inherit cmake-utils
164 -
165 -if [[ ${PV} != 9999 ]]; then
166 - MY_P=${P/_/-}
167 - S="${WORKDIR}/${MY_P}"
168 - SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz
169 - https://github.com/FreeRDP/FreeRDP/commit/6931f54fad12eaf46a72c5c02ac05da817ab6b94.patch -> freerdp-2.0.0-rc4-fix-NTLM-AvPair-lists.patch"
170 - KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 x86"
171 -else
172 - inherit git-r3
173 - SRC_URI=""
174 - EGIT_REPO_URI="https://github.com/FreeRDP/FreeRDP.git"
175 -fi
176 -
177 -DESCRIPTION="Free implementation of the Remote Desktop Protocol"
178 -HOMEPAGE="http://www.freerdp.com/"
179 -
180 -LICENSE="Apache-2.0"
181 -SLOT="0/2"
182 -IUSE="alsa +client cpu_flags_arm_neon cups debug doc ffmpeg gstreamer jpeg libressl openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv"
183 -RESTRICT="!test? ( test )"
184 -
185 -RDEPEND="
186 - !libressl? ( dev-libs/openssl:0= )
187 - libressl? ( dev-libs/libressl:0= )
188 - sys-libs/zlib:0
189 - alsa? ( media-libs/alsa-lib )
190 - cups? ( net-print/cups )
191 - client? (
192 - usb? (
193 - virtual/libudev:0=
194 - sys-apps/util-linux:0=
195 - dev-libs/dbus-glib:0=
196 - virtual/libusb:1=
197 - )
198 - X? (
199 - x11-libs/libXcursor
200 - x11-libs/libXext
201 - x11-libs/libXi
202 - x11-libs/libXrender
203 - xinerama? ( x11-libs/libXinerama )
204 - xv? ( x11-libs/libXv )
205 - )
206 - )
207 - ffmpeg? ( media-video/ffmpeg:0= )
208 - gstreamer? (
209 - media-libs/gstreamer:1.0
210 - media-libs/gst-plugins-base:1.0
211 - x11-libs/libXrandr
212 - )
213 - jpeg? ( virtual/jpeg:0 )
214 - openh264? ( media-libs/openh264 )
215 - pulseaudio? ( media-sound/pulseaudio )
216 - server? (
217 - X? (
218 - x11-libs/libXcursor
219 - x11-libs/libXdamage
220 - x11-libs/libXext
221 - x11-libs/libXfixes
222 - x11-libs/libXrandr
223 - x11-libs/libXtst
224 - xinerama? ( x11-libs/libXinerama )
225 - )
226 - )
227 - smartcard? ( sys-apps/pcsc-lite )
228 - systemd? ( sys-apps/systemd:0= )
229 - wayland? (
230 - dev-libs/wayland
231 - x11-libs/libxkbcommon
232 - )
233 - X? (
234 - x11-libs/libX11
235 - x11-libs/libxkbfile
236 - )
237 -"
238 -DEPEND="${RDEPEND}
239 - virtual/pkgconfig
240 - client? ( X? ( doc? (
241 - app-text/docbook-xml-dtd:4.1.2
242 - app-text/xmlto
243 - ) ) )
244 -"
245 -
246 -PATCHES=(
247 - "${FILESDIR}"/2.0.0-rc4-libressl.patch
248 - "${FILESDIR}"/2.0.0-rc4-bitmap-endian.patch
249 - "${DISTDIR}"/freerdp-2.0.0-rc4-fix-NTLM-AvPair-lists.patch
250 -)
251 -
252 -src_configure() {
253 - local mycmakeargs=(
254 - -DBUILD_TESTING=$(usex test)
255 - -DCHANNEL_URBDRC=$(usex usb)
256 - -DWITH_ALSA=$(usex alsa)
257 - -DWITH_CCACHE=OFF
258 - -DWITH_CLIENT=$(usex client)
259 - -DWITH_CUPS=$(usex cups)
260 - -DWITH_DEBUG_ALL=$(usex debug)
261 - -DWITH_MANPAGES=$(usex doc)
262 - -DWITH_FFMPEG=$(usex ffmpeg)
263 - -DWITH_DSP_FFMPEG=$(usex ffmpeg)
264 - -DWITH_GSTREAMER_1_0=$(usex gstreamer)
265 - -DWITH_JPEG=$(usex jpeg)
266 - -DWITH_NEON=$(usex cpu_flags_arm_neon)
267 - -DWITH_OPENH264=$(usex openh264)
268 - -DWITH_PULSE=$(usex pulseaudio)
269 - -DWITH_SERVER=$(usex server)
270 - -DWITH_PCSC=$(usex smartcard)
271 - -DWITH_LIBSYSTEMD=$(usex systemd)
272 - -DWITH_X11=$(usex X)
273 - -DWITH_XINERAMA=$(usex xinerama)
274 - -DWITH_XV=$(usex xv)
275 - -DWITH_WAYLAND=$(usex wayland)
276 - )
277 - cmake-utils_src_configure
278 -}
279
280 diff --git a/net-misc/freerdp/freerdp-2.0.0_rc4_p1129.ebuild b/net-misc/freerdp/freerdp-2.0.0_rc4_p1129.ebuild
281 deleted file mode 100644
282 index 81fe15dcd97..00000000000
283 --- a/net-misc/freerdp/freerdp-2.0.0_rc4_p1129.ebuild
284 +++ /dev/null
285 @@ -1,119 +0,0 @@
286 -# Copyright 2011-2020 Gentoo Authors
287 -# Distributed under the terms of the GNU General Public License v2
288 -
289 -EAPI=7
290 -
291 -inherit cmake
292 -
293 -if [[ ${PV} != 9999 ]]; then
294 - COMMIT="483d09b760bea529972afad9b6f6c7a89dcffd40"
295 - SRC_URI="https://github.com/FreeRDP/FreeRDP/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
296 - S="${WORKDIR}/FreeRDP-${COMMIT}"
297 - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
298 -else
299 - inherit git-r3
300 - EGIT_REPO_URI="https://github.com/FreeRDP/FreeRDP.git"
301 -fi
302 -
303 -DESCRIPTION="Free implementation of the Remote Desktop Protocol"
304 -HOMEPAGE="http://www.freerdp.com/"
305 -
306 -LICENSE="Apache-2.0"
307 -SLOT="0/2"
308 -IUSE="alsa +client cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer jpeg libressl openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv"
309 -RESTRICT="!test? ( test )"
310 -
311 -RDEPEND="
312 - !libressl? ( dev-libs/openssl:0= )
313 - libressl? ( dev-libs/libressl:0= )
314 - sys-libs/zlib:0
315 - alsa? ( media-libs/alsa-lib )
316 - cups? ( net-print/cups )
317 - client? (
318 - usb? (
319 - virtual/libudev:0=
320 - sys-apps/util-linux:0=
321 - dev-libs/dbus-glib:0=
322 - virtual/libusb:1=
323 - )
324 - X? (
325 - x11-libs/libXcursor
326 - x11-libs/libXext
327 - x11-libs/libXi
328 - x11-libs/libXrender
329 - xinerama? ( x11-libs/libXinerama )
330 - xv? ( x11-libs/libXv )
331 - )
332 - )
333 - ffmpeg? ( media-video/ffmpeg:0= )
334 - !ffmpeg? (
335 - x11-libs/cairo:0=
336 - )
337 - gstreamer? (
338 - media-libs/gstreamer:1.0
339 - media-libs/gst-plugins-base:1.0
340 - x11-libs/libXrandr
341 - )
342 - jpeg? ( virtual/jpeg:0 )
343 - openh264? ( media-libs/openh264 )
344 - pulseaudio? ( media-sound/pulseaudio )
345 - server? (
346 - X? (
347 - x11-libs/libXcursor
348 - x11-libs/libXdamage
349 - x11-libs/libXext
350 - x11-libs/libXfixes
351 - x11-libs/libXrandr
352 - x11-libs/libXtst
353 - xinerama? ( x11-libs/libXinerama )
354 - )
355 - )
356 - smartcard? ( sys-apps/pcsc-lite )
357 - systemd? ( sys-apps/systemd:0= )
358 - wayland? (
359 - dev-libs/wayland
360 - x11-libs/libxkbcommon
361 - )
362 - X? (
363 - x11-libs/libX11
364 - x11-libs/libxkbfile
365 - )
366 -"
367 -DEPEND="${RDEPEND}"
368 -BDEPEND="
369 - virtual/pkgconfig
370 - client? ( X? ( doc? (
371 - app-text/docbook-xml-dtd:4.1.2
372 - app-text/xmlto
373 - ) ) )
374 -"
375 -
376 -src_configure() {
377 - local mycmakeargs=(
378 - -DBUILD_TESTING=$(usex test ON OFF)
379 - -DCHANNEL_URBDRC=$(usex usb ON OFF)
380 - -DWITH_ALSA=$(usex alsa ON OFF)
381 - -DWITH_CCACHE=OFF
382 - -DWITH_CLIENT=$(usex client ON OFF)
383 - -DWITH_CUPS=$(usex cups ON OFF)
384 - -DWITH_DEBUG_ALL=$(usex debug ON OFF)
385 - -DWITH_MANPAGES=$(usex doc ON OFF)
386 - -DWITH_FFMPEG=$(usex ffmpeg ON OFF)
387 - -DWITH_SWSCALE=$(usex ffmpeg ON OFF)
388 - -DWITH_CAIRO=$(usex ffmpeg OFF ON)
389 - -DWITH_DSP_FFMPEG=$(usex ffmpeg ON OFF)
390 - -DWITH_GSTREAMER_1_0=$(usex gstreamer ON OFF)
391 - -DWITH_JPEG=$(usex jpeg ON OFF)
392 - -DWITH_NEON=$(usex cpu_flags_arm_neon ON OFF)
393 - -DWITH_OPENH264=$(usex openh264 ON OFF)
394 - -DWITH_PULSE=$(usex pulseaudio ON OFF)
395 - -DWITH_SERVER=$(usex server ON OFF)
396 - -DWITH_PCSC=$(usex smartcard ON OFF)
397 - -DWITH_LIBSYSTEMD=$(usex systemd ON OFF)
398 - -DWITH_X11=$(usex X ON OFF)
399 - -DWITH_XINERAMA=$(usex xinerama ON OFF)
400 - -DWITH_XV=$(usex xv ON OFF)
401 - -DWITH_WAYLAND=$(usex wayland ON OFF)
402 - )
403 - cmake_src_configure
404 -}
Report Message
Find on MARC Find on Google Groups