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 EF8D41395E1 for ; Tue, 1 Nov 2016 21:40:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 43156E0C2E; Tue, 1 Nov 2016 21:40:43 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 29D19E0C2E for ; Tue, 1 Nov 2016 21:40:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BE34B3413C7 for ; Tue, 1 Nov 2016 21:40:40 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 06BCA306 for ; Tue, 1 Nov 2016 21:40:39 +0000 (UTC) From: "Kristian Fiskerstrand" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Kristian Fiskerstrand" Message-ID: <1478036432.b74dd1d6f9a4c6e443d0dc6eb32b8beef45b56cb.k_f@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-crypt/gnupg/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-crypt/gnupg/gnupg-2.1.15-r1.ebuild X-VCS-Directories: app-crypt/gnupg/ X-VCS-Committer: k_f X-VCS-Committer-Name: Kristian Fiskerstrand X-VCS-Revision: b74dd1d6f9a4c6e443d0dc6eb32b8beef45b56cb X-VCS-Branch: master Date: Tue, 1 Nov 2016 21:40:39 +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-Archives-Salt: 199db00d-b2c6-4800-bde4-6257ac3f5bdd X-Archives-Hash: ed00108e9b6f5a00e30ef0eb0a62122e commit: b74dd1d6f9a4c6e443d0dc6eb32b8beef45b56cb Author: Kristian Fiskerstrand gentoo org> AuthorDate: Tue Nov 1 21:40:17 2016 +0000 Commit: Kristian Fiskerstrand gentoo 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