gentoo resync : 21.07.2018

3 files changed, 0 insertions, 52 deletions

diff --git a/app-pda/Manifest.gz b/app-pda/Manifest.gz
index be874af8ea77..fb710d8ef5f9 100644
--- a/app-pda/Manifest.gz
+++ b/app-pda/Manifest.gz
diff --git a/app-pda/libimobiledevice/Manifest b/app-pda/libimobiledevice/Manifest
index c7906cb6d725..7c706fd61869 100644
--- a/app-pda/libimobiledevice/Manifest
+++ b/app-pda/libimobiledevice/Manifest
@@ -1,4 +1,3 @@
-AUX gnutls-3.4.patch 2415 BLAKE2B cdd9f3ad241a866db1794ec2ac661df902b180555102173706a47700889ff98a18bdadefba90818edea14def51664c3bbe75fe38cf1375574f3fe7ba51c10340 SHA512 d1a46062d3e4a37dfbb8d8ac754f7e927e0f8f2720152d7f8604667b65ea8fa5f26777f4490cb01c7dc01771a96c545bc1b1c8b433482ad24fb9840f063fb36b
 DIST libimobiledevice-1.2.0-git.patch 187304 BLAKE2B 7c184f823b831b913dbae16a58db1e4b7682fb42e573b1bab3983eb8150feb696795fd59c81ca7582fd56cd953e32489a8ddc502c4cb39a6ac88ff3d018ceace SHA512 cfc433a8eada9357ee5119ccfeb1e7444f10132637a43954174721905207b0e168f49a1728ee16ed6b0a9fd8b9617e8e35b04cf34f775abd1d12b8ecb7dbdbd2
 DIST libimobiledevice-1.2.0-userpref-GnuTLS-Fix-3.6.0-SHA1-compatibility.patch 2272 BLAKE2B 2f435af75c6f7fe319c76b52feac32d8f1389806835658bae5713d82471d0b2edd01b062871bff5e757795c220e2cd4c77d404c1df0cf9616c2fc2d77364b686 SHA512 a31741cfaae53781a1491fd53514e614e64c676573dc9252adea2fb0d64005eb5fad6483f1848b0246f0fff76c8fb4535f56a6e97c13dd7aa48a29061cabb172
 DIST libimobiledevice-1.2.0-userpref-GnuTLS-Use-valid-serial-for-3.6.0.patch 2014 BLAKE2B 8a6e51af145cf9983aa92ad7febf8d48a64b81f4f4664079ee7df3d433626141e10af6700ad38aad81bbbf3be03d6b35bae4f10a595e97f6998a06b6b2a4fbd4 SHA512 1c6002f8da5524603b989613fc1b14e526bc6fcbf515890f8c4976fe5e1b3801f04f6b210264624990ff7dd7de01063ad53dbf9ec506a0645098692a948216b9
diff --git a/app-pda/libimobiledevice/files/gnutls-3.4.patch b/app-pda/libimobiledevice/files/gnutls-3.4.patch
deleted file mode 100644
index 9b4b83372109..000000000000
--- a/app-pda/libimobiledevice/files/gnutls-3.4.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 2a5868411c57e25802d2f16fd6b77601f10d0b72 Mon Sep 17 00:00:00 2001
-From: Nikos Mavrogiannopoulos <nmav@redhat.com>
-Date: Fri, 29 Apr 2016 22:58:34 +0200
-Subject: [PATCH] Updated gnutls certificate callback to new API (backwards
- compatible)
-
----
- src/idevice.c | 13 +++++++++++++
- 1 file changed, 13 insertions(+)
-
-diff --git a/src/idevice.c b/src/idevice.c
-index 5912aeb..f2de6a3 100644
---- a/src/idevice.c
-+++ b/src/idevice.c
-@@ -642,7 +642,11 @@ static const char *ssl_error_to_string(int e)
- /**
-  * Internally used gnutls callback function that gets called during handshake.
-  */
-+#if GNUTLS_VERSION_NUMBER >= 0x020b07
-+static int internal_cert_callback(gnutls_session_t session, const gnutls_datum_t * req_ca_rdn, int nreqs, const gnutls_pk_algorithm_t * sign_algos, int sign_algos_length, gnutls_retr2_st * st)
-+#else
- static int internal_cert_callback(gnutls_session_t session, const gnutls_datum_t * req_ca_rdn, int nreqs, const gnutls_pk_algorithm_t * sign_algos, int sign_algos_length, gnutls_retr_st * st)
-+#endif
- {
- 	int res = -1;
- 	gnutls_certificate_type_t type = gnutls_certificate_type_get(session);
-@@ -650,7 +654,12 @@ static int internal_cert_callback(gnutls_session_t session, const gnutls_datum_t
- 		ssl_data_t ssl_data = (ssl_data_t)gnutls_session_get_ptr(session);
- 		if (ssl_data && ssl_data->host_privkey && ssl_data->host_cert) {
- 			debug_info("Passing certificate");
-+#if GNUTLS_VERSION_NUMBER >= 0x020b07
-+			st->cert_type = type;
-+			st->key_type = GNUTLS_PRIVKEY_X509;
-+#else
- 			st->type = type;
-+#endif
- 			st->ncerts = 1;
- 			st->cert.x509 = &ssl_data->host_cert;
- 			st->key.x509 = ssl_data->host_privkey;
-@@ -759,7 +768,11 @@ LIBIMOBILEDEVICE_API idevice_error_t idevice_connection_enable_ssl(idevice_conne
- 	debug_info("enabling SSL mode");
- 	errno = 0;
- 	gnutls_certificate_allocate_credentials(&ssl_data_loc->certificate);
-+#if GNUTLS_VERSION_NUMBER >= 0x020b07
-+	gnutls_certificate_set_retrieve_function(ssl_data_loc->certificate, internal_cert_callback);
-+#else
- 	gnutls_certificate_client_set_retrieve_function(ssl_data_loc->certificate, internal_cert_callback);
-+#endif
- 	gnutls_init(&ssl_data_loc->session, GNUTLS_CLIENT);
- 	gnutls_priority_set_direct(ssl_data_loc->session, "NONE:+VERS-SSL3.0:+ANON-DH:+RSA:+AES-128-CBC:+AES-256-CBC:+SHA1:+MD5:+COMP-NULL", NULL);
- 	gnutls_credentials_set(ssl_data_loc->session, GNUTLS_CRD_CERTIFICATE, ssl_data_loc->certificate);