packages: ca-certificates/ca-certificates.spec - some merge tool needed for...

[glen]

Author: glen                         Date: Thu Jul  7 09:33:04 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- some merge tool needed for /etc/ca-certificates.conf

---- Files affected:
packages/ca-certificates:
   ca-certificates.spec (1.44 -> 1.45) 

---- Diffs:

================================================================
Index: packages/ca-certificates/ca-certificates.spec
diff -u packages/ca-certificates/ca-certificates.spec:1.44 packages/ca-certificates/ca-certificates.spec:1.45
--- packages/ca-certificates/ca-certificates.spec:1.44	Sat Jun 11 11:06:58 2011
+++ packages/ca-certificates/ca-certificates.spec	Thu Jul  7 11:32:59 2011
@@ -1,6 +1,9 @@
 # $Revision$, $Date$
 # 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#
@@ -218,6 +221,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.45  2011/07/07 09:32:59  glen
+- some merge tool needed for /etc/ca-certificates.conf
+
 Revision 1.44  2011/06/11 09:06:58  glen
 - Juur-SK included by mozilla as well
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ca-certificates/ca-certificates.spec?r1=1.44&r2=1.45&f=u