mirror of
https://github.com/RGBCube/serenity
synced 2025-07-26 08:27:45 +00:00
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.
This commit is contained in:
parent
317b2d7f92
commit
84ad8a51d3
2 changed files with 16 additions and 2 deletions
|
@ -2,11 +2,11 @@
|
||||||
port=curl
|
port=curl
|
||||||
version=7.65.3
|
version=7.65.3
|
||||||
useconfigure=true
|
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
|
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"
|
https://curl.se/download/curl-${version}.tar.bz2.asc curl-${version}.tar.bz2.asc"
|
||||||
|
|
||||||
depends=zlib
|
depends="zlib openssl"
|
||||||
auth_type="sig"
|
auth_type="sig"
|
||||||
auth_import_key="27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2"
|
auth_import_key="27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2"
|
||||||
auth_opts="curl-${version}.tar.bz2.asc curl-${version}.tar.bz2"
|
auth_opts="curl-${version}.tar.bz2.asc curl-${version}.tar.bz2"
|
||||||
|
|
14
Ports/curl/patches/disable-nbio.patch
Normal file
14
Ports/curl/patches/disable-nbio.patch
Normal file
|
@ -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
|
Loading…
Add table
Add a link
Reference in a new issue