Gentoo Archives: gentoo-commits

From: Quentin Retornaz <gentoo@××××××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/libressl:master commit in: net-misc/rdesktop/files/, net-misc/rdesktop/
Date: Sun, 03 Jul 2022 17:47:39
Message-Id: 1656870421.42db53d87cf3438054027caca35500487a0d59f5.quentin@gentoo
1 commit: 42db53d87cf3438054027caca35500487a0d59f5
2 Author: orbea <orbea <AT> riseup <DOT> net>
3 AuthorDate: Sun Jul 3 02:52:07 2022 +0000
4 Commit: Quentin Retornaz <gentoo <AT> retornaz <DOT> com>
5 CommitDate: Sun Jul 3 17:47:01 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=42db53d8
7
8 net-misc/rdesktop: Remove package
9
10 Works with libressl-3.5.x and rdesktop-1.9.0::gentoo.
11
12 Signed-off-by: orbea <orbea <AT> riseup.net>
13 Signed-off-by: Quentin Retornaz <gentoo <AT> retornaz.com>
14
15 net-misc/rdesktop/Manifest | 1 -
16 .../files/rdesktop-1.6.0-sound_configure.patch | 15 -----
17 .../rdesktop/files/rdesktop-1.8.3-no_strip.patch | 12 ----
18 .../files/rdesktop-1.8.3-xrandr_configure.patch | 17 ------
19 .../rdesktop/files/rdesktop-1.8.4-libressl.patch | 16 -----
20 .../files/rdesktop-1.8.5-use_standard_gssapi.patch | 56 -----------------
21 .../files/rdesktop-1.8.6-sec_decrypt.patch | 59 ------------------
22 net-misc/rdesktop/metadata.xml | 19 ------
23 net-misc/rdesktop/rdesktop-1.8.6-r1.ebuild | 71 ----------------------
24 net-misc/rdesktop/rdesktop-1.8.6.ebuild | 70 ---------------------
25 10 files changed, 336 deletions(-)
26
27 diff --git a/net-misc/rdesktop/Manifest b/net-misc/rdesktop/Manifest
28 deleted file mode 100644
29 index e521b8c..0000000
30 --- a/net-misc/rdesktop/Manifest
31 +++ /dev/null
32 @@ -1 +0,0 @@
33 -DIST rdesktop-1.8.6.tar.gz 321061 BLAKE2B bd61ecfbdca3f05b2a8d7f84c10296af3845870f5bd2522ecd768ce27cdbf790787ba9af2f53c85bcd674926488b77a610e48cafbb891fced9a458f86a2ee9e1 SHA512 a7d624dad27e531cf38d73bd879e66aaf72e527d082a4adb59e259e4e5b9a779ee6938db74601fbb2be7e7b015c806109fe8dfc99d78cbd06f0ba4d8f89b28ee
34
35 diff --git a/net-misc/rdesktop/files/rdesktop-1.6.0-sound_configure.patch b/net-misc/rdesktop/files/rdesktop-1.6.0-sound_configure.patch
36 deleted file mode 100644
37 index b2f492b..0000000
38 --- a/net-misc/rdesktop/files/rdesktop-1.6.0-sound_configure.patch
39 +++ /dev/null
40 @@ -1,15 +0,0 @@
41 ---- rdesktop.orig/configure.ac 2009-06-30 10:35:14.000000000 +0200
42 -+++ rdesktop/configure.ac 2009-06-30 11:35:10.000000000 +0200
43 -@@ -228,7 +228,11 @@
44 - if test -n "$PKG_CONFIG"; then
45 - PKG_CHECK_MODULES(LIBAO, ao, [HAVE_LIBAO=1], [HAVE_LIBAO=0])
46 - PKG_CHECK_MODULES(ALSA, alsa, [HAVE_ALSA=1], [HAVE_ALSA=0])
47 -- PKG_CHECK_MODULES(LIBSAMPLERATE, samplerate, [HAVE_LIBSAMPLERATE=1], [HAVE_LIBSAMPLERATE=0])
48 -+ AC_ARG_WITH(libsamplerate,
49 -+ [ --without-libsamplerate disable libsamplerate support])
50 -+ if test "x$with_libsamplerate" != "xno"; then
51 -+ PKG_CHECK_MODULES(LIBSAMPLERATE, samplerate, [HAVE_LIBSAMPLERATE=1], [HAVE_LIBSAMPLERATE=0])
52 -+ fi
53 - if test x"$HAVE_LIBSAMPLERATE" = "x1"; then
54 - AC_DEFINE(HAVE_LIBSAMPLERATE)
55 - if test x"$static_libsamplerate" = "xyes"; then
56
57 diff --git a/net-misc/rdesktop/files/rdesktop-1.8.3-no_strip.patch b/net-misc/rdesktop/files/rdesktop-1.8.3-no_strip.patch
58 deleted file mode 100644
59 index 018ceee..0000000
60 --- a/net-misc/rdesktop/files/rdesktop-1.8.3-no_strip.patch
61 +++ /dev/null
62 @@ -1,12 +0,0 @@
63 -diff -Naur rdesktop-1.8.3.orig/Makefile.in rdesktop-1.8.3/Makefile.in
64 ---- rdesktop-1.8.3.orig/Makefile.in 2013-01-21 13:28:14.000000000 +0100
65 -+++ rdesktop-1.8.3/Makefile.in 2018-08-20 18:05:38.401218002 +0200
66 -@@ -60,7 +60,7 @@
67 - installbin: rdesktop
68 - mkdir -p $(DESTDIR)$(bindir)
69 - $(INSTALL) rdesktop $(DESTDIR)$(bindir)
70 -- $(STRIP) $(DESTDIR)$(bindir)/rdesktop
71 -+
72 - chmod 755 $(DESTDIR)$(bindir)/rdesktop
73 -
74 - .PHONY: installman
75
76 diff --git a/net-misc/rdesktop/files/rdesktop-1.8.3-xrandr_configure.patch b/net-misc/rdesktop/files/rdesktop-1.8.3-xrandr_configure.patch
77 deleted file mode 100644
78 index fea0b97..0000000
79 --- a/net-misc/rdesktop/files/rdesktop-1.8.3-xrandr_configure.patch
80 +++ /dev/null
81 @@ -1,17 +0,0 @@
82 ---- rdesktop.orig/configure.ac 2015-09-14 11:27:54.974472081 +0200
83 -+++ rdesktop/configure.ac 2015-09-14 11:34:37.729155044 +0200
84 -@@ -151,9 +151,12 @@
85 - AC_SUBST(CREDSSPOBJ)
86 -
87 - # xrandr
88 --if test -n "$PKG_CONFIG"; then
89 -- PKG_CHECK_MODULES(XRANDR, xrandr, [HAVE_XRANDR=1], [HAVE_XRANDR=0])
90 -+AC_ARG_WITH([xrandr], AS_HELP_STRING([--without-xrandr], [Build without Xrandr library (default: true)]))
91 -+AS_IF([test "x$with_xrandr" != "xno"], [
92 -+ if test -n "$PKG_CONFIG"; then
93 -+ PKG_CHECK_MODULES(XRANDR, xrandr, [HAVE_XRANDR=1], [HAVE_XRANDR=0])
94 - fi
95 -+])
96 - if test x"$HAVE_XRANDR" = "x1"; then
97 - CFLAGS="$CFLAGS $XRANDR_CFLAGS"
98 - LIBS="$LIBS $XRANDR_LIBS"
99
100 diff --git a/net-misc/rdesktop/files/rdesktop-1.8.4-libressl.patch b/net-misc/rdesktop/files/rdesktop-1.8.4-libressl.patch
101 deleted file mode 100644
102 index b56cbfc..0000000
103 --- a/net-misc/rdesktop/files/rdesktop-1.8.4-libressl.patch
104 +++ /dev/null
105 @@ -1,16 +0,0 @@
106 -diff --git a/ssl.c b/ssl.c
107 -index 07d7aa5..45df34f 100644
108 ---- a/ssl.c
109 -+++ b/ssl.c
110 -@@ -225,7 +225,7 @@ rdssl_rkey_get_exp_mod(RDSSL_RKEY * rkey, uint8 * exponent, uint32 max_exp_len,
111 - BIGNUM *e = NULL;
112 - BIGNUM *n = NULL;
113 -
114 --#if OPENSSL_VERSION_NUMBER < 0x10100000L
115 -+#if (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER))
116 - e = rkey->e;
117 - n = rkey->n;
118 - #else
119 ---
120 -2.20.1
121 -
122
123 diff --git a/net-misc/rdesktop/files/rdesktop-1.8.5-use_standard_gssapi.patch b/net-misc/rdesktop/files/rdesktop-1.8.5-use_standard_gssapi.patch
124 deleted file mode 100644
125 index a5e14c3..0000000
126 --- a/net-misc/rdesktop/files/rdesktop-1.8.5-use_standard_gssapi.patch
127 +++ /dev/null
128 @@ -1,56 +0,0 @@
129 -diff -Naur rdesktop-1.8.5.orig/configure.ac rdesktop-1.8.5/configure.ac
130 ---- rdesktop-1.8.5.orig/configure.ac 2019-05-08 11:24:50.000000000 +0200
131 -+++ rdesktop-1.8.5/configure.ac 2019-05-14 18:33:49.479354354 +0200
132 -@@ -122,27 +122,20 @@
133 -
134 - dnl CredSSP feature
135 - AC_ARG_ENABLE([credssp], AS_HELP_STRING([--disable-credssp], [disable support for CredSSP]))
136 --AC_ARG_ENABLE([static-gssglue], AS_HELP_STRING([--enable-static-gssglue]),
137 -- [static_gssglue=yes], [static_gssglue=no])
138 - AS_IF([test "x$enable_credssp" != "xno"], [
139 - if test -n "$PKG_CONFIG"; then
140 -- PKG_CHECK_MODULES(GSSGLUE, libgssglue, [WITH_CREDSSP=1], [WITH_CREDSSP=0])
141 -+ PKG_CHECK_MODULES(GSSAPI, krb5-gssapi, [WITH_CREDSSP=1], [WITH_CREDSSP=0])
142 - fi
143 -
144 - if test x"$WITH_CREDSSP" = "x1"; then
145 - CREDSSPOBJ="cssp.o"
146 -- CFLAGS="$CFLAGS $GSSGLUE_CFLAGS"
147 --
148 -- AS_IF([test "x$static_gssglue" != "xno"], [
149 -- LIBS="$LIBS -Wl,-Bstatic -lgssglue -Wl,-Bdynamic"
150 -- ], [
151 -- LIBS="$LIBS -lgssglue"
152 -- ])
153 -+ CFLAGS="$CFLAGS $GSSAPI_CFLAGS"
154 -+ LIBS="$LIBS $GSSAPI_LIBS"
155 -
156 - AC_DEFINE(WITH_CREDSSP)
157 - else
158 - echo
159 -- echo "CredSSP support requires libgssglue, install the dependency"
160 -+ echo "CredSSP support requires GSSAPI, install the dependency"
161 - echo "or disable the feature using --disable-credssp."
162 - echo
163 - exit 1
164 -diff -Naur rdesktop-1.8.5.orig/cssp.c rdesktop-1.8.5/cssp.c
165 ---- rdesktop-1.8.5.orig/cssp.c 2019-05-08 11:22:39.000000000 +0200
166 -+++ rdesktop-1.8.5/cssp.c 2019-05-14 18:34:49.559368755 +0200
167 -@@ -140,7 +140,7 @@
168 - }
169 -
170 - static STREAM
171 --cssp_gss_wrap(gss_ctx_id_t * ctx, STREAM in)
172 -+cssp_gss_wrap(gss_ctx_id_t ctx, STREAM in)
173 - {
174 - int conf_state;
175 - OM_uint32 major_status;
176 -@@ -181,7 +181,7 @@
177 - }
178 -
179 - static STREAM
180 --cssp_gss_unwrap(gss_ctx_id_t * ctx, STREAM in)
181 -+cssp_gss_unwrap(gss_ctx_id_t ctx, STREAM in)
182 - {
183 - OM_uint32 major_status;
184 - OM_uint32 minor_status;
185
186 diff --git a/net-misc/rdesktop/files/rdesktop-1.8.6-sec_decrypt.patch b/net-misc/rdesktop/files/rdesktop-1.8.6-sec_decrypt.patch
187 deleted file mode 100644
188 index dbb0d0e..0000000
189 --- a/net-misc/rdesktop/files/rdesktop-1.8.6-sec_decrypt.patch
190 +++ /dev/null
191 @@ -1,59 +0,0 @@
192 -From 7841030279c5300d5073b2348b58f3f41e136f82 Mon Sep 17 00:00:00 2001
193 -From: Markus Beth <markus.beth@×××.de>
194 -Date: Tue, 11 Jun 2019 22:57:31 +0200
195 -Subject: [PATCH] sec_decrypt() the correct amount of data
196 -
197 -Save the correct amount of data to sec_decrypt() because after
198 -inout_uint8p() the macro s_remaining(s) will find nothing left.
199 ----
200 - secure.c | 16 ++++++++++------
201 - 1 file changed, 10 insertions(+), 6 deletions(-)
202 -
203 -diff --git a/secure.c b/secure.c
204 -index 8f65b3aa..9b301e1f 100644
205 ---- a/secure.c
206 -+++ b/secure.c
207 -@@ -813,6 +813,7 @@ sec_recv(uint8 * rdpver)
208 - STREAM s;
209 - struct stream packet;
210 - size_t data_offset;
211 -+ size_t remaining;
212 - unsigned char *data;
213 -
214 - while ((s = mcs_recv(&channel, rdpver)) != NULL)
215 -@@ -832,8 +833,9 @@ sec_recv(uint8 * rdpver)
216 -
217 - data_offset = s_tell(s);
218 -
219 -- inout_uint8p(s, data, s_remaining(s));
220 -- sec_decrypt(data, s_remaining(s));
221 -+ remaining = s_remaining(s);
222 -+ inout_uint8p(s, data, remaining);
223 -+ sec_decrypt(data, remaining);
224 -
225 - s_seek(s, data_offset);
226 - }
227 -@@ -860,8 +862,9 @@ sec_recv(uint8 * rdpver)
228 -
229 - data_offset = s_tell(s);
230 -
231 -- inout_uint8p(s, data, s_remaining(s));
232 -- sec_decrypt(data, s_remaining(s));
233 -+ remaining = s_remaining(s);
234 -+ inout_uint8p(s, data, remaining);
235 -+ sec_decrypt(data, remaining);
236 - }
237 -
238 - if (sec_flags & SEC_LICENCE_NEG)
239 -@@ -883,8 +886,9 @@ sec_recv(uint8 * rdpver)
240 -
241 - data_offset = s_tell(s);
242 -
243 -- inout_uint8p(s, data, s_remaining(s));
244 -- sec_decrypt(data, s_remaining(s));
245 -+ remaining = s_remaining(s);
246 -+ inout_uint8p(s, data, remaining);
247 -+ sec_decrypt(data, remaining);
248 -
249 - /* Check for a redirect packet, starts with 00 04 */
250 - if (data[0] == 0 && data[1] == 4)
251
252 diff --git a/net-misc/rdesktop/metadata.xml b/net-misc/rdesktop/metadata.xml
253 deleted file mode 100644
254 index 8e11088..0000000
255 --- a/net-misc/rdesktop/metadata.xml
256 +++ /dev/null
257 @@ -1,19 +0,0 @@
258 -<?xml version="1.0" encoding="UTF-8"?>
259 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
260 -<pkgmetadata>
261 - <maintainer type="person">
262 - <email>voyageur@g.o</email>
263 - <name>Bernard Cafarelli</name>
264 - </maintainer>
265 - <longdescription>
266 - An open source client for Windows NT Terminal Server and Windows 2000/2003 Terminal Services, capable of natively speaking Remote Desktop Protocol (RDP) in order to present the user's NT desktop. Unlike Citrix ICA, no server extensions are required.
267 - </longdescription>
268 - <use>
269 - <flag name="kerberos">Enable CredSPP support + Kerberos authentication</flag>
270 - <flag name="pcsc-lite">Enable smartcard support with <pkg>sys-apps/pcsc-lite</pkg> driver</flag>
271 - <flag name="xrandr">Enable XRandR window extension support</flag>
272 - </use>
273 - <upstream>
274 - <remote-id type="sourceforge">rdesktop</remote-id>
275 - </upstream>
276 -</pkgmetadata>
277
278 diff --git a/net-misc/rdesktop/rdesktop-1.8.6-r1.ebuild b/net-misc/rdesktop/rdesktop-1.8.6-r1.ebuild
279 deleted file mode 100644
280 index 1c72beb..0000000
281 --- a/net-misc/rdesktop/rdesktop-1.8.6-r1.ebuild
282 +++ /dev/null
283 @@ -1,71 +0,0 @@
284 -# Copyright 1999-2021 Gentoo Authors
285 -# Distributed under the terms of the GNU General Public License v2
286 -
287 -EAPI=7
288 -inherit autotools eutils
289 -
290 -MY_PV=${PV/_/-}
291 -
292 -DESCRIPTION="A Remote Desktop Protocol Client"
293 -HOMEPAGE="http://www.rdesktop.org/"
294 -SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
295 -
296 -LICENSE="GPL-3"
297 -SLOT="0"
298 -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
299 -IUSE="alsa ao debug ipv6 kerberos libsamplerate oss pcsc-lite xrandr"
300 -
301 -S=${WORKDIR}/${PN}-${MY_PV}
302 -
303 -RDEPEND="
304 - dev-libs/openssl:0=
305 - x11-libs/libX11
306 - x11-libs/libXext
307 - x11-libs/libXau
308 - x11-libs/libXdmcp
309 - alsa? ( media-libs/alsa-lib )
310 - ao? ( >=media-libs/libao-0.8.6 )
311 - kerberos? ( virtual/krb5 )
312 - libsamplerate? ( media-libs/libsamplerate )
313 - pcsc-lite? ( >=sys-apps/pcsc-lite-1.6.6 )
314 - xrandr? ( x11-libs/libXrandr )"
315 -DEPEND="${RDEPEND}
316 - x11-libs/libXt"
317 -BDEPEND=virtual/pkgconfig
318 -
319 -PATCHES=(
320 - "${FILESDIR}"/${PN}-1.6.0-sound_configure.patch
321 - "${FILESDIR}"/${PN}-1.8.3-no_strip.patch
322 - "${FILESDIR}"/${PN}-1.8.3-xrandr_configure.patch
323 - "${FILESDIR}"/${PN}-1.8.4-libressl.patch
324 - "${FILESDIR}"/${PN}-1.8.5-use_standard_gssapi.patch
325 - "${FILESDIR}"/${P}-sec_decrypt.patch
326 -)
327 -
328 -DOCS=( doc/HACKING doc/TODO doc/keymapping.txt )
329 -
330 -src_prepare() {
331 - default
332 - eautoreconf
333 -}
334 -
335 -src_configure() {
336 - if use ao; then
337 - sound_conf=$(use_with ao sound libao)
338 - else if use alsa; then
339 - sound_conf=$(use_with alsa sound alsa)
340 - else
341 - sound_conf=$(use_with oss sound oss)
342 - fi
343 - fi
344 -
345 - econf \
346 - --with-openssl="${EPREFIX}"/usr \
347 - $(use_with debug) \
348 - $(use_with ipv6) \
349 - $(use_with libsamplerate) \
350 - $(use_with xrandr) \
351 - $(use_enable kerberos credssp) \
352 - $(use_enable pcsc-lite smartcard) \
353 - ${sound_conf}
354 -}
355
356 diff --git a/net-misc/rdesktop/rdesktop-1.8.6.ebuild b/net-misc/rdesktop/rdesktop-1.8.6.ebuild
357 deleted file mode 100644
358 index 85eabb9..0000000
359 --- a/net-misc/rdesktop/rdesktop-1.8.6.ebuild
360 +++ /dev/null
361 @@ -1,70 +0,0 @@
362 -# Copyright 1999-2021 Gentoo Authors
363 -# Distributed under the terms of the GNU General Public License v2
364 -
365 -EAPI=7
366 -inherit autotools eutils
367 -
368 -MY_PV=${PV/_/-}
369 -
370 -DESCRIPTION="A Remote Desktop Protocol Client"
371 -HOMEPAGE="http://www.rdesktop.org/"
372 -SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
373 -
374 -LICENSE="GPL-3"
375 -SLOT="0"
376 -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
377 -IUSE="alsa ao debug ipv6 kerberos libsamplerate oss pcsc-lite xrandr"
378 -
379 -S=${WORKDIR}/${PN}-${MY_PV}
380 -
381 -RDEPEND="
382 - dev-libs/openssl:0=
383 - x11-libs/libX11
384 - x11-libs/libXext
385 - x11-libs/libXau
386 - x11-libs/libXdmcp
387 - alsa? ( media-libs/alsa-lib )
388 - ao? ( >=media-libs/libao-0.8.6 )
389 - kerberos? ( virtual/krb5 )
390 - libsamplerate? ( media-libs/libsamplerate )
391 - pcsc-lite? ( >=sys-apps/pcsc-lite-1.6.6 )
392 - xrandr? ( x11-libs/libXrandr )"
393 -DEPEND="${RDEPEND}
394 - x11-libs/libXt"
395 -BDEPEND=virtual/pkgconfig
396 -
397 -PATCHES=(
398 - "${FILESDIR}"/${PN}-1.6.0-sound_configure.patch
399 - "${FILESDIR}"/${PN}-1.8.3-no_strip.patch
400 - "${FILESDIR}"/${PN}-1.8.3-xrandr_configure.patch
401 - "${FILESDIR}"/${PN}-1.8.4-libressl.patch
402 - "${FILESDIR}"/${PN}-1.8.5-use_standard_gssapi.patch
403 -)
404 -
405 -DOCS=( doc/HACKING doc/TODO doc/keymapping.txt )
406 -
407 -src_prepare() {
408 - default
409 - eautoreconf
410 -}
411 -
412 -src_configure() {
413 - if use ao; then
414 - sound_conf=$(use_with ao sound libao)
415 - else if use alsa; then
416 - sound_conf=$(use_with alsa sound alsa)
417 - else
418 - sound_conf=$(use_with oss sound oss)
419 - fi
420 - fi
421 -
422 - econf \
423 - --with-openssl="${EPREFIX}"/usr \
424 - $(use_with debug) \
425 - $(use_with ipv6) \
426 - $(use_with libsamplerate) \
427 - $(use_with xrandr) \
428 - $(use_enable kerberos credssp) \
429 - $(use_enable pcsc-lite smartcard) \
430 - ${sound_conf}
431 -}