diff options
| -rw-r--r-- | groups/241.native_packages_inet.group | 2 | ||||
| -rw-r--r-- | vars/ca_certificates.vars | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/groups/241.native_packages_inet.group b/groups/241.native_packages_inet.group index b3a7c5ac..7e7b1c80 100644 --- a/groups/241.native_packages_inet.group +++ b/groups/241.native_packages_inet.group @@ -25,7 +25,7 @@ pacman proxytunnel rsync socat thttpd w3m weechat wget whois")"; : ${PKG_BIND_CONFIGURE_ARGS_EXTRA:="--with-libtool --disable-backtrace --with-eddsa=no --with-ecdsa=yes --with-gssapi=no --with-libxml2=no --with-libjson=no --with-openssl=${PREFIX_NATIVE} BUILD_CC=gcc"}; : ${PKG_BIND_MAKEFLAGS_BUILD:=-j1}; : ${PKG_CA_CERTIFICATES_DEPENDS:="libressl"}; -: ${PKG_CA_CERTIFICATES_URLS_GIT:="ca-certificates=https://github.com/Redfoxmoon3/ca-certificates@master"}; +: ${PKG_CA_CERTIFICATES_URLS_GIT:="ca-certificates=https://dev.midipix.org/distro/cacerts.git@main"}; : ${PKG_CA_CERTIFICATES_IN_TREE:=1}; : ${PKG_CA_CERTIFICATES_CFLAGS_BUILD_EXTRA:=-I${PREFIX_NATIVE}/include}; : ${PKG_CA_CERTIFICATES_LDFLAGS_BUILD_EXTRA:=-L${PREFIX_NATIVE}/lib}; diff --git a/vars/ca_certificates.vars b/vars/ca_certificates.vars index dc17ab65..f25b98ba 100644 --- a/vars/ca_certificates.vars +++ b/vars/ca_certificates.vars @@ -20,8 +20,7 @@ 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 + ETCCERTSDIR:/etc/ssl/certs/; do set -- $(rtl_llift "${_vspec}" : " "); _vname="${1}"; _vval="${2}"; sed -i"" -e's,^#define '"${_vname}"' ".\+"$,#define '"${_vname}"' "'"${PKG_DESTDIR%/}${_vval}"'",' update-ca.c; done; @@ -35,7 +34,6 @@ pkg_ca_certificates_host_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; }; |