From: Jan Palus <atler@pld-linux.org>
Date: Fri, 12 Mar 2021 10:29:14 +0000 (+0100)
Subject: rediff patches; rel 3
X-Git-Tag: auto/th/ca-certificates-20210119-3
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fca-certificates.git;a=commitdiff_plain;h=4ab1fc5

rediff patches; rel 3
---

diff --git a/ca-certificates-etc-certs.patch b/ca-certificates-etc-certs.patch
index 8d25f7c..ecd9623 100644
--- a/ca-certificates-etc-certs.patch
+++ b/ca-certificates-etc-certs.patch
@@ -1,7 +1,7 @@
 --- ca-certificates-20140223/sbin/update-ca-certificates~	2014-03-14 12:55:24.000000000 +0200
 +++ ca-certificates-20140223/sbin/update-ca-certificates	2014-03-14 14:38:31.587876211 +0200
-@@ -37,7 +37,7 @@
- 
+@@ -37,8 +37,8 @@
+ default=0
  CERTSCONF=/etc/ca-certificates.conf
  CERTSDIR=/usr/share/ca-certificates
 -LOCALCERTSDIR=/usr/local/share/ca-certificates
@@ -9,7 +9,8 @@
 +LOCALCERTSDIR=/etc/certs
 +CERTBUNDLE=/etc/certs/ca-certificates.crt
  ETCCERTSDIR=@openssldir@
- cd $ETCCERTSDIR
+ HOOKSDIR=/etc/ca-certificates/update.d
+ 
 @@ -52,7 +52,7 @@
  
  # Helper files.  (Some of them are not simple arrays because we spawn
@@ -39,7 +40,7 @@
      rm -f "$PEM"
 @@ -111,24 +111,18 @@
  
- sed -e '/^$/d' -e '/^#/d' -e '/^!/d' $CERTSCONF | while read crt
+ sed -e '/^$/d' -e '/^#/d' -e '/^!/d' "$CERTSCONF" | while read crt
  do
 -  if ! test -f "$CERTSDIR/$crt"
 +  if test -f "$CERTSDIR/$crt"
diff --git a/ca-certificates-undebianize.patch b/ca-certificates-undebianize.patch
index 125661e..a7c4212 100644
--- a/ca-certificates-undebianize.patch
+++ b/ca-certificates-undebianize.patch
@@ -62,7 +62,7 @@
  A summary of options is included below.
  .TP
 @@ -53,13 +48,13 @@
- 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.
diff --git a/ca-certificates.d.patch b/ca-certificates.d.patch
index c8b9d3a..bb73b74 100644
--- a/ca-certificates.d.patch
+++ b/ca-certificates.d.patch
@@ -17,8 +17,8 @@
  LOCALCERTSDIR=${DESTDIR}${LOCALCERTSDIR}
  CERTBUNDLE=${DESTDIR}${CERTBUNDLE}
 @@ -105,25 +106,30 @@
- 
- echo -n "Updating certificates in $ETCCERTSDIR... "
+   done
+ fi
  
 -# Handle certificates that should be removed.  This is an explicit act
 -# by prefixing lines in the configuration files with exclamation marks (!).
diff --git a/ca-certificates.spec b/ca-certificates.spec
index 97dee1b..ebc634a 100644
--- a/ca-certificates.spec
+++ b/ca-certificates.spec
@@ -13,7 +13,7 @@ Summary(pl.UTF-8):	Pliki PEM popularnych certyfikatów CA
 Name:		ca-certificates
 %define	ver_date	20210119
 Version:	%{ver_date}
-Release:	2
+Release:	3
 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