X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=ca-certificates-etc-certs.patch;h=0bbdbb31fa010bbcb2551dd76a3508475261d0c8;hb=3dc5e4eae9f7712ff80eb8da71c109e2b53efa48;hp=9ed3a0d6a5fe1cf3d7692bfc148adbebacb82597;hpb=2ce0e3af2227f9920bac76bcef8b5500741aff24;p=packages%2Fca-certificates.git

diff --git a/ca-certificates-etc-certs.patch b/ca-certificates-etc-certs.patch
index 9ed3a0d..0bbdbb3 100644
--- a/ca-certificates-etc-certs.patch
+++ b/ca-certificates-etc-certs.patch
@@ -1,20 +1,30 @@
---- ca-certificates/sbin/update-ca-certificates	2008-11-01 18:39:19.000000000 +0100
-+++ ca-certificates/sbin/update-ca-certificates-local	2008-11-01 19:17:39.138384960 +0100
+--- ca-certificates-20120212/sbin/update-ca-certificates~	2012-05-12 11:41:03.000000000 +0300
++++ ca-certificates-20120212/sbin/update-ca-certificates	2012-05-12 11:43:10.517657520 +0300
 @@ -37,7 +37,7 @@
  
  CERTSCONF=/etc/ca-certificates.conf
  CERTSDIR=/usr/share/ca-certificates
 -LOCALCERTSDIR=/usr/local/share/ca-certificates
+-CERTBUNDLE=ca-certificates.crt
 +LOCALCERTSDIR=/etc/certs
- CERTBUNDLE=ca-certificates.crt
- ETCCERTSDIR=/etc/openssl/certs
++CERTBUNDLE=/etc/certs/ca-certificates.crt
+ ETCCERTSDIR=@openssldir@
  cd $ETCCERTSDIR
+@@ -52,7 +52,7 @@
+ 
+ # Helper files.  (Some of them are not simple arrays because we spawn
+ # subshells later on.)
+-TEMPBUNDLE="$(mktemp -t "${CERTBUNDLE}.tmp.XXXXXX")"
++TEMPBUNDLE="$(mktemp "${CERTBUNDLE}.tmp.XXXXXX")"
+ ADDED="$(mktemp -t "ca-certificates.tmp.XXXXXX")"
+ REMOVED="$(mktemp -t "ca-certificates.tmp.XXXXXX")"
+ 
 @@ -62,7 +62,7 @@
  # bundle.
  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$//' -e 's/ /_/g' \
                                                    -e 's/[()]/=/g' \
                                                    -e 's/,/_/g').pem"
    if ! test -e "$PEM" || [ "$(readlink "$PEM")" != "$CERT" ]
@@ -23,10 +33,18 @@
  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"
    if test -L "$PEM"
    then
      rm -f "$PEM"
+@@ -89,6 +89,7 @@
+   do
+      case $(readlink $symlink) in
+      $CERTSDIR*) rm -f $symlink;;
++     $LOCALCERTSDIR*) rm -f $symlink;;
+      esac
+   done
+   find . -type l -print | while read symlink
 @@ -110,24 +110,18 @@
  
  sed -e '/^$/d' -e '/^#/d' -e '/^!/d' $CERTSCONF | while read crt
@@ -34,12 +52,12 @@
 -  if ! test -f "$CERTSDIR/$crt"
 +  if test -f "$CERTSDIR/$crt"
    then
+-    echo "W: $CERTSDIR/$crt not found, but listed in $CERTSCONF." >&2
 +    add "$CERTSDIR/$crt"
 +  elif test -f "$LOCALCERTSDIR/$crt"
 +  then
 +    add "$LOCALCERTSDIR/$crt"
 +  else
--    echo "W: $CERTSDIR/$crt not found, but listed in $CERTSCONF." >&2
 +    echo "W: $CERTSDIR/$crt or $LOCALCERTSDIR/$crt not found, but listed in $CERTSCONF." >&2
      continue
    fi
@@ -56,6 +74,6 @@
 -  done
 -fi
 -
- chmod 0644 "$TEMPBUNDLE"
- mv -f "$TEMPBUNDLE" "$CERTBUNDLE"
+ rm -f "$CERTBUNDLE"
  
+ ADDED_CNT=$(wc -l < "$ADDED")