Merge branch 'f17' into f16

- Update nss to NSS_3_14_2_RTM

nss.spec

@@ -159,7 +159,7 @@ low level services.
 # link pem against buildroot's freebl, essential when mixing and matching
 %patch25 -p0 -b .systemfreebl
 # activate for stable and beta branches
-#%patch29 -p0 -b .cbcrandomivoff
+%patch29 -p0 -b .cbcrandomivoff
 %patch39 -p1 -b .nobypass
 %patch40 -p1 -b .noocsptest
 %patch43 -p0 -b .nosoftokentests
@@ -634,31 +634,29 @@ rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/nsslowhash.h
 - Bug 879978 - Install the nssck.api header template in a place where mod_revocator can access it
 - Install nssck.api in /usr/includes/nss3
 
-* Mon Nov 19 2012 Elio Maldonado <emaldona@redhat.com> - 3.14-10
+* Mon Nov 19 2012 Elio Maldonado <emaldona@redhat.com> - 3.14-7
 - Bug 870864 - Add support in NSS for Secure Boot
 
-* Sat Nov 10 2012 Elio Maldonado <emaldona@redhat.com> - 3.14-9
+* Fri Nov 09 2012 Elio Maldonado <emaldona@redhat.com> - 3.14-6
 - Disable bypass code at build time and return failure on attempts to enable at runtime
 - Bug 806588 - Disable SSL PKCS #11 bypass at build time
+- Fix changelog release tags to match what was actually built
 
-* Sun Nov 04 2012 Elio Maldonado <emaldona@redhat.com> - 3.14-8
+* Mon Nov 05 2012 Elio Maldonado <emaldona@redhat.com> - 3.14-5
 - Fix pk11wrap locking which fixes 'fedpkg new-sources' and 'fedpkg update' hangs
 - Bug 872124 - nss-3.14 breaks fedpkg new-sources
-- Fix should be considered preliminary since the patch may change upon upstream approval
- 
-* Thu Nov 01 2012 Elio Maldonado <emaldona@redhat.com> - 3.14-7
+
+* Thu Nov 01 2012 Elio Maldonado <emaldona@redhat.com> - 3.14-4
 - Add a dummy source file for testing /preventing fedpkg breakage
 - Helps test the fedpkg new-sources and upload commands for breakage by nss updates
 - Related to Bug 872124 - nss 3.14 breaks fedpkg new-sources
 
-* Thu Nov 01 2012 Elio Maldonado <emaldona@redhat.com> - 3.14-6
-- Fix a previous unwanted merge from f18
-- Update the SS_SSL_CBC_RANDOM_IV patch to match new sources while
-- Keeping the patch disabled while we are still in rawhide and
-- State in comment that patch is needed for both stable and beta branches
-- Update .gitignore to download only the new sources
+* Thu Nov 01 2012 Elio Maldonado <emaldona@redhat.com> - 3.14-3
+- Reenable patch to set NSS_SSL_CBC_RANDOM_IV to 1 by default
+- Update the patch to account for the new sources
+- Resolves Bug 872124 - nss 3.14 breaks fedpkg new-sources
 
-* Wed Oct 31 2012 Elio Maldonado <emaldona@redhat.com> - 3.14-5
+* Wed Oct 31 2012 Elio Maldonado <emaldona@redhat.com> - 3.14-2
 - Fix the spec file so sechash.h gets installed
 - Resolves: rhbz#871882 - missing header: sechash.h in nss 3.14
 
@@ -685,36 +683,17 @@ rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/nsslowhash.h
 * Fri Oct 05 2012 Kai Engert <kaie@redhat.com> - 3.13.6-1
 - Update to NSS_3_13_6_RTM
 
-* Mon Aug 27 2012 Elio Maldonado <emaldona@redhat.com> - 3.13.5-8
-- Rebase pem sources to fedora-hosted upstream to pick up two fixes from rhel-6.3
-- Resolves: rhbz#847460 - Fix invalid read and free on invalid cert load
-- Resolves: rhbz#847462 - PEM module may attempt to free uninitialized pointer 
-- Remove unneeded fix gcc 4.7 c++ issue in secmodt.h that actually undoes the upstream fix
-
-* Mon Aug 13 2012 Elio Maldonado <emaldona@redhat.com> - 3.13.5-7
+* Mon Aug 13 2012 Elio Maldonado <emaldona@redhat.com> - 3.13.5-2
 - Fix pluggable ecc support
 
-* Fri Jul 20 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.13.5-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Sun Jul 01 2012 Elio Maldonado <emaldona@redhat.com> - 3.13.5-5
-- Fix checkin comment to prevent unwanted expansions of percents
-
-* Sun Jul 01 2012 Elio Maldonado <emaldona@redhat.com> - 3.13.5-4
+* Sun Jul 01 2012 Elio Maldonado <emaldona@redhat.com> - 3.13.5-1
+- Update to NSS_3_13_5_RTM
 - Resolves: Bug 830410 - Missing Requires %%{?_isa}
 - Use Requires: %%{name}%%{?_isa} = %%{version}-%%{release} on tools
 - Drop zlib requires which rpmlint reports as error E: explicit-lib-dependency zlib
 - Enable sha224 portion of powerup selftest when running test suites
 - Require nspr 4.9.1
-
-* Wed Jun 20 2012 Elio Maldonado <emaldona@redhat.com> - 3.13.5-3
-- Resolves: rhbz#833529 - revert unwanted change to nss.pc.in
-
-* Tue Jun 19 2012 Elio Maldonado <emaldona@redhat.com> - 3.13.5-2
-- Resolves: rhbz#833529 - Remove unwanted space from the Libs: line on nss.pc.in
-
-* Mon Jun 18 2012 Elio Maldonado <emaldona@redhat.com> - 3.13.5-1
-- Update to NSS_3_13_5_RTM
+- Selective merge from master
 
 * Fri Apr 13 2012 Elio Maldonado <emaldona@redhat.com> - 3.13.4-3
 - Resolves: Bug 812423 - nss_Init leaks memory, fix from RHEL 6.3
@@ -844,7 +823,7 @@ rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/nsslowhash.h
 * Wed Mar 23 2011 Elio Maldonado <emaldona@redhat.com> - 3.12.9-14
 - Update to NSS_3.12.9_WITH_CKBI_1_82_RTM
 
-* Thu Feb 24 2011 Elio Maldonado <emaldona@redhat.com> - 3.12.9-13
+* Wed Feb 24 2011 Elio Maldonado <emaldona@redhat.com> - 3.12.9-13
 - Short-term fix for ssl test suites hangs on ipv6 type connections (#539183)
 
 * Fri Feb 18 2011 Elio Maldonado <emaldona@redhat.com> - 3.12.9-12
@@ -909,7 +888,7 @@ rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/nsslowhash.h
 * Sun Oct 31 2010 Elio Maldonado <emaldona@redhat.com> - 3.12.8-7
 - Tell rpm not to verify md5, size, and modtime of configurations file
 
-* Mon Oct 18 2010 Elio Maldonado <emaldona@redhat.com> - 3.12.8-6
+* Wed Oct 18 2010 Elio Maldonado <emaldona@redhat.com> - 3.12.8-6
 - Fix certificates trust order (#643134)
 - Apply nss-sysinit-userdb-first.patch last
 
@@ -963,7 +942,7 @@ rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/nsslowhash.h
 * Mon Aug 09 2010 Elio Maldonado <emaldona@redhat.com> - 3.12.6-10
 - Add support for PKCS#8 encoded PEM RSA private key files (#614532)
 
-* Sat Jul 31 2010 Elio Maldonado <emaldona@redhat.com> - 3.12.6-9
+* Fri Jul 31 2010 Elio Maldonado <emaldona@redhat.com> - 3.12.6-9
 - Fix nsssysinit to return userdb ahead of systemdb (#603313)
 
 * Tue Jun 08 2010 Dennis Gilmore <dennis@ausil.us> - 3.12.6-8
@@ -975,7 +954,7 @@ rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/nsslowhash.h
 * Sun Jun 06 2010 Elio Maldonado <emaldona@redhat.com> - 3.12.6-6
 - Fix SIGSEGV within CreateObject (#596674)
 
-* Mon Apr 12 2010 Elio Maldonado <emaldona@redhat.com> - 3.12.6-5
+* Sat Apr 12 2010 Elio Maldonado <emaldona@redhat.com> - 3.12.6-5
 - Update pem source tar to pick up the following bug fixes:
 - PEM - Allow collect objects to search through all objects
 - PEM - Make CopyObject return a new shallow copy
@@ -1056,7 +1035,7 @@ rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/nsslowhash.h
 - Require nss-softoken of same architecture as nss (#527867)
 - Merge setup-nsssysinit.sh improvements from F-12 (#527051)
 
-* Sat Oct 03 2009 Elio Maldonado<emaldona@redhat.com> - 3.12.4-13
+* Mon Oct 03 2009 Elio Maldonado<emaldona@redhat.com> - 3.12.4-13
 - User no longer prompted for a password when listing keys an empty system db (#527048)
 - Fix setup-nsssysinit to handle more general formats (#527051)
 
@@ -1130,13 +1109,13 @@ rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/nsslowhash.h
 - Fix nss-config not to include nssutil
 - Add BuildRequires on nss-softokn and nss-util since build also runs the test suite
 
-* Thu Aug 27 2009 Elio Maldonado<emaldona@redhat.com> - 3.12.3.99.3-21
+* Wed Aug 27 2009 Elio Maldonado<emaldona@redhat.com> - 3.12.3.99.3-21
 - disabling all tests while we investigate a buffer overflow bug
 
-* Thu Aug 27 2009 Elio Maldonado<emaldona@redhat.com> - 3.12.3.99.3-20
+* Wed Aug 27 2009 Elio Maldonado<emaldona@redhat.com> - 3.12.3.99.3-20
 - disabling some tests while we investigate a buffer overflow bug - 519766
 
-* Thu Aug 27 2009 Elio Maldonado<emaldona@redhat.com> - 3.12.3.99.3-19
+* Wed Aug 27 2009 Elio Maldonado<emaldona@redhat.com> - 3.12.3.99.3-19
 - remove patches that are now in nss-softokn and
 - remove spurious exec-permissions for nss.pc per rpmlint
 - single requires line in nss.pc.in
@@ -1173,7 +1152,7 @@ rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/nsslowhash.h
 * Thu Aug 20 2009 Dennis Gilmore <dennis@ausil.us> - 3.12.3.99.3-9
 - dont install libnssutil3.so since its now in nss-util
 
-* Thu Aug 06 2009 Elio Maldonado <emaldona@redhat.com> - 3.12.3.99.3-7.1
+* Sat Aug 06 2009 Elio Maldonado <emaldona@redhat.com> - 3.12.3.99.3-7.1
 - Fix spec file problems uncovered by Fedora_12_Mass_Rebuild
 
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.12.3.99.3-7
@@ -1191,7 +1170,7 @@ rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/nsslowhash.h
 - fix numerous gcc warnings. (500815)
 - fix to support arbitrarily long password while loading a private key. (500180) 
 - fix memory leak in make_key and memory leaks and return values in pem_mdSession_Login (501191)
-* Mon Jun 08 2009 Elio Maldonado <emaldona@redhat.com> - 3.12.3.99.3-4
+* Fri Jun 08 2009 Elio Maldonado <emaldona@redhat.com> - 3.12.3.99.3-4
 - add patch for bug 502133 upstream bug 496997
 * Fri Jun 05 2009 Kai Engert <kaie@redhat.com> - 3.12.3.99.3-3
 - rebuild with higher release number for upgrade sanity
@@ -1389,5 +1368,5 @@ rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/nsslowhash.h
 - Adressed review comments by Wan-Teh Chang, Bob Relyea,
   Christopher Aillon.
 
-* Sat Jul  9 2005 Rob Crittenden <rcritten@redhat.com> 3.10-1
+* Tue Jul  9 2005 Rob Crittenden <rcritten@redhat.com> 3.10-1
 - Initial build