No longer install spi's CA into /etc/ssl/certs, instead depend on the cacert-spi...

diff --git a/CA.SPI-INC.ORG.pem b/CA.SPI-INC.ORG.pem
deleted file mode 100644 (file)
index 8f868ff..0000000
--- a/CA.SPI-INC.ORG.pem
+++ /dev/null
@@ -1,152 +0,0 @@
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number:
-            e8:8e:b6:c9:f8:2a:14:28
-        Signature Algorithm: sha1WithRSAEncryption
-        Issuer: C=US, ST=Indiana, L=Indianapolis, O=Software in the Public Interest, OU=hostmaster, CN=Certificate Authority/emailAddress=hostmaster@spi-inc.org
-        Validity
-            Not Before: May 13 08:07:56 2008 GMT
-            Not After : May 11 08:07:56 2018 GMT
-        Subject: C=US, ST=Indiana, L=Indianapolis, O=Software in the Public Interest, OU=hostmaster, CN=Certificate Authority/emailAddress=hostmaster@spi-inc.org
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-            RSA Public Key: (4096 bit)
-                Modulus (4096 bit):
-                    00:dc:36:e6:47:42:c2:c4:51:75:29:87:40:c3:d8:
-                    8e:21:06:d2:18:4e:eb:ef:20:bd:90:3c:85:10:13:
-                    8c:29:5b:94:63:f6:f4:2d:f1:06:42:91:b9:19:c4:
-                    42:69:08:bf:8b:36:45:ea:28:05:33:49:48:a0:27:
-                    43:93:35:8a:41:d8:78:b3:f0:ef:b3:6e:2d:dd:d1:
-                    cb:7d:ea:f4:75:26:d3:3e:90:3a:ee:d7:e7:2c:04:
-                    b5:7c:e1:f5:7c:c5:4e:ef:77:bd:5c:a2:93:33:92:
-                    ce:7d:81:48:cf:6b:b5:22:2c:08:83:fd:d3:d5:cf:
-                    3b:2d:fd:b5:49:90:5b:f6:ad:4d:13:ca:de:d3:a6:
-                    9d:53:51:71:63:46:f8:4a:16:5c:98:ee:2d:6d:9a:
-                    16:a1:76:90:e2:60:43:99:d6:89:d6:6c:2e:7a:98:
-                    b2:0b:03:2c:e3:7a:4f:c7:dd:e3:cc:e3:4a:6a:8d:
-                    79:52:fa:f4:c1:af:2e:8f:2a:08:cb:1b:29:82:92:
-                    72:43:bc:ce:88:a9:aa:a7:8a:51:43:55:85:9a:37:
-                    03:78:93:c8:f0:bd:b4:41:c8:07:42:9a:cb:35:97:
-                    7a:8a:81:65:de:1d:54:08:01:f1:64:5c:b7:17:1a:
-                    51:bc:1e:c3:59:87:76:18:16:98:ee:bf:f6:67:81:
-                    8b:06:35:c5:4b:6d:59:19:c7:d2:c6:48:be:6e:14:
-                    28:83:4a:10:9c:1b:f5:6f:bc:a9:8e:f5:69:fe:b2:
-                    c1:55:cc:e7:14:c9:f9:5b:14:53:51:07:ea:ce:3d:
-                    e4:4f:28:1f:3c:61:09:d7:33:d2:6e:a7:6e:d4:c7:
-                    13:09:6f:6b:5d:14:ee:9d:89:1b:a5:6a:f2:f6:f8:
-                    d0:72:8e:ea:72:1f:2f:34:6a:29:0a:c5:0a:ec:1c:
-                    40:85:12:f7:a6:a5:d3:4f:ad:c0:85:8c:4c:7c:73:
-                    20:cc:53:18:f1:b2:58:4c:01:f5:bf:ea:64:d5:5c:
-                    39:c5:ce:6c:cc:53:5a:56:ba:41:0f:25:df:6b:50:
-                    b6:c7:8a:a0:bd:02:c2:c5:3b:55:a5:b2:64:22:84:
-                    51:28:56:ae:31:ee:5e:fb:0b:16:4d:46:05:91:80:
-                    44:ed:ac:6d:f0:57:a8:fa:eb:61:48:a0:cb:1b:b3:
-                    1f:8e:cd:c5:21:77:03:84:1e:fc:ac:a3:43:08:63:
-                    8c:ed:f9:27:ef:b4:b0:5d:67:d6:4f:ed:d0:8b:3e:
-                    5d:5b:c9:91:bd:96:02:84:3d:c5:4d:bc:42:3f:74:
-                    fd:3c:5d:ac:5c:48:36:5e:87:31:2f:18:6c:c4:68:
-                    ee:a1:8b:c9:59:d0:18:e3:00:80:b3:54:27:2e:99:
-                    f0:15:53
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Subject Key Identifier: 
-                34:71:D1:38:D7:15:36:83:47:6B:D7:37:64:42:3B:8E:8D:52:9D:AB
-            X509v3 Authority Key Identifier: 
-                keyid:34:71:D1:38:D7:15:36:83:47:6B:D7:37:64:42:3B:8E:8D:52:9D:AB
-                DirName:/C=US/ST=Indiana/L=Indianapolis/O=Software in the Public Interest/OU=hostmaster/CN=Certificate Authority/emailAddress=hostmaster@spi-inc.org
-                serial:E8:8E:B6:C9:F8:2A:14:28
-
-            X509v3 Basic Constraints: critical
-                CA:TRUE
-            Netscape Cert Type: 
-                SSL CA, S/MIME CA, Object Signing CA
-            X509v3 Issuer Alternative Name: 
-                <EMPTY>
-
-            Netscape Comment: 
-                Software in the Public Interest
-            Netscape CA Revocation Url: 
-                https://ca.spi-inc.org/ca-crl.pem
-            Netscape Revocation Url: 
-                https://ca.spi-inc.org/cert-crl.pem
-            X509v3 Subject Alternative Name: 
-                email:hostmaster@spi-inc.org
-            X509v3 Key Usage: critical
-                Certificate Sign, CRL Sign
-    Signature Algorithm: sha1WithRSAEncryption
-        b4:cd:bd:e0:b9:ea:b2:03:2b:7e:32:e9:de:72:3f:c9:4b:82:
-        5e:9d:e2:af:55:09:a2:0c:54:e8:cf:18:3c:28:20:1d:a9:bb:
-        03:02:2f:52:39:22:f9:17:cf:ad:67:90:b3:03:7f:d8:15:e3:
-        6b:7e:bb:9b:56:01:af:35:d4:da:b9:c7:67:17:9b:d4:d5:0e:
-        37:b3:20:41:2e:0c:01:c4:5b:f9:65:3e:c2:61:e8:d2:f0:6a:
-        95:70:c3:c6:6f:d5:35:a4:ac:59:72:e1:89:df:a1:a0:9d:24:
-        bd:29:79:e9:61:2a:d9:d3:1e:c9:46:a4:08:78:41:92:72:0f:
-        ab:14:75:ed:09:f0:a2:f0:5c:ef:c3:0a:62:20:b7:c2:28:66:
-        ae:4c:2f:2e:8f:45:63:26:96:f0:ee:31:e6:8b:55:9b:aa:3a:
-        f9:82:39:1d:88:3c:e2:07:75:1a:e1:0f:b1:30:bc:71:32:d2:
-        3a:fe:fa:a1:89:f3:43:2c:d6:72:c4:79:a7:15:48:05:c0:d8:
-        2d:72:02:e3:cb:3d:16:6a:ba:c9:b8:11:10:e2:49:85:cc:96:
-        47:60:05:25:2e:ef:75:59:33:f5:47:19:16:ef:da:6c:5f:07:
-        c8:a6:50:b6:1d:cb:66:34:25:fc:66:83:eb:c5:b6:30:41:f8:
-        46:44:62:a8:c1:0c:54:e6:ea:4c:5a:28:e6:ae:c6:b7:fe:7f:
-        3b:96:a8:2e:ee:c7:68:3e:dd:00:3d:29:af:2a:63:ab:5f:ee:
-        49:2a:2d:c5:dc:fb:d1:c6:d3:d1:97:56:52:86:b6:94:eb:d4:
-        60:51:b7:fc:1e:9b:cc:02:9b:d4:1f:8f:f9:4a:8f:b6:2e:28:
-        3b:17:cc:c5:a6:05:e3:d2:d3:b5:c6:03:c9:e1:48:42:9b:cb:
-        3f:e4:17:e0:fe:0d:01:95:09:ba:b8:0d:71:e4:09:70:77:42:
-        d8:4d:e1:42:a9:60:83:d7:17:89:43:d2:d4:dd:a7:18:b6:ab:
-        d4:24:25:87:b5:d4:e2:fc:2e:22:69:bd:ad:68:2c:ff:72:b5:
-        98:aa:06:9c:e7:2a:6a:b8:a1:93:76:ce:b0:f3:7f:9c:e1:e0:
-        4f:b8:d8:86:46:a5:33:02:2c:25:61:37:2a:92:c8:ac:81:74:
-        68:63:87:33:76:bd:05:7f:5e:d5:d5:02:6d:bd:af:ff:2a:5a:
-        aa:49:ec:98:79:47:53:91:f6:0e:34:5a:c9:a5:c6:eb:b2:e3:
-        c5:ac:b6:a0:70:35:bb:c8:51:69:d0:f2:b5:a2:32:6e:bc:3f:
-        a0:37:39:7c:71:36:a6:05:df:0c:12:e4:16:a7:c5:d6:cb:63:
-        a3:95:70:3f:e6:04:a3:60
------BEGIN CERTIFICATE-----
-MIIIDjCCBfagAwIBAgIJAOiOtsn4KhQoMA0GCSqGSIb3DQEBBQUAMIG8MQswCQYD
-VQQGEwJVUzEQMA4GA1UECBMHSW5kaWFuYTEVMBMGA1UEBxMMSW5kaWFuYXBvbGlz
-MSgwJgYDVQQKEx9Tb2Z0d2FyZSBpbiB0aGUgUHVibGljIEludGVyZXN0MRMwEQYD
-VQQLEwpob3N0bWFzdGVyMR4wHAYDVQQDExVDZXJ0aWZpY2F0ZSBBdXRob3JpdHkx
-JTAjBgkqhkiG9w0BCQEWFmhvc3RtYXN0ZXJAc3BpLWluYy5vcmcwHhcNMDgwNTEz
-MDgwNzU2WhcNMTgwNTExMDgwNzU2WjCBvDELMAkGA1UEBhMCVVMxEDAOBgNVBAgT
-B0luZGlhbmExFTATBgNVBAcTDEluZGlhbmFwb2xpczEoMCYGA1UEChMfU29mdHdh
-cmUgaW4gdGhlIFB1YmxpYyBJbnRlcmVzdDETMBEGA1UECxMKaG9zdG1hc3RlcjEe
-MBwGA1UEAxMVQ2VydGlmaWNhdGUgQXV0aG9yaXR5MSUwIwYJKoZIhvcNAQkBFhZo
-b3N0bWFzdGVyQHNwaS1pbmMub3JnMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIIC
-CgKCAgEA3DbmR0LCxFF1KYdAw9iOIQbSGE7r7yC9kDyFEBOMKVuUY/b0LfEGQpG5
-GcRCaQi/izZF6igFM0lIoCdDkzWKQdh4s/Dvs24t3dHLfer0dSbTPpA67tfnLAS1
-fOH1fMVO73e9XKKTM5LOfYFIz2u1IiwIg/3T1c87Lf21SZBb9q1NE8re06adU1Fx
-Y0b4ShZcmO4tbZoWoXaQ4mBDmdaJ1mwuepiyCwMs43pPx93jzONKao15Uvr0wa8u
-jyoIyxspgpJyQ7zOiKmqp4pRQ1WFmjcDeJPI8L20QcgHQprLNZd6ioFl3h1UCAHx
-ZFy3FxpRvB7DWYd2GBaY7r/2Z4GLBjXFS21ZGcfSxki+bhQog0oQnBv1b7ypjvVp
-/rLBVcznFMn5WxRTUQfqzj3kTygfPGEJ1zPSbqdu1McTCW9rXRTunYkbpWry9vjQ
-co7qch8vNGopCsUK7BxAhRL3pqXTT63AhYxMfHMgzFMY8bJYTAH1v+pk1Vw5xc5s
-zFNaVrpBDyXfa1C2x4qgvQLCxTtVpbJkIoRRKFauMe5e+wsWTUYFkYBE7axt8Feo
-+uthSKDLG7Mfjs3FIXcDhB78rKNDCGOM7fkn77SwXWfWT+3Qiz5dW8mRvZYChD3F
-TbxCP3T9PF2sXEg2XocxLxhsxGjuoYvJWdAY4wCAs1QnLpnwFVMCAwEAAaOCAg8w
-ggILMB0GA1UdDgQWBBQ0cdE41xU2g0dr1zdkQjuOjVKdqzCB8QYDVR0jBIHpMIHm
-gBQ0cdE41xU2g0dr1zdkQjuOjVKdq6GBwqSBvzCBvDELMAkGA1UEBhMCVVMxEDAO
-BgNVBAgTB0luZGlhbmExFTATBgNVBAcTDEluZGlhbmFwb2xpczEoMCYGA1UEChMf
-U29mdHdhcmUgaW4gdGhlIFB1YmxpYyBJbnRlcmVzdDETMBEGA1UECxMKaG9zdG1h
-c3RlcjEeMBwGA1UEAxMVQ2VydGlmaWNhdGUgQXV0aG9yaXR5MSUwIwYJKoZIhvcN
-AQkBFhZob3N0bWFzdGVyQHNwaS1pbmMub3JnggkA6I62yfgqFCgwDwYDVR0TAQH/
-BAUwAwEB/zARBglghkgBhvhCAQEEBAMCAAcwCQYDVR0SBAIwADAuBglghkgBhvhC
-AQ0EIRYfU29mdHdhcmUgaW4gdGhlIFB1YmxpYyBJbnRlcmVzdDAwBglghkgBhvhC
-AQQEIxYhaHR0cHM6Ly9jYS5zcGktaW5jLm9yZy9jYS1jcmwucGVtMDIGCWCGSAGG
-+EIBAwQlFiNodHRwczovL2NhLnNwaS1pbmMub3JnL2NlcnQtY3JsLnBlbTAhBgNV
-HREEGjAYgRZob3N0bWFzdGVyQHNwaS1pbmMub3JnMA4GA1UdDwEB/wQEAwIBBjAN
-BgkqhkiG9w0BAQUFAAOCAgEAtM294LnqsgMrfjLp3nI/yUuCXp3ir1UJogxU6M8Y
-PCggHam7AwIvUjki+RfPrWeQswN/2BXja367m1YBrzXU2rnHZxeb1NUON7MgQS4M
-AcRb+WU+wmHo0vBqlXDDxm/VNaSsWXLhid+hoJ0kvSl56WEq2dMeyUakCHhBknIP
-qxR17QnwovBc78MKYiC3wihmrkwvLo9FYyaW8O4x5otVm6o6+YI5HYg84gd1GuEP
-sTC8cTLSOv76oYnzQyzWcsR5pxVIBcDYLXIC48s9Fmq6ybgREOJJhcyWR2AFJS7v
-dVkz9UcZFu/abF8HyKZQth3LZjQl/GaD68W2MEH4RkRiqMEMVObqTFoo5q7Gt/5/
-O5aoLu7HaD7dAD0prypjq1/uSSotxdz70cbT0ZdWUoa2lOvUYFG3/B6bzAKb1B+P
-+UqPti4oOxfMxaYF49LTtcYDyeFIQpvLP+QX4P4NAZUJurgNceQJcHdC2E3hQqlg
-g9cXiUPS1N2nGLar1CQlh7XU4vwuImm9rWgs/3K1mKoGnOcqarihk3bOsPN/nOHg
-T7jYhkalMwIsJWE3KpLIrIF0aGOHM3a9BX9e1dUCbb2v/ypaqknsmHlHU5H2DjRa
-yaXG67Ljxay2oHA1u8hRadDytaIybrw/oDc5fHE2pgXfDBLkFqfF1stjo5VwP+YE
-o2A=
------END CERTIFICATE-----

diff --git a/debian/changelog b/debian/changelog
index bd1327e3b80eb635c2240b9bc56a8cfa3f4f90be..7b2affe881d8c43462f5332284545d6f0c36671d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debian.org (4) stable; urgency=low
+
+  * No longer install spi's CA into /etc/ssl/certs,
+  * instead depend on the cacert-spi package.
+
+ -- Peter Palfrader <weasel@debian.org>  Sun, 25 May 2008 19:46:20 +0200
+
 debian.org (3) stable; urgency=low
 
   * Add bzip2 and less to depends.

diff --git a/debian/control b/debian/control
index 057330c253231a98911a81a9bc7c9c58b7d614c7..9a9ed7f243066349ba5e275384d1630ae9714a41 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Standards-Version: 3.7.2
 
 Package: debian.org
 Architecture: all
-Depends: userdir-ldap, zsh, tcsh, pdksh, ksh, csh, ntp, locales-all, exim4-daemon-heavy | postfix, sudo, emacs21-nox | emacs21, vim, munin-node, gnupg, bzip2, less
+Depends: userdir-ldap, zsh, tcsh, pdksh, ksh, csh, ntp, locales-all, exim4-daemon-heavy | postfix, sudo, emacs21-nox | emacs21, vim, munin-node, gnupg, bzip2, less, cacert-spi
 Recommends: mcelog, dsa-nagios-nrpe-config
 Conflicts: dchroot-dsa (<= 2:1)
 Description: debian.org host meta-package

diff --git a/debian/rules b/debian/rules
index 655ef958a54a1c72252efcb639683343c3bc7d6f..61feca680e7e933c6e1eca19e2cd6b77ccda5e63 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -16,9 +16,6 @@ binary-indep:
        install -m644 debian/changelog debian/tmp/usr/share/doc/debian.org/changelog
        gzip -9f debian/tmp/usr/share/doc/debian.org/changelog
 
-       install -d debian/tmp/etc/ssl/certs
-       install -m 644 CA.SPI-INC.ORG.pem debian/tmp/etc/ssl/certs
-
        (cd debian/tmp && find etc -type f | sed -e 's#^#/#') > debian/tmp/DEBIAN/conffiles
 
        dpkg-gencontrol -isp -pdebian.org