rpms/nss
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- Update to nss-3.17.1

Browse Source 
- Add a mechanism to skip test suite execution during development work
This commit is contained in:
Kai Engert 2014-09-25 02:12:48 +02:00
parent 64ca89cbe4
commit 0ac07fb221
3 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -8,4 +8,4 @@ TestCA.ca.cert
TestUser50.cert TestUser50.cert
TestUser51.cert TestUser51.cert
/nss-pem-20140125.tar.bz2 /nss-pem-20140125.tar.bz2
/nss-3.17.0.tar.gz /nss-3.17.1.tar.gz

28
nss.spec
View File

@ -1,6 +1,6 @@
%global nspr_version 4.10.7 %global nspr_version 4.10.7
%global nss_util_version 3.17.0 %global nss_util_version 3.17.1
%global nss_softokn_version 3.17.0 %global nss_softokn_version 3.17.1
%global unsupported_tools_directory %{_libdir}/nss/unsupported-tools %global unsupported_tools_directory %{_libdir}/nss/unsupported-tools
%global allTools "certutil cmsutil crlutil derdump modutil pk12util pp signtool signver ssltap vfychain vfyserv" %global allTools "certutil cmsutil crlutil derdump modutil pk12util pp signtool signver ssltap vfychain vfyserv"
@ -18,8 +18,8 @@
Summary: Network Security Services Summary: Network Security Services
Name: nss Name: nss
Version: 3.17.0 Version: 3.17.1
Release: 2%{?dist} Release: 1%{?dist}
License: MPLv2.0 License: MPLv2.0
URL: http://www.mozilla.org/projects/security/pki/nss/ URL: http://www.mozilla.org/projects/security/pki/nss/
Group: System Environment/Libraries Group: System Environment/Libraries
@ -423,7 +423,13 @@ nss_tests="libpkix cert dbtests tools fips sdr crmf smime ssl ocsp merge pkits c
# global nss_ssl_tests "normal_fips" # global nss_ssl_tests "normal_fips"
# global nss_ssl_run "cov auth" # global nss_ssl_run "cov auth"
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 SKIP_NSS_TEST_SUITE=`echo $SKIP_NSS_TEST_SUITE`
if [ "x$SKIP_NSS_TEST_SUITE" == "x" ]; then
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
else
echo "skipped test suite"
fi
popd popd
@ -434,7 +440,13 @@ popd
# GREP_EXIT_STATUS > 1 would indicate an error in grep such as failure to find the log file. # GREP_EXIT_STATUS > 1 would indicate an error in grep such as failure to find the log file.
killall $RANDSERV || : killall $RANDSERV || :
TEST_FAILURES=$(grep -c FAILED ./tests_results/security/localhost.1/output.log) || GREP_EXIT_STATUS=$? if [ "x$SKIP_NSS_TEST_SUITE" == "x" ]; then
TEST_FAILURES=$(grep -c FAILED ./tests_results/security/localhost.1/output.log) || GREP_EXIT_STATUS=$?
else
TEST_FAILURES=0
GREP_EXIT_STATUS=1
fi
if [ ${GREP_EXIT_STATUS:-0} -eq 1 ]; then if [ ${GREP_EXIT_STATUS:-0} -eq 1 ]; then
echo "okay: test suite detected no failures" echo "okay: test suite detected no failures"
else else
@ -749,6 +761,10 @@ fi
%changelog %changelog
* Wed Sep 24 2014 Kai Engert <kaie@redhat.com> - 3.17.1-1
- Update to nss-3.17.1
- Add a mechanism to skip test suite execution during development work
* Thu Aug 21 2014 Kevin Fenzi <kevin@scrye.com> - 3.17.0-2 * Thu Aug 21 2014 Kevin Fenzi <kevin@scrye.com> - 3.17.0-2
- Rebuild for rpm bug 1131960 - Rebuild for rpm bug 1131960

2
sources
View File

@ -8,4 +8,4 @@ f998b70c1be25e8bb9f5fdb5d50eb6f2 TestCA.ca.cert
1b7b6808cd77d5df29bf5bb9e5fac967 TestUser50.cert 1b7b6808cd77d5df29bf5bb9e5fac967 TestUser50.cert
ab0b56dd505a995425c03e5266f7c8d6 TestUser51.cert ab0b56dd505a995425c03e5266f7c8d6 TestUser51.cert
b8a94e863c852e1f8b75e930e76f8640 nss-pem-20140125.tar.bz2 b8a94e863c852e1f8b75e930e76f8640 nss-pem-20140125.tar.bz2
7e5e411e757949b699c0a5aa9417592b nss-3.17.0.tar.gz 4bac61d6db9312e20e70b812a17c74ea nss-3.17.1.tar.gz