Hello community,

here is the log from the commit of package ca-certificates for openSUSE:Factory 
checked in at 2014-06-18 10:59:15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ca-certificates (Old)
 and      /work/SRC/openSUSE:Factory/.ca-certificates.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "ca-certificates"

Changes:
--------
--- /work/SRC/openSUSE:Factory/ca-certificates/ca-certificates.changes  
2014-05-10 08:32:46.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.ca-certificates.new/ca-certificates.changes     
2014-06-18 10:59:22.000000000 +0200
@@ -1,0 +2,5 @@
+Wed Jun  4 11:10:24 UTC 2014 - lnus...@suse.de
+
+- don't keep certificates with marker (bnc#875647)
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ ca-certificates.spec ++++++
--- /var/tmp/diff_new_pack.raIksr/_old  2014-06-18 10:59:23.000000000 +0200
+++ /var/tmp/diff_new_pack.raIksr/_new  2014-06-18 10:59:23.000000000 +0200
@@ -87,8 +87,13 @@
        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/
+       for cert in %{sslcerts}.rpmsave/*.pem; do
+               test -f "$cert" -a ! -L "$cert" || continue
+               read firstline < "$cert"
+               # skip package provided certificates (bnc#875647)
+               test "$firstline" != "# generated by openssl-certs, do not 
edit" || continue
+               cp -v -n "$cert" /etc/pki/trust/anchors/
+       done
 fi
 
 %post

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to