- openssl rehash command does not exist as of openssl 1.0.2o, use c_rehash.sh script

- rel 2

diff --git a/ca-certificates.spec b/ca-certificates.spec
index 7156fb4f724ddfeb190b47eec0f6c5ce4b7cbed3..89cf46b810fbac5652a4ab4b2d793ae1389000dc 100644 (file)
--- a/ca-certificates.spec
+++ b/ca-certificates.spec
@@ -14,7 +14,7 @@ Summary(pl.UTF-8):    Pliki PEM popularnych certyfikatów CA
 Name:          ca-certificates
 %define        ver_date        20180409
 Version:       %{ver_date}
-Release:       1
+Release:       2
 License:       GPL v2 (scripts), MPL v2 (mozilla certs), distributable (other certs)
 Group:         Base
 Source0:       http://ftp.debian.org/debian/pool/main/c/ca-certificates/%{name}_%{version}.tar.xz
@@ -95,6 +95,7 @@ Patch2:               %{name}-etc-certs.patch
 
 Patch5:                %{name}-DESTDIR.patch
 Patch6:                %{name}.d.patch
+Patch7:                no-openssl-rehash.patch
 URL:           https://packages.debian.org/sid/ca-certificates
 BuildRequires: openssl-tools
 BuildRequires: python >= 1:2.6
@@ -143,6 +144,7 @@ Skrypt i dane do odświeżania bazy certyfikatów CA.
 
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 %{__sed} -i -e 's,@openssldir@,%{openssldir},' sbin/update-ca-certificates*
 

diff --git a/no-openssl-rehash.patch b/no-openssl-rehash.patch
new file mode 100644 (file)
index 0000000..bdd965b
--- /dev/null
+++ b/no-openssl-rehash.patch
@@ -0,0 +1,14 @@
+--- ca-certificates/sbin/update-ca-certificates~       2018-04-13 22:08:15.000000000 +0200
++++ ca-certificates/sbin/update-ca-certificates        2018-04-13 22:30:21.837942256 +0200
+@@ -185,9 +185,9 @@
+   # only run if set of files has changed
+   if [ "$verbose" = 0 ]
+   then
+-    openssl rehash . > /dev/null
++    c_rehash.sh . > /dev/null
+   else
+-    openssl rehash .
++    c_rehash.sh .
+   fi
+ fi
+