[nss/f18: 26/26] Merge branch 'f19' into f18 - to update to nss-3.15.1
Elio Maldonado
emaldonado at fedoraproject.org
Mon Jul 22 23:13:58 UTC 2013
commit e52ccd19ae082530475027a536e3c6047eb686b6
Merge: 60d1b4b 862bb14
Author: Elio Maldonado <emaldona at redhat.com>
Date: Sun Jul 21 11:32:15 2013 -0700
Merge branch 'f19' into f18 - to update to nss-3.15.1
.gitignore | 5 +-
0001-sync-up-with-upstream-softokn-changes.patch | 6 +-
...96651-pem-dont-trash-keys-on-failed-login.patch | 4 +-
TestCA.ca.cert | Bin 0 -> 628 bytes
TestUser50.cert | Bin 0 -> 615 bytes
TestUser51.cert | Bin 0 -> 615 bytes
add-relro-linker-option.patch | 8 +-
disable-ocsp-stapling-tests.patch | 9 +
dummy-sources-for-testing | 2 +
iquote.patch | 38 +++
mozilla-crypto-strip.sh | 12 +-
no-softoken-freebl-tests.patch | 39 ---
nss-3.14.0.0-disble-ocsp-test.patch | 9 +-
nss-539183.patch | 22 +-
nss-646045.patch | 12 +-
nss-config.xml | 132 +++++++++
nss-enable-pem.patch | 10 +-
nss-skip-bltest-and-fipstest.patch | 17 ++
nss-ssl-cbc-random-iv-off-by-default.patch | 16 +-
nss-ssl-enforce-no-pkcs11-bypass.path | 15 +-
nss-versus-softoken-tests.patch | 38 +++
nss.spec | 303 ++++++++++++--------
nsspem-use-system-freebl.patch | 31 +--
renegotiate-transitional.patch | 10 +-
setup-nsssysinit.xml | 110 +++++++
sources | 5 +-
utilwrap-include-templates.patch | 14 +
27 files changed, 612 insertions(+), 255 deletions(-)
---
diff --cc nss.spec
index 32f64b5,c2f1480..dc84ce4
--- a/nss.spec
+++ b/nss.spec
@@@ -1,9 -1,18 +1,10 @@@
- %global nspr_version 4.9.5
- %global nss_util_version 3.14.3
+ %global nspr_version 4.10
+ %global nss_util_version 3.15.1
%global nss_softokn_fips_version 3.12.9
- %global nss_softokn_version 3.14.3
+ %global nss_softokn_version 3.15.1
%global unsupported_tools_directory %{_libdir}/nss/unsupported-tools
+ %global allTools "certutil cmsutil crlutil derdump modutil pk12util pp signtool signver ssltap vfychain vfyserv"
-# solution taken from icedtea-web.spec
-%define multilib_arches ppc64 sparc64 x86_64
-%ifarch %{multilib_arches}
-%define alt_ckbi libnssckbi.so.%{_arch}
-%else
-%define alt_ckbi libnssckbi.so
-%endif
-
# Define if using a source archive like "nss-version.with.ckbi.version".
# To "disable", add "#" to start of line, AND a space after "%".
#% define nss_ckbi_suffix .with.ckbi.1.93
@@@ -169,11 -189,32 +179,32 @@@ low level services
%patch25 -p0 -b .systemfreebl
# activate for stable and beta branches
%patch29 -p0 -b .cbcrandomivoff
- %patch39 -p1 -b .nobypass
- %patch40 -p1 -b .noocsptest
- %patch43 -p0 -b .nosoftokentests
-#%patch39 -p0 -b .nobypass
++%patch39 -p0 -b .nobypass
+ %patch40 -p0 -b .noocsptest
%patch44 -p1 -b .syncupwithupstream
%patch45 -p0 -b .notrash
+ %patch46 -p0 -b .skipoutbound
+ %patch47 -p0 -b .templates
+ %patch48 -p0 -b .crypto
+ %patch49 -p0 -b .skipthem
+ %patch50 -p0 -b .iquote
+
+ #########################################################
+ # Higher-level libraries and test tools need access to
+ # module-private headers from util, freebl, and softoken
+ # until fixed upstream we must copy some headers locally
+ #########################################################
+
+ pemNeedsFromSoftoken="lowkeyi lowkeyti softoken softoknt"
+ for file in ${pemNeedsFromSoftoken}; do
+ %{__cp} ./nss/lib/softoken/${file}.h ./nss/lib/ckfw/pem/
+ done
+
+ # Copying these header util the upstream bug is accepted
+ # Upstream https://bugzilla.mozilla.org/show_bug.cgi?id=820207
+ %{__cp} ./nss/lib/softoken/lowkeyi.h ./nss/cmd/rsaperf
+ %{__cp} ./nss/lib/softoken/lowkeyti.h ./nss/cmd/rsaperf
+
%build
@@@ -619,10 -723,43 +668,18 @@@ don
%changelog
-* Tue Jul 02 2013 Elio Maldonado <emaldona at redhat.com> - 3.15.1-1
++* Sun Jul 21 2013 Elio Maldonado <emaldona at redhat.com> - 3.15.1-1
+ - Update to NSS_3_15_1_RTM
-- Enable the iquote.patch to access newly introduced types
-
-* Wed Jun 19 2013 Elio Maldonado <emaldona at redhat.com> - 3.15-5
-- Install man pages for nss-tools and the nss-config and setup-nsssysinit scripts
++- Enable iquote.patch to access newly introduced types
++- Install man pages for nss-config and setup-nsssysinit
+ - Resolves: rhbz#606020 - nss security tools lack man pages
++- Resolves: rhbz#689918 -build nss without softoken or util sources in the tree
++- Fix NSS_VMAJOR, NSS_VMINOR, and NSS_VPATCH generation for nss-config
+
-* Tue Jun 18 2013 emaldona <emaldona at redhat.com> - 3.15-4
-- Build nss without softoken or util sources in the tree
-- Resolves: rhbz#689918
-
-* Mon Jun 17 2013 emaldona <emaldona at redhat.com> - 3.15-3
-- Update ssl-cbc-random-iv-by-default.patch
-
-* Sun Jun 16 2013 Elio Maldonado <emaldona at redhat.com> - 3.15-2
-- Fix generation of NSS_VMAJOR, NSS_VMINOR, and NSS_VPATCH for nss-config
-
-* Sat Jun 15 2013 Elio Maldonado <emaldona at redhat.com> - 3.15-1
-- Update to NSS_3_15_RTM
-
-* Tue May 14 2013 Elio Maldonado <emaldona at redhat.com> - 3.14.3-13.0
-- Reactivate nss-ssl-cbc-random-iv-off-by-default.patch
-
-* Fri Apr 19 2013 Kai Engert <kaie at redhat.com> - 3.14.3-12.0
+* Mon Apr 22 2013 Kai Engert <kaie at redhat.com> - 3.14.3-2
- Add upstream patch to fix rhbz#872761
-
-* Sun Mar 24 2013 Kai Engert <kaie at redhat.com> - 3.14.3-11
- Update expired test certificates (fixed in upstream bug 852781)
-* Fri Mar 08 2013 Kai Engert <kaie at redhat.com> - 3.14.3-10
-- Fix incorrect post/postun scripts. Fix broken links in posttrans.
-
-* Wed Mar 06 2013 Kai Engert <kaie at redhat.com> - 3.14.3-9
-- Configure libnssckbi.so to use the alternatives system
- in order to prepare for a drop in replacement.
-
* Fri Feb 15 2013 Elio Maldonado <emaldona at redhat.com> - 3.14.3-1
- Update to NSS_3_14_3_RTM
- sync up pem rsawrapr.c with softoken upstream changes for nss-3.14.3
More information about the scm-commits
mailing list