191221 - NSS tip Solaris pkg files are 3.3.2 level

Status: RESOLVED FIXED

(NSS :: Build, defect)

Description

[Sonja Mirtitsch]

NSS 3.8 will soon be released but the files don't have the 3.3.3 changes. I
think Glen has a script to bring them all up to date versionwise, but we'd need
compare them individually for the rest I think.
I also did not yet check in the prototype change, even though it has approval
already.

Comment 1

[Wan-Teh Chang]

*** Bug 191222 has been marked as a duplicate of this bug. ***

Comment 2

[Kirk Erickson]

Attachment: patch for the TIP of NSS

Replaces hardcoded PRODUCT_VERSION, with dynamic grep/sed
technique for gathering the version dynamically from nss.h.

Tested building on iws-perf.
Note, I did not install the resulting package.
I haven't root access to any Solaris machine I can build
on that I know of.

Sonja, if this patch works for you, go ahead and check it in.
Its working for us in several trees now...

Comment 3

[Wan-Teh Chang]

Comment on attachment 113928 [details] [diff] [review]
patch for the TIP of NSS

>+PRODUCT_VERSION =  $(shell echo `grep NSS_VERSION $(CORE_DEPTH)/../dist/public/nss/nss.h \
>+		| sed -e 's/"$$//' -e 's/.*"//' -e 's/ .*//'`)

The "echo" and the `` are not necessary.

Comment 4

[Kirk Erickson]

Attachment: patch for the TIP of NSS

Tested and checked in this patch at the TIP of NSS.
It effects mozilla/security/nss/pkg/solaris/Makefile.com only,
and has the echo and `` removed.

Comment 5

[Kirk Erickson]

Attachment: Solaris Package installation log

I tested building and installing Solaris packages at the TIP of
NSS, after a final checkin at 8:13am.  Everthing looks fine.  The
versioning information is coming out correct.  I installed NSPR,
which is of course required by NSS from a tree with the latest
proposed patch (see bug 192364).

I used the following script to automate the operation, and
capture the attached log for the record.

#!/bin/sh
#
PACKAGES=/var/tmp/packages
NSPR=/export/kirke/workarea-nspr/mozilla/dist
NSS=/export/kirke/workarea-nss/mozilla/dist
SUNWpr=${NSPR}/lib/pkgarchive/SUNWpr
SUNWprx=${NSPR}/lib/pkgarchive/SUNWprx
SUNWtls=${NSS}/SunOS5.8_OPT.OBJ/pkgarchive/SUNWtls
SUNWtlsx=${NSS}/SunOS5.8_64_OPT.OBJ/pkgarchive/SUNWtlsx

(set -x
rm -rf ${PACKAGES}
mkdir ${PACKAGES}
cp -r ${SUNWpr} ${PACKAGES}
cp -r ${SUNWprx} ${PACKAGES}
cp -r ${SUNWtls} ${PACKAGES}
cp -r ${SUNWtlsx} ${PACKAGES}
su <<EOF
pkgrm -n SUNWtls
pkgrm -n SUNWtlsx
pkgrm -n SUNWpr
pkgrm -n SUNWprx
pkgadd -d ${PACKAGES} <<ADDEOF
all
q
ADDEOF
EOF
pkginfo -l SUNWtls SUNWtlsx SUNWpr SUNWprx
date) 2>&1 | tee log-`date '+%Y-%m%d-%H%M'`

Comment 6

[Kirk Erickson]

Attachment: Add libsoftokn3.so and integrity (.chk) files

We neglected the softokn3 library, and the new integrity check
files.	This patch adds these.

pkg/solaris/SUNWtls/prototype_com:
----------------------------------
f none usr/lib/mps/libsoftokn3.chk 755 root bin
f none usr/lib/mps/libsoftokn3.so 755 root bin

pkg/solaris/SUNWtls/prototype_sparc:
------------------------------------
f none usr/lib/mps/libfreebl_hybrid_3.chk 755 root bin
f none usr/lib/mps/libfreebl_pure32_3.chk 755 root bin

pkg/solaris/SUNWtlsx/prototype_sparc:
-------------------------------------
f none usr/lib/mps/sparcv9/libsoftokn3.chk 755 root bin
f none usr/lib/mps/sparcv9/libsoftokn3.so 755 root bin

I tested building and installing the resulting Solaris
packages.

Comment 7

[Wan-Teh Chang]

Comment on attachment 114280 [details] [diff] [review]
Add libsoftokn3.so and integrity (.chk) files

r=wtc.	Please check this in before midnight.  Thanks.

Comment 8

[Kirk Erickson]

Comment on attachment 114280 [details] [diff] [review]
Add libsoftokn3.so and integrity (.chk) files

Checked into the tip of NSS.

Comment 9

[Kirk Erickson]

I've tested building and installing Solaris packages at the TIP
of NSS (with all changes checked in).  Versioning information
is correct, and gathered dynamically.  Solaris version numbers
will match 'ident' output release to release. 
Closing.