From patchwork Wed Sep 7 14:56:59 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Wurmus X-Patchwork-Id: 15374 Received: (qmail 114363 invoked by uid 89); 7 Sep 2016 14:57:31 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Checked: by ClamAV 0.99.2 on sourceware.org X-Virus-Found: No X-Spam-SWARE-Status: No, score=-3.0 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 spammy=UD:R, respected, HX-TM-AS-Product-Ver:sk:SMEX-11, Respect X-Spam-Status: No, score=-3.0 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on sourceware.org X-Spam-Level: X-HELO: lists.gnu.org Received: from lists.gnu.org (HELO lists.gnu.org) (208.118.235.17) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 07 Sep 2016 14:57:21 +0000 Received: from localhost ([::1]:41424 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bheHw-0000YN-1s for patchwork@sourceware.org; Wed, 07 Sep 2016 10:57:20 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37963) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bheHq-0000Y6-L5 for guix-devel@gnu.org; Wed, 07 Sep 2016 10:57:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bheHm-0006tI-Gt for guix-devel@gnu.org; Wed, 07 Sep 2016 10:57:13 -0400 Received: from sinope02.bbbm.mdc-berlin.de ([141.80.25.24]:35803) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bheHm-0006sv-74 for guix-devel@gnu.org; Wed, 07 Sep 2016 10:57:10 -0400 Received: from localhost (localhost [127.0.0.1]) by sinope02.bbbm.mdc-berlin.de (Postfix) with ESMTP id 448C62DA0B7 for ; Wed, 7 Sep 2016 16:57:07 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=mdc-berlin.de; h= content-type:content-type:mime-version:x-mailer:message-id:date :date:subject:subject:from:from:received:received:received; s= mdc; t=1473260222; x=1475074623; bh=9To7CyIa9Q+wLs4iwKFGwIRK44yQ ILjC5KEGmB5V/54=; b=JA238KxoPcRiZtKLI4XFZVVnMvMBiRV0j9m5fCCjFrva YSeore2wk98KZT1zNtS/Mmm72Jw/ztnH5LZQxjFKpkGDX813MyqKy2bq7mQdGdLQ cZNZSx2oU03fEsuU+0rJLSzceSKilygBpyGEUNMApGGmKVzSuJeYXosD8YbdT5s= X-Virus-Scanned: amavisd-new at mdc-berlin.de Received: from sinope02.bbbm.mdc-berlin.de ([127.0.0.1]) by localhost (sinope02.bbbm.mdc-berlin.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id hzQR6WNcWxzY for ; Wed, 7 Sep 2016 16:57:02 +0200 (CEST) Received: from HTCATWO.mdc-berlin.net (puck.citx.mdc-berlin.de [141.80.36.101]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by sinope02.bbbm.mdc-berlin.de (Postfix) with ESMTPS for ; Wed, 7 Sep 2016 16:57:02 +0200 (CEST) Received: from localhost (141.80.180.135) by HTCATWO.mdc-berlin.net (141.80.180.125) with Microsoft SMTP Server (TLS) id 14.3.294.0; Wed, 7 Sep 2016 16:57:01 +0200 From: Ricardo Wurmus To: Subject: [PATCH] gnu: r-curl: Respect CURL_CA_BUNDLE variable. Date: Wed, 7 Sep 2016 16:56:59 +0200 Message-ID: <20160907145659.7543-1-ricardo.wurmus@mdc-berlin.de> X-Mailer: git-send-email 2.9.3 MIME-Version: 1.0 X-Originating-IP: [141.80.180.135] X-TM-AS-Product-Ver: SMEX-11.0.0.4283-8.000.1202-22562.000 X-TM-AS-Result: No--2.141800-0.000000-31 X-TM-AS-MatchedID: 703786-704421-303277-105040-188019-706561-703788-704983-1 88198-701384-139705-148004-148036-42000-42003 X-TM-AS-User-Approved-Sender: Yes X-TM-AS-User-Blocked-Sender: No X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 141.80.25.24 X-BeenThere: guix-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+patchwork=sourceware.org@gnu.org Sender: "Guix-devel" * gnu/packages/web.scm (r-curl)[arguments]: Add phase "allow-CURL_CA_BUNDLE". --- gnu/packages/web.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 87bc3e2..321a250 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -3168,6 +3168,19 @@ applications.") (base32 "1p24bcaf1wbfdi1r9ibyyp0l0zp4kzs4g3srv8vikz93hycm1qa6")))) (build-system r-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; The environment variable CURL_CA_BUNDLE is only respected when + ;; running Windows, so we disable the platform checks. + (add-after 'unpack 'allow-CURL_CA_BUNDLE + (lambda _ + (substitute* "R/onload.R" + (("if \\(!grepl\\(\"mingw\".*") + "if (FALSE)\n")) + (substitute* "src/handle.c" + (("#ifdef _WIN32") "#if 1")) + #t))))) (inputs `(("libcurl" ,curl))) (home-page "https://github.com/jeroenooms/curl")