From 6b39c9f172512a02cae72f09bad51500753ac369 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz=20=28arab=2C=20vx?= =?UTF-8?q?p=29?= Date: Mon, 14 May 2018 18:34:21 +0000 Subject: vars/build.vars:curl:${PKG_CONFIGURE_ARGS_EXTRA}: amend w/ --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt --with-ca-path=/etc/ssl/certs (via Redfoxmoon.) vars/ca_certificates.vars:pkg_install_make_post(): via Redfoxmoon. --- vars/build.vars | 2 +- vars/ca_certificates.vars | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/vars/build.vars b/vars/build.vars index 6b48b1b3..658d48a9 100644 --- a/vars/build.vars +++ b/vars/build.vars @@ -429,7 +429,7 @@ NATIVE_PACKAGES_DEPS_PYTHON="${PREFIX}/bin/python"; : ${PKG_CURL_SHA256SUM:=e44eaabdf916407585bf5c7939ff1161e6242b6b015d3f2f5b758b2a330461fc}; : ${PKG_CURL_VERSION:=7.59.0}; : ${PKG_CURL_URL:=https://curl.haxx.se/download/curl-${PKG_CURL_VERSION}.tar.xz}; -: ${PKG_CURL_CONFIGURE_ARGS_EXTRA:="--disable-symbol-hiding --enable-shared --with-ca-bundle=/etc/ca-bundle.crt --with-gnutls --without-ssl"}; +: ${PKG_CURL_CONFIGURE_ARGS_EXTRA:="--disable-symbol-hiding --enable-shared --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt --with-ca-path=/etc/ssl/certs --with-gnutls --without-ssl"}; : ${PKG_LIBZ_SHA256SUM:=abcc2831b7a0e891d0875fa852e9b9510b420d843d3d20aad010f65493fe4f7b}; : ${PKG_LIBZ_VERSION:=1.2.8.2015.12.26}; : ${PKG_LIBZ_URL:=https://sortix.org/libz/release/libz-${PKG_LIBZ_VERSION}.tar.gz}; diff --git a/vars/ca_certificates.vars b/vars/ca_certificates.vars index a5a92dd4..d43d5b78 100644 --- a/vars/ca_certificates.vars +++ b/vars/ca_certificates.vars @@ -6,4 +6,11 @@ pkg_ca_certificates_install_make_pre() { ${PKG_DESTDIR}/../ca-certificates/certdata2pem_host }; +pkg_ca_certificates_install_make_post() { + ex_rtl_fileop cd "${PKG_DESTDIR}/share/ca-certificates"; + set +o noglob + find . -name '*.crt' | sort | cut -b3- > ${PKG_DESTDIR}/etc/ca-certificates.conf + set -o noglob +}; + # vim:filetype=sh -- cgit v1.2.3