Gentoo Archives: gentoo-commits

From: Kristian Fiskerstrand <k_f@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-crypt/gnupg/
Date: Tue, 01 Nov 2016 21:40:44
Message-Id: 1478036432.b74dd1d6f9a4c6e443d0dc6eb32b8beef45b56cb.k_f@gentoo
1 commit: b74dd1d6f9a4c6e443d0dc6eb32b8beef45b56cb
2 Author: Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
3 AuthorDate: Tue Nov 1 21:40:17 2016 +0000
4 Commit: Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
5 CommitDate: Tue Nov 1 21:40:32 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b74dd1d6
7
8 app-crypt/gnupg: Followup fix to making system-cert-store default
9
10 Make sure that setting system-cert-store adds the bitflag for _TRUST_SYS
11 in addition to TRUST_DEF in order for hkp-cacert to still function
12
13 Package-Manager: portage-2.3.2
14
15 app-crypt/gnupg/gnupg-2.1.15-r1.ebuild | 2 +-
16 1 file changed, 1 insertion(+), 1 deletion(-)
17
18 diff --git a/app-crypt/gnupg/gnupg-2.1.15-r1.ebuild b/app-crypt/gnupg/gnupg-2.1.15-r1.ebuild
19 index 4a0c067..db751a3 100644
20 --- a/app-crypt/gnupg/gnupg-2.1.15-r1.ebuild
21 +++ b/app-crypt/gnupg/gnupg-2.1.15-r1.ebuild
22 @@ -52,7 +52,7 @@ src_prepare() {
23 # This provides use of gnutls system cert store for hkps://
24 # Gentoo-Bug: 597934
25 if use system-cert-store; then
26 - sed -i 's/HTTP_FLAG_TRUST_DEF/HTTP_FLAG_TRUST_SYS/g' \
27 + sed -i 's/HTTP_FLAG_TRUST_DEF/HTTP_FLAG_TRUST_DEF | HTTP_FLAG_TRUST_SYS/g' \
28 "${S}/dirmngr/ks-engine-hkp.c" || die
29 einfo "Using system TLS certificate store"
30 fi