1 |
commit: 125e3a7b84901fd9a0005167103cecf60eac94fe |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Apr 20 07:51:35 2019 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Apr 20 07:51:35 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=125e3a7b |
7 |
|
8 |
net-misc/tn5250: Remove last-rited pkg |
9 |
|
10 |
Closes: https://bugs.gentoo.org/678684 |
11 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
12 |
|
13 |
net-misc/tn5250/Manifest | 1 - |
14 |
.../tn5250-0.17.4-disable-sslv2-and-sslv3.patch | 61 ----------- |
15 |
.../files/tn5250-0.17.4-duplicate-definition.patch | 115 --------------------- |
16 |
...5250-0.17.4-fix-Wformat-security-warnings.patch | 62 ----------- |
17 |
.../tn5250/files/tn5250-0.17.4-openssl11.patch | 49 --------- |
18 |
net-misc/tn5250/files/tn5250-0.17.4-tinfo.patch | 10 -- |
19 |
net-misc/tn5250/files/tn5250-0.17.4-whoami.patch | 13 --- |
20 |
net-misc/tn5250/metadata.xml | 7 -- |
21 |
net-misc/tn5250/tn5250-0.17.4-r1.ebuild | 58 ----------- |
22 |
net-misc/tn5250/tn5250-0.17.4-r2.ebuild | 56 ---------- |
23 |
net-misc/tn5250/tn5250-0.17.4-r3.ebuild | 58 ----------- |
24 |
profiles/package.mask | 2 - |
25 |
12 files changed, 492 deletions(-) |
26 |
|
27 |
diff --git a/net-misc/tn5250/Manifest b/net-misc/tn5250/Manifest |
28 |
deleted file mode 100644 |
29 |
index 0f173d6e431..00000000000 |
30 |
--- a/net-misc/tn5250/Manifest |
31 |
+++ /dev/null |
32 |
@@ -1 +0,0 @@ |
33 |
-DIST tn5250-0.17.4.tar.gz 648452 BLAKE2B 9e4d2d2b3148d063eecfc57f32daa1936d9f829a219952c9eb666e3f128c42f5ac611c4ccf12cdd533b3758459ce7f2f4e7c8fe74090042cb796067a7f6afe14 SHA512 7c41bc47658f792fe7c6c6186d93095ac2eca67868070d84502bcff7de0cbc97afea1bd9987d2dbc5a340a444fdf1fbff81c7b844f5c205ec603f24c5e6c0804 |
34 |
|
35 |
diff --git a/net-misc/tn5250/files/tn5250-0.17.4-disable-sslv2-and-sslv3.patch b/net-misc/tn5250/files/tn5250-0.17.4-disable-sslv2-and-sslv3.patch |
36 |
deleted file mode 100644 |
37 |
index 9c8d04f5585..00000000000 |
38 |
--- a/net-misc/tn5250/files/tn5250-0.17.4-disable-sslv2-and-sslv3.patch |
39 |
+++ /dev/null |
40 |
@@ -1,61 +0,0 @@ |
41 |
-From 1acfebd966e8804e6573cbe9287b8b6f028a646c Mon Sep 17 00:00:00 2001 |
42 |
-From: Michael Orlitzky <michael@××××××××.com> |
43 |
-Date: Tue, 23 Aug 2016 18:13:47 -0400 |
44 |
-Subject: [PATCH 1/1] sslstream.c: ignore the user's choice of ssl_method. |
45 |
- |
46 |
-The SSLv2 and SSLv3 protocols are insecure, and people have begun to |
47 |
-operate without them. LibreSSL, for example, does not have them |
48 |
-enabled, and it is possible to build OpenSSL in the same manner. |
49 |
- |
50 |
-If SSLv[23] are disabled, the user would not be able to choose "ssl2" |
51 |
-or "ssl3" as his "ssl_method", an option that was undocumented |
52 |
-anywhere. Therefore there is not much lost, and some security to gain, |
53 |
-by removing the option completely. This commit does that, and uses the |
54 |
-automatic protocol choice that is capable of negotiating TLSv1, |
55 |
-TLSv1.1 and TLSv1.2. |
56 |
- |
57 |
-Gentoo-Bug: 591940 |
58 |
---- |
59 |
- lib5250/sslstream.c | 26 ++++++++++---------------- |
60 |
- 1 file changed, 10 insertions(+), 16 deletions(-) |
61 |
- |
62 |
-diff --git a/lib5250/sslstream.c b/lib5250/sslstream.c |
63 |
-index 7181566..2f91d1a 100644 |
64 |
---- a/lib5250/sslstream.c |
65 |
-+++ b/lib5250/sslstream.c |
66 |
-@@ -362,22 +362,16 @@ int tn5250_ssl_stream_init (Tn5250Stream *This) |
67 |
- |
68 |
- /* which SSL method do we use? */ |
69 |
- |
70 |
-- strcpy(methstr,"auto"); |
71 |
-- if (This->config!=NULL && tn5250_config_get (This->config, "ssl_method")) { |
72 |
-- strncpy(methstr, tn5250_config_get (This->config, "ssl_method"), 4); |
73 |
-- methstr[4] = '\0'; |
74 |
-- } |
75 |
-- |
76 |
-- if (!strcmp(methstr, "ssl2")) { |
77 |
-- meth = SSLv2_client_method(); |
78 |
-- TN5250_LOG(("SSL Method = SSLv2_client_method()\n")); |
79 |
-- } else if (!strcmp(methstr, "ssl3")) { |
80 |
-- meth = SSLv3_client_method(); |
81 |
-- TN5250_LOG(("SSL Method = SSLv3_client_method()\n")); |
82 |
-- } else { |
83 |
-- meth = SSLv23_client_method(); |
84 |
-- TN5250_LOG(("SSL Method = SSLv23_client_method()\n")); |
85 |
-- } |
86 |
-+ /* Ignore the user's choice of ssl_method (which isn't documented |
87 |
-+ * anyway...) if it was either "ssl2" or "ssl3". Both are insecure, |
88 |
-+ * and this is only safe supported method left. |
89 |
-+ * |
90 |
-+ * This is a Gentoo-specific modification that lets us build |
91 |
-+ * against LibreSSL and newer OpenSSL with its insecure protocols |
92 |
-+ * disabled. |
93 |
-+ */ |
94 |
-+ meth = SSLv23_client_method(); |
95 |
-+ TN5250_LOG(("SSL Method = SSLv23_client_method()\n")); |
96 |
- |
97 |
- /* create a new SSL context */ |
98 |
- |
99 |
--- |
100 |
-2.7.3 |
101 |
- |
102 |
|
103 |
diff --git a/net-misc/tn5250/files/tn5250-0.17.4-duplicate-definition.patch b/net-misc/tn5250/files/tn5250-0.17.4-duplicate-definition.patch |
104 |
deleted file mode 100644 |
105 |
index 39b3ccb4555..00000000000 |
106 |
--- a/net-misc/tn5250/files/tn5250-0.17.4-duplicate-definition.patch |
107 |
+++ /dev/null |
108 |
@@ -1,115 +0,0 @@ |
109 |
-From 66e1a2f80091e9ee9b99156ae23e5faaf9f24fe0 Mon Sep 17 00:00:00 2001 |
110 |
-From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@×××××.cz> |
111 |
-Date: Mon, 20 Feb 2017 15:06:36 +0100 |
112 |
-Subject: [PATCH 3/4] remove duplicate definition for tn3270_ssl_stream_init() |
113 |
- |
114 |
---- |
115 |
- lib5250/sslstream.c | 93 ----------------------------------------------------- |
116 |
- 1 file changed, 93 deletions(-) |
117 |
- |
118 |
-diff --git a/lib5250/sslstream.c b/lib5250/sslstream.c |
119 |
-index f4353a9..86d38cf 100644 |
120 |
---- a/lib5250/sslstream.c |
121 |
-+++ b/lib5250/sslstream.c |
122 |
-@@ -477,99 +477,6 @@ int tn5250_ssl_stream_init (Tn5250Stream *This) |
123 |
- return 0; /* Ok */ |
124 |
- } |
125 |
- |
126 |
--/****f* lib5250/tn3270_ssl_stream_init |
127 |
-- * NAME |
128 |
-- * tn3270_ssl_stream_init |
129 |
-- * SYNOPSIS |
130 |
-- * ret = tn3270_ssl_stream_init (This); |
131 |
-- * INPUTS |
132 |
-- * Tn5250Stream * This - |
133 |
-- * DESCRIPTION |
134 |
-- * DOCUMENT ME!!! |
135 |
-- *****/ |
136 |
--int tn3270_ssl_stream_init (Tn5250Stream *This) |
137 |
--{ |
138 |
-- int len; |
139 |
-- |
140 |
--/* initialize SSL library */ |
141 |
-- |
142 |
-- SSL_load_error_strings(); |
143 |
-- SSL_library_init(); |
144 |
-- |
145 |
--/* create a new SSL context */ |
146 |
-- |
147 |
-- This->ssl_context = SSL_CTX_new(SSLv23_client_method()); |
148 |
-- if (This->ssl_context==NULL) { |
149 |
-- DUMP_ERR_STACK (); |
150 |
-- return -1; |
151 |
-- } |
152 |
-- |
153 |
--/* if a certificate authority file is defined, load it into this context */ |
154 |
-- |
155 |
-- if (This->config!=NULL && tn5250_config_get (This->config, "ssl_ca_file")) { |
156 |
-- if (SSL_CTX_load_verify_locations(This->ssl_context, |
157 |
-- tn5250_config_get (This->config, "ssl_ca_file"), NULL)<1) { |
158 |
-- DUMP_ERR_STACK (); |
159 |
-- return -1; |
160 |
-- } |
161 |
-- } |
162 |
-- |
163 |
--/* if a certificate authority file is defined, load it into this context */ |
164 |
-- |
165 |
-- if (This->config!=NULL && tn5250_config_get (This->config, "ssl_ca_file")) { |
166 |
-- if (SSL_CTX_load_verify_locations(This->ssl_context, |
167 |
-- tn5250_config_get (This->config, "ssl_ca_file"), NULL)<1) { |
168 |
-- DUMP_ERR_STACK (); |
169 |
-- return -1; |
170 |
-- } |
171 |
-- } |
172 |
-- |
173 |
-- This->userdata = NULL; |
174 |
-- |
175 |
--/* if a PEM passphrase is defined, set things up so that it can be used */ |
176 |
-- |
177 |
-- if (This->config!=NULL && tn5250_config_get (This->config,"ssl_pem_pass")){ |
178 |
-- TN5250_LOG(("SSL: Setting password callback\n")); |
179 |
-- len = strlen(tn5250_config_get (This->config, "ssl_pem_pass")); |
180 |
-- This->userdata = malloc(len+1); |
181 |
-- strncpy(This->userdata, |
182 |
-- tn5250_config_get (This->config, "ssl_pem_pass"), len); |
183 |
-- SSL_CTX_set_default_passwd_cb(This->ssl_context, |
184 |
-- (pem_password_cb *)ssl_stream_passwd_cb); |
185 |
-- SSL_CTX_set_default_passwd_cb_userdata(This->ssl_context, (void *)This); |
186 |
-- |
187 |
-- } |
188 |
-- |
189 |
--/* If a certificate file has been defined, load it into this context as well */ |
190 |
-- |
191 |
-- if (This->config!=NULL && tn5250_config_get (This->config, "ssl_cert_file")){ |
192 |
-- TN5250_LOG(("SSL: Loading certificates from certificate file\n")); |
193 |
-- if (SSL_CTX_use_certificate_file(This->ssl_context, |
194 |
-- tn5250_config_get (This->config, "ssl_cert_file"), |
195 |
-- SSL_FILETYPE_PEM) <= 0) { |
196 |
-- DUMP_ERR_STACK (); |
197 |
-- return -1; |
198 |
-- } |
199 |
-- TN5250_LOG(("SSL: Loading private keys from certificate file\n")); |
200 |
-- if (SSL_CTX_use_PrivateKey_file(This->ssl_context, |
201 |
-- tn5250_config_get (This->config, "ssl_cert_file"), |
202 |
-- SSL_FILETYPE_PEM) <= 0) { |
203 |
-- DUMP_ERR_STACK (); |
204 |
-- return -1; |
205 |
-- } |
206 |
-- } |
207 |
-- |
208 |
-- This->ssl_handle = NULL; |
209 |
-- This->connect = ssl_stream_connect; |
210 |
-- This->accept = ssl_stream_accept; |
211 |
-- This->disconnect = ssl_stream_disconnect; |
212 |
-- This->handle_receive = ssl_stream_handle_receive; |
213 |
-- This->send_packet = tn3270_ssl_stream_send_packet; |
214 |
-- This->destroy = ssl_stream_destroy; |
215 |
-- This->streamtype = TN3270E_STREAM; |
216 |
-- return 0; /* Ok */ |
217 |
--} |
218 |
-- |
219 |
- /****i* lib5250/ssl_stream_connect |
220 |
- * NAME |
221 |
- * ssl_stream_connect |
222 |
--- |
223 |
-2.7.4 |
224 |
|
225 |
diff --git a/net-misc/tn5250/files/tn5250-0.17.4-fix-Wformat-security-warnings.patch b/net-misc/tn5250/files/tn5250-0.17.4-fix-Wformat-security-warnings.patch |
226 |
deleted file mode 100644 |
227 |
index 4927bce546f..00000000000 |
228 |
--- a/net-misc/tn5250/files/tn5250-0.17.4-fix-Wformat-security-warnings.patch |
229 |
+++ /dev/null |
230 |
@@ -1,62 +0,0 @@ |
231 |
-From 1bc9cac45be4bac46f58e325779bdb8c7b7bf502 Mon Sep 17 00:00:00 2001 |
232 |
-From: Michael Orlitzky <michael@××××××××.com> |
233 |
-Date: Tue, 23 Aug 2016 20:20:15 -0400 |
234 |
-Subject: [PATCH 1/1] Fix format-security warnings. |
235 |
- |
236 |
-Newer versions of GCC have the ability to warn you (or throw errors) |
237 |
-about insecure format strings. Generally this is due to an omitted |
238 |
-format string in the printf family of functions, and a few of those |
239 |
-issues existed in the code base. They were all fixed by adding a |
240 |
-trivial "%s" format string. The project now builds with |
241 |
--Werror=format-security. |
242 |
---- |
243 |
- curses/cursesterm.c | 4 ++-- |
244 |
- lib5250/sslstream.c | 2 +- |
245 |
- lib5250/telnetstr.c | 2 +- |
246 |
- 3 files changed, 4 insertions(+), 4 deletions(-) |
247 |
- |
248 |
-diff --git a/curses/cursesterm.c b/curses/cursesterm.c |
249 |
-index bf20f05..3032966 100644 |
250 |
---- a/curses/cursesterm.c |
251 |
-+++ b/curses/cursesterm.c |
252 |
-@@ -640,9 +640,9 @@ static void curses_terminal_update(Tn5250Terminal * This, Tn5250Display *display |
253 |
- if(This->data->is_xterm) { |
254 |
- if (This->data->font_132!=NULL) { |
255 |
- if (tn5250_display_width (display)>100) |
256 |
-- printf(This->data->font_132); |
257 |
-+ printf("%s", This->data->font_132); |
258 |
- else |
259 |
-- printf(This->data->font_80); |
260 |
-+ printf("%s", This->data->font_80); |
261 |
- } |
262 |
- printf ("\x1b[8;%d;%dt", tn5250_display_height (display)+1, |
263 |
- tn5250_display_width (display)); |
264 |
-diff --git a/lib5250/sslstream.c b/lib5250/sslstream.c |
265 |
-index 2f91d1a..7f3009e 100644 |
266 |
---- a/lib5250/sslstream.c |
267 |
-+++ b/lib5250/sslstream.c |
268 |
-@@ -307,7 +307,7 @@ static void ssl_log_SB_buf(unsigned char *buf, int len) |
269 |
- |
270 |
- if (!tn5250_logfile) |
271 |
- return; |
272 |
-- fprintf(tn5250_logfile,ssl_getTelOpt(type=*buf++)); |
273 |
-+ fprintf(tn5250_logfile,"%s",ssl_getTelOpt(type=*buf++)); |
274 |
- switch (c=*buf++) { |
275 |
- case IS: |
276 |
- fputs("<IS>",tn5250_logfile); |
277 |
-diff --git a/lib5250/telnetstr.c b/lib5250/telnetstr.c |
278 |
-index 9ad2624..cf1576f 100644 |
279 |
---- a/lib5250/telnetstr.c |
280 |
-+++ b/lib5250/telnetstr.c |
281 |
-@@ -282,7 +282,7 @@ static void log_SB_buf(unsigned char *buf, int len) |
282 |
- |
283 |
- if (!tn5250_logfile) |
284 |
- return; |
285 |
-- fprintf(tn5250_logfile,getTelOpt(type=*buf++)); |
286 |
-+ fprintf(tn5250_logfile,"%s",getTelOpt(type=*buf++)); |
287 |
- switch (c=*buf++) { |
288 |
- case IS: |
289 |
- fputs("<IS>",tn5250_logfile); |
290 |
--- |
291 |
-2.7.3 |
292 |
- |
293 |
|
294 |
diff --git a/net-misc/tn5250/files/tn5250-0.17.4-openssl11.patch b/net-misc/tn5250/files/tn5250-0.17.4-openssl11.patch |
295 |
deleted file mode 100644 |
296 |
index 8c6d0fde1c7..00000000000 |
297 |
--- a/net-misc/tn5250/files/tn5250-0.17.4-openssl11.patch |
298 |
+++ /dev/null |
299 |
@@ -1,49 +0,0 @@ |
300 |
-From 5922e57bb5ea78ff35f82a60f1721d533cc0584a Mon Sep 17 00:00:00 2001 |
301 |
-From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@×××××.cz> |
302 |
-Date: Mon, 20 Feb 2017 15:37:51 +0100 |
303 |
-Subject: [PATCH 4/4] port to OpenSSL 1.1 |
304 |
- |
305 |
-- check for better functions in configure |
306 |
-- update SSL initialization call |
307 |
---- |
308 |
- configure.ac | 8 ++++---- |
309 |
- lib5250/sslstream.c | 2 +- |
310 |
- 2 files changed, 5 insertions(+), 5 deletions(-) |
311 |
- |
312 |
-diff --git a/configure.ac b/configure.ac |
313 |
-index 4ba0007..8a16cff 100644 |
314 |
---- a/configure.ac |
315 |
-+++ b/configure.ac |
316 |
-@@ -152,13 +152,13 @@ dnl ** happily, we don't have to hunt for them thanks to ldconfig! |
317 |
- dnl ** |
318 |
- if test -n $sslincludedir; then |
319 |
- CPPFLAGS="$CPPFLAGS $sslincludedir" |
320 |
-- AC_CHECK_LIB(crypto,CRYPTO_num_locks) |
321 |
-- if test "$ac_cv_lib_crypto_CRYPTO_num_locks" != "yes" |
322 |
-+ AC_CHECK_LIB(crypto,OPENSSL_init) |
323 |
-+ if test "$ac_cv_lib_crypto_OPENSSL_init" != "yes" |
324 |
- then |
325 |
- AC_MSG_ERROR([** Unable to find OpenSSL libraries!]) |
326 |
- fi |
327 |
-- AC_CHECK_LIB(ssl,SSL_library_init) |
328 |
-- if test "$ac_cv_lib_ssl_SSL_library_init" != "yes" |
329 |
-+ AC_CHECK_LIB(ssl,OPENSSL_init_ssl) |
330 |
-+ if test "$ac_cv_lib_ssl_OPENSSL_init_ssl" != "yes" |
331 |
- then |
332 |
- AC_MSG_ERROR([** Unable to find OpenSSL libraries!]) |
333 |
- fi |
334 |
-diff --git a/lib5250/sslstream.c b/lib5250/sslstream.c |
335 |
-index 86d38cf..3c0f390 100644 |
336 |
---- a/lib5250/sslstream.c |
337 |
-+++ b/lib5250/sslstream.c |
338 |
-@@ -368,7 +368,7 @@ int tn5250_ssl_stream_init (Tn5250Stream *This) |
339 |
- /* initialize SSL library */ |
340 |
- |
341 |
- SSL_load_error_strings(); |
342 |
-- SSL_library_init(); |
343 |
-+ OPENSSL_init_ssl(0, NULL); |
344 |
- |
345 |
- /* which SSL method do we use? */ |
346 |
- |
347 |
--- |
348 |
-2.7.4 |
349 |
|
350 |
diff --git a/net-misc/tn5250/files/tn5250-0.17.4-tinfo.patch b/net-misc/tn5250/files/tn5250-0.17.4-tinfo.patch |
351 |
deleted file mode 100644 |
352 |
index 46469c4def8..00000000000 |
353 |
--- a/net-misc/tn5250/files/tn5250-0.17.4-tinfo.patch |
354 |
+++ /dev/null |
355 |
@@ -1,10 +0,0 @@ |
356 |
---- a/configure.ac |
357 |
-+++ b/configure.ac |
358 |
-@@ -64,6 +64,7 @@ |
359 |
- AC_MSG_ERROR([** You need a curses-compatible library installed.]) |
360 |
- fi |
361 |
- fi |
362 |
-+ AC_SEARCH_LIBS(stdscr, tinfo, [CURSES_LIB="$CURSES_LIB -ltinfo"]) |
363 |
- AC_SUBST([CURSES_LIB]) |
364 |
- if test "$ac_cv_use_old_keys" != "yes"; |
365 |
- then |
366 |
|
367 |
diff --git a/net-misc/tn5250/files/tn5250-0.17.4-whoami.patch b/net-misc/tn5250/files/tn5250-0.17.4-whoami.patch |
368 |
deleted file mode 100644 |
369 |
index fbcece25af2..00000000000 |
370 |
--- a/net-misc/tn5250/files/tn5250-0.17.4-whoami.patch |
371 |
+++ /dev/null |
372 |
@@ -1,13 +0,0 @@ |
373 |
---- a/linux/Makefile.am |
374 |
-+++ b/linux/Makefile.am |
375 |
-@@ -18,10 +18,6 @@ |
376 |
- if [ "$$(uname -s)" = "Linux" ]; then \ |
377 |
- if which tic >/dev/null 2>&1 ; then \ |
378 |
- if [ "`whoami`" = "root" ]; then \ |
379 |
-- rm -f /usr/share/terminfo/x/xterm-5250 ; \ |
380 |
-- rm -f /usr/share/terminfo/5/5250 ; \ |
381 |
-- rm -f /usr/lib/terminfo/x/xterm-5250 ; \ |
382 |
-- rm -f /usr/lib/terminfo/5/5250 ; \ |
383 |
- good=yes ; \ |
384 |
- tic $(srcdir)/5250.terminfo || good=no ; \ |
385 |
- else \ |
386 |
|
387 |
diff --git a/net-misc/tn5250/metadata.xml b/net-misc/tn5250/metadata.xml |
388 |
deleted file mode 100644 |
389 |
index 46bc7afa2da..00000000000 |
390 |
--- a/net-misc/tn5250/metadata.xml |
391 |
+++ /dev/null |
392 |
@@ -1,7 +0,0 @@ |
393 |
-<?xml version="1.0" encoding="UTF-8"?> |
394 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
395 |
-<pkgmetadata> |
396 |
- <upstream> |
397 |
- <remote-id type="sourceforge">tn5250</remote-id> |
398 |
- </upstream> |
399 |
-</pkgmetadata> |
400 |
|
401 |
diff --git a/net-misc/tn5250/tn5250-0.17.4-r1.ebuild b/net-misc/tn5250/tn5250-0.17.4-r1.ebuild |
402 |
deleted file mode 100644 |
403 |
index 5ae73def9bf..00000000000 |
404 |
--- a/net-misc/tn5250/tn5250-0.17.4-r1.ebuild |
405 |
+++ /dev/null |
406 |
@@ -1,58 +0,0 @@ |
407 |
-# Copyright 1999-2017 Gentoo Foundation |
408 |
-# Distributed under the terms of the GNU General Public License v2 |
409 |
- |
410 |
-EAPI=6 |
411 |
-inherit eutils |
412 |
- |
413 |
-DESCRIPTION="Telnet client for the IBM AS/400 that emulates 5250 terminals and printers" |
414 |
-HOMEPAGE="http://tn5250.sourceforge.net/" |
415 |
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" |
416 |
- |
417 |
-LICENSE="LGPL-2.1" |
418 |
-SLOT="0" |
419 |
-KEYWORDS="amd64 ppc ~sparc x86" |
420 |
-IUSE="X libressl ssl" |
421 |
- |
422 |
-RDEPEND=" |
423 |
- sys-libs/ncurses:= |
424 |
- ssl? ( |
425 |
- !libressl? ( dev-libs/openssl:0= ) |
426 |
- libressl? ( dev-libs/libressl:0= ) |
427 |
- ) |
428 |
-" |
429 |
- |
430 |
-DEPEND="${RDEPEND} |
431 |
- X? ( x11-libs/libXt ) |
432 |
-" |
433 |
- |
434 |
-src_prepare() { |
435 |
- default |
436 |
- # Next, the Makefile for the terminfo settings tries to remove |
437 |
- # some files it doesn't have access to. We can just remove those |
438 |
- # lines. |
439 |
- cd "${S}/linux" |
440 |
- sed -i \ |
441 |
- -e "/rm -f \/usr\/.*\/terminfo.*5250/d" Makefile.in \ |
442 |
- || die "sed Makefile.in failed" |
443 |
- cd "${S}" |
444 |
-} |
445 |
- |
446 |
-src_configure() { |
447 |
- econf \ |
448 |
- --disable-static \ |
449 |
- --without-python \ |
450 |
- $(use_with X x) \ |
451 |
- $(use_with ssl) |
452 |
-} |
453 |
- |
454 |
-src_install() { |
455 |
- # The TERMINFO variable needs to be defined for the install |
456 |
- # to work, because the install calls "tic." man tic for |
457 |
- # details. |
458 |
- dodir /usr/share/terminfo |
459 |
- emake DESTDIR="${D}" \ |
460 |
- TERMINFO="${D}/usr/share/terminfo" install |
461 |
- |
462 |
- einstalldocs |
463 |
- prune_libtool_files |
464 |
-} |
465 |
|
466 |
diff --git a/net-misc/tn5250/tn5250-0.17.4-r2.ebuild b/net-misc/tn5250/tn5250-0.17.4-r2.ebuild |
467 |
deleted file mode 100644 |
468 |
index f3cfbf0f617..00000000000 |
469 |
--- a/net-misc/tn5250/tn5250-0.17.4-r2.ebuild |
470 |
+++ /dev/null |
471 |
@@ -1,56 +0,0 @@ |
472 |
-# Copyright 1999-2018 Gentoo Foundation |
473 |
-# Distributed under the terms of the GNU General Public License v2 |
474 |
- |
475 |
-EAPI=6 |
476 |
-inherit autotools ltprune |
477 |
- |
478 |
-DESCRIPTION="IBM AS/400 telnet client which emulates 5250 terminals/printers" |
479 |
-HOMEPAGE="http://tn5250.sourceforge.net/" |
480 |
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" |
481 |
- |
482 |
-LICENSE="LGPL-2.1" |
483 |
-SLOT="0" |
484 |
-KEYWORDS="~amd64 ~ppc ~sparc ~x86" |
485 |
-IUSE="libressl ssl static-libs" |
486 |
- |
487 |
-RDEPEND=" |
488 |
- sys-libs/ncurses:= |
489 |
- ssl? ( |
490 |
- !libressl? ( dev-libs/openssl:0= ) |
491 |
- libressl? ( dev-libs/libressl:0= ) |
492 |
- ) |
493 |
-" |
494 |
- |
495 |
-DEPEND=" |
496 |
- ${RDEPEND} |
497 |
-" |
498 |
- |
499 |
-PATCHES=( |
500 |
- "${FILESDIR}"/${PN}-0.17.4-disable-sslv2-and-sslv3.patch |
501 |
- "${FILESDIR}"/${PN}-0.17.4-fix-Wformat-security-warnings.patch |
502 |
- "${FILESDIR}"/${PN}-0.17.4-tinfo.patch |
503 |
- "${FILESDIR}"/${PN}-0.17.4-whoami.patch |
504 |
-) |
505 |
- |
506 |
-src_prepare() { |
507 |
- default |
508 |
- eautoreconf |
509 |
-} |
510 |
- |
511 |
-src_configure() { |
512 |
- econf \ |
513 |
- $(use_enable static-libs static) \ |
514 |
- $(use_with ssl) \ |
515 |
- --without-python |
516 |
-} |
517 |
- |
518 |
-src_install() { |
519 |
- # The TERMINFO variable needs to be defined for the install |
520 |
- # to work, because the install calls "tic." man tic for |
521 |
- # details. |
522 |
- dodir /usr/share/terminfo |
523 |
- emake DESTDIR="${D}" TERMINFO="${D}/usr/share/terminfo" install |
524 |
- |
525 |
- einstalldocs |
526 |
- prune_libtool_files |
527 |
-} |
528 |
|
529 |
diff --git a/net-misc/tn5250/tn5250-0.17.4-r3.ebuild b/net-misc/tn5250/tn5250-0.17.4-r3.ebuild |
530 |
deleted file mode 100644 |
531 |
index b28b5cc3723..00000000000 |
532 |
--- a/net-misc/tn5250/tn5250-0.17.4-r3.ebuild |
533 |
+++ /dev/null |
534 |
@@ -1,58 +0,0 @@ |
535 |
-# Copyright 1999-2019 Gentoo Authors |
536 |
-# Distributed under the terms of the GNU General Public License v2 |
537 |
- |
538 |
-EAPI=7 |
539 |
-inherit autotools |
540 |
- |
541 |
-DESCRIPTION="IBM AS/400 telnet client which emulates 5250 terminals/printers" |
542 |
-HOMEPAGE="http://tn5250.sourceforge.net/" |
543 |
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" |
544 |
- |
545 |
-LICENSE="LGPL-2.1" |
546 |
-SLOT="0" |
547 |
-KEYWORDS="~amd64 ~ppc ~sparc ~x86" |
548 |
-IUSE="libressl ssl" |
549 |
- |
550 |
-RDEPEND=" |
551 |
- sys-libs/ncurses:0= |
552 |
- ssl? ( |
553 |
- !libressl? ( dev-libs/openssl:0= ) |
554 |
- libressl? ( dev-libs/libressl:0= ) |
555 |
- ) |
556 |
-" |
557 |
- |
558 |
-DEPEND="${RDEPEND}" |
559 |
- |
560 |
-PATCHES=( |
561 |
- "${FILESDIR}"/${PN}-0.17.4-disable-sslv2-and-sslv3.patch |
562 |
- "${FILESDIR}"/${PN}-0.17.4-fix-Wformat-security-warnings.patch |
563 |
- "${FILESDIR}"/${PN}-0.17.4-tinfo.patch |
564 |
- "${FILESDIR}"/${PN}-0.17.4-whoami.patch |
565 |
- "${FILESDIR}"/${PN}-0.17.4-duplicate-definition.patch |
566 |
-) |
567 |
- |
568 |
-src_prepare() { |
569 |
- default |
570 |
- if has_version ">=dev-libs/openssl-1.1.1"; then |
571 |
- eapply "${FILESDIR}"/${PN}-0.17.4-openssl11.patch |
572 |
- fi |
573 |
- eautoreconf |
574 |
-} |
575 |
- |
576 |
-src_configure() { |
577 |
- econf \ |
578 |
- $(use_with ssl) \ |
579 |
- --disable-static \ |
580 |
- --without-python |
581 |
-} |
582 |
- |
583 |
-src_install() { |
584 |
- # The TERMINFO variable needs to be defined for the install |
585 |
- # to work, because the install calls "tic." man tic for |
586 |
- # details. |
587 |
- dodir /usr/share/terminfo |
588 |
- emake DESTDIR="${D}" TERMINFO="${D}/usr/share/terminfo" install |
589 |
- |
590 |
- einstalldocs |
591 |
- find "${D}" -name '*.la' -delete || die |
592 |
-} |
593 |
|
594 |
diff --git a/profiles/package.mask b/profiles/package.mask |
595 |
index 244c74f9bc0..398ec66549d 100644 |
596 |
--- a/profiles/package.mask |
597 |
+++ b/profiles/package.mask |
598 |
@@ -628,7 +628,6 @@ x11-libs/hippo-canvas |
599 |
# net-mail/uw-mailutils: #674174, same as uw-imap |
600 |
# net-misc/sslwrap: #674524, last updated upstream in 2000 |
601 |
# net-misc/stone: #675612, needs new snapshot, current ver is from 2008 |
602 |
-# net-misc/tn5250: #678684, last commits in 2012 |
603 |
# |
604 |
# Removal in 30 days. |
605 |
app-crypt/keynote |
606 |
@@ -654,7 +653,6 @@ net-mail/uw-imap |
607 |
net-mail/uw-mailutils |
608 |
net-misc/sslwrap |
609 |
net-misc/stone |
610 |
-net-misc/tn5250 |
611 |
|
612 |
# Miroslav Šulc <fordfrog@g.o> (19 Mar 2019) |
613 |
# Depends on >=virtual/{jdk,jre}-11 which is masked |