46 lines
1.7 KiB
Diff
46 lines
1.7 KiB
Diff
From c32d2e7154e242402f086b126dc439507813f173 Mon Sep 17 00:00:00 2001
|
|
From: Oliver Smith <osmith@sysmocom.de>
|
|
Date: Tue, 16 Nov 2021 08:38:47 +0100
|
|
Subject: [PATCH] Revert "update-ca-certificates: Replace deprecated mktemp -t
|
|
with mktemp --tmpdir"
|
|
|
|
This reverts commit 66951d3b45ffe24d182d36ec02d3ec7aee30ece7.
|
|
|
|
The busybox version we use doesn't support --tmpdir. Fix for:
|
|
|
|
root@sysmocom-alix:~# opkg upgrade
|
|
Not selecting udev 232 as installing it would break existing dependencies.
|
|
Configuring ca-certificates.
|
|
mktemp: unrecognized option '--tmpdir'
|
|
BusyBox v1.24.1 (2019-08-13 07:53:38 UTC) multi-call binary.
|
|
|
|
Usage: mktemp [-dt] [-p DIR] [TEMPLATE]
|
|
Collected errors:
|
|
* pkg_run_script: package "ca-certificates" postinst script returned status 1.
|
|
* opkg_configure: ca-certificates.postinst returned 1.
|
|
root@sysmocom-alix:~#
|
|
|
|
Related: SYS#5283
|
|
---
|
|
sbin/update-ca-certificates | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/sbin/update-ca-certificates b/sbin/update-ca-certificates
|
|
index 9a876d7..40a3932 100755
|
|
--- a/sbin/update-ca-certificates
|
|
+++ b/sbin/update-ca-certificates
|
|
@@ -81,8 +81,8 @@ trap cleanup 0
|
|
# Helper files. (Some of them are not simple arrays because we spawn
|
|
# subshells later on.)
|
|
TEMPBUNDLE="${ETCCERTSDIR}/${CERTBUNDLE}.new"
|
|
-ADDED="$(mktemp --tmpdir "ca-certificates.tmp.XXXXXX")"
|
|
-REMOVED="$(mktemp --tmpdir "ca-certificates.tmp.XXXXXX")"
|
|
+ADDED="$(mktemp -t "ca-certificates.tmp.XXXXXX")"
|
|
+REMOVED="$(mktemp -t "ca-certificates.tmp.XXXXXX")"
|
|
|
|
# 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
|
|
--
|
|
2.30.2
|
|
|