From 526004a07ea4fc589273c8e6fc3fcda7354a3793b248ce0f6ca28b0e1e9d08d4 Mon Sep 17 00:00:00 2001 From: Ludwig Nussel Date: Thu, 8 May 2014 16:02:02 +0000 Subject: [PATCH] - copy custom pem files in /etc/ssl/certs to /etc/pki/anchors on update (bnc#875647) OBS-URL: https://build.opensuse.org/package/show/Base:System/ca-certificates?expand=0&rev=48 --- ca-certificates.changes | 6 ++++++ ca-certificates.spec | 6 +++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ca-certificates.changes b/ca-certificates.changes index 3d09a54..7aeaf80 100644 --- a/ca-certificates.changes +++ b/ca-certificates.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu May 8 15:41:43 UTC 2014 - lnussel@suse.de + +- copy custom pem files in /etc/ssl/certs to /etc/pki/anchors on + update (bnc#875647) + ------------------------------------------------------------------- Mon Apr 7 15:07:44 UTC 2014 - lnussel@suse.de diff --git a/ca-certificates.spec b/ca-certificates.spec index c3a8034..ddef270 100644 --- a/ca-certificates.spec +++ b/ca-certificates.spec @@ -41,7 +41,7 @@ Url: https://github.com/openSUSE/ca-certificates Requires: openssl Requires: p11-kit Requires: p11-kit-tools >= 0.19.3 -# needed for %post +# needed for post Requires(post): coreutils openssl p11-kit-tools Recommends: ca-certificates-mozilla # we need to obsolete openssl-certs to make sure it's files are @@ -85,6 +85,10 @@ install -D -m 644 /dev/null %{buildroot}/var/lib/ca-certificates/java-cacerts # migrate /etc/ssl/certs to a symlink if [ "$1" -ne 0 -a -d %{sslcerts} -a ! -L %{sslcerts} ]; then mv -T --backup=numbered %{sslcerts} %{sslcerts}.rpmsave && ln -s /var/lib/ca-certificates/pem %{sslcerts} + # copy custom pem files to new location (bnc#875647) + mkdir -p /etc/pki/trust/anchors + find %{sslcerts}.rpmsave -maxdepth 1 -name '*.pem' -type f -print0 | \ + xargs -0 --no-run-if-empty -n1 -I FILE cp -v -n FILE /etc/pki/trust/anchors/ fi %post