gentoo resync : 22.01.2019

4 files changed, 71 insertions, 26 deletions

diff --git a/net-ftp/tlswrap/Manifest b/net-ftp/tlswrap/Manifest
index be8780ddb6f4..a90f1b817006 100644
--- a/net-ftp/tlswrap/Manifest
+++ b/net-ftp/tlswrap/Manifest
@@ -1,8 +1,8 @@
 AUX fix-Wformat-security-warnings.patch 2478 BLAKE2B a5eaabcee8e6bdcb573d020c1b7bba80a6f5dd266cd5e1f02b987b2cbafb3d86b77b82458afc00a152ee1c2ac2424b1d1c994eba7607f19dc7105ccbcec6e366 SHA512 77af5535f8a250baa1e1967bdf31a8f74f2e5222b7c138f140ec245b06a7bcd398e7877f523170fe2cfa2bc026245f66533285bf03008eb317ecc5a0955ee239
 AUX modernize-am_init_automake.patch 920 BLAKE2B ff8fade6f0cb57b1edb28f36fdbb0b6be864f43a7c344fe5540b101f1fc7bdadd23a8b4cb9f9458413dba96ca682a9234cb640038a8ea2288ebe00fea09e7e91 SHA512 42056abceb24f7680d0480f2dbe9f87c37c124a5012811681a4826fb1dd3d3cdc883d31e5fb4d202a67bd1f6dc7edc5f8fa2aa828c20ee46c1ab6a05b0e49a17
 AUX respect-cflags.patch 2327 BLAKE2B 4ba3c51a989b6a23a7e5edd787a0e36b15f1876f28f15e75ba74624d5481dbf1321424c1bafd06869209cc818845e7d3480bc30149d6bddf3f899daa07db6e06 SHA512 97ff02e1417bbee2cf518f8dfcd6d32535fd610394f499ef4c552aa0741a56fe54a8ab7cedf8a553f337f4a38a221e990c222ff9c019f3037e01bdd3241e92fc
-AUX tlswrap-1.04-libressl.patch 522 BLAKE2B 14f78918a9a005aa751e962b1d2087d0c7f6b5c5d030df931234f78c7ccedf5ec25f05220a42cc2911eff5afbf201268fdbac4054826da4617f6d413b19c0d3a SHA512 e9011223a76fe6090478dcb589be81065b71c6363bb35bc02153dedf426c238a275e605a598718b917adaa55778033ed3a689af4d513fb0a3948a39e8c6df77f
+AUX tlswrap-1.04-openssl11.patch 1949 BLAKE2B 45b36c5f43285221cb2bf5d77f4ca181225977d7acc7b255695a5977edca3d0bb214cd7365ce9c7939989244e1d8280cec0e2c2489e591e14404b09947aa2fc4 SHA512 65ba9b78c7a73ed0ac819fcb56f3dc9685974161e772bea1ce809620e780c45a77644cabd8e29a0770068febae89e5412d47eef209db92a63928ff5d5ea4927a
 AUX tlswrap.init 395 BLAKE2B c43439a23c748d820fb5375b6183b6f3a992ee9d0324e23eb85f9a2c938d6579bb296e332dd7e042b9355e75fd94b2bf6f91a625ff98b3169e95c4df13334b8e SHA512 6699101e5a628cf91013575e31f85c13a254854814240e7d7bf7006d1bb6f73eab8ecb80fe1d168e952c7c6ffc001495a6a6bc0e591de2e84d40591fccf02fae
 DIST tlswrap-1.04.tar.gz 129507 BLAKE2B fafbe0185f3b2e1a440cd1ad3892c005435eecc371ecd5094d81f3dac08f1c6186cd5d873e02ae35d9dfb987168ae0c6c7a4233420c874d171d3a8fe8004e885 SHA512 f6d2a54cd77fef42174726cbe7ddd5109bb8a9c2289ddf22eddb2d240edba4a5de2e857d940ab44298e4c48da142e638d9b91fd971e5f328a36c6a557f4a257a
-EBUILD tlswrap-1.04-r3.ebuild 829 BLAKE2B cdf33a3914889e2254e8ae5971deb9a988a22e789b2d38a1f5d2ed2a302eac79ffd9a026d2f35c927967601e9e72a69ad759cb1f21c2477dc5419d9d51270421 SHA512 3eb1283b529260748712599423c44050fa4fa43eab5c05ebabaad4fb5ba40d69c42d3182091424e3136e99a623f3f3ec65337b55d8035212d7f8128f4b3aa901
+EBUILD tlswrap-1.04-r3.ebuild 820 BLAKE2B 9a7c1a4be52bfe44353575b3a6ebe59d6448da1d1d2e084795bca7e37a98e0264cfa8c7541bbad106f907b18fcb6020f8899c6aa01e2dc23eb8f4732c0114925 SHA512 1d90fa0ad9bd65b7a7a77a08801302a65f786b247f0c6048af52774737546997153367015a735506d938a6ef63fc06ae7eaffa42ee81ce992efb676222ef88f5
 MISC metadata.xml 305 BLAKE2B bb4951030887c06d701bb0906badf2ae1ece916b99cfa5b1cd76c09ba49122325cfb721c868519c4eac297f71b564598e56c682564ccc6c6575e6fd9a113d506 SHA512 4a622677eeb69709c3ca1f15cadadc536f5478afcbcf673bd0f4247c9f8f099f267343634c61942104989dd428b39082fd05b4d048694c55698a5e30a9530c95
diff --git a/net-ftp/tlswrap/files/tlswrap-1.04-libressl.patch b/net-ftp/tlswrap/files/tlswrap-1.04-libressl.patch
deleted file mode 100644
index 5c1f1083005f..000000000000
--- a/net-ftp/tlswrap/files/tlswrap-1.04-libressl.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -Naur a/tls.c b/tls.c
---- a/tls.c	2006-11-25 19:52:08.000000000 +0100
-+++ b/tls.c	2015-11-10 16:16:25.000000000 +0100
-@@ -73,10 +73,12 @@
- 		printf("egd_sock is %s\n", egd_sock);
- #ifdef HAVE_RAND_STATUS
- 	if (RAND_status() != 1) {
-+#ifndef OPENSSL_NO_EGD
- 		if ( RAND_egd(egd_sock) == -1 ) {
- 			fprintf(stderr, "egd_sock is %s\n", egd_sock);
- 			sys_err("RAND_egd failed\n");
- 		}
-+#endif
- 		if (RAND_status() != 1)
- 			sys_err("ssl_init: System without /dev/urandom, PRNG seeding must be done manually.\r\n");
- 	}
diff --git a/net-ftp/tlswrap/files/tlswrap-1.04-openssl11.patch b/net-ftp/tlswrap/files/tlswrap-1.04-openssl11.patch
new file mode 100644
index 000000000000..e8d0941d7434
--- /dev/null
+++ b/net-ftp/tlswrap/files/tlswrap-1.04-openssl11.patch
@@ -0,0 +1,60 @@
+diff -wru tlswrap-1.04.orig/tls.c tlswrap-1.04/tls.c
+--- tlswrap-1.04.orig/tls.c	2006-11-25 19:52:08.000000000 +0100
++++ tlswrap-1.04/tls.c	2017-12-05 04:43:56.757223948 +0100
+@@ -73,10 +73,12 @@
+ 		printf("egd_sock is %s\n", egd_sock);
+ #ifdef HAVE_RAND_STATUS
+ 	if (RAND_status() != 1) {
++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || OPENSSL_NO_EGD
+ 		if ( RAND_egd(egd_sock) == -1 ) {
+ 			fprintf(stderr, "egd_sock is %s\n", egd_sock);
+ 			sys_err("RAND_egd failed\n");
+ 		}
++#endif
+ 		if (RAND_status() != 1)
+ 			sys_err("ssl_init: System without /dev/urandom, PRNG seeding must be done manually.\r\n");
+ 	}
+@@ -262,7 +264,8 @@
+ 	int					ok, extcount, i, j;
+ 	char 				*extstr;
+ 	SSL					*ssl;
+-#if (OPENSSL_VERSION_NUMBER > 0x00908000L)
++#if (OPENSSL_VERSION_NUMBER > 0x10100000L)
++#elif (OPENSSL_VERSION_NUMBER > 0x00908000L)
+ 	unsigned char const		*data1;
+ #else
+ 	unsigned char	*data1;
+@@ -279,6 +282,16 @@
+ 	if (debug)
+ 		printf("tls_cert2\n");
+ 	
++#if (OPENSSL_VERSION_NUMBER > 0x10100000L)
++	if (ud->sec_level > 3) {
++		X509_VERIFY_PARAM *param = SSL_get0_param(ssl);
++		X509_VERIFY_PARAM_set_hostflags(param, X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS);
++		X509_VERIFY_PARAM_set1_host(param, ud->serv_dns.hostname, 0);
++		X509_VERIFY_PARAM_set1_ip_asc(param, ud->serv_data_host);
++		SSL_set_verify(ssl, SSL_VERIFY_PEER, 0);
++	}
++#endif
++
+ 	if ((x509_peer = SSL_get_peer_certificate(ssl)) == NULL)
+ 		return X509_V_ERR_APPLICATION_VERIFICATION; /* SSL_get_peer* can only be NULL on  'anonymous DH connections' so shouldn't happen. */
+ 
+@@ -287,6 +300,8 @@
+ 		return SSL_get_verify_result(ssl);
+ 	}
+ 	
++
++#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
+ 	if ((extcount = X509_get_ext_count(x509_peer)) > 0) {
+ 		if (debug) printf("extcount = %d\n", extcount);
+ 		for (i = 0; i < extcount; i++) {
+@@ -333,6 +348,7 @@
+   		return X509_V_ERR_APPLICATION_VERIFICATION;
+   	}
+   }
++#endif
+   X509_free(x509_peer);
+ 	return SSL_get_verify_result(ssl);
+ }
diff --git a/net-ftp/tlswrap/tlswrap-1.04-r3.ebuild b/net-ftp/tlswrap/tlswrap-1.04-r3.ebuild
index 4bb88bbe38ec..07e388e8f258 100644
--- a/net-ftp/tlswrap/tlswrap-1.04-r3.ebuild
+++ b/net-ftp/tlswrap/tlswrap-1.04-r3.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
+EAPI=7
 inherit autotools
 
 DESCRIPTION="FTP wrapper which supports TLS with every FTP client"
@@ -15,15 +14,17 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="libressl"
 
-DEPEND="!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:= )"
-RDEPEND="${DEPEND}"
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:= )
+"
+DEPEND="${RDEPEND}"
 
 PATCHES=(
-	"${FILESDIR}/${P}-libressl.patch"
 	"${FILESDIR}/respect-cflags.patch"
 	"${FILESDIR}/modernize-am_init_automake.patch"
 	"${FILESDIR}/fix-Wformat-security-warnings.patch"
+	"${FILESDIR}/${P}-openssl11.patch"
 )
 
 src_prepare() {
@@ -33,6 +34,6 @@ src_prepare() {
 
 src_install() {
 	emake prefix="${D}/usr" install
-	dodoc ChangeLog README
+	einstalldocs
 	newinitd "${FILESDIR}/tlswrap.init" tlswrap
 }