Hello community,

here is the log from the commit of package ca-certificates for openSUSE:Factory 
checked in at 2013-12-17 10:00:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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  
2013-10-17 13:59:30.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.ca-certificates.new/ca-certificates.changes     
2013-12-17 10:00:33.000000000 +0100
@@ -1,0 +2,6 @@
+Fri Dec  6 09:16:11 UTC 2013 - lnus...@suse.de
+
+- etc_ssl.run: fix typo
+- turn /etc/ssl/certs into a symlink to /var/lib/ca-certificates/pem
+
+-------------------------------------------------------------------

Old:
----
  ca-certificates-1_201310161709.tar.xz

New:
----
  ca-certificates-1_201312061005.tar.xz

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

Other differences:
------------------
++++++ ca-certificates.spec ++++++
--- /var/tmp/diff_new_pack.6ffsMF/_old  2013-12-17 10:00:34.000000000 +0100
+++ /var/tmp/diff_new_pack.6ffsMF/_new  2013-12-17 10:00:34.000000000 +0100
@@ -29,7 +29,7 @@
 %define ssletcdir %{_sysconfdir}/ssl
 %define cabundle  /var/lib/ca-certificates/ca-bundle.pem
 %define sslcerts  %{ssletcdir}/certs
-Version:        1_201310161709
+Version:        1_201312061005
 Release:        0
 Summary:        Utilities for system wide CA certificate installation
 License:        GPL-2.0+
@@ -69,17 +69,24 @@
 %make_install
 install -d m 755 %{buildroot}%{trustdir_cfg}/{anchors,blacklist}
 install -d m 755 %{buildroot}%{trustdir_static}/{anchors,blacklist}
-install -d m 755 %{buildroot}/etc/ssl/certs
+install -d m 755 %{buildroot}%{ssletcdir}
 install -d m 755 %{buildroot}/etc/ca-certificates/update.d
 install -d m 755 %{buildroot}%{_prefix}/lib/ca-certificates/update.d
 install -d m 755 %{buildroot}/var/lib/ca-certificates/pem
 install -d m 755 %{buildroot}/var/lib/ca-certificates/openssl
+ln -s /var/lib/ca-certificates/pem %{buildroot}%{sslcerts}
 %if %{with cabundle}
 install -D -m 644 /dev/null %{buildroot}/%{cabundle}
 ln -s %{cabundle} %{buildroot}%{ssletcdir}/ca-bundle.pem
 %endif
 install -D -m 644 /dev/null %{buildroot}/var/lib/ca-certificates/java-cacerts
 
+%pre
+# 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}
+fi
+
 %post
 if [ -s /etc/ca-certificates.conf ]; then
        while read line; do
@@ -114,7 +121,7 @@
 %dir %{trustdir_static}
 %dir %{trustdir_static}/anchors
 %dir %{trustdir_static}/blacklist
-%dir /etc/ssl/certs
+%sslcerts
 %ghost /var/lib/ca-certificates/java-cacerts
 %dir /etc/ca-certificates
 %dir /etc/ca-certificates/update.d

++++++ ca-certificates-1_201310161709.tar.xz -> 
ca-certificates-1_201312061005.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/ca-certificates-1_201310161709/etc_ssl.run 
new/ca-certificates-1_201312061005/etc_ssl.run
--- old/ca-certificates-1_201310161709/etc_ssl.run      2013-10-16 
17:09:27.000000000 +0200
+++ new/ca-certificates-1_201312061005/etc_ssl.run      2013-12-06 
10:05:00.000000000 +0100
@@ -84,8 +84,13 @@
        "help|h",
     ) or die "$!\n";
 
+$ENV{'P11_KIT_PEMDIR_HASH'} = 1;
 system("trust", "extract", "--purpose=server-auth", "--filter=ca-anchors", 
"--format=pem-directory", "-f", $pemdir) == 0 or die;
 
+# we are done if /etc/ssl/certs is a link pointing to 
/var/lib/ca-certificates/pem
+exit 0 if (-l $etccertsdir && readlink($etccertsdir) eq $pemdir);
+warn "Warning: $etccertsdir should be a link to $pemdir!\n";
+
 for my $f (<"$pemdir/*.pem">) {
        addcert($f);
 }
@@ -127,5 +132,5 @@
 if ($foundignored)
 {
        print STDERR "\n* = CA Certificates in /etc/ssl/certs are only seen by 
some legacy applications.
-To install CA-Certificates globally move them to /etc/pki/trust/ancors 
instead!\n";
+To install CA-Certificates globally move them to /etc/pki/trust/anchors 
instead!\n";
 }

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

Reply via email to