up to 20190110

diff --git a/ca-certificates.spec b/ca-certificates.spec
index 67c873df0ff4b4dfbc13193e9e4828f51afa7b71..4f6102783b6b1df0d7bfbc119017c82c18556855 100644 (file)
--- a/ca-certificates.spec
+++ b/ca-certificates.spec
@@ -12,13 +12,13 @@
 Summary:       Common CA Certificates PEM files
 Summary(pl.UTF-8):     Pliki PEM popularnych certyfikatów CA
 Name:          ca-certificates
-%define        ver_date        20180409
+%define        ver_date        20190110
 Version:       %{ver_date}
-Release:       4
+Release:       1
 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
-# Source0-md5: 8425f4b1219e4e528db2de764e4c6586
+# Source0-md5: e91d3d9259127ba2dbb65fda58d73f31
 Source2:       http://www.certum.pl/keys/CA.pem
 # Source2-md5: 35610177afc9c64e70f1ce62c1885496
 Source3:       http://www.certum.pl/keys/level1.pem
@@ -137,7 +137,7 @@ Script and data for updating CA Certificates database.
 Skrypt i dane do odświeżania bazy certyfikatów CA.
 
 %prep
-%setup -q -n %{name}
+%setup -q
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1

diff --git a/no-openssl-rehash.patch b/no-openssl-rehash.patch
index bdd965b9340f38f4f2212c92c56dfb2756f18244..2ea0b2013d884ff2d394083434b657bf3109c764 100644 (file)
--- a/no-openssl-rehash.patch
+++ b/no-openssl-rehash.patch
@@ -1,13 +1,13 @@
 --- 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
+   done
    if [ "$verbose" = 0 ]
    then
 -    openssl rehash . > /dev/null
 +    c_rehash.sh . > /dev/null
    else
--    openssl rehash .
+-    openssl rehash -v .
 +    c_rehash.sh .
    fi
  fi