From 4b9f6341f0d0a890c6a112a1db077506a86f4fb8 Mon Sep 17 00:00:00 2001
From: Tristan Van Berkom <tristan.vanberkom@codethink.co.uk>
Date: Fri, 13 Nov 2015 14:40:55 +0900
Subject: Updated ca-certificates chunk

This patch uses the new upstream delta based on the 2015 default
certificates used by debian, and drops the delta which was used
to force an update-ca-certificates invokation at make install time.

Now we no longer run the update-ca-certificates at make install time
and only run it at system-integration time.

Change-Id: I0de520d64f45c64aa3d213b9099211b5ab8a50dd
---
 strata/core.morph                 |  4 ++--
 strata/core/ca-certificates.morph | 22 +++++++++-------------
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/strata/core.morph b/strata/core.morph
index dc6e6ecf..f531f84a 100644
--- a/strata/core.morph
+++ b/strata/core.morph
@@ -135,8 +135,8 @@ chunks:
 - name: ca-certificates
   morph: strata/core/ca-certificates.morph
   repo: upstream:ca-certificates
-  ref: e9b06b26d9e57444e74a5cb6beca3f12726fc3c6
-  unpetrify-ref: baserock/debian/20140325
+  ref: 642c21872876ce2f9ec323b1df44f1cd6c47e91c
+  unpetrify-ref: baserock/debian/20150426
   build-depends:
   - automake
   - python3
diff --git a/strata/core/ca-certificates.morph b/strata/core/ca-certificates.morph
index 195d45d4..0497b283 100644
--- a/strata/core/ca-certificates.morph
+++ b/strata/core/ca-certificates.morph
@@ -4,26 +4,22 @@ build-system: manual
 build-commands:
 - make
 install-commands:
+#
+# ca-certificates makefile does not properly take responsibility
+# for creating the paths it installs to
+#
 - mkdir -p "$DESTDIR"/usr/share/ca-certificates
 - mkdir -p "$DESTDIR"/usr/sbin
 - make DESTDIR="$DESTDIR" install
 - mkdir "$DESTDIR"/etc
-- |
-  cd "$DESTDIR"/usr/share/ca-certificates
-  find * -type f > "$DESTDIR"/etc/ca-certificates.conf
-#
-# The curl build requires some certificates to be present
-# at build time. Building curl without the certificates
-# installed results in a git which cannot use https.
 #
-# See: http://listmaster.pepperfish.net/pipermail/baserock-dev-baserock.org/2015-January/010419.html
+# We create the config with all certificates provided
+# by the debian package enabled. Some systems may want
+# to override the ca-certificates.conf file.
 #
 - |
-  export CERTSCONF="$DESTDIR/etc/ca-certificates.conf"
-  export CERTSDIR="$DESTDIR/usr/share/ca-certificates"
-  export ETCCERTSDIR="$DESTDIR/etc/ssl/certs"
-  mkdir -p "$ETCCERTSDIR"
-  ./sbin/update-ca-certificates
+  cd "$DESTDIR"/usr/share/ca-certificates
+  find * -type f > "$DESTDIR"/etc/ca-certificates.conf
 system-integration:
   ca-certificates-misc:
     00-update-ca-certs:
-- 
cgit v1.2.1