summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2021-02-20 15:45:46 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-02-23 22:35:01 +0000
commitc79cc7dcbec13e10a2a6750bbcd96142eb073829 (patch)
treef55165caf883a3311dd27721900200879f53e318 /meta
parent3fbe42a5f24dde19a33e350350276bf8d93f08ed (diff)
downloadpoky-c79cc7dcbec13e10a2a6750bbcd96142eb073829.tar.gz
ca-certificates: Clean up two patches and submit upstream
(From OE-Core rev: f3eabbb5c15fb55ae3d46b2377c09bb58226d965) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-support/ca-certificates/ca-certificates/sbindir.patch10
-rw-r--r--meta/recipes-support/ca-certificates/ca-certificates/update-ca-certificates-support-Toybox.patch21
2 files changed, 18 insertions, 13 deletions
diff --git a/meta/recipes-support/ca-certificates/ca-certificates/sbindir.patch b/meta/recipes-support/ca-certificates/ca-certificates/sbindir.patch
index a113fa8b15..f343ebf16e 100644
--- a/meta/recipes-support/ca-certificates/ca-certificates/sbindir.patch
+++ b/meta/recipes-support/ca-certificates/ca-certificates/sbindir.patch
@@ -1,6 +1,12 @@
1Upstream-Status: Pending 1sbin/Makefile: Allow the sbin path to be configurable
2 2
3Let us alter the install destination of the script via SBINDIR 3Some project sharing ca-certificates from Debian allow configuration
4of the installation location. Make the sbin location configurable.
5
6Also ensure the target directory exists
7
8Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
9Upstream-Status: Submitted [https://salsa.debian.org/debian/ca-certificates/-/merge_requests/5]
4 10
5--- ca-certificates-20130119.orig/sbin/Makefile 11--- ca-certificates-20130119.orig/sbin/Makefile
6+++ ca-certificates-20130119/sbin/Makefile 12+++ ca-certificates-20130119/sbin/Makefile
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 @@
1From 30378026d136efa779732e3f6664e2ecf461e458 Mon Sep 17 00:00:00 2001 1update-ca-certificates: Replace deprecated mktemp -t with mktemp --tmpdir
2From: Patrick Ohly <patrick.ohly@intel.com>
3Date: Thu, 17 Mar 2016 12:38:09 +0100
4Subject: [PATCH] update-ca-certificates: support Toybox
5 2
6"mktemp -t" is deprecated and does not work when using Toybox. Replace 3According to coreutils docs, mktemp -t is deprecated, switch to the
7with something that works also with Toybox. 4--tmpdir option instead.
8 5
9Upstream-Status: Pending 6Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
7Upstream-Status: Submitted [https://salsa.debian.org/debian/ca-certificates/-/merge_requests/5]
10 8
11Signed-off-by: Patrick Ohly <patrick.ohly@intel.com> 9[This was originally for compatibility with toybox but toybox now
10supports -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