1 |
commit: e745dcaa8b9020f635aee9d6aec03c8e46ddbd56 |
2 |
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Mar 11 07:48:18 2019 +0000 |
4 |
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Mar 11 07:49:29 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e745dcaa |
7 |
|
8 |
net-misc/rdesktop: drop vulnerable versions |
9 |
|
10 |
Bug: https://bugs.gentoo.org/674558 |
11 |
Package-Manager: Portage-2.3.62, Repoman-2.3.12 |
12 |
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org> |
13 |
|
14 |
net-misc/rdesktop/Manifest | 1 - |
15 |
.../files/rdesktop-1.7.0-libao_crash.patch | 18 --- |
16 |
.../files/rdesktop-1.8.3-openssl-1.1.patch | 125 --------------------- |
17 |
net-misc/rdesktop/rdesktop-1.8.3-r1.ebuild | 74 ------------ |
18 |
net-misc/rdesktop/rdesktop-1.8.3-r2.ebuild | 76 ------------- |
19 |
net-misc/rdesktop/rdesktop-1.8.3-r3.ebuild | 70 ------------ |
20 |
net-misc/rdesktop/rdesktop-1.8.3.ebuild | 74 ------------ |
21 |
net-misc/rdesktop/rdesktop-1.8.4.ebuild | 69 ------------ |
22 |
8 files changed, 507 deletions(-) |
23 |
|
24 |
diff --git a/net-misc/rdesktop/Manifest b/net-misc/rdesktop/Manifest |
25 |
index ba8eea641aa..4e04d770212 100644 |
26 |
--- a/net-misc/rdesktop/Manifest |
27 |
+++ b/net-misc/rdesktop/Manifest |
28 |
@@ -1,2 +1 @@ |
29 |
-DIST rdesktop-1.8.3.tar.gz 320212 BLAKE2B daca0b78a8fcd0461f1c3251135bd980aaafacf8e0cd51ab731b576adb23006ec9f51858586e7e3a1a7f192b7830308e585984b4a31fb013748f8c6b3a8c47bb SHA512 06b94ad3b09430b05e424ef31a3e6f2388190b4920e348603cb66a414244896e0dc8906b9f12920e9406cf153ffa7f6507b23bf6713c3a675c0540a8ef57902d |
30 |
DIST rdesktop-1.8.4.tar.gz 321448 BLAKE2B b4d5a91f77a63258d08823c860b2d7045b0ee7ad0feb144746c904146c410c6456391eb3f2b7b9a6a40c2fb34515bb7518888c2c9da8dfcaf17c5309ff21cad3 SHA512 9e4f6723eb0baab31ad11f1c5c29a4753c655386c2381d01646b7834c959ffc2ec1e0c2f3f73626255aa018889709758d97387c7563da98bb1b7f269610929ae |
31 |
|
32 |
diff --git a/net-misc/rdesktop/files/rdesktop-1.7.0-libao_crash.patch b/net-misc/rdesktop/files/rdesktop-1.7.0-libao_crash.patch |
33 |
deleted file mode 100644 |
34 |
index 3afb9b2b0f2..00000000000 |
35 |
--- a/net-misc/rdesktop/files/rdesktop-1.7.0-libao_crash.patch |
36 |
+++ /dev/null |
37 |
@@ -1,18 +0,0 @@ |
38 |
---- rdpsnd_libao.c.orig 2010-11-29 14:55:31.124907038 +0100 |
39 |
-+++ rdpsnd_libao.c 2010-11-29 14:55:51.708464083 +0100 |
40 |
-@@ -76,6 +76,7 @@ |
41 |
- format.channels = 2; |
42 |
- format.rate = 44100; |
43 |
- format.byte_format = AO_FMT_NATIVE; |
44 |
-+ format.matrix = NULL; |
45 |
- |
46 |
- |
47 |
- o_device = ao_open_live(default_driver, &format, NULL); |
48 |
-@@ -115,6 +116,7 @@ |
49 |
- format.channels = pwfx->nChannels; |
50 |
- format.rate = 44100; |
51 |
- format.byte_format = AO_FMT_NATIVE; |
52 |
-+ format.matrix = NULL; |
53 |
- |
54 |
- if (o_device != NULL) |
55 |
- ao_close(o_device); |
56 |
|
57 |
diff --git a/net-misc/rdesktop/files/rdesktop-1.8.3-openssl-1.1.patch b/net-misc/rdesktop/files/rdesktop-1.8.3-openssl-1.1.patch |
58 |
deleted file mode 100644 |
59 |
index c74bd48c5aa..00000000000 |
60 |
--- a/net-misc/rdesktop/files/rdesktop-1.8.3-openssl-1.1.patch |
61 |
+++ /dev/null |
62 |
@@ -1,125 +0,0 @@ |
63 |
-From bd6aa6acddf0ba640a49834807872f4cc0d0a773 Mon Sep 17 00:00:00 2001 |
64 |
-From: Jani Hakala <jjhakala@×××××.com> |
65 |
-Date: Thu, 16 Jun 2016 14:28:15 +0300 |
66 |
-Subject: [PATCH] Fix OpenSSL 1.1 compability issues |
67 |
- |
68 |
-Some data types have been made opaque in OpenSSL version 1.1 so |
69 |
-stack allocation and accessing struct fields directly does not work. |
70 |
---- |
71 |
- ssl.c | 65 ++++++++++++++++++++++++++++++++++++----------------------- |
72 |
- 1 file changed, 40 insertions(+), 25 deletions(-) |
73 |
- |
74 |
-diff --git a/ssl.c b/ssl.c |
75 |
-index 48751255..032e9b9e 100644 |
76 |
---- a/ssl.c |
77 |
-+++ b/ssl.c |
78 |
-@@ -88,7 +88,7 @@ rdssl_rsa_encrypt(uint8 * out, uint8 * in, int len, uint32 modulus_size, uint8 * |
79 |
- uint8 * exponent) |
80 |
- { |
81 |
- BN_CTX *ctx; |
82 |
-- BIGNUM mod, exp, x, y; |
83 |
-+ BIGNUM *mod, *exp, *x, *y; |
84 |
- uint8 inr[SEC_MAX_MODULUS_SIZE]; |
85 |
- int outlen; |
86 |
- |
87 |
-@@ -98,24 +98,24 @@ rdssl_rsa_encrypt(uint8 * out, uint8 * in, int len, uint32 modulus_size, uint8 * |
88 |
- reverse(inr, len); |
89 |
- |
90 |
- ctx = BN_CTX_new(); |
91 |
-- BN_init(&mod); |
92 |
-- BN_init(&exp); |
93 |
-- BN_init(&x); |
94 |
-- BN_init(&y); |
95 |
-- |
96 |
-- BN_bin2bn(modulus, modulus_size, &mod); |
97 |
-- BN_bin2bn(exponent, SEC_EXPONENT_SIZE, &exp); |
98 |
-- BN_bin2bn(inr, len, &x); |
99 |
-- BN_mod_exp(&y, &x, &exp, &mod, ctx); |
100 |
-- outlen = BN_bn2bin(&y, out); |
101 |
-+ mod = BN_new(); |
102 |
-+ exp = BN_new(); |
103 |
-+ x = BN_new(); |
104 |
-+ y = BN_new(); |
105 |
-+ |
106 |
-+ BN_bin2bn(modulus, modulus_size, mod); |
107 |
-+ BN_bin2bn(exponent, SEC_EXPONENT_SIZE, exp); |
108 |
-+ BN_bin2bn(inr, len, x); |
109 |
-+ BN_mod_exp(y, x, exp, mod, ctx); |
110 |
-+ outlen = BN_bn2bin(y, out); |
111 |
- reverse(out, outlen); |
112 |
- if (outlen < (int) modulus_size) |
113 |
- memset(out + outlen, 0, modulus_size - outlen); |
114 |
- |
115 |
-- BN_free(&y); |
116 |
-- BN_clear_free(&x); |
117 |
-- BN_free(&exp); |
118 |
-- BN_free(&mod); |
119 |
-+ BN_free(y); |
120 |
-+ BN_clear_free(x); |
121 |
-+ BN_free(exp); |
122 |
-+ BN_free(mod); |
123 |
- BN_CTX_free(ctx); |
124 |
- } |
125 |
- |
126 |
-@@ -146,12 +146,20 @@ rdssl_cert_to_rkey(RDSSL_CERT * cert, uint32 * key_len) |
127 |
- |
128 |
- Kudos to Richard Levitte for the following (. intiutive .) |
129 |
- lines of code that resets the OID and let's us extract the key. */ |
130 |
-- nid = OBJ_obj2nid(cert->cert_info->key->algor->algorithm); |
131 |
-+ |
132 |
-+ X509_PUBKEY *key = NULL; |
133 |
-+ X509_ALGOR *algor = NULL; |
134 |
-+ |
135 |
-+ key = X509_get_X509_PUBKEY(cert); |
136 |
-+ algor = X509_PUBKEY_get0_param(NULL, NULL, 0, &algor, key); |
137 |
-+ |
138 |
-+ nid = OBJ_obj2nid(algor->algorithm); |
139 |
-+ |
140 |
- if ((nid == NID_md5WithRSAEncryption) || (nid == NID_shaWithRSAEncryption)) |
141 |
- { |
142 |
- DEBUG_RDP5(("Re-setting algorithm type to RSA in server certificate\n")); |
143 |
-- ASN1_OBJECT_free(cert->cert_info->key->algor->algorithm); |
144 |
-- cert->cert_info->key->algor->algorithm = OBJ_nid2obj(NID_rsaEncryption); |
145 |
-+ X509_PUBKEY_set0_param(key, OBJ_nid2obj(NID_rsaEncryption), |
146 |
-+ 0, NULL, NULL, 0); |
147 |
- } |
148 |
- epk = X509_get_pubkey(cert); |
149 |
- if (NULL == epk) |
150 |
-@@ -201,14 +209,24 @@ rdssl_rkey_get_exp_mod(RDSSL_RKEY * rkey, uint8 * exponent, uint32 max_exp_len, |
151 |
- { |
152 |
- int len; |
153 |
- |
154 |
-- if ((BN_num_bytes(rkey->e) > (int) max_exp_len) || |
155 |
-- (BN_num_bytes(rkey->n) > (int) max_mod_len)) |
156 |
-+ BIGNUM *e = NULL; |
157 |
-+ BIGNUM *n = NULL; |
158 |
-+ |
159 |
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)) |
160 |
-+ e = rkey->e; |
161 |
-+ n = rkey->n; |
162 |
-+#else |
163 |
-+ RSA_get0_key(rkey, &e, &n, NULL); |
164 |
-+#endif |
165 |
-+ |
166 |
-+ if ((BN_num_bytes(e) > (int) max_exp_len) || |
167 |
-+ (BN_num_bytes(n) > (int) max_mod_len)) |
168 |
- { |
169 |
- return 1; |
170 |
- } |
171 |
-- len = BN_bn2bin(rkey->e, exponent); |
172 |
-+ len = BN_bn2bin(e, exponent); |
173 |
- reverse(exponent, len); |
174 |
-- len = BN_bn2bin(rkey->n, modulus); |
175 |
-+ len = BN_bn2bin(n, modulus); |
176 |
- reverse(modulus, len); |
177 |
- return 0; |
178 |
- } |
179 |
-@@ -229,8 +247,5 @@ void |
180 |
- rdssl_hmac_md5(const void *key, int key_len, const unsigned char *msg, int msg_len, |
181 |
- unsigned char *md) |
182 |
- { |
183 |
-- HMAC_CTX ctx; |
184 |
-- HMAC_CTX_init(&ctx); |
185 |
- HMAC(EVP_md5(), key, key_len, msg, msg_len, md, NULL); |
186 |
-- HMAC_CTX_cleanup(&ctx); |
187 |
- } |
188 |
|
189 |
diff --git a/net-misc/rdesktop/rdesktop-1.8.3-r1.ebuild b/net-misc/rdesktop/rdesktop-1.8.3-r1.ebuild |
190 |
deleted file mode 100644 |
191 |
index 57610b0cc2c..00000000000 |
192 |
--- a/net-misc/rdesktop/rdesktop-1.8.3-r1.ebuild |
193 |
+++ /dev/null |
194 |
@@ -1,74 +0,0 @@ |
195 |
-# Copyright 1999-2017 Gentoo Foundation |
196 |
-# Distributed under the terms of the GNU General Public License v2 |
197 |
- |
198 |
-EAPI=5 |
199 |
-inherit autotools eutils |
200 |
- |
201 |
-MY_PV=${PV/_/-} |
202 |
- |
203 |
-DESCRIPTION="A Remote Desktop Protocol Client" |
204 |
-HOMEPAGE="http://rdesktop.sourceforge.net/" |
205 |
-SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz" |
206 |
- |
207 |
-LICENSE="GPL-3" |
208 |
-SLOT="0" |
209 |
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" |
210 |
-IUSE="alsa ao debug ipv6 kerberos libsamplerate oss pcsc-lite xrandr" |
211 |
- |
212 |
-S=${WORKDIR}/${PN}-${MY_PV} |
213 |
- |
214 |
-RDEPEND=">=dev-libs/openssl-0.9.6b:= |
215 |
- x11-libs/libX11 |
216 |
- x11-libs/libXext |
217 |
- x11-libs/libXau |
218 |
- x11-libs/libXdmcp |
219 |
- alsa? ( media-libs/alsa-lib ) |
220 |
- ao? ( >=media-libs/libao-0.8.6 ) |
221 |
- kerberos? ( net-libs/libgssglue ) |
222 |
- libsamplerate? ( media-libs/libsamplerate ) |
223 |
- pcsc-lite? ( >=sys-apps/pcsc-lite-1.6.6 ) |
224 |
- xrandr? ( x11-libs/libXrandr )" |
225 |
-DEPEND="${RDEPEND} |
226 |
- virtual/pkgconfig |
227 |
- x11-libs/libXt" |
228 |
- |
229 |
-src_prepare() { |
230 |
- # Prevent automatic stripping |
231 |
- local strip="$(echo '$(STRIP) $(DESTDIR)$(bindir)/rdesktop')" |
232 |
- sed -i -e "s:${strip}::" Makefile.in \ |
233 |
- || die "sed failed in Makefile.in" |
234 |
- |
235 |
- # Automagic dependencies |
236 |
- epatch "${FILESDIR}"/${PN}-1.6.0-sound_configure.patch |
237 |
- epatch "${FILESDIR}"/${P}-xrandr_configure.patch |
238 |
- |
239 |
- epatch_user |
240 |
- |
241 |
- eautoreconf |
242 |
-} |
243 |
- |
244 |
-src_configure() { |
245 |
- if use ao; then |
246 |
- sound_conf=$(use_with ao sound libao) |
247 |
- else if use alsa; then |
248 |
- sound_conf=$(use_with alsa sound alsa) |
249 |
- else |
250 |
- sound_conf=$(use_with oss sound oss) |
251 |
- fi |
252 |
- fi |
253 |
- |
254 |
- econf \ |
255 |
- --with-openssl="${EPREFIX}"/usr \ |
256 |
- $(use_with debug) \ |
257 |
- $(use_with ipv6) \ |
258 |
- $(use_with libsamplerate) \ |
259 |
- $(use_with xrandr) \ |
260 |
- $(use_enable kerberos credssp) \ |
261 |
- $(use_enable pcsc-lite smartcard) \ |
262 |
- ${sound_conf} |
263 |
-} |
264 |
- |
265 |
-src_install() { |
266 |
- emake DESTDIR="${D}" install |
267 |
- dodoc doc/HACKING doc/TODO doc/keymapping.txt |
268 |
-} |
269 |
|
270 |
diff --git a/net-misc/rdesktop/rdesktop-1.8.3-r2.ebuild b/net-misc/rdesktop/rdesktop-1.8.3-r2.ebuild |
271 |
deleted file mode 100644 |
272 |
index 5598e930762..00000000000 |
273 |
--- a/net-misc/rdesktop/rdesktop-1.8.3-r2.ebuild |
274 |
+++ /dev/null |
275 |
@@ -1,76 +0,0 @@ |
276 |
-# Copyright 1999-2017 Gentoo Foundation |
277 |
-# Distributed under the terms of the GNU General Public License v2 |
278 |
- |
279 |
-EAPI=5 |
280 |
-inherit autotools eutils |
281 |
- |
282 |
-MY_PV=${PV/_/-} |
283 |
- |
284 |
-DESCRIPTION="A Remote Desktop Protocol Client" |
285 |
-HOMEPAGE="http://rdesktop.sourceforge.net/" |
286 |
-SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz" |
287 |
- |
288 |
-LICENSE="GPL-3" |
289 |
-SLOT="0" |
290 |
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" |
291 |
-IUSE="alsa ao debug ipv6 kerberos libressl libsamplerate oss pcsc-lite xrandr" |
292 |
- |
293 |
-S=${WORKDIR}/${PN}-${MY_PV} |
294 |
- |
295 |
-RDEPEND=" |
296 |
- !libressl? ( dev-libs/openssl:0= ) |
297 |
- libressl? ( dev-libs/libressl:= ) |
298 |
- x11-libs/libX11 |
299 |
- x11-libs/libXext |
300 |
- x11-libs/libXau |
301 |
- x11-libs/libXdmcp |
302 |
- alsa? ( media-libs/alsa-lib ) |
303 |
- ao? ( >=media-libs/libao-0.8.6 ) |
304 |
- kerberos? ( net-libs/libgssglue ) |
305 |
- libsamplerate? ( media-libs/libsamplerate ) |
306 |
- pcsc-lite? ( >=sys-apps/pcsc-lite-1.6.6 ) |
307 |
- xrandr? ( x11-libs/libXrandr )" |
308 |
-DEPEND="${RDEPEND} |
309 |
- virtual/pkgconfig |
310 |
- x11-libs/libXt" |
311 |
- |
312 |
-src_prepare() { |
313 |
- # Prevent automatic stripping |
314 |
- local strip="$(echo '$(STRIP) $(DESTDIR)$(bindir)/rdesktop')" |
315 |
- sed -i -e "s:${strip}::" Makefile.in \ |
316 |
- || die "sed failed in Makefile.in" |
317 |
- |
318 |
- # Automagic dependencies |
319 |
- epatch "${FILESDIR}"/${PN}-1.6.0-sound_configure.patch |
320 |
- epatch "${FILESDIR}"/${P}-xrandr_configure.patch |
321 |
- |
322 |
- epatch_user |
323 |
- |
324 |
- eautoreconf |
325 |
-} |
326 |
- |
327 |
-src_configure() { |
328 |
- if use ao; then |
329 |
- sound_conf=$(use_with ao sound libao) |
330 |
- else if use alsa; then |
331 |
- sound_conf=$(use_with alsa sound alsa) |
332 |
- else |
333 |
- sound_conf=$(use_with oss sound oss) |
334 |
- fi |
335 |
- fi |
336 |
- |
337 |
- econf \ |
338 |
- --with-openssl="${EPREFIX}"/usr \ |
339 |
- $(use_with debug) \ |
340 |
- $(use_with ipv6) \ |
341 |
- $(use_with libsamplerate) \ |
342 |
- $(use_with xrandr) \ |
343 |
- $(use_enable kerberos credssp) \ |
344 |
- $(use_enable pcsc-lite smartcard) \ |
345 |
- ${sound_conf} |
346 |
-} |
347 |
- |
348 |
-src_install() { |
349 |
- emake DESTDIR="${D}" install |
350 |
- dodoc doc/HACKING doc/TODO doc/keymapping.txt |
351 |
-} |
352 |
|
353 |
diff --git a/net-misc/rdesktop/rdesktop-1.8.3-r3.ebuild b/net-misc/rdesktop/rdesktop-1.8.3-r3.ebuild |
354 |
deleted file mode 100644 |
355 |
index 1d73ffcf64a..00000000000 |
356 |
--- a/net-misc/rdesktop/rdesktop-1.8.3-r3.ebuild |
357 |
+++ /dev/null |
358 |
@@ -1,70 +0,0 @@ |
359 |
-# Copyright 1999-2018 Gentoo Foundation |
360 |
-# Distributed under the terms of the GNU General Public License v2 |
361 |
- |
362 |
-EAPI=7 |
363 |
-inherit autotools eutils |
364 |
- |
365 |
-MY_PV=${PV/_/-} |
366 |
- |
367 |
-DESCRIPTION="A Remote Desktop Protocol Client" |
368 |
-HOMEPAGE="http://rdesktop.sourceforge.net/" |
369 |
-SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz" |
370 |
- |
371 |
-LICENSE="GPL-3" |
372 |
-SLOT="0" |
373 |
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" |
374 |
-IUSE="alsa ao debug ipv6 kerberos libressl libsamplerate oss pcsc-lite xrandr" |
375 |
- |
376 |
-S=${WORKDIR}/${PN}-${MY_PV} |
377 |
- |
378 |
-RDEPEND=" |
379 |
- !libressl? ( dev-libs/openssl:0= ) |
380 |
- libressl? ( dev-libs/libressl:= ) |
381 |
- x11-libs/libX11 |
382 |
- x11-libs/libXext |
383 |
- x11-libs/libXau |
384 |
- x11-libs/libXdmcp |
385 |
- alsa? ( media-libs/alsa-lib ) |
386 |
- ao? ( >=media-libs/libao-0.8.6 ) |
387 |
- kerberos? ( net-libs/libgssglue ) |
388 |
- libsamplerate? ( media-libs/libsamplerate ) |
389 |
- pcsc-lite? ( >=sys-apps/pcsc-lite-1.6.6 ) |
390 |
- xrandr? ( x11-libs/libXrandr )" |
391 |
-DEPEND="${RDEPEND} |
392 |
- x11-libs/libXt" |
393 |
-BDEPEND=virtual/pkgconfig |
394 |
- |
395 |
-PATCHES=( |
396 |
- "${FILESDIR}"/${PN}-1.6.0-sound_configure.patch |
397 |
- "${FILESDIR}"/${P}-no_strip.patch |
398 |
- "${FILESDIR}"/${P}-xrandr_configure.patch |
399 |
- "${FILESDIR}"/${P}-openssl-1.1.patch |
400 |
-) |
401 |
- |
402 |
-DOCS=( doc/HACKING doc/TODO doc/keymapping.txt ) |
403 |
- |
404 |
-src_prepare() { |
405 |
- default |
406 |
- eautoreconf |
407 |
-} |
408 |
- |
409 |
-src_configure() { |
410 |
- if use ao; then |
411 |
- sound_conf=$(use_with ao sound libao) |
412 |
- else if use alsa; then |
413 |
- sound_conf=$(use_with alsa sound alsa) |
414 |
- else |
415 |
- sound_conf=$(use_with oss sound oss) |
416 |
- fi |
417 |
- fi |
418 |
- |
419 |
- econf \ |
420 |
- --with-openssl="${EPREFIX}"/usr \ |
421 |
- $(use_with debug) \ |
422 |
- $(use_with ipv6) \ |
423 |
- $(use_with libsamplerate) \ |
424 |
- $(use_with xrandr) \ |
425 |
- $(use_enable kerberos credssp) \ |
426 |
- $(use_enable pcsc-lite smartcard) \ |
427 |
- ${sound_conf} |
428 |
-} |
429 |
|
430 |
diff --git a/net-misc/rdesktop/rdesktop-1.8.3.ebuild b/net-misc/rdesktop/rdesktop-1.8.3.ebuild |
431 |
deleted file mode 100644 |
432 |
index 1e898da2e7a..00000000000 |
433 |
--- a/net-misc/rdesktop/rdesktop-1.8.3.ebuild |
434 |
+++ /dev/null |
435 |
@@ -1,74 +0,0 @@ |
436 |
-# Copyright 1999-2017 Gentoo Foundation |
437 |
-# Distributed under the terms of the GNU General Public License v2 |
438 |
- |
439 |
-EAPI=5 |
440 |
- |
441 |
-inherit autotools eutils |
442 |
- |
443 |
-MY_PV=${PV/_/-} |
444 |
- |
445 |
-DESCRIPTION="A Remote Desktop Protocol Client" |
446 |
-HOMEPAGE="http://rdesktop.sourceforge.net/" |
447 |
-SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz" |
448 |
- |
449 |
-LICENSE="GPL-3" |
450 |
-SLOT="0" |
451 |
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" |
452 |
-IUSE="alsa ao debug ipv6 kerberos libsamplerate oss pcsc-lite" |
453 |
- |
454 |
-S=${WORKDIR}/${PN}-${MY_PV} |
455 |
- |
456 |
-RDEPEND=">=dev-libs/openssl-0.9.6b |
457 |
- x11-libs/libX11 |
458 |
- x11-libs/libXext |
459 |
- x11-libs/libXau |
460 |
- x11-libs/libXdmcp |
461 |
- alsa? ( media-libs/alsa-lib ) |
462 |
- ao? ( >=media-libs/libao-0.8.6 ) |
463 |
- kerberos? ( net-libs/libgssglue ) |
464 |
- libsamplerate? ( media-libs/libsamplerate ) |
465 |
- pcsc-lite? ( >=sys-apps/pcsc-lite-1.6.6 )" |
466 |
-DEPEND="${RDEPEND} |
467 |
- virtual/pkgconfig |
468 |
- x11-libs/libXt" |
469 |
- |
470 |
-src_prepare() { |
471 |
- # Prevent automatic stripping |
472 |
- local strip="$(echo '$(STRIP) $(DESTDIR)$(bindir)/rdesktop')" |
473 |
- sed -i -e "s:${strip}::" Makefile.in \ |
474 |
- || die "sed failed in Makefile.in" |
475 |
- |
476 |
- # Automagic dependency on libsamplerate |
477 |
- epatch "${FILESDIR}"/${PN}-1.6.0-sound_configure.patch |
478 |
- # bug #280923 |
479 |
- epatch "${FILESDIR}"/${PN}-1.7.0-libao_crash.patch |
480 |
- |
481 |
- epatch_user |
482 |
- |
483 |
- eautoreconf |
484 |
-} |
485 |
- |
486 |
-src_configure() { |
487 |
- if use ao; then |
488 |
- sound_conf=$(use_with ao sound libao) |
489 |
- else if use alsa; then |
490 |
- sound_conf=$(use_with alsa sound alsa) |
491 |
- else |
492 |
- sound_conf=$(use_with oss sound oss) |
493 |
- fi |
494 |
- fi |
495 |
- |
496 |
- econf \ |
497 |
- --with-openssl="${EPREFIX}"/usr \ |
498 |
- $(use_with debug) \ |
499 |
- $(use_with ipv6) \ |
500 |
- $(use_with libsamplerate) \ |
501 |
- $(use_enable kerberos credssp) \ |
502 |
- $(use_enable pcsc-lite smartcard) \ |
503 |
- ${sound_conf} |
504 |
-} |
505 |
- |
506 |
-src_install() { |
507 |
- emake DESTDIR="${D}" install |
508 |
- dodoc doc/HACKING doc/TODO doc/keymapping.txt |
509 |
-} |
510 |
|
511 |
diff --git a/net-misc/rdesktop/rdesktop-1.8.4.ebuild b/net-misc/rdesktop/rdesktop-1.8.4.ebuild |
512 |
deleted file mode 100644 |
513 |
index f5be6057df9..00000000000 |
514 |
--- a/net-misc/rdesktop/rdesktop-1.8.4.ebuild |
515 |
+++ /dev/null |
516 |
@@ -1,69 +0,0 @@ |
517 |
-# Copyright 1999-2019 Gentoo Authors |
518 |
-# Distributed under the terms of the GNU General Public License v2 |
519 |
- |
520 |
-EAPI=7 |
521 |
-inherit autotools eutils |
522 |
- |
523 |
-MY_PV=${PV/_/-} |
524 |
- |
525 |
-DESCRIPTION="A Remote Desktop Protocol Client" |
526 |
-HOMEPAGE="http://www.rdesktop.org/" |
527 |
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz" |
528 |
- |
529 |
-LICENSE="GPL-3" |
530 |
-SLOT="0" |
531 |
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" |
532 |
-IUSE="alsa ao debug ipv6 kerberos libressl libsamplerate oss pcsc-lite xrandr" |
533 |
- |
534 |
-S=${WORKDIR}/${PN}-${MY_PV} |
535 |
- |
536 |
-RDEPEND=" |
537 |
- !libressl? ( dev-libs/openssl:0= ) |
538 |
- libressl? ( dev-libs/libressl:= ) |
539 |
- x11-libs/libX11 |
540 |
- x11-libs/libXext |
541 |
- x11-libs/libXau |
542 |
- x11-libs/libXdmcp |
543 |
- alsa? ( media-libs/alsa-lib ) |
544 |
- ao? ( >=media-libs/libao-0.8.6 ) |
545 |
- kerberos? ( net-libs/libgssglue ) |
546 |
- libsamplerate? ( media-libs/libsamplerate ) |
547 |
- pcsc-lite? ( >=sys-apps/pcsc-lite-1.6.6 ) |
548 |
- xrandr? ( x11-libs/libXrandr )" |
549 |
-DEPEND="${RDEPEND} |
550 |
- x11-libs/libXt" |
551 |
-BDEPEND=virtual/pkgconfig |
552 |
- |
553 |
-PATCHES=( |
554 |
- "${FILESDIR}"/${PN}-1.6.0-sound_configure.patch |
555 |
- "${FILESDIR}"/${PN}-1.8.3-no_strip.patch |
556 |
- "${FILESDIR}"/${PN}-1.8.3-xrandr_configure.patch |
557 |
-) |
558 |
- |
559 |
-DOCS=( doc/HACKING doc/TODO doc/keymapping.txt ) |
560 |
- |
561 |
-src_prepare() { |
562 |
- default |
563 |
- eautoreconf |
564 |
-} |
565 |
- |
566 |
-src_configure() { |
567 |
- if use ao; then |
568 |
- sound_conf=$(use_with ao sound libao) |
569 |
- else if use alsa; then |
570 |
- sound_conf=$(use_with alsa sound alsa) |
571 |
- else |
572 |
- sound_conf=$(use_with oss sound oss) |
573 |
- fi |
574 |
- fi |
575 |
- |
576 |
- econf \ |
577 |
- --with-openssl="${EPREFIX}"/usr \ |
578 |
- $(use_with debug) \ |
579 |
- $(use_with ipv6) \ |
580 |
- $(use_with libsamplerate) \ |
581 |
- $(use_with xrandr) \ |
582 |
- $(use_enable kerberos credssp) \ |
583 |
- $(use_enable pcsc-lite smartcard) \ |
584 |
- ${sound_conf} |
585 |
-} |