Skip to content

Commit 20b3af3

Browse files
authored
Patch curl so that it builds without BinaryBuilder (#55290)
Also removes nss flag as NSS seems to have been removed from curl and I think the flag was dropped in https://github.com/curl/curl/pull/11459/files. Fixes #55286.
1 parent 9be0976 commit 20b3af3

File tree

2 files changed

+33
-2
lines changed

2 files changed

+33
-2
lines changed

deps/curl.mk

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ checksum-curl: $(SRCCACHE)/curl-$(CURL_VER).tar.bz2
3737
# Disable....almost everything
3838
CURL_CONFIGURE_FLAGS := $(CONFIGURE_COMMON) \
3939
--without-gnutls --without-libidn2 --without-librtmp \
40-
--without-nss --without-libpsl --without-libgsasl --without-fish-functions-dir \
40+
--without-libpsl --without-libgsasl --without-fish-functions-dir \
4141
--disable-ares --disable-manual --disable-ldap --disable-ldaps --disable-static \
4242
--without-gssapi --without-brotli
4343
# A few things we actually enable
@@ -57,7 +57,15 @@ CURL_TLS_CONFIGURE_FLAGS := --with-mbedtls=$(build_prefix)
5757
endif
5858
CURL_CONFIGURE_FLAGS += $(CURL_TLS_CONFIGURE_FLAGS)
5959

60-
$(BUILDDIR)/curl-$(CURL_VER)/build-configured: $(SRCCACHE)/curl-$(CURL_VER)/source-extracted
60+
$(SRCCACHE)/curl-$(CURL_VER)/curl-8.6.0-build.patch-applied: $(SRCCACHE)/curl-$(CURL_VER)/source-extracted
61+
cd $(dir $@) && \
62+
patch -p1 -f < $(SRCDIR)/patches/curl-8.6.0-build.patch
63+
echo 1 > $@
64+
65+
$(SRCCACHE)/curl-$(CURL_VER)/source-patched: $(SRCCACHE)/curl-$(CURL_VER)/curl-8.6.0-build.patch-applied
66+
echo 1 > $@
67+
68+
$(BUILDDIR)/curl-$(CURL_VER)/build-configured: $(SRCCACHE)/curl-$(CURL_VER)/source-patched
6169
mkdir -p $(dir $@)
6270
cd $(dir $@) && \
6371
$(dir $<)/configure $(CURL_CONFIGURE_FLAGS) \
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
From 5cc2b016c36aaf5a08e2feb7c068fca5bb0a8052 Mon Sep 17 00:00:00 2001
2+
From: Daniel Stenberg <[email protected]>
3+
Date: Mon, 5 Feb 2024 15:22:08 +0100
4+
Subject: [PATCH] md4: include strdup.h for the memdup proto
5+
6+
Reported-by: Erik Schnetter
7+
Fixes #12849
8+
Closes #12863
9+
---
10+
lib/md4.c | 1 +
11+
1 file changed, 1 insertion(+)
12+
13+
diff --git a/lib/md4.c b/lib/md4.c
14+
index 067c211e420afd..58dd1166cf924f 100644
15+
--- a/lib/md4.c
16+
+++ b/lib/md4.c
17+
@@ -28,6 +28,7 @@
18+
19+
#include <string.h>
20+
21+
+#include "strdup.h"
22+
#include "curl_md4.h"
23+
#include "warnless.h"

0 commit comments

Comments
 (0)