git: 051f1d77a957 - main - ftp/curl: Fix distinfo by adding the patch locally
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 22 Dec 2024 12:44:43 UTC
The branch main has been updated by sunpoet:
URL: https://cgit.FreeBSD.org/ports/commit/?id=051f1d77a9579ef4de5f408186fccbcb4fd75775
commit 051f1d77a9579ef4de5f408186fccbcb4fd75775
Author: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2024-12-22 12:44:21 +0000
Commit: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2024-12-22 12:44:21 +0000
ftp/curl: Fix distinfo by adding the patch locally
Reported by: diizzy
---
ftp/curl/Makefile | 3 ---
ftp/curl/distinfo | 4 +---
ftp/curl/files/patch-lib-asyn-thread.c | 16 ++++++++++++++++
3 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/ftp/curl/Makefile b/ftp/curl/Makefile
index 26a1ee93cde6..f42934c00a88 100644
--- a/ftp/curl/Makefile
+++ b/ftp/curl/Makefile
@@ -4,9 +4,6 @@ CATEGORIES= ftp net www
MASTER_SITES= https://curl.se/download/ \
https://github.com/curl/curl/releases/download/curl-${PORTVERSION:S|.|_|g}/
-PATCH_SITES= https://github.com/curl/curl/commit/
-PATCHFILES= ff5091aa9f73802e894b1cbdf24ab84e103200e2.patch:-p1
-
MAINTAINER= sunpoet@FreeBSD.org
COMMENT= Command line tool and library for transferring data with URLs
WWW= https://curl.se/ \
diff --git a/ftp/curl/distinfo b/ftp/curl/distinfo
index 0122660f4409..4383b3edb1d0 100644
--- a/ftp/curl/distinfo
+++ b/ftp/curl/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1734769461
+TIMESTAMP = 1734871121
SHA256 (curl-8.11.1.tar.xz) = c7ca7db48b0909743eaef34250da02c19bc61d4f1dcedd6603f109409536ab56
SIZE (curl-8.11.1.tar.xz) = 2751236
-SHA256 (ff5091aa9f73802e894b1cbdf24ab84e103200e2.patch) = 297a61cc260f4bf9e60e5b939e559d5e50df8484328f92d06ffcc256e538d998
-SIZE (ff5091aa9f73802e894b1cbdf24ab84e103200e2.patch) = 1074
diff --git a/ftp/curl/files/patch-lib-asyn-thread.c b/ftp/curl/files/patch-lib-asyn-thread.c
new file mode 100644
index 000000000000..1c74a41daa42
--- /dev/null
+++ b/ftp/curl/files/patch-lib-asyn-thread.c
@@ -0,0 +1,16 @@
+Obtained from: https://github.com/curl/curl/commit/ff5091aa9f73802e894b1cbdf24ab84e103200e2
+
+--- lib/asyn-thread.c.orig 2024-12-11 07:08:12 UTC
++++ lib/asyn-thread.c
+@@ -195,9 +195,11 @@ void destroy_thread_sync_data(struct thread_sync_data
+ * 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));
+ }