diff options
author | cvs2hg <devnull@localhost> | 2004-10-11 22:38:45 +0000 |
---|---|---|
committer | cvs2hg <devnull@localhost> | 2004-10-11 22:38:45 +0000 |
commit | ae61433619efcd111199a5b57d4fa3e19c3f2fd8 (patch) | |
tree | ded2fb123055329040085e560141e6724e59abc6 | |
parent | 8860819374da8b5970abd1c0637153bc496c7114 (diff) | |
download | nss-hg-NSS_CLIENT_TAG_20041015.tar.gz |
fixup commit for tag 'NSS_CLIENT_TAG_20041015'NSS_CLIENT_TAG_20041015
-rw-r--r-- | security/coreconf/OS2.mk | 3 | ||||
-rw-r--r-- | security/nss/lib/nss/nss.h | 4 | ||||
-rw-r--r-- | security/nss/lib/pk11wrap/pk11slot.c | 5 | ||||
-rw-r--r-- | security/nss/pkg/solaris/SUNWtlsx/Makefile | 16 | ||||
-rw-r--r-- | security/nss/pkg/solaris/SUNWtlsx/pkgdepend | 31 | ||||
-rw-r--r-- | security/nss/pkg/solaris/SUNWtlsx/pkginfo.tmpl | 35 | ||||
-rw-r--r-- | security/nss/pkg/solaris/SUNWtlsx/prototype_com | 28 | ||||
-rw-r--r-- | security/nss/pkg/solaris/SUNWtlsx/prototype_sparc | 38 |
8 files changed, 156 insertions, 4 deletions
diff --git a/security/coreconf/OS2.mk b/security/coreconf/OS2.mk index 5b3b51d0b..a8eed088f 100644 --- a/security/coreconf/OS2.mk +++ b/security/coreconf/OS2.mk @@ -54,8 +54,7 @@ LIB_PREFIX = $(NULL) # Override suffix in suffix.mk LIB_SUFFIX = lib -# the DLL_SUFFIX must be uppercase for FIPS mode to work. bugzilla 240784 -DLL_SUFFIX = DLL +DLL_SUFFIX = dll PROG_SUFFIX = .exe diff --git a/security/nss/lib/nss/nss.h b/security/nss/lib/nss/nss.h index 6060387e1..783686bda 100644 --- a/security/nss/lib/nss/nss.h +++ b/security/nss/lib/nss/nss.h @@ -49,11 +49,11 @@ SEC_BEGIN_PROTOS * The format of the version string should be * "<major version>.<minor version>[.<patch level>] [<Beta>]" */ -#define NSS_VERSION "3.9.3" +#define NSS_VERSION "3.9.3 Beta 3" #define NSS_VMAJOR 3 #define NSS_VMINOR 9 #define NSS_VPATCH 3 -#define NSS_BETA PR_FALSE +#define NSS_BETA PR_TRUE /* diff --git a/security/nss/lib/pk11wrap/pk11slot.c b/security/nss/lib/pk11wrap/pk11slot.c index d55bea701..7f1d078d1 100644 --- a/security/nss/lib/pk11wrap/pk11slot.c +++ b/security/nss/lib/pk11wrap/pk11slot.c @@ -1256,6 +1256,11 @@ void PK11_LogoutAll(void) SECMODModuleList *mlp = NULL; int i; + /* NSS is not initialized, there are not tokens to log out */ + if (lock == NULL) { + return; + } + SECMOD_GetReadLock(lock); /* find the number of entries */ for (mlp = modList; mlp != NULL; mlp = mlp->next) { diff --git a/security/nss/pkg/solaris/SUNWtlsx/Makefile b/security/nss/pkg/solaris/SUNWtlsx/Makefile new file mode 100644 index 000000000..5058a1f68 --- /dev/null +++ b/security/nss/pkg/solaris/SUNWtlsx/Makefile @@ -0,0 +1,16 @@ +# +# Copyright 2002 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. +# +#ident "$Id$" +# + +CORE_DEPTH = ../../../.. +include ../Makefile.com + +DATAFILES += + +all:: $(FILES) +publish:: all pkg + +include ../Makefile.targ diff --git a/security/nss/pkg/solaris/SUNWtlsx/pkgdepend b/security/nss/pkg/solaris/SUNWtlsx/pkgdepend new file mode 100644 index 000000000..b5c7d7fa8 --- /dev/null +++ b/security/nss/pkg/solaris/SUNWtlsx/pkgdepend @@ -0,0 +1,31 @@ +# Copyright 2002 Microsystems, Inc. All Rights Reserved. +# Use is subject to license terms. +# +# $Id$ +# +# This package information file defines software dependencies associated +# with the pkg. You can define three types of pkg dependencies with this file: +# P indicates a prerequisite for installation +# I indicates an incompatible package +# R indicates a reverse dependency +# <pkg.abbr> see pkginfo(4), PKG parameter +# <name> see pkginfo(4), NAME parameter +# <version> see pkginfo(4), VERSION parameter +# <arch> see pkginfo(4), ARCH parameter +# <type> <pkg.abbr> <name> +# (<arch>)<version> +# (<arch>)<version> +# ... +# <type> <pkg.abbr> <name> +# ... + +P SUNWcar Core Architecture, (Root) +P SUNWkvm Core Architecture, (Kvm) +P SUNWcsr Core Solaris, (Root) +P SUNWcsu Core Solaris, (Usr) +P SUNWcsd Core Solaris Devices +P SUNWcsl Core Solaris Libraries +P SUNWcarx Core Architecture, (Root) (64-bit) +P SUNWcsxu Core Solaris (Usr) (64-bit) +P SUNWcslx Core Solaris Libraries (64-bit) +P SUNWprx Netscape Portable Runtime diff --git a/security/nss/pkg/solaris/SUNWtlsx/pkginfo.tmpl b/security/nss/pkg/solaris/SUNWtlsx/pkginfo.tmpl new file mode 100644 index 000000000..6129c2452 --- /dev/null +++ b/security/nss/pkg/solaris/SUNWtlsx/pkginfo.tmpl @@ -0,0 +1,35 @@ +# +# Copyright 2002 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. +# +#ident "$Id$" +# +# +# This required package information file describes characteristics of the +# package, such as package abbreviation, full package name, package version, +# and package architecture. +# +PKG="SUNWtlsx" +NAME="Network Security Services (64-bit)" +ARCH="ISA" +SUNW_ISA="sparcv9" +VERSION="NSSVERS,REV=0.0.0" +SUNW_PRODNAME="Network Security Services" +SUNW_PRODVERS="RELEASE/VERSION" +SUNW_PKGTYPE="usr" +MAXINST="1000" +CATEGORY="system" +DESC="Network Security Services (64-bit)" +VENDOR="Sun Microsystems, Inc." +HOTLINE="Please contact your local service provider" +EMAIL="" +CLASSES="none" +BASEDIR=/ +SUNW_PKGVERS="1.0" +#VSTOCK="<reserved by Release Engineering for package part #>" +#ISTATES="<developer defined>" +#RSTATES='<developer defined>' +#ULIMIT="<developer defined>" +#ORDER="<developer defined>" +#PSTAMP="<developer defined>" +#INTONLY="<developer defined>" diff --git a/security/nss/pkg/solaris/SUNWtlsx/prototype_com b/security/nss/pkg/solaris/SUNWtlsx/prototype_com new file mode 100644 index 000000000..0dffc99e1 --- /dev/null +++ b/security/nss/pkg/solaris/SUNWtlsx/prototype_com @@ -0,0 +1,28 @@ +# +# Copyright 2002 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. +# +#ident "$Id$" +# +# This required package information file contains a list of package contents. +# The 'pkgmk' command uses this file to identify the contents of a package +# and their location on the development machine when building the package. +# Can be created via a text editor or through use of the 'pkgproto' command. + +#!search <pathname pathname ...> # where to find pkg objects +#!include <filename> # include another 'prototype' file +#!default <mode> <owner> <group> # default used if not specified on entry +#!<param>=<value> # puts parameter in pkg environment + +# packaging files +i copyright +i pkginfo +i depend=pkgdepend +# +# source locations relative to the prototype file +# +# SUNWtlsx +# +d none usr 755 root sys +d none usr/lib 755 root bin +d none usr/lib/mps 755 root bin diff --git a/security/nss/pkg/solaris/SUNWtlsx/prototype_sparc b/security/nss/pkg/solaris/SUNWtlsx/prototype_sparc new file mode 100644 index 000000000..1f15d804b --- /dev/null +++ b/security/nss/pkg/solaris/SUNWtlsx/prototype_sparc @@ -0,0 +1,38 @@ +# +# Copyright 2002 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. +# +#ident "$Id$" +# +# This required package information file contains a list of package contents. +# The 'pkgmk' command uses this file to identify the contents of a package +# and their location on the development machine when building the package. +# Can be created via a text editor or through use of the 'pkgproto' command. + +#!search <pathname pathname ...> # where to find pkg objects +#!include <filename> # include another 'prototype' file +#!default <mode> <owner> <group> # default used if not specified on entry +#!<param>=<value> # puts parameter in pkg environment + +# +# Include ISA independent files (prototype_com) +# +!include prototype_com +# +# +# +# List files which are SPARC specific here +# +# source locations relative to the prototype file +# +# +# SUNWtlsx +# +s none usr/lib/mps/64=sparcv9 +d none usr/lib/mps/sparcv9 755 root bin +f none usr/lib/mps/sparcv9/libnss3.so 755 root bin +f none usr/lib/mps/sparcv9/libsmime3.so 755 root bin +f none usr/lib/mps/sparcv9/libssl3.so 755 root bin +f none usr/lib/mps/sparcv9/libnssckbi.so 755 root bin +f none usr/lib/mps/sparcv9/libsoftokn3.chk 755 root bin +f none usr/lib/mps/sparcv9/libsoftokn3.so 755 root bin |