- up to 20150426

[packages/ca-certificates.git] / ca-certificates-etc-certs.patch

diff --git a/ca-certificates-etc-certs.patch b/ca-certificates-etc-certs.patch
index a321e259959be7324032fc2b4ecd4f23796345d2..2e9c4c72120204d8ce13edd9709482d92bdf22ea 100644 (file)
--- a/ca-certificates-etc-certs.patch
+++ b/ca-certificates-etc-certs.patch
@@ -1,5 +1,5 @@
---- 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-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 @@
  
  CERTSCONF=/etc/ca-certificates.conf
@@ -37,27 +37,27 @@
    if test -L "$PEM"
    then
      rm -f "$PEM"
-@@ -89,6 +89,7 @@
+@@ -90,6 +90,7 @@ if [ "$fresh" = 1 ]; then
    do
-      case $(readlink $symlink) in
-      $CERTSDIR*) rm -f $symlink;;
-+     $LOCALCERTSDIR*) rm -f $symlink;;
-      esac
+     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 @@
+@@ -111,24 +111,18 @@
  
  sed -e '/^$/d' -e '/^#/d' -e '/^!/d' $CERTSCONF | while read crt
  do
 -  if ! test -f "$CERTSDIR/$crt"
 +  if test -f "$CERTSDIR/$crt"
-   then
++   then
 +    add "$CERTSDIR/$crt"
 +  elif test -f "$LOCALCERTSDIR/$crt"
-+  then
+   then
+-    echo "W: $CERTSDIR/$crt not found, but listed in $CERTSCONF." >&2
 +    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
@@ -68,12 +68,12 @@
 -# administrator.
 -if [ -d "$LOCALCERTSDIR" ]
 -then
--  find -L "$LOCALCERTSDIR" -type f -name '*.crt' | while read crt
+-  find -L "$LOCALCERTSDIR" -type f -name '*.crt' | sort | while read crt
 -  do
 -    add "$crt"
 -  done
 -fi
 -
- chmod 0644 "$TEMPBUNDLE"
- mv -f "$TEMPBUNDLE" "$CERTBUNDLE"
+ rm -f "$CERTBUNDLE"
  
+ ADDED_CNT=$(wc -l < "$ADDED")