зеркало из https://github.com/mozilla/pjs.git
fix for bug 69582, empty scripts due to a full /tmp cause programms to
bahave wrong - instead of generating temorary scripts the input comes directly from this script, redirected via <<
This commit is contained in:
Родитель
74679406ed
Коммит
5b49528d04
|
@ -224,26 +224,27 @@ cert_CA()
|
|||
|
||||
################# Generating Certscript #################################
|
||||
#
|
||||
echo "$SCRIPTNAME: Certificate initialized, generating script ----------"
|
||||
|
||||
echo 5 > ${CERTSCRIPT}
|
||||
echo 9 >> ${CERTSCRIPT}
|
||||
echo n >> ${CERTSCRIPT}
|
||||
echo y >> ${CERTSCRIPT}
|
||||
echo 3 >> ${CERTSCRIPT}
|
||||
echo n >> ${CERTSCRIPT}
|
||||
echo 5 >> ${CERTSCRIPT}
|
||||
echo 6 >> ${CERTSCRIPT}
|
||||
echo 7 >> ${CERTSCRIPT}
|
||||
echo 9 >> ${CERTSCRIPT}
|
||||
echo n >> ${CERTSCRIPT}
|
||||
echo "$SCRIPTNAME: Certificate initialized ----------"
|
||||
|
||||
################# Creating CA Cert ######################################
|
||||
#
|
||||
CU_ACTION="Creating CA Cert"
|
||||
CU_SUBJECT="CN=NSS Test CA, O=BOGUS NSS, L=Mountain View, ST=California, C=US"
|
||||
certu -S -n "TestCA" -t "CTu,CTu,CTu" -v 60 -x -d . -1 -2 -5 \
|
||||
-f ${R_PWFILE} -z ${R_NOISE_FILE} < ${CERTSCRIPT} 2>&1
|
||||
-f ${R_PWFILE} -z ${R_NOISE_FILE} 2>&1 <<CERTSCRIPT
|
||||
5
|
||||
9
|
||||
n
|
||||
y
|
||||
3
|
||||
n
|
||||
5
|
||||
6
|
||||
7
|
||||
9
|
||||
n
|
||||
CERTSCRIPT
|
||||
|
||||
if [ "$RET" -ne 0 ]; then
|
||||
Exit 6 "Fatal - failed to create CA cert"
|
||||
fi
|
||||
|
|
|
@ -266,7 +266,6 @@ if [ -z "${INIT_SOURCED}" -o "${INIT_SOURCED}" != "TRUE" ]; then
|
|||
DAVEDIR=${HOSTDIR}/dave
|
||||
|
||||
PWFILE=${TMP}/tests.pw.$$
|
||||
CERTSCRIPT=${TMP}/tests_certs.$$
|
||||
NOISE_FILE=${TMP}/tests_noise.$$
|
||||
|
||||
# we need relative pathnames of these files abd directories, since our
|
||||
|
@ -280,14 +279,13 @@ if [ -z "${INIT_SOURCED}" -o "${INIT_SOURCED}" != "TRUE" ]; then
|
|||
R_DAVEDIR=../dave
|
||||
|
||||
R_PWFILE=../tests.pw.$$
|
||||
R_CERTSCRIPT=../tests_certs.$$
|
||||
R_NOISE_FILE=../tests_noise.$$
|
||||
|
||||
# a new log file, short - fast to search, mostly for tools to
|
||||
# see if their portion of the cert has succeeded, also for me -
|
||||
CERT_LOG_FILE=${HOSTDIR}/cert.log #the output.log is so crowded...
|
||||
|
||||
TEMPFILES="${PWFILE} ${CERTSCRIPT} ${NOISE_FILE}"
|
||||
TEMPFILES="${PWFILE} ${NOISE_FILE}"
|
||||
trap "Exit $0 Signal_caught" 2 3
|
||||
|
||||
export PATH LD_LIBRARY_PATH SHLIB_PATH LIBPATH
|
||||
|
|
|
@ -83,10 +83,6 @@ tools_init()
|
|||
R_TOOLSDIR=../tools
|
||||
R_COPYDIR=../tools/copydir
|
||||
|
||||
SIGNSCRIPT=${TMP}/tests_sign.$$
|
||||
|
||||
TEMPFILES="${TEMPFILES} ${SIGNSCRIPT}"
|
||||
|
||||
mkdir -p ${TOOLSDIR}
|
||||
mkdir -p ${COPYDIR}
|
||||
mkdir -p ${TOOLSDIR}/html
|
||||
|
@ -120,15 +116,16 @@ tools_sign()
|
|||
{
|
||||
echo "$SCRIPTNAME: Create objsign cert -------------------------------"
|
||||
echo "signtool -G \"objectsigner\" -d ${R_ALICEDIR} -p \"nss\""
|
||||
echo "y" > ${SIGNSCRIPT}
|
||||
echo "TEST" >> ${SIGNSCRIPT}
|
||||
echo "MOZ" >> ${SIGNSCRIPT}
|
||||
echo "NSS" >> ${SIGNSCRIPT}
|
||||
echo "NY" >> ${SIGNSCRIPT}
|
||||
echo "US" >> ${SIGNSCRIPT}
|
||||
echo "liz" >> ${SIGNSCRIPT}
|
||||
echo "liz@moz.org" >> ${SIGNSCRIPT}
|
||||
signtool -G "objsigner" -d ${R_ALICEDIR} -p "nss" < ${SIGNSCRIPT} 2>&1
|
||||
signtool -G "objsigner" -d ${R_ALICEDIR} -p "nss" 2>&1 <<SIGNSCRIPT
|
||||
y
|
||||
TEST
|
||||
MOZ
|
||||
NSS
|
||||
NY
|
||||
US
|
||||
liz
|
||||
liz@moz.org
|
||||
SIGNSCRIPT
|
||||
|
||||
echo "$SCRIPTNAME: Signing a set of files ----------------------------"
|
||||
echo "signtool -Z nojs.jar -d ${R_ALICEDIR} -p \"nss\" -k objsigner \\"
|
||||
|
|
Загрузка…
Ссылка в новой задаче