From c281a339e1708b89372b31fd682c35c1f3e28611 Mon Sep 17 00:00:00 2001 From: Elio Maldonado Date: Sun, 21 Feb 2016 11:30:52 -0800 Subject: [PATCH] Rebase to NSS 3.22.1 - Bug 1304135 - nss-3.22.1 is available --- .gitignore | 2 +- disableSSL2tests.patch | 6 +++--- nss.spec | 13 ++++++++----- sources | 2 +- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index e5fc984..efb3b63 100644 --- a/.gitignore +++ b/.gitignore @@ -10,4 +10,4 @@ TestUser51.cert /nss-pem-20140125.tar.bz2 /PayPalRootCA.cert /PayPalICA.cert -/nss-3.22.0.tar.gz +/nss-3.22.1.tar.gz diff --git a/disableSSL2tests.patch b/disableSSL2tests.patch index b3cdc14..d5c9f59 100644 --- a/disableSSL2tests.patch +++ b/disableSSL2tests.patch @@ -36,7 +36,7 @@ fi echo "kill -0 ${PID} >/dev/null 2>/dev/null" -+ if [ "${NSS_NO_SSL2_NO_EXPORT}" = "1" ] && [ ${EXP} -eq 0 -o ${SSL2} -eq 0 ]; then ++ if [[ "${NSS_NO_SSL2_NO_EXPORT}" = "1" ] && [ ${EXP} -eq 0 -o ${SSL2} -eq 0 ]]; then + echo "No server to kill" + else kill -0 ${PID} >/dev/null 2>/dev/null || Exit 10 "Fatal - selfserv process not detectable" @@ -58,7 +58,7 @@ ${BINDIR}/tstclnt -p ${PORT} -h ${HOSTADDR} ${CLIENT_OPTIONS} -q \ -d ${P_R_CLIENTDIR} -v < ${REQUEST_FILE} if [ $? -ne 0 ]; then -+ if [ "${NSS_NO_SSL2_NO_EXPORT}" = "1" ] && [ ${EXP} -eq 0 -o ${SSL2} -eq 0 ]; then ++ if [ "${NSS_NO_SSL2_NO_EXPORT}" = "1" ] && [[ ${EXP} -eq 0 -o ${SSL2} -eq 0 ]]; then + html_passed "Server never started" + else html_failed "Waiting for Server" @@ -112,7 +112,7 @@ + # skip export and ssl2 tests when build has disabled SSL2 + if [ "${NSS_NO_SSL2_NO_EXPORT}" = "1" ] && [ ${EXP} -eq 0 || ${SSL2} -eq 0 ]; then -+ echo "yyy exp/ssl2 test skipped: (NSS_NO_SSL2,EXP,SSL2)=(${NSS_NO_SSL2},${EXP},${SSL2})" ++ echo "exp/ssl2 test skipped: (NSS_NO_SSL2,EXP,SSL2)=(${NSS_NO_SSL2},${EXP},${SSL2})" + continue + fi + diff --git a/nss.spec b/nss.spec index 86a3823..7bf978a 100644 --- a/nss.spec +++ b/nss.spec @@ -1,6 +1,6 @@ -%global nspr_version 4.11.0 -%global nss_util_version 3.22.0 -%global nss_softokn_version 3.22.0 +%global nspr_version 4.12.0 +%global nss_util_version 3.22.1 +%global nss_softokn_version 3.22.1 %global unsupported_tools_directory %{_libdir}/nss/unsupported-tools %global allTools "certutil cmsutil crlutil derdump modutil pk12util signtool signver ssltap vfychain vfyserv" @@ -18,10 +18,10 @@ Summary: Network Security Services Name: nss -Version: 3.22.0 +Version: 3.22.1 # for Rawhide, please always use release >= 2 # for Fedora release branches, please use release < 2 (1.0, 1.1, ...) -Release: 3%{?dist} +Release: 2%{?dist} License: MPLv2.0 URL: http://www.mozilla.org/projects/security/pki/nss/ Group: System Environment/Libraries @@ -831,6 +831,9 @@ fi %changelog +* Sun Feb 21 2016 Elio Maldonado - 3.22.1-1 +- Rebase to NSS 3.22.1 + * Mon Feb 08 2016 Elio Maldonado - 3.22.0-3 - Update .gitignore as part of updating to nss 3.22 diff --git a/sources b/sources index 2a3bcb4..8efb6d4 100644 --- a/sources +++ b/sources @@ -4,4 +4,4 @@ a5ae49867124ac75f029a9a33af31bad blank-cert8.db 691e663ccc07b7a1eaa6f088e03bf8e2 blank-cert9.db 2ec9e0606ba40fe65196545564b7cc2a blank-key4.db b8a94e863c852e1f8b75e930e76f8640 nss-pem-20140125.tar.bz2 -a0ae9d27c0261716648e49e3be33badd nss-3.22.0.tar.gz +66175367b13bbe41295d62fce4efb88b nss-3.22.1.tar.gz