diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-support/ca-certificates/ca-certificates/update-ca-certificates-support-Toybox.patch | 34 | ||||
-rw-r--r-- | meta/recipes-support/ca-certificates/ca-certificates_20160104.bb | 1 |
2 files changed, 35 insertions, 0 deletions
diff --git a/meta/recipes-support/ca-certificates/ca-certificates/update-ca-certificates-support-Toybox.patch b/meta/recipes-support/ca-certificates/ca-certificates/update-ca-certificates-support-Toybox.patch new file mode 100644 index 0000000000..6e2171f758 --- /dev/null +++ b/meta/recipes-support/ca-certificates/ca-certificates/update-ca-certificates-support-Toybox.patch | |||
@@ -0,0 +1,34 @@ | |||
1 | From 30378026d136efa779732e3f6664e2ecf461e458 Mon Sep 17 00:00:00 2001 | ||
2 | From: Patrick Ohly <patrick.ohly@intel.com> | ||
3 | Date: Thu, 17 Mar 2016 12:38:09 +0100 | ||
4 | Subject: [PATCH] update-ca-certificates: support Toybox | ||
5 | |||
6 | "mktemp -t" is deprecated and does not work when using Toybox. Replace | ||
7 | with something that works also with Toybox. | ||
8 | |||
9 | Upstream-Status: Pending | ||
10 | |||
11 | Signed-off-by: Patrick Ohly <patrick.ohly@intel.com> | ||
12 | --- | ||
13 | sbin/update-ca-certificates | 6 +++--- | ||
14 | 1 file changed, 3 insertions(+), 3 deletions(-) | ||
15 | |||
16 | diff --git a/sbin/update-ca-certificates b/sbin/update-ca-certificates | ||
17 | index 79c41bb..ae9e3f1 100755 | ||
18 | --- a/sbin/update-ca-certificates | ||
19 | +++ b/sbin/update-ca-certificates | ||
20 | @@ -113,9 +113,9 @@ trap cleanup 0 | ||
21 | |||
22 | # Helper files. (Some of them are not simple arrays because we spawn | ||
23 | # subshells later on.) | ||
24 | -TEMPBUNDLE="$(mktemp -t "${CERTBUNDLE}.tmp.XXXXXX")" | ||
25 | -ADDED="$(mktemp -t "ca-certificates.tmp.XXXXXX")" | ||
26 | -REMOVED="$(mktemp -t "ca-certificates.tmp.XXXXXX")" | ||
27 | +TEMPBUNDLE="$(mktemp -p${TMPDIR:-/tmp} "${CERTBUNDLE}.tmp.XXXXXX")" | ||
28 | +ADDED="$(mktemp -p${TMPDIR:-/tmp} "ca-certificates.tmp.XXXXXX")" | ||
29 | +REMOVED="$(mktemp -p${TMPDIR:-/tmp} "ca-certificates.tmp.XXXXXX")" | ||
30 | |||
31 | # Adds a certificate to the list of trusted ones. This includes a symlink | ||
32 | # in /etc/ssl/certs to the certificate file and its inclusion into the | ||
33 | -- | ||
34 | 2.1.4 | ||
diff --git a/meta/recipes-support/ca-certificates/ca-certificates_20160104.bb b/meta/recipes-support/ca-certificates/ca-certificates_20160104.bb index 4266926033..e0f1939137 100644 --- a/meta/recipes-support/ca-certificates/ca-certificates_20160104.bb +++ b/meta/recipes-support/ca-certificates/ca-certificates_20160104.bb | |||
@@ -17,6 +17,7 @@ SRC_URI = "git://anonscm.debian.org/collab-maint/ca-certificates.git \ | |||
17 | file://0001-update-ca-certificates-remove-c-rehash.patch \ | 17 | file://0001-update-ca-certificates-remove-c-rehash.patch \ |
18 | file://0002-update-ca-certificates-use-SYSROOT.patch \ | 18 | file://0002-update-ca-certificates-use-SYSROOT.patch \ |
19 | file://0001-update-ca-certificates-don-t-use-Debianisms-in-run-p.patch \ | 19 | file://0001-update-ca-certificates-don-t-use-Debianisms-in-run-p.patch \ |
20 | file://update-ca-certificates-support-Toybox.patch \ | ||
20 | file://default-sysroot.patch \ | 21 | file://default-sysroot.patch \ |
21 | file://sbindir.patch" | 22 | file://sbindir.patch" |
22 | 23 | ||