[certmonger/f21: 8/8] Merge remote-tracking branch 'origin/master' into f21

[Nalin Dahyabhai]

commit dc190d98902977a6bb071b832713647af3824d47
Merge: d0851a2 b6fcbbc
Author: Nalin Dahyabhai <nalin at redhat.com>
Date:   Thu Aug 28 15:23:48 2014 -0400

    Merge remote-tracking branch 'origin/master' into f21
    
    Conflicts:
    	certmonger.spec

 .gitignore      |   10 ++++++
 certmonger.spec |   85 +++++++++++++++++++++++++++++++++++++++++++++++++++----
 sources         |    4 +-
 3 files changed, 91 insertions(+), 8 deletions(-)
---
diff --cc certmonger.spec
index 497b778,bbfa063..84d7c00
--- a/certmonger.spec
+++ b/certmonger.spec
@@@ -221,9 -236,64 +236,67 @@@ exit 
  %endif
  
  %changelog
+ * Thu Aug 28 2014 Nalin Dahyabhai <nalin at redhat.com> 0.75.14-1
+ - make pathname canonicalization slightly smarter, to handle ".." in
+   locations
+ - updates to self-tests
+ 
+ * Thu Aug 21 2014 Kevin Fenzi <kevin at scrye.com> - 0.75.13-2
+ - Rebuild for rpm bug 1131960
+ 
+ * Mon Aug 18 2014 Nalin Dahyabhai <nalin at redhat.com> 0.75.13-1
+ - add a missing test case file (whoops)
+ 
+ * Mon Aug 18 2014 Nalin Dahyabhai <nalin at redhat.com> 0.75.12-1
+ - correct encoding/decoding of variant-typed data which we receive and send
+   as part of the org.freedesktop.DBus.Properties interface over the bus, and
+   add some tests for them (based on patch from David Kupka, ticket #36)
+ 
+ * Fri Aug 15 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.75.10-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+ 
 +* Fri Aug 15 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.75.6-2
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 +
+ * Tue Aug 12 2014 Nalin Dahyabhai <nalin at redhat.com> 0.75.11-1
+ - when getcert is passed a -a flag, to indicate that CA root certificates
+   should be stored in the specified database, don't ignore locations which
+   don't include a storage scheme (#1129537)
+ - when called to 'start-tracking' with the -a or -F flags, if we have
+   applicable certificates on-hand for a CA that we're either told to use
+   or which we decide is the correct one, save the certificates (#1129696)
+ 
+ * Tue Aug  5 2014 Nalin Dahyabhai <nalin at redhat.com> 0.75.10-1
+ - when attempting to contact an IPA LDAP server, if no "ldap_uri" is set in
+   default.conf, and no "host" is set either, try to construct the server URI
+   using the "server" setting (#1126985)
+ 
+ * Thu Jul 31 2014 Nalin Dahyabhai <nalin at redhat.com> 0.75.9-1
+ - avoid potential use-after-free after a CA is removed dynamically (thanks to
+   Keenan Brock) (#1125342)
+ - add a "external-helper" property to CA objects
+ 
+ * Mon Jul 21 2014 Nalin Dahyabhai <nalin at redhat.com> 0.75.8-1
+ - add a 'refresh' option to the getcert command
+ - add a '-a' flag to the getcert command's 'refresh-ca' option
+ 
+ * Thu Jul 17 2014 Nalin Dahyabhai <nalin at redhat.com> 0.75.7-2
+ - reintroduce package Requires: on systemd-sysv on F19 and EL6 and older,
+   conditionalized it so that it's ignored on newer releases, and make
+   whether or not we call systemd-sysv-convert in triggers depend on that,
+   too (#1104138)
+ 
+ * Thu Jul 17 2014 Nalin Dahyabhai <nalin at redhat.com> 0.75.7-1
+ - fix an inconsistency in how we parse cookie values returned by CA helpers,
+   in that single-line values would lose the end-of-line after a daemon
+   restart, but not before
+ - handle timeout values and exit status values when calling CA helpers
+   in non-SUBMIT, non-POLL modes (#1118468)
+ - rework how we save CA certificates so that we save CA certificates associated
+   with end-entity certificates when we save that end-entity certificate, which
+   requires running all of the involved pre- and post-save commands
+ - drop package Requires: on systemd-sysv (#1104138)
+ 
  * Thu Jun 26 2014 Nalin Dahyabhai <nalin at redhat.com> 0.75.6-1
  - avoid potential use-after-free and read overrun after a CA is added
    dynamically (thanks to Jan Cholasta)