From patchwork Fri Jan 19 01:51:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Peter_M=C3=BCller?= X-Patchwork-Id: 1610 Return-Path: Received: from mail01.ipfire.org (unknown [172.28.1.200]) by web02.ipfire.org (Postfix) with ESMTP id 0179660334 for ; Thu, 18 Jan 2018 15:52:00 +0100 (CET) Received: from mail01.ipfire.org (localhost [IPv6:::1]) by mail01.ipfire.org (Postfix) with ESMTP id 90BAE4551; Thu, 18 Jan 2018 15:51:59 +0100 (CET) Received: from mx.link38.eu (mx.link38.eu [IPv6:2a03:4000:17:39a::1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mx.link38.eu", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4CCC74551 for ; Thu, 18 Jan 2018 15:51:56 +0100 (CET) X-Virus-Scanned: ClamAV at mx.link38.eu Received: from mx-fra.brokers.link38.eu (mx-fra.brokers.link38.eu [10.141.75.13]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx.link38.eu (Postfix) with ESMTPS id 939034014F for ; Thu, 18 Jan 2018 15:51:49 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx-fra.brokers.link38.eu (Postfix) with ESMTPSA id 58F859F284 for ; Thu, 18 Jan 2018 15:51:32 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=link38.eu; s=201711; t=1516287092; x=1579359092; bh=tQk2bfB4/BB8wt/78QtrCrViaDZum+aFL6J60EdkgEU=; h=Date:From:To:Subject:Message-ID:Content-Type:From:To:Subject:Date: Cc; b=y6mg0XfjASuXu2TP9nK3kwEjADRUBZdMr+zzPmFx2NgrEcYqTTmXDGUNYF+aeXTql pZuitncpEJ7SUvuCH5QOr0LPot/Pb+lzwj+MniRPgod/maKyU3jRoGEWZF4/ZDYti7 bbxzdoL3UCWc0OtBL5VWhtqJkN2amaQ6JSDyL3rydh6i21DE8+d5CwumD+sM+QNkqs j4E1rvf0jFdhNG2KuFqaDUX8xKHwbnlwFKqNJyXsa9vSEO3IO7SOfxR+OW1RIaSadi R06U/QqpizoJWE99Cjiak7gwOv7mR11zptN2ZgzVLRxAdCKwhucLydiq4zIAUtJjYj Ff6pHX87w/LMQ== Date: Thu, 18 Jan 2018 15:51:31 +0100 From: Peter =?utf-8?q?M=C3=BCller?= To: "development@lists.ipfire.org" Subject: [PATCH] ship updated CA bundle Message-ID: <20180118155131.3679fe76.peter.mueller@link38.eu> Organization: Link38 MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Add new generated CA bundle files to updater and remove accidentally inserted blank line at the end of certdata.txt . Signed-off-by: Peter Müller --- config/ca-certificates/certdata.txt | 1 - config/rootfiles/core/118/filelists/files | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/config/ca-certificates/certdata.txt b/config/ca-certificates/certdata.txt index d94a2c882..5d2baf3a5 100644 --- a/config/ca-certificates/certdata.txt +++ b/config/ca-certificates/certdata.txt @@ -23460,4 +23460,3 @@ CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_MUST_VERIFY_TRUST CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - diff --git a/config/rootfiles/core/118/filelists/files b/config/rootfiles/core/118/filelists/files index 162f586d3..127cd8cd7 100644 --- a/config/rootfiles/core/118/filelists/files +++ b/config/rootfiles/core/118/filelists/files @@ -1,5 +1,7 @@ etc/system-release etc/issue +etc/ssl/certs/ca-bundle.crt +etc/ssl/certs/ca-bundle.trust.crt etc/httpd/conf/loadmodule.conf etc/httpd/conf/vhosts.d/captive.conf etc/httpd/conf/vhosts.d/ipfire-interface-ssl.conf