meta: revert to using bearssl by default

23 files changed, 32 insertions, 5 deletions

diff --git a/extra/bearssl/build b/core/bearssl/build
index 21bbd789..21bbd789 100755
--- a/extra/bearssl/build
+++ b/core/bearssl/build
diff --git a/extra/bearssl/checksums b/core/bearssl/checksums
index cd6661bf..cd6661bf 100644
--- a/extra/bearssl/checksums
+++ b/core/bearssl/checksums
diff --git a/extra/bearssl/patches/0001-Add-missing-return-in-client-single-EC-choose-functi.patch b/core/bearssl/patches/0001-Add-missing-return-in-client-single-EC-choose-functi.patch
index 421bbc7f..421bbc7f 100644
--- a/extra/bearssl/patches/0001-Add-missing-return-in-client-single-EC-choose-functi.patch
+++ b/core/bearssl/patches/0001-Add-missing-return-in-client-single-EC-choose-functi.patch
diff --git a/extra/bearssl/patches/0002-Add-functions-to-retrieve-certificate-validity-perio.patch b/core/bearssl/patches/0002-Add-functions-to-retrieve-certificate-validity-perio.patch
index 8377da4d..8377da4d 100644
--- a/extra/bearssl/patches/0002-Add-functions-to-retrieve-certificate-validity-perio.patch
+++ b/core/bearssl/patches/0002-Add-functions-to-retrieve-certificate-validity-perio.patch
diff --git a/extra/bearssl/sources b/core/bearssl/sources
index 3d637087..3d637087 100644
--- a/extra/bearssl/sources
+++ b/core/bearssl/sources
diff --git a/extra/bearssl/version b/core/bearssl/version
index 28c26d58..28c26d58 100644
--- a/extra/bearssl/version
+++ b/core/bearssl/version
diff --git a/core/ca-certificates/build b/core/ca-certificates/build
new file mode 100755
index 00000000..0f8263d8
--- /dev/null
+++ b/core/ca-certificates/build
@@ -0,0 +1,3 @@
+#!/bin/sh -e
+
+install -Dm755 cert.sh "$1/usr/bin/update-certdata"
diff --git a/core/ca-certificates/checksums b/core/ca-certificates/checksums
new file mode 100644
index 00000000..ec462a46
--- /dev/null
+++ b/core/ca-certificates/checksums
@@ -0,0 +1 @@
+556ce672b222179d5a3e0a3c5fcce3126571d3d321701b0017244a0c879e50a4  cert.sh
diff --git a/core/ca-certificates/files/cert.sh b/core/ca-certificates/files/cert.sh
new file mode 100755
index 00000000..8ab33928
--- /dev/null
+++ b/core/ca-certificates/files/cert.sh
@@ -0,0 +1,15 @@
+#!/bin/sh -e
+#
+# update-certdata
+
+DEST="$CPT_ROOT/etc/certificates"
+
+[ -d "$DEST" ]  || mkdir -p "$DEST"
+
+[ -w "$DEST" ] || {
+    printf '%s\n' "${0##*/}: root required to update CA certificates." >&2
+    exit 1
+}
+
+wget https://curl.haxx.se/ca/cacert.pem -O "$DEST/cert.pem"
+printf '%s\n' "${0##*/}: updated cert.pem"
diff --git a/core/ca-certificates/post-install b/core/ca-certificates/post-install
new file mode 100755
index 00000000..8ee4d0ea
--- /dev/null
+++ b/core/ca-certificates/post-install
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+/usr/bin/update-certdata
diff --git a/core/ca-certificates/sources b/core/ca-certificates/sources
new file mode 100644
index 00000000..198fd03e
--- /dev/null
+++ b/core/ca-certificates/sources
@@ -0,0 +1 @@
+files/cert.sh
diff --git a/core/ca-certificates/version b/core/ca-certificates/version
new file mode 100644
index 00000000..82026115
--- /dev/null
+++ b/core/ca-certificates/version
@@ -0,0 +1 @@
+git 2
diff --git a/core/curl/build b/core/curl/build
index 2ef56a74..f27b1522 100755
--- a/core/curl/build
+++ b/core/curl/build
@@ -16,7 +16,9 @@
     --without-libpsl \
     --without-zstd \
     --with-pic \
-    --with-ssl
+    --with-bearssl \
+    --with-ca-bundle=/etc/certificates/cert.pem \
+    --without-ssl
 
 make curl_LDFLAGS=-all-static
 make DESTDIR="$1" install
diff --git a/core/curl/depends b/core/curl/depends
index 9ee911ae..cf6ff53d 100644
--- a/core/curl/depends
+++ b/core/curl/depends
@@ -1,2 +1,3 @@
-libressl
+bearssl
+ca-certificates
 zlib
diff --git a/core/curl/version b/core/curl/version
index a59a9334..db87252d 100644
--- a/core/curl/version
+++ b/core/curl/version
@@ -1 +1 @@
-7.72.0 3
+7.72.0 2
diff --git a/core/git/depends b/core/git/depends
index 7a3c084e..0a37ab16 100644
--- a/core/git/depends
+++ b/core/git/depends
@@ -1,4 +1,4 @@
+bearssl   make
 curl      make
-libressl  make
 pkgconf   make
 zlib      make
diff --git a/core/git/version b/core/git/version
index 1ab3a66b..3e2a9c0a 100644
--- a/core/git/version
+++ b/core/git/version
@@ -1 +1 @@
-2.28.0 2
+2.28.0 3
diff --git a/core/libressl/build b/extra/libressl/build
index 86ade623..86ade623 100755
--- a/core/libressl/build
+++ b/extra/libressl/build
diff --git a/core/libressl/checksums b/extra/libressl/checksums
index fe481445..fe481445 100644
--- a/core/libressl/checksums
+++ b/extra/libressl/checksums
diff --git a/core/libressl/files/update-certdata.sh b/extra/libressl/files/update-certdata.sh
index 611f944d..611f944d 100755
--- a/core/libressl/files/update-certdata.sh
+++ b/extra/libressl/files/update-certdata.sh
diff --git a/core/libressl/post-install b/extra/libressl/post-install
index f39088e7..f39088e7 100755
--- a/core/libressl/post-install
+++ b/extra/libressl/post-install
diff --git a/core/libressl/sources b/extra/libressl/sources
index 1dc98b16..1dc98b16 100644
--- a/core/libressl/sources
+++ b/extra/libressl/sources
diff --git a/core/libressl/version b/extra/libressl/version
index b7c90c2c..b7c90c2c 100644
--- a/core/libressl/version
+++ b/extra/libressl/version