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

Rebase to NSS 3.22.1

Browse Source 
- Bug 1304135 - nss-3.22.1 is available
This commit is contained in:
Elio Maldonado 2016-02-21 11:30:52 -08:00
parent 317de01a4d
commit c281a339e1
4 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -10,4 +10,4 @@ TestUser51.cert
/nss-pem-20140125.tar.bz2 /nss-pem-20140125.tar.bz2
/PayPalRootCA.cert /PayPalRootCA.cert
/PayPalICA.cert /PayPalICA.cert
/nss-3.22.0.tar.gz /nss-3.22.1.tar.gz

6
disableSSL2tests.patch
View File

@ -36,7 +36,7 @@
fi fi
echo "kill -0 ${PID} >/dev/null 2>/dev/null" 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" + echo "No server to kill"
+ else + else
kill -0 ${PID} >/dev/null 2>/dev/null || Exit 10 "Fatal - selfserv process not detectable" 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 \ ${BINDIR}/tstclnt -p ${PORT} -h ${HOSTADDR} ${CLIENT_OPTIONS} -q \
-d ${P_R_CLIENTDIR} -v < ${REQUEST_FILE} -d ${P_R_CLIENTDIR} -v < ${REQUEST_FILE}
if [ $? -ne 0 ]; then 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" + html_passed "Server never started"
+ else + else
html_failed "Waiting for Server" html_failed "Waiting for Server"
@ -112,7 +112,7 @@
+ # skip export and ssl2 tests when build has disabled SSL2 + # skip export and ssl2 tests when build has disabled SSL2
+ if [ "${NSS_NO_SSL2_NO_EXPORT}" = "1" ] && [ ${EXP} -eq 0 || ${SSL2} -eq 0 ]; then + 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 + continue
+ fi + fi
+ +

13
nss.spec
View File

@ -1,6 +1,6 @@
%global nspr_version 4.11.0 %global nspr_version 4.12.0
%global nss_util_version 3.22.0 %global nss_util_version 3.22.1
%global nss_softokn_version 3.22.0 %global nss_softokn_version 3.22.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 signtool signver ssltap vfychain vfyserv" %global allTools "certutil cmsutil crlutil derdump modutil pk12util signtool signver ssltap vfychain vfyserv"
@ -18,10 +18,10 @@
Summary: Network Security Services Summary: Network Security Services
Name: nss Name: nss
Version: 3.22.0 Version: 3.22.1
# for Rawhide, please always use release >= 2 # for Rawhide, please always use release >= 2
# for Fedora release branches, please use release < 2 (1.0, 1.1, ...) # for Fedora release branches, please use release < 2 (1.0, 1.1, ...)
Release: 3%{?dist} Release: 2%{?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
@ -831,6 +831,9 @@ fi
%changelog %changelog
* Sun Feb 21 2016 Elio Maldonado <emaldona@redhat.com> - 3.22.1-1
- Rebase to NSS 3.22.1
* Mon Feb 08 2016 Elio Maldonado <emaldona@redhat.com> - 3.22.0-3 * Mon Feb 08 2016 Elio Maldonado <emaldona@redhat.com> - 3.22.0-3
- Update .gitignore as part of updating to nss 3.22 - Update .gitignore as part of updating to nss 3.22

2
sources
View File

@ -4,4 +4,4 @@ a5ae49867124ac75f029a9a33af31bad blank-cert8.db
691e663ccc07b7a1eaa6f088e03bf8e2 blank-cert9.db 691e663ccc07b7a1eaa6f088e03bf8e2 blank-cert9.db
2ec9e0606ba40fe65196545564b7cc2a blank-key4.db 2ec9e0606ba40fe65196545564b7cc2a blank-key4.db
b8a94e863c852e1f8b75e930e76f8640 nss-pem-20140125.tar.bz2 b8a94e863c852e1f8b75e930e76f8640 nss-pem-20140125.tar.bz2
a0ae9d27c0261716648e49e3be33badd nss-3.22.0.tar.gz 66175367b13bbe41295d62fce4efb88b nss-3.22.1.tar.gz