Update openssl dependency to >= 1.1.0

Switch to `openssl rehash` and drop usage of `c_rehash` script

5 files changed, 8 insertions, 6 deletions

diff --git a/debian/changelog b/debian/changelog
index 0f7aa82..d3d480d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -45,6 +45,8 @@ ca-certificates (20180329) UNRELEASED; urgency=medium
     Fix lintian file-contains-trailing-whitespace.
   * debian/{compat,control}:
     Set to debhelper compat 11.
+  * Update openssl dependency to >= 1.1.0 to support `openssl rehash` and drop
+    usage of `c_rehash` script.
 
   [ Thijs Kinkhorst ]
   * Remove Christian Perrier from uploaders at his request (closes: #894070).
diff --git a/debian/control b/debian/control
index 2522b7b..aa3368d 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Vcs-Browser: https://salsa.debian.org/debian/ca-certificates
 
 Package: ca-certificates
 Architecture: all
-Depends: openssl (>= 1.0.0), ${misc:Depends}
+Depends: openssl (>= 1.1.0), ${misc:Depends}
 Enhances: openssl
 Multi-Arch: foreign
 Breaks: ca-certificates-java (<<20121112+nmu1)
diff --git a/debian/rules b/debian/rules
index a935300..f86b929 100755
--- a/debian/rules
+++ b/debian/rules
@@ -60,7 +60,7 @@ install: build
 	install -d -m 0755 "$(CURDIR)/debian/ca-certificates-udeb/etc/ssl/certs"
 	(cd mozilla; \
 	 $(MAKE) install CERTSDIR="$(CURDIR)/debian/ca-certificates-udeb/etc/ssl/certs")
-	c_rehash -v "$(CURDIR)/debian/ca-certificates-udeb/etc/ssl/certs"
+	openssl rehash -compat -v "$(CURDIR)/debian/ca-certificates-udeb/etc/ssl/certs"
 
 # Build architecture-independent files here.
 binary-indep: build install
diff --git a/sbin/update-ca-certificates b/sbin/update-ca-certificates
index ac59ae9..2d553a5 100755
--- a/sbin/update-ca-certificates
+++ b/sbin/update-ca-certificates
@@ -174,9 +174,9 @@ then
   # only run if set of files has changed
   if [ "$verbose" = 0 ]
   then
-    c_rehash . > /dev/null
+    openssl rehash -compat . > /dev/null
   else
-    c_rehash .
+    openssl rehash -compat .
   fi
 fi
 
diff --git a/sbin/update-ca-certificates.8 b/sbin/update-ca-certificates.8
index a76541d..c60eab1 100644
--- a/sbin/update-ca-certificates.8
+++ b/sbin/update-ca-certificates.8
@@ -50,7 +50,7 @@ A summary of options is included below.
 Show summary of options.
 .TP
 .B \-v, \-\-verbose
-Be verbose. Output \fBc_rehash\fP.
+Be verbose. Output \fBopenssl rehash\fP.
 .TP
 .B \-f, \-\-fresh
 Fresh updates.  Remove symlinks in /etc/ssl/certs directory.
@@ -69,7 +69,7 @@ Directory of CA certificates.
 .I /usr/local/share/ca-certificates
 Directory of local CA certificates (with .crt extension).
 .SH SEE ALSO
-.BR c_rehash (1)
+.BR openssl (1)
 .SH AUTHOR
 This manual page was written by Fumitoshi UKAI <ukai@debian.or.jp>,
 for the Debian project (but may be used by others).