rpm/ca-certificates
SHA256
1
0
Fork 0
forked from pool/ca-certificates
Code Pull Requests Activity

Accepting request 241323 from home:msmeissn:branches:Base:System

Browse Source 
- clarify the start order of the generators, as certbundle.run 
  semi-depends on etc_ssl.run via a timestamp. (bnc#883386)

OBS-URL: https://build.opensuse.org/request/show/241323
OBS-URL: https://build.opensuse.org/package/show/Base:System/ca-certificates?expand=0&rev=54
This commit is contained in:
Marcus Meissner 2014-07-17 10:05:13 +00:00 committed by Git OBS Bridge
parent 03e8c59b7a
commit 13421b9824
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ca-certificates.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Jul 17 09:51:16 UTC 2014 - meissner@suse.com
- clarify the start order of the generators, as certbundle.run
semi-depends on etc_ssl.run via a timestamp. (bnc#883386)
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jun 23 15:24:13 UTC 2014 - lnussel@suse.de Mon Jun 23 15:24:13 UTC 2014 - lnussel@suse.de

15
ca-certificates.spec
View File

@ -81,6 +81,13 @@ ln -s %{cabundle} %{buildroot}%{ssletcdir}/ca-bundle.pem
%endif %endif
install -D -m 644 /dev/null %{buildroot}/var/lib/ca-certificates/java-cacerts install -D -m 644 /dev/null %{buildroot}/var/lib/ca-certificates/java-cacerts
# should be done in git.
mv %{buildroot}/%{_prefix}/lib/ca-certificates/update.d/{,50}java.run
mv %{buildroot}/%{_prefix}/lib/ca-certificates/update.d/{,70}openssl.run
mv %{buildroot}/%{_prefix}/lib/ca-certificates/update.d/{,80}etc_ssl.run
# certbundle.run must be run after etc_ssl.run as it uses a timestamp from it
mv %{buildroot}/%{_prefix}/lib/ca-certificates/update.d/{,99}certbundle.run
%pre %pre
# migrate /etc/ssl/certs to a symlink # migrate /etc/ssl/certs to a symlink
if [ "$1" -ne 0 -a -d %{sslcerts} -a ! -L %{sslcerts} ]; then if [ "$1" -ne 0 -a -d %{sslcerts} -a ! -L %{sslcerts} ]; then
@ -141,14 +148,14 @@ rm -rf %{buildroot}
%dir /var/lib/ca-certificates/openssl %dir /var/lib/ca-certificates/openssl
%{_sbindir}/update-ca-certificates %{_sbindir}/update-ca-certificates
%{_mandir}/man8/update-ca-certificates.8* %{_mandir}/man8/update-ca-certificates.8*
%{_prefix}/lib/ca-certificates/update.d/java.run %{_prefix}/lib/ca-certificates/update.d/*java.run
%{_prefix}/lib/ca-certificates/update.d/etc_ssl.run %{_prefix}/lib/ca-certificates/update.d/*etc_ssl.run
%{_prefix}/lib/ca-certificates/update.d/openssl.run %{_prefix}/lib/ca-certificates/update.d/*openssl.run
# #
%if %{with cabundle} %if %{with cabundle}
%{ssletcdir}/ca-bundle.pem %{ssletcdir}/ca-bundle.pem
%ghost %{cabundle} %ghost %{cabundle}
%{_prefix}/lib/ca-certificates/update.d/certbundle.run %{_prefix}/lib/ca-certificates/update.d/*certbundle.run
%endif %endif
%changelog %changelog