From 9d6da397d02d5340ec2a4cf60e04297f831a6313 Mon Sep 17 00:00:00 2001 From: Erik Martin-Dorel Date: Sat, 5 Mar 2022 01:19:59 +0100 Subject: [PATCH] deps(opam): Bump `ssl` version * Necessary on macOS to avoid https://github.com/savonet/ocaml-ssl/issues/34 * See also https://github.com/savonet/ocaml-ssl/releases --- learn-ocaml-client.opam | 2 +- learn-ocaml-client.opam.locked | 2 +- learn-ocaml.opam | 2 +- learn-ocaml.opam.locked | 2 +- src/main/linking_flags.sh | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/learn-ocaml-client.opam b/learn-ocaml-client.opam index f9258a8c9..c3ce67ee8 100644 --- a/learn-ocaml-client.opam +++ b/learn-ocaml-client.opam @@ -41,7 +41,7 @@ depends: [ "ppxlib" "ppx_sexp_conv" "ppx_tools" - "ssl" {= "0.5.5"} + "ssl" {= "0.5.10"} "vg" ] build: [ diff --git a/learn-ocaml-client.opam.locked b/learn-ocaml-client.opam.locked index 8d39f9e11..31cebf6e9 100644 --- a/learn-ocaml-client.opam.locked +++ b/learn-ocaml-client.opam.locked @@ -95,7 +95,7 @@ depends: [ "seq" {= "0.2.2"} "sexplib" {= "v0.14.0"} "sexplib0" {= "v0.14.0"} - "ssl" {= "0.5.5"} + "ssl" {= "0.5.10"} "stdlib-shims" {= "0.3.0"} "stringext" {= "1.6.0"} "topkg" {= "1.0.3"} diff --git a/learn-ocaml.opam b/learn-ocaml.opam index 24c702087..ed9434bbf 100644 --- a/learn-ocaml.opam +++ b/learn-ocaml.opam @@ -58,7 +58,7 @@ depends: [ "ppx_tools" "ppx_tools_versioned" "re" - "ssl" {= "0.5.5"} + "ssl" {= "0.5.10"} "uutf" {>= "1.0" } "vg" "yojson" {>= "1.4.0" } diff --git a/learn-ocaml.opam.locked b/learn-ocaml.opam.locked index d0e09f545..a2d873be9 100644 --- a/learn-ocaml.opam.locked +++ b/learn-ocaml.opam.locked @@ -107,7 +107,7 @@ depends: [ "seq" {= "0.2.2"} "sexplib" {= "v0.14.0"} "sexplib0" {= "v0.14.0"} - "ssl" {= "0.5.5"} + "ssl" {= "0.5.10"} "stdlib-shims" {= "0.3.0"} "stringext" {= "1.6.0"} "topkg" {= "1.0.3"} diff --git a/src/main/linking_flags.sh b/src/main/linking_flags.sh index cbec663a2..6428ec12d 100755 --- a/src/main/linking_flags.sh +++ b/src/main/linking_flags.sh @@ -52,7 +52,7 @@ case $(uname -s) in Linux) case $(. /etc/os-release && echo $ID) in alpine) - COMMON_LIBS="camlstr ssl_threads_stubs ssl crypto cstruct_stubs bigstringaf_stubs lwt_unix_stubs unix c" + COMMON_LIBS="camlstr ssl_stubs ssl crypto cstruct_stubs bigstringaf_stubs lwt_unix_stubs unix c" # `m` and `pthread` are built-in musl echo2 '(-noautolink' echo2 ' -cclib -Wl,-Bstatic' @@ -68,7 +68,7 @@ case $(uname -s) in esac ;; Darwin) - COMMON_LIBS="camlstr ssl_threads_stubs /usr/local/opt/openssl/lib/libssl.a /usr/local/opt/openssl/lib/libcrypto.a cstruct_stubs bigstringaf_stubs lwt_unix_stubs unix" + COMMON_LIBS="camlstr ssl_stubs /usr/local/opt/openssl/lib/libssl.a /usr/local/opt/openssl/lib/libcrypto.a cstruct_stubs bigstringaf_stubs lwt_unix_stubs unix" # `m` and `pthread` are built-in in libSystem echo2 '(-noautolink' for l in $EXTRA_LIBS $COMMON_LIBS; do