mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-19 05:21:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

dev-libs/openssl: Apply CoreOS changes

Browse Source 
- Drop pkg_postinst.
  - Create /etc/ssl with tmpfiles (and package it for the SDK).
This commit is contained in:
Benjamin Gilbert 2019-11-08 19:46:24 -05:00 committed by Kai Lüke
parent 15a0f44519
commit 453b034ca5
2 changed files with 14 additions and 13 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

24
sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/openssl-1.0.2u.ebuild vendored
View File

@ -3,7 +3,7 @@
EAPI="7" EAPI="7"
inherit flag-o-matic toolchain-funcs multilib multilib-minimal inherit flag-o-matic toolchain-funcs multilib multilib-minimal systemd
# openssl-1.0.2-patches-1.6 contain additional CVE patches # openssl-1.0.2-patches-1.6 contain additional CVE patches
# which got fixed with this release. # which got fixed with this release.
@ -267,11 +267,6 @@ multilib_src_install_all() {
# twice; once with shared lib support enabled and once without. # twice; once with shared lib support enabled and once without.
use static-libs || rm -f "${ED}"/usr/lib*/lib*.a use static-libs || rm -f "${ED}"/usr/lib*/lib*.a
# create the certs directory
dodir ${SSL_CNF_DIR}/certs
cp -RP certs/* "${ED}"${SSL_CNF_DIR}/certs/ || die
rm -r "${ED}"${SSL_CNF_DIR}/certs/{demo,expired}
# 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 cd "${ED}"/usr/share/man
local m d s local m d s
@ -297,12 +292,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 # Don't keep the sample CA files and their ilk in /etc.
keepdir ${SSL_CNF_DIR}/private rm -r "${ED}"${SSL_CNF_DIR}
}
pkg_postinst() { # Save the default openssl.cnf in /usr and link it into place.
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
# Package the tmpfiles.d setup for SDK bootstrapping.
systemd-tmpfiles --create --root="${ED}" "${FILESDIR}"/openssl.conf
} }