fixup commit for tag 'NSS_3_3_3_BETA_Sun120602' NSS_3_3_BRANCH NSS_3_3_3_BETA_Sun120602
authorcvs2hg
Fri, 06 Dec 2002 20:07:12 +0000
branchNSS_3_3_BRANCH
changeset 3907 1001a5d40787879920e919b66148d64311ce1389
parent 3906 ab1f130a1525014f5af38ed6f0cdbacde8cf3dc6
child 3926 b4719f262cbeea545e9593c515c794621e3a27ed
push idunknown
push userunknown
push dateunknown
fixup commit for tag 'NSS_3_3_3_BETA_Sun120602'
security/coreconf/AIX5.1.mk
security/nss/pkg/solaris/Makefile
security/nss/pkg/solaris/Makefile.com
security/nss/pkg/solaris/Makefile.targ
security/nss/pkg/solaris/SUNWtls/Makefile
security/nss/pkg/solaris/SUNWtls/pkgdepend
security/nss/pkg/solaris/SUNWtls/pkginfo.tmpl
security/nss/pkg/solaris/SUNWtls/prototype_com
security/nss/pkg/solaris/SUNWtls/prototype_i386
security/nss/pkg/solaris/SUNWtls/prototype_sparc
security/nss/pkg/solaris/SUNWtlsx/Makefile
security/nss/pkg/solaris/SUNWtlsx/pkgdepend
security/nss/pkg/solaris/SUNWtlsx/pkginfo.tmpl
security/nss/pkg/solaris/SUNWtlsx/prototype_com
security/nss/pkg/solaris/SUNWtlsx/prototype_sparc
security/nss/pkg/solaris/bld_awk_pkginfo.ksh
security/nss/pkg/solaris/common_files/copyright
deleted file mode 100644
--- a/security/coreconf/AIX5.1.mk
+++ /dev/null
@@ -1,54 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-# 
-# The Original Code is the Netscape security libraries.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-#
-# Config stuff for AIX5.1
-#
-
-include $(CORE_DEPTH)/coreconf/AIX.mk
-
-
-ifeq ($(USE_64), 1)
-# Next line replaced by generic name handling in arch.mk
-#	COMPILER_TAG    = _64
-	OS_CFLAGS	+= -DAIX_64BIT
-	OBJECT_MODE=64
-	export OBJECT_MODE
-endif
-DSO_LDOPTS	= -brtl -bM:SRE -bnoentry
-MKSHLIB		= $(LD) $(DSO_LDOPTS) -lsvld -L/usr/lpp/xlC/lib -lc -lm
-
-OS_LIBS		+= -L/usr/lpp/xlC/lib -lc -lm
-ifdef MAPFILE
-DSO_LDOPTS      += -bexport:$(MAPFILE)
-else
-DSO_LDOPTS      += -bexpall
-endif
deleted file mode 100644
--- a/security/nss/pkg/solaris/Makefile
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# Copyright 2002 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"$Id$"
-#
-
-CORE_DEPTH = ../../..
-
-%: %.ksh
-	$(RM) $@
-	cp $< $@
-	chmod +x $@
-
-
-ifeq ($(USE_64), 1)
-DIRS = \
-    SUNWtlsx
-else
-DIRS = \
-    SUNWtls
-endif
-
-PROTO = \
-	$(ROOT) \
-	$(ROOT)/usr \
-	$(ROOT)/usr/lib \
-	$(ROOT)/usr/lib/mps
-
-ifdef USE_64
-PROTO += $(ROOT)/usr/lib/mps/sparcv9
-endif
-
-include Makefile.com
-
-awk_pkginfo: bld_awk_pkginfo
-	./bld_awk_pkginfo -m $(MACH) -p "$(PRODUCT_VERSION)" -o $@ -v $(PRODUCT_VERSION)
-
-all:: awk_pkginfo $(PROTO)
-publish: awk_pkginfo $(PROTO)
-	+$(LOOP_OVER_DIRS)
-
-clean clobber::
-	$(RM) awk_pkginfo bld_awk_pkginfo
-	$(RM) -r $(ROOT)
-
-$(ROOT) $(ROOT)/%:
-	mkdir -p $@
-
-ifdef USE_64
-$(ROOT)/usr/lib/mps/sparcv9: $(ROOT)/usr/lib
-	$(LN) -sf ../../../../$(DIST)/lib $@
-else
-$(ROOT)/usr/lib/mps: $(ROOT)/usr/lib
-	$(LN) -sf ../../../$(DIST)/lib $@
-endif
deleted file mode 100644
--- a/security/nss/pkg/solaris/Makefile.com
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# Copyright 2002 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"$Id$"
-#
-
-MACH = $(shell mach)
-
-PUBLISH_ROOT = $(DIST)
-ifeq ($(CORE_DEPTH),../../..)
-ROOT = ROOT
-else
-ROOT = $(subst ../../../,,$(CORE_DEPTH))/ROOT
-endif
-
-PKGARCHIVE = $(PUBLISH_ROOT)/pkgarchive
-DATAFILES = copyright
-FILES = $(DATAFILES) pkginfo
-
-PACKAGE = $(shell basename `pwd`)
-
-PRODUCT_VERSION = 3.3.2
-PRODUCT_NAME = NSS_3_3_2_RTM
-
-LN = /usr/bin/ln
-
-CLOBBERFILES = $(FILES)
-
-include $(CORE_DEPTH)/coreconf/config.mk
-include $(CORE_DEPTH)/coreconf/rules.mk
-
-# vim: ft=make
deleted file mode 100644
--- a/security/nss/pkg/solaris/Makefile.targ
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# Copyright 2002 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"$Id$"
-#
-
-pkginfo: pkginfo.tmpl ../awk_pkginfo
-	$(RM) $@; nawk -f ../awk_pkginfo $@.tmpl > $@
-
-pkg: $(PKGARCHIVE)
-	pkgmk -f prototype_$(MACH) -d $(PKGARCHIVE) -r $(ROOT) -o $(PACKAGE)
-
-$(PKGARCHIVE):
-	[ -d $(PKGARCHIVE) ] || mkdir -p $(PKGARCHIVE)
-
-$(DATAFILES):: %: ../common_files/%
-	$(RM) $@; cp ../common_files/$@ $@
-
-$(MACHDATAFILES): %: ../common_files/%_$(MACH)
-	$(RM) $@; cp ../common_files/$@_$(MACH) $@
-
-clobber clean::
-	-$(RM) $(CLOBBERFILES) $(CLEANFILES)
-
-.PHONY: pkg
deleted file mode 100644
--- a/security/nss/pkg/solaris/SUNWtls/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# 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
deleted file mode 100644
--- a/security/nss/pkg/solaris/SUNWtls/pkgdepend
+++ /dev/null
@@ -1,28 +0,0 @@
-# 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 SUNWpr	Netscape Portable Runtime
deleted file mode 100644
--- a/security/nss/pkg/solaris/SUNWtls/pkginfo.tmpl
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# 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="SUNWtls"
-NAME="Network Security Services"
-ARCH="ISA"
-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"
-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>"
deleted file mode 100644
--- a/security/nss/pkg/solaris/SUNWtls/prototype_com
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# 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
-#
-# SUNWtls
-#
-d none usr 755 root sys
-d none usr/lib 755 root bin
-d none usr/lib/mps 755 root bin
-f none usr/lib/mps/libnss3.so 755 root bin
-f none usr/lib/mps/libsmime3.so 755 root bin
-f none usr/lib/mps/libssl3.so 755 root bin
-f none usr/lib/mps/libnssckbi.so 755 root bin
deleted file mode 100644
--- a/security/nss/pkg/solaris/SUNWtls/prototype_i386
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# 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 i386 specific here
-#
-# source locations relative to the prototype file
-#
-#
-# SUNWtls
-#
deleted file mode 100644
--- a/security/nss/pkg/solaris/SUNWtls/prototype_sparc
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# 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
-#
-#
-# SUNWtls
-#
-f none usr/lib/mps/libfreebl_hybrid_3.so 755 root bin
-f none usr/lib/mps/libfreebl_pure32_3.so 755 root bin
-
deleted file mode 100644
--- a/security/nss/pkg/solaris/SUNWtlsx/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# 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
deleted file mode 100644
--- a/security/nss/pkg/solaris/SUNWtlsx/pkgdepend
+++ /dev/null
@@ -1,31 +0,0 @@
-# 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
deleted file mode 100644
--- a/security/nss/pkg/solaris/SUNWtlsx/pkginfo.tmpl
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# 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>"
deleted file mode 100644
--- a/security/nss/pkg/solaris/SUNWtlsx/prototype_com
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# 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
deleted file mode 100644
--- a/security/nss/pkg/solaris/SUNWtlsx/prototype_sparc
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# 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
-
deleted file mode 100644
--- a/security/nss/pkg/solaris/bld_awk_pkginfo.ksh
+++ /dev/null
@@ -1,105 +0,0 @@
-#!/usr/bin/ksh -p
-#
-#ident	"$Id$"
-#
-# Copyright 2002 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# Simple script which builds the awk_pkginfo awk script.  This awk script
-# is used to convert the pkginfo.tmpl files into pkginfo files
-# for the build.
-#
-
-usage()
-{
-   cat <<-EOF
-usage: bld_awk_pkginfo -p <prodver> -m <mach> -o <awk_script> [-v <version>]
-EOF
-}
-
-#
-# Awk strings
-#
-# two VERSION patterns: one for Dewey decimal, one for Dewey plus ,REV=n
-# the first has one '=' the second has two or more '='
-#
-VERSION1="VERSION=[^=]*$"
-VERSION2="VERSION=[^=]*=.*$"
-PRODVERS="^SUNW_PRODVERS="
-ARCH='ARCH=\"ISA\"'
-
-#
-# parse command line
-#
-mach=""
-prodver=""
-awk_script=""
-version="NSSVERS"
-
-while getopts o:p:m:v: c
-do
-   case $c in
-   o)
-      awk_script=$OPTARG
-      ;;
-   m)
-      mach=$OPTARG
-      ;;
-   p)
-      prodver=$OPTARG
-      ;;
-   v)
-      version=$OPTARG
-      ;;
-   \?)
-      usage
-      exit 1
-      ;;
-   esac
-done
-
-if [[ ( -z $prodver ) || ( -z $mach ) || ( -z $awk_script ) ]]
-then
-   usage
-   exit 1
-fi
-
-if [[ -f $awk_script ]]
-then
-	rm -f $awk_script
-fi
-
-#
-# Build REV= field based on date
-#
-rev=$(date "+%Y.%m.%d.%H.%M")
-
-#
-# Build awk script which will process all the
-# pkginfo.tmpl files.
-#
-# the first VERSION pattern is replaced with a leading quotation mark
-#
-rm -f $awk_script
-cat << EOF > $awk_script
-/$VERSION1/ {
-      sub(/\=[^=]*$/,"=\"$rev\"")
-      print
-      next
-   }
-/$VERSION2/ {
-      sub(/\=[^=]*$/,"=$rev\"")
-      sub(/NSSVERS/,"$version")
-      print
-      next
-   }
-/$PRODVERS/ { 
-      printf "SUNW_PRODVERS=\"%s\"\n", "$prodver" 
-      next
-   }
-/$ARCH/ {
-      printf "ARCH=\"%s\"\n", "$mach"
-      next
-   }
-{ print }
-EOF
deleted file mode 100644
--- a/security/nss/pkg/solaris/common_files/copyright
+++ /dev/null
@@ -1,28 +0,0 @@
-The contents of this package are subject to the Mozilla Public License
-Version 1.1 (the "License"); you may not use this package except in
-compliance with the License. You may obtain a copy of the License at
-http://www.mozilla.org/MPL/
-
-Software distributed under the License is distributed on an "AS IS"
-basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-License for the specific language governing rights and limitations
-under the License.
-
-The Original Code is the Netscape security libraries.
-
-The Initial Developer of the Original Code is Netscape Communications
-Corporation.  Portions created by Netscape are Copyright (C) 1994-2000
-Netscape Communications Corporation.  All Rights Reserved.
-
-Contributor(s):
-
-Alternatively, the contents of this package may be used under the terms
-of the GNU General Public License Version 2 or later (the "GPL"), in
-which case the provisions of the GPL are applicable instead of those
-above.  If you wish to allow use of your version of this package only
-under the terms of the GPL and not to allow others to use your version
-of this package under the MPL, indicate your decision by deleting the
-provisions above and replace them with the notice and other provisions
-required by the GPL.  If you do not delete the provisions above, a
-recipient may use your version of this package under either the MPL or
-the GPL.