commit: e6ebf3224ce898d9c55c0fe3fc29a47fe17a6906 Author: Boleyn Su <boleyn.su <AT> gmail <DOT> com> AuthorDate: Tue Dec 1 09:50:15 2020 +0000 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> CommitDate: Fri Dec 18 20:06:25 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6ebf322
Fix postinst script of sys-apps/baselayout-java The old postinst will not work for binpkg. This CL fixes it. Closes: https://bugs.gentoo.org/757837 Signed-off-by: Boleyn Su <boleynsu <AT> google.com> Closes: https://github.com/gentoo/gentoo/pull/18469 Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> sys-apps/baselayout-java/baselayout-java-0.1.0-r1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-apps/baselayout-java/baselayout-java-0.1.0-r1.ebuild b/sys-apps/baselayout-java/baselayout-java-0.1.0-r1.ebuild index 23ba5272869..803fe0c5eac 100644 --- a/sys-apps/baselayout-java/baselayout-java-0.1.0-r1.ebuild +++ b/sys-apps/baselayout-java/baselayout-java-0.1.0-r1.ebuild @@ -28,7 +28,7 @@ src_install() { exeinto /etc/ca-certificates/update.d newexe - java-cacerts <<-_EOF_ #!/bin/sh - exec trust extract --overwrite --format=java-cacerts --filter=ca-anchors --purpose server-auth "${EROOT}"/etc/ssl/certs/java/cacerts + exec trust extract --overwrite --format=java-cacerts --filter=ca-anchors --purpose server-auth "${EPREFIX}/etc/ssl/certs/java/cacerts" _EOF_ } @@ -44,6 +44,6 @@ pkg_postinst() { # so jdk ebuilds can create symlink to in into security directory if [[ ! -f "${EROOT}"/etc/ssl/certs/java/cacerts ]]; then einfo "Generating java cacerts file from system ca-certificates" - "${EROOT}"/etc/ca-certificates/update.d/java-cacerts || die + trust extract --overwrite --format=java-cacerts --filter=ca-anchors --purpose server-auth "${EROOT}/etc/ssl/certs/java/cacerts" || die fi }
