gentoo resync : 19.11.2017

3 files changed, 0 insertions, 86 deletions

diff --git a/net-wireless/wpa_supplicant/Manifest b/net-wireless/wpa_supplicant/Manifest
index 7c4fa431c3cc..e4c32a0d9b37 100644
--- a/net-wireless/wpa_supplicant/Manifest
+++ b/net-wireless/wpa_supplicant/Manifest
@@ -15,8 +15,6 @@ AUX 2017-1/rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch 4309 SHA25
 AUX 2017-1/rebased-v2.6-0007-WNM-Ignore-WNM-Sleep-Mode-Response-without-pending-r.patch 1649 SHA256 c5a17af84aec2d88c56ce0da2d6945be398fe7cab5c0c340deb30973900c2736 SHA512 111e655cfbb3a86e3792040e0ea375490d31c42c9d43cbe911290d54df5f4db437e4c8ad0e937c51729dcefeb0db0989b8ab55b9523398683abd08ebfec18076 WHIRLPOOL 8d2c8b1a52e199944028d97b3c66e12c155a01771b1bb073d48d7a4a561398544cf9a5feca85adee2d5eb5ceed5c517a03942a3bbcadbe420fc8474f50140eb5
 AUX 2017-1/rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch 2750 SHA256 c8840d857b9432f3b488113c85c1ff5d4a4b8d81078b7033388dae1e990843b1 SHA512 fc84edd8b30305cc42053c872554098f3f077292ec980ed6a442f37884087ff2f055738fd55977ed792bef1887dcc8c4626586465d78dd0258edb83dcd50a65a WHIRLPOOL 65af236e7c6de4a7a2cd67be811ea9fe689076c80199a67cdb567ccaf43fae98d9ea804af221908303e254731fd3fab2cf4b987b5a447affc9d7bf238d026d38
 AUX wpa_cli.sh 1284 SHA256 f3aa34b99a90213c53496f8ea014c487266338791f3526043a7fd97adc651fc6 SHA512 250372231eda6f7228fcf76b13fc1b95637d0d9dec96b7bef820bfa1af1496f218909f521daf2ddb2ca81d0ebb3162500f833575b64d8d2b4820c247499e1c56 WHIRLPOOL d9415986c75374f2e0eb5b55d462e083538f7c02f059ca197c0c70645dbfebcabacde24aa77710edbc8ae0dcd0b0f81a2afe6bfd0048f7415affa79d70417722
-AUX wpa_supplicant-2.5-do-not-call-dbus-functions-with-NULL-path.patch 486 SHA256 1d1ba823a6f1447bae53cb95591d6e17e6b95505f983c5f8cb17f312f6be85bb SHA512 dac56bc505a51167042ebe548f0e81a20a5578f753af9bb7ec3335a542d799c6e8739681ef7c8f7747a9bc954f8aa6f1a147250eacba17fd7fff80c4e53638ed WHIRLPOOL 2c6a9615d770924c504d7d90fc13a4738f1b7bc9e34135d89c40522a111e4d5131efea5294eb8375c649f95b591b333cb7990d144c19cc4ed75269d45e023fa5
-AUX wpa_supplicant-2.5-libressl.patch 2793 SHA256 70d663b6d20b0133321480868287701441830e3f4777bde397cc05c68af011b8 SHA512 0e2537968947c71850797989bb1084912f77b2a982b2f5ba683552d761e8760ade41b4ffcdfb9cfdd7941453f1aad236f93eba0bf6d080adc5dfcb71fd94eea8 WHIRLPOOL 23484d782c5f7338bdaf30d1517196e2ea4e1197f19e583a171630206d6886060ae91a4d04275a6ea0382ea9635a8fca7ebc84b42b550b23642d7b5c5614a497
 AUX wpa_supplicant-2.6-do-not-call-dbus-functions-with-NULL-path.patch 486 SHA256 1d1ba823a6f1447bae53cb95591d6e17e6b95505f983c5f8cb17f312f6be85bb SHA512 dac56bc505a51167042ebe548f0e81a20a5578f753af9bb7ec3335a542d799c6e8739681ef7c8f7747a9bc954f8aa6f1a147250eacba17fd7fff80c4e53638ed WHIRLPOOL 2c6a9615d770924c504d7d90fc13a4738f1b7bc9e34135d89c40522a111e4d5131efea5294eb8375c649f95b591b333cb7990d144c19cc4ed75269d45e023fa5
 AUX wpa_supplicant-2.6-libressl.patch 3003 SHA256 1e3dd49ad71a13a705393c3fef93d56ed0d93fcbd8bf8c1af1abc7a6403cea1b SHA512 2fb29ec14db2f33f8c011e1c2e98eef4d36b2e9f3b36f6058c390484ae5c64ad5d67aa25f138829503fabfac374bda24172871bdefef2a0566db963a5a362ec8 WHIRLPOOL fbffdc9363c8602230ad517fdebe1cbd39c005b9b2611aff8baa26ada4ed5a568dea9efc2b14d6f8aa9b516821ecd88bd9f1d9fb4cacd8150f0efe7a6c5d821b
 AUX wpa_supplicant-conf.d 161 SHA256 61ec59007f66ac5bacc0aa095d1f2ccbc977a687038e161a463d1727223d5a90 SHA512 29103161ec2b9631fca9e8d9a97fafd60ffac3fe78cf613b834395ddcaf8be1e253c22e060d7d9f9b974b2d7ce794caa932a2125e29f6494b75bce475f7b30e1 WHIRLPOOL 5508d1598bd952ec773db0d5e5ab440134337de6e26d7b8c7c6b00789c570559a54457ac507357b65e8604da849f9ab52dff90d27197d9be11ed2cc66eaae1e7
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-2.5-do-not-call-dbus-functions-with-NULL-path.patch b/net-wireless/wpa_supplicant/files/wpa_supplicant-2.5-do-not-call-dbus-functions-with-NULL-path.patch
deleted file mode 100644
index 0f340c9566d2..000000000000
--- a/net-wireless/wpa_supplicant/files/wpa_supplicant-2.5-do-not-call-dbus-functions-with-NULL-path.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/wpa_supplicant/dbus/dbus_new_helpers.c b/wpa_supplicant/dbus/dbus_new_helpers.c
-index 45623f3..0fc3d08 100644
---- a/wpa_supplicant/dbus/dbus_new_helpers.c
-+++ b/wpa_supplicant/dbus/dbus_new_helpers.c
-@@ -847,7 +847,7 @@ void wpa_dbus_mark_property_changed(struct wpas_dbus_priv *iface,
- 	const struct wpa_dbus_property_desc *dsc;
- 	int i = 0;
- 
--	if (iface == NULL)
-+	if (iface == NULL || path == NULL)
- 		return;
- 
- 	dbus_connection_get_object_path_data(iface->con, path,
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-2.5-libressl.patch b/net-wireless/wpa_supplicant/files/wpa_supplicant-2.5-libressl.patch
deleted file mode 100644
index 458628c577dc..000000000000
--- a/net-wireless/wpa_supplicant/files/wpa_supplicant-2.5-libressl.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From c987191de92bacbf27df5d345a9d18aea8ea8a98 Mon Sep 17 00:00:00 2001

-From: =?UTF-8?q?Marek=20Beh=C3=BAn?= <kabel@blackhole.sk>

-Date: Mon, 16 Nov 2015 02:18:22 +0100

-Subject: [PATCH] Check for LIBRESSL_VERSION_NUMBER in tls_openssl.c

-

-LibreSSL does not yet support the new API, so do not use it

-when LIBRESSL_VERSION_NUMBER macro is defined.

----

- src/crypto/tls_openssl.c | 12 ++++++------

- 1 file changed, 6 insertions(+), 6 deletions(-)

-

-diff --git a/src/crypto/tls_openssl.c b/src/crypto/tls_openssl.c

-index c2bb8c5..3883465 100644

---- a/src/crypto/tls_openssl.c

-+++ b/src/crypto/tls_openssl.c

-@@ -3163,7 +3163,7 @@ static int tls_parse_pkcs12(struct tls_data *data, SSL *ssl, PKCS12 *p12,

- 	}

- 

- 	if (certs) {

--#if OPENSSL_VERSION_NUMBER >= 0x10002000L

-+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)

- 		SSL_clear_chain_certs(ssl);

- 		while ((cert = sk_X509_pop(certs)) != NULL) {

- 			X509_NAME_oneline(X509_get_subject_name(cert), buf,

-@@ -3746,7 +3746,7 @@ int tls_connection_get_random(void *ssl_ctx, struct tls_connection *conn,

- 	if (conn == NULL || keys == NULL)

- 		return -1;

- 	ssl = conn->ssl;

--#if OPENSSL_VERSION_NUMBER < 0x10100000L

-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)

- 	if (ssl == NULL || ssl->s3 == NULL || ssl->session == NULL)

- 		return -1;

- 

-@@ -3775,7 +3775,7 @@ int tls_connection_get_random(void *ssl_ctx, struct tls_connection *conn,

- #ifndef CONFIG_FIPS

- static int openssl_get_keyblock_size(SSL *ssl)

- {

--#if OPENSSL_VERSION_NUMBER < 0x10100000L

-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)

- 	const EVP_CIPHER *c;

- 	const EVP_MD *h;

- 	int md_size;

-@@ -3845,7 +3845,7 @@ static int openssl_tls_prf(struct tls_connection *conn,

- 		   "mode");

- 	return -1;

- #else /* CONFIG_FIPS */

--#if OPENSSL_VERSION_NUMBER < 0x10100000L

-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)

- 	SSL *ssl;

- 	u8 *rnd;

- 	int ret = -1;

-@@ -4328,7 +4328,7 @@ int tls_connection_set_cipher_list(void *tls_ctx, struct tls_connection *conn,

- 

- 	wpa_printf(MSG_DEBUG, "OpenSSL: cipher suites: %s", buf + 1);

- 

--#if OPENSSL_VERSION_NUMBER >= 0x10100000L

-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)

- #if defined(EAP_FAST) || defined(EAP_FAST_DYNAMIC) || defined(EAP_SERVER_FAST)

- 	if (os_strstr(buf, ":ADH-")) {

- 		/*

-@@ -4917,7 +4917,7 @@ static int tls_sess_sec_cb(SSL *s, void *secret, int *secret_len,

- 	struct tls_connection *conn = arg;

- 	int ret;

- 

--#if OPENSSL_VERSION_NUMBER < 0x10100000L

-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)

- 	if (conn == NULL || conn->session_ticket_cb == NULL)

- 		return 0;

- 

--- 

-2.4.10