[nss-softokn/f16: 60/60] Merge branch 'f17' into f16
Elio Maldonado
emaldonado at fedoraproject.org
Tue Dec 18 03:48:11 UTC 2012
commit 70c226d61ad8036ed18f2bf8573cde0520e2411c
Merge: d5a7dc3 f15799f
Author: Elio Maldonado <emaldona at redhat.com>
Date: Mon Dec 17 19:31:49 2012 -0800
Merge branch 'f17' into f16
.gitignore | 3 +-
Bug-829088-nss-3.13.4-fips-sha224-selftest.patch | 18 +
add-relro-linker-option.patch | 16 -
drbg.patch | 481 ---
nss-softokn.spec | 67 +-
softoken-minimal-test-dependencies.patch | 3996 +---------------------
sources | 2 +-
7 files changed, 82 insertions(+), 4501 deletions(-)
---
diff --cc nss-softokn.spec
index 2ece175,00b42d1..ec1f222
--- a/nss-softokn.spec
+++ b/nss-softokn.spec
@@@ -9,8 -9,9 +9,9 @@@
%{?__debug_package:%{__debug_install_post}} \
%{__arch_install_post} \
%{__os_install_post} \
+ export LD_LIBRARY_PATH=$RPM_BUILD_ROOT/%{_libdir} \
$RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_libdir}/libsoftokn3.so \
- $RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_libdir}/libfreebl3.so \
+ $RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_lib}/libfreebl3.so \
$RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_libdir}/libnssdbm3.so \
%{nil}
@@@ -417,8 -375,17 +393,17 @@@ don
%{_includedir}/nss3/shsign.h
%changelog
-* Mon Nov 19 2012 Elio Maldonado <emaldona at redhat.com> - 3.14-5
++* Mon Dec 17 2012 Elio Maldonado <emaldona at redhat.com> - 3.14-5
+ - Update to NSS_3_14_RTM
+ - Restore and update patch for Bug 829088 for code changes in nss-3.14
+ - Update the license to MPLv2.0
+ - Add export LD_LIBRARY_PATH=$RPM_BUILD_ROOT/%{_libdir} to the signing commands
+ - Ensures in-tree libraries are the ones the shlibsign tools dynamically links to
+ - Now we digest and sign with SHA256 and before we used SHA1 and verification would fail
+ - This is a temporary fix while the buildroot is being bootstrapped
+ - Can be removed in the next build
+
-* Fri Oct 26 2012 Elio Maldonado <emaldona at redhat.com> - 3.13.6-2
+* Tue Nov 13 2012 Elio Maldonado <emaldona at redhat.com> - 3.13.6-2
- Bootstrapping build prior to upcoming update of nss packages to nss-3.14
- Don't install sechasht.h as nss-util-devel will install when updated to 3.14
- Prevent update conflict between nss-util-devel-3.14 and nss-softokn-devel-3.13.6
diff --cc softoken-minimal-test-dependencies.patch
index 52abbff,b8daa9c..51e0cd2
--- a/softoken-minimal-test-dependencies.patch
+++ b/softoken-minimal-test-dependencies.patch
@@@ -3991,28 -54,10 +54,28 @@@ diff -up ./mozilla/security/nss/cmd/man
$(NULL)
TEMPORARILY_DONT_BUILD = \
--diff -up ./mozilla/security/nss/cmd/platlibs.mk.crypto ./mozilla/security/nss/cmd/platlibs.mk
- --- ./mozilla/security/nss/cmd/platlibs.mk.crypto 2010-06-11 17:58:33.000000000 -0700
- +++ ./mozilla/security/nss/cmd/platlibs.mk 2012-04-01 13:15:51.540584249 -0700
- @@ -92,43 +92,13 @@ DEFINES += -DNSS_USE_STATIC_LIBS
---- ./mozilla/security/nss/cmd/platlibs.mk.crypto 2012-07-17 15:22:42.000000000 +0000
-+++ ./mozilla/security/nss/cmd/platlibs.mk 2012-10-02 16:03:14.388622383 +0000
-@@ -56,25 +56,9 @@ PKIXLIB = \
++diff -up mozilla/security/nss/cmd/platlibs.mk.crypto mozilla/security/nss/cmd/platlibs.mk
++--- mozilla/security/nss/cmd/platlibs.mk.crypto 2010-06-11 17:58:33.000000000 -0700
+++++ mozilla/security/nss/cmd/platlibs.mk 2011-10-11 10:40:37.319478239 -0700
++@@ -92,44 +92,13 @@ DEFINES += -DNSS_USE_STATIC_LIBS
+ # $(PROGRAM) has explicit dependencies on $(EXTRA_LIBS)
+ CRYPTOLIB=$(SOFTOKEN_LIB_DIR)/$(LIB_PREFIX)freebl.$(LIB_SUFFIX)
+
+-PKIXLIB = \
+- $(DIST)/lib/$(LIB_PREFIX)pkixtop.$(LIB_SUFFIX) \
+- $(DIST)/lib/$(LIB_PREFIX)pkixutil.$(LIB_SUFFIX) \
+- $(DIST)/lib/$(LIB_PREFIX)pkixsystem.$(LIB_SUFFIX) \
+- $(DIST)/lib/$(LIB_PREFIX)pkixcrlsel.$(LIB_SUFFIX) \
+- $(DIST)/lib/$(LIB_PREFIX)pkixmodule.$(LIB_SUFFIX) \
+- $(DIST)/lib/$(LIB_PREFIX)pkixstore.$(LIB_SUFFIX) \
+- $(DIST)/lib/$(LIB_PREFIX)pkixparams.$(LIB_SUFFIX) \
+- $(DIST)/lib/$(LIB_PREFIX)pkixchecker.$(LIB_SUFFIX) \
+- $(DIST)/lib/$(LIB_PREFIX)pkixpki.$(LIB_SUFFIX) \
+- $(DIST)/lib/$(LIB_PREFIX)pkixtop.$(LIB_SUFFIX) \
+- $(DIST)/lib/$(LIB_PREFIX)pkixresults.$(LIB_SUFFIX) \
+- $(DIST)/lib/$(LIB_PREFIX)pkixcertsel.$(LIB_SUFFIX)
+-
+ # can't do this in manifest.mn because OS_ARCH isn't defined there.
ifeq (,$(filter-out WINNT WINCE,$(OS_ARCH)))
EXTRA_LIBS += \
@@@ -4035,10 -80,10 +98,11 @@@
- $(PKIXLIB) \
- $(DBMLIB) \
- $(DIST)/lib/$(LIB_PREFIX)$(SQLITE_LIB_NAME).$(LIB_SUFFIX) \
-- $(DIST)/lib/$(LIB_PREFIX)nssutil3.$(LIB_SUFFIX) \
++- $(DIST)/lib/$(LIB_PREFIX)nssutil3.$(LIB_SUFFIX) \
$(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plc4.$(LIB_SUFFIX) \
$(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plds4.$(LIB_SUFFIX) \
- @@ -143,30 +113,9 @@ EXTRA_LIBS += \
-@@ -89,30 +73,9 @@ EXTRA_LIBS += \
++ $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)nspr4.$(LIB_SUFFIX) \
++@@ -143,30 +112,9 @@ EXTRA_LIBS += \
else
EXTRA_LIBS += \
@@@ -4069,41 -114,20 +133,53 @@@
$(NULL)
ifeq ($(OS_ARCH), AIX)
- @@ -199,8 +148,6 @@ ifeq (,$(filter-out WINNT WINCE,$(OS_ARC
-@@ -145,9 +108,6 @@ ifeq (,$(filter-out WINNT WINCE,$(OS_ARC
++@@ -199,9 +147,6 @@ ifeq (,$(filter-out WINNT WINCE,$(OS_ARC
EXTRA_LIBS += \
$(DIST)/lib/$(LIB_PREFIX)sectool.$(LIB_SUFFIX) \
$(DIST)/lib/$(IMPORT_LIB_PREFIX)nssutil3$(IMPORT_LIB_SUFFIX) \
- $(DIST)/lib/$(IMPORT_LIB_PREFIX)smime3$(IMPORT_LIB_SUFFIX) \
- $(DIST)/lib/$(IMPORT_LIB_PREFIX)ssl3$(IMPORT_LIB_SUFFIX) \
- $(DIST)/lib/$(IMPORT_LIB_PREFIX)nss3$(IMPORT_LIB_SUFFIX) \
+ - $(DIST)/lib/$(IMPORT_LIB_PREFIX)nss3$(IMPORT_LIB_SUFFIX) \
$(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plc4$(IMPORT_LIB_SUFFIX) \
$(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plds4$(IMPORT_LIB_SUFFIX) \
- @@ -227,8 +174,6 @@ endif
+ $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)nspr4$(IMPORT_LIB_SUFFIX) \
-diff -up ./mozilla/security/nss/tests/all.sh.crypto ./mozilla/security/nss/tests/all.sh
---- ./mozilla/security/nss/tests/all.sh.crypto 2012-06-13 18:16:39.000000000 +0000
-+++ ./mozilla/security/nss/tests/all.sh 2012-10-02 15:59:32.217547061 +0000
-@@ -295,13 +295,13 @@ if [ -z "${INIT_SOURCED}" -o "${INIT_SOU
++@@ -227,9 +172,6 @@ endif
+ # $(EXTRA_SHARED_LIBS) come before $(OS_LIBS), except on AIX.
+ EXTRA_SHARED_LIBS += \
+ -L$(DIST)/lib \
+- -lssl3 \
+- -lsmime3 \
- -lnss3 \
++- -lnss3 \
+ -L$(NSSUTIL_LIB_DIR) \
+ -lnssutil3 \
- diff -up ./mozilla/security/nss/tests/all.sh.crypto ./mozilla/security/nss/tests/all.sh
- --- ./mozilla/security/nss/tests/all.sh.crypto 2012-04-01 13:21:51.519603762 -0700
- +++ ./mozilla/security/nss/tests/all.sh 2012-04-01 13:22:41.577606476 -0700
- @@ -303,10 +303,10 @@ run_cycles()
++ -L$(NSPR_LIB_DIR) \
++diff -up mozilla/security/nss/tests/all.sh.crypto mozilla/security/nss/tests/all.sh
++--- mozilla/security/nss/tests/all.sh.crypto 2010-01-29 11:58:40.000000000 -0800
+++++ mozilla/security/nss/tests/all.sh 2011-10-11 11:06:41.884531933 -0700
++@@ -303,18 +303,18 @@ run_cycles()
+
+ ############################## main code ###############################
+
+-cycles="standard pkix upgradedb sharedb"
++cycles="standard"
+ CYCLES=${NSS_CYCLES:-$cycles}
+
+-tests="cipher libpkix cert dbtests tools fips sdr crmf smime ssl ocsp merge pkits chains"
++tests="cipher"
+ TESTS=${NSS_TESTS:-$tests}
+
+ ALL_TESTS=${TESTS}
++
++-nss_ssl_tests="crl bypass_normal normal_bypass fips_normal normal_fips iopr"
+++nss_ssl_tests=""
++ NSS_SSL_TESTS="${NSS_SSL_TESTS:-$nss_ssl_tests}"
++
++-nss_ssl_run="cov auth stress"
+++nss_ssl_run=""
++ NSS_SSL_RUN="${NSS_SSL_RUN:-$nss_ssl_run}"
++
++ SCRIPTNAME=all.sh
+@@ -328,13 +328,20 @@ if [ -z "${INIT_SOURCED}" -o "${INIT_SOU
fi
# NOTE:
More information about the scm-commits
mailing list