diff options
| -rw-r--r-- | groups/010.host_deps.group | 20 | ||||
| -rw-r--r-- | vars/ca_certificates.vars | 25 | ||||
| l--------- | vars/ca_certificates_host.vars | 1 |
3 files changed, 39 insertions, 7 deletions
diff --git a/groups/010.host_deps.group b/groups/010.host_deps.group index 054e6ed6..addc6a0c 100644 --- a/groups/010.host_deps.group +++ b/groups/010.host_deps.group @@ -9,13 +9,13 @@ HOST_DEPS_GROUP_DEPENDS="host_tools"; HOST_DEPS_LDFLAGS_CONFIGURE="-L${PREFIX}/lib -Wl,-rpath,${PREFIX}/lib"; HOST_DEPS_MAKEFLAGS_INSTALL="prefix= PREFIX="; HOST_DEPS_PACKAGES=" -bison_host bmake_host bzip2_host chainport_host clang_host clzip_host -cmake_host dbus_glib_host dbus_host expat_host file_host flex_host -gdb_host gdbm_host glib_host gperf_host infounzip_host infozip_host -intltool_host libffi_host libreadline_host libressl_host libz_host -libzip_host llvm_host mdso_host mpackage_host musl_fts_host ncurses_host -ncursestw_host ncursesw_host pcre_host perk_host python2_host python3_host -ruby_host sqlite3_host texinfo_host tzdb_host xz_host"; +bison_host bmake_host bzip2_host ca_certificates_host chainport_host +clang_host clzip_host cmake_host dbus_glib_host dbus_host expat_host +file_host flex_host gdb_host gdbm_host glib_host gperf_host infounzip_host +infozip_host intltool_host libffi_host libreadline_host libressl_host +libz_host libzip_host llvm_host mdso_host mpackage_host musl_fts_host +ncurses_host ncursestw_host ncursesw_host pcre_host perk_host python2_host +python3_host ruby_host sqlite3_host texinfo_host tzdb_host xz_host"; HOST_DEPS_PREFIX="${PREFIX}"; : ${PKG_BISON_HOST_SHA256SUM:=55e4a023b1b4ad19095a5f8279f0dc048fa29f970759cea83224a6d5e7a3a641}; : ${PKG_BISON_HOST_VERSION:=3.5}; @@ -29,6 +29,12 @@ HOST_DEPS_PREFIX="${PREFIX}"; : ${PKG_BZIP2_HOST_IN_TREE:=1}; : ${PKG_BZIP2_HOST_MAKEFLAGS_BUILD_EXTRA:=-f Makefile-libbz2_so}; : ${PKG_BZIP2_HOST_MAKE_INSTALL_VNAME:=PREFIX}; +: ${PKG_CA_CERTIFICATES_HOST_DEPENDS:="libressl_host"}; +: ${PKG_CA_CERTIFICATES_HOST_URLS_GIT:="ca-certificates=https://github.com/Redfoxmoon3/ca-certificates@master"}; +: ${PKG_CA_CERTIFICATES_HOST_IN_TREE:=1}; +: ${PKG_CA_CERTIFICATES_HOST_CFLAGS_BUILD_EXTRA:=-I${PREFIX}/include}; +: ${PKG_CA_CERTIFICATES_HOST_LDFLAGS_BUILD_EXTRA:=-L${PREFIX}/lib}; +: ${PKG_CA_CERTIFICATES_HOST_ENV_VARS_EXTRA:="HOST_CC=gcc"}; : ${PKG_CHAINPORT_HOST_URLS_GIT:="chainport=${DEFAULT_GITROOT}/ports/chainport"}; : ${PKG_CHAINPORT_HOST_BUILD_STEPS_DISABLE:="build"}; : ${PKG_CHAINPORT_HOST_NO_LOG_VARS:=1}; 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 |