diff options
| author | Gunnar Beutner <gunnar@beutner.name> | 2021-04-12 18:27:09 +0200 |
|---|---|---|
| committer | Andreas Kling <kling@serenityos.org> | 2021-04-12 22:44:49 +0200 |
| commit | 84ad8a51d3236720f46b0309dc6be0b0321e8fc9 (patch) | |
| tree | ecf843560dac703e2cde4a1160e5595f3138cc53 | |
| parent | 317b2d7f9220d7cddc19e83a00f79da2159301a5 (diff) | |
| download | serenity-84ad8a51d3236720f46b0309dc6be0b0321e8fc9.zip | |
Ports: Link curl against openssl and disable non-blocking I/O
For some reason curl complains that SSL_connect() fails when
non-blocking I/O is enabled. With blocking I/O it works just
fine though.
| -rwxr-xr-x | Ports/curl/package.sh | 4 | ||||
| -rw-r--r-- | Ports/curl/patches/disable-nbio.patch | 14 |
2 files changed, 16 insertions, 2 deletions
diff --git a/Ports/curl/package.sh b/Ports/curl/package.sh index 7bdc5381b5..5665275432 100755 --- a/Ports/curl/package.sh +++ b/Ports/curl/package.sh @@ -2,11 +2,11 @@ port=curl version=7.65.3 useconfigure=true -configopts="--disable-threaded-resolver --disable-ipv6" +configopts="--disable-threaded-resolver --disable-ipv6 --disable-ntlm-wb" files="https://curl.se/download/curl-${version}.tar.bz2 curl-${version}.tar.bz2 https://curl.se/download/curl-${version}.tar.bz2.asc curl-${version}.tar.bz2.asc" -depends=zlib +depends="zlib openssl" auth_type="sig" auth_import_key="27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2" auth_opts="curl-${version}.tar.bz2.asc curl-${version}.tar.bz2" diff --git a/Ports/curl/patches/disable-nbio.patch b/Ports/curl/patches/disable-nbio.patch new file mode 100644 index 0000000000..3828f0fbcf --- /dev/null +++ b/Ports/curl/patches/disable-nbio.patch @@ -0,0 +1,14 @@ +diff -Naur curl-7.65.3/lib/nonblock.c curl-7.65.3.serenity/lib/nonblock.c +--- curl-7.65.3/lib/nonblock.c 2021-04-12 18:25:48.687757722 +0200 ++++ curl-7.65.3.serenity/lib/nonblock.c 2021-04-12 18:22:32.390375039 +0200 +@@ -39,6 +39,10 @@ + + #include "nonblock.h" + ++#ifdef __serenity__ ++#define USE_BLOCKING_SOCKETS ++#endif ++ + /* + * curlx_nonblock() set the given socket to either blocking or non-blocking + * mode based on the 'nonblock' boolean argument. This function is highly |