Update to NSS 3.35.0
This commit is contained in:
Daiki Ueno
parent
bd239c046a
commit
08f152ebf9
|
|
@ -23,3 +23,4 @@ TestUser51.cert
|
|||
/nss-3.32.1.tar.gz
|
||||
/nss-3.33.0.tar.gz
|
||||
/nss-3.34.0.tar.gz
|
||||
/nss-3.35.0.tar.gz
|
||||
|
|
|
|||
|
|
@ -1,65 +0,0 @@
|
|||
diff --git a/tests/merge/merge.sh b/tests/merge/merge.sh
|
||||
--- a/tests/merge/merge.sh
|
||||
+++ b/tests/merge/merge.sh
|
||||
@@ -93,17 +93,17 @@ merge_init()
|
||||
CONFLICT1DIR=conflict1
|
||||
CONFLICT2DIR=conflict2
|
||||
mkdir ${CONFLICT1DIR}
|
||||
mkdir ${CONFLICT2DIR}
|
||||
# in the upgrade mode (dbm->sql), make sure our test databases
|
||||
# are dbm databases.
|
||||
if [ "${TEST_MODE}" = "UPGRADE_DB" ]; then
|
||||
save=${NSS_DEFAULT_DB_TYPE}
|
||||
- NSS_DEFAULT_DB_TYPE= ; export NSS_DEFAULT_DB_TYPE
|
||||
+ NSS_DEFAULT_DB_TYPE=dbm ; export NSS_DEFAULT_DB_TYPE
|
||||
fi
|
||||
|
||||
certutil -N -d ${CONFLICT1DIR} -f ${R_PWFILE}
|
||||
certutil -N -d ${CONFLICT2DIR} -f ${R_PWFILE}
|
||||
certutil -A -n Alice -t ,, -i ${R_CADIR}/TestUser41.cert -d ${CONFLICT1DIR}
|
||||
# modify CONFLICTDIR potentially corrupting the database
|
||||
certutil -A -n "Alice #1" -t C,, -i ${R_CADIR}/TestUser42.cert -d ${CONFLICT1DIR} -f ${R_PWFILE}
|
||||
certutil -M -n "Alice #1" -t ,, -d ${CONFLICT1DIR} -f ${R_PWFILE}
|
||||
diff --git a/tests/all.sh b/tests/all.sh
|
||||
--- a/tests/all.sh
|
||||
+++ b/tests/all.sh
|
||||
@@ -106,16 +106,18 @@
|
||||
RUN_FIPS=""
|
||||
|
||||
############################## run_tests ###############################
|
||||
# run test suites defined in TESTS variable, skip scripts defined in
|
||||
# TESTS_SKIP variable
|
||||
########################################################################
|
||||
run_tests()
|
||||
{
|
||||
+ echo "Running test cycle: ${TEST_MODE} ----------------------"
|
||||
+ echo "List of tests that will be executed: ${TESTS}"
|
||||
for TEST in ${TESTS}
|
||||
do
|
||||
# NOTE: the spaces are important. If you don't include
|
||||
# the spaces, then turning off ssl_gtests will also turn off ssl
|
||||
# tests.
|
||||
echo " ${TESTS_SKIP} " | grep " ${TEST} " > /dev/null
|
||||
if [ $? -eq 0 ]; then
|
||||
continue
|
||||
@@ -167,18 +169,19 @@ run_cycle_pkix()
|
||||
export NSS_ENABLE_PKIX_VERIFY
|
||||
|
||||
TESTS="${ALL_TESTS}"
|
||||
TESTS_SKIP="cipher dbtests sdr crmf smime merge multinit"
|
||||
|
||||
NSS_SSL_TESTS=`echo "${NSS_SSL_TESTS}" | sed -e "s/normal//g" -e "s/fips//g" -e "s/_//g"`
|
||||
export -n NSS_SSL_RUN
|
||||
|
||||
- # use the default format
|
||||
+ # use the default format. (unset for the shell, export -n for binaries)
|
||||
export -n NSS_DEFAULT_DB_TYPE
|
||||
+ unset NSS_DEFAULT_DB_TYPE
|
||||
|
||||
run_tests
|
||||
}
|
||||
|
||||
######################### run_cycle_upgrade_db #########################
|
||||
# upgrades certificate database to shareable format and run test suites
|
||||
# with those databases
|
||||
########################################################################
|
||||
17
nss.spec
17
nss.spec
|
|
@ -1,12 +1,12 @@
|
|||
%global nspr_version 4.17.0
|
||||
%global nss_util_version 3.34.0
|
||||
%global nss_softokn_version 3.34.0
|
||||
%global nspr_version 4.18.0
|
||||
%global nss_util_version 3.35.0
|
||||
%global nss_softokn_version 3.35.0
|
||||
%global unsupported_tools_directory %{_libdir}/nss/unsupported-tools
|
||||
%global allTools "certutil cmsutil crlutil derdump modutil pk12util signtool signver ssltap vfychain vfyserv"
|
||||
|
||||
Summary: Network Security Services
|
||||
Name: nss
|
||||
Version: 3.34.0
|
||||
Version: 3.35.0
|
||||
# for Rawhide, please always use release >= 2
|
||||
# for Fedora release branches, please use release < 2 (1.0, 1.1, ...)
|
||||
Release: 2%{?dist}
|
||||
|
|
@ -98,9 +98,6 @@ Patch58: rhbz1185708-enable-ecc-3des-ciphers-by-default.patch
|
|||
Patch59: nss-check-policy-file.patch
|
||||
Patch62: nss-skip-util-gtest.patch
|
||||
|
||||
# Fix upgrade_db test use dbm by default, required with default sql
|
||||
Patch77: nss-sql-4-1377940-test.patch
|
||||
|
||||
%description
|
||||
Network Security Services (NSS) is a set of libraries designed to
|
||||
support cross-platform development of security-enabled client and
|
||||
|
|
@ -183,9 +180,6 @@ low level services.
|
|||
pushd nss
|
||||
%patch59 -p1 -b .check_policy_file
|
||||
%patch62 -p1 -b .skip_util_gtest
|
||||
|
||||
%patch77 -p1 -b .1377940
|
||||
|
||||
popd
|
||||
|
||||
#########################################################
|
||||
|
|
@ -761,6 +755,9 @@ done
|
|||
|
||||
|
||||
%changelog
|
||||
* Tue Jan 23 2018 Daiki Ueno <dueno@redhat.com> - 3.35.0-2
|
||||
- Update to NSS 3.35.0
|
||||
|
||||
* Tue Nov 14 2017 Daiki Ueno <dueno@redhat.com> - 3.34.0-2
|
||||
- Update to NSS 3.34.0
|
||||
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -3,4 +3,4 @@ SHA512 (blank-cert9.db) = 2f8eab4c0612210ee47db8a3a80c1b58a0b43849551af78c7da403
|
|||
SHA512 (blank-key3.db) = 01f7314e9fc8a7c9aa997652624cfcde213d18a6b3bb31840c1a60bbd662e56b5bc3221d13874abb42ce78163b225a6dfce2e1326cf6dd29366ad9c28ba5a71c
|
||||
SHA512 (blank-key4.db) = 8fedae93af7163da23fe9492ea8e785a44c291604fa98e58438448efb69c85d3253fc22b926d5c3209c62e58a86038fd4d78a1c4c068bc00600a7f3e5382ebe7
|
||||
SHA512 (blank-secmod.db) = 06a2dbd861839ef6315093459328b500d3832333a34b30e6fac4a2503af337f014a4d319f0f93322409e719142904ce8bc08252ae9a4f37f30d4c3312e900310
|
||||
SHA512 (nss-3.34.0.tar.gz) = 2826e3d327af34714d521edac0fba4da6e14c7a28750ccfeeba8259b0a1954233fc47dcbec47b6aeb96f53de501adc15adf130379efa503b00677a924eb50080
|
||||
SHA512 (nss-3.35.0.tar.gz) = a9865fd11d8b2ab83b57b1b50fe6f0d3a6d936f7ae4d0817e9dd1bf3e5182ff7f26ebc21fe7490c3dea2b792e4e4302af876ac70750e8e1f4da6bb710fd3002e
|
||||
|
|
|
|||
Loading…
Reference in New Issue