From 5f3737927094f4d505c5fe00281ee0354ca38967 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz?= Date: Wed, 29 Apr 2020 19:35:15 +0100 Subject: groups/010.host_deps.group: adds ca_certificates_host (master.) vars/ca_certificates.vars:pkg_ca_certificates_install_make_pre(): copy ${PKG_DESTDIR} from ca_certificates_host. vars/ca_certificates_host.vars: apply temporary fixes. --- vars/ca_certificates.vars | 25 +++++++++++++++++++++++++ vars/ca_certificates_host.vars | 1 + 2 files changed, 26 insertions(+) create mode 120000 vars/ca_certificates_host.vars (limited to 'vars') diff --git a/vars/ca_certificates.vars b/vars/ca_certificates.vars index cd423ff8..dc17ab65 100644 --- a/vars/ca_certificates.vars +++ b/vars/ca_certificates.vars @@ -4,6 +4,7 @@ pkg_ca_certificates_install_make_pre() { "${PKG_DESTDIR}/../ca-certificates/certdata2pem_host"; + tar -C "${BUILD_WORKDIR}/ca_certificates_host-host-${PKG_TARGET}/destdir" -cpf - . | tar -C "${PKG_DESTDIR}" -xpf -; }; pkg_ca_certificates_install_make_post() { @@ -15,4 +16,28 @@ pkg_ca_certificates_install_make_post() { set -o noglob; }; +pkg_ca_certificates_host_configure_patch_post() { + local _vname="" _vspec="" _vval=""; + for _vspec in \ + CERTSCONF:/etc/ca-certificates.conf \ + ETCCERTSDIR:/etc/ssl/certs/ \ + RUNPARTSDIR:/etc/ca-certificates/update.d/; do + set -- $(rtl_llift "${_vspec}" : " "); _vname="${1}"; _vval="${2}"; + sed -i"" -e's,^#define '"${_vname}"' ".\+"$,#define '"${_vname}"' "'"${PKG_DESTDIR%/}${_vval}"'",' update-ca.c; + done; + sed -i"" -e's,^#define CERTSDIR ".\+"$,#define CERTSDIR "../../../usr/share/ca-certificates/",' update-ca.c; + sed -i"" -e's,^#define LOCALCERTSDIR ".\+"$,#define LOCALCERTSDIR "../../../usr/local/share/ca-certificates/",' update-ca.c; +}; + +pkg_ca_certificates_host_install_make_pre() { + pkg_ca_certificates_install_make_pre "${@}"; +}; + +pkg_ca_certificates_host_install_make_post() { + pkg_ca_certificates_install_make_post "${@}"; + sed -i"" -e's,^exec /usr/bin/c_rehash /etc/ssl/certs$,exec "'"${PKG_DESTDIR}/bin/c_rehash"'" "'"${PKG_DESTDIR}/etc/ssl/certs"'",' "${PKG_DESTDIR}/etc/ca-certificates/update.d/certhash"; + env LD_LIBRARY_PATH="${PKG_PREFIX}/lib" "${PKG_DESTDIR}/sbin/update-ca-certificates"; + set +o noglob; rtl_fileop rm "${PKG_DESTDIR}/bin"/* "${PKG_DESTDIR}/sbin"/*; set -o noglob; +}; + # vim:filetype=sh textwidth=0 diff --git a/vars/ca_certificates_host.vars b/vars/ca_certificates_host.vars new file mode 120000 index 00000000..242754d1 --- /dev/null +++ b/vars/ca_certificates_host.vars @@ -0,0 +1 @@ +ca_certificates.vars \ No newline at end of file -- cgit v1.2.3