From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 69DFF1382C5 for ; Fri, 18 Dec 2020 20:06:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 97F62E090E; Fri, 18 Dec 2020 20:06:51 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7CF04E090E for ; Fri, 18 Dec 2020 20:06:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 80F2F33D0AF for ; Fri, 18 Dec 2020 20:06:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0D3E157 for ; Fri, 18 Dec 2020 20:06:49 +0000 (UTC) From: "Georgy Yakovlev" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Georgy Yakovlev" Message-ID: <1608321985.e6ebf3224ce898d9c55c0fe3fc29a47fe17a6906.gyakovlev@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/baselayout-java/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/baselayout-java/baselayout-java-0.1.0-r1.ebuild X-VCS-Directories: sys-apps/baselayout-java/ X-VCS-Committer: gyakovlev X-VCS-Committer-Name: Georgy Yakovlev X-VCS-Revision: e6ebf3224ce898d9c55c0fe3fc29a47fe17a6906 X-VCS-Branch: master Date: Fri, 18 Dec 2020 20:06:49 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: fbcb6d31-02cc-4901-b367-dd90c5b56dac X-Archives-Hash: f2770ba00d66afbe35c0cd919fe11167 commit: e6ebf3224ce898d9c55c0fe3fc29a47fe17a6906 Author: Boleyn Su gmail com> AuthorDate: Tue Dec 1 09:50:15 2020 +0000 Commit: Georgy Yakovlev gentoo 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 google.com> Closes: https://github.com/gentoo/gentoo/pull/18469 Signed-off-by: Georgy Yakovlev 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 }