From patchwork Sun May 6 16:19:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Bark X-Patchwork-Id: 909340 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=barkynet.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=barkynet-com.20150623.gappssmtp.com header.i=@barkynet-com.20150623.gappssmtp.com header.b="n+94vBHL"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40f9vT6ST0z9s2k for ; Mon, 7 May 2018 02:20:05 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 49F4286D7E; Sun, 6 May 2018 16:20:02 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 8AFXCJtcBajU; Sun, 6 May 2018 16:20:00 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 8B39486B22; Sun, 6 May 2018 16:20:00 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id BD07A1C16D0 for ; Sun, 6 May 2018 16:19:59 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 6D53D86B22 for ; Sun, 6 May 2018 16:19:59 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id zE+Jml0Qvg5R for ; Sun, 6 May 2018 16:19:58 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by whitealder.osuosl.org (Postfix) with ESMTPS id DF6DB82684 for ; Sun, 6 May 2018 16:19:57 +0000 (UTC) Received: by mail-wm0-f66.google.com with SMTP id x12-v6so12829883wmc.0 for ; Sun, 06 May 2018 09:19:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=barkynet-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=8HE08WojW5cfdnmK22dH2w5+uwoSqFGs2aFTDdb6+GQ=; b=n+94vBHLBChubI1H9QlqF+MKKQx0QLSwpTbDcuB/eEdIjC3bWfEFZ2htCD+ZB0y9es QXBqbOIBRsE94eVv/Rx5j8O62PUvaM+jAVGtuFGdUUraMTHvh1pivenn1DzSiChX1RV4 KIefPdDUSelacxxu9Wjw3wJM5VYnj6CUGTdD4wSB+X/58+niyKPx0Tl5uFfFmtINnYAd nFpEEARsrsgHXPsGXRqbKnXvw/wYfTLlhX1BV3+A06FfitPgoEnvMEc3n2kXcc9UxM9C zwe5M/WuAf+4OkS5zjMdxvWPesQ5F88U5PZ42Z/0cFhEJBxKgdsYj2RF8nf3Qd6cSVUQ uRlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=8HE08WojW5cfdnmK22dH2w5+uwoSqFGs2aFTDdb6+GQ=; b=Q3LPVMbpyQoxBRFb8wnV2MHmnunw4uhLR4e49MTt8KtJGGsnlG7MxhJEy70EvWm4PH qBqck3zdM6x+Xt66x9xYOu8UB3MFPC8qA1+thS9hkmBg+KIM+LZqsaZTzldvrl9USvfh NNzITV5qYj/qQQEXx/M7bhCimeawgSpR7xM+DZlPdoGfcMT8fXblmeTYXyxVSf8Tvbk6 6ZIjmxcnt/B42DwynyfSEGQTfqZaIpR16nRfUiTSQUXeXyFnId2d4LiCxv4LFX20zG91 tIcAy6X3egCkqigXvBafIAj0rWXmKri/sw80d8Gjmz8IuxUsBj6ljGrUWcmbYdesVrej RwkQ== X-Gm-Message-State: ALQs6tBB/qu0hQvkyLHfEGNiZH86dpvg9dCYpUlYOK7+JBpEgCwVOlkK 2b7QtV/KaC8SIbyWOdiHpxb67wa7wYQ= X-Google-Smtp-Source: AB8JxZplOjklTA9+QwKFsf1ohBDz/OmFxDQPkjc7fB1YxQC1GK2jRdKfyh1BSVhCOOsNQw97Fh2lGQ== X-Received: by 10.28.166.9 with SMTP id p9mr23143745wme.146.1525623595910; Sun, 06 May 2018 09:19:55 -0700 (PDT) Received: from sideshow.home.barkynet.com (barkynet.plus.com. [80.229.219.126]) by smtp.googlemail.com with ESMTPSA id 60-v6sm19357131wrj.62.2018.05.06.09.19.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 06 May 2018 09:19:55 -0700 (PDT) From: Martin Bark To: buildroot@buildroot.org Date: Sun, 6 May 2018 17:19:43 +0100 Message-Id: <20180506161944.7451-1-martin@barkynet.com> X-Mailer: git-send-email 2.17.0 Subject: [Buildroot] [PATCH 1/2] package/ca-certificates: don't hash certificates.crt X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Martin Bark MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Copy certificates.crt to /etc/ssl/certs after we run c_rehash to prevent it getting hashed by mistake. Signed-off-by: Martin Bark --- package/ca-certificates/ca-certificates.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/package/ca-certificates/ca-certificates.mk b/package/ca-certificates/ca-certificates.mk index cb0e961465..b99e6f47ca 100644 --- a/package/ca-certificates/ca-certificates.mk +++ b/package/ca-certificates/ca-certificates.mk @@ -30,14 +30,20 @@ define CA_CERTIFICATES_INSTALL_TARGET_CMDS # Create symlinks to certificates under /etc/ssl/certs # and generate the bundle + rm -f $(@D)/ca-certificates.crt cd $(TARGET_DIR) ;\ for i in `find usr/share/ca-certificates -name "*.crt"` ; do \ ln -sf ../../../$$i etc/ssl/certs/`basename $${i} .crt`.pem ;\ - cat $$i >>etc/ssl/certs/ca-certificates.crt ;\ + cat $$i >>$(@D)/ca-certificates.crt ;\ done # Create symlinks to the certificates by their hash values $(HOST_DIR)/bin/c_rehash $(TARGET_DIR)/etc/ssl/certs + + # Install the certificates bundle we just created + $(INSTALL) -D -m 644 $(@D)/ca-certificates.crt \ + $(TARGET_DIR)/etc/ssl/certs/ca-certificates.crt + endef $(eval $(generic-package))