mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-17 18:06:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

dev-libs/openssl: apply flatcar changes

Browse Source 
- drop `pkg_postint`
- create `/etc/ssl` with systemd-tmpfiles

Signed-off-by: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
This commit is contained in:
Mathieu Tortuyaux 2021-09-24 10:13:06 +02:00
parent ca192320b3
commit b3a9d297ee
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/files/openssl.conf vendored Normal file
View File

@ -0,0 +1,3 @@
d /etc/ssl - - - - -
d /etc/ssl/private 0700 - - - -
L /etc/ssl/openssl.cnf - - - - ../../usr/share/ssl/openssl.cnf

22
sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/openssl-3.0.0.ebuild vendored
View File

@ -3,7 +3,7 @@
EAPI="7" EAPI="7"
inherit flag-o-matic linux-info toolchain-funcs multilib-minimal inherit flag-o-matic linux-info toolchain-funcs multilib-minimal systemd
MY_P=${P/_/-} MY_P=${P/_/-}
@ -248,9 +248,6 @@ multilib_src_install_all() {
dodoc {AUTHORS,CHANGES,NEWS,README,README-PROVIDERS}.md doc/*.txt doc/${PN}-c-indent.el dodoc {AUTHORS,CHANGES,NEWS,README,README-PROVIDERS}.md doc/*.txt doc/${PN}-c-indent.el
# create the certs directory
keepdir ${SSL_CNF_DIR}/certs
# Namespace openssl programs to prevent conflicts with other man pages # Namespace openssl programs to prevent conflicts with other man pages
cd "${ED}"/usr/share/man || die cd "${ED}"/usr/share/man || die
local m d s local m d s
@ -282,12 +279,15 @@ multilib_src_install_all() {
dodir /etc/sandbox.d #254521 dodir /etc/sandbox.d #254521
echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
diropts -m0700 # flatcar changes: do not keep the sample CA files in `/etc`
keepdir ${SSL_CNF_DIR}/private rm -rf "${ED}"${SSL_CNF_DIR}
}
pkg_postinst() { # flatcar changes: save the default `openssl.cnf` in `/usr`
ebegin "Running 'c_rehash ${EROOT}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069" dodir /usr/share/ssl
c_rehash "${EROOT}${SSL_CNF_DIR}/certs" >/dev/null insinto /usr/share/ssl
eend $? doins "${S}"/apps/openssl.cnf
systemd_dotmpfilesd "${FILESDIR}"/openssl.conf
# flatcar changes: package `tmpfiles.d` setup for SDK bootstrapping.
systemd-tmpfiles --create --root="${ED}" "${FILESDIR}"/openssl.conf
} }