From: Elan Ruusamäe <glen@pld-linux.org>
Date: Thu, 7 Jul 2011 09:32:59 +0000 (+0000)
Subject: - some merge tool needed for /etc/ca-certificates.conf
X-Git-Tag: auto/ac/ca-certificates-20110502-1~3
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fca-certificates.git;a=commitdiff_plain;h=71d873a8a43900716a07e6e688aa79b7211b006e

- some merge tool needed for /etc/ca-certificates.conf

Changed files:
    ca-certificates.spec -> 1.45
---

diff --git a/ca-certificates.spec b/ca-certificates.spec
index 8387a26..88dd8bb 100644
--- a/ca-certificates.spec
+++ b/ca-certificates.spec
@@ -1,5 +1,8 @@
 # TODO
 # - cleanup dead links from /etc/openssl/certs after -update uninstall
+# - deal with removed (renamed) certs on upgrade (as new config is created as
+#   .rpmnew). create some merge tool (or split /etc/ca-certificates.conf to
+#   /etc/ca-certificates.d): http://pastebin.com/04hZd2x0
 #
 # - https://bugzilla.mozilla.org/show_bug.cgi?id=549701 and
 #   http://groups.google.com/group/mozilla.dev.security.policy/browse_thread/thread/b6493a285ba79998#