[nss/f20: 10/10] Merge branch 'master' into f20

[Elio Maldonado]

commit f7afdb6b3341d1518a5cf291773f14d4f6034898
Merge: c0d31ae 49e209f
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Mon Dec 2 13:48:29 2013 -0800

    Merge branch 'master' into f20

 .gitignore                           |    2 +-
 certutil_keyOpFlagsFix.patch         |   24 ++++++++++++++++++++++
 document-certutil-email-option.patch |   25 +++++++++++++++++++++++
 nss.spec                             |   36 ++++++++++++++++++++-------------
 setup-nsssysinit.xml                 |   22 ++++++++------------
 sources                              |    2 +-
 6 files changed, 82 insertions(+), 29 deletions(-)
---
diff --cc nss.spec
index 29ae9a4,d3fc86c..2f9fea9
--- a/nss.spec
+++ b/nss.spec
@@@ -742,14 -749,21 +743,22 @@@ f
  
  
  %changelog
+ * Sun Nov 24 2013 Elio Maldonado <emaldona at redhat.com> - 3.15.3-1
+ - Update to NSS_3_15_3_RTM
+ - Resolves: Bug 1031897 - CVE-2013-5605 CVE-2013-5606 CVE-2013-1741 nss: various flaws
+ - Fix option descriptions for setup-nsssysinit manpage
+ - Fix man page of nss-sysinit wrong path and other flaws
+ - Document email option for certutil manpage
+ - Remove unused patches
+ 
  * Sun Oct 27 2013 Elio Maldonado <emaldona at redhat.com> - 3.15.2-3
 -- Revert one change from last commit to preserve full nss pluggable ecc supprt [1019245]
 -
 -* Wed Oct 23 2013 Elio Maldonado <emaldona at redhat.com> - 3.15.2-2
 -- Use the full sources from upstream
 +- Use the full pristine sources from upstream
  - Bug 1019245 - ECDHE in openssl available -> NSS needs too for Firefox/Thunderbird
  
 +* Fri Oct 18 2013 Elio Maldonado <emaldona at redhat.com> - 3.15.2-2
 +- Disable the nss-ssl-cbc-random-iv-off-by-default.patch
 +- Resolves: rhbz#1020420 - Turn on the fix for BEAST by default [CVE-2011-3389]
 +
  * Thu Sep 26 2013 Elio Maldonado <emaldona at redhat.com> - 3.15.2-1
  - Update to NSS_3_15_2_RTM
  - Update iquote.patch on account of modified prototype on cert.h installed by nss-devel