[krb5/f21: 22/23] Merge changes from master into f21

[Nalin Dahyabhai]

commit b883d575b9cac81039e9f4c224c3faeccdce18eb
Merge: e096b95 c48fd0f
Author: Nalin Dahyabhai <nalin at redhat.com>
Date:   Fri Aug 22 09:50:15 2014 -0400

    Merge changes from master into f21
    
    Update to 1.12.2.

 .gitignore                                         |    3 +
 ...-try-to-stat-not-on-disk-ccache-residuals.patch |  316 -----------
 ...su-merge-krb5_ccache_copy-and-_restricted.patch |  230 ++++++++
 ...u-don-t-stat-not-on-disk-ccache-residuals.patch |  369 +++++++++++++
 ...n-memory-cache-until-we-need-the-target-s.patch |  321 ------------
 ...-to-destroy-the-ccache-we-re-copying-from.patch |   95 ----
 0003-Use-an-intermediate-memory-cache-in-ksu.patch |  417 +++++++++++++++
 ...u-respect-the-default_ccache_name-setting.patch |  378 ++++++++++++++
 ...e-the-default_ccache_name-d-as-the-target.patch |  149 ------
 ...more-careful-of-target-ccache-collections.patch |  179 -------
 ...y-config-entries-to-the-ksu-target-ccache.patch |   12 +-
 ...-randomness-for-ksu-secondary-cache-names.patch |  115 ++++
 ...krb5_cc_new_unique-create-DIR-directories.patch |   37 ++
 krb5-1.10-doublelog.patch                          |   14 -
 krb5-1.12-CVE-2014-4341_4342-tests.patch           |  547 --------------------
 krb5-1.12-CVE-2014-4341_4342.patch                 |  163 ------
 krb5-1.12-tcl86.patch                              |  149 ------
 krb5-1.12.1-pam.patch                              |   18 +-
 krb5-master-empty-credstore.patch                  |   43 --
 krb5-master-keyring-kdcsync.patch                  |  108 ----
 krb5-master-mechd.patch                            |   38 --
 krb5-master-move-otp-sockets.patch                 |   11 +-
 krb5-master-rcache-acquirecred-leak.patch          |   26 -
 krb5-master-spnego-preserve-oid.patch              |  166 ------
 krb5-master-strdupcheck.patch                      |   23 +
 krb5.spec                                          |   83 ++--
 sources                                            |    6 +-
 27 files changed, 1637 insertions(+), 2379 deletions(-)
---
diff --cc krb5.spec
index 88048f2,cb919d8..f09ef2c
--- a/krb5.spec
+++ b/krb5.spec
@@@ -1043,9 -1023,29 +1023,32 @@@ exit 
  %{_sbindir}/uuserver
  
  %changelog
+ * Wed Aug 20 2014 Nalin Dahyabhai <nalin at redhat.com> - 1.12.2-3
+ - pull in upstream fix for an incorrect check on the value returned by a
+   strdup() call (#1132062)
+ 
 +* Sun Aug 17 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.12.1-15
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 +
+ * Sun Aug 17 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.12.2-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+ 
+ * Fri Aug 15 2014 Nalin Dahyabhai <nalin at redhat.com> - 1.12.2-1
+ - update to 1.12.2
+   - drop patch for RT#7820, fixed in 1.12.2
+   - drop patch for #231147, fixed as RT#3277 in 1.12.2
+   - drop patch for RT#7818, fixed in 1.12.2
+   - drop patch for RT#7836, fixed in 1.12.2
+   - drop patch for RT#7858, fixed in 1.12.2
+   - drop patch for RT#7924, fixed in 1.12.2
+   - drop patch for RT#7926, fixed in 1.12.2
+   - drop patches for CVE-2014-4341/CVE-2014-4342, included in 1.12.2
+   - drop patch for CVE-2014-4343, included in 1.12.2
+   - drop patch for CVE-2014-4344, included in 1.12.2
+   - drop patch for CVE-2014-4345, included in 1.12.2
+ - replace older proposed changes for ksu with backports of the changes
+   after review and merging upstream (#1015559, #1026099, #1118347)
+ 
  * Thu Aug  7 2014 Nalin Dahyabhai <nalin at redhat.com> - 1.12.1-14
  - incorporate fix for MITKRB5-SA-2014-001 (CVE-2014-4345)