diff options
Diffstat (limited to 'meta/recipes-support/ca-certificates/ca-certificates/update-ca-certificates-support-Toybox.patch')
| -rw-r--r-- | meta/recipes-support/ca-certificates/ca-certificates/update-ca-certificates-support-Toybox.patch | 21 |
1 files changed, 10 insertions, 11 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 index 6e2171f758..f78790923c 100644 --- 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 | |||
| @@ -1,14 +1,13 @@ | |||
| 1 | From 30378026d136efa779732e3f6664e2ecf461e458 Mon Sep 17 00:00:00 2001 | 1 | update-ca-certificates: Replace deprecated mktemp -t with mktemp --tmpdir |
| 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 | 2 | ||
| 6 | "mktemp -t" is deprecated and does not work when using Toybox. Replace | 3 | According to coreutils docs, mktemp -t is deprecated, switch to the |
| 7 | with something that works also with Toybox. | 4 | --tmpdir option instead. |
| 8 | 5 | ||
| 9 | Upstream-Status: Pending | 6 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> |
| 7 | Upstream-Status: Submitted [https://salsa.debian.org/debian/ca-certificates/-/merge_requests/5] | ||
| 10 | 8 | ||
| 11 | Signed-off-by: Patrick Ohly <patrick.ohly@intel.com> | 9 | [This was originally for compatibility with toybox but toybox now |
| 10 | supports -t] | ||
| 12 | --- | 11 | --- |
| 13 | sbin/update-ca-certificates | 6 +++--- | 12 | sbin/update-ca-certificates | 6 +++--- |
| 14 | 1 file changed, 3 insertions(+), 3 deletions(-) | 13 | 1 file changed, 3 insertions(+), 3 deletions(-) |
| @@ -24,9 +23,9 @@ index 79c41bb..ae9e3f1 100755 | |||
| 24 | -TEMPBUNDLE="$(mktemp -t "${CERTBUNDLE}.tmp.XXXXXX")" | 23 | -TEMPBUNDLE="$(mktemp -t "${CERTBUNDLE}.tmp.XXXXXX")" |
| 25 | -ADDED="$(mktemp -t "ca-certificates.tmp.XXXXXX")" | 24 | -ADDED="$(mktemp -t "ca-certificates.tmp.XXXXXX")" |
| 26 | -REMOVED="$(mktemp -t "ca-certificates.tmp.XXXXXX")" | 25 | -REMOVED="$(mktemp -t "ca-certificates.tmp.XXXXXX")" |
| 27 | +TEMPBUNDLE="$(mktemp -p${TMPDIR:-/tmp} "${CERTBUNDLE}.tmp.XXXXXX")" | 26 | +TEMPBUNDLE="$(mktemp --tmpdir "${CERTBUNDLE}.tmp.XXXXXX")" |
| 28 | +ADDED="$(mktemp -p${TMPDIR:-/tmp} "ca-certificates.tmp.XXXXXX")" | 27 | +ADDED="$(mktemp --tmpdir "ca-certificates.tmp.XXXXXX")" |
| 29 | +REMOVED="$(mktemp -p${TMPDIR:-/tmp} "ca-certificates.tmp.XXXXXX")" | 28 | +REMOVED="$(mktemp --tmpdir "ca-certificates.tmp.XXXXXX")" |
| 30 | 29 | ||
| 31 | # Adds a certificate to the list of trusted ones. This includes a symlink | 30 | # 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 | 31 | # in /etc/ssl/certs to the certificate file and its inclusion into the |