Import Debian version 20090701

[ca-certificates.git] / sbin / update-ca-certificates

diff --git a/sbin/update-ca-certificates b/sbin/update-ca-certificates
index 728e9099764456eb158fa88b0bc4ef0d3426414d..a34ef75b0ce8a15ee81f61c3773587dca523d9fa 100755 (executable)
--- a/sbin/update-ca-certificates
+++ b/sbin/update-ca-certificates
@@ -60,7 +60,9 @@ REMOVED="$(mktemp -t "ca-certificates.tmp.XXXXXX")"
 # bundle.
 add() {
   CERT="$1"
-  PEM="$ETCCERTSDIR/$(basename "$CERT" .crt).pem"
+  PEM="$ETCCERTSDIR/$(basename "$CERT" .crt | sed -e 's/ /_/g' \
+                                                  -e 's/[()]/=/g' \
+                                                  -e 's/,/_/g').pem"
   if ! test -e "$PEM" || [ "$(readlink "$PEM")" != "$CERT" ]
   then
     ln -sf "$CERT" "$PEM"
@@ -118,7 +120,7 @@ done
 # administrator.
 if [ -d "$LOCALCERTSDIR" ]
 then
-  find -L "$LOCALCERTSDIR" -type f | while read crt
+  find -L "$LOCALCERTSDIR" -type f -name '*.crt' | while read crt
   do
     add "$crt"
   done