From 4d04992e9a384d7e1a9472afd269f0b004bf13bc Mon Sep 17 00:00:00 2001 From: Elio Maldonado Date: Tue, 6 May 2014 09:32:26 -0700 Subject: [PATCH] Update to nss-3.16.1 - Update the iquote patch on account of the rebase - Improve error detection in the %section - Resolves: Bug 1094702 - nss-3.16.1 is available --- .gitignore | 2 +- iquote.patch | 56 +++++++++++++++++++++++++++++++--------------------- nss.spec | 46 ++++++++++++++++++++++++++++++++---------- sources | 2 +- 4 files changed, 72 insertions(+), 34 deletions(-) diff --git a/.gitignore b/.gitignore index c78c5da..f096800 100644 --- a/.gitignore +++ b/.gitignore @@ -8,4 +8,4 @@ TestCA.ca.cert TestUser50.cert TestUser51.cert /nss-pem-20140125.tar.bz2 -/nss-3.16.0.tar.gz +/nss-3.16.1.tar.gz diff --git a/iquote.patch b/iquote.patch index 586d37b..2d853c7 100644 --- a/iquote.patch +++ b/iquote.patch @@ -1,6 +1,6 @@ diff -up nss/cmd/bltest/Makefile.iquote nss/cmd/bltest/Makefile ---- nss/cmd/bltest/Makefile.iquote 2014-01-03 11:59:10.000000000 -0800 -+++ nss/cmd/bltest/Makefile 2014-01-07 13:30:04.465429623 -0800 +--- nss/cmd/bltest/Makefile.iquote 2014-05-01 20:27:18.000000000 -0700 ++++ nss/cmd/bltest/Makefile 2014-05-06 07:15:41.173387799 -0700 @@ -45,6 +45,7 @@ include $(CORE_DEPTH)/coreconf/rules.mk # (6) Execute "component" rules. (OPTIONAL) # ####################################################################### @@ -10,8 +10,8 @@ diff -up nss/cmd/bltest/Makefile.iquote nss/cmd/bltest/Makefile ####################################################################### diff -up nss/cmd/lib/Makefile.iquote nss/cmd/lib/Makefile ---- nss/cmd/lib/Makefile.iquote 2014-01-03 11:59:10.000000000 -0800 -+++ nss/cmd/lib/Makefile 2014-01-07 13:30:04.465429623 -0800 +--- nss/cmd/lib/Makefile.iquote 2014-05-01 20:27:18.000000000 -0700 ++++ nss/cmd/lib/Makefile 2014-05-06 07:15:41.174387806 -0700 @@ -38,7 +38,8 @@ include $(CORE_DEPTH)/coreconf/rules.mk # (6) Execute "component" rules. (OPTIONAL) # ####################################################################### @@ -22,9 +22,20 @@ diff -up nss/cmd/lib/Makefile.iquote nss/cmd/lib/Makefile ####################################################################### # (7) Execute "local" rules. (OPTIONAL). # +diff -up nss/cmd/modutil/Makefile.iquote nss/cmd/modutil/Makefile +--- nss/cmd/modutil/Makefile.iquote 2014-05-06 07:34:30.055124213 -0700 ++++ nss/cmd/modutil/Makefile 2014-05-06 07:35:36.016602770 -0700 +@@ -41,6 +41,7 @@ include $(CORE_DEPTH)/coreconf/rules.mk + # (6) Execute "component" rules. (OPTIONAL) # + ####################################################################### + ++INCLUDES += -iquote $(DIST)/../public/nss + + + ####################################################################### diff -up nss/cmd/selfserv/Makefile.iquote nss/cmd/selfserv/Makefile ---- nss/cmd/selfserv/Makefile.iquote 2014-03-14 13:31:59.000000000 -0700 -+++ nss/cmd/selfserv/Makefile 2014-03-18 14:48:16.065834825 -0700 +--- nss/cmd/selfserv/Makefile.iquote 2014-05-01 20:27:18.000000000 -0700 ++++ nss/cmd/selfserv/Makefile 2014-05-06 07:15:41.175387813 -0700 @@ -35,7 +35,8 @@ include $(CORE_DEPTH)/coreconf/rules.mk # (6) Execute "component" rules. (OPTIONAL) # ####################################################################### @@ -36,8 +47,8 @@ diff -up nss/cmd/selfserv/Makefile.iquote nss/cmd/selfserv/Makefile ####################################################################### # (7) Execute "local" rules. (OPTIONAL). # diff -up nss/cmd/ssltap/Makefile.iquote nss/cmd/ssltap/Makefile ---- nss/cmd/ssltap/Makefile.iquote 2014-03-14 13:31:59.000000000 -0700 -+++ nss/cmd/ssltap/Makefile 2014-03-18 14:48:16.065834825 -0700 +--- nss/cmd/ssltap/Makefile.iquote 2014-05-01 20:27:18.000000000 -0700 ++++ nss/cmd/ssltap/Makefile 2014-05-06 07:15:41.176387820 -0700 @@ -39,7 +39,8 @@ include $(CORE_DEPTH)/coreconf/rules.mk # (6) Execute "component" rules. (OPTIONAL) # ####################################################################### @@ -49,8 +60,8 @@ diff -up nss/cmd/ssltap/Makefile.iquote nss/cmd/ssltap/Makefile ####################################################################### # (7) Execute "local" rules. (OPTIONAL). # diff -up nss/cmd/strsclnt/Makefile.iquote nss/cmd/strsclnt/Makefile ---- nss/cmd/strsclnt/Makefile.iquote 2014-03-14 13:31:59.000000000 -0700 -+++ nss/cmd/strsclnt/Makefile 2014-03-18 14:48:16.065834825 -0700 +--- nss/cmd/strsclnt/Makefile.iquote 2014-05-01 20:27:18.000000000 -0700 ++++ nss/cmd/strsclnt/Makefile 2014-05-06 07:15:41.177387827 -0700 @@ -36,7 +36,8 @@ include $(CORE_DEPTH)/coreconf/rules.mk # (6) Execute "component" rules. (OPTIONAL) # ####################################################################### @@ -62,8 +73,8 @@ diff -up nss/cmd/strsclnt/Makefile.iquote nss/cmd/strsclnt/Makefile ####################################################################### # (7) Execute "local" rules. (OPTIONAL). # diff -up nss/cmd/tstclnt/Makefile.iquote nss/cmd/tstclnt/Makefile ---- nss/cmd/tstclnt/Makefile.iquote 2014-03-14 13:31:59.000000000 -0700 -+++ nss/cmd/tstclnt/Makefile 2014-03-18 14:48:16.065834825 -0700 +--- nss/cmd/tstclnt/Makefile.iquote 2014-05-01 20:27:18.000000000 -0700 ++++ nss/cmd/tstclnt/Makefile 2014-05-06 07:15:41.178387834 -0700 @@ -37,6 +37,8 @@ include $(CORE_DEPTH)/coreconf/rules.mk ####################################################################### @@ -74,8 +85,8 @@ diff -up nss/cmd/tstclnt/Makefile.iquote nss/cmd/tstclnt/Makefile ####################################################################### # (7) Execute "local" rules. (OPTIONAL). # diff -up nss/cmd/vfyserv/Makefile.iquote nss/cmd/vfyserv/Makefile ---- nss/cmd/vfyserv/Makefile.iquote 2014-03-18 14:49:25.794897961 -0700 -+++ nss/cmd/vfyserv/Makefile 2014-03-18 14:50:03.817477638 -0700 +--- nss/cmd/vfyserv/Makefile.iquote 2014-05-01 20:27:18.000000000 -0700 ++++ nss/cmd/vfyserv/Makefile 2014-05-06 07:15:41.179387841 -0700 @@ -37,6 +37,8 @@ include $(CORE_DEPTH)/coreconf/rules.mk ####################################################################### @@ -86,8 +97,8 @@ diff -up nss/cmd/vfyserv/Makefile.iquote nss/cmd/vfyserv/Makefile ####################################################################### # (7) Execute "local" rules. (OPTIONAL). # diff -up nss/coreconf/location.mk.iquote nss/coreconf/location.mk ---- nss/coreconf/location.mk.iquote 2014-01-03 11:59:10.000000000 -0800 -+++ nss/coreconf/location.mk 2014-01-07 13:30:04.465429623 -0800 +--- nss/coreconf/location.mk.iquote 2014-05-01 20:27:18.000000000 -0700 ++++ nss/coreconf/location.mk 2014-05-06 07:15:41.180387848 -0700 @@ -45,6 +45,10 @@ endif ifdef NSS_INCLUDE_DIR @@ -100,8 +111,8 @@ diff -up nss/coreconf/location.mk.iquote nss/coreconf/location.mk ifndef NSS_LIB_DIR diff -up nss/lib/certhigh/Makefile.iquote nss/lib/certhigh/Makefile ---- nss/lib/certhigh/Makefile.iquote 2014-01-03 11:59:10.000000000 -0800 -+++ nss/lib/certhigh/Makefile 2014-01-07 13:30:04.466429634 -0800 +--- nss/lib/certhigh/Makefile.iquote 2014-05-01 20:27:18.000000000 -0700 ++++ nss/lib/certhigh/Makefile 2014-05-06 07:15:41.181387855 -0700 @@ -38,7 +38,7 @@ include $(CORE_DEPTH)/coreconf/rules.mk # (6) Execute "component" rules. (OPTIONAL) # ####################################################################### @@ -112,8 +123,8 @@ diff -up nss/lib/certhigh/Makefile.iquote nss/lib/certhigh/Makefile ####################################################################### # (7) Execute "local" rules. (OPTIONAL). # diff -up nss/lib/cryptohi/Makefile.iquote nss/lib/cryptohi/Makefile ---- nss/lib/cryptohi/Makefile.iquote 2014-01-03 11:59:10.000000000 -0800 -+++ nss/lib/cryptohi/Makefile 2014-01-07 13:30:04.466429634 -0800 +--- nss/lib/cryptohi/Makefile.iquote 2014-05-01 20:27:18.000000000 -0700 ++++ nss/lib/cryptohi/Makefile 2014-05-06 07:15:41.182387862 -0700 @@ -38,7 +38,7 @@ include $(CORE_DEPTH)/coreconf/rules.mk # (6) Execute "component" rules. (OPTIONAL) # ####################################################################### @@ -123,8 +134,9 @@ diff -up nss/lib/cryptohi/Makefile.iquote nss/lib/cryptohi/Makefile ####################################################################### # (7) Execute "local" rules. (OPTIONAL). # ---- nss/lib/nss/Makefile.iquote 2014-01-03 11:59:10.000000000 -0800 -+++ nss/lib/nss/Makefile 2014-01-07 13:30:04.466429634 -0800 +diff -up nss/lib/nss/Makefile.iquote nss/lib/nss/Makefile +--- nss/lib/nss/Makefile.iquote 2014-05-01 20:27:18.000000000 -0700 ++++ nss/lib/nss/Makefile 2014-05-06 07:15:41.183387869 -0700 @@ -37,7 +37,8 @@ include $(CORE_DEPTH)/coreconf/rules.mk # (6) Execute "component" rules. (OPTIONAL) # ####################################################################### diff --git a/nss.spec b/nss.spec index 85794af..e08d3fd 100644 --- a/nss.spec +++ b/nss.spec @@ -1,6 +1,6 @@ -%global nspr_version 4.10.4 -%global nss_util_version 3.16.0 -%global nss_softokn_version 3.16.0 +%global nspr_version 4.10.5 +%global nss_util_version 3.16.1 +%global nss_softokn_version 3.16.1 %global unsupported_tools_directory %{_libdir}/nss/unsupported-tools %global allTools "certutil cmsutil crlutil derdump modutil pk12util pp signtool signver ssltap vfychain vfyserv" @@ -18,7 +18,7 @@ Summary: Network Security Services Name: nss -Version: 3.16.0 +Version: 3.16.1 Release: 1%{?dist} License: MPLv2.0 URL: http://www.mozilla.org/projects/security/pki/nss/ @@ -413,7 +413,7 @@ find ./nss/tests -type f |\ killall $RANDSERV || : rm -rf ./tests_results -cd ./nss/tests/ +pushd ./nss/tests/ # all.sh is the test suite script # don't need to run all the tests when testing packaging @@ -429,14 +429,34 @@ nss_tests="cipher libpkix cert dbtests tools fips sdr crmf smime ssl ocsp merge HOST=localhost DOMSUF=localdomain PORT=$MYRAND NSS_CYCLES=%{?nss_cycles} NSS_TESTS=%{?nss_tests} NSS_SSL_TESTS=%{?nss_ssl_tests} NSS_SSL_RUN=%{?nss_ssl_run} ./all.sh -cd ../../ +popd +# Normally, the grep exit status is 0 if selected lines are found and 1 otherwise, +# Grep exits with status greater than 1 if an error ocurred. +# If there are test failures we expect TEST_FAILURES > 0 and GREP_EXIT_STATUS = 0, +# With no test failures we expect TEST_FAILURES = 0 and GREP_EXIT_STATUS = 1, whereas +# GREP_EXIT_STATUS > 1 would indicate an error in grep such as failure to find the log file. killall $RANDSERV || : -TEST_FAILURES=`grep -c FAILED ./tests_results/security/localhost.1/output.log` || : -if [ $TEST_FAILURES -ne 0 ]; then - echo "error: test suite returned failure(s)" - exit 1 +TEST_FAILURES=$(grep -c FAILED ./tests_results/security/localhost.1/output.log) || GREP_EXIT_STATUS=$? +if [ ${GREP_EXIT_STATUS:-0} -eq 1 ]; then + echo "okay: test suite detected no failures" +else + if [ ${GREP_EXIT_STATUS:-0} -eq 0 ]; then + # while a situation in which grep return status is 0 and it doesn't output + # anything shouldn't happen, set the default to something that is + # obviously wrong (-1) + echo "error: test suite had ${TEST_FAILURES:--1} test failure(s)" + exit 1 + else + if [ ${GREP_EXIT_STATUS:-0} -eq 2 ]; then + echo "error: grep has not found log file" + exit 1 + else + echo "error: grep failed with exit code: ${GREP_EXIT_STATUS}" + exit 1 + fi + fi fi echo "test suite completed" @@ -731,6 +751,12 @@ fi %changelog +* Tue May 06 2014 Elio Maldonado - 3.16.1-1 +- Update to nss-3.16.1 +- Update the iquote patch on account of the rebase +- Improve error detection in the %%section +- Resolves: Bug 1094702 - nss-3.16.1 is available + * Tue Mar 18 2014 Elio Maldonado - 3.16.0-1 - Update to nss-3.16.0 - Cleanup the copying of the tools man pages diff --git a/sources b/sources index 8c21e07..6d967e5 100644 --- a/sources +++ b/sources @@ -8,4 +8,4 @@ f998b70c1be25e8bb9f5fdb5d50eb6f2 TestCA.ca.cert 1b7b6808cd77d5df29bf5bb9e5fac967 TestUser50.cert ab0b56dd505a995425c03e5266f7c8d6 TestUser51.cert b8a94e863c852e1f8b75e930e76f8640 nss-pem-20140125.tar.bz2 -6a60df5c01f6c4ed8dbdbe85cf818a28 nss-3.16.0.tar.gz +97ccaa5d27aa59faf07c8b968dbaea1d nss-3.16.1.tar.gz