commit:     b74dd1d6f9a4c6e443d0dc6eb32b8beef45b56cb
Author:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
AuthorDate: Tue Nov  1 21:40:17 2016 +0000
Commit:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
CommitDate: Tue Nov  1 21:40:32 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b74dd1d6

app-crypt/gnupg: Followup fix to making system-cert-store default

Make sure that setting system-cert-store adds the bitflag for _TRUST_SYS
in addition to TRUST_DEF in order for hkp-cacert to still function

Package-Manager: portage-2.3.2

 app-crypt/gnupg/gnupg-2.1.15-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-crypt/gnupg/gnupg-2.1.15-r1.ebuild 
b/app-crypt/gnupg/gnupg-2.1.15-r1.ebuild
index 4a0c067..db751a3 100644
--- a/app-crypt/gnupg/gnupg-2.1.15-r1.ebuild
+++ b/app-crypt/gnupg/gnupg-2.1.15-r1.ebuild
@@ -52,7 +52,7 @@ src_prepare() {
        # This provides use of gnutls system cert store for hkps://
        # Gentoo-Bug: 597934
        if use system-cert-store; then
-               sed -i 's/HTTP_FLAG_TRUST_DEF/HTTP_FLAG_TRUST_SYS/g' \
+               sed -i 's/HTTP_FLAG_TRUST_DEF/HTTP_FLAG_TRUST_DEF | 
HTTP_FLAG_TRUST_SYS/g' \
            "${S}/dirmngr/ks-engine-hkp.c" || die
                einfo "Using system TLS certificate store"
        fi

Reply via email to