gentoo resync : 03.03.2019

4 files changed, 225 insertions, 0 deletions

diff --git a/net-misc/tn5250/Manifest b/net-misc/tn5250/Manifest
index 209182614022..75653e3d2b66 100644
--- a/net-misc/tn5250/Manifest
+++ b/net-misc/tn5250/Manifest
@@ -1,8 +1,11 @@
 AUX tn5250-0.17.4-disable-sslv2-and-sslv3.patch 2333 BLAKE2B f0debeacfcfe2596b716733cd80195b402f9b1536b3bbc6be7d12b763a2724b84c7030e92d76cdeca2685fb1bfc1714ab8d545276d23460f6cff930db412e86d SHA512 938130a2211409ab179499f1b7b50f5517d609a0ad73051a6c1a89493b44cca28200723693698beb516733e3099976f5ec0335f290553e903604c5a1eee652bd
+AUX tn5250-0.17.4-duplicate-definition.patch 3848 BLAKE2B 22d22f71ac85429ac08b856710587c0c7a759e15ed09730c25de475c5be14b4cf49da2c5db3e420c34a7425900d226cfdb0e78eab22c57c8771f512680edadb9 SHA512 ed3976c07e207594e1f43f156e65f9a26bcf82c0ffd1f05174da9cdd7441ad2ffb6d6b34deb7a544350ddb50f29e42dafe00d0b05ebcefa8bdf5968d47425ec4
 AUX tn5250-0.17.4-fix-Wformat-security-warnings.patch 2283 BLAKE2B 59ffb231abf6ef7927d79e8be51133c6f1f31f63ec38514bbaeee2069c3d063dc7ef3642953b7777668c016bb30e06c590ed63bb618d7796c3475483d77708b1 SHA512 da9114d26e838e822d8c63faa68f8157e03404f86e03c38f9f557416199c5ae96a35f4dbf47717c2588a6f29549b69a84ec66f5b7de848803b90759cae1fda04
+AUX tn5250-0.17.4-openssl11.patch 1617 BLAKE2B 99c528fcc57b9356c9c58c9a161bf370a907207fdd1493f4b2a339cacc775769da8755dd6322847ed9441b62ddf3bcaa8a891c628e9de15c647bdb80bfebf2f6 SHA512 7b52a1787f19e743137409239e2d6fa03197d73513a355fcede9e079fff909fa2c3921351039bfed703be140377130e4b74784397134e4454faa140a721f9e2b
 AUX tn5250-0.17.4-tinfo.patch 294 BLAKE2B 6032318a041b7e495e709f44e6abeedaee17be5754f779d73b33cfd0bc9fd625c53687cc9e2e0f49dc8be48ea497f3d2f3d9cba0b48c59d3f84fd9a98bdeab50 SHA512 e348a54d74e79fd3b7d4a7ae8a8bbab9751f873317b82738c1b934c643a4fe28cefb38008d944af61fe64f0852a1bb5eeea7b6bb8143e51a3469bc20fb8e0b22
 AUX tn5250-0.17.4-whoami.patch 450 BLAKE2B 529c2822328ae5b7eb70e49e1459271d325f465c6ecc3c2f0621805e1f61892c58614cdcd84c522ffe7b78d05c554af9928ff181497fefc13fb82a62c916502b SHA512 404fd5913db7240f1db14ac2a45e2897866e50fc33d56e5eb22e810b238d47b5d6c3700dd73fe095c2f5714e5f8f745c7e0bf670450d6454d20f10fa2f8c69c2
 DIST tn5250-0.17.4.tar.gz 648452 BLAKE2B 9e4d2d2b3148d063eecfc57f32daa1936d9f829a219952c9eb666e3f128c42f5ac611c4ccf12cdd533b3758459ce7f2f4e7c8fe74090042cb796067a7f6afe14 SHA512 7c41bc47658f792fe7c6c6186d93095ac2eca67868070d84502bcff7de0cbc97afea1bd9987d2dbc5a340a444fdf1fbff81c7b844f5c205ec603f24c5e6c0804
 EBUILD tn5250-0.17.4-r1.ebuild 1247 BLAKE2B 6169023b231922ef82594a6359d2d3f824cec17d1def604fca3a1aa676f3b6939a89cf882fa2e21afab20c7a6e6f46d00df9953c6e342af9016974a3e50802dd SHA512 e57461bf744d4ffffad3c8046a9faf674d0cef81d6baf1ea88546d5155a1eef7668931955599ab64a4ff4566990591edb41aba55a45f5ccb54dccfac7319e722
 EBUILD tn5250-0.17.4-r2.ebuild 1190 BLAKE2B 12e610edc7efeb7e0ff561db603c1f9e3e14ee6b95336eb81046ecce1554b350015d7316054ff5b3f8b78fae206ba7f070e9ab05ca2f0ce1c6ff6ccb3b830b98 SHA512 95631351a044b1328ccfc1006d1a4f6941b698a84eb7800697ef52e0f30a978bfa0ebb22af5e7a376dbcb97b4dfa7f7b0701adb9d7ceb85e6d057e4e7d3974db
+EBUILD tn5250-0.17.4-r3.ebuild 1329 BLAKE2B 95b5939c5f8d6f999e30846096eec4d25258cb6f04af08d5ba559adb97b5ad5bfc081f513e86787e32ab40fb3cd8d28c0dad0e5284b08c9b971b9ed6efc2d397 SHA512 0f5f7b8c637ee195f39bedda7d193e6192a47ffaa93a419f928d3b797993244f328bfd06df302251f8fe58d6476cbf5b4ae8b34571a4a94110006cb238adda47
 MISC metadata.xml 215 BLAKE2B a53a3a3ece4a9e09b8df96f5f8a629b7119c0e95e3e428c185f25378748975728f080e999a5e434e6fb3a38bb6599562ffacb8197f0be3ece1bcc43ccc1954de SHA512 0e99f231bdcff1306e232af176e4ce38c754ea988c072324093f2ac5bca81432abeb12af3e5f1960d0047bcd6d8c558fc995d1e6670556e00e443ebb1b6fe09c
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
new file mode 100644
index 000000000000..39b3ccb45552
--- /dev/null
+++ b/net-misc/tn5250/files/tn5250-0.17.4-duplicate-definition.patch
@@ -0,0 +1,115 @@
+From 66e1a2f80091e9ee9b99156ae23e5faaf9f24fe0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
+Date: Mon, 20 Feb 2017 15:06:36 +0100
+Subject: [PATCH 3/4] remove duplicate definition for tn3270_ssl_stream_init()
+
+---
+ lib5250/sslstream.c | 93 -----------------------------------------------------
+ 1 file changed, 93 deletions(-)
+
+diff --git a/lib5250/sslstream.c b/lib5250/sslstream.c
+index f4353a9..86d38cf 100644
+--- a/lib5250/sslstream.c
++++ b/lib5250/sslstream.c
+@@ -477,99 +477,6 @@ int tn5250_ssl_stream_init (Tn5250Stream *This)
+    return 0; /* Ok */
+ }
+ 
+-/****f* lib5250/tn3270_ssl_stream_init
+- * NAME
+- *    tn3270_ssl_stream_init
+- * SYNOPSIS
+- *    ret = tn3270_ssl_stream_init (This);
+- * INPUTS
+- *    Tn5250Stream *       This       - 
+- * DESCRIPTION
+- *    DOCUMENT ME!!!
+- *****/
+-int tn3270_ssl_stream_init (Tn5250Stream *This)
+-{
+-   int len;
+-
+-/* initialize SSL library */
+-
+-   SSL_load_error_strings();
+-   SSL_library_init();
+-
+-/* create a new SSL context */
+-
+-   This->ssl_context = SSL_CTX_new(SSLv23_client_method());
+-   if (This->ssl_context==NULL) {
+-        DUMP_ERR_STACK ();
+-        return -1;
+-   }
+-
+-/* if a certificate authority file is defined, load it into this context */
+-
+-   if (This->config!=NULL && tn5250_config_get (This->config, "ssl_ca_file")) {
+-        if (SSL_CTX_load_verify_locations(This->ssl_context, 
+-                  tn5250_config_get (This->config, "ssl_ca_file"), NULL)<1) {
+-            DUMP_ERR_STACK ();
+-            return -1;
+-        }
+-   }
+-
+-/* if a certificate authority file is defined, load it into this context */
+-
+-   if (This->config!=NULL && tn5250_config_get (This->config, "ssl_ca_file")) {
+-        if (SSL_CTX_load_verify_locations(This->ssl_context, 
+-                  tn5250_config_get (This->config, "ssl_ca_file"), NULL)<1) {
+-            DUMP_ERR_STACK ();
+-            return -1;
+-        }
+-   }
+-
+-   This->userdata = NULL;
+-
+-/* if a PEM passphrase is defined, set things up so that it can be used */
+-
+-   if (This->config!=NULL && tn5250_config_get (This->config,"ssl_pem_pass")){
+-        TN5250_LOG(("SSL: Setting password callback\n"));
+-        len = strlen(tn5250_config_get (This->config, "ssl_pem_pass"));
+-        This->userdata = malloc(len+1);
+-        strncpy(This->userdata,
+-                tn5250_config_get (This->config, "ssl_pem_pass"), len);
+-        SSL_CTX_set_default_passwd_cb(This->ssl_context,
+-                (pem_password_cb *)ssl_stream_passwd_cb);
+-        SSL_CTX_set_default_passwd_cb_userdata(This->ssl_context, (void *)This);
+-
+-   }
+-
+-/* If a certificate file has been defined, load it into this context as well */
+-
+-   if (This->config!=NULL && tn5250_config_get (This->config, "ssl_cert_file")){
+-        TN5250_LOG(("SSL: Loading certificates from certificate file\n"));
+-        if (SSL_CTX_use_certificate_file(This->ssl_context,
+-                tn5250_config_get (This->config, "ssl_cert_file"),
+-                SSL_FILETYPE_PEM) <= 0) {
+-            DUMP_ERR_STACK ();
+-            return -1;
+-        }
+-        TN5250_LOG(("SSL: Loading private keys from certificate file\n"));
+-        if (SSL_CTX_use_PrivateKey_file(This->ssl_context,
+-                tn5250_config_get (This->config, "ssl_cert_file"),
+-                SSL_FILETYPE_PEM) <= 0) {
+-            DUMP_ERR_STACK ();
+-            return -1;
+-        }
+-   }
+-
+-   This->ssl_handle = NULL;
+-   This->connect = ssl_stream_connect;
+-   This->accept = ssl_stream_accept;
+-   This->disconnect = ssl_stream_disconnect;
+-   This->handle_receive = ssl_stream_handle_receive;
+-   This->send_packet = tn3270_ssl_stream_send_packet;
+-   This->destroy = ssl_stream_destroy;
+-   This->streamtype = TN3270E_STREAM;
+-   return 0; /* Ok */
+-}
+-
+ /****i* lib5250/ssl_stream_connect
+  * NAME
+  *    ssl_stream_connect
+-- 
+2.7.4
diff --git a/net-misc/tn5250/files/tn5250-0.17.4-openssl11.patch b/net-misc/tn5250/files/tn5250-0.17.4-openssl11.patch
new file mode 100644
index 000000000000..8c6d0fde1c70
--- /dev/null
+++ b/net-misc/tn5250/files/tn5250-0.17.4-openssl11.patch
@@ -0,0 +1,49 @@
+From 5922e57bb5ea78ff35f82a60f1721d533cc0584a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
+Date: Mon, 20 Feb 2017 15:37:51 +0100
+Subject: [PATCH 4/4] port to OpenSSL 1.1
+
+- check for better functions in configure
+- update SSL initialization call
+---
+ configure.ac        | 8 ++++----
+ lib5250/sslstream.c | 2 +-
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 4ba0007..8a16cff 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -152,13 +152,13 @@ dnl ** happily, we don't have to hunt for them thanks to ldconfig!
+ dnl **
+ if test -n $sslincludedir; then
+      CPPFLAGS="$CPPFLAGS $sslincludedir"
+-     AC_CHECK_LIB(crypto,CRYPTO_num_locks)
+-     if test "$ac_cv_lib_crypto_CRYPTO_num_locks" != "yes"
++     AC_CHECK_LIB(crypto,OPENSSL_init)
++     if test "$ac_cv_lib_crypto_OPENSSL_init" != "yes"
+      then
+              AC_MSG_ERROR([** Unable to find OpenSSL libraries!])
+      fi
+-     AC_CHECK_LIB(ssl,SSL_library_init)
+-     if test "$ac_cv_lib_ssl_SSL_library_init" != "yes"
++     AC_CHECK_LIB(ssl,OPENSSL_init_ssl)
++     if test "$ac_cv_lib_ssl_OPENSSL_init_ssl" != "yes"
+      then
+              AC_MSG_ERROR([** Unable to find OpenSSL libraries!])
+      fi
+diff --git a/lib5250/sslstream.c b/lib5250/sslstream.c
+index 86d38cf..3c0f390 100644
+--- a/lib5250/sslstream.c
++++ b/lib5250/sslstream.c
+@@ -368,7 +368,7 @@ int tn5250_ssl_stream_init (Tn5250Stream *This)
+ /*  initialize SSL library */
+ 
+    SSL_load_error_strings();
+-   SSL_library_init();
++   OPENSSL_init_ssl(0, NULL);
+ 
+ /*  which SSL method do we use? */
+ 
+-- 
+2.7.4
diff --git a/net-misc/tn5250/tn5250-0.17.4-r3.ebuild b/net-misc/tn5250/tn5250-0.17.4-r3.ebuild
new file mode 100644
index 000000000000..b28b5cc3723d
--- /dev/null
+++ b/net-misc/tn5250/tn5250-0.17.4-r3.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="IBM AS/400 telnet client which emulates 5250 terminals/printers"
+HOMEPAGE="http://tn5250.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="libressl ssl"
+
+RDEPEND="
+	sys-libs/ncurses:0=
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+"
+
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.17.4-disable-sslv2-and-sslv3.patch
+	"${FILESDIR}"/${PN}-0.17.4-fix-Wformat-security-warnings.patch
+	"${FILESDIR}"/${PN}-0.17.4-tinfo.patch
+	"${FILESDIR}"/${PN}-0.17.4-whoami.patch
+	"${FILESDIR}"/${PN}-0.17.4-duplicate-definition.patch
+)
+
+src_prepare() {
+	default
+	if has_version ">=dev-libs/openssl-1.1.1"; then
+		eapply "${FILESDIR}"/${PN}-0.17.4-openssl11.patch
+	fi
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with ssl) \
+		--disable-static \
+		--without-python
+}
+
+src_install() {
+	# The TERMINFO variable needs to be defined for the install
+	# to work, because the install calls "tic."	 man tic for
+	# details.
+	dodir /usr/share/terminfo
+	emake DESTDIR="${D}" TERMINFO="${D}/usr/share/terminfo" install
+
+	einstalldocs
+	find "${D}" -name '*.la' -delete || die
+}