move todo from separate file to .spec

diff --git a/TODO b/TODO
deleted file mode 100644 (file)
index 327e545..0000000
--- a/TODO
+++ /dev/null
@@ -1,69 +0,0 @@
-TODO:
-
-add these certs from amsn
-http://amsn.svn.sourceforge.net/viewvc/amsn/trunk/amsn/ca-certs/
-svn co https://amsn.svn.sourceforge.net/svnroot/amsn/trunk/amsn/ca-certs amsn-certs
-amsn-0.98.4/ca-certs:
-lrwxrwxrwx 1 glen glen   44 dets   8  2010 37621ded.0 -> VeriSign_International_Server_Class_3_CA.pem
-lrwxrwxrwx 1 glen glen   42 dets   8  2010 6e7f22c1.0 -> VeriSign_Class3_Extended_Validation_CA.pem
-lrwxrwxrwx 1 glen glen   32 dets   8  2010 75ced341.0 -> Microsoft_Internet_Authority.pem
-lrwxrwxrwx 1 glen glen   37 dets   8  2010 874806e2.0 -> Microsoft_Secure_Server_Authority.pem
--rw-r--r-- 1 glen glen 1,8K märts 11  2010 Microsoft_Internet_Authority.pem
--rw-r--r-- 1 glen glen 2,2K märts 11  2010 Microsoft_Secure_Server_Authority.pem
--rw-r--r-- 1 glen glen 2,1K märts 11  2010 VeriSign_Class3_Extended_Validation_CA.pem
--rw-r--r-- 1 glen glen 1,3K märts 11  2010 VeriSign_International_Server_Class_3_CA.pem
-
-this already present:
-rm -f GTE_CyberTrust_Global_Root.pem c692a373.0
-
-
-add these certs from pidgin
-http://developer.pidgin.im/viewmtn/revision/browse/d3dccc0843de29ce8d5c7e2e017028396dc2b46b/share/ca-certs
-pidgin-2.10.0/share/ca-certs:
-
-lrwxrwxrwx 1 glen users   29 Aug 27 18:15 1445ed77.0 -> DigiCertHighAssuranceCA-3.pem
-lrwxrwxrwx 1 glen users   37 Aug 27 18:15 3ac0e112.0 -> Microsoft_Secure_Server_Authority.pem
-lrwxrwxrwx 1 glen users   42 Aug 27 18:15 3ac0e112.1 -> Microsoft_Secure_Server_Authority_2010.pem
-lrwxrwxrwx 1 glen users   44 Aug 27 18:15 58546a39.0 -> VeriSign_International_Server_Class_3_CA.pem
-lrwxrwxrwx 1 glen users   42 Aug 27 18:15 6d402b6e.0 -> VeriSign_Class3_Extended_Validation_CA.pem
--rw-r--r-- 1 glen users 1.5K Aug 18 11:51 AOL_Member_CA.pem
--rw-r--r-- 1 glen users 2.2K Aug 18 11:51 CAcert_Class3.pem
-lrwxrwxrwx 1 glen users   17 Aug 27 18:15 dedcef0a.0 -> AOL_Member_CA.pem
--rw-r--r-- 1 glen users 2.3K Aug 18 11:51 DigiCertHighAssuranceCA-3.pem
-lrwxrwxrwx 1 glen users   17 Aug 27 18:15 e5662767.0 -> CAcert_Class3.pem
-lrwxrwxrwx 1 glen users   32 Aug 27 18:15 f4039b98.0 -> Microsoft_Internet_Authority.pem
-lrwxrwxrwx 1 glen users   37 Aug 27 18:15 f4039b98.1 -> Microsoft_Internet_Authority_2010.pem
--rw-r--r-- 1 glen users 1.8K Aug 18 11:51 Microsoft_Internet_Authority_2010.pem
--rw-r--r-- 1 glen users 1.8K Aug 18 11:51 Microsoft_Internet_Authority.pem
--rw-r--r-- 1 glen users 2.2K Aug 18 11:51 Microsoft_Secure_Server_Authority_2010.pem
--rw-r--r-- 1 glen users 2.2K Aug 18 11:51 Microsoft_Secure_Server_Authority.pem
--rw-r--r-- 1 glen users 2.1K Aug 18 11:51 VeriSign_Class3_Extended_Validation_CA.pem
--rw-r--r-- 1 glen users 1.3K Aug 18 11:51 VeriSign_International_Server_Class_3_CA.pem
-
-
-
-
-/usr/sbin/update-ca-certificates --fresh || :
-14:12:26 root[tty3]@haarber /#  /usr/sbin/update-ca-certificates --fresh
-Clearing symlinks in /etc/openssl/certs...done.
-Updating certificates in /etc/openssl/certs... W: /usr/share/ca-certificates/mozilla/DigiNotar_Root_CA.crt or /etc/certs/mozilla/DigiNotar_Root_CA.crt not found, but listed in /etc/ca-certificates.conf.
-WARNING: can't open config file: /etc/openssl/openssl.cnf
-WARNING: can't open config file: /etc/openssl/openssl.cnf
-WARNING: can't open config file: /etc/openssl/openssl.cnf
-WARNING: can't open config file: /etc/openssl/openssl.cnf
-WARNING: can't open config file: /etc/openssl/openssl.cnf
-WARNING: can't open config file: /etc/openssl/openssl.cnf
-WARNING: can't open config file: /etc/openssl/openssl.cnf
-WARNING: can't open config file: /etc/openssl/openssl.cnf
-WARNING: can't open config file: /etc/openssl/openssl.cnf
-WARNING: can't open config file: /etc/openssl/openssl.cnf
-WARNING: can't open config file: /etc/openssl/openssl.cnf
-WARNING: can't open config file: /etc/openssl/openssl.cnf
-WARNING: can't open config file: /etc/openssl/openssl.cnf
-WARNING: can't open config file: /etc/openssl/openssl.cnf
-WARNING: can't open config file: /etc/openssl/openssl.cnf
-WARNING: can't open config file: /etc/openssl/openssl.cnf
-14:12:31 root[tty3]@haarber /# rpm -qf /etc/openssl/openssl.cnf
-openssl-tools-1.0.0g-1.x86_64
-
-

diff --git a/ca-certificates.spec b/ca-certificates.spec
index 2e315b9c97093e48def3653f1b31095bce61a8f6..e76427d871b1bcd311176bff25be18996d9e52ca 100644 (file)
--- a/ca-certificates.spec
+++ b/ca-certificates.spec
@@ -2,7 +2,8 @@
 # - cleanup dead links from /etc/openssl/certs after -update uninstall
 # - https://bugzilla.mozilla.org/show_bug.cgi?id=549701 and
 #   http://groups.google.com/group/mozilla.dev.security.policy/browse_thread/thread/b6493a285ba79998#
 # - cleanup dead links from /etc/openssl/certs after -update uninstall
 # - https://bugzilla.mozilla.org/show_bug.cgi?id=549701 and
 #   http://groups.google.com/group/mozilla.dev.security.policy/browse_thread/thread/b6493a285ba79998#

-# - add certs noted in TODO file
+# - make amsn use system certs
+# - make pidgin use system certs

 # - swap %{certsdir}/ca-certificates.crt /etc/pki/tls/certs/ca-bundle.crt regards file vs symlink
 #
 Summary:       Common CA Certificates PEM files
 # - swap %{certsdir}/ca-certificates.crt /etc/pki/tls/certs/ca-bundle.crt regards file vs symlink
 #
 Summary:       Common CA Certificates PEM files