From patchwork Tue Feb 11 09:54:54 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Koen Kooi X-Patchwork-Id: 24443 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vb0-f69.google.com (mail-vb0-f69.google.com [209.85.212.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id AB4F9206FF for ; Tue, 11 Feb 2014 09:55:08 +0000 (UTC) Received: by mail-vb0-f69.google.com with SMTP id m10sf16834480vbh.0 for ; Tue, 11 Feb 2014 01:55:07 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:delivered-to:from:to:date :message-id:cc:subject:precedence:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:mime-version:sender :errors-to:x-original-sender:x-original-authentication-results :mailing-list:content-type:content-transfer-encoding; bh=waOdiEJWto+SjNCUKwDfD8Eb+6ja2cQUuXSX8vvORgw=; b=P/j9628LC3MbhCEqnbURz3AMLv5+jIIPRbrpyGA2zNg64h+xYOT4PuqlC7RXRUgYdM lDInFnEbXQcSqmGc4AsIAaktDtfhs88mnKHvy4YPmY3ipnMEypxY6H34vkXq23aqjTvt nffCopIhEyFPsc8Fz6637C6fk15fb+xkMEOvZKxkECinaThzELYCbi6mFQAoDmI+V368 DtAwGH8RQRUtbS/S2ajhmFJekJLT+MJ9op3CWsA9JkN2Og9YHDd40Hzm4N9F8SUu75IU q+P/hGJVVsD2EG/Ep8qMux6MQas7Sj3V0mV8tBS9UkUqroHXp6NIBc/WQb4HkYc9bd9Q Islw== X-Gm-Message-State: ALoCoQkvREhRR+vJEsRsL1GnH77V/EZsiP8pYuK2wXbXjaU/0398eFSNBuwler04rrxBIRuwzihL X-Received: by 10.236.92.202 with SMTP id j50mr12439206yhf.26.1392112507716; Tue, 11 Feb 2014 01:55:07 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.18.148 with SMTP id 20ls1623815qgf.89.gmail; Tue, 11 Feb 2014 01:55:07 -0800 (PST) X-Received: by 10.58.229.164 with SMTP id sr4mr27923032vec.18.1392112507620; Tue, 11 Feb 2014 01:55:07 -0800 (PST) Received: from mail-vb0-f43.google.com (mail-vb0-f43.google.com [209.85.212.43]) by mx.google.com with ESMTPS id f5si5193216vej.149.2014.02.11.01.55.07 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 11 Feb 2014 01:55:07 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.43 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.43; Received: by mail-vb0-f43.google.com with SMTP id p5so5603943vbn.2 for ; Tue, 11 Feb 2014 01:55:07 -0800 (PST) X-Received: by 10.52.170.3 with SMTP id ai3mr123604vdc.35.1392112507369; Tue, 11 Feb 2014 01:55:07 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.174.196 with SMTP id u4csp233795vcz; Tue, 11 Feb 2014 01:55:06 -0800 (PST) X-Received: by 10.68.135.137 with SMTP id ps9mr9545514pbb.160.1392112506177; Tue, 11 Feb 2014 01:55:06 -0800 (PST) Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id ek3si18404870pbd.265.2014.02.11.01.55.05 for ; Tue, 11 Feb 2014 01:55:06 -0800 (PST) Received-SPF: pass (google.com: domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Received: from mail.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 997DC6E99A; Tue, 11 Feb 2014 09:55:03 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-we0-f178.google.com (mail-we0-f178.google.com [74.125.82.178]) by mail.openembedded.org (Postfix) with ESMTP id 9A3BB6E99A for ; Tue, 11 Feb 2014 09:55:00 +0000 (UTC) Received: by mail-we0-f178.google.com with SMTP id q59so5356572wes.9 for ; Tue, 11 Feb 2014 01:55:01 -0800 (PST) X-Received: by 10.180.79.7 with SMTP id f7mr14262029wix.20.1392112500983; Tue, 11 Feb 2014 01:55:00 -0800 (PST) Received: from localhost ([2001:610:612:0:5e51:4fff:fec8:7c15]) by mx.google.com with ESMTPSA id d6sm44621069wic.9.2014.02.11.01.55.00 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Feb 2014 01:55:00 -0800 (PST) From: Koen Kooi To: openembedded-core@lists.openembedded.org Date: Tue, 11 Feb 2014 10:54:54 +0100 Message-Id: <1392112494-27144-1-git-send-email-koen.kooi@linaro.org> X-Mailer: git-send-email 1.8.4.2 Cc: Koen Kooi Subject: [OE-core] [PATCHv2] curl: fix https certificate problems X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: koen.kooi@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.43 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 point CA bundle to /etc/ssl/certs/ca-certificates.crt instead of using the buildhost location, Configure would look at the buildhost and hardcode the bundle location for there into the target. This leads to non-working https support. Also remove the empty and now useless curl-certs packages since it's empty and no ALLOW_EMPTY has been set. Apart from making https work again with curl cmdline this also fixes libcurl which means git can fetch https repos as well instead of erroring out. Signed-off-by: Koen Kooi --- meta/recipes-support/curl/curl_7.34.0.bb | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/meta/recipes-support/curl/curl_7.34.0.bb b/meta/recipes-support/curl/curl_7.34.0.bb index b49c6e4..aba6649 100644 --- a/meta/recipes-support/curl/curl_7.34.0.bb +++ b/meta/recipes-support/curl/curl_7.34.0.bb @@ -30,6 +30,7 @@ EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \ --enable-crypto-auth \ --disable-ldap \ --disable-ldaps \ + --with-ca-bundle=${sysconfdir}/ssl/certs/ca-certificates.crt \ ${CURLGNUTLS} \ " @@ -45,13 +46,10 @@ do_install_append() { oe_multilib_header curl/curlbuild.h } -PACKAGES =+ "${PN}-certs libcurl libcurl-dev libcurl-staticdev libcurl-doc" - -FILES_${PN}-certs = "${datadir}/curl/curl-*" -PACKAGE_ARCH_${PN}-certs = "all" +PACKAGES =+ "libcurl libcurl-dev libcurl-staticdev libcurl-doc" FILES_lib${BPN} = "${libdir}/lib*.so.*" -RRECOMMENDS_lib${BPN} += "${PN}-certs" +RRECOMMENDS_lib${BPN} += "ca-certificates" FILES_lib${BPN}-dev = "${includedir} \ ${libdir}/lib*.so \ ${libdir}/lib*.la \