From: Jan Rękorajski <baggins@pld-linux.org>
Date: Tue, 23 Mar 2010 10:32:14 +0000 (+0000)
Subject: - avoid missing or duplicate .pem extension
X-Git-Tag: auto/th/ca-certificates-20090814-6~6
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fca-certificates.git;a=commitdiff_plain;h=d9b817d8c01bddfe211e78a7dc57829dd6dbd10f;ds=sidebyside

- avoid missing or duplicate .pem extension

Changed files:
    ca-certificates-etc-certs.patch -> 1.8
---

diff --git a/ca-certificates-etc-certs.patch b/ca-certificates-etc-certs.patch
index 41c2c43..85fb967 100644
--- a/ca-certificates-etc-certs.patch
+++ b/ca-certificates-etc-certs.patch
@@ -24,7 +24,7 @@
  add() {
    CERT="$1"
 -  PEM="$ETCCERTSDIR/$(basename "$CERT" .crt | sed -e 's/ /_/g' \
-+  PEM="$ETCCERTSDIR/$(basename "$CERT" | sed -e 's/.crt$/.pem/' -e 's/ /_/g' \
++  PEM="$ETCCERTSDIR/$(basename "$CERT" .pem | sed -e 's/.crt$/.pem/' -e 's/ /_/g' \
                                                    -e 's/[()]/=/g' \
                                                    -e 's/,/_/g').pem"
    if ! test -e "$PEM" || [ "$(readlink "$PEM")" != "$CERT" ]
@@ -33,7 +33,7 @@
  remove() {
    CERT="$1"
 -  PEM="$ETCCERTSDIR/$(basename "$CERT" .crt).pem"
-+  PEM="$ETCCERTSDIR/$(basename "$CERT" | sed 's/.crt$/.pem/')"
++  PEM="$ETCCERTSDIR/$(basename "$CERT" .pem | sed 's/.crt$/.pem/').pem"
    if test -L "$PEM"
    then
      rm -f "$PEM"