Import Debian version 20090708

diff --git a/Makefile b/Makefile
index 79183a47ab69aa14904341c70874b7acccb5e35a..44846eb47a3ac21fa3e56d1b9d3d08e36409778b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,9 +3,7 @@
 #
 
 CERTSDIR = /usr/share/ca-certificates
-SUBDIRS = spi-inc.org debconf.org mozilla \
-       cacert.org brasil.gov.br signet.pl quovadis.bm \
-       telesec.de gouv.fr
+SUBDIRS = spi-inc.org debconf.org mozilla cacert.org brasil.gov.br signet.pl telesec.de gouv.fr
 
 all:
        for dir in $(SUBDIRS); do \

diff --git a/cacert.org/Makefile b/cacert.org/Makefile
index fd0c4355b73810949ca4ef8e5c94135ef56b10f1..180ea6b8ca4af60cb2124e8cd97ef5f61e4343fb 100644 (file)
--- a/cacert.org/Makefile
+++ b/cacert.org/Makefile
@@ -9,6 +9,5 @@ clean:
 
 install:
        cat root.crt class3.crt > cacert.org.crt
-       for p in *.crt; do \
-        install -m 644 $$p $(CERTSDIR)/$$p ; \
-       done
+       install -m 644 cacert.org.crt $(CERTSDIR)/cacert.org.crt
+

diff --git a/debian/NEWS b/debian/NEWS
index 004cc1608b9ba4f477f92fecec517a0d1ddbb396..6a0b57a2a6a89853125d16d906e5b7e5d8960723 100644 (file)
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,3 +1,17 @@
+ca-certificates (20090708) unstable; urgency=low
+
+  * Removed CA files:
+    - cacert.org/root.crt and cacert.org/class3.crt:
+      Both certificate files were deprecated with 20080809.  Users of these
+      root certificates are encouraged to switch to
+      `cacert.org/cacert.org.crt' which contains both class 1 and class 3
+      roots joined in a single file.
+    - quovadis.bm/QuoVadis_Root_Certification_Authority.crt:
+      This certificate has been added into the Mozilla truststore and
+      is available as `mozilla/QuoVadis_Root_CA.crt'.
+
+ -- Philipp Kern <pkern@debian.org>  Wed, 08 Jul 2009 23:19:56 +0200
+
 ca-certificates (20090701) unstable; urgency=low
 
   * Readded Equifax Secure Global eBusiness CA.

diff --git a/debian/changelog b/debian/changelog
index a4d8a5fddb3ef6e4130d5b0c152f5d8dd50b67ce..609ddd64a98141bc4670a965ba32417cc169a6ec 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,27 @@
+ca-certificates (20090708) unstable; urgency=low
+
+  * Removed CA files:
+    - cacert.org/root.crt and cacert.org/class3.crt:
+      Both certificate files were deprecated with 20080809.  Users of these
+      root certificates are encouraged to switch to
+      `cacert.org/cacert.org.crt' which contains both class 1 and class 3
+      roots joined in a single file.
+    - quovadis.bm/QuoVadis_Root_Certification_Authority.crt:
+      This certificate has been added into the Mozilla truststore and
+      is available as `mozilla/QuoVadis_Root_CA.crt'.
+  * Do not redirect c_rehash error messages to /dev/null.
+    (Closes: #495224)
+  * Remove dangling symlinks on purge, which also gets rid of the hash
+    symlink for ca-certificates.crt.  (Closes: #475240)
+  * Use subshells when grepping for certificates in config, avoiding
+    SIGPIPE because of grep's immediate exit after it finds the pattern.
+    (Closes: #486737)
+  * Fix VERBOSE_ARG usage in update-ca-certificates.  Thanks to
+    Robby Workman of Slackware.
+  * Updated Standards-Version and FSF portal address in the copyright file.
+
+ -- Philipp Kern <pkern@debian.org>  Wed, 08 Jul 2009 23:19:56 +0200
+
 ca-certificates (20090701) unstable; urgency=low
 
   * Reactivated "Equifax Secure Global eBusiness CA".  (Closes: #534674)

diff --git a/debian/config.in b/debian/config.in
index 6677eab3aefdfc7df4f99b4c85bae8c44a8d59b9..209bf3d2a6fc40b0dee4251423f84cb66cac2d17 100644 (file)
--- a/debian/config.in
+++ b/debian/config.in
@@ -78,9 +78,9 @@ if test -d /usr/share/ca-certificates; then
    else
      CERTS_AVAILABLE="$CERTS_AVAILABLE, $crt"
    fi
-   if echo "$CERTS_DISABLED" | grep -F -q -x "$crt" > /dev/null 2>&1; then
+   if (echo "$CERTS_DISABLED" | grep -F -q -x "$crt") > /dev/null 2>&1; then
      : # echo "I: ignore $crt"
-   elif echo "$CERTS_TRUST" | grep -F -q -x "$crt" > /dev/null 2>&1; then
+   elif (echo "$CERTS_TRUST" | grep -F -q -x "$crt") > /dev/null 2>&1; then
      # already trusted
      if test "$CERTS_ENABLED" = ""; then
        CERTS_ENABLED="$crt"

diff --git a/debian/control b/debian/control
index 943ec8705553171ddcae83611114e543510d0c6e..01f9a559eab52bff42067c81dd39a296edf93959 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Philipp Kern <pkern@debian.org>
 Build-Depends: debhelper (>> 4.1.16), po-debconf
 Build-Depends-Indep: python
-Standards-Version: 3.8.0
+Standards-Version: 3.8.2
 
 Package: ca-certificates
 Architecture: all

diff --git a/debian/copyright b/debian/copyright
index fadf8e04ad587d053111486c2b816c73881bbee2..5318b43e53f5caa2acf632b94b05990bd1eb5145 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -22,7 +22,8 @@ sbin/update-ca-certificates:
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
+    USA.
 
 mozilla/certdata2pem.py:
 

diff --git a/debian/postrm b/debian/postrm
index 8aa9d3fb8167942df1cdf349d11f5d0ecfa5eb3a..ae65ee5fd868a2d5235f0b247ec2036ff737be41 100644 (file)
--- a/debian/postrm
+++ b/debian/postrm
@@ -16,31 +16,36 @@ set -e
 #        * <disappearer's-postrm> `disappear' <r>overwrit>r> <new-version>
 # for details, see /usr/share/doc/packaging-manual/
 
+remove_dangling_symlinks() {
+    echo -n "Removing dangling symlinks from /etc/ssl/certs... "
+    find /etc/ssl/certs -type l -print | while read h
+    do
+        test -f "$h" || rm -f "$h"
+    done
+    echo "done."
+}
+
 case "$1" in
     remove)
-       echo -n "Removing hash symlinks in /etc/ssl/certs ..."
-       find /etc/ssl/certs -type l -print | while read h
-       do
-        test -f "$h" || rm -f "$h"
-       done
-       echo done.
-       rmdir /usr/local/share/ca-certificates 2>/dev/null || true
-       ;;
+        remove_dangling_symlinks
+        rmdir /usr/local/share/ca-certificates 2>/dev/null || true
+        ;;
 
     purge)
-       rm -f /etc/ssl/certs/ca-certificates.crt*
-
-       # Clean up even if openssl is removed before ca-certificates.
-       # (Which is what piuparts does.)
-       [ -d /etc/ssl/certs ] && rmdir --ignore-fail-on-non-empty /etc/ssl/certs
-       [ -d /etc/ssl ] && rmdir --ignore-fail-on-non-empty /etc/ssl
-
-       rm -f /etc/ca-certificates.conf*
-       if test -e /usr/share/debconf/confmodule; then
-         . /usr/share/debconf/confmodule
-         db_purge
-       fi
-       ;;
+        rm -f /etc/ssl/certs/ca-certificates.crt
+        remove_dangling_symlinks
+
+        # Clean up even if openssl is removed before ca-certificates.
+        # (Which is what piuparts does.)
+        [ -d /etc/ssl/certs ] && rmdir --ignore-fail-on-non-empty /etc/ssl/certs
+        [ -d /etc/ssl ] && rmdir --ignore-fail-on-non-empty /etc/ssl
+
+        rm -f /etc/ca-certificates.conf*
+        if test -e /usr/share/debconf/confmodule; then
+            . /usr/share/debconf/confmodule
+            db_purge
+        fi
+        ;;
 
     upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
         ;;
@@ -48,7 +53,6 @@ case "$1" in
     *)
         echo "postrm called with unknown argument \`$1'" >&2
         exit 1
-
 esac
 
 # dh_installdeb will replace this with shell code automatically

diff --git a/mozilla/certdata2pem.py b/mozilla/certdata2pem.py
index d40b659d5cc059fa4af0b2dd0f7f682784f7f84b..76cc3436393bdfc82642b962b708cccb4827bfeb 100644 (file)
--- a/mozilla/certdata2pem.py
+++ b/mozilla/certdata2pem.py
@@ -17,7 +17,8 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
+# USA.
 
 import base64
 import os.path

diff --git a/quovadis.bm/Makefile b/quovadis.bm/Makefile
deleted file mode 100644 (file)
index 7c1b893..0000000
--- a/quovadis.bm/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# Makefile
-#
-
-all:
-
-clean:
-
-install:
-       for p in *.crt; do \
-        install -m 644 $$p $(CERTSDIR)/$$p ; \
-       done

diff --git a/quovadis.bm/QuoVadis_Root_Certification_Authority.crt b/quovadis.bm/QuoVadis_Root_Certification_Authority.crt
deleted file mode 100644 (file)
index 0050532..0000000
--- a/quovadis.bm/QuoVadis_Root_Certification_Authority.crt
+++ /dev/null
@@ -1,35 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIF0DCCBLigAwIBAgIEOrZQizANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJC
-TTEZMBcGA1UEChMQUXVvVmFkaXMgTGltaXRlZDElMCMGA1UECxMcUm9vdCBDZXJ0
-aWZpY2F0aW9uIEF1dGhvcml0eTEuMCwGA1UEAxMlUXVvVmFkaXMgUm9vdCBDZXJ0
-aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wMTAzMTkxODMzMzNaFw0yMTAzMTcxODMz
-MzNaMH8xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMSUw
-IwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MS4wLAYDVQQDEyVR
-dW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv2G1lVO6V/z68mcLOhrfEYBklbTRvM16z/Yp
-li4kVEAkOPcahdxYTMukJ0KX0J+DisPkBgNbAKVRHnAEdOLB1Dqr1607BxgFjv2D
-rOpm2RgbaIr1VxqYuvXtdj182d6UajtLF8HVj71lODqV0D1VNk7feVcxKh7YWWVJ
-WCCYfqtffp/p1k3sg3Spx2zY7ilKhSoGFPlU5tPaZQeLYzcS19Dsw3sgQUSj7cug
-F+FxZc4dZjH3dgEZyH0DWLaVSR2mEiboxgx24ONmy+pdpibu5cxfvWenAScOospU
-xbF6lR1xHkopigPcakXBpBlebzbNw6Kwt/5cOOJSvPhEQ+aQuwIDAQABo4ICUjCC
-Ak4wPQYIKwYBBQUHAQEEMTAvMC0GCCsGAQUFBzABhiFodHRwczovL29jc3AucXVv
-dmFkaXNvZmZzaG9yZS5jb20wDwYDVR0TAQH/BAUwAwEB/zCCARoGA1UdIASCAREw
-ggENMIIBCQYJKwYBBAG+WAABMIH7MIHUBggrBgEFBQcCAjCBxxqBxFJlbGlhbmNl
-IG9uIHRoZSBRdW9WYWRpcyBSb290IENlcnRpZmljYXRlIGJ5IGFueSBwYXJ0eSBh
-c3N1bWVzIGFjY2VwdGFuY2Ugb2YgdGhlIHRoZW4gYXBwbGljYWJsZSBzdGFuZGFy
-ZCB0ZXJtcyBhbmQgY29uZGl0aW9ucyBvZiB1c2UsIGNlcnRpZmljYXRpb24gcHJh
-Y3RpY2VzLCBhbmQgdGhlIFF1b1ZhZGlzIENlcnRpZmljYXRlIFBvbGljeS4wIgYI
-KwYBBQUHAgEWFmh0dHA6Ly93d3cucXVvdmFkaXMuYm0wHQYDVR0OBBYEFItLbe3T
-KbkGGew5Oanwl4Rqy+/fMIGuBgNVHSMEgaYwgaOAFItLbe3TKbkGGew5Oanwl4Rq
-y+/foYGEpIGBMH8xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1p
-dGVkMSUwIwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MS4wLAYD
-VQQDEyVRdW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggQ6tlCL
-MA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOCAQEAitQUtf70mpKnGdSk
-fnIYj9lofFIk3WdvOXrEql494liwTXCYhGHoG+NpGA7O+0dQoE7/8CQfvbLO9Sf8
-7C9TqnN7Az10buYWnuulLsS/VidQK2K6vkscPFVcQR0kvoIgR13VRH56FmjffU1R
-cHhXHTMe/QKZnAzNCgVPx7uOpHX6Sm2xgI4JVrmcGmD+XcHXetwReNDWXcG31a0y
-mQM6isxUJTkxgXsTIlG6Rmyhu576BGxJJnSP0nPrzDCi5upZIof4l/UO/erMkqQW
-xFIY6iHOsfHmhIHluqmGKPJDWl0Snawe2ajlCmqnf6CHKc/yiU3U7MXi5nrQNiOK
-SnQ2+Q==
------END CERTIFICATE-----
-

diff --git a/quovadis.bm/bug250847.txt b/quovadis.bm/bug250847.txt
deleted file mode 100644 (file)
index 76e5b4b..0000000
--- a/quovadis.bm/bug250847.txt
+++ /dev/null
@@ -1,205 +0,0 @@
-From SDavidson@quovadis.bm Tue May 25 05:18:29 2004
-Received: (at submit) by bugs.debian.org; 25 May 2004 12:18:29 +0000
-Return-path: <SDavidson@quovadis.bm>
-Received: from scbm1mx01.securecentre.com [200.1.160.234] 
-       by spohr.debian.org with esmtp (Exim 3.35 1 (Debian))
-       id 1BSat2-0000fn-00; Tue, 25 May 2004 05:18:28 -0700
-Received: from mail.quovadis.bm (webmail.qvnetwork.com) by scbm1mx01.securecentre.com
- (Content Technologies SMTPRS 4.3.12) with ESMTP id <T69c7dc6727c801a0ea314@scbm1mx01.securecentre.com> for <submit@bugs.debian.org>;
- Tue, 25 May 2004 09:17:56 -0300
-X-MimeOLE: Produced By Microsoft Exchange V6.5.6944.0
-Content-class: urn:content-classes:message
-MIME-Version: 1.0
-Content-Type: multipart/alternative;
-       boundary="----_=_NextPart_001_01C44252.4F71FB64"
-Subject: ca-certificates - Add QuoVadis CA Certificates
-Date: Tue, 25 May 2004 09:17:56 -0300
-Message-ID: <FAC7214EEEE5034DA60F8318C06729091F4364@qvbm2mx01.evcnetwork.com>
-X-MS-Has-Attach: 
-X-MS-TNEF-Correlator: 
-Thread-Topic: ca-certificates - Add QuoVadis CA Certificates
-Thread-Index: AcRCUk9mQ9YHgyerSUiCfaIpO7JoJg==
-From: "Stephen Davidson" <SDavidson@quovadis.bm>
-To: <submit@bugs.debian.org>
-Delivered-To: submit@bugs.debian.org
-X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2004_03_25 
-       (1.212-2003-09-23-exp) on spohr.debian.org
-X-Spam-Status: No, hits=1.6 required=4.0 tests=FRONTPAGE,HAS_PACKAGE,
-       HTML_10_20,HTML_MESSAGE,UPPERCASE_25_50 autolearn=no 
-       version=2.60-bugs.debian.org_2004_03_25
-X-Spam-Level: *
-
-This is a multi-part message in MIME format.
-
-------_=_NextPart_001_01C44252.4F71FB64
-Content-Type: text/plain;
-       charset="us-ascii"
-Content-Transfer-Encoding: quoted-printable
-
-Package: ca-certificates
-Version: 20020323
-Severity:  Normal
-
-Problem:  Please add the QuoVadis CA certificates to Debian.
-=20
-QuoVadis is a commercial certificate authority located in Bermuda and
-serving customers worldwide.  QuoVadis is an Authorised Certification
-Services Provider (CSP) under Bermuda's Electronic Transactions Act.
-The CSP standard synthesizes major requirements from BS 7799, WebTrust
-for Certification Authorities, and the European Electronic Signature
-Standards Initiative (EESSI).  More information may be found at:
-http://www.quovadis.bm/bdacsp.asp <http://www.quovadis.bm/bdacsp.asp> .
-
-
-The QuoVadis CA cert is already distributed in Apple OSX and Microsoft
-Windows (for which we completed the WebTrust for CAs procedures with
-Ernst & Young).
-
-A summary of our certification policies may be found at:
-http://www.quovadis.bm/policies/pki.asp
-<http://www.quovadis.bm/policies/pki.asp>=20
-
-QuoVadis currently provides a "root injector" that senses the user's
-computer config and inserts the root appropriately.  This may be found
-at: =20
-
-Following is the QV root CA cert in base 64 format.  The CA cert may
-also be downloaded from http://www.quovadis.bm/root/
-<http://www.quovadis.bm/root/> :
-
------BEGIN CERTIFICATE-----
-MIIF0DCCBLigAwIBAgIEOrZQizANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJC
-TTEZMBcGA1UEChMQUXVvVmFkaXMgTGltaXRlZDElMCMGA1UECxMcUm9vdCBDZXJ0
-aWZpY2F0aW9uIEF1dGhvcml0eTEuMCwGA1UEAxMlUXVvVmFkaXMgUm9vdCBDZXJ0
-aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wMTAzMTkxODMzMzNaFw0yMTAzMTcxODMz
-MzNaMH8xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMSUw
-IwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MS4wLAYDVQQDEyVR
-dW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv2G1lVO6V/z68mcLOhrfEYBklbTRvM16z/Yp
-li4kVEAkOPcahdxYTMukJ0KX0J+DisPkBgNbAKVRHnAEdOLB1Dqr1607BxgFjv2D
-rOpm2RgbaIr1VxqYuvXtdj182d6UajtLF8HVj71lODqV0D1VNk7feVcxKh7YWWVJ
-WCCYfqtffp/p1k3sg3Spx2zY7ilKhSoGFPlU5tPaZQeLYzcS19Dsw3sgQUSj7cug
-F+FxZc4dZjH3dgEZyH0DWLaVSR2mEiboxgx24ONmy+pdpibu5cxfvWenAScOospU
-xbF6lR1xHkopigPcakXBpBlebzbNw6Kwt/5cOOJSvPhEQ+aQuwIDAQABo4ICUjCC
-Ak4wPQYIKwYBBQUHAQEEMTAvMC0GCCsGAQUFBzABhiFodHRwczovL29jc3AucXVv
-dmFkaXNvZmZzaG9yZS5jb20wDwYDVR0TAQH/BAUwAwEB/zCCARoGA1UdIASCAREw
-ggENMIIBCQYJKwYBBAG+WAABMIH7MIHUBggrBgEFBQcCAjCBxxqBxFJlbGlhbmNl
-IG9uIHRoZSBRdW9WYWRpcyBSb290IENlcnRpZmljYXRlIGJ5IGFueSBwYXJ0eSBh
-c3N1bWVzIGFjY2VwdGFuY2Ugb2YgdGhlIHRoZW4gYXBwbGljYWJsZSBzdGFuZGFy
-ZCB0ZXJtcyBhbmQgY29uZGl0aW9ucyBvZiB1c2UsIGNlcnRpZmljYXRpb24gcHJh
-Y3RpY2VzLCBhbmQgdGhlIFF1b1ZhZGlzIENlcnRpZmljYXRlIFBvbGljeS4wIgYI
-KwYBBQUHAgEWFmh0dHA6Ly93d3cucXVvdmFkaXMuYm0wHQYDVR0OBBYEFItLbe3T
-KbkGGew5Oanwl4Rqy+/fMIGuBgNVHSMEgaYwgaOAFItLbe3TKbkGGew5Oanwl4Rq
-y+/foYGEpIGBMH8xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1p
-dGVkMSUwIwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MS4wLAYD
-VQQDEyVRdW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggQ6tlCL
-MA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOCAQEAitQUtf70mpKnGdSk
-fnIYj9lofFIk3WdvOXrEql494liwTXCYhGHoG+NpGA7O+0dQoE7/8CQfvbLO9Sf8
-7C9TqnN7Az10buYWnuulLsS/VidQK2K6vkscPFVcQR0kvoIgR13VRH56FmjffU1R
-cHhXHTMe/QKZnAzNCgVPx7uOpHX6Sm2xgI4JVrmcGmD+XcHXetwReNDWXcG31a0y
-mQM6isxUJTkxgXsTIlG6Rmyhu576BGxJJnSP0nPrzDCi5upZIof4l/UO/erMkqQW
-xFIY6iHOsfHmhIHluqmGKPJDWl0Snawe2ajlCmqnf6CHKc/yiU3U7MXi5nrQNiOK
-SnQ2+Q=3D=3D
------END CERTIFICATE-----
-
-Please contact me if you need any additional information.
-=20
-=20
-
-------_=_NextPart_001_01C44252.4F71FB64
-Content-Type: text/html;
-       charset="us-ascii"
-Content-Transfer-Encoding: quoted-printable
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML><HEAD><TITLE>Message</TITLE>
-<META http-equiv=3DContent-Language content=3Den-us>
-<META content=3D"MSHTML 6.00.2800.1400" name=3DGENERATOR>
-<META content=3DFrontPage.Editor.Document name=3DProgId>
-<META http-equiv=3DContent-Type content=3D"text/html; =
-charset=3Dus-ascii">
-<STYLE fprolloverstyle>A:hover {color: #0D2677; font-size: 8pt; =
-font-family: Verdana; font-weight: bold}=0A=
-</STYLE>
-</HEAD>
-<BODY style=3D"FONT-SIZE: 10pt; COLOR: #003366; FONT-FAMILY: Verdana" =
-text=3D#333333=20
-vLink=3D#009900 aLink=3D#009900 link=3D#009900 bgColor=3D#ffffff>
-<DIV>Package: ca-certificates<BR>Version: 20020323</DIV>
-<DIV><SPAN class=3D668590512-25052004></SPAN>S<SPAN=20
-class=3D668590512-25052004>everity:&nbsp; Normal</SPAN><BR></DIV>
-<DIV><SPAN class=3D668590512-25052004>Problem:&nbsp; Please add the =
-QuoVadis CA=20
-certificates to Debian.</SPAN></DIV>
-<DIV><SPAN class=3D668590512-25052004></SPAN>&nbsp;</DIV>
-<DIV><SPAN class=3D668590512-25052004>QuoVadis is a commercial =
-certificate=20
-authority located in Bermuda and serving customers worldwide.&nbsp; =
-QuoVadis is=20
-an Authorised Certification Services Provider (CSP) under Bermuda's =
-Electronic=20
-Transactions Act.&nbsp; The CSP standard synthesizes =
-major&nbsp;requirements=20
-from BS 7799, WebTrust for Certification Authorities, and the European=20
-Electronic Signature Standards Initiative (EESSI).&nbsp; More =
-information may be=20
-found at:&nbsp; <A href=3D"http://www.quovadis.bm/bdacsp.asp"><FONT=20
-color=3D#800080>http://www.quovadis.bm/bdacsp.asp</FONT></A>.&nbsp; =
-<BR><BR>The=20
-QuoVadis CA cert is already distributed in Apple OSX and Microsoft =
-Windows (for=20
-which we completed the WebTrust for CAs procedures&nbsp;with Ernst &amp; =
-
-Young).<BR><BR>A summary of our certification policies may be found =
-at:&nbsp; <A=20
-href=3D"http://www.quovadis.bm/policies/pki.asp"><FONT=20
-color=3D#800080>http://www.quovadis.bm/policies/pki.asp</FONT></A><BR><BR=
->QuoVadis=20
-currently provides a "root injector" that senses the user's computer =
-config and=20
-inserts the root appropriately.&nbsp; This may be found at:&nbsp;=20
-<BR><BR>Following is the QV root CA cert in base 64 format.&nbsp; The CA =
-cert=20
-may also be downloaded from <A =
-href=3D"http://www.quovadis.bm/root/"><FONT=20
-color=3D#800080>http://www.quovadis.bm/root/</FONT></A>:<BR><BR>-----BEGI=
-N=20
-CERTIFICATE-----<BR>MIIF0DCCBLigAwIBAgIEOrZQizANBgkqhkiG9w0BAQUFADB/MQswC=
-QYDVQQGEwJC<BR>TTEZMBcGA1UEChMQUXVvVmFkaXMgTGltaXRlZDElMCMGA1UECxMcUm9vdC=
-BDZXJ0<BR>aWZpY2F0aW9uIEF1dGhvcml0eTEuMCwGA1UEAxMlUXVvVmFkaXMgUm9vdCBDZXJ=
-0<BR>aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wMTAzMTkxODMzMzNaFw0yMTAzMTcxODMz<BR>=
-MzNaMH8xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMSUw<BR>IwYDV=
-QQLExxSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MS4wLAYDVQQDEyVR<BR>dW9WYWRpcy=
-BSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG<BR>9w0BAQEFAAOCAQ8=
-AMIIBCgKCAQEAv2G1lVO6V/z68mcLOhrfEYBklbTRvM16z/Yp<BR>li4kVEAkOPcahdxYTMuk=
-J0KX0J+DisPkBgNbAKVRHnAEdOLB1Dqr1607BxgFjv2D<BR>rOpm2RgbaIr1VxqYuvXtdj182=
-d6UajtLF8HVj71lODqV0D1VNk7feVcxKh7YWWVJ<BR>WCCYfqtffp/p1k3sg3Spx2zY7ilKhS=
-oGFPlU5tPaZQeLYzcS19Dsw3sgQUSj7cug<BR>F+FxZc4dZjH3dgEZyH0DWLaVSR2mEiboxgx=
-24ONmy+pdpibu5cxfvWenAScOospU<BR>xbF6lR1xHkopigPcakXBpBlebzbNw6Kwt/5cOOJS=
-vPhEQ+aQuwIDAQABo4ICUjCC<BR>Ak4wPQYIKwYBBQUHAQEEMTAvMC0GCCsGAQUFBzABhiFod=
-HRwczovL29jc3AucXVv<BR>dmFkaXNvZmZzaG9yZS5jb20wDwYDVR0TAQH/BAUwAwEB/zCCAR=
-oGA1UdIASCAREw<BR>ggENMIIBCQYJKwYBBAG+WAABMIH7MIHUBggrBgEFBQcCAjCBxxqBxFJ=
-lbGlhbmNl<BR>IG9uIHRoZSBRdW9WYWRpcyBSb290IENlcnRpZmljYXRlIGJ5IGFueSBwYXJ0=
-eSBh<BR>c3N1bWVzIGFjY2VwdGFuY2Ugb2YgdGhlIHRoZW4gYXBwbGljYWJsZSBzdGFuZGFy<=
-BR>ZCB0ZXJtcyBhbmQgY29uZGl0aW9ucyBvZiB1c2UsIGNlcnRpZmljYXRpb24gcHJh<BR>Y3=
-RpY2VzLCBhbmQgdGhlIFF1b1ZhZGlzIENlcnRpZmljYXRlIFBvbGljeS4wIgYI<BR>KwYBBQU=
-HAgEWFmh0dHA6Ly93d3cucXVvdmFkaXMuYm0wHQYDVR0OBBYEFItLbe3T<BR>KbkGGew5Oanw=
-l4Rqy+/fMIGuBgNVHSMEgaYwgaOAFItLbe3TKbkGGew5Oanwl4Rq<BR>y+/foYGEpIGBMH8xC=
-zAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1p<BR>dGVkMSUwIwYDVQQLExxSb2=
-90IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MS4wLAYD<BR>VQQDEyVRdW9WYWRpcyBSb290IEN=
-lcnRpZmljYXRpb24gQXV0aG9yaXR5ggQ6tlCL<BR>MA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG=
-9w0BAQUFAAOCAQEAitQUtf70mpKnGdSk<BR>fnIYj9lofFIk3WdvOXrEql494liwTXCYhGHoG=
-+NpGA7O+0dQoE7/8CQfvbLO9Sf8<BR>7C9TqnN7Az10buYWnuulLsS/VidQK2K6vkscPFVcQR=
-0kvoIgR13VRH56FmjffU1R<BR>cHhXHTMe/QKZnAzNCgVPx7uOpHX6Sm2xgI4JVrmcGmD+XcH=
-XetwReNDWXcG31a0y<BR>mQM6isxUJTkxgXsTIlG6Rmyhu576BGxJJnSP0nPrzDCi5upZIof4=
-l/UO/erMkqQW<BR>xFIY6iHOsfHmhIHluqmGKPJDWl0Snawe2ajlCmqnf6CHKc/yiU3U7MXi5=
-nrQNiOK<BR>SnQ2+Q=3D=3D<BR>-----END=20
-CERTIFICATE-----<BR><BR>Please contact me if you need any additional=20
-information.</SPAN></DIV>
-<DIV><SPAN class=3D668590512-25052004></SPAN>&nbsp;</DIV>
-<DIV><SPAN class=3D668590512-25052004></SPAN>&nbsp;</DIV></BODY></HTML>
-=00
-------_=_NextPart_001_01C44252.4F71FB64--
-
-
-

diff --git a/sbin/update-ca-certificates b/sbin/update-ca-certificates
index a34ef75b0ce8a15ee81f61c3773587dca523d9fa..fc083d77dfce5f6a08ca5ca47282a3ba420752a8 100755 (executable)
--- a/sbin/update-ca-certificates
+++ b/sbin/update-ca-certificates
@@ -17,7 +17,8 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02111-1301,
+# USA.
 #
 
 verbose=0
@@ -137,7 +138,7 @@ then
   # only run if set of files has changed
   if [ "$verbose" = 0 ]
   then
-    c_rehash . > /dev/null 2>&1
+    c_rehash . > /dev/null
   else
     c_rehash .
   fi
@@ -149,7 +150,7 @@ HOOKSDIR=/etc/ca-certificates/update.d
 echo -n "Running hooks in $HOOKSDIR...."
 VERBOSE_ARG=
 [ "$verbose" = 0 ] || VERBOSE_ARG=--verbose
-eval run-parts $VERB_ARG --test -- $HOOKSDIR | while read hook
+eval run-parts $VERBOSE_ARG --test -- $HOOKSDIR | while read hook
 do
   ( cat $ADDED
     cat $REMOVED ) | $hook || echo E: $hook exited with code $?.