packages: ca-certificates/ca-certificates-etc-certs.patch - avoid missing o...

baggins baggins at pld-linux.org
Tue Mar 23 11:32:20 CET 2010


Author: baggins                      Date: Tue Mar 23 10:32:20 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- avoid missing or duplicate .pem extension

---- Files affected:
packages/ca-certificates:
   ca-certificates-etc-certs.patch (1.7 -> 1.8) 

---- Diffs:

================================================================
Index: packages/ca-certificates/ca-certificates-etc-certs.patch
diff -u packages/ca-certificates/ca-certificates-etc-certs.patch:1.7 packages/ca-certificates/ca-certificates-etc-certs.patch:1.8
--- packages/ca-certificates/ca-certificates-etc-certs.patch:1.7	Tue Feb  9 15:16:16 2010
+++ packages/ca-certificates/ca-certificates-etc-certs.patch	Tue Mar 23 11:32:14 2010
@@ -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"
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ca-certificates/ca-certificates-etc-certs.patch?r1=1.7&r2=1.8&f=u



More information about the pld-cvs-commit mailing list