mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-09 05:29:32 +00:00
Code Issues Projects Releases Wiki Activity

ca-certificates: Clean up two patches and submit upstream

Browse Source 
(From OE-Core rev: f3eabbb5c15fb55ae3d46b2377c09bb58226d965)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2021-02-20 15:45:46 +00:00
parent 3fbe42a5f2
commit c79cc7dcbe
2 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-support/ca-certificates/ca-certificates/sbindir.patch
+8 -2
View File
@@ -1,6 +1,12 @@
Upstream-Status: Pending sbin/Makefile: Allow the sbin path to be configurable
Let us alter the install destination of the script via SBINDIR Some project sharing ca-certificates from Debian allow configuration
of the installation location. Make the sbin location configurable.
Also ensure the target directory exists
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Upstream-Status: Submitted [https://salsa.debian.org/debian/ca-certificates/-/merge_requests/5]
--- ca-certificates-20130119.orig/sbin/Makefile --- ca-certificates-20130119.orig/sbin/Makefile
+++ ca-certificates-20130119/sbin/Makefile +++ ca-certificates-20130119/sbin/Makefile
meta/recipes-support/ca-certificates/ca-certificates/update-ca-certificates-support-Toybox.patch
+10 -11
View File
@@ -1,14 +1,13 @@
From 30378026d136efa779732e3f6664e2ecf461e458 Mon Sep 17 00:00:00 2001 update-ca-certificates: Replace deprecated mktemp -t with mktemp --tmpdir
From: Patrick Ohly <patrick.ohly@intel.com>
Date: Thu, 17 Mar 2016 12:38:09 +0100
Subject: [PATCH] update-ca-certificates: support Toybox
"mktemp -t" is deprecated and does not work when using Toybox. Replace According to coreutils docs, mktemp -t is deprecated, switch to the
with something that works also with Toybox. --tmpdir option instead.
Upstream-Status: Pending Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Upstream-Status: Submitted [https://salsa.debian.org/debian/ca-certificates/-/merge_requests/5]
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com> [This was originally for compatibility with toybox but toybox now
supports -t]
--- ---
sbin/update-ca-certificates | 6 +++--- sbin/update-ca-certificates | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-) 1 file changed, 3 insertions(+), 3 deletions(-)
@@ -24,9 +23,9 @@ index 79c41bb..ae9e3f1 100755
-TEMPBUNDLE="$(mktemp -t "${CERTBUNDLE}.tmp.XXXXXX")" -TEMPBUNDLE="$(mktemp -t "${CERTBUNDLE}.tmp.XXXXXX")"
-ADDED="$(mktemp -t "ca-certificates.tmp.XXXXXX")" -ADDED="$(mktemp -t "ca-certificates.tmp.XXXXXX")"
-REMOVED="$(mktemp -t "ca-certificates.tmp.XXXXXX")" -REMOVED="$(mktemp -t "ca-certificates.tmp.XXXXXX")"
+TEMPBUNDLE="$(mktemp -p${TMPDIR:-/tmp} "${CERTBUNDLE}.tmp.XXXXXX")" +TEMPBUNDLE="$(mktemp --tmpdir "${CERTBUNDLE}.tmp.XXXXXX")"
+ADDED="$(mktemp -p${TMPDIR:-/tmp} "ca-certificates.tmp.XXXXXX")" +ADDED="$(mktemp --tmpdir "ca-certificates.tmp.XXXXXX")"
+REMOVED="$(mktemp -p${TMPDIR:-/tmp} "ca-certificates.tmp.XXXXXX")" +REMOVED="$(mktemp --tmpdir "ca-certificates.tmp.XXXXXX")"
# Adds a certificate to the list of trusted ones. This includes a symlink # Adds a certificate to the list of trusted ones. This includes a symlink
# in /etc/ssl/certs to the certificate file and its inclusion into the # in /etc/ssl/certs to the certificate file and its inclusion into the