From 451e5cdd781fa068d6e89481e20ea375feb4bf95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Tue, 30 Nov 2021 14:25:44 +0700 Subject: [PATCH] ca-certificates: fix busybox mktemp compat Close: #34323 --- .../ca-certificates/patches/busybox-flags.patch | 14 ++++++++++++++ srcpkgs/ca-certificates/template | 4 ++-- 2 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/ca-certificates/patches/busybox-flags.patch diff --git a/srcpkgs/ca-certificates/patches/busybox-flags.patch b/srcpkgs/ca-certificates/patches/busybox-flags.patch new file mode 100644 index 00000000000..0f109e1b0bc --- /dev/null +++ b/srcpkgs/ca-certificates/patches/busybox-flags.patch @@ -0,0 +1,14 @@ +diff --git a/sbin/update-ca-certificates b/sbin/update-ca-certificates +--- a/work/sbin/update-ca-certificates ++++ b/work/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 -p "${TMPDIR:-/tmp}" "ca-certificates.tmp.XXXXXX")" ++REMOVED="$(mktemp -p "${TMPDIR:-/tmp}" "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 diff --git a/srcpkgs/ca-certificates/template b/srcpkgs/ca-certificates/template index d328fae1eb7..30b2c68d95d 100644 --- a/srcpkgs/ca-certificates/template +++ b/srcpkgs/ca-certificates/template @@ -1,6 +1,6 @@ # Template file for 'ca-certificates' pkgname=ca-certificates -version=20211016+3.71 +version=20211016+3.72 revision=1 _nss_version=${version#*+} bootstrap=yes @@ -16,7 +16,7 @@ homepage="https://wiki.mozilla.org/NSS:Root_certs" distfiles="${DEBIAN_SITE}/main/c/${pkgname}/${pkgname}_${version%+*}.tar.xz ${MOZILLA_SITE}/security/nss/releases/NSS_${_nss_version//\./_}_RTM/src/nss-${_nss_version}.tar.gz" checksum="2ae9b6dc5f40c25d6d7fe55e07b54f12a8967d1955d3b7b2f42ee46266eeef88 - 99acd315d9af35419cda4a6960f00a7d446bd231bd407174a7b07cb3dba0c253" + 6ea60a9ff113e493ea2ab25f41ea75a9fbd10af7903f26f703dac8680732d02e" post_extract() { cp ${FILESDIR}/* $build_wrksrc/mozilla