mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
net-misc/curl: drop unused patches
Signed-off-by: Matt Jolly <kangie@gentoo.org>
This commit is contained in:
@@ -1,33 +0,0 @@
|
||||
https://github.com/curl/curl/commit/ff5091aa9f73802e894b1cbdf24ab84e103200e2
|
||||
From: Andy Pan <i@andypan.me>
|
||||
Date: Thu, 12 Dec 2024 12:48:56 +0000
|
||||
Subject: [PATCH] async-thread: avoid closing eventfd twice
|
||||
|
||||
When employing eventfd for socketpair, there is only one file
|
||||
descriptor. Closing that fd twice might result in fd corruption.
|
||||
Thus, we should avoid closing the eventfd twice, following the
|
||||
pattern in lib/multi.c.
|
||||
|
||||
Fixes #15725
|
||||
Closes #15727
|
||||
Reported-by: Christian Heusel
|
||||
---
|
||||
lib/asyn-thread.c | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/lib/asyn-thread.c b/lib/asyn-thread.c
|
||||
index a58e4b790494ab..32d496b107cb0a 100644
|
||||
--- a/lib/asyn-thread.c
|
||||
+++ b/lib/asyn-thread.c
|
||||
@@ -195,9 +195,11 @@ void destroy_thread_sync_data(struct thread_sync_data *tsd)
|
||||
* close one end of the socket pair (may be done in resolver thread);
|
||||
* the other end (for reading) is always closed in the parent thread.
|
||||
*/
|
||||
+#ifndef USE_EVENTFD
|
||||
if(tsd->sock_pair[1] != CURL_SOCKET_BAD) {
|
||||
wakeup_close(tsd->sock_pair[1]);
|
||||
}
|
||||
+#endif
|
||||
#endif
|
||||
memset(tsd, 0, sizeof(*tsd));
|
||||
}
|
||||
@@ -1,34 +0,0 @@
|
||||
From 6927ecf38cf3372d539c88479e97707d855de07e Mon Sep 17 00:00:00 2001
|
||||
From: Matt Jolly <kangie@gentoo.org>
|
||||
Date: Sun, 10 Nov 2024 08:51:02 +1000
|
||||
Subject: [PATCH] Update prefix patch for 8.11.0
|
||||
|
||||
---
|
||||
curl-config.in | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/curl-config.in b/curl-config.in
|
||||
index 2dc40ed..1876d6c 100644
|
||||
--- a/curl-config.in
|
||||
+++ b/curl-config.in
|
||||
@@ -147,7 +147,7 @@ while test "$#" -gt 0; do
|
||||
else
|
||||
CPPFLAG_CURL_STATICLIB=''
|
||||
fi
|
||||
- if test "X@includedir@" = 'X/usr/include'; then
|
||||
+ if test "X@includedir@" = "X@GENTOO_PORTAGE_EPREFIX@/usr/include"; then
|
||||
echo "${CPPFLAG_CURL_STATICLIB}"
|
||||
else
|
||||
echo "${CPPFLAG_CURL_STATICLIB}-I@includedir@"
|
||||
@@ -155,7 +155,7 @@ while test "$#" -gt 0; do
|
||||
;;
|
||||
|
||||
--libs)
|
||||
- if test "X@libdir@" != 'X/usr/lib' -a "X@libdir@" != 'X/usr/lib64'; then
|
||||
+ if test "X@libdir@" != "X@GENTOO_PORTAGE_EPREFIX@/usr/lib" -a "X@libdir@" != "X@GENTOO_PORTAGE_EPREFIX@/usr/lib64"; then
|
||||
CURLLIBDIR="-L@libdir@ "
|
||||
else
|
||||
CURLLIBDIR=''
|
||||
--
|
||||
2.47.0
|
||||
|
||||
Reference in New Issue
Block a user