diff options
| author | Julien Cristau <jcristau@debian.org> | 2021-04-08 16:26:35 +0000 |
|---|---|---|
| committer | Julien Cristau <jcristau@debian.org> | 2021-04-08 16:26:35 +0000 |
| commit | f7ad3147ccf06d306fbe90601a9879fbd1e70cba (patch) | |
| tree | 5161cde90649c13c24870f6b01332c38f89a92b8 | |
| parent | 40474a99d28d1dc89a5f0eadfea1796678488e87 (diff) | |
| parent | 66951d3b45ffe24d182d36ec02d3ec7aee30ece7 (diff) | |
| download | ca-certificates-f7ad3147ccf06d306fbe90601a9879fbd1e70cba.tar.gz | |
Merge branch 'master' into 'master'
ca-certificates: Two small updates
See merge request debian/ca-certificates!5
| -rw-r--r-- | sbin/Makefile | 5 | ||||
| -rwxr-xr-x | sbin/update-ca-certificates | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/sbin/Makefile b/sbin/Makefile index a9658e7..1976cc3 100644 --- a/sbin/Makefile +++ b/sbin/Makefile @@ -3,9 +3,12 @@ # # +SBINDIR = /usr/sbin + all: clean: install: - install -m755 update-ca-certificates $(DESTDIR)/usr/sbin/ + install -d $(DESTDIR)$(SBINDIR) + install -m755 update-ca-certificates $(DESTDIR)$(SBINDIR)/ diff --git a/sbin/update-ca-certificates b/sbin/update-ca-certificates index 95fb1d9..789867f 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 -t "ca-certificates.tmp.XXXXXX")" -REMOVED="$(mktemp -t "ca-certificates.tmp.XXXXXX")" +ADDED="$(mktemp --tmpdir "ca-certificates.tmp.XXXXXX")" +REMOVED="$(mktemp --tmpdir "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 |