aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeo <thinkabit.ukim@gmail.com>2020-10-14 02:00:19 -0300
committerLeo <thinkabit.ukim@gmail.com>2020-10-14 02:00:40 -0300
commit6b240e256c26d9f484daab883663265d114a8407 (patch)
tree31b725e22f5514a9a7d2c39727733ff035941bc7
parent1c9be9506a3d9e5657ae9f73d38c7ec3fc948c12 (diff)
downloadaports-6b240e256c26d9f484daab883663265d114a8407.tar.gz
aports-6b240e256c26d9f484daab883663265d114a8407.tar.bz2
aports-6b240e256c26d9f484daab883663265d114a8407.tar.xz
community/*: remove stale patches
-rw-r--r--community/libimobiledevice/02a0e03e24bc96bba2e5ea2438c30baf803fd137.patch95
-rw-r--r--community/libimobiledevice/13bf235cac2201747de11652cf14fe2714ca0718.patch31
-rw-r--r--community/opencl-icd-loader/ocl_icd_loader.c.patch12
3 files changed, 0 insertions, 138 deletions
diff --git a/community/libimobiledevice/02a0e03e24bc96bba2e5ea2438c30baf803fd137.patch b/community/libimobiledevice/02a0e03e24bc96bba2e5ea2438c30baf803fd137.patch
deleted file mode 100644
index 74263fe52e..0000000000
--- a/community/libimobiledevice/02a0e03e24bc96bba2e5ea2438c30baf803fd137.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-Upstream: Yes
-From 02a0e03e24bc96bba2e5ea2438c30baf803fd137 Mon Sep 17 00:00:00 2001
-From: Christophe Fergeau
-Date: Tue, 25 Apr 2017 14:09:48 +0200
-Subject: Avoid double free with OpenSSL 1.1.0
-
-Since commit OpenSSL_1_1_0-pre3~178
-https://github.com/openssl/openssl/commit/b184e3ef73200cb3b7914a603b43a5b8a074c85f
-OpenSSL automatically cleans up some of its internal data when the
-program exits. This conflicts with some similar clean up
-libimobiledevice attempts to do, which causes a double-free.
-SSL_COMP_free_compression_methods() was available in OpenSSL 1.0.2,
-and is still there in 1.1.0 as a no-op, so we can use that to free
-the compression methods.
-
-This bug can be hit with a simple idevicebackup2 --help
-
-==14299== Invalid read of size 4
-==14299== at 0x547AEBC: OPENSSL_sk_pop_free (stack.c:263)
-==14299== by 0x508B848: ssl_library_stop (ssl_init.c:182)
-==14299== by 0x5424D11: OPENSSL_cleanup (init.c:402)
-==14299== by 0x5DC3134: __cxa_finalize (cxa_finalize.c:56)
-==14299== by 0x53332B2: ??? (in /usr/lib64/libcrypto.so.1.1.0e)
-==14299== by 0x4011232: _dl_fini (dl-fini.c:235)
-==14299== by 0x5DC2DC7: __run_exit_handlers (exit.c:83)
-==14299== by 0x5DC2E19: exit (exit.c:105)
-==14299== by 0x5DA8604: (below main) (libc-start.c:329)
-==14299== Address 0x6585590 is 0 bytes inside a block of size 40 free'd
-==14299== at 0x4C2FCC8: free (vg_replace_malloc.c:530)
-==14299== by 0x4E43381: sk_SSL_COMP_free (ssl.h:830)
-==14299== by 0x4E434E7: internal_idevice_deinit (idevice.c:103)
-==14299== by 0x5B79643: __pthread_once_slow (pthread_once.c:116)
-==14299== by 0x4E5663A: thread_once (thread.c:104)
-==14299== by 0x4E43525: libimobiledevice_deinitialize (idevice.c:140)
-==14299== by 0x4011232: _dl_fini (dl-fini.c:235)
-==14299== by 0x5DC2DC7: __run_exit_handlers (exit.c:83)
-==14299== by 0x5DC2E19: exit (exit.c:105)
-==14299== by 0x5DA8604: (below main) (libc-start.c:329)
-==14299== Block was alloc'd at
-==14299== at 0x4C2EB1B: malloc (vg_replace_malloc.c:299)
-==14299== by 0x5428908: CRYPTO_zalloc (mem.c:100)
-==14299== by 0x547A9AE: OPENSSL_sk_new (stack.c:108)
-==14299== by 0x5087D43: sk_SSL_COMP_new (ssl.h:830)
-==14299== by 0x5087D43: do_load_builtin_compressions (ssl_ciph.c:482)
-==14299== by 0x5087D43: do_load_builtin_compressions_ossl_ (ssl_ciph.c:476)
-==14299== by 0x5B79643: __pthread_once_slow (pthread_once.c:116)
-==14299== by 0x547B198: CRYPTO_THREAD_run_once (threads_pthread.c:106)
-==14299== by 0x5089F96: load_builtin_compressions (ssl_ciph.c:500)
-==14299== by 0x5089F96: SSL_COMP_get_compression_methods (ssl_ciph.c:1845)
-==14299== by 0x508B68B: ossl_init_ssl_base (ssl_init.c:125)
-==14299== by 0x508B68B: ossl_init_ssl_base_ossl_ (ssl_init.c:25)
-==14299== by 0x5B79643: __pthread_once_slow (pthread_once.c:116)
-==14299== by 0x547B198: CRYPTO_THREAD_run_once (threads_pthread.c:106)
-==14299== by 0x508B90A: OPENSSL_init_ssl (ssl_init.c:227)
-==14299== by 0x4E43416: internal_idevice_init (idevice.c:73)
-=
-
-Signed-off-by: Christophe Fergeau <cfergeau@redhat.com>
----
- src/idevice.c | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-(limited to 'src/idevice.c')
-
-diff --git a/src/idevice.c b/src/idevice.c
-index 913038e..d1f13cb 100644
---- a/src/idevice.c
-+++ b/src/idevice.c
-@@ -51,6 +51,14 @@
- #include "common/debug.h"
-
- #ifdef HAVE_OPENSSL
-+
-+#if OPENSSL_VERSION_NUMBER < 0x10002000L
-+static void SSL_COMP_free_compression_methods(void)
-+{
-+ sk_SSL_COMP_free(SSL_COMP_get_compression_methods());
-+}
-+#endif
-+
- static mutex_t *mutex_buf = NULL;
- static void locking_function(int mode, int n, const char* file, int line)
- {
-@@ -100,7 +108,7 @@ static void internal_idevice_deinit(void)
-
- EVP_cleanup();
- CRYPTO_cleanup_all_ex_data();
-- sk_SSL_COMP_free(SSL_COMP_get_compression_methods());
-+ SSL_COMP_free_compression_methods();
- #ifdef HAVE_ERR_REMOVE_THREAD_STATE
- ERR_remove_thread_state(NULL);
- #else
---
-cgit v1.1-32-gdbae
-
diff --git a/community/libimobiledevice/13bf235cac2201747de11652cf14fe2714ca0718.patch b/community/libimobiledevice/13bf235cac2201747de11652cf14fe2714ca0718.patch
deleted file mode 100644
index 55d004e6f5..0000000000
--- a/community/libimobiledevice/13bf235cac2201747de11652cf14fe2714ca0718.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Upstream: Yes
-From 13bf235cac2201747de11652cf14fe2714ca0718 Mon Sep 17 00:00:00 2001
-From: David Weinstein
-Date: Mon, 21 Mar 2016 17:45:59 -0400
-Subject: Fix SSL version negotiation for newer versions of OpenSSL
-
-Depending on the OpenSSL version (and custom distribution patches), `SSLv3_method()`
-would return NULL on some systems and also `SSLv23_method()` fails with some older
-iOS versions...
----
- src/idevice.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-(limited to 'src/idevice.c')
-
-diff --git a/src/idevice.c b/src/idevice.c
-index f2de6a3..1dcdae2 100644
---- a/src/idevice.c
-+++ b/src/idevice.c
-@@ -703,7 +703,7 @@ LIBIMOBILEDEVICE_API idevice_error_t idevice_connection_enable_ssl(idevice_conne
- }
- BIO_set_fd(ssl_bio, (int)(long)connection->data, BIO_NOCLOSE);
-
-- SSL_CTX *ssl_ctx = SSL_CTX_new(SSLv3_method());
-+ SSL_CTX *ssl_ctx = SSL_CTX_new(TLSv1_method());
- if (ssl_ctx == NULL) {
- debug_info("ERROR: Could not create SSL context.");
- BIO_free(ssl_bio);
---
-cgit v1.1-32-gdbae
-
diff --git a/community/opencl-icd-loader/ocl_icd_loader.c.patch b/community/opencl-icd-loader/ocl_icd_loader.c.patch
deleted file mode 100644
index 3ce6f8766e..0000000000
--- a/community/opencl-icd-loader/ocl_icd_loader.c.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/ocl_icd_loader.c.orig 2017-01-19 13:55:12 UTC
-+++ b/ocl_icd_loader.c
-@@ -53,7 +53,7 @@ int debug_ocl_icd_mask=0;
-
- typedef __typeof__(clGetPlatformInfo) *clGetPlatformInfo_fn;
-
--inline void dump_vendor_icd(const char* info, const struct vendor_icd *v) {
-+static inline void dump_vendor_icd(const char* info, const struct vendor_icd *v) {
- debug(D_DUMP, "%s %p={ num=%i, handle=%p, f=%p}\n", info,
- v, v->num_platforms, v->dl_handle, v->ext_fn_ptr);
- }
-