gentoo resync : 31.12.2017 (final resync this year)

2 files changed, 0 insertions, 149 deletions

diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest
index d997820fd0d0..dcbb1bcbe0b1 100644
--- a/net-misc/freerdp/Manifest
+++ b/net-misc/freerdp/Manifest
@@ -4,7 +4,6 @@ AUX 2.0.0-rc1-libressl.patch 1196 BLAKE2B 73d75cb75f2ec3b7e4fe8a4f410f76ec69be4b
 AUX freerdp-Fix-gstreamer-1.0-detection.patch 989 BLAKE2B 97989faf7984ed4b2f5720e45c590fb2f7751b6ebb18b244bf4e328d46856fc954020842aba49af75ac4bc2759f34687d95177ae8d7d7dfdef64a09f024f8315 SHA512 50fb859ce7dfb2af89efe5f40f0cf318da3fd32503b51e133e296420bde16bbc090f0aa10f6df09dce5ff9769e79fcabc1535f89413d962b7b06f6461dfcfb77
 AUX freerdp-armfp.patch 2930 BLAKE2B 33f324a88bcaa0f5340e9becdbc4c50589d8ecbc57c2f74da471b1b472e3b9895b8d26884df2b7d559c1b51b7e1d49450e710587d8b9a529755501af67e3c25f SHA512 57dd03e82b822fed95a5379aa79ada99910ef6c2a9cfaab1dc721181f76aa249d839576d31aa83e3568a37abc5b81a3ff8c5c2d0d15e6a5e457d254660581a48
 AUX freerdp-ffmpeg29.patch 1778 BLAKE2B a34acaa93eb59c01623151989ef8dd97e0aecc394219249d33ab6815b295e105a5d7db4baeca44a4a43f53665919a65466f9423b002e40648b02aaf6c1ea879b SHA512 c58acc5ddab34fe664d38649b7271ad793430cb1c9ad8e6b78f1924a8b70e1b8d76c426fb633cf6dd97fe3277664649fd7254e2e4377330c64234d23f1b26fd1
-AUX freerdp-libressl.patch 5386 BLAKE2B c2c160bdf4dd8f27415dfef179ff9131b4db22bec2a1fb26d90785d9f02332700c6299aa512b8a42cdf49f6627624c522f89eaaf337bf95a5f9fdc74230b4eab SHA512 9ee540047e4d8e61904eace6f41dcc8ec36089b6e34f6df152529a1f505014aa9cec163e46478938af38b173498d254d5b738183c2d463d445524903be6b6645
 DIST FreeRDP-2.0.0-rc0.tar.gz 6486529 BLAKE2B 6d9bf0e88c925f2184f87696b78a374c5fb24ecb3014515e077825805191fcb2e58b930ef4eccb797d496d142024357ca7562426e990a65cd3c54c58de3cc525 SHA512 d3eb0d5d23aa2a4d0277414f13a984d40aba051102c5af1e5ade975cdb469ef3549b145cd4339415fc33f056044929cfac71884512ea77a1e718d70d5b21b9dd
 DIST FreeRDP-2.0.0-rc1.tar.gz 6530403 BLAKE2B 5e276c3d1153f04512dba4bf09807751ca70ece3496c1ba00766b04369fffde8d86ad446345f0eab0fea4641708b7f985f95ea4a6001107163ee60e35822a955 SHA512 5d8fd7d6900feac1e42bfc0ebc111524205c3baa093958ced42d03635076ae7d88cd86439a22ff0656bc53f0302daee5a114a4ac26328ae598ee086490926182
 DIST freerdp-1.2.1_pre20150326.tar.gz 6146857 BLAKE2B 8ead05b89e129ba09b046f545073d128ca1d44dac7248c23bc543094f0fd23f336c890367945e7fce4def98c4ce1e01c4e5a970e92f3d4f74d08daf3cf0a8c6a SHA512 ca1499d56ecb9c9bc624de2ecc976eb9633b795050ac01e16fcc9e0a8951d274cc63644a0e2b830e75f66de894f6a22274864fd20a9351834f6d664874e65ec8
diff --git a/net-misc/freerdp/files/freerdp-libressl.patch b/net-misc/freerdp/files/freerdp-libressl.patch
deleted file mode 100644
index cbb79bcc1d31..000000000000
--- a/net-misc/freerdp/files/freerdp-libressl.patch
+++ /dev/null
@@ -1,148 +0,0 @@
-From 70ab61c8e6083080093fc42e8e7172969864e2bd Mon Sep 17 00:00:00 2001
-From: Aric Belsito <lluixhi@gmail.com>
-Date: Sun, 19 Mar 2017 13:58:24 -0700
-Subject: [PATCH] Support LibreSSL
-
-Broken by the addition of OpenSSL 1.1.0 support.
----
- libfreerdp/crypto/opensslcompat.c | 4 ++--
- libfreerdp/crypto/opensslcompat.h | 4 ++--
- libfreerdp/crypto/tls.c           | 8 ++++----
- winpr/libwinpr/crypto/hash.c      | 8 ++++----
- winpr/libwinpr/utils/ssl.c        | 2 +-
- 5 files changed, 13 insertions(+), 13 deletions(-)
-
-diff --git a/libfreerdp/crypto/opensslcompat.c b/libfreerdp/crypto/opensslcompat.c
-index bb5aff7..701902d 100644
---- a/libfreerdp/crypto/opensslcompat.c
-+++ b/libfreerdp/crypto/opensslcompat.c
-@@ -19,7 +19,7 @@
- 
- #include "opensslcompat.h"
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- 
- BIO_METHOD* BIO_meth_new(int type, const char* name)
- {
-@@ -41,4 +41,4 @@ void RSA_get0_key(const RSA* r, const BIGNUM** n, const BIGNUM** e, const BIGNUM
- 		*d = r->d;
- }
- 
--#endif /* OPENSSL < 1.1.0 */
-+#endif /* OPENSSL < 1.1.0 || LIBRESSL */
-diff --git a/libfreerdp/crypto/opensslcompat.h b/libfreerdp/crypto/opensslcompat.h
-index a599863..b42d32f 100644
---- a/libfreerdp/crypto/opensslcompat.h
-+++ b/libfreerdp/crypto/opensslcompat.h
-@@ -30,7 +30,7 @@
- 
- #include <openssl/opensslv.h>
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- 
- #include <openssl/bio.h>
- #include <openssl/rsa.h>
-@@ -59,7 +59,7 @@
- BIO_METHOD* BIO_meth_new(int type, const char* name);
- void RSA_get0_key(const RSA* r, const BIGNUM** n, const BIGNUM** e, const BIGNUM** d);
- 
--#endif /* OPENSSL < 1.1.0 */
-+#endif /* OPENSSL < 1.1.0 || LIBRESSL */
- #endif /* WITH_OPENSSL */
- 
- #endif /* FREERDP_CRYPTO_OPENSSLCOMPAT_H */
-diff --git a/libfreerdp/crypto/tls.c b/libfreerdp/crypto/tls.c
-index 1071a2e..c415763 100644
---- a/libfreerdp/crypto/tls.c
-+++ b/libfreerdp/crypto/tls.c
-@@ -323,7 +323,7 @@ static long bio_rdp_tls_ctrl(BIO* bio, int cmd, long num, void* ptr)
- 		case BIO_CTRL_PUSH:
- 			if (next_bio && (next_bio != ssl_rbio))
- 			{
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- 				SSL_set_bio(tls->ssl, next_bio, next_bio);
- 				CRYPTO_add(&(bio->next_bio->references), 1, CRYPTO_LOCK_BIO);
- #else
-@@ -346,7 +346,7 @@ static long bio_rdp_tls_ctrl(BIO* bio, int cmd, long num, void* ptr)
- 				if (ssl_rbio != ssl_wbio)
- 					BIO_free_all(ssl_wbio);
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- 				if (next_bio)
- 					CRYPTO_add(&(bio->next_bio->references), -1, CRYPTO_LOCK_BIO);
- 				tls->ssl->wbio = tls->ssl->rbio = NULL;
-@@ -384,7 +384,7 @@ static long bio_rdp_tls_ctrl(BIO* bio, int cmd, long num, void* ptr)
- 					BIO_push(ssl_rbio, next_bio);
- 
- 				BIO_set_next(bio, ssl_rbio);
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- 				CRYPTO_add(&(ssl_rbio->references), 1, CRYPTO_LOCK_BIO);
- #else
- 				BIO_up_ref(ssl_rbio);
-@@ -1021,7 +1021,7 @@ BOOL tls_send_alert(rdpTls* tls)
-  *        SSL struct is opaqe now
-  */
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- 	if (tls->alertDescription != TLS_ALERT_DESCRIPTION_CLOSE_NOTIFY)
- 	{
- 		/**
-diff --git a/winpr/libwinpr/crypto/hash.c b/winpr/libwinpr/crypto/hash.c
-index 949d687..27eb434 100644
---- a/winpr/libwinpr/crypto/hash.c
-+++ b/winpr/libwinpr/crypto/hash.c
-@@ -146,7 +146,7 @@ WINPR_HMAC_CTX* winpr_HMAC_New(void)
- 
- #if defined(WITH_OPENSSL)
- 	HMAC_CTX* hmac = NULL;
--#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
- 	if (!(hmac = (HMAC_CTX*) calloc(1, sizeof(HMAC_CTX))))
- 		return NULL;
- 	HMAC_CTX_init(hmac);
-@@ -267,7 +267,7 @@ void winpr_HMAC_Free(WINPR_HMAC_CTX* ctx)
- 	HMAC_CTX* hmac = (HMAC_CTX*) ctx;
- 	if (hmac)
- 	{
--#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
- 		HMAC_CTX_cleanup(hmac);
- 		free(hmac);
- #else
-@@ -317,7 +317,7 @@ WINPR_DIGEST_CTX* winpr_Digest_New(void)
- 
- #if defined(WITH_OPENSSL)
- 	EVP_MD_CTX* mdctx;
--#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
- 	mdctx = EVP_MD_CTX_create();
- #else
- 	mdctx = EVP_MD_CTX_new();
-@@ -406,7 +406,7 @@ void winpr_Digest_Free(WINPR_DIGEST_CTX* ctx)
- 	EVP_MD_CTX* mdctx = (EVP_MD_CTX*) ctx;
- 	if (mdctx)
- 	{
--#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
- 		EVP_MD_CTX_destroy(mdctx);
- #else
- 		EVP_MD_CTX_free(mdctx);
-diff --git a/winpr/libwinpr/utils/ssl.c b/winpr/libwinpr/utils/ssl.c
-index 2f8100f..5fd6ac6 100644
---- a/winpr/libwinpr/utils/ssl.c
-+++ b/winpr/libwinpr/utils/ssl.c
-@@ -45,7 +45,7 @@ static BOOL g_winpr_openssl_initialized_by_winpr = FALSE;
-  * set locking callbacks to use OpenSSL in a multi-threaded environment.
-  */
- 
--#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
- 
- #define WINPR_OPENSSL_LOCKING_REQUIRED 1
-