Elio Maldonado
commit
e0216f968e
|
|
@ -8,4 +8,4 @@ TestCA.ca.cert
|
|||
TestUser50.cert
|
||||
TestUser51.cert
|
||||
/nss-pem-20140125.tar.bz2
|
||||
/nss-3.16.1.tar.gz
|
||||
/nss-3.16.2.tar.gz
|
||||
|
|
|
|||
|
|
@ -1,38 +0,0 @@
|
|||
diff -up nss/tests/all.sh.crypto nss/tests/all.sh
|
||||
--- nss/tests/all.sh.crypto 2013-05-28 14:43:24.000000000 -0700
|
||||
+++ nss/tests/all.sh 2013-06-13 12:14:12.741082184 -0700
|
||||
@@ -299,9 +299,10 @@ fi
|
||||
# created, we check for modutil to know whether the build
|
||||
# is complete. If a new file is created after that, the
|
||||
# following test for modutil should check for that instead.
|
||||
+# Except when building softoken only where shlibsign is the last one built.
|
||||
+export LAST_BUILT=[ ${NSS_BUILD_SOFTOKEN_ONLY} -eq "1" ] && shlibsign || modutil
|
||||
|
||||
-if [ ! -f ${DIST}/${OBJDIR}/bin/modutil -a \
|
||||
- ! -f ${DIST}/${OBJDIR}/bin/modutil.exe ]; then
|
||||
+if [ ! -f ${DIST}/${OBJDIR}/bin/${LAST_BUILT}${PROG_SUFFIX} -a ]; then
|
||||
echo "Build Incomplete. Aborting test." >> ${LOGFILE}
|
||||
html_head "Testing Initialization"
|
||||
Exit "Checking for build"
|
||||
diff -up nss/tests/cipher/cipher.sh.crypto nss/tests/cipher/cipher.sh
|
||||
--- nss/tests/cipher/cipher.sh.crypto 2013-05-28 14:43:24.000000000 -0700
|
||||
+++ nss/tests/cipher/cipher.sh 2013-06-13 11:58:00.956064976 -0700
|
||||
@@ -129,6 +129,16 @@ if [ ! -x ${DIST}/${OBJDIR}/bin/bltest${
|
||||
return 0
|
||||
fi
|
||||
cipher_init
|
||||
-cipher_main
|
||||
-cipher_gcm
|
||||
+if [ "${NSS_BUILD_SOFTOKEN_ONLY}" = "1" ]; then
|
||||
+ echo "Skipping cipher_gcm because this is a softoken only build"
|
||||
+ cipher_main
|
||||
+elif [ "${NSS_BUILD_WITHOUT_SOFTOKEN}" = "1" ]; then
|
||||
+ echo "Skipping cipher_main because this an nss without softoken build"
|
||||
+ cipher_gcm
|
||||
+else
|
||||
+ # default is to run both
|
||||
+ cipher_init
|
||||
+ cipher_main
|
||||
+ cipher_gcm
|
||||
+fi
|
||||
cipher_cleanup
|
||||
46
nss.spec
46
nss.spec
|
|
@ -1,6 +1,6 @@
|
|||
%global nspr_version 4.10.5
|
||||
%global nss_util_version 3.16.1
|
||||
%global nss_softokn_version 3.16.1
|
||||
%global nspr_version 4.10.6
|
||||
%global nss_util_version 3.16.2
|
||||
%global nss_softokn_version 3.16.2
|
||||
%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.1
|
||||
Version: 3.16.2
|
||||
Release: 1%{?dist}
|
||||
License: MPLv2.0
|
||||
URL: http://www.mozilla.org/projects/security/pki/nss/
|
||||
|
|
@ -84,8 +84,6 @@ Patch29: nss-ssl-cbc-random-iv-off-by-default.patch
|
|||
Patch40: nss-3.14.0.0-disble-ocsp-test.patch
|
||||
# Fedora / RHEL-only patch, the templates directory was originally introduced to support mod_revocator
|
||||
Patch47: utilwrap-include-templates.patch
|
||||
# Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=902171
|
||||
Patch48: nss-versus-softoken-tests.patch
|
||||
# TODO remove when we switch to building nss without softoken
|
||||
Patch49: nss-skip-bltest-and-fipstest.patch
|
||||
# This patch uses the gcc-iquote dir option documented at
|
||||
|
|
@ -182,7 +180,6 @@ low level services.
|
|||
%patch29 -p0 -b .cbcrandomivoff
|
||||
%patch40 -p0 -b .noocsptest
|
||||
%patch47 -p0 -b .templates
|
||||
%patch48 -p0 -b .crypto
|
||||
%patch49 -p0 -b .skipthem
|
||||
%patch50 -p0 -b .iquote
|
||||
|
||||
|
|
@ -202,6 +199,16 @@ done
|
|||
%{__cp} ./nss/lib/softoken/lowkeyi.h ./nss/cmd/rsaperf
|
||||
%{__cp} ./nss/lib/softoken/lowkeyti.h ./nss/cmd/rsaperf
|
||||
|
||||
##### Remove util/freebl/softoken and low level tools
|
||||
######## Remove freebl, softoken and util
|
||||
%{__rm} -rf ./nss/lib/freebl
|
||||
%{__rm} -rf ./nss/lib/softoken
|
||||
%{__rm} -rf ./nss/lib/util
|
||||
######## Remove nss-softokn test tools as we already ran
|
||||
# the cipher test suite as part of the nss-softokn build
|
||||
%{__rm} -rf ./nss/cmd/bltest
|
||||
%{__rm} -rf ./nss/cmd/fipstest
|
||||
%{__rm} -rf ./nss/cmd/rsaperf_low
|
||||
|
||||
%build
|
||||
|
||||
|
|
@ -266,17 +273,6 @@ export USE_64
|
|||
# uncomment if the iquote patch is activated
|
||||
export IN_TREE_FREEBL_HEADERS_FIRST=1
|
||||
|
||||
##### phase 1: remove util/freebl/softoken and low level tools
|
||||
#
|
||||
######## Remove freebl, softoken and util
|
||||
%{__rm} -rf ./mozilla/security/nss/lib/freebl
|
||||
%{__rm} -rf ./mozilla/security/nss/lib/softoken
|
||||
%{__rm} -rf ./mozilla/security/nss/lib/util
|
||||
######## Remove nss-softokn test tools
|
||||
%{__rm} -rf ./mozilla/security/nss/cmd/bltest
|
||||
%{__rm} -rf ./mozilla/security/nss/cmd/fipstest
|
||||
%{__rm} -rf ./mozilla/security/nss/cmd/rsaperf_low
|
||||
|
||||
##### phase 2: build the rest of nss
|
||||
# nss supports pluggable ecc with more than suite-b
|
||||
NSS_ECC_MORE_THAN_SUITE_B=1
|
||||
|
|
@ -293,7 +289,7 @@ pushd ./nss
|
|||
%{__make} clean_docs build_docs
|
||||
popd
|
||||
|
||||
# and copy them to the dist directory
|
||||
# and copy them to the dist directory for %%install to find them
|
||||
%{__mkdir_p} ./dist/docs/nroff
|
||||
%{__cp} ./nss/doc/nroff/* ./dist/docs/nroff
|
||||
|
||||
|
|
@ -357,7 +353,7 @@ done
|
|||
|
||||
|
||||
%check
|
||||
if [ $DISABLETEST -eq 1 ]; then
|
||||
if [ ${DISABLETEST:-0} -eq 1 ]; then
|
||||
echo "testing disabled"
|
||||
exit 0
|
||||
fi
|
||||
|
|
@ -422,7 +418,7 @@ pushd ./nss/tests/
|
|||
|
||||
# don't need to run all the tests when testing packaging
|
||||
# nss_cycles: standard pkix upgradedb sharedb
|
||||
nss_tests="cipher libpkix cert dbtests tools fips sdr crmf smime ssl ocsp merge pkits chains"
|
||||
nss_tests="libpkix cert dbtests tools fips sdr crmf smime ssl ocsp merge pkits chains"
|
||||
# nss_ssl_tests: crl bypass_normal normal_bypass normal_fips fips_normal iopr
|
||||
# nss_ssl_run: cov auth stress
|
||||
#
|
||||
|
|
@ -445,7 +441,7 @@ killall $RANDSERV || :
|
|||
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
|
||||
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
|
||||
|
|
@ -755,6 +751,12 @@ fi
|
|||
|
||||
|
||||
%changelog
|
||||
* Mon Jun 30 2014 Elio Maldonado <emaldona@redhat.com> - 3.16.2-1
|
||||
- Update to nss-3.16.2
|
||||
- Remove unwanted source directories at end of %%prep so it truly removes them
|
||||
- Skip the cipher suite already run as part of the nss-softokn build
|
||||
- Resolves: Bug 1114319 - nss-3.16.2 is available
|
||||
|
||||
* Tue May 06 2014 Elio Maldonado <emaldona@redhat.com> - 3.16.1-1
|
||||
- Update to nss-3.16.1
|
||||
- Update the iquote patch on account of the rebase
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -8,4 +8,4 @@ f998b70c1be25e8bb9f5fdb5d50eb6f2 TestCA.ca.cert
|
|||
1b7b6808cd77d5df29bf5bb9e5fac967 TestUser50.cert
|
||||
ab0b56dd505a995425c03e5266f7c8d6 TestUser51.cert
|
||||
b8a94e863c852e1f8b75e930e76f8640 nss-pem-20140125.tar.bz2
|
||||
97ccaa5d27aa59faf07c8b968dbaea1d nss-3.16.1.tar.gz
|
||||
afc6789c9d805db5be1e5f3c533394f1 nss-3.16.2.tar.gz
|
||||
|
|
|
|||
Loading…
Reference in New Issue