From fbaf18d29b425483cdc6273d3f5ac59bd54f4e4d Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jeremy@system76.com>
Date: Thu, 27 Dec 2018 20:23:18 -0700
Subject: [PATCH] Cleanup curl patches
---
recipes/curl/01-no-nonblock.patch | 14 --------------
.../{02-redox-sys-select.patch => redox.patch} | 0
2 files changed, 14 deletions(-)
delete mode 100644 recipes/curl/01-no-nonblock.patch
rename recipes/curl/{02-redox-sys-select.patch => redox.patch} (100%)
diff --git a/recipes/curl/01-no-nonblock.patch b/recipes/curl/01-no-nonblock.patch
deleted file mode 100644
index e27622937..000000000
--- a/recipes/curl/01-no-nonblock.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ruw source/lib/nonblock.c source-new/lib/nonblock.c
---- source/lib/nonblock.c 2018-10-27 04:00:54.000000000 -0600
-+++ source-new/lib/nonblock.c 2018-12-10 12:40:21.350755609 -0700
-@@ -47,7 +47,7 @@
- int curlx_nonblock(curl_socket_t sockfd, /* operate on this */
- int nonblock /* TRUE or FALSE */)
- {
--#if defined(USE_BLOCKING_SOCKETS)
-+#if defined(USE_BLOCKING_SOCKETS) || defined(__redox__)
- (void)sockfd;
- (void)nonblock;
- return 0; /* returns success */
-Only in source-new/lib: nonblock.c.orig
-Only in source-new/lib: nonblock.c.rej
diff --git a/recipes/curl/02-redox-sys-select.patch b/recipes/curl/redox.patch
similarity index 100%
rename from recipes/curl/02-redox-sys-select.patch
rename to recipes/curl/redox.patch
--
GitLab