Import sfw build 169
Bugs Fixed
----------
7045290 next on As The Gate Churns - more things move from sfw to userland/foss (Act III)
7053238 ctype_base and codecvt_base destructors should be public
7055596 std::money_base and std::messages_base destructors should be public
--- a/usr/src/Targetdirs Thu Jun 16 03:22:51 2011 -0700
+++ b/usr/src/Targetdirs Fri Jul 15 23:48:44 2011 -0700
@@ -22,7 +22,7 @@
#
# Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
#
-# ident "@(#)Targetdirs 1.272 11/06/02 SMI"
+# ident "@(#)Targetdirs 1.273 11/06/15 SMI"
#
#
@@ -65,11 +65,7 @@
/etc/security \
/etc/security/auth_attr.d \
/etc/security/exec_attr.d \
- /etc/security/pam_pkcs11 \
- /etc/security/pam_pkcs11/cacerts \
- /etc/security/pam_pkcs11/crls \
/etc/security/prof_attr.d \
- /etc/stunnel \
/etc/mysql \
/etc/mysql/5.0 \
/etc/mysql/5.1 \
@@ -85,8 +81,7 @@
/lib/svc/manifest/network \
/lib/svc/manifest/network/ldap \
/lib/svc/manifest/network/loadbalancer \
- /lib/svc/manifest/network/routing \
- /lib/svc/manifest/network/ssl
+ /lib/svc/manifest/network/routing
# Note: Do not add subdirs (other than logs, proxy and libexec)
# of /var/apache2/2.2 to the list. The apache2 installation will
@@ -158,7 +153,6 @@
/usr/include/openldap \
/usr/include/sane \
/usr/include/stdcxx4 \
- /usr/include/tidy \
/usr/include/xmlrpc-c \
/usr/include/yaz \
/usr/jruby \
@@ -186,14 +180,12 @@
/usr/lib/openldap/bin/$(MACH64) \
/usr/lib/nethack \
/usr/lib/openusb_backend \
- /usr/lib/pam_pkcs11 \
/usr/lib/pkgconfig \
/usr/lib/python2.6 \
/usr/lib/python2.6/vendor-packages \
/usr/lib/python2.6/vendor-packages/rdiff_backup \
/usr/lib/quilt \
/usr/lib/sane \
- /usr/lib/security \
/usr/lib/tcl8.4 \
/usr/lib/tcl8.4/snack2.2.10 \
/usr/lib/tcl8.4/tls1.6 \
@@ -521,8 +513,6 @@
/usr/share/doc/jrexx \
/usr/share/doc/librsync-0.9.7 \
/usr/share/doc/librsync-0.9.7/html \
- /usr/share/doc/libsndfile \
- /usr/share/doc/libsndfile/html \
/usr/share/doc/libxmlrpc-c3-dev \
/usr/share/doc/libxmlrpc-c3-dev/examples \
/usr/share/doc/libxmlrpc-c3-dev/examples/conf \
@@ -533,7 +523,6 @@
/usr/share/doc/openldap \
/usr/share/doc/openldap/admin24 \
/usr/share/doc/openldap/images \
- /usr/share/doc/pam_pkcs11 \
/usr/share/doc/pen \
/usr/share/doc/privoxy \
/usr/share/doc/privoxy/developer-manual \
@@ -552,8 +541,6 @@
/usr/share/doc/stdcxx4/html/stdlibref \
/usr/share/doc/stdcxx4/html/stdlibug \
/usr/share/doc/sysbench \
- /usr/share/doc/tidy \
- /usr/share/doc/tidy/html \
/usr/share/doc/tls-1.6 \
/usr/share/doc/tls-1.6/html \
/usr/share/doc/trove \
@@ -612,9 +599,6 @@
/usr/share/man/man7openssl \
/usr/share/man/man8 \
/usr/share/man/man8oldap \
- /usr/share/octave \
- /usr/share/octave/site \
- /usr/share/octave/site/m \
/usr/share/pixmaps \
/usr/share/quilt \
/usr/share/quilt/compat \
@@ -675,8 +659,6 @@
/usr/bin/$(MACH64) \
/usr/lib/$(MACH64) \
/usr/lib/$(MACH64)/pkgconfig \
- /usr/lib/pam_pkcs11/$(MACH64) \
- /usr/lib/security/$(MACH64) \
/usr/sfw/bin/$(MACH64) \
/usr/apr/1.3/bin/$(MACH64) \
/usr/apr/1.3/build/$(MACH64) \
--- a/usr/src/cmd/Makefile Thu Jun 16 03:22:51 2011 -0700
+++ b/usr/src/cmd/Makefile Fri Jul 15 23:48:44 2011 -0700
@@ -22,7 +22,7 @@
#
# Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
#
-# ident "@(#)Makefile 1.207 11/06/02 SMI"
+# ident "@(#)Makefile 1.208 11/06/15 SMI"
#
#
@@ -104,8 +104,6 @@
simplewbem \
slrn \
spawn-fcgi \
- stunnel \
- sudo \
sysbench \
unrar \
webmin
--- a/usr/src/cmd/php5/Makefile.sfw Thu Jun 16 03:22:51 2011 -0700
+++ b/usr/src/cmd/php5/Makefile.sfw Fri Jul 15 23:48:44 2011 -0700
@@ -20,7 +20,7 @@
#
# Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
#
-#pragma ident "@(#)Makefile.sfw 1.46 11/06/02 SMI"
+#pragma ident "@(#)Makefile.sfw 1.47 11/06/15 SMI"
PHP_REL=5.2
#
@@ -355,7 +355,7 @@
--with-pdo-sqlite=shared \
--with-snmp=shared,/usr \
--with-sqlite=shared \
- --with-tidy=shared,$(ROOT)/usr \
+ --with-tidy=shared,/usr \
--without-tsrm-pthreads )
$(PHP_CGI)/config.status: $(PHP_DIR)/configure
@@ -403,7 +403,7 @@
--with-pdo-sqlite=shared \
--with-snmp=shared,/usr \
--with-sqlite=shared \
- --with-tidy=shared,$(ROOT)/usr )
+ --with-tidy=shared,/usr )
$(PHP_DIR)/configure: $(PHP_DIR).tar.bz2
bunzip2 -dc $(PHP_DIR).tar.bz2 | tar xopf -
--- a/usr/src/cmd/stunnel/METADATA Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-NAME: stunnel
-VERSION: 4.25
-DESCRIPTION: Universal SSL Wrapper
-LICENSE: GPLv2
-PACKAGE: SUNWstunnelr SUNWstunnelu
-PROJECT_URL: http://www.stunnel.org/
-SOURCE_DOWNLOAD: http://www.stunnel.org/download/stunnel/src/stunnel-4.25.tar.gz
-SUPPORT: C
-BUGTRAQ: solaris/utility/stunnel
-OSR: 9258
-COMMENTS:
- PSARC: 2008/369
- ADDITIONS: sample configuration, SMF manifest, test scripts.
--- a/usr/src/cmd/stunnel/Makefile.sfw Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,80 +0,0 @@
-#
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-#ident "@(#)Makefile.sfw 1.4 10/04/22 SMI"
-
-# Change this ip updating the package version.
-PKGNAME=stunnel
-VER=4.25
-PROG=$(PKGNAME)-$(VER)
-CLOBBERFILES=stunnel.pod test_stun stunnel.man
-PREFIX=${ROOT}/usr
-XMLDIR=${ROOT}/lib/svc/manifest/network/ssl
-LIBDIR=${ROOT}/usr/lib
-XMLFILE=stunnel.xml
-BINDIR=${PREFIX}/bin
-SHAREDIR=${PREFIX}/share
-MANDIR=${SHAREDIR}/man/man${MANSECTION}
-DATE=`date '+%e %b %Y'`
-POD2MAN=/usr/perl5/5.8.4/bin/pod2man
-
-include ../Makefile.cmd
-
-CONFIGURE_OPTIONS += --with-ssl=/usr
-CONFIGURE_OPTIONS += --sysconfdir=/etc
-
-SFW_PATH="$(SPRO_VROOT)/bin:/usr/perl5/bin:/usr/sfw/bin:$(PATH)"
-CPPFLAGS="-I/usr/sfw/include"
-LDFLAGS="-L/usr/sfw/lib -R/usr/sfw/lib"
-
-all: $(PROG)/config.status
- (cd $(PROG); env - \
- CC=$(CC) \
- CPPFLAGS=$(CPPFLAGS) \
- LDFLAGS=$(LDFLAGS) \
- PATH=$(SFW_PATH) \
- MAKE=$(CCSMAKE) $(CCSMAKE))
-
-$(PROG)/configure: $(PROG).tar.gz
- /usr/bin/gunzip -dc $(PROG).tar.gz | \
- $(GTAR) xpf - --no-same-owner
- touch $(PROG)/configure
- find $(PROG) -type d -exec /usr/bin/chmod 755 "{}" \;
- find $(PROG) -type f -exec /usr/bin/chmod ugo+r "{}" \;
-
-$(PROG)/config.status: $(PROG)/configure
- (cd $(PROG); env - \
- CC=$(CC) \
- CPPFLAGS=$(CPPFLAGS) \
- LDFLAGS=$(LDFLAGS) \
- PATH=$(SFW_PATH) \
- MAKE=$(CCSMAKE) \
- ./configure $(CONFIGURE_OPTIONS))
-
-install: all
- $(SHELL) ./install-sfw ${PKGNAME} $(VER)
-
-clean:
- rm -rf $(PROG)
-
-include ../Makefile.targ
--- a/usr/src/cmd/stunnel/auth_attr Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-solaris.smf.value.stunnel:::Change stunnel value properties::
-solaris.smf.manage.stunnel:::Manage stunnel service states::
--- a/usr/src/cmd/stunnel/install-sfw Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +0,0 @@
-#!/bin/ksh93
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-#ident "@(#)install-sfw 1.3 10/04/22 SMI"
-
-set -e
-
-PKGNAME=${1}
-VERS=${2}
-PKGVERS=${PKGNAME}-${VERS}
-PREFIX=${ROOT}/usr
-XMLDIR=${ROOT}/lib/svc/manifest/network/ssl
-LIBDIR=${ROOT}/usr/lib
-XMLFILE=stunnel.xml
-BINDIR=${PREFIX}/bin
-SHAREDIR=${PREFIX}/share
-MANSECTION=1
-MANDIR=${SHAREDIR}/man/man${MANSECTION}
-DATE=`date '+%e %b %Y'`
-POD2MAN=/usr/perl5/5.8.4/bin/pod2man
-
-source "${SRC}/tools/install.subr"
-
-
-# Add the Solaris specific section to the stunnel man page.
-cat ${PKGVERS}/doc/stunnel.pod solaris_manpage.pod >stunnel.pod
-${POD2MAN} --section=${MANSECTION} --date="${DATE}" \
- --release="${PKGNAME} ${VERS}" --center="User Commands" \
- stunnel.pod >stunnel.man
-
-_install N ${XMLFILE} ${XMLDIR}/${XMLFILE} 444
-_install N stunnel.sample ${ROOT}/etc/stunnel/stunnel.sample 444
-_install N stunnel.man ${MANDIR}/stunnel.${MANSECTION} 444
-_install E ${PKGVERS}/src/stunnel ${BINDIR}/stunnel 555
-_install N ${PKGVERS}/src/.libs/libstunnel.so ${LIBDIR}/libstunnel.so 555
-_install N test_stunnel.sh test_stun 755
-_install N setup_CA.sh setup_CA 555
-_install N auth_attr ${ROOT}/etc/security/auth_attr.d/stunnel 444
-_install N prof_attr ${ROOT}/etc/security/prof_attr.d/stunnel 444
-
-exit 0
--- a/usr/src/cmd/stunnel/prof_attr Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-Stunnel Administration:RO:::auths=solaris.smf.manage.stunnel,solaris.smf.value.stunnel
--- a/usr/src/cmd/stunnel/setup_CA.sh Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,84 +0,0 @@
-#!/bin/sh
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#ident "@(#)setup_CA.sh 1.2 08/12/11 SMI"
-#
-# This is a sample script to create a simple Certificate Authority using
-# openssl(5). This script uses some library functions contained in
-# stunnel_ca_lib.sh, be sure to copy this file into the same directory as this
-# script.
-#
-# The openssl(1) and ca(1) man pages contain details of the options used.
-#
-# CA stuff
-#
-STUNNEL_DIR=/etc/stunnel
-CA_DIR=${STUNNEL_DIR}/my_CA
-PEMFILE=${STUNNEL_DIR}/stunnel.pem
-OPENSSL=/usr/bin/openssl
-OPEN_SSL_CONF="${CA_DIR}/openssl.cnf"
-# These variables are used to make up the DN
-# of the CA signing certificate and the CRLs
-# Try and use your own details here!
-CA_SIG='rsa'
-CA_KEY="abc123"
-DEFAULT_BITS=1024
-COUNTRY='US'
-STATE='CA'
-LOCALITY='Nowhere City'
-ORG='Mycorp'
-OUNIT='Test'
-USER_NAME='Jon Doe'
-EMAIL='[email protected]'
-USE_EXISTING='no'
-FIRST_CERT='01'
-
-# To stop openssl complaining about being unable to create random state.
-HOME=${CA_DIR}
-export HOME
-
-#
-# Source in the setup_ca() and setup_certificate() functions
-# from the shell library.
-
-SHELL_LIB=`dirname $0`/stunnel_ca_lib.sh
-
-. ${SHELL_LIB}
-
-if [ -f ${OPEN_SSL_CONF} ]
- then echo "Using existing CA config file: ${OPEN_SSL_CONF}"
- echo "\n\nGenerating CA certificate"
- create_CA_certificate
- echo "\n\nGenerating a CSR"
- generate_csr
- echo "\n\nSign CSR"
- ca_sign_csr
- echo "\n\nCreating ${PEMFILE}"
- combine_pem
-else
- echo "\n\nCreating simple CA in ${CA_DIR}"
- echo "Creating configuration file: ${OPEN_SSL_CONF}"
- setup_ca
- echo "\n\nEdit ${OPEN_SSL_CONF} to use values that are meaningfull"
- echo "within your organisation, then re-run this script."
- exit 0
-fi
--- a/usr/src/cmd/stunnel/solaris_manpage.pod Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,112 +0,0 @@
-=begin text
-
-#ident "@(#)solaris_manpage.pod 1.3 11/01/03 SMI"
-
-=end text
-
-=head1 SOLARIS CONFIGURATION
-
-Solaris has a service management facility to start processes and daemons
-at system boot. This facility replaces the more traditional runtime
-configuration scripts used by other Unix operating systems.
-The Solaris service management facility is also used to implement inetd(1M).
-
-To configure stunnel to listen on one or more ports, create the stunnel
-configuration file /etc/stunnel/stunnel.conf. The configuration tokens are
-explained elsewhere in this manual. A sample configuration file delivered
-in /etc/stunnel can be used as a reference.
-
-Now activate the stunnel smf(5) service using svcadm(1M).
-
-=over 4
-=item
-
-# svcadm enable svc:/network/ssl/stunnel:default
-
-=back
-
-Note that the smf(5) FMRI can be abbreviated to stunnel, so following
-command is also valid:
-
-=over 4
-=item
-
-# svcadm enable stunnel
-
-=back
-
-Check that the service is running with the svcs(1M) command. If the stunnel
-service is not online, use svcs -xv to find out why. This command will show the
-name of the log file used to record any startup errors.
-
-The stunnel smf(5) service is defined by a manifest which is part of the
-service/security/stunnel package. The properties of the service can be
-viewed or changed with the svcprop(1M) command.
-
-The stunnel smf(5) service starts stunnel process(es) which listen for
-incoming connections. An alternative way of achieving this is to use
-INETD MODE described elsewhere in this manual. This method is advantageous
-if the service useage is intermittant, or when many services need to use
-stunnel because each service can be enabled or disabled independently.
-
-When configuring inetd(1M) to listen on the required ports, the
-stunnel process(es) are started only when a connection is established.
-
-The INETD MODE section of this manual describes editing /etc/inetd.conf
-to configure inetd(1M), although this file exists in Solaris, the services
-controlled by inetd(1M) are in fact configured using smf(5) manifests.
-
-To configure inetd(1M) on Solaris to start a stunnel process:
-
-=over 4
-=item *
-
-Check that the service has an entry in /etc/services.
-
-=item *
-
-Check to see if there is already a smf(5) service running on this port
-using svcs(1M) and disable any existing service with svcadm(1M).
-
-=item *
-
-Create a stunnel configuration file, for example:
-
-/etc/stunnel/stunnel_imap.conf
-
-=item *
-
-Create a scratch template file and add the /etc/inetd.conf entry to
-this file (see INETD MODE).
-
-=item *
-
-Use the inetconv(1M) command to create a inetd(1M) service manifest and
-register the service with smf(5), for example:
-
-# inetconv -i /tmp/inetd_scratch.conf -o /lib/svc/manifest/network/ssl
-
-=item *
-
-The newly created service can be managed with svcadm(1M).
-
-=back
-
-=head1 ATTRIBUTES
-
-See attributes(5) for descriptions of the following attributes:
-
-___________________________________________________________
-| ATTRIBUTE TYPE | ATTRIBUTE VALUE |
-|_____________________________|___________________________|
-| Availability | service/security/stunnel |
-|_____________________________|___________________________|
-| Interface Stability | Uncommitted |
-|_____________________________|___________________________|
-
-
-=head1 SOURCE CODE
-
-Source for stunnel is available on http://opensolaris.org.
-
-
Binary file usr/src/cmd/stunnel/stunnel-4.25.tar.gz has changed
--- a/usr/src/cmd/stunnel/stunnel.sample Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,106 +0,0 @@
-;
-;
-; CDDL HEADER START
-;
-; The contents of this file are subject to the terms of the
-; Common Development and Distribution License (the "License").
-; You may not use this file except in compliance with the License.
-;
-; You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-; or http://www.opensolaris.org/os/licensing.
-; See the License for the specific language governing permissions
-; and limitations under the License.
-;
-; When distributing Covered Code, include this CDDL HEADER in each
-; file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-; If applicable, add the following below this CDDL HEADER, with the
-; fields enclosed by brackets "[]" replaced with your own identifying
-; information: Portions Copyright [yyyy] [name of copyright owner]
-;
-; CDDL HEADER END
-;
-; Copyright 2008 Sun Microsystems, Inc. All rights reserved.
-; Use is subject to license terms.
-;
-;ident "@(#)stunnel.sample 1.1 08/07/09 SMI"
-;
-; Sample stunnel configuration file, copy and edit as required.
-; The examples are commented out because the fictitious system names
-; would cause stunnel to fail with a bind error.
-;
-; Blank lines and lines that start with ';' are ignored.
-; These options are global to all stunnel processes using this file
-;
-; pid lock file
-pid = /var/run/stunnel.pid
-;
-; Global debug level (written to stdout or syslog(3C))
-; Default debug level is 5.
-debug = 7
-;
-; stunnel service defintions start with a [label], the label should be
-; unique and descriptive.
-;
-; The following block defines a sample service to allow a non-SSL aware
-; IMAP mail client to use SSL to connect to a secure mail server (imaps).
-; stunnel will listen on the "accept" address/port and forward packets
-; to the "connect" address/port. The mail client should be configured
-; to use "localhost" as its mail server.
-;[imapd]
-;
-; verify = 0
-; accept = localhost:143
-; names and IP addresses work too.
-; accept = mysystem:143
-; accept = 192.168.0.12:143
-; Only use these ciphers, run this command to find supported ciphers:
-; 'openssl ciphers'
-; ciphers = DES-CBC3-SHA:IDEA-CBC-MD5
-; client = yes
-; connect = mymailserver.net:993
-
-; The following could be used by a non-privileged user to run a imaps proxy.
-; The bind port is not privileged, this assumes that no other process
-; is using this port, of course. The mail client would need to be configured
-; to use "localhost" as its mailserver and connect to port "14344".
-;[imap_user]
-; accept = localhost:14344
-; connect = mymailserver.net:993
-; client = yes
-
-; This definition allows 'https' connections to the "accept" address/port
-; and forwards them to an http server running on the localhost port 80.
-; To work in server mode, stunnel needs a pkcs#12 file. This contains
-; the server's pem-encoded private and public keys.
-;
-; The pkcs#12 file provides the servers identity, this file can be obtained
-; from an existing CA, either commercial or from somewhere within the
-; organization. Alternatively, openssl(5) can be used to generate self-signed
-; certificates, or be configured as a ca(1) and used to generate and sign CSR's.
-; The signed certificates are concatenated into a pkcs#12, the location is
-; defined with the 'cert =' keyword (see below).
-;
-;[https]
-; verify = 1
-; accept = localhost:143
-; Location of a file that contains the system private key and public certificate
-; created with openssl. The file should be owned by root and have be read only
-; for root only (IE: chmod 0400)
-; see openssl(5) and ca(1)
-; cert = /etc/stunnel/stunnel.pem
-; accept = my_external_IP:443
-; connect = localhost:80
-; client = no
-;
-; For more information on setting up an openssl(5) CA, read the Solaris
-; man pages or one of the many Internet tutorials on the subject.
-;
-; The source code for the version of stunnel shipped with Solaris can be
-; viewed on http://src.opensolaris.org/source/ (search for stunnel). This
-; source tree includes a sample script that can setup openssl(5) as a CA
-; and generate and sign the certificates.
-;
-; setup_CA.sh - Configures openssl(5) as a CA, generates certificates.
-; stunnel_ca_lib.sh - Library used by setup_CA.sh.
-; test_stunnel.sh - For generating a test configuration.
-;
--- a/usr/src/cmd/stunnel/stunnel.xml Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,185 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
-<!--
- CDDL HEADER START
-
- The contents of this file are subject to the terms of the
- Common Development and Distribution License (the "License").
- You may not use this file except in compliance with the License.
-
- You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- or http://www.opensolaris.org/os/licensing.
- See the License for the specific language governing permissions
- and limitations under the License.
-
- When distributing Covered Code, include this CDDL HEADER in each
- file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- If applicable, add the following below this CDDL HEADER, with the
- fields enclosed by brackets "[]" replaced with your own identifying
- information: Portions Copyright [yyyy] [name of copyright owner]
-
- CDDL HEADER END
-
- Copyright 2008 Sun Microsystems, Inc. All rights reserved.
- Use is subject to license terms.
-
- ident "@(#)stunnel.xml 1.2 08/07/18 SMI"
-
- NOTE: This service manifest is not editable; its contents will
- be overwritten by package or patch operations, including
- operating system upgrade. Make customizations in a different
- file.
--->
-<service_bundle type='manifest' name='SUNWstunnelr:stunnel'>
-
-<service
- name='network/ssl/stunnel'
- type='service'
- version='1'>
-
- <create_default_instance enabled='false' />
-
- <single_instance />
-
- <!-- Read/Write access required to /var/run for lockfiles -->
- <dependency
- name='filesystem'
- grouping='require_all'
- restart_on='none'
- type='service'>
- <service_fmri
- value='svc:/system/filesystem/local'
- />
- </dependency>
-
- <dependency
- name='loopback'
- grouping='require_all'
- restart_on='none'
- type='service'>
- <service_fmri
- value='svc:/system/filesystem/local'
- />
- </dependency>
-
- <dependency
- name='net-physical'
- grouping='require_all'
- restart_on='none'
- type='service'>
- <service_fmri
- value='svc:/network/physical'
- />
- </dependency>
-
- <dependency
- name='cryptosvc'
- grouping='require_all'
- restart_on='none'
- type='service'>
- <service_fmri
- value='svc:/system/cryptosvc'
- />
- </dependency>
-
- <exec_method
- type='method'
- name='start'
- exec='/usr/bin/stunnel %{config/config_file}'
- timeout_seconds='60' />
-
- <exec_method
- type='method'
- name='stop'
- exec=':kill'
- timeout_seconds='60' />
-
- <property_group name='general' type='framework'>
- <!-- A user with this authorization can:
-
- svcadm restart stunnel
- svcadm disable -t stunnel
- svcadm mark <state> stunnel
- svcadm clear stunnel
-
- see auths(1) and user_attr(4)-->
-
- <propval
- name='action_authorization'
- type='astring'
- value='solaris.smf.manage.stunnel'
- />
- <!-- A user with this authorization can:
-
- svcadm disable stunnel
- svcadm enable stunnel
-
- see auths(1) and user_attr(4)-->
-
- <propval
- name='value_authorization'
- type='astring'
- value='solaris.smf.value.stunnel'
- />
- </property_group>
-
- <!-- The properties defined below can be changed by a user
- with 'solaris.smf.value.stunnel' authorization using the
- svccfg(1M) command.
-
- e.g.
-
- svccfg -s stunnel setprop config/config_file = /myconf/etc/stunnel.conf
-
- Now refresh the service:
-
- svcadm refresh network/stunnel
-
- Note: svcadm disable/enable does not use the new property
- until after the service has been refreshed.
-
- ***Do not edit this manifest to change these properties! -->
-
- <property_group name='config' type='application'>
- <propval
- name='config_file'
- type='astring'
- value='/etc/stunnel/stunnel.conf'
- />
- <propval
- name='value_authorization'
- type='astring'
- value='solaris.smf.value.stunnel'
- />
- </property_group>
-
- <!-- default service model of 'contract' -->
- <property_group name='startd' type='framework'>
- <propval
- name='duration'
- type='astring'
- value='contract'
- />
- </property_group>
-
- <stability value='Unstable' />
-
- <template>
- <common_name>
- <loctext xml:lang='C'>
- stunnel as a daemon
- </loctext>
- </common_name>
- <documentation>
- <manpage title='stunnel' section='8'
- manpath='/usr/share/man' />
- <doc_link
- name='stunnel.org website'
- uri='http://www.stunnel.org'
- />
- </documentation>
- </template>
-
-</service>
-</service_bundle>
-
--- a/usr/src/cmd/stunnel/stunnel_ca_lib.sh Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,200 +0,0 @@
-#!/bin/sh
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#ident "@(#)stunnel_ca_lib.sh 1.1 08/07/09 SMI"
-#
-
-# These are common functions used by test_stunnel and setup_CA
-
-setup_ca() {
-
-mkdir -p ${CA_DIR}
-mkdir -p ${PEMDIR}
-cd ${CA_DIR}
-mkdir -p private requests certs newcerts crl
-cat /dev/null > index.txt
-cat /dev/null > serial
-echo ${FIRST_CERT} >> serial
-
-cat /dev/null > ${OPEN_SSL_CONF}
-
-echo "############################################################" \
- >> ${OPEN_SSL_CONF}
-echo "# This config file autogenerated by $PROGNAME" >> ${OPEN_SSL_CONF}
-echo "# Edit this section, change these values to something meaningfull" \
- >> ${OPEN_SSL_CONF}
-echo "############################################################" \
- >> ${OPEN_SSL_CONF}
-echo "[ req_distinguished_name ] " >> ${OPEN_SSL_CONF}
-echo "countryName = ${COUNTRY} " >> ${OPEN_SSL_CONF}
-echo "countryName_default = ${COUNTRY} " >> ${OPEN_SSL_CONF}
-echo "countryName_min = 2 " >> ${OPEN_SSL_CONF}
-echo "countryName_max = 2 " >> ${OPEN_SSL_CONF}
-echo "stateOrProvinceName = ${STATE} " >> ${OPEN_SSL_CONF}
-echo "stateOrProvinceName_default = ${STATE} " >> ${OPEN_SSL_CONF}
-echo "localityName = ${LOCALITY} " >> ${OPEN_SSL_CONF}
-echo "localityName_default = ${LOCALITY} " >> ${OPEN_SSL_CONF}
-echo "0.organizationName = ${ORG} " >> ${OPEN_SSL_CONF}
-echo "0.organizationName_default = ${ORG} " >> ${OPEN_SSL_CONF}
-echo "organizationalUnitName = ${OUNIT} " >> ${OPEN_SSL_CONF}
-echo "organizationalUnitName_default = ${OUNIT} " >> ${OPEN_SSL_CONF}
-echo " " >> ${OPEN_SSL_CONF}
-echo "commonName = ${USER_NAME} " >> ${OPEN_SSL_CONF}
-echo "commonName_default = ${USER_NAME} " >> ${OPEN_SSL_CONF}
-echo "commonName_max = 64 " >> ${OPEN_SSL_CONF}
-echo " " >> ${OPEN_SSL_CONF}
-echo "emailAddress = ${EMAIL} " >> ${OPEN_SSL_CONF}
-echo "emailAddress_default = ${EMAIL} " >> ${OPEN_SSL_CONF}
-echo "emailAddress_max = 64 " >> ${OPEN_SSL_CONF}
-echo "############################################################" \
- >> ${OPEN_SSL_CONF}
-echo "# End of edit section" >> ${OPEN_SSL_CONF}
-echo "############################################################" \
- >> ${OPEN_SSL_CONF}
-echo " " >> ${OPEN_SSL_CONF}
-echo "[ req_attributes ] " >> ${OPEN_SSL_CONF}
-echo "HOME = ${CA_DIR} " >> ${OPEN_SSL_CONF}
-echo "RANDFILE = ${CA_DIR}/.rnd " >> ${OPEN_SSL_CONF}
-echo "[ ca ] " >> ${OPEN_SSL_CONF}
-echo "default_ca = CA_default " >> ${OPEN_SSL_CONF}
-echo " " >> ${OPEN_SSL_CONF}
-echo "[ CA_default ] " >> ${OPEN_SSL_CONF}
-echo " " >> ${OPEN_SSL_CONF}
-echo "dir = ${CA_DIR} " >> ${OPEN_SSL_CONF}
-echo "certs = \$dir/certs " >> ${OPEN_SSL_CONF}
-echo "crl_dir = \$dir/crl " >> ${OPEN_SSL_CONF}
-echo "database = \$dir/index.txt " >> ${OPEN_SSL_CONF}
-echo "unique_subject = no " >> ${OPEN_SSL_CONF}
-echo "new_certs_dir = \$dir/newcerts " >> ${OPEN_SSL_CONF}
-echo " " >> ${OPEN_SSL_CONF}
-echo "certificate = \$dir/cacert.pem " >> ${OPEN_SSL_CONF}
-echo "serial = \$dir/serial " >> ${OPEN_SSL_CONF}
-echo "crl = \$dir/crl.pem " >> ${OPEN_SSL_CONF}
-echo "private_key = \$dir/private/cakey.pem " >> ${OPEN_SSL_CONF}
-echo "RANDFILE = \$dir/private/.rand " >> ${OPEN_SSL_CONF}
-echo " " >> ${OPEN_SSL_CONF}
-echo "x509_extensions = usr_cert " >> ${OPEN_SSL_CONF}
-echo "name_opt = ca_default " >> ${OPEN_SSL_CONF}
-echo "cert_opt = ca_default " >> ${OPEN_SSL_CONF}
-echo "default_days = 365" >> ${OPEN_SSL_CONF}
-echo "default_crl_days= 30 " >> ${OPEN_SSL_CONF}
-echo "default_md = md5" >> ${OPEN_SSL_CONF}
-echo "preserve = no " >> ${OPEN_SSL_CONF}
-echo "policy = policy_match " >> ${OPEN_SSL_CONF}
-echo " " >> ${OPEN_SSL_CONF}
-echo "# For the CA policy " >> ${OPEN_SSL_CONF}
-echo "[ policy_match ] " >> ${OPEN_SSL_CONF}
-echo "countryName = match " >> ${OPEN_SSL_CONF}
-echo "stateOrProvinceName = optional " >> ${OPEN_SSL_CONF}
-echo "organizationName = optional " >> ${OPEN_SSL_CONF}
-echo "organizationalUnitName = optional " >> ${OPEN_SSL_CONF}
-echo "commonName = supplied " >> ${OPEN_SSL_CONF}
-echo "emailAddress = optional " >> ${OPEN_SSL_CONF}
-echo "[ policy_anything ] " >> ${OPEN_SSL_CONF}
-echo "countryName = optional " >> ${OPEN_SSL_CONF}
-echo "stateOrProvinceName = optional " >> ${OPEN_SSL_CONF}
-echo "localityName = optional " >> ${OPEN_SSL_CONF}
-echo "organizationName = optional " >> ${OPEN_SSL_CONF}
-echo "organizationalUnitName = optional " >> ${OPEN_SSL_CONF}
-echo "commonName = supplied " >> ${OPEN_SSL_CONF}
-echo "emailAddress = optional " >> ${OPEN_SSL_CONF}
-echo "[ req ] " >> ${OPEN_SSL_CONF}
-echo "input_password = " >> ${OPEN_SSL_CONF}
-echo "output_password = " >> ${OPEN_SSL_CONF}
-echo "default_bits = ${DEFAULT_BITS} " >> ${OPEN_SSL_CONF}
-echo "default_keyfile = privkey.pem " >> ${OPEN_SSL_CONF}
-echo "distinguished_name = req_distinguished_name " >> ${OPEN_SSL_CONF}
-echo "attributes = req_attributes " >> ${OPEN_SSL_CONF}
-echo "x509_extensions = v3_ca" >> ${OPEN_SSL_CONF}
-echo "string_mask = nombstr " >> ${OPEN_SSL_CONF}
-echo "[ req_attributes ] " >> ${OPEN_SSL_CONF}
-echo "challengePassword = A challenge password " >> ${OPEN_SSL_CONF}
-echo "challengePassword_min = 4 " >> ${OPEN_SSL_CONF}
-echo "challengePassword_max = 20 " >> ${OPEN_SSL_CONF}
-echo "[ usr_cert ] " >> ${OPEN_SSL_CONF}
-echo "basicConstraints=CA:FALSE " >> ${OPEN_SSL_CONF}
-echo "nsComment = "OpenSSL Generated Certificate" " >> ${OPEN_SSL_CONF}
-echo "subjectKeyIdentifier=hash " >> ${OPEN_SSL_CONF}
-echo "authorityKeyIdentifier=keyid,issuer:always " >> ${OPEN_SSL_CONF}
-echo "[ v3_req ] " >> ${OPEN_SSL_CONF}
-echo " " >> ${OPEN_SSL_CONF}
-echo "basicConstraints = CA:FALSE " >> ${OPEN_SSL_CONF}
-echo "keyUsage = nonRepudiation, digitalSignature, keyEncipherment " \
- >> ${OPEN_SSL_CONF}
-echo " " >> ${OPEN_SSL_CONF}
-echo "[ v3_ca ] " >> ${OPEN_SSL_CONF}
-echo " " >> ${OPEN_SSL_CONF}
-echo "subjectKeyIdentifier=hash " >> ${OPEN_SSL_CONF}
-echo " " >> ${OPEN_SSL_CONF}
-echo "authorityKeyIdentifier=keyid:always,issuer:always " >> ${OPEN_SSL_CONF}
-echo "basicConstraints = CA:true " >> ${OPEN_SSL_CONF}
-echo " " >> ${OPEN_SSL_CONF}
-echo "[ crl_ext ] " >> ${OPEN_SSL_CONF}
-echo " " >> ${OPEN_SSL_CONF}
-echo "authorityKeyIdentifier=keyid:always,issuer:always " >> ${OPEN_SSL_CONF}
-echo " " >> ${OPEN_SSL_CONF}
-
-}
-
-create_CA_certificate() {
-
-cd ${CA_DIR}
-
-${OPENSSL} req -rand /dev/urandom -outform PEM -passin pass:${CA_KEY} \
- -passout pass:${CA_KEY} -x509 -newkey ${CA_SIG}:${DEFAULT_BITS} \
- -days 365 -nodes -keyout ${CA_DIR}/private/cakey.pem \
- -out ${CA_DIR}/cacert.pem -config ${OPEN_SSL_CONF}
-
-}
-
-generate_csr() {
-
-cd ${CA_DIR}
-
-${OPENSSL} req -config ${OPEN_SSL_CONF} -batch \
- -newkey ${CA_SIG}:${DEFAULT_BITS} -nodes \
- -keyout private/stunnel-key.pem -out requests/stunnel-req.pem
-
-}
-
-ca_sign_csr() {
-
-cd ${CA_DIR}
-
-${OPENSSL} ca -config ${OPEN_SSL_CONF} -batch \
- -in requests/stunnel-req.pem -out certs/stunnel.pem
-}
-
-
-combine_pem() {
-
-cd ${CA_DIR}
-
-# stunnel needs all private/public key in a single file
-cat private/stunnel-key.pem > ${PEMFILE}
-echo >> ${PEMFILE}
-cat certs/stunnel.pem >> ${PEMFILE}
-# This file needs to be secure
-chmod 400 ${PEMFILE}
-
-}
-
--- a/usr/src/cmd/stunnel/test_stunnel.sh Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,376 +0,0 @@
-#!/bin/sh
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#ident "@(#)test_stunnel.sh 1.2 08/12/11 SMI"
-#
-# This test script can be used to test stunnel configurations. This script
-# should be run on two machines (that can communicate).
-#
-# The script does the following on both machines:
-#
-# * Sets up apache to listen on localhost:HTTP_SERVER_PORT
-# * Sets up an OpenSSL CA
-# * Creates a x509 certificate for stunnel to use.
-# * Signs the certificate
-# * Configures the stunnel config file to:
-#
-# ** Listen on local addresses for incomming SSL connections
-# ** Redirect these connections to the local web server
-# ** Listen on localhost:LOCAL_LISTEN_PORT for TCP connections
-# ** Make outbound SSL connections to the other machine
-# for these connections.
-# ** Enable the stunnel service
-# ** Enable the webserver
-# ** Spit out a script which can be used to test stunnel
-# ** on both machines.
-#
-#
-# Before running this script configure the two ADDRESSES variables below
-# with the IP address(es) of the two machines that will be used for testing.
-# The addresses below are just examples! Use ones that work. You can add
-# the addresses for both systems before running the script, it works out
-# if the addesses are local or not when you run it.
-#
-# Note that the example has multiple addresses for each machine, a single
-# address will work too, but the script will accommodate hosts with multiple
-# addresses, including IPv6 addresses.
-ADDRESSES1=''
-ADDRESSES2=''
-# EG:
-#ADDRESSES1='129.146.108.232 192.168.99.2 fe80::202:b3ff:febd:a5e5'
-#ADDRESSES2='129.146.108.233 192.168.99.1 fe80::a00:20ff:feb8:c1fc'
-#
-# Now do the following:
-#
-# * Run this script on the first machine (check for errors)
-# * Run this script on the second machine (check for errors)
-# * Run the "test_stunnel_script" that in generated on each system.
-# * Tidy-up afterwards by:
-# ** svcadm disable stunnel
-# ** rm /etc/stunnel/stunnel.conf (or rename)
-# ** svcadm disable http
-# ** rm the http.conf generated (or rename)
-# ** rm server certificate
-#
-# Most of the following should not ever need changing
-#
-LOCAL_LISTEN_PORT=55501
-HTTP_SERVER_PORT=3333
-HTTPS_PORT=443
-progname=`basename ${0}`
-TMP1=/tmp/${progname}_scratch.$$
-SCRIPT=/tmp/test_stunnel_script
-CHECK_SCRIPT=/tmp/test_stunnel_check_script
-STUNNEL=svc:/network/ssl/stunnel:default
-#
-# Web server stuff
-#
-DOC_ROOT=/var/tmp/test_http
-HTTPD=svc:/network/http:apache2
-HTTPD_CONF_DIR=/etc/apache2/
-HTTP_VER=""
-#
-# This is only here because somebody thought it would be a good idea
-# to move the default location of apache :-(
-#
-if [ -d /etc/apache2/2.2 ]
- then HTTPD=svc:/network/http:apache22
- HTTPD_VER="2.2"
- HTTPD_CONF_DIR=/etc/apache2/${HTTPD_VER}
-fi
-HTTPD_CONF=${HTTPD_CONF_DIR}/httpd.conf
-HTTP_LOG=/var/apache2/${HTTPD_VER}/logs/error_log
-STUNNEL_CONF=/etc/stunnel/stunnel.conf
-WGET=/usr/bin/wget
-GET_FILE=test_file
-#
-# CA stuff
-#
-CA_DIR=/tmp/my_CA
-PEMDIR=/var/tmp/my_CA/etc/stunnel
-PEMFILE=${PEMDIR}/stunnel.pem
-OPENSSL=/usr/bin/openssl
-OPEN_SSL_CONF="${CA_DIR}/openssl.cnf"
-RAND_OPTS=''
-# These variables are used to make up the DN
-# of the CA signing certificate and the CRLs
-# Try and use your own details here!
-CA_SIG='rsa'
-CA_KEY="abc123"
-DEFAULT_BITS=1024
-COUNTRY='US'
-STATE='CA'
-LOCALITY='Nowhere City'
-ORG='Mycorp'
-OUNIT='Test'
-USER_NAME='Jon Doe'
-EMAIL='[email protected]'
-USE_EXISTING='no'
-FIRST_CERT='01'
-
-HOME=${CA_DIR}
-export HOME
-
-#
-# Script functions see "Main" for program
-#
-# Source in the setup_ca() and setup_certificate() functions
-# from the shell library.
-
-SHELL_LIB=`dirname $0`/stunnel_ca_lib.sh
-
-. ${SHELL_LIB}
-
-# Use netstat to see if things worked
-
-clobber_files() {
-
-rm -rf ${CHECK_SCRIPT} ${SCRIPT} ${STUNNEL_CONF} ${CA_DIR} ${PEMDIR}
-}
-
-check_services() {
-
-for port in ${HTTP_SERVER_PORT} ${HTTPS_PORT}
- do echo "\n\necho Checking to see if system listening on ${port}" \
- >> ${CHECK_SCRIPT}
- echo "netstat -an | grep ${port}" >> ${CHECK_SCRIPT}
-done
-
-sh ${CHECK_SCRIPT}
-}
-
-check_addresses() {
-
-# Need to be root for this
-/usr/bin/id | grep root >/dev/null 2>&1
-if [ "$?" != "0" ]
- then echo "Need to be root to run this."
- exit 1
-fi
-# Figure out which system we are on
-for address in ${ADDRESSES1}
- do ifconfig -a | nawk '
- {
- if (substr($1,1,4) == "inet") {
- if (address == $2) {
- # Found address
- exit(2)
- }
- }
- }' address="${address}"
- if [ "$?" = "2" ]
- then echo "This system has these addresses:"
- echo "${ADDRESSES1}"
- THIS_SYSTEM_ADDRESSES=${ADDRESSES1}
- OTHER_SYSTEM_ADDRESSES=${ADDRESSES2}
- break
- fi
-done
-
-if [ "xx${THIS_SYSTEM_ADDRESSES}" = "xx" ]
- then for address in ${ADDRESSES2}
- do ifconfig -a | nawk '
- {
- if (substr($1,1,4) == "inet") {
- if (address == $2) {
- # Found address
- exit(2)
- }
- }
- }' address="${address}"
- if [ "$?" = "2" ]
- then echo "This system has these addresses:"
- echo "${ADDRESSES2}"
- THIS_SYSTEM_ADDRESSES=${ADDRESSES2}
- OTHER_SYSTEM_ADDRESSES=${ADDRESSES1}
- break
- fi
- done
-fi
-
-if [ "xx${THIS_SYSTEM_ADDRESSES}" = "xx" ]
- then echo "The variables ADDRESSES1 and ADDRESSES2 need to be"
- echo "configured to match the two test systems - exiting."
- exit 1
-fi
-}
-
-# Check state of smf(5) service
-get_state() {
-
-service=${1}
-svcs ${service} >${TMP1} 2>&1
-return=$?
-check_return ${return}
-num_services=`wc -l ${TMP1} | nawk '{print $1}'`
-if [ ${num_services} -gt 2 ]
- then echo "${service} matches more than one service."
- exit 2
-fi
-service_state=`grep -v STATE ${TMP1} | nawk '{print $1}'`
-}
-
-
-check_service() {
-
-service=${1}
-get_state ${service}
-echo "${service} state is: ${service_state}"
-if [ "${service_state}" = "maintenance" ]
- then svcadm clear ${service}
- get_state ${service}
-fi
-}
-
-check_return() {
-
- if [ "${1}" != "0" ]
- then echo "Error code of ${1} returned."
- exit 1
- fi
-}
-
-# This generates the stunnel configuration file
-setup_stunnel() {
-
-if [ -f ${STUNNEL_CONF} ]
- then mv ${STUNNEL_CONF} ${STUNNEL_CONF}.save.$$
-fi
-
-echo "${OTHER_SYSTEM_ADDRESSES}" | nawk '
-BEGIN {
- count = 1
- printf("pid = /var/run/stunnel.pid\n")
- printf("debug = 7\n")
- printf("cd /tmp\n") >> "'"${SCRIPT}"'"
-}
-{
- while ($count != "") {
- printf("[outbound%s]\n", count)
- printf("verify = 0\n")
- printf("accept = localhost:%d\n", out_port)
- printf("connect = %s:%d\n", $count, https_port)
- printf("client = yes\n")
- printf("ciphers = DES-CBC3-SHA:IDEA-CBC-MD5\n\n")
- # spit out test scripts
- printf("rm -rf %s\n", file) >> "'"${SCRIPT}"'"
- printf("%s http://localhost:%d/%s\n",
- wget, out_port, file) >> "'"${SCRIPT}"'"
- printf("cat %s\n" , file) >> "'"${SCRIPT}"'"
- printf("echo Checking for listeners on port %d\n\n",
- out_port) >> "'"${CHECK_SCRIPT}"'"
- printf("netstat -an | grep %d\n",
- out_port) >> "'"${CHECK_SCRIPT}"'"
- count++
- out_port++
- }
-}' out_port="${LOCAL_LISTEN_PORT}" \
- https_port="${HTTPS_PORT}" wget="${WGET}" \
- file="${GET_FILE}" > ${STUNNEL_CONF}
-
-echo "${THIS_SYSTEM_ADDRESSES}" | nawk '
-BEGIN {
- count = 1
-}
-{
- while ($count != "") {
- printf("[inbound%s]\n", count)
- printf("client = no\n")
- printf("cert = %s\n", keyfile)
- printf("connect = localhost:%d\n", local_listen_port)
- printf("accept = %s:%d\n\n", $count, https_port)
- count++
- }
-}' local_listen_port="${HTTP_SERVER_PORT}" \
- https_port="${HTTPS_PORT}" \
- keyfile="${PEMFILE}" >> ${STUNNEL_CONF}
-
-}
-
-setup_http() {
-
-if [ -f ${HTTPD_CONF} ]
- then mv ${HTTPD_CONF} ${HTTPD_CONF}.save.$$
-fi
-cat <<EOF > ${HTTPD_CONF}
-Listen localhost:${HTTP_SERVER_PORT}
-User webservd
-Group webservd
-ServerName 127.0.0.1
-ErrorLog ${HTTP_LOG}
-DocumentRoot ${DOC_ROOT}
-EOF
-mkdir -p ${DOC_ROOT}
-# Write something to the file the web server will send.
-banner `hostname` > ${DOC_ROOT}/${GET_FILE}
-
-}
-
-service_action() {
-
-action=${1}
-service=${2}
-
-case ${action} in
-
- "disable")
- if [ "${service_state}" = "online" ]
- then svcadm disable ${service}
- fi
- ;;
-
- "enable")
- svcadm enable -s ${service}
- ;;
-esac
-}
-
-# main
-check_addresses
-clobber_files
-check_service ${HTTPD}
-service_action disable ${HTTPD}
-check_service ${STUNNEL}
-service_action disable ${STUNNEL}
-# just in case stunnel was started outside of smf(5)
-pkill stunnel
-setup_http
-setup_stunnel
-echo "\n\nCreating simple CA in ${CA_DIR}"
-echo "Creating configuration file: ${OPEN_SSL_CONF}"
-setup_ca
-echo "\n\nGenerating CA certificate"
-create_CA_certificate
-echo "\n\nGenerating a CSR"
-generate_csr
-echo "\n\nSign CSR"
-ca_sign_csr
-echo "\n\nCreating ${PEMFILE}"
-combine_pem
-
-service_action enable ${HTTPD}
-service_action enable ${STUNNEL}
-check_services
-chmod +x ${SCRIPT}
-echo "\n\nNow run this script on the other system, when thats done run this:\n"
-echo "${SCRIPT}"
-
--- a/usr/src/cmd/sudo/METADATA Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-NAME: sudo
-VERSION: 1.7.4p4
-DESCRIPTION: delegate authority
-LICENSE: ISC-like, BSD
-PACKAGE: SUNWsudor SUNWsudou
-PROJECT_URL: http://www.sudo.ws/
-SOURCE_DOWNLOAD: http://www.sudo.ws/sudo/dist/sudo-1.7.4p4.tar.gz
-SUPPORT: C
-BUGTRAQ: solaris/utility/sudo
-OSR: 11289
-COMMENTS:
- PSARC: 2008/370, 2009/2005
- Modifications:
- - Makefile changes to correctly create and install
- 32- and 64-bit preload libraries
- - Additions to env.c to set the correct LD_PRELOAD
- paths (LD_PRELOAD_32 and LD_PRELOAD_64)
- Additions:
- - Man-page addition
--- a/usr/src/cmd/sudo/Makefile.sfw Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,88 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
-#
-#pragma ident "@(#)Makefile.sfw 1.5 11/01/12 SMI"
-#
-
-VER=$(COMPONENT_NAME:sh)-$(COMPONENT_VERSION:sh)
-
-include ../Makefile.cmd
-
-all: $(VER)/config.status
- (cd $(VER); env \
- CC=$(CC) CXX=$(CCC) \
- LD_OPTIONS="-M $(SRC)/cmd/mapfile_noexstk" \
- "CFLAGS=$(CFLAGS)" \
- "CFLAGS64=$(CFLAGS64)" \
- MACH64=$(MACH64) \
- PATH=$(SFW_PATH) \
- MAKE=$(CCSMAKE) \
- $(CCSMAKE) -e)
-
-install: all
- (cd $(VER); env \
- CC=$(CC) CXX=$(CCC) \
- "CFLAGS=$(CFLAGS)" \
- MACH64=$(MACH64) \
- PATH=$(SFW_PATH) \
- MAKE=$(CCSMAKE) \
- DESTDIR=$(ROOT) \
- INSTALL="$(SRC)/tools/install-proto.pl" \
- $(CCSMAKE) -e install)
- $(RM) $(ROOTBIN)/sudoreplay $(ROOT)/usr/share/man/man1m/sudoreplay.1m
- $(RM) $(ROOT)/usr/share/man/man4/sudoers.ldap.4
- $(RM) -r $(ROOT)/usr/share/doc/sudo
- (DESTDIR=$(ROOT) $(SH) ./install.sfw $(VER))
-
-$(VER)/config.status: $(VER)/configure
- (cd $(VER); env \
- CC=$(CC) CXX=$(CCC) \
- "CFLAGS=$(CFLAGS)" \
- MACH64=$(MACH64) \
- PATH=$(SFW_PATH) \
- MAKE=$(CCSMAKE) \
- ./configure --prefix=/usr \
- --with-noexec=/usr/lib/sudo_noexec.so \
- --with-CC=cc \
- --with-ldap \
- --with-project \
- --with-timedir=/var/run/sudo )
-
-#
-# We apply original patches and also the solaris.patch that
-# changes the MANDIR variable at the Makefile and avoid installing
-# non english man pages
-#
-$(VER)/configure: $(VER).tar.gz
- /usr/sfw/bin/gtar xfvz $(VER).tar.gz
- ( \
- cd $(VER) && \
- gpatch -p1 < ../solaris.patch; \
- gpatch -p1 < ../no_var_run.patch; \
- )
- touch $(VER)/configure
-
-clean:
- -rm -rf $(VER)
-
-include ../Makefile.targ
-
--- a/usr/src/cmd/sudo/install.sfw Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-#!/bin/sh
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-#pragma ident "@(#)install.sfw 1.3 10/10/06 SMI"
-#
-
-VERS=$1
-
-PREFIX=${ROOT}/usr
-BINDIR=${PREFIX}/bin
-SHAREDIR=${PREFIX}/share
-MAN1mDIR=${SHAREDIR}/man/man1m
-MAN4DIR=${SHAREDIR}/man/man4
-
-. ${SRC}/tools/install.subr
-
-# manpages is converted by sunman-auditing sed-script to
-# append warning about sudo and auditing, the stability and availability.
-
-MANSCRIPT=sunman-sedscript
-for page in sudo.1m visudo.1m
-do
- _install M ${ROOTDIR}/${MAN1mDIR}/${page} ${ROOTDIR}/${MAN1mDIR}/${page}.temporary 444
- mv -f ${ROOTDIR}/${MAN1mDIR}/${page}.temporary ${ROOTDIR}/${MAN1mDIR}/${page}
-done
-
-# relink sudoedit.1m
-rm -f ${ROOTDIR}/${MAN1mDIR}/sudoedit.1m
-ln ${ROOTDIR}/${MAN1mDIR}/sudo.1m ${ROOTDIR}/${MAN1mDIR}/sudoedit.1m
-
-for page in sudoers.4
-do
- _install M ${ROOTDIR}/${MAN4DIR}/${page} ${ROOTDIR}/${MAN4DIR}/${page}.temporary 444
- mv -f ${ROOTDIR}/${MAN4DIR}/${page}.temporary ${ROOTDIR}/${MAN4DIR}/${page}
-done
-
-exit 0
--- a/usr/src/cmd/sudo/no_var_run.patch Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
---- sudo-1.7.4p4/Makefile.in.orig
-+++ sudo-1.7.4p4/Makefile.in
-@@ -499,7 +499,6 @@
- $(DESTDIR)$(sudoersdir) $(DESTDIR)$(docdir) \
- $(DESTDIR)$(mandirsu) $(DESTDIR)$(mandirform) \
- $(DESTDIR)$(ldifdir)
-- $(SHELL) $(srcdir)/mkinstalldirs -m 0700 $(DESTDIR)$(timedir)
-
- install-binaries: install-dirs $(PROGS)
- $(INSTALL) -O $(install_uid) -G $(install_gid) -m 04511 sudo $(DESTDIR)$(sudodir)/sudo
--- a/usr/src/cmd/sudo/solaris.patch Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,221 +0,0 @@
-diff -c -r sudo-1.7.4p4/Makefile.in sudo-1.7.4p4.sun/Makefile.in
-*** sudo-1.7.4p4/Makefile.in Fri Sep 3 23:43:57 2010
---- sudo-1.7.4p4.sun/Makefile.in Thu Sep 23 22:07:12 2010
-***************
-*** 24,29 ****
---- 24,31 ----
-
- #### Start of system configuration section. ####
-
-+ TESTMACH:sh = if [ -z "$MACH64" ] ; then echo "Run make from Makfile.sfw" >&2 ; exit 1; else [ -d $MACH64 ] || mkdir $MACH64 ; fi
-+
- srcdir = @srcdir@
- devdir = @devdir@
- authdir = $(srcdir)/auth
-***************
-*** 86,91 ****
---- 88,96 ----
- mandirsu = $(mandir)/$(mantype)$(mansectsu)
- mandirform = $(mandir)/$(mantype)$(mansectform)
-
-+ datadir = @datadir@
-+ ldifdir = $(datadir)/lib/ldif
-+
- # User and group ids the installed files should be "owned" by
- install_uid = 0
- install_gid = 0
-***************
-*** 207,212 ****
---- 212,228 ----
- libsudo_noexec.la: sudo_noexec.lo
- $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ sudo_noexec.lo -avoid-version -rpath $(noexecdir)
-
-+ #
-+ # Create 64-bit versions of the shared library
-+ #
-+ $(MACH64)/sudo_noexec.lo: $(srcdir)/sudo_noexec.c
-+ $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS64) $(DEFS) $(OPTIONS) -o $(MACH64)/sudo_noexec.o $(srcdir)/sudo_noexec.c
-+
-+ $(MACH64)/libsudo_noexec.la: $(MACH64)/sudo_noexec.lo
-+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -m64 -o $@ $(MACH64)/sudo_noexec.lo -avoid-version -rpath $(noexecdir)
-+
-+ libsudo_noexec: libsudo_noexec.la $(MACH64)/libsudo_noexec.la
-+
- # Uncomment the following if you want "make distclean" to clean the parser
- @DEV@GENERATED = gram.h gram.c toke.c def_data.c def_data.h getdate
-
-***************
-*** 475,519 ****
- hg log --style=changelog -b default --date '<2010-01-18 00:00:00' >> $@; \
- fi
-
-! install: install-dirs install-binaries @INSTALL_NOEXEC@ install-sudoers install-doc
-
- install-dirs:
- $(SHELL) $(srcdir)/mkinstalldirs $(DESTDIR)$(sudodir) \
- $(DESTDIR)$(visudodir) $(DESTDIR)$(noexecdir) \
- $(DESTDIR)$(sudoersdir) $(DESTDIR)$(docdir) \
-! $(DESTDIR)$(mandirsu) $(DESTDIR)$(mandirform)
- $(SHELL) $(srcdir)/mkinstalldirs -m 0700 $(DESTDIR)$(timedir)
-
- install-binaries: install-dirs $(PROGS)
-! $(INSTALL) -b~ -O $(install_uid) -G $(install_gid) -M 04111 sudo $(DESTDIR)$(sudodir)/sudo
- rm -f $(DESTDIR)$(sudodir)/sudoedit
- ln $(DESTDIR)$(sudodir)/sudo $(DESTDIR)$(sudodir)/sudoedit
-! if [ -f sudoreplay ]; then $(INSTALL) -b~ -O $(install_uid) -G $(install_gid) -M 0111 sudoreplay $(DESTDIR)$(sudodir)/sudoreplay; fi
-! $(INSTALL) -b~ -O $(install_uid) -G $(install_gid) -M 0111 visudo $(DESTDIR)$(visudodir)/visudo
-! if [ -f sesh ]; then $(INSTALL) -b~ -O $(install_uid) -G $(install_gid) -M 0111 sesh $(DESTDIR)$(libexecdir)/sesh; fi
-
-! install-noexec: install-dirs libsudo_noexec.la
-! if [ -f .libs/lib$(noexecfile) ]; then $(INSTALL) -b~ -O $(install_uid) -G $(install_gid) -M 0755 .libs/lib$(noexecfile) $(DESTDIR)$(noexecdir)/$(noexecfile); fi
-
- install-sudoers: install-dirs
-! $(INSTALL) -d -O $(sudoers_uid) -G $(sudoers_gid) -M 0750 \
- $(DESTDIR)$(sudoersdir)/sudoers.d
- test -f $(DESTDIR)$(sudoersdir)/sudoers || \
-! $(INSTALL) -O $(sudoers_uid) -G $(sudoers_gid) -M $(sudoers_mode) \
- sudoers $(DESTDIR)$(sudoersdir)/sudoers
-
- install-doc: install-dirs ChangeLog
-! (cd $(srcdir) && for f in ChangeLog HISTORY LICENSE NEWS README TROUBLESHOOTING UPGRADE sample.*; do $(INSTALL) -O $(install_uid) -G $(install_gid) -M 0444 $$f $(DESTDIR)$(docdir); done)
-! @LDAP@(cd $(srcdir) && for f in README.LDAP schema.* sudoers2ldif; do $(INSTALL) -O $(install_uid) -G $(install_gid) -M 0444 $$f $(DESTDIR)$(docdir); done)
-! $(INSTALL) -O $(install_uid) -G $(install_gid) -M 0444 @mansrcdir@/sudo.$(mantype) $(DESTDIR)$(mandirsu)/sudo.$(mansectsu)
- @rm -f $(DESTDIR)$(mandirsu)/sudoedit.$(mansectsu)
- ln $(DESTDIR)$(mandirsu)/sudo.$(mansectsu) $(DESTDIR)$(mandirsu)/sudoedit.$(mansectsu)
-! @REPLAY@$(INSTALL) -O $(install_uid) -G $(install_gid) -M 0444 @mansrcdir@/sudoreplay.$(mantype) $(DESTDIR)$(mandirsu)/sudoreplay.$(mansectsu)
-! $(INSTALL) -O $(install_uid) -G $(install_gid) -M 0444 @mansrcdir@/visudo.$(mantype) $(DESTDIR)$(mandirsu)/visudo.$(mansectsu)
-! $(INSTALL) -O $(install_uid) -G $(install_gid) -M 0444 @mansrcdir@/sudoers.$(mantype) $(DESTDIR)$(mandirform)/sudoers.$(mansectform)
-! @LDAP@$(INSTALL) -O $(install_uid) -G $(install_gid) -M 0444 @mansrcdir@/sudoers.ldap.$(mantype) $(DESTDIR)$(mandirform)/sudoers.ldap.$(mansectform)
- @MAN_POSTINSTALL@
-
- check:
- @echo nothing to check
-
---- 491,542 ----
- hg log --style=changelog -b default --date '<2010-01-18 00:00:00' >> $@; \
- fi
-
-! install: install-dirs install-binaries @INSTALL_NOEXEC@ install-sudoers install-doc install-ldif
-
- install-dirs:
- $(SHELL) $(srcdir)/mkinstalldirs $(DESTDIR)$(sudodir) \
- $(DESTDIR)$(visudodir) $(DESTDIR)$(noexecdir) \
- $(DESTDIR)$(sudoersdir) $(DESTDIR)$(docdir) \
-! $(DESTDIR)$(mandirsu) $(DESTDIR)$(mandirform) \
-! $(DESTDIR)$(ldifdir)
- $(SHELL) $(srcdir)/mkinstalldirs -m 0700 $(DESTDIR)$(timedir)
-
- install-binaries: install-dirs $(PROGS)
-! $(INSTALL) -O $(install_uid) -G $(install_gid) -m 04511 sudo $(DESTDIR)$(sudodir)/sudo
- rm -f $(DESTDIR)$(sudodir)/sudoedit
- ln $(DESTDIR)$(sudodir)/sudo $(DESTDIR)$(sudodir)/sudoedit
-! if [ -f sudoreplay ]; then $(INSTALL) -O $(install_uid) -G $(install_gid) -m 0111 sudoreplay $(DESTDIR)$(sudodir)/sudoreplay; fi
-! $(INSTALL) -O $(install_uid) -G $(install_gid) -m 0511 visudo $(DESTDIR)$(visudodir)/visudo
-! if [ -f sesh ]; then $(INSTALL) -O $(install_uid) -G $(install_gid) -m 0511 sesh $(DESTDIR)$(libexecdir)/sesh; fi
-
-! install-noexec: install-dirs libsudo_noexec.la $(MACH64)/libsudo_noexec.la
-! if [ -f .libs/lib$(noexecfile) ]; then $(INSTALL) -O $(install_uid) -G $(install_gid) -m 0755 .libs/lib$(noexecfile) $(DESTDIR)$(noexecdir)/$(noexecfile); fi
-! if [ -f $(MACH64)/.libs/lib$(noexecfile) ]; then $(INSTALL) -O $(install_uid) -G $(install_gid) -m 0755 $(MACH64)/.libs/lib$(noexecfile) $(DESTDIR)$(noexecdir)/$(MACH64)/$(noexecfile); fi
-
- install-sudoers: install-dirs
-! $(INSTALL) -d -O $(sudoers_uid) -G $(sudoers_gid) -m 0750 \
- $(DESTDIR)$(sudoersdir)/sudoers.d
- test -f $(DESTDIR)$(sudoersdir)/sudoers || \
-! $(INSTALL) -O $(sudoers_uid) -G $(sudoers_gid) -m $(sudoers_mode) \
- sudoers $(DESTDIR)$(sudoersdir)/sudoers
-
- install-doc: install-dirs ChangeLog
-! (cd $(srcdir) && for f in ChangeLog HISTORY LICENSE NEWS README TROUBLESHOOTING UPGRADE sample.*; do $(INSTALL) -O $(install_uid) -G $(install_gid) -m 0444 $$f $(DESTDIR)$(docdir); done)
-! @LDAP@(cd $(srcdir) && for f in README.LDAP schema.* sudoers2ldif; do $(INSTALL) -O $(install_uid) -G $(install_gid) -m 0444 $$f $(DESTDIR)$(docdir); done)
-! $(INSTALL) -O $(install_uid) -G $(install_gid) -m 0444 @mansrcdir@/sudo.$(mantype) $(DESTDIR)$(mandirsu)/sudo.$(mansectsu)
- @rm -f $(DESTDIR)$(mandirsu)/sudoedit.$(mansectsu)
- ln $(DESTDIR)$(mandirsu)/sudo.$(mansectsu) $(DESTDIR)$(mandirsu)/sudoedit.$(mansectsu)
-! @REPLAY@$(INSTALL) -O $(install_uid) -G $(install_gid) -m 0444 @mansrcdir@/sudoreplay.$(mantype) $(DESTDIR)$(mandirsu)/sudoreplay.$(mansectsu)
-! $(INSTALL) -O $(install_uid) -G $(install_gid) -m 0444 @mansrcdir@/visudo.$(mantype) $(DESTDIR)$(mandirsu)/visudo.$(mansectsu)
-! $(INSTALL) -O $(install_uid) -G $(install_gid) -m 0444 @mansrcdir@/sudoers.$(mantype) $(DESTDIR)$(mandirform)/sudoers.$(mansectform)
-! @LDAP@$(INSTALL) -O $(install_uid) -G $(install_gid) -m 0444 @mansrcdir@/sudoers.ldap.$(mantype) $(DESTDIR)$(mandirform)/sudoers.ldap.$(mansectform)
- @MAN_POSTINSTALL@
-
-+ install-ldif:
-+ $(INSTALL) -O $(install_uid) -G $(install_gid) -m 0444 $(srcdir)/schema.OpenLDAP $(DESTDIR)$(ldifdir)/sudo-schema.OpenLDAP
-+ $(INSTALL) -O $(install_uid) -G $(install_gid) -m 0444 $(srcdir)/schema.iPlanet $(DESTDIR)$(ldifdir)/sudo-schema.iPlanet
-+ $(INSTALL) -O $(install_uid) -G $(install_gid) -m 0444 $(srcdir)/sudoers2ldif $(DESTDIR)$(ldifdir)/sudoers2ldif
-+
- check:
- @echo nothing to check
-
-***************
-*** 524,530 ****
-
- distclean: clean
- -rm -rf Makefile pathnames.h config.h config.status config.cache \
-! config.log libtool sudoers sudo_noexec.lo .libs $(GENERATED) \
- sudo.man sudoers.man sudoers.ldap.man sudoreplay.man \
- visudo.man sudo_usage.h Makefile.binary
-
---- 547,554 ----
-
- distclean: clean
- -rm -rf Makefile pathnames.h config.h config.status config.cache \
-! config.log libtool sudoers sudo_noexec.lo $(MACH64) \
-! .libs $(GENERATED) \
- sudo.man sudoers.man sudoers.ldap.man sudoreplay.man \
- visudo.man sudo_usage.h Makefile.binary
-
-Common subdirectories: sudo-1.7.4p4/auth and sudo-1.7.4p4.sun/auth
-diff -c -r sudo-1.7.4p4/configure sudo-1.7.4p4.sun/configure
-*** sudo-1.7.4p4/configure Mon Sep 6 14:03:39 2010
---- sudo-1.7.4p4.sun/configure Fri Sep 17 14:22:18 2010
-***************
-*** 18438,18444 ****
- fi
- fi
- if test X"$with_noexec" != X"no"; then
-! PROGS="${PROGS} libsudo_noexec.la"
- INSTALL_NOEXEC="install-noexec"
-
- eval noexec_file="$with_noexec"
---- 18438,18444 ----
- fi
- fi
- if test X"$with_noexec" != X"no"; then
-! PROGS="${PROGS} libsudo_noexec"
- INSTALL_NOEXEC="install-noexec"
-
- eval noexec_file="$with_noexec"
-Common subdirectories: sudo-1.7.4p4/emul and sudo-1.7.4p4.sun/emul
-diff -c -r sudo-1.7.4p4/env.c sudo-1.7.4p4.sun/env.c
-*** sudo-1.7.4p4/env.c Wed Aug 18 21:27:03 2010
---- sudo-1.7.4p4.sun/env.c Fri Sep 17 14:32:17 2010
-***************
-*** 792,798 ****
---- 792,819 ----
- # ifdef _AIX
- sudo_setenv("LDR_PRELOAD", def_noexec_file, TRUE);
- # else
-+ # ifdef __sun
-+ {
-+ char *p = NULL;
-+ char path[MAXPATHLEN], path64[MAXPATHLEN];
-+
-+ if (strlcpy(path, def_noexec_file, sizeof (path)) < sizeof (path))
-+ p = strrchr(path, '/');
-+ if (p != NULL) {
-+ /* full pathname specified; set both 32/64 LD_PRELOAD vars */
-+ *p = '\0';
-+ if (snprintf(path64, sizeof (path64), "%s/64/%s",
-+ path, p+1) < sizeof (path64))
-+ sudo_setenv("LD_PRELOAD_64", path64, TRUE);
-+ sudo_setenv("LD_PRELOAD_32", def_noexec_file, TRUE);
-+ } else {
-+ /* relative pathname specified, ld.so.1 will search */
-+ sudo_setenv("LD_PRELOAD", def_noexec_file, TRUE);
-+ }
-+ }
-+ # else
- sudo_setenv("LD_PRELOAD", def_noexec_file, TRUE);
-+ # endif /* __sun */
- # endif /* _AIX */
- # endif /* __osf__ || __sgi */
- #endif /* __darwin__ || __APPLE__ */
-Common subdirectories: sudo-1.7.4p4/m4 and sudo-1.7.4p4.sun/m4
Binary file usr/src/cmd/sudo/sudo-1.7.4p4.tar.gz has changed
--- a/usr/src/cmd/sudo/sunman-sedscript Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-1i\
-'\\" t\
-\.\\" Modified for Solaris to to add the Solaris stability classification,\
-\.\\" and to add a note about auditing and source availability\
-\.\\"\
-$a\
-\.\\" Begin Sun update\
-.SH ATTRIBUTES\
-See\
-.BR attributes (5)\
-for descriptions of the following attributes:\
-.sp\
-.TS\
-box;\
-cbp-1 | cbp-1\
-l | l .\
-ATTRIBUTE TYPE ATTRIBUTE VALUE\
-=\
-Availability security/sudo\
-=\
-Interface Stability Uncommitted\
-.TE \
-.PP\
-.SH NOTES\
-\\fBsudo\\fR does not create \\fBaudit\\fR(2) records; for a Role Based administration\
-solution that performs auditing of all actions, please refer to \\fBrbac\\fR(5).\
-.PP\
-Source for sudo is available on http://opensolaris.org.\
-\.\\" End Sun update
--- a/usr/src/lib/Makefile Thu Jun 16 03:22:51 2011 -0700
+++ b/usr/src/lib/Makefile Fri Jul 15 23:48:44 2011 -0700
@@ -22,7 +22,7 @@
#
# Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
#
-# ident "@(#)Makefile 1.105 11/06/02 SMI"
+# ident "@(#)Makefile 1.106 11/06/15 SMI"
#
#
@@ -59,7 +59,6 @@
javamail \
libassuan \
libconfuse \
- libexpat \
libksba \
libmcrypt \
libmemcached \
@@ -67,18 +66,15 @@
libpcap \
libosip2 \
librsync \
- libsndfile \
libxmlrpc-c \
libyaz \
memcached-java \
pywbem \
qdox \
- tidy \
sblim \
imperius \
openssl \
openusb \
- pam_pkcs11 \
perl_net_ssleay \
saaj \
sane-backends \
@@ -112,7 +108,6 @@
jaxb: activation
saaj: activation
wiseman: saaj jaxb
-pam_pkcs11: openssl
perl_net_ssleay: openssl
qdox: junit
trove: junit
--- a/usr/src/lib/libexpat/CVE-2009-3560.patch Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
---- lib/xmlparse.c 2009/09/29 02:49:16 1.164
-+++ lib/xmlparse.c 2009/12/29 18:42:05 1.166
-@@ -3701,6 +3701,9 @@
- return XML_ERROR_UNCLOSED_TOKEN;
- case XML_TOK_PARTIAL_CHAR:
- return XML_ERROR_PARTIAL_CHAR;
-+ case -XML_TOK_PROLOG_S:
-+ tok = -tok;
-+ break;
- case XML_TOK_NONE:
- #ifdef XML_DTD
- /* for internal PE NOT referenced between declarations */
--- a/usr/src/lib/libexpat/CVE-2009-3720.patch Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- lib/xmltok_impl.c 2006/11/26 17:34:46 1.13
-+++ lib/xmltok_impl.c 2008/06/13 13:18:44 1.15
-@@ -1744,7 +1744,7 @@
- const char *end,
- POSITION *pos)
- {
-- while (ptr != end) {
-+ while (ptr < end) {
- switch (BYTE_TYPE(enc, ptr)) {
- #define LEAD_CASE(n) \
- case BT_LEAD ## n: \
--- a/usr/src/lib/libexpat/METADATA Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-NAME: expat
-VERSION: 2.0.1
-DESCRIPTION: A fast, non-validating, stream-oriented XML parsing library
-LICENSE: BSD-like
-PACKAGE: SUNWlexpt
-PROJECT_URL: http://expat.sourceforge.net
-SOURCE_DOWNLOAD: http://superb-west.dl.sourceforge.net/sourceforge/expat/expat-2.0.1.tar.gz
-SUPPORT: B
-BUGTRAQ: solaris/library/libexpat
-OSR: 6651
-COMMENTS:
--- a/usr/src/lib/libexpat/Makefile.sfw Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,96 +0,0 @@
-#
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#ident "@(#)Makefile.sfw 1.10 09/11/30 SMI"
-
-VER=expat-2.0.1
-VER64=$(VER)-64
-
-LARGEFILES= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
-
-include ../Makefile.lib
-
-all: real-all
-
-all32: $(VER)/config.status
- (cd $(VER); env \
- CC=$(CC) CXX=$(CCC) \
- "CFLAGS= -g -DHAVE_EXPAT_CONFIG_H $(LARGEFILES)" \
- "INSTALL=/usr/ucb/install -c" \
- PATH=$(SFW_PATH) \
- MAKE=$(CCSMAKE) $(CCSMAKE))
- @find . -name core -exec rm -f {} \;
-
-all64: $(VER64)/config.status
- (cd $(VER64); env \
- "CC=$(CC64)" "CXX=$(CCC64)" \
- "CFLAGS=$(CFLAGS64) -g -DHAVE_EXPAT_CONFIG_H $(LARGEFILES)" \
- "INSTALL=/usr/ucb/install -c" \
- PATH=$(SFW_PATH) \
- MAKE=$(CCSMAKE) $(CCSMAKE))
- @find . -name core -exec rm -f {} \;
-
-install: all
- $(SH) ./install-sfw
- MACH64=$(MACH64) $(SH) ./install-sfw-64
-
-real-all: all32 all64
-
-$(VER)/config.status: $(VER)/configure
- (cd $(VER); env \
- CC=$(CC) "CFLAGS=$(CFLAGS)" CXX=$(CCC) \
- "INSTALL=/usr/ucb/install -c" \
- PATH=$(SFW_PATH) \
- "MAKE=$(CCSMAKE)" \
- ./configure --prefix=/usr)
-
-$(VER64)/config.status: $(VER64)/configure
- (cd $(VER64); env \
- "CC=$(CC64)" "CFLAGS=$(CFLAGS64)" "CXX=$(CCC64)" \
- "INSTALL=/usr/ucb/install -c" \
- PATH=$(SFW_PATH) \
- "MAKE=$(CCSMAKE)" \
- ./configure --prefix=/usr)
-
-$(VER)/configure: $(VER).tar.gz
- gzip -dc $(VER).tar.gz | tar xopf -
- (cd $(VER); gpatch -p0 < ../CVE-2009-3560.patch)
- (cd $(VER); gpatch -p0 < ../CVE-2009-3720.patch)
- touch $(VER)/configure
-
-$(VER64)/configure: $(VER).tar.gz
- mkdir -p tmp
- gzip -dc $(VER).tar.gz | (cd tmp; tar xopf -)
- rm -rf $(VER64)
- mv tmp/$(VER) $(VER64); rmdir tmp
- (cd $(VER64); gpatch -p0 < ../CVE-2009-3560.patch)
- (cd $(VER64); gpatch -p0 < ../CVE-2009-3720.patch)
- touch $(VER64)/configure
-clean:
- -rm -rf $(VER)
- -rm -rf $(VER64)
-
-install_h:
-
-include ../Makefile.targ
Binary file usr/src/lib/libexpat/expat-2.0.1.tar.gz has changed
--- a/usr/src/lib/libexpat/install-sfw Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-#!/bin/sh
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#ident "@(#)install-sfw 1.6 07/08/31 SMI"
-
-VERS=expat-2.0.1
-
-PREFIX=${ROOT}/usr
-LIBDIR=${PREFIX}/lib
-INCDIR=${PREFIX}/include
-
-. ${SRC}/tools/install.subr
-
-cd ${VERS}
-
-_install D .libs/libexpat.so.1.5.2 ${LIBDIR}/libexpat.so.1.5.2 555
-_install N lib/expat.h ${INCDIR}/expat.h 444
-_install N lib/expat_external.h ${INCDIR}/expat_external.h 444
-_install L libexpat.so.1.5.2 ${LIBDIR}/libexpat.so
-_install L libexpat.so.1.5.2 ${LIBDIR}/libexpat.so.1
-_install L libexpat.so.1.5.2 ${LIBDIR}/libexpat.so.0
-
-exit 0
--- a/usr/src/lib/libexpat/install-sfw-64 Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-#!/bin/sh
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#ident "@(#)install-sfw-64 1.7 07/08/31 SMI"
-
-VERS=expat-2.0.1-64
-
-PREFIX=${ROOT}/usr
-LIBDIR=${PREFIX}/lib/${MACH64}
-INCDIR=${PREFIX}/include
-
-. ${SRC}/tools/install.subr
-
-cd ${VERS}
-
-_install D .libs/libexpat.so.1.5.2 ${LIBDIR}/libexpat.so.1.5.2 555
-_install L libexpat.so.1.5.2 ${LIBDIR}/libexpat.so
-_install L libexpat.so.1.5.2 ${LIBDIR}/libexpat.so.1
-_install L libexpat.so.1.5.2 ${LIBDIR}/libexpat.so.0
-
-exit 0
--- a/usr/src/lib/libsndfile/METADATA Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-NAME: libsndfile
-VERSION: 1.0.23
-DESCRIPTION: library for reading/writing sound files
-LICENSE: LGPLv2.1
-PACKAGE: SUNWlibsndfile
-PROJECT_URL: http://www.mega-nerd.com/libsndfile/
-SOURCE_DOWNLOAD: http://www.mega-nerd.com/libsndfile/files/libsndfile-1.0.23.tar.gz
-SUPPORT: C
-BUGTRAQ: solaris/library/libsndfile
-OSR: 10263
-COMMENTS:
--- a/usr/src/lib/libsndfile/Makefile.sfw Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,94 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-#pragma ident "@(#)Makefile.sfw 1.3 10/11/24 SMI"
-
-include ../Makefile.lib
-
-VER =$(COMPONENT_NAME:sh)-$(COMPONENT_VERSION:sh)
-TARBALL =$(VER).tar.gz
-VER64 =$(VER)-64
-
-CXXFLAGS = -features=extensions
-CXXFLAGS64 = -features=extensions $(CCFLAGS64)
-
-# Build libsndfile
-all: all32 all64
-
-all32: $(VER)/config.status
- (cd $(VER); env - "CC=$(CC)" \
- "CFLAGS=$(CFLAGS) -KPIC -xstrconst" \
- "CXX=$(CCC)" \
- "CXXFLAGS=$(CXXFLAGS)" \
- PATH=$(SFW_PATH) \
- MAKE=$(CCSMAKE) \
- $(CCSMAKE))
-
-all64: $(VER64)/config.status
- (cd $(VER64); env - "CC=$(CC64)" \
- "CFLAGS=$(CFLAGS64) -KPIC -xstrconst" \
- "CXX=$(CCC64)" \
- "CXXFLAGS=$(CXXFLAGS64)" \
- PATH=$(SFW_PATH) \
- MAKE=$(CCSMAKE) \
- $(CCSMAKE))
-
-install: all
- $(SHELL) ./install-sfw
- MACH64=$(MACH64) $(SHELL) ./install-sfw-64
-
-$(VER)/config.status: $(VER)/configure
- (cd $(VER); env - "CC=$(CC)" \
- "CFLAGS=$(CFLAGS) -KPIC -xstrconst" \
- "CXX=$(CCC)" \
- "CXXFLAGS=$(CXXFLAGS)" \
- "PATH=$(SFW_PATH)" \
- "MAKE=$(CCSMAKE)" \
- ./configure $(CONFIGURE_OPTIONS))
-
-$(VER64)/config.status: $(VER64)/configure
- (cd $(VER64); env - "CC=$(CC64)" \
- "CFLAGS=$(CFLAGS64) -KPIC -xstrconst" \
- "CXX=$(CCC64)" \
- "CXXFLAGS=$(CXXFLAGS64)" \
- "PATH=$(SFW_PATH)" \
- "MAKE=$(CCSMAKE)" \
- ./configure $(CONFIGURE_OPTIONS))
-
-$(VER)/configure: $(VER).tar.gz
- gzip -dc $(VER).tar.gz | tar xopf -
- touch $(VER)/configure
-
-$(VER64)/configure: $(VER).tar.gz
- mkdir -p tmp
- gzip -dc $(VER).tar.gz | (cd tmp; tar xopf -)
- rm -fr $(VER64)
- mv tmp/$(VER) $(VER64)
- rmdir tmp
- touch $(VER64)/configure
-
-clean:
- -rm -rf $(VER) \
- $(VER64)
-
-install_h:
-
-include ../Makefile.targ
--- a/usr/src/lib/libsndfile/install-sfw Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,88 +0,0 @@
-#!/bin/bash
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-#pragma ident "@(#)install-sfw 1.2 10/11/24 SMI"
-
-VERS=1.0.23
-VERSDIR=libsndfile-${VERS}
-
-PREFIX=${ROOT}/usr
-BINDIR=${PREFIX}/bin
-LIBDIR=${PREFIX}/lib
-INCDIR=${PREFIX}/include
-SHAREDIR=${PREFIX}/share
-DOCDIR=${SHAREDIR}/doc/libsndfile/html
-MAN1DIR=${SHAREDIR}/man/man1
-OCTAVEDIR=${SHAREDIR}/octave/site/m
-
-MANSCRIPT=../sunman-stability
-
-source ${SRC}/tools/install.subr
-
-cd ${VERSDIR}
-
-# install man-pages
-_install M man/sndfile-info.1 ${MAN1DIR}/sndfile-info.1 444
-_install M man/sndfile-play.1 ${MAN1DIR}/sndfile-play.1 444
-_install M man/sndfile-convert.1 ${MAN1DIR}/sndfile-convert.1 444
-
-# install docs
-_install N doc/libsndfile.jpg ${DOCDIR}/libsndfile.jpg 444
-_install N doc/libsndfile.css ${DOCDIR}/libsndfile.css 444
-_install N doc/api.html ${DOCDIR}/api.html 444
-_install N doc/command.html ${DOCDIR}/command.html 444
-_install N doc/bugs.html ${DOCDIR}/bugs.html 444
-_install N doc/sndfile_info.html ${DOCDIR}/sndfile_info.html 444
-_install N doc/new_file_type.HOWTO ${DOCDIR}/new_file_type.HOWTO 444
-_install N doc/pkgconfig.html ${DOCDIR}/pkgconfig.html 444
-_install N doc/win32.html ${DOCDIR}/win32.html 444
-_install N doc/FAQ.html ${DOCDIR}/FAQ.html 444
-_install N doc/lists.html ${DOCDIR}/lists.html 444
-_install N doc/embedded_files.html ${DOCDIR}/embedded_files.html 444
-_install N doc/octave.html ${DOCDIR}/octave.html 444
-_install N doc/dither.html ${DOCDIR}/dither.html 444
-
-# install octave scripts
-_install N Octave/sndfile_load.m ${OCTAVEDIR}/sndfile_load.m 444
-_install N Octave/sndfile_save.m ${OCTAVEDIR}/sndfile_save.m 444
-_install N Octave/sndfile_play.m ${OCTAVEDIR}/sndfile_play.m 444
-
-# install lib
-_install D src/.libs/libsndfile.so.${VERS} ${LIBDIR}/libsndfile.so.${VERS} 555
-_install L libsndfile.so.${VERS} ${LIBDIR}/libsndfile.so
-_install L libsndfile.so.${VERS} ${LIBDIR}/libsndfile.so.1
-
-# install headers
-_install N src/sndfile.hh ${INCDIR}/sndfile.hh 444
-_install N src/sndfile.h ${INCDIR}/sndfile.h 444
-
-# install executables
-_install E programs/.libs/sndfile-info ${BINDIR}/sndfile-info 555
-_install E programs/.libs/sndfile-play ${BINDIR}/sndfile-play 555
-_install E programs/.libs/sndfile-convert ${BINDIR}/sndfile-convert 555
-_install E regtest/.libs/sndfile-regtest ${BINDIR}/sndfile-regtest 555
-
-# install pkgconfig
-_install N sndfile.pc ${LIBDIR}/pkgconfig/sndfile.pc 444
-
-exit 0
--- a/usr/src/lib/libsndfile/install-sfw-64 Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-#!/bin/bash
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-#pragma ident "@(#)install-sfw-64 1.2 10/11/24 SMI"
-
-VERS=1.0.23
-VERSDIR=libsndfile-${VERS}-64
-
-PREFIX=${ROOT}/usr
-LIBDIR=${PREFIX}/lib/${MACH64}
-
-source ${SRC}/tools/install.subr
-
-cd ${VERSDIR}
-
-# install lib
-_install D src/.libs/libsndfile.so.${VERS} ${LIBDIR}/libsndfile.so.${VERS} 555
-_install L libsndfile.so.${VERS} ${LIBDIR}/libsndfile.so
-_install L libsndfile.so.${VERS} ${LIBDIR}/libsndfile.so.1
-
-exit 0
Binary file usr/src/lib/libsndfile/libsndfile-1.0.23.tar.gz has changed
--- a/usr/src/lib/libsndfile/sunman-stability Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-1i\
-'\\" t\
-\.\\"\
-\.\\" Modified for Solaris to to add the Solaris stability classification,\
-\.\\" and to add a note about source availability.\
-\.\\"\
-$a\
-\.\\" Begin Sun update\
-.SH ATTRIBUTES\
-See\
-.BR attributes (5)\
-for descriptions of the following attributes:\
-.sp\
-.TS\
-box;\
-cbp-1 | cbp-1\
-l | l .\
-ATTRIBUTE TYPE ATTRIBUTE VALUE\
-=\
-Availability library/libsndfile\
-=\
-Interface Stability Uncommitted\
-.TE \
-.PP\
-.SH NOTES\
-Source for libsndfile is available on http://opensolaris.org.\
-\.\\" End Sun update
--- a/usr/src/lib/pam_pkcs11/METADATA Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-NAME: pam_pkcs11
-VERSION: 0.6.0
-DESCRIPTION: PKCS#11 PAM support
-LICENSE: LGPLv2.1
-PACKAGE: SUNWpampkcs11u SUNWpampkcs11r SUNWpampkcs11-docs
-PROJECT_URL: http://www.opensc-project.org
-SOURCE_DOWNLOAD: http://www.opensc-project.org/files/pam_pkcs11/pam_pkcs11-0.6.0.tar.gz
-SUPPORT: A
-BUGTRAQ: solaris/pam/pkcs11_scheme
-OSR: 6596
-COMMENTS:
-*) Changed to use slot_description for slot/token selection to resolve an
- incompatibility issue between the OpenSC/pam_pkcs11 module and Solaris
- Cryptographic Framework (a PKCS#11 implementation). The pertinent
- source files are:
- src/common/pkcs11_lib.h
- src/common/pkcs11_lib.c
- src/pam_pkcs11/pam_config.h
- src/pam_pkcs11/pam_config.c
- src/pam_pkcs11/pam_pkcs11.c
- src/tools/pkcs11_inspect.c
- src/tools/pklogin_finder.c
-
-*) Removed the "smartcard" word from the PAM prompts, since this module
- can be used for any PKCS#11 token. The pertinent source file is:
- src/pam_pkcs11/pam_pkcs11.c
-
-*) Fixed a bug in make_hash_link.sh. The pertinent source file is:
- tools/make_hash_link.sh
-
-*) Some minor changes to compile and build on Solaris. The pertinent
- source files are:
- po/Makefile.in.in
- src/pam_pkcs11/Makefile.in
- src/mappers/ldap_mapper.c
- src/tools/pkcs11_eventmgr.c
- src/tools/pkcs11_setup.c
--- a/usr/src/lib/pam_pkcs11/Makefile.sfw Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,108 +0,0 @@
-#
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#ident "@(#)Makefile.sfw 1.2 09/03/12 SMI"
-
-VER=pam_pkcs11-0.6.0
-VER64=$(VER)-64
-
-LARGEFILES= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
-
-include ../Makefile.lib
-
-# configure(1) options
-PREFIX=/usr
-CONFIGURE_OPTIONS += --with-pcsclite=no
-CONFIGURE_OPTIONS += --with-included-gettext=yes
-CONFIGURE_OPTIONS += --localstatedir=/var
-
-CONFIGURE_OPTIONS32 = $(CONFIGURE_OPTIONS)
-CONFIGURE_OPTIONS32 += --libdir=$(PREFIX)/lib
-CONFIGURE_OPTIONS32 += --bindir=$(PREFIX)/bin
-
-CONFIGURE_OPTIONS64 = $(CONFIGURE_OPTIONS)
-CONFIGURE_OPTIONS64 += --libdir=$(PREFIX)/lib/$(MACH64)
-CONFIGURE_OPTIONS64 += --bindir=$(PREFIX)/bin/$(MACH64)
-
-all: clean .WAIT all32 all64
-
-all32: $(VER)/config.status
- (cd $(VER); env \
- CC=$(CC) "CFLAGS=$(CFLAGS) $(XREGSFLAG)" \
- "LD_OPTIONS=-M $(SRC)/cmd/mapfile_noexstk $(ZDEFS) $(ZTEXT) \
- $(ZCOMBRELOC) -L/usr/sfw/lib -R/usr/sfw/lib" \
- PATH=$(SFW_PATH) \
- MAKE=$(CCSMAKE) \
- $(CCSMAKE))
- (cd $(VER)/po; Make=$(CCSMAKE) $(CCSMAKE) update-po)
-
-all64: $(VER64)/config.status
- (cd $(VER64); env \
- CC=$(CC64) "CFLAGS=$(CFLAGS64) $(XREGSFLAG64) $(LARGEFILES)" \
- "LD_OPTIONS=-M $(SRC)/cmd/mapfile_noexstk $(ZDEFS) $(ZTEXT) \
- $(ZCOMBRELOC) -L/usr/sfw/lib/64 -R/usr/sfw/lib/64" \
- PATH=$(SFW_PATH) \
- MAKE=$(CCSMAKE) \
- $(CCSMAKE))
-
-install: all
- $(SH) ./install-pampkcs11
- MACH64=$(MACH64) $(SH) ./install-pampkcs11-64
-
-$(VER)/config.status: $(VER)/configure
- (cd $(VER); env \
- CC=$(CC) "CFLAGS=$(CFLAGS) $(XREGSFLAG)" \
- "LD_OPTIONS=-M $(SRC)/cmd/mapfile_noexstk $(ZDEFS) $(ZTEXT) \
- $(ZCOMBRELOC) -L/usr/sfw/lib -R/usr/sfw/lib" \
- PATH=$(SFW_PATH) \
- MAKE=$(CCSMAKE) \
- ./configure $(CONFIGURE_OPTIONS32))
-
-$(VER64)/config.status: $(VER64)/configure
- (cd $(VER64); env \
- CC=$(CC64) "CFLAGS=$(CFLAGS64) $(XREGSFLAG64) $(LARGEFILES)" \
- "LD_OPTIONS=-M $(SRC)/cmd/mapfile_noexstk $(ZDEFS) $(ZTEXT) \
- $(ZCOMBRELOC) -L/usr/sfw/lib/64 -R/usr/sfw/lib/64" \
- PATH=$(SFW_PATH) \
- MAKE=$(CCSMAKE) \
- ./configure $(CONFIGURE_OPTIONS64))
-
-$(VER)/configure: $(VER).tar.gz
- mkdir -p tmp; gzip -dc $(VER).tar.gz | (cd tmp; tar xopf -)
- mv tmp/$(VER) $(VER); rmdir tmp
- (cd $(VER); gpatch -p 1 < ../pam_pkcs11.patch)
-
-$(VER64)/configure: $(VER).tar.gz
- mkdir -p tmp; gzip -dc $(VER).tar.gz | (cd tmp; tar xopf -)
- mv tmp/$(VER) $(VER64); rmdir tmp
- (cd $(VER64); gpatch -p 1 < ../pam_pkcs11.patch)
-
-clean:
- -rm -rf $(VER)
- -rm -rf $(VER64)
-
-install_h:
-
-include ../Makefile.targ
-
--- a/usr/src/lib/pam_pkcs11/install-pampkcs11 Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,76 +0,0 @@
-#!/bin/sh
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#ident "@(#)install-pampkcs11 1.1 08/06/25 SMI"
-
-VERS=pam_pkcs11-0.6.0
-
-LIBDIR=${ROOT}/usr/lib/security
-MAPUTILDIR=${ROOT}/usr/lib/pam_pkcs11
-CONFDIR=${ROOT}/etc/security/pam_pkcs11
-CADIR=${CONFDIR}/cacerts
-CRLDIR=${CONFDIR}/crls
-DOCDIR=${ROOT}/usr/share/doc/pam_pkcs11
-LOCALEDIR=${ROOT}/usr/share/locale
-PKGDIR=${LIBDIR}/pkgconfig
-
-. ${SRC}/tools/install.subr
-
-#
-# Install configuration files.
-# The configuration files are special "sun" versions with changes to comply to
-# the Solaris PAM architecture and resolve an incompatibility problem with the
-# Solaris Cryptographic Framework. These are the ones we actually install.
-#
-# Note to maintainers - if the package revs, you need to re-create new sun
-# versions of the configuration files.
-#
-_install N pam_pkcs11.conf ${CONFDIR}/pam_pkcs11.conf 644
-
-# Install other files
-cd ${VERS}
-
-# Install lib
-_install D src/pam_pkcs11/.libs/pam_pkcs11.so ${LIBDIR}/pam_pkcs11.so 755
-
-# Install external mapper modules and utilities
-_install D src/mappers/.libs/ldap_mapper.so ${MAPUTILDIR}/ldap_mapper.so 755
-_install D src/mappers/.libs/opensc_mapper.so ${MAPUTILDIR}/opensc_mapper.so 755
-_install D src/mappers/.libs/openssh_mapper.so ${MAPUTILDIR}/openssh_mapper.so 755
-_install E src/tools/pkcs11_inspect ${MAPUTILDIR}/pkcs11_inspect 555
-_install E src/tools/pklogin_finder ${MAPUTILDIR}/pklogin_finder 555
-
-# Install sample mapfiles and a script
-_install N etc/digest_mapping.example ${CONFDIR}/digest_mapping.example 444
-_install N etc/subject_mapping.example ${CONFDIR}/subject_mapping.example 444
-_install N etc/mail_mapping.example ${CONFDIR}/mail_mapping.example 444
-_install N tools/make_hash_link.sh ${CONFDIR}/make_hash_link.sh 755
-
-# Install the user manual
-_install N doc/pam_pkcs11.html ${DOCDIR}/pam_pkcs11.html 444
-_install N doc/mappers_api.html ${DOCDIR}/mappers_api.html 444
-
-#Install locale source
-_install N po/fr.gmo ${LOCALEDIR}/fr/LC_MESSAGES/pam_pkcs11.mo 644
--- a/usr/src/lib/pam_pkcs11/install-pampkcs11-64 Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-#!/bin/sh
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#ident "@(#)install-pampkcs11-64 1.1 08/06/12 SMI"
-
-VERS=pam_pkcs11-0.6.0-64
-
-LIBDIR=${ROOT}/usr/lib/security/${MACH64}
-MAPUTILDIR=${ROOT}/usr/lib/pam_pkcs11/${MACH64}
-PKGDIR=${LIBDIR}/pkgconfig
-
-. ${SRC}/tools/install.subr
-
-# Install other files
-cd ${VERS}
-
-# Install lib
-_install D src/pam_pkcs11/.libs/pam_pkcs11.so ${LIBDIR}/pam_pkcs11.so 755
-
-# Install external mapper modules and utilities
-_install D src/mappers/.libs/ldap_mapper.so ${MAPUTILDIR}/ldap_mapper.so 755
-_install D src/mappers/.libs/opensc_mapper.so ${MAPUTILDIR}/opensc_mapper.so 755
-_install D src/mappers/.libs/openssh_mapper.so ${MAPUTILDIR}/openssh_mapper.so 755
-
-exit 0
Binary file usr/src/lib/pam_pkcs11/pam_pkcs11-0.6.0.tar.gz has changed
--- a/usr/src/lib/pam_pkcs11/pam_pkcs11.conf Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,276 +0,0 @@
-#
-# Configuration file for pam_pkcs11 module
-#
-# Original Author: Juan Antonio Martinez <[email protected]>
-#
-pam_pkcs11 {
- # Allow empty passwords
- nullok = true;
-
- # Enable debugging support.
- debug = true;
-
- # Filename of the PKCS #11 module. The default value is "default"
- use_pkcs11_module = default;
-
- pkcs11_module default {
- module = /usr/lib/libpkcs11.so;
- description = "Solaris PKCS#11 Cryptographic Framework library";
-
- # Which slot to use?
- # You can use "slot_description" or "slot_num", but not both, to specify
- # the slot to use. Using "slot_description" is preferred because the
- # PKCS#11 specification does not guarantee slot ordering. "slot_num" should
- # only be used with those PKCS#11 implementations that guarantee
- # constant slot numbering.
- #
- # slot_description = "xxxx"
- # The slot is specified by the slot description, for example,
- # slot_description = "Sun Crypto Softtoken". The default value is
- # "none" which means to use the first slot with an available token.
- #
- # slot_num = a_number
- # The slot is specified by the slot number, for example, slot_num = 1.
- # The default value is zero which means to use the first slot with an
- # available token.
- #
- # On Solaris OS, an administrator can use the "cryotoadm list -v" command
- # to find all the available slots and their slot descriptions. For more
- # information, see the libpkcs11(3LIB) and cryptoadm(1m) man pages.
- #
- slot_description = "none";
-
- # Where are CA certificates stored?
- # You can setup this value to:
- # 1- A directory with openssl hash-links to all certificates
- # 2- A CA file in PEM (.pem) or ASN1 (.cer) format,
- # containing all allowed CA certs
- # The default value is /etc/security/pam_pkcs11/cacerts.
- ca_dir = /etc/security/pam_pkcs11/cacerts;
-
- # Path to the directory where the local (offline) CRLs are stored.
- # Same convention as above is applied: you can choose either
- # hash-link directory or CRL file
- # The default value is /etc/security/pam_pkcs11/crls.
- crl_dir = /etc/security/pam_pkcs11/crls;
-
- # Some pcks#11 libraries can handle multithreading. So
- # set it to true to properly call C_Initialize()
- support_threads = false;
-
- # Sets the Certificate verification policy.
- # "none" Performs no verification
- # "ca" Does CA check
- # "crl_online" Downloads the CRL form the location given by the
- # CRL distribution point extension of the certificate
- # "crl_offline" Uses the locally stored CRLs
- # "crl_auto" Is a combination of online and offline; it first
- # tries to download the CRL from a possibly given CRL
- # distribution point and if this fails, uses the local
- # CRLs
- # "signature" Does also a signature check to ensure that private
- # and public key matches
- # You can use a combination of ca,crl, and signature flags, or just
- # use "none".
- # cert_policy = ca,signature;
- cert_policy = signature;
-
- # What kind of token?
- # The value of the token_type parameter will be used in the user prompt
- # messages. The default value is "Smart card".
- token_type = "Secure token";
- }
-
- # Which mappers ( Cert to login ) to use?
- # you can use several mappers:
- #
- # subject - Cert Subject to login file based mapper
- # pwent - CN to getpwent() login or gecos fields mapper
- # ldap - LDAP mapper
- # opensc - Search certificate in ${HOME}/.eid/authorized_certificates
- # openssh - Search certificate public key in ${HOME}/.ssh/authorized_keys
- # mail - Compare email fields from certificate
- # ms - Use Microsoft Universal Principal Name extension
- # krb - Compare againts Kerberos Principal Name
- # cn - Compare Common Name (CN)
- # uid - Compare Unique Identifier
- # digest - Certificate digest to login (mapfile based) mapper
- # generic - User defined certificate contents mapped
- # null - blind access/deny mapper
- #
- # You can select a comma-separated mapper list.
- # If used null mapper should be the last in the list :-)
- # Also you should select at least one mapper, otherwise
- # certificate will not match :-)
- # use_mappers = digest, cn, pwent, uid, mail, subject, null;
- use_mappers = cn;
-
- # When no absolute path or module info is provided, use this
- # value as module search path
- # TODO:
- # This is not still functional: use absolute pathnames or LD_LIBRARY_PATH
- mapper_search_path = /usr/lib/pam_pkcs11;
-
- #
- # Generic certificate contents mapper
- mapper generic {
- debug = true;
- module = internal;
- # ignore letter case on match/compare
- ignorecase = false;
- # Use one of "cn" , "subject" , "kpn" , "email" , "upn" or "uid"
- cert_item = cn;
- # Define mapfile if needed, else select "none"
- mapfile = file:///etc/security/pam_pkcs11/generic_mapping
- # Decide if use getpwent() to map login
- use_getpwent = false;
- }
-
- # Certificate Subject to login based mapper
- # provided file stores one or more "Subject -> login" lines
- mapper subject {
- debug = false;
- module = internal;
- ignorecase = false;
- mapfile = file:///etc/security/pam_pkcs11/subject_mapping;
- }
-
- # Search public keys from $HOME/.ssh/authorized_keys to match users
- mapper openssh {
- debug = false;
- module = /usr/lib/pam_pkcs11/openssh_mapper.so;
- }
-
- # Search certificates from $HOME/.eid/authorized_certificates to match users
- mapper opensc {
- debug = false;
- module = /usr/lib/pam_pkcs11/opensc_mapper.so;
- }
-
- # Certificate Common Name ( CN ) to getpwent() mapper
- mapper pwent {
- debug = false;
- ignorecase = false;
- module = internal;
- }
-
- # Null ( no map ) mapper. when user as finder matchs to NULL or "nobody"
- mapper null {
- debug = false;
- module = internal ;
- # select behavior: always match, or always fail
- default_match = false;
- # on match, select returned user
- default_user = nobody ;
- }
-
- # Directory ( ldap style ) mapper
- mapper ldap {
- debug = false;
- module = /usr/lib/pam_pkcs11/ldap_mapper.so;
- # hostname of ldap server (use LDAP-URI for more then one)
- ldaphost = "";
- # Port on ldap server to connect, this is also the default
- # if no port is given in URI below
- # if empty, then 389 for TLS and 636 for SSL is used
- ldapport = ;
- # space separted list of LDAP URIs (URIs are used by given order)
- URI = "";
- # Scope of search: 0-2
- # Default is 1 = "one", meaning the set of records one
- # level below the basedn.
- # 0 = "base" means search only the basedn, and
- # 2 = "sub" means the union of entries at the "base" level
- # and ? all or "one" level below ??? FIXME
- scope = 2;
- # DN to bind with. Must have read-access for user entries
- # under "base"
- binddn = "cn=pam,o=example,c=com";
- # Password for above DN
- passwd = "";
- # Searchbase for user entries
- base = "ou=People,o=example,c=com";
- # Attribute of user entry which contains the certificate
- attribute = "userCertificate";
- # Searchfilter for user entry. Must only let pass user entry
- # for the login user.
- filter = "(&(objectClass=posixAccount)(uid=%s))"
- # SSL/TLS-Switch
- # This is a global switch, you can't switch between
- # SSL or TLS and non secured connections per URI!
- # values: off (standard), tls or on (ssl) or ssl
- ssl = tls
- # SSL specific settings
- # tls_randfile = ...
- tls_cacertfile = /etc/ssl/cacert.pem
- # tls_cacertdir = ...
- tls_checkpeer = 0
- #tls_ciphers = ...
- #tls_cert = ...
- #tls_key = ...
- }
-
- # Assume common name (CN) to be the login
- mapper cn {
- debug = false;
- module = internal;
- ignorecase = true;
- # mapfile = file:///etc/security/pam_pkcs11/cn_map;
- mapfile = "none";
- }
-
- # mail - Compare email field from certificate
- mapper mail {
- debug = false;
- module = internal;
- # Declare mapfile or
- # leave empty "" or "none" to use no map
- mapfile = file:///etc/security/pam_pkcs11/mail_mapping;
- # Some certs store email in uppercase. take care on this
- ignorecase = true;
- # Also check that host matches mx domain
- # when using mapfile this feature is ignored
- ignoredomain = false;
- }
-
- # ms - Use Microsoft Universal Principal Name extension
- # UPN is in format login@ADS_Domain. No map is needed, just
- # check domain name.
- mapper ms {
- debug = false;
- module = internal;
- ignorecase = false;
- ignoredomain = false;
- domain = "domain.com";
- }
-
- # krb - Compare againts Kerberos Principal Name
- mapper krb {
- debug = false;
- module = internal;
- ignorecase = false;
- mapfile = "none";
- }
-
- # uid - Maps Subject Unique Identifier field (if exist) to login
- mapper uid {
- debug = false;
- module = internal;
- ignorecase = false;
- mapfile = "none";
- }
-
- # digest - elaborate certificate digest and map it into a file
- mapper digest {
- debug = false;
- module = internal;
- # algorithm used to evaluate certificate digest
- # Select one of:
- # "null","md2","md4","md5","sha","sha1","dss","dss1","ripemd160"
- algorithm = "sha1";
- # mapfile = file:///etc/security/pam_pkcs11/digest_mapping;
- mapfile = "none";
-
- }
-
-}
--- a/usr/src/lib/pam_pkcs11/pam_pkcs11.patch Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1574 +0,0 @@
-*** pam_pkcs11-0.6.0-ORIG/configure.in Mon Jun 11 05:17:38 2007
---- pam_pkcs11-WS/configure.in Mon Sep 28 16:06:48 2009
-***************
-*** 237,243 ****
- AC_FUNC_REALLOC
- AC_FUNC_STAT
- AC_FUNC_VPRINTF
-! AC_CHECK_FUNCS([memset strdup strerror])
-
-
- AC_CONFIG_FILES([
---- 237,243 ----
- AC_FUNC_REALLOC
- AC_FUNC_STAT
- AC_FUNC_VPRINTF
-! AC_CHECK_FUNCS([memset strdup strerror daemon])
-
-
- AC_CONFIG_FILES([
-*** pam_pkcs11-0.6.0-ORIG/po/Makefile.in.in Tue May 22 00:54:56 2007
---- pam_pkcs11-WS/po/Makefile.in.in Mon Sep 28 16:06:48 2009
-***************
-*** 46,61 ****
- GMSGFMT_ = @GMSGFMT@
- GMSGFMT_no = @GMSGFMT@
- GMSGFMT_yes = @GMSGFMT_015@
-! GMSGFMT = $(GMSGFMT_$(USE_MSGCTXT))
- MSGFMT_ = @MSGFMT@
- MSGFMT_no = @MSGFMT@
- MSGFMT_yes = @MSGFMT_015@
- MSGFMT = $(MSGFMT_$(USE_MSGCTXT))
-! XGETTEXT_ = @XGETTEXT@
- XGETTEXT_no = @XGETTEXT@
- XGETTEXT_yes = @XGETTEXT_015@
- XGETTEXT = $(XGETTEXT_$(USE_MSGCTXT))
-! MSGMERGE = msgmerge
- MSGMERGE_UPDATE = @MSGMERGE@ --update
- MSGINIT = msginit
- MSGCONV = msgconv
---- 46,61 ----
- GMSGFMT_ = @GMSGFMT@
- GMSGFMT_no = @GMSGFMT@
- GMSGFMT_yes = @GMSGFMT_015@
-! GMSGFMT = msgfmt
- MSGFMT_ = @MSGFMT@
- MSGFMT_no = @MSGFMT@
- MSGFMT_yes = @MSGFMT_015@
- MSGFMT = $(MSGFMT_$(USE_MSGCTXT))
-! XGETTEXT_ = /bin/xgettext
- XGETTEXT_no = @XGETTEXT@
- XGETTEXT_yes = @XGETTEXT_015@
- XGETTEXT = $(XGETTEXT_$(USE_MSGCTXT))
-! MSGMERGE = /usr/lib/intltool/gettext-tools/msgmerge
- MSGMERGE_UPDATE = @MSGMERGE@ --update
- MSGINIT = msginit
- MSGCONV = msgconv
-***************
-*** 87,94 ****
- .po.gmo:
- @lang=`echo $* | sed -e 's,.*/,,'`; \
- test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
-! echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o $${lang}.gmo $${lang}.po"; \
-! cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo
-
- .sin.sed:
- sed -e '/^#/d' $< > t-$@
---- 87,94 ----
- .po.gmo:
- @lang=`echo $* | sed -e 's,.*/,,'`; \
- test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
-! echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -o $${lang}.gmo $${lang}.po"; \
-! cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo
-
- .sin.sed:
- sed -e '/^#/d' $< > t-$@
-***************
-*** 135,145 ****
- else \
- msgid_bugs_address='$(PACKAGE_BUGREPORT)'; \
- fi; \
-! $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
-! --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \
-! --files-from=$(srcdir)/POTFILES.in \
-! --copyright-holder='$(COPYRIGHT_HOLDER)' \
-! --msgid-bugs-address="$$msgid_bugs_address"
- test ! -f $(DOMAIN).po || { \
- if test -f $(srcdir)/$(DOMAIN).pot; then \
- sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \
---- 135,142 ----
- else \
- msgid_bugs_address='$(PACKAGE_BUGREPORT)'; \
- fi; \
-! $(XGETTEXT) -ns -c TRANSLATORS: -m "" -d $(DOMAIN) \
-! ../src/pam_pkcs11/pam_pkcs11.c
- test ! -f $(DOMAIN).po || { \
- if test -f $(srcdir)/$(DOMAIN).pot; then \
- sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \
-*** pam_pkcs11-0.6.0-ORIG/src/common/pkcs11_lib.h Mon May 21 02:46:19 2007
---- pam_pkcs11-WS/src/common/pkcs11_lib.h Mon Sep 28 16:06:48 2009
-***************
-*** 36,46 ****
- PKCS11_EXTERN int find_slot_by_number_and_label(pkcs11_handle_t *h,
- int slot_num, const char *slot_label,
- unsigned int *slot);
-! PKCS11_EXTERN const char *get_slot_label(pkcs11_handle_t *h);
- PKCS11_EXTERN int wait_for_token(pkcs11_handle_t *h,
- int wanted_slot_num,
- const char *wanted_slot_label,
- unsigned int *slot);
- PKCS11_EXTERN const X509 *get_X509_certificate(cert_object_t *cert);
- PKCS11_EXTERN void release_pkcs11_module(pkcs11_handle_t *h);
- PKCS11_EXTERN int open_pkcs11_session(pkcs11_handle_t *h, unsigned int slot);
---- 36,57 ----
- PKCS11_EXTERN int find_slot_by_number_and_label(pkcs11_handle_t *h,
- int slot_num, const char *slot_label,
- unsigned int *slot);
-! PKCS11_EXTERN const char *get_slot_tokenlabel(pkcs11_handle_t *h);
- PKCS11_EXTERN int wait_for_token(pkcs11_handle_t *h,
- int wanted_slot_num,
-+ const char *wanted_token_label,
-+ unsigned int *slot);
-+ PKCS11_EXTERN int find_slot_by_slotlabel(pkcs11_handle_t *h,
- const char *wanted_slot_label,
- unsigned int *slot);
-+ PKCS11_EXTERN int find_slot_by_slotlabel_and_tokenlabel(pkcs11_handle_t *h,
-+ const char *wanted_slot_label,
-+ const char *wanted_token_label,
-+ unsigned int *slot);
-+ PKCS11_EXTERN int wait_for_token_by_slotlabel(pkcs11_handle_t *h,
-+ const char *wanted_slot_label,
-+ const char *wanted_token_label,
-+ unsigned int *slot);
- PKCS11_EXTERN const X509 *get_X509_certificate(cert_object_t *cert);
- PKCS11_EXTERN void release_pkcs11_module(pkcs11_handle_t *h);
- PKCS11_EXTERN int open_pkcs11_session(pkcs11_handle_t *h, unsigned int slot);
-*** pam_pkcs11-0.6.0-ORIG/src/common/pkcs11_lib.c Wed Jun 6 02:33:10 2007
---- pam_pkcs11-WS/src/common/pkcs11_lib.c Mon Sep 28 16:06:48 2009
-***************
-*** 67,77 ****
---- 67,138 ----
- return 0;
- }
-
-+ /*
-+ * memcmp_pad_max() is a specialized version of memcmp() which compares two
-+ * pieces of data up to a maximum length. If the two data match up the
-+ * maximum length, they are considered matching. Trailing blanks do not cause
-+ * the match to fail if one of the data is shorted.
-+ *
-+ * Examples of matches:
-+ * "one" |
-+ * "one " |
-+ * ^maximum length
-+ *
-+ * "Number One | X" (X is beyond maximum length)
-+ * "Number One " |
-+ * ^maximum length
-+ *
-+ * Examples of mismatches:
-+ * " one"
-+ * "one"
-+ *
-+ * "Number One X|"
-+ * "Number One |"
-+ * ^maximum length
-+ */
-+ static int
-+ memcmp_pad_max(void *d1, size_t d1_len, void *d2, size_t d2_len,
-+ size_t max_sz)
-+ {
-+ size_t len, extra_len;
-+ char *marker;
-+
-+ /* No point in comparing anything beyond max_sz */
-+ if (d1_len > max_sz)
-+ d1_len = max_sz;
-+ if (d2_len > max_sz)
-+ d2_len = max_sz;
-+
-+ /* Find shorter of the two data. */
-+ if (d1_len <= d2_len) {
-+ len = d1_len;
-+ extra_len = d2_len;
-+ marker = d2;
-+ } else { /* d1_len > d2_len */
-+ len = d2_len;
-+ extra_len = d1_len;
-+ marker = d1;
-+ }
-+
-+ /* Have a match in the shortest length of data? */
-+ if (memcmp(d1, d2, len) != 0)
-+ /* CONSTCOND */
-+ return (1);
-+
-+ /* If the rest of longer data is nulls or blanks, call it a match. */
-+ while (len < extra_len && marker[len])
-+ if (!isspace(marker[len++]))
-+ /* CONSTCOND */
-+ return (1);
-+ return (0);
-+ }
-+
- #ifdef HAVE_NSS
- /*
- * Using NSS to find the manage the PKCS #11 modules
- */
- #include "nss.h"
-+ #include "nspr.h"
- #include "cert.h"
- #include "secmod.h"
- #include "pk11pub.h"
-***************
-*** 287,294 ****
- /* we're configured for a specific module and token, see if it's present */
- slot_num--;
- if (slot_num >= 0 && slot_num < module->slotCount && module->slots &&
-! module->slots[i] && PK11_IsPresent(module->slots[i])) {
-! h->slot = PK11_ReferenceSlot(module->slots[i]);
- *slotID = PK11_GetSlotID(h->slot);
- return 0;
- }
---- 348,355 ----
- /* we're configured for a specific module and token, see if it's present */
- slot_num--;
- if (slot_num >= 0 && slot_num < module->slotCount && module->slots &&
-! module->slots[slot_num] && PK11_IsPresent(module->slots[slot_num])) {
-! h->slot = PK11_ReferenceSlot(module->slots[slot_num]);
- *slotID = PK11_GetSlotID(h->slot);
- return 0;
- }
-***************
-*** 301,327 ****
- */
- int find_slot_by_number_and_label(pkcs11_handle_t *h,
- int wanted_slot_id,
-! const char *wanted_slot_label,
- unsigned int *slot_num)
- {
- int rv;
-! const char *slot_label = NULL;
- PK11SlotInfo *slot = NULL;
-
- /* we want a specific slot id, or we don't kare about the label */
-! if ((wanted_slot_label == NULL) || (wanted_slot_id != 0)) {
- rv = find_slot_by_number(h, wanted_slot_id, slot_num);
-
- /* if we don't care about the label, or we failed, we're done */
-! if ((wanted_slot_label == NULL) || (rv != 0)) {
- return rv;
- }
-
- /* verify it's the label we want */
-! slot_label = PK11_GetTokenName(h->slot);
-
-! if ((slot_label != NULL) &&
-! (strcmp (wanted_slot_label, slot_label) == 0)) {
- return 0;
- }
- return -1;
---- 362,388 ----
- */
- int find_slot_by_number_and_label(pkcs11_handle_t *h,
- int wanted_slot_id,
-! const char *wanted_token_label,
- unsigned int *slot_num)
- {
- int rv;
-! const char *token_label = NULL;
- PK11SlotInfo *slot = NULL;
-
- /* we want a specific slot id, or we don't kare about the label */
-! if ((wanted_token_label == NULL) || (wanted_slot_id != 0)) {
- rv = find_slot_by_number(h, wanted_slot_id, slot_num);
-
- /* if we don't care about the label, or we failed, we're done */
-! if ((wanted_token_label == NULL) || (rv != 0)) {
- return rv;
- }
-
- /* verify it's the label we want */
-! token_label = PK11_GetTokenName(h->slot);
-
-! if ((token_label != NULL) &&
-! (strcmp (wanted_token_label, token_label) == 0)) {
- return 0;
- }
- return -1;
-***************
-*** 328,334 ****
- }
-
- /* we want a specific slot by label only */
-! slot = PK11_FindSlotByName(wanted_slot_label);
- if (!slot) {
- return -1;
- }
---- 389,395 ----
- }
-
- /* we want a specific slot by label only */
-! slot = PK11_FindSlotByName(wanted_token_label);
- if (!slot) {
- return -1;
- }
-***************
-*** 350,356 ****
-
- int wait_for_token(pkcs11_handle_t *h,
- int wanted_slot_id,
-! const char *wanted_slot_label,
- unsigned int *slot_num)
- {
- int rv;
---- 411,417 ----
-
- int wait_for_token(pkcs11_handle_t *h,
- int wanted_slot_id,
-! const char *wanted_token_label,
- unsigned int *slot_num)
- {
- int rv;
-***************
-*** 358,364 ****
- rv = -1;
- do {
- /* see if the card we're looking for is inserted */
-! rv = find_slot_by_number_and_label (h, wanted_slot_id, wanted_slot_label,
- slot_num);
- if (rv != 0) {
- PK11SlotInfo *slot;
---- 419,425 ----
- rv = -1;
- do {
- /* see if the card we're looking for is inserted */
-! rv = find_slot_by_number_and_label (h, wanted_slot_id, wanted_token_label,
- slot_num);
- if (rv != 0) {
- PK11SlotInfo *slot;
-***************
-*** 385,390 ****
---- 446,592 ----
- return rv;
- }
-
-+ /*
-+ * This function will search the slot list to find a slot based on the slot
-+ * label. If the wanted_slot_label is "none", then we will return the first
-+ * slot with the token presented.
-+ *
-+ * This function return 0 if it found a matching slot; otherwise, it returns
-+ * -1.
-+ */
-+ int
-+ find_slot_by_slotlabel(pkcs11_handle_t *h, const char *wanted_slot_label,
-+ unsigned int *slotID)
-+ {
-+ SECMODModule *module = h->module;
-+ PK11SlotInfo *slot;
-+ int rv;
-+ int i;
-+
-+ if (slotID == NULL || wanted_slot_label == NULL ||
-+ strlen(wanted_slot_label) == 0 || module == NULL)
-+ return (-1);
-+
-+ if (strcmp(wanted_slot_label, "none") == 0) {
-+ rv = find_slot_by_number(h, 0, slotID);
-+ return (rv);
-+ } else {
-+ /* wanted_slot_label is not "none" */
-+ for (i = 0; i < module->slotCount; i++) {
-+ if (module->slots[i] && PK11_IsPresent(module->slots[i])) {
-+ const char *slot_label;
-+
-+ slot = PK11_ReferenceSlot(module->slots[i]);
-+ slot_label = PK11_GetSlotName(slot);
-+ if (memcmp_pad_max((void *)slot_label, strlen(slot_label),
-+ (void *)wanted_slot_label, strlen(wanted_slot_label), 64) == 0) {
-+ h->slot = slot;
-+ *slotID = PK11_GetSlotID(slot);
-+ return 0;
-+ }
-+ }
-+ }
-+ }
-+
-+ return (-1);
-+ }
-+
-+ int
-+ find_slot_by_slotlabel_and_tokenlabel(pkcs11_handle_t *h,
-+ const char *wanted_slot_label, const char *wanted_token_label,
-+ unsigned int *slot_num)
-+ {
-+ SECMODModule *module = h->module;
-+ PK11SlotInfo *slot;
-+ unsigned long i;
-+ int rv;
-+
-+ if (slot_num == NULL || module == NULL)
-+ return (-1);
-+
-+ if (wanted_token_label == NULL){
-+ rv = find_slot_by_slotlabel(h, wanted_slot_label, slot_num);
-+ return (rv);
-+ }
-+
-+ /* wanted_token_label != NULL */
-+ if (strcmp(wanted_slot_label, "none") == 0) {
-+ for (i = 0; i < module->slotCount; i++) {
-+ if (module->slots[i] && PK11_IsPresent(module->slots[i])) {
-+ const char *token_label;
-+ slot = PK11_ReferenceSlot(module->slots[i]);
-+ token_label = PK11_GetTokenName(slot);
-+ if (memcmp_pad_max((void *) token_label, strlen(token_label),
-+ (void *)wanted_token_label, strlen(wanted_token_label), 33) == 0) {
-+ h->slot = slot;
-+ *slot_num = PK11_GetSlotID(slot);
-+ return (0);
-+ }
-+ }
-+ }
-+ return (-1);
-+ } else {
-+ for (i = 0; i < module->slotCount; i++) {
-+ if (module->slots[i] && PK11_IsPresent(module->slots[i])) {
-+ const char *slot_label;
-+ const char *token_label;
-+
-+ slot = PK11_ReferenceSlot(module->slots[i]);
-+ slot_label = PK11_GetSlotName(slot);
-+ token_label = PK11_GetTokenName(slot);
-+ if ((memcmp_pad_max((void *)slot_label, strlen(slot_label),
-+ (void *)wanted_slot_label, strlen(wanted_slot_label), 64) == 0) &&
-+ (memcmp_pad_max((void *)token_label, strlen(token_label),
-+ (void *)wanted_token_label, strlen(wanted_token_label), 33) == 0))
-+ {
-+ h->slot = slot;
-+ *slot_num = PK11_GetSlotID(slot);
-+ return (0);
-+ }
-+ }
-+ }
-+ return (-1);
-+ }
-+ }
-+
-+ int wait_for_token_by_slotlabel(pkcs11_handle_t *h,
-+ const char *wanted_slot_label,
-+ const char *wanted_token_label,
-+ unsigned int *slot_num)
-+ {
-+ int rv;
-+
-+ rv = -1;
-+ do {
-+ /* see if the card we're looking for is inserted */
-+ rv = find_slot_by_slotlabel_and_tokenlabel (h, wanted_slot_label,
-+ wanted_token_label, slot_num);
-+
-+ if (rv != 0) {
-+ PK11SlotInfo *slot;
-+ PRIntervalTime slot_poll_interval; /* only for legacy hardware */
-+
-+ /* if the card is not inserted, then block until something happens */
-+ slot_poll_interval = PR_MillisecondsToInterval(PAM_PKCS11_POLL_TIME);
-+ slot = SECMOD_WaitForAnyTokenEvent(h->module, 0 /* flags */,
-+ slot_poll_interval);
-+
-+ /* unexpected error */
-+ if (slot == NULL) {
-+ break;
-+ }
-+
-+ /* something happened, continue loop and check if the card
-+ * we're looking for is inserted
-+ */
-+ PK11_FreeSlot(slot);
-+ continue;
-+ }
-+ } while (rv != 0);
-+
-+ return rv;
-+ }
-+
- void release_pkcs11_module(pkcs11_handle_t *h)
- {
- SECStatus rv;
-***************
-*** 470,476 ****
- return 0;
- }
-
-! const char *get_slot_label(pkcs11_handle_t *h)
- {
- if (!h->slot) {
- return NULL;
---- 672,678 ----
- return 0;
- }
-
-! const char *get_slot_tokenlabel(pkcs11_handle_t *h)
- {
- if (!h->slot) {
- return NULL;
-***************
-*** 613,619 ****
- return (rv == SECSuccess) ? 0 : -1;
- }
-
-- #include "nspr.h"
-
- struct tuple_str {
- PRErrorCode errNum;
---- 815,820 ----
-***************
-*** 708,714 ****
- typedef struct {
- CK_SLOT_ID id;
- CK_BBOOL token_present;
-! CK_UTF8CHAR label[33];
- } slot_t;
-
- struct pkcs11_handle_str {
---- 909,916 ----
- typedef struct {
- CK_SLOT_ID id;
- CK_BBOOL token_present;
-! CK_UTF8CHAR label[33]; /* token label */
-! CK_UTF8CHAR slotDescription[64];
- } slot_t;
-
- struct pkcs11_handle_str {
-***************
-*** 758,764 ****
- DBG3("module permissions: uid = %d, gid = %d, mode = %o",
- module_stat.st_uid, module_stat.st_gid, module_stat.st_mode & 0777);
- if (module_stat.st_mode & S_IWGRP || module_stat.st_mode & S_IWOTH
-! || module_stat.st_uid != 0 || module_stat.st_gid != 0) {
- set_error("the pkcs #11 module MUST be owned by root and MUST NOT "
- "be writeable by the group or others");
- free(h);
---- 960,966 ----
- DBG3("module permissions: uid = %d, gid = %d, mode = %o",
- module_stat.st_uid, module_stat.st_gid, module_stat.st_mode & 0777);
- if (module_stat.st_mode & S_IWGRP || module_stat.st_mode & S_IWOTH
-! || module_stat.st_uid != 0) {
- set_error("the pkcs #11 module MUST be owned by root and MUST NOT "
- "be writeable by the group or others");
- free(h);
-***************
-*** 807,812 ****
---- 1009,1018 ----
- set_error("C_GetSlotInfo() failed: %x", rv);
- return -1;
- }
-+
-+ (void) memcpy(h->slots[i].slotDescription, sinfo.slotDescription,
-+ sizeof(h->slots[i].slotDescription));
-+
- DBG1("- description: %.64s", sinfo.slotDescription);
- DBG1("- manufacturer: %.32s", sinfo.manufacturerID);
- DBG1("- flags: %04lx", sinfo.flags);
-***************
-*** 945,971 ****
-
- int find_slot_by_number_and_label(pkcs11_handle_t *h,
- int wanted_slot_id,
-! const char *wanted_slot_label,
- unsigned int *slot_num)
- {
- unsigned int slot_index;
- int rv;
-! const char *slot_label = NULL;
-
- /* we want a specific slot id, or we don't care about the label */
-! if ((wanted_slot_label == NULL) || (wanted_slot_id != 0)) {
- rv = find_slot_by_number(h, wanted_slot_id, slot_num);
-
- /* if we don't care about the label, or we failed, we're done */
-! if ((wanted_slot_label == NULL) || (rv != 0)) {
- return rv;
- }
-
- /* verify it's the label we want */
-! slot_label = h->slots[*slot_num].label;
-
-! if ((slot_label != NULL) &&
-! (strcmp (wanted_slot_label, slot_label) == 0)) {
- return 0;
- }
- return -1;
---- 1151,1177 ----
-
- int find_slot_by_number_and_label(pkcs11_handle_t *h,
- int wanted_slot_id,
-! const char *wanted_token_label,
- unsigned int *slot_num)
- {
- unsigned int slot_index;
- int rv;
-! const char *token_label = NULL;
-
- /* we want a specific slot id, or we don't care about the label */
-! if ((wanted_token_label == NULL) || (wanted_slot_id != 0)) {
- rv = find_slot_by_number(h, wanted_slot_id, slot_num);
-
- /* if we don't care about the label, or we failed, we're done */
-! if ((wanted_token_label == NULL) || (rv != 0)) {
- return rv;
- }
-
- /* verify it's the label we want */
-! token_label = h->slots[*slot_num].label;
-
-! if ((token_label != NULL) &&
-! (strcmp (wanted_token_label, token_label) == 0)) {
- return 0;
- }
- return -1;
-***************
-*** 974,982 ****
- /* look up the slot by it's label from the list */
- for (slot_index = 0; slot_index < h->slot_count; slot_index++) {
- if (h->slots[slot_index].token_present) {
-! slot_label = h->slots[slot_index].label;
-! if ((slot_label != NULL) &&
-! (strcmp (wanted_slot_label, slot_label) == 0)) {
- *slot_num = slot_index;
- return 0;
- }
---- 1180,1188 ----
- /* look up the slot by it's label from the list */
- for (slot_index = 0; slot_index < h->slot_count; slot_index++) {
- if (h->slots[slot_index].token_present) {
-! token_label = h->slots[slot_index].label;
-! if ((token_label != NULL) &&
-! (strcmp (wanted_token_label, token_label) == 0)) {
- *slot_num = slot_index;
- return 0;
- }
-***************
-*** 985,993 ****
- return -1;
- }
-
- int wait_for_token(pkcs11_handle_t *h,
- int wanted_slot_id,
-! const char *wanted_slot_label,
- unsigned int *slot_num)
- {
- int rv;
---- 1191,1310 ----
- return -1;
- }
-
-+ /*
-+ * This function will search the slot list to find a slot based on the slot
-+ * label. If the wanted_slot_label is "none", then we will return the first
-+ * slot with the token presented.
-+ *
-+ * This function return 0 if it found a matching slot; otherwise, it returns
-+ * -1.
-+ */
-+ int
-+ find_slot_by_slotlabel(pkcs11_handle_t *h, const char *wanted_slot_label,
-+ unsigned int *slot_num)
-+ {
-+ unsigned long index;
-+ size_t len;
-+
-+ if (slot_num == NULL || wanted_slot_label == NULL ||
-+ strlen(wanted_slot_label) == 0)
-+ return (-1);
-+
-+ if (strcmp(wanted_slot_label, "none") == 0) {
-+ for (index = 0; index < h->slot_count; index++) {
-+ if (h->slots[index].token_present) {
-+ *slot_num = index;
-+ return (0);
-+ }
-+ }
-+ } else {
-+ /* Look up the slot by it's slotDescription */
-+ len = strlen(wanted_slot_label);
-+ for (index = 0; index < h->slot_count; index++) {
-+ if (memcmp_pad_max(h->slots[index].slotDescription, 64,
-+ (void *)wanted_slot_label, len, 64) == 0) {
-+ *slot_num = index;
-+ return (0);
-+ }
-+ }
-+ }
-+
-+ return (-1);
-+ }
-+
-+
-+ int
-+ find_slot_by_slotlabel_and_tokenlabel(pkcs11_handle_t *h,
-+ const char *wanted_slot_label, const char *wanted_token_label,
-+ unsigned int *slot_num)
-+ {
-+ unsigned long i;
-+ int rv;
-+
-+ if (slot_num == NULL)
-+ return (-1);
-+
-+ if (wanted_token_label == NULL) {
-+ rv = find_slot_by_slotlabel(h, wanted_slot_label, slot_num);
-+ return (rv);
-+ }
-+
-+ /* wanted_token_label != NULL */
-+ if (strcmp(wanted_slot_label, "none") == 0) {
-+ for (i= 0; i < h->slot_count; i++) {
-+ if (h->slots[i].token_present &&
-+ strcmp(wanted_token_label, h->slots[i].label) == 0) {
-+ *slot_num = i;
-+ return (0);
-+ }
-+ }
-+ return (-1);
-+ } else {
-+ for (i = 0; i < h->slot_count; i++) {
-+ if (h->slots[i].token_present) {
-+ const char *slot_label = h->slots[i].slotDescription;
-+ const char *token_label = h->slots[i].label;
-+
-+ if ((memcmp_pad_max((void *)slot_label, strlen(slot_label),
-+ (void *)wanted_slot_label, strlen(wanted_slot_label), 64) == 0) &&
-+ (memcmp_pad_max((void *)token_label, strlen(token_label),
-+ (void *)wanted_token_label, strlen(wanted_token_label), 33) == 0))
-+ {
-+ *slot_num = i;
-+ return (0);
-+ }
-+ }
-+ }
-+ return (-1);
-+ }
-+ }
-+
-+ int wait_for_token_by_slotlabel(pkcs11_handle_t *h,
-+ const char *wanted_slot_label,
-+ const char *wanted_token_label,
-+ unsigned int *slot_num)
-+ {
-+ int rv;
-+
-+ rv = -1;
-+ do {
-+ /* see if the card we're looking for is inserted */
-+ rv = find_slot_by_slotlabel_and_tokenlabel (h, wanted_slot_label,
-+ wanted_token_label, slot_num);
-+ if (rv != 0) {
-+ /* could call C_WaitForSlotEvent, for now just poll */
-+ sleep(10);
-+ refresh_slots(h);
-+ continue;
-+ }
-+ } while (rv != 0);
-+
-+ return rv;
-+ }
-+
- int wait_for_token(pkcs11_handle_t *h,
- int wanted_slot_id,
-! const char *wanted_token_label,
- unsigned int *slot_num)
- {
- int rv;
-***************
-*** 995,1001 ****
- rv = -1;
- do {
- /* see if the card we're looking for is inserted */
-! rv = find_slot_by_number_and_label (h, wanted_slot_id, wanted_slot_label,
- slot_num);
- if (rv != 0) {
- /* could call C_WaitForSlotEvent, for now just poll */
---- 1312,1318 ----
- rv = -1;
- do {
- /* see if the card we're looking for is inserted */
-! rv = find_slot_by_number_and_label (h, wanted_slot_id, wanted_token_label,
- slot_num);
- if (rv != 0) {
- /* could call C_WaitForSlotEvent, for now just poll */
-***************
-*** 1306,1312 ****
- return -1;
- }
-
-! const char *get_slot_label(pkcs11_handle_t *h)
- {
- return h->slots[h->current_slot].label;
- }
---- 1623,1629 ----
- return -1;
- }
-
-! const char *get_slot_tokenlabel(pkcs11_handle_t *h)
- {
- return h->slots[h->current_slot].label;
- }
-*** pam_pkcs11-0.6.0-ORIG/src/pam_pkcs11/Makefile.in Wed Jun 6 02:23:27 2007
---- pam_pkcs11-WS/src/pam_pkcs11/Makefile.in Mon Sep 28 16:06:48 2009
-***************
-*** 234,241 ****
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- MAINTAINERCLEANFILES = Makefile.in
-! AM_CFLAGS = -Wall -fno-strict-aliasing $(CRYPTO_CFLAGS)
-! AM_CPPFLAGS = -Wall -fno-strict-aliasing $(CRYPTO_CFLAGS)
- lib_LTLIBRARIES = pam_pkcs11.la
- pam_pkcs11_la_SOURCES = pam_pkcs11.c \
- mapper_mgr.c mapper_mgr.h \
---- 234,241 ----
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- MAINTAINERCLEANFILES = Makefile.in
-! AM_CFLAGS = $(CRYPTO_CFLAGS)
-! AM_CPPFLAGS = $(CRYPTO_CFLAGS)
- lib_LTLIBRARIES = pam_pkcs11.la
- pam_pkcs11_la_SOURCES = pam_pkcs11.c \
- mapper_mgr.c mapper_mgr.h \
-*** pam_pkcs11-0.6.0-ORIG/src/pam_pkcs11/pam_config.h Wed Jun 6 02:55:02 2007
---- pam_pkcs11-WS/src/pam_pkcs11/pam_config.h Mon Sep 28 16:06:48 2009
-***************
-*** 13,19 ****
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
-! * $Id: pam_config.h 270 2007-05-21 08:13:00Z ludovic.rousseau $
- */
-
- /*
---- 13,19 ----
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
-! * $Id: pam_config.h 341 2008-10-14 07:36:46Z ludovic.rousseau $
- */
-
- /*
-***************
-*** 38,46 ****
---- 38,48 ----
- char *pkcs11_module;
- char *pkcs11_modulepath;
- char **screen_savers;
-+ char *slot_description;
- int slot_num;
- int support_threads;
- cert_policy policy;
-+ char *token_type;
- char *username; /* provided user name */
- };
-
-*** pam_pkcs11-0.6.0-ORIG/src/pam_pkcs11/pam_pkcs11.c Tue May 22 01:28:33 2007
---- pam_pkcs11-WS/src/pam_pkcs11/pam_pkcs11.c Mon Nov 2 15:39:57 2009
-***************
-*** 12,18 ****
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
-! * $Id: pam_pkcs11.c 281 2007-05-22 08:28:40Z ludovic.rousseau $
- */
-
- /* We have to make this definitions before we include the pam header files! */
---- 12,18 ----
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
-! * $Id: pam_pkcs11.c 341 2008-10-14 07:36:46Z ludovic.rousseau $
- */
-
- /* We have to make this definitions before we include the pam header files! */
-***************
-*** 59,65 ****
- /*
- * comodity function that returns 1 on null, empty o spaced string
- */
-! int is_spaced_str(const char *str) {
- char *pt=(char *)str;
- if(!str) return 1;
- if (!strcmp(str,"")) return 1;
---- 59,65 ----
- /*
- * comodity function that returns 1 on null, empty o spaced string
- */
-! static int is_spaced_str(const char *str) {
- char *pt=(char *)str;
- if(!str) return 1;
- if (!strcmp(str,"")) return 1;
-***************
-*** 91,103 ****
- rv = conv->conv(1, (const struct pam_message **)msgp, &resp, conv->appdata_ptr);
- if (rv != PAM_SUCCESS)
- return rv;
-! if ((resp == NULL) || (resp[0].resp == NULL))
- return !response ? PAM_SUCCESS : PAM_CRED_INSUFFICIENT;
- if (response) {
- *response = strdup(resp[0].resp);
- }
- /* overwrite memory and release it */
- memset(resp[0].resp, 0, strlen(resp[0].resp));
- free(&resp[0]);
- return PAM_SUCCESS;
- }
---- 91,106 ----
- rv = conv->conv(1, (const struct pam_message **)msgp, &resp, conv->appdata_ptr);
- if (rv != PAM_SUCCESS)
- return rv;
-! if ((resp == NULL) || (resp[0].resp == NULL)) {
-! free(&resp[0]);
- return !response ? PAM_SUCCESS : PAM_CRED_INSUFFICIENT;
-+ }
- if (response) {
- *response = strdup(resp[0].resp);
- }
- /* overwrite memory and release it */
- memset(resp[0].resp, 0, strlen(resp[0].resp));
-+ free(resp[0].resp);
- free(&resp[0]);
- return PAM_SUCCESS;
- }
-***************
-*** 206,211 ****
---- 209,220 ----
- return PAM_AUTHINFO_UNAVAIL;
- }
-
-+ /* Either slot_description or slot_num, but not both, needs to be used */
-+ if ((configuration->slot_description != NULL && configuration->slot_num != -1) || (configuration->slot_description == NULL && configuration->slot_num == -1)) {
-+ ERR("Error setting configuration parameters");
-+ return PAM_AUTHINFO_UNAVAIL;
-+ }
-+
- /* fail if we are using a remote server
- * local login: DISPLAY=:0
- * XDMCP login: DISPLAY=host:0 */
-***************
-*** 274,281 ****
- DBG1("explicit username = [%s]", user);
- }
- } else {
-! pam_prompt(pamh, PAM_TEXT_INFO, NULL,
-! _("Please insert your smart card or enter your username."));
- /* get user name */
- rv = pam_get_user(pamh, &user, NULL);
-
---- 283,292 ----
- DBG1("explicit username = [%s]", user);
- }
- } else {
-! sprintf(password_prompt,
-! _("Please insert your %s or enter your username."),
-! _(configuration->token_type));
-! pam_prompt(pamh, PAM_TEXT_INFO, NULL, password_prompt);
- /* get user name */
- rv = pam_get_user(pamh, &user, NULL);
-
-***************
-*** 314,321 ****
- }
-
- /* open pkcs #11 session */
-! rv = find_slot_by_number_and_label(ph, configuration->slot_num,
- login_token_name, &slot_num);
- if (rv != 0) {
- ERR("no suitable token available");
- pam_syslog(pamh, LOG_ERR, "no suitable token available");
---- 325,338 ----
- }
-
- /* open pkcs #11 session */
-! if (configuration->slot_description != NULL) {
-! rv = find_slot_by_slotlabel_and_tokenlabel(ph,
-! configuration->slot_description, login_token_name, &slot_num);
-! } else if (configuration->slot_num != -1) {
-! rv = find_slot_by_number_and_label(ph, configuration->slot_num,
- login_token_name, &slot_num);
-+ }
-+
- if (rv != 0) {
- ERR("no suitable token available");
- pam_syslog(pamh, LOG_ERR, "no suitable token available");
-***************
-*** 337,344 ****
- pam_prompt(pamh, PAM_TEXT_INFO, NULL,
- _("Please insert your smart card."));
- }
-! rv = wait_for_token(ph, configuration->slot_num,
- login_token_name, &slot_num);
- if (rv != 0) {
- release_pkcs11_module(ph);
- return pkcs11_pam_fail;
---- 354,368 ----
- pam_prompt(pamh, PAM_TEXT_INFO, NULL,
- _("Please insert your smart card."));
- }
-!
-! if (configuration->slot_description != NULL) {
-! rv = wait_for_token_by_slotlabel(ph, configuration->slot_description,
-! login_token_name, &slot_num);
-! } else if (configuration->slot_num != -1) {
-! rv = wait_for_token(ph, configuration->slot_num,
- login_token_name, &slot_num);
-+ }
-+
- if (rv != 0) {
- release_pkcs11_module(ph);
- return pkcs11_pam_fail;
-***************
-*** 350,362 ****
- } else {
- /* we haven't prompted for the user yet, get the user and see if
- * the smart card has been inserted in the mean time */
-! pam_prompt(pamh, PAM_TEXT_INFO, NULL,
-! _("Please insert your smart card or enter your username."));
- rv = pam_get_user(pamh, &user, NULL);
-
- /* check one last time for the smart card before bouncing to the next
- * module */
-! rv = find_slot_by_number(ph, configuration->slot_num, &slot_num);
- if (rv != 0) {
- /* user gave us a user id and no smart card go to next module */
- release_pkcs11_module(ph);
---- 374,394 ----
- } else {
- /* we haven't prompted for the user yet, get the user and see if
- * the smart card has been inserted in the mean time */
-! sprintf(password_prompt,
-! _("Please insert your %s or enter your username."),
-! _(configuration->token_type));
-! pam_prompt(pamh, PAM_TEXT_INFO, NULL, password_prompt);
- rv = pam_get_user(pamh, &user, NULL);
-
- /* check one last time for the smart card before bouncing to the next
- * module */
-! if (configuration->slot_description != NULL) {
-! rv = find_slot_by_slotlabel(ph, configuration->slot_description,
-! &slot_num);
-! } else if (configuration->slot_num != -1) {
-! rv = find_slot_by_number(ph, configuration->slot_num, &slot_num);
-! }
-!
- if (rv != 0) {
- /* user gave us a user id and no smart card go to next module */
- release_pkcs11_module(ph);
-***************
-*** 364,370 ****
- }
- }
- } else {
-! pam_prompt(pamh, PAM_TEXT_INFO, NULL, _("Smart card inserted. "));
- }
- rv = open_pkcs11_session(ph, slot_num);
- if (rv != 0) {
---- 396,404 ----
- }
- }
- } else {
-! sprintf(password_prompt, _("Found the %s."),
-! _(configuration->token_type));
-! pam_prompt(pamh, PAM_TEXT_INFO, NULL, password_prompt);
- }
- rv = open_pkcs11_session(ph, slot_num);
- if (rv != 0) {
-***************
-*** 375,390 ****
- }
-
- /* get password */
-! sprintf(password_prompt, _("Welcome %.32s!"), get_slot_label(ph));
- pam_prompt(pamh, PAM_TEXT_INFO, NULL, password_prompt);
- if (configuration->use_first_pass) {
- rv = pam_get_pwd(pamh, &password, NULL, PAM_AUTHTOK, 0);
- } else if (configuration->try_first_pass) {
-! rv = pam_get_pwd(pamh, &password, _("Smart card password: "), PAM_AUTHTOK,
- PAM_AUTHTOK);
- } else {
-! rv = pam_get_pwd(pamh, &password, _("Smart card password: "), 0,
-! PAM_AUTHTOK);
- }
- if (rv != PAM_SUCCESS) {
- release_pkcs11_module(ph);
---- 409,424 ----
- }
-
- /* get password */
-! sprintf(password_prompt, _("Welcome %.32s!"), get_slot_tokenlabel(ph));
- pam_prompt(pamh, PAM_TEXT_INFO, NULL, password_prompt);
-+ sprintf(password_prompt, _("%s PIN: "), _(configuration->token_type));
- if (configuration->use_first_pass) {
- rv = pam_get_pwd(pamh, &password, NULL, PAM_AUTHTOK, 0);
- } else if (configuration->try_first_pass) {
-! rv = pam_get_pwd(pamh, &password, password_prompt, PAM_AUTHTOK,
- PAM_AUTHTOK);
- } else {
-! rv = pam_get_pwd(pamh, &password, password_prompt, 0, PAM_AUTHTOK);
- }
- if (rv != PAM_SUCCESS) {
- release_pkcs11_module(ph);
-***************
-*** 558,564 ****
- snprintf(env_temp, sizeof(env_temp) - 1,
- "PKCS11_LOGIN_TOKEN_NAME=%.*s",
- (sizeof(env_temp) - 1) - strlen("PKCS11_LOGIN_TOKEN_NAME="),
-! get_slot_label(ph));
- rv = pam_putenv(pamh, env_temp);
-
- if (rv != PAM_SUCCESS) {
---- 592,598 ----
- snprintf(env_temp, sizeof(env_temp) - 1,
- "PKCS11_LOGIN_TOKEN_NAME=%.*s",
- (sizeof(env_temp) - 1) - strlen("PKCS11_LOGIN_TOKEN_NAME="),
-! get_slot_tokenlabel(ph));
- rv = pam_putenv(pamh, env_temp);
-
- if (rv != PAM_SUCCESS) {
-*** pam_pkcs11-0.6.0-ORIG/src/pam_pkcs11/pam_config.c Mon May 21 02:46:19 2007
---- pam_pkcs11-WS/src/pam_pkcs11/pam_config.c Mon Sep 28 16:06:48 2009
-***************
-*** 20,25 ****
---- 20,26 ----
-
- #include <syslog.h>
- #include <string.h>
-+ #include "config.h"
- #include "../scconf/scconf.h"
- #include "../common/debug.h"
- #include "../common/error.h"
-***************
-*** 27,38 ****
---- 28,45 ----
- #include "pam_config.h"
- #include "mapper_mgr.h"
-
-+ #define N_(string) (string)
-+
- /*
- * configuration related functions
- */
-
- struct configuration_st configuration = {
-+ #ifndef ORIGINAL /* SUN_SOLARIS */
-+ "/etc/security/pam_pkcs11/pam_pkcs11.conf",
-+ #else
- "/etc/pam_pkcs11/pam_pkcs11.conf", /* char * config_file; */
-+ #endif
- NULL, /* scconf_context *ctx; */
- 0, /* int debug; */
- 0, /* int nullok; */
-***************
-*** 44,57 ****
- "default", /* const char *pkcs11_module; */
- "/etc/pam_pkcs11/pkcs11_module.so",/* const char *pkcs11_module_path; */
- NULL, /* screen savers */
-! 0, /* int slot_num; */
- 0, /* support threads */
- /* cert policy; */
- { 0,CRLP_NONE,0,"/etc/pam_pkcs11/cacerts","/etc/pam_pkcs11/crls","/etc/pam_pkcs11/nssdb",OCSP_NONE },
- NULL /* char *username */
- };
-
-- #if 0
- static void display_config (void) {
- DBG1("debug %d",configuration.debug);
- DBG1("nullok %d",configuration.nullok);
---- 51,65 ----
- "default", /* const char *pkcs11_module; */
- "/etc/pam_pkcs11/pkcs11_module.so",/* const char *pkcs11_module_path; */
- NULL, /* screen savers */
-! NULL, /* slot_description */
-! -1, /* int slot_num; */
- 0, /* support threads */
- /* cert policy; */
- { 0,CRLP_NONE,0,"/etc/pam_pkcs11/cacerts","/etc/pam_pkcs11/crls","/etc/pam_pkcs11/nssdb",OCSP_NONE },
-+ N_("Smart card"), /* token_type */
- NULL /* char *username */
- };
-
- static void display_config (void) {
- DBG1("debug %d",configuration.debug);
- DBG1("nullok %d",configuration.nullok);
-***************
-*** 71,77 ****
- DBG1("signature_policy %d",configuration.policy.signature_policy);
- DBG1("ocsp_policy %d",configuration.policy.ocsp_policy);
- }
-- #endif
-
- /*
- parse configuration file
---- 79,84 ----
-***************
-*** 136,143 ****
---- 143,164 ----
- scconf_get_str(pkcs11_mblk,"crl_dir",configuration.policy.crl_dir);
- configuration.policy.nss_dir = (char *)
- scconf_get_str(pkcs11_mblk,"nss_dir",configuration.policy.nss_dir);
-+ configuration.slot_description = (char *)
-+ scconf_get_str(pkcs11_mblk,"slot_description",configuration.slot_description);
-+
- configuration.slot_num =
- scconf_get_int(pkcs11_mblk,"slot_num",configuration.slot_num);
-+
-+ if (configuration.slot_description != NULL && configuration.slot_num != -1) {
-+ DBG1("Can not specify both slot_description and slot_num in file %s",configuration.config_file);
-+ return;
-+ }
-+
-+ if (configuration.slot_description == NULL && configuration.slot_num == -1) {
-+ DBG1("Neither slot_description nor slot_num found in file %s",configuration.config_file);
-+ return;
-+ }
-+
- configuration.support_threads =
- scconf_get_bool(pkcs11_mblk,"support_threads",configuration.support_threads);
- policy_list= scconf_find_list(pkcs11_mblk,"cert_policy");
-***************
-*** 165,170 ****
---- 186,194 ----
- }
- policy_list= policy_list->next;
- }
-+
-+ configuration.token_type = (char *)
-+ scconf_get_str(pkcs11_mblk,"token_type",configuration.token_type);
- }
- screen_saver_list = scconf_find_list(root,"screen_savers");
- if (screen_saver_list) {
-***************
-*** 199,205 ****
- int i;
- int res;
- /* try to find a configuration file entry */
-! for (i = 0; i < argc; i++) {
- if (strstr(argv[i],"config_file=") ) {
- configuration.config_file=1+strchr(argv[i],'=');
- break;
---- 223,229 ----
- int i;
- int res;
- /* try to find a configuration file entry */
-! for (i = 1; i < argc; i++) {
- if (strstr(argv[i],"config_file=") ) {
- configuration.config_file=1+strchr(argv[i],'=');
- break;
-***************
-*** 211,217 ****
- /* display_config(); */
- /* finally parse provided arguments */
- /* dont skip argv[0] */
-! for (i = 0; i < argc; i++) {
- if (strcmp("nullok", argv[i]) == 0) {
- configuration.nullok = 1;
- continue;
---- 235,241 ----
- /* display_config(); */
- /* finally parse provided arguments */
- /* dont skip argv[0] */
-! for (i = 1; i < argc; i++) {
- if (strcmp("nullok", argv[i]) == 0) {
- configuration.nullok = 1;
- continue;
-***************
-*** 246,255 ****
- res=sscanf(argv[i],"pkcs11_module=%255s",configuration.pkcs11_module);
- continue;
- }
- if (strstr(argv[i],"slot_num=") ) {
-! res=sscanf(argv[i],"slot_nume=%d",&configuration.slot_num);
- continue;
- }
- if (strstr(argv[i],"ca_dir=") ) {
- res=sscanf(argv[i],"ca_dir=%255s",configuration.policy.ca_dir);
- continue;
---- 270,285 ----
- res=sscanf(argv[i],"pkcs11_module=%255s",configuration.pkcs11_module);
- continue;
- }
-+ if (strstr(argv[i],"slot_description=") ) {
-+ res=sscanf(argv[i],"slot_description=%255s",configuration.slot_description);
-+ continue;
-+ }
-+
- if (strstr(argv[i],"slot_num=") ) {
-! res=sscanf(argv[i],"slot_num=%d",&configuration.slot_num);
- continue;
- }
-+
- if (strstr(argv[i],"ca_dir=") ) {
- res=sscanf(argv[i],"ca_dir=%255s",configuration.policy.ca_dir);
- continue;
-***************
-*** 289,294 ****
---- 319,330 ----
- }
- continue;
- }
-+
-+ if (strstr(argv[i],"token_type=") ) {
-+ res=sscanf(argv[i],"token_type=%255s",configuration.token_type);
-+ continue;
-+ }
-+
- if (strstr(argv[i],"config_file=") ) {
- /* already parsed, skip */
- continue;
-***************
-*** 299,302 ****
- }
- return &configuration;
- }
--
---- 335,337 ----
-*** pam_pkcs11-0.6.0-ORIG/src/mappers/ldap_mapper.c Wed Jun 6 02:48:24 2007
---- pam_pkcs11-WS/src/mappers/ldap_mapper.c Mon Sep 28 16:06:48 2009
-***************
-*** 184,192 ****
- }
-
- # ifdef HAVE_LDAP_INIT
-! *ld = ldap_init (uri, defport);
- # else
-! *ld = ldap_open (uri, defport);
- # endif
- rc = (*ld == NULL) ? LDAP_SERVER_DOWN : LDAP_SUCCESS;
-
---- 184,192 ----
- }
-
- # ifdef HAVE_LDAP_INIT
-! *ld = ldap_init (uri, ldapdefport);
- # else
-! *ld = ldap_open (uri, ldapdefport);
- # endif
- rc = (*ld == NULL) ? LDAP_SERVER_DOWN : LDAP_SUCCESS;
-
-*** pam_pkcs11-0.6.0-ORIG/src/tools/pkcs11_inspect.c Mon May 21 02:46:19 2007
---- pam_pkcs11-WS/src/tools/pkcs11_inspect.c Mon Sep 28 16:06:48 2009
-***************
-*** 53,58 ****
---- 53,63 ----
- return 1;
- }
-
-+ if ((configuration->slot_description != NULL && configuration->slot_num != -1) || (configuration->slot_description == NULL && configuration->slot_num == -1)) {
-+ ERR("Error setting configuration parameters");
-+ return 1;
-+ }
-+
- /* init openssl */
- rv = crypto_init(&configuration->policy);
- if (rv != 0) {
-***************
-*** 79,85 ****
- }
-
- /* open pkcs #11 session */
-! rv = find_slot_by_number(ph, configuration->slot_num, &slot_num);
- if (rv != 0) {
- release_pkcs11_module(ph);
- DBG("no token available");
---- 84,95 ----
- }
-
- /* open pkcs #11 session */
-! if (configuration->slot_description != NULL) {
-! rv = find_slot_by_slotlabel(ph, configuration->slot_description, &slot_num);
-! } else {
-! rv = find_slot_by_number(ph, configuration->slot_num, &slot_num);
-! }
-!
- if (rv != 0) {
- release_pkcs11_module(ph);
- DBG("no token available");
-*** pam_pkcs11-0.6.0-ORIG/src/tools/pklogin_finder.c Wed Jun 6 03:00:36 2007
---- pam_pkcs11-WS/src/tools/pklogin_finder.c Mon Sep 28 16:06:48 2009
-***************
-*** 55,60 ****
---- 55,65 ----
- return 1;
- }
-
-+ if ((configuration->slot_description != NULL && configuration->slot_num != -1) || (configuration->slot_description == NULL && configuration->slot_num == -1)) {
-+ ERR("Error setting configuration parameters");
-+ return 1;
-+ }
-+
- /* init openssl */
- rv = crypto_init(&configuration->policy);
- if (rv != 0) {
-***************
-*** 80,86 ****
- }
-
- /* open pkcs #11 session */
-! rv = find_slot_by_number(ph,configuration->slot_num, &slot_num);
- if (rv != 0) {
- release_pkcs11_module(ph);
- DBG("no token available");
---- 85,95 ----
- }
-
- /* open pkcs #11 session */
-! if (configuration->slot_description != NULL) {
-! rv = find_slot_by_slotlabel(ph,configuration->slot_description, &slot_num);
-! } else {
-! rv = find_slot_by_number(ph,configuration->slot_num, &slot_num);
-! }
- if (rv != 0) {
- release_pkcs11_module(ph);
- DBG("no token available");
-*** pam_pkcs11-0.6.0-ORIG/src/tools/pkcs11_eventmgr.c Wed Jun 6 04:14:27 2007
---- pam_pkcs11-WS/src/tools/pkcs11_eventmgr.c Mon Sep 28 16:06:48 2009
-***************
-*** 430,435 ****
---- 430,436 ----
- }
- }
-
-+ #ifdef HAVE_DAEMON
- if (daemonize) {
- DBG("Going to be daemon...");
- if ( daemon(0,debug)<0 ) {
-***************
-*** 440,445 ****
---- 441,447 ----
- return 1;
- }
- }
-+ #endif
-
- /*
- * Wait endlessly for all events in the list of readers
-***************
-*** 512,517 ****
---- 514,520 ----
- }
-
- /* put my self into background if flag is set */
-+ #ifdef HAVE_DAEMON
- if (daemonize) {
- DBG("Going to be daemon...");
- if ( daemon(0,debug)<0 ) {
-***************
-*** 521,526 ****
---- 524,530 ----
- return 1;
- }
- }
-+ #endif
-
- /* open pkcs11 sesion */
- DBG("initialising pkcs #11 module...");
-*** pam_pkcs11-0.6.0-ORIG/src/tools/pkcs11_listcerts.c Mon May 21 02:46:19 2007
---- pam_pkcs11-WS/src/tools/pkcs11_listcerts.c Mon Sep 28 16:06:48 2009
-***************
-*** 53,58 ****
---- 53,63 ----
- return 1;
- }
-
-+ if ((configuration->slot_description != NULL && configuration->slot_num != -1) || (configuration->slot_description == NULL && configuration->slot_num == -1)) {
-+ ERR("Error setting configuration parameters");
-+ return 1;
-+ }
-+
- /* init openssl */
- rv = crypto_init(&configuration->policy);
- if (rv != 0) {
-***************
-*** 78,84 ****
- }
-
- /* open pkcs #11 session */
-! rv = find_slot_by_number(ph, configuration->slot_num, &slot_num);
- if (rv != 0) {
- release_pkcs11_module(ph);
- DBG("no token available");
---- 83,94 ----
- }
-
- /* open pkcs #11 session */
-! if (configuration->slot_description != NULL) {
-! rv = find_slot_by_slotlabel(ph,configuration->slot_description, &slot_num);
-! } else {
-! rv = find_slot_by_number(ph,configuration->slot_num, &slot_num);
-! }
-!
- if (rv != 0) {
- release_pkcs11_module(ph);
- DBG("no token available");
-*** pam_pkcs11-0.6.0-ORIG/src/tools/pkcs11_setup.c Wed Jun 6 04:20:09 2007
---- pam_pkcs11-WS/src/tools/pkcs11_setup.c Mon Sep 28 16:06:48 2009
-***************
-*** 60,65 ****
---- 60,92 ----
- return value;
- }
-
-+ #ifndef ORIGINAL /* SUN_SOLARIS */
-+ /* Written by Niels M\ufffd\ufffdller <[email protected]>
-+ * modified by Ludovic Rousseau <[email protected]>
-+ *
-+ * This file is hereby placed in the public domain.
-+ */
-+ static char * strndup (const char *s, size_t size)
-+ {
-+ char *r;
-+ char *end = memchr(s, 0, size);
-+
-+ if (NULL == end)
-+ return NULL;
-+
-+ /* Length */
-+ size = end - s;
-+
-+ r = malloc(size+1);
-+ if (r)
-+ {
-+ memcpy(r, s, size);
-+ r[size] = '\0';
-+ }
-+ return r;
-+ }
-+ #endif
-+
- static int scconf_replace_str_list(scconf_block * block, const char *option, const char *value)
- {
- scconf_list *list = NULL;
-*** pam_pkcs11-0.6.0-ORIG/tools/make_hash_link.sh Mon May 21 02:46:19 2007
---- pam_pkcs11-WS/tools/make_hash_link.sh Mon Sep 28 16:06:48 2009
-***************
-*** 54,60 ****
- hash=`$OPENSSL x509 -inform pem -in $file -noout -hash 2> /dev/null`
- if [ ! -z $hash ]; then
- is_ca=`$OPENSSL x509 -inform pem -in $file -noout -text | grep 'CA:TRUE'`
-! if [ ! -z $is_ca ]; then
- hash=$hash.
- mk_link
- fi
---- 54,60 ----
- hash=`$OPENSSL x509 -inform pem -in $file -noout -hash 2> /dev/null`
- if [ ! -z $hash ]; then
- is_ca=`$OPENSSL x509 -inform pem -in $file -noout -text | grep 'CA:TRUE'`
-! if [ ! -z "$is_ca" ]; then
- hash=$hash.
- mk_link
- fi
-***************
-*** 63,69 ****
- hash=`$OPENSSL x509 -inform der -in $file -noout -hash 2> /dev/null`
- if [ ! -z $hash ]; then
- is_ca=`$OPENSSL x509 -inform der -in $file -noout -text | grep 'CA:TRUE'`
-! if [ ! -z $is_ca ]; then
- hash=$hash.
- mk_link
- fi
---- 63,69 ----
- hash=`$OPENSSL x509 -inform der -in $file -noout -hash 2> /dev/null`
- if [ ! -z $hash ]; then
- is_ca=`$OPENSSL x509 -inform der -in $file -noout -text | grep 'CA:TRUE'`
-! if [ ! -z "$is_ca" ]; then
- hash=$hash.
- mk_link
- fi
--- a/usr/src/lib/stdcxx4/Solaris/apply_patches.sh Thu Jun 16 03:22:51 2011 -0700
+++ b/usr/src/lib/stdcxx4/Solaris/apply_patches.sh Fri Jul 15 23:48:44 2011 -0700
@@ -22,7 +22,7 @@
#
# Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
#
-# ident "@(#)apply_patches.sh 1.3 11/04/26 SMI"
+# ident "@(#)apply_patches.sh 1.4 11/06/21 SMI"
#
UNAMEP="`uname -p`"
@@ -258,7 +258,7 @@
do
if [ ! -f ${PATCHDB}/$file.applied ] ; then
echo "Applying patch $file."
- /usr/bin/gpatch -p1 < ./Solaris/diffs/$file
+ /usr/bin/gpatch -p1 --no-backup-if-mismatch < ./Solaris/diffs/$file
touch ${PATCHDB}/$file.applied
else
echo "Patch file $file has already been applied."
--- a/usr/src/lib/stdcxx4/Solaris/diffs/6920783-locale.66.diff Thu Jun 16 03:22:51 2011 -0700
+++ b/usr/src/lib/stdcxx4/Solaris/diffs/6920783-locale.66.diff Fri Jul 15 23:48:44 2011 -0700
@@ -1,6 +1,6 @@
---- stdcxx-4.2.1/include/loc/_codecvt.h 2008-04-24 20:23:39.000000000 -0400
-+++ stdcxx-4.2.1/include/loc/_codecvt.h 2011-01-07 18:25:32.742687311 -0500
-@@ -48,9 +48,15 @@
+--- stdcxx-4.2.1/include/loc/_codecvt.h 2008-04-24 17:23:39.000000000 -0700
++++ stdcxx-4.2.1/include/loc/_codecvt.h 2011-06-09 12:32:15.715973839 -0700
+@@ -48,9 +48,12 @@
// 22.2.1.5 - Template class codecvt
@@ -10,14 +10,11 @@
+public:
enum result { ok, partial, error, noconv };
+
-+ codecvt_base () { }
-+
-+protected:
-+ virtual ~codecvt_base () _THROWS(()) { }
++ virtual ~codecvt_base () { }
};
-@@ -188,8 +194,6 @@
+@@ -188,8 +191,6 @@
_EXPLICIT codecvt (_RWSTD_SIZE_T = 0);
@@ -26,25 +23,24 @@
result out (state_type &__state,
const intern_type *__from, const intern_type* __from_end,
const intern_type *&__from_next,
-@@ -234,6 +238,8 @@
+@@ -234,6 +235,8 @@
protected:
-+ virtual ~codecvt () _THROWS (());
++ virtual ~codecvt ();
+
virtual result
do_out (state_type&,
const intern_type*, const intern_type*, const intern_type*&,
-@@ -303,6 +309,8 @@
+@@ -303,6 +306,8 @@
protected:
-+ virtual ~codecvt () _THROWS(());
++ virtual ~codecvt ();
+
virtual result
do_out (state_type&, const intern_type*, const intern_type*,
const intern_type*&,
-
#===========================================================================#
--- stdcxx-4.2.1/include/loc/_collate.h 2008-04-24 20:23:39.000000000 -0400
@@ -53,7 +49,7 @@
protected:
-+ virtual ~collate () _THROWS(()) { }
++ virtual ~collate () { }
+
// protected virtual members are not defined
virtual int
@@ -62,7 +58,7 @@
protected:
-+ virtual ~collate () _THROWS(()) { }
++ virtual ~collate () { }
+
virtual int
do_compare (const char_type*, const char_type*,
@@ -71,7 +67,7 @@
protected:
-+ virtual ~collate () _THROWS(()) { }
++ virtual ~collate () { }
virtual int
do_compare (const char_type*, const char_type*,
const char_type*, const char_type*) const;
@@ -82,7 +78,7 @@
+
+protected:
+
-+ virtual collate_byname () _THROWS(()) { }
++ virtual collate_byname () { }
};
@@ -90,7 +86,7 @@
protected:
-+ virtual ~collate_byname() _THROWS(()) { }
++ virtual ~collate_byname() { }
+
virtual int
do_compare (const char_type*, const char_type*,
@@ -99,7 +95,7 @@
protected:
-+ virtual ~collate_byname () _THROWS(()) { }
++ virtual ~collate_byname () { }
+
virtual int
do_compare (const char_type*, const char_type*,
@@ -112,9 +108,9 @@
#===========================================================================#
---- stdcxx-4.2.1/include/loc/_ctype.h 2008-04-24 20:23:39.000000000 -0400
-+++ stdcxx-4.2.1/include/loc/_ctype.h 2011-01-07 18:28:33.353937253 -0500
-@@ -64,11 +64,15 @@
+--- stdcxx-4.2.1/include/loc/_ctype.h 2008-04-24 17:23:39.000000000 -0700
++++ stdcxx-4.2.1/include/loc/_ctype.h 2011-06-09 12:32:41.296525908 -0700
+@@ -64,11 +64,12 @@
_RWSTD_NAMESPACE (std) {
@@ -126,24 +122,19 @@
+class _RWSTD_EXPORT ctype_base
{
+public:
-+
-+ ctype_base () { }
-+
// 22.2.1, p1 - mask is a bitmask type (see 17.3.3.1.2)
typedef _RWSTD_BITMASK_ENUM (_RW::__rw_ctype_mask) mask;
-@@ -83,6 +87,10 @@
+@@ -83,6 +84,8 @@
_RWSTD_STATIC_CONST (mask, xdigit = _RW::__rw_xdigit);
_RWSTD_STATIC_CONST (mask, alnum = _RW::__rw_alnum);
_RWSTD_STATIC_CONST (mask, graph = _RW::__rw_graph);
+
-+protected:
-+
-+ virtual ~ctype_base () _THROWS(()) { }
++ virtual ~ctype_base () { }
};
-@@ -103,7 +111,8 @@
+@@ -103,7 +106,8 @@
typedef _CharT char_type;
_EXPLICIT ctype (_RWSTD_SIZE_T __ref = 0)
@@ -153,70 +144,69 @@
// 22.2.1.1.1, p1
-@@ -171,6 +180,8 @@
+@@ -171,6 +175,8 @@
protected:
-+ virtual ~ctype () _THROWS(()) { }
++ virtual ~ctype () { }
+
// 22.2.1.1.2, p1
virtual bool do_is (mask, char_type) const {
return false;
-@@ -292,7 +303,7 @@
+@@ -292,7 +298,7 @@
static const mask* classic_table () _THROWS (());
- virtual ~ctype ();
-+ virtual ~ctype () _THROWS(());
++ virtual ~ctype ();
virtual const char_type*
do_toupper (char_type*, const char_type*) const;
-@@ -394,6 +405,10 @@
+@@ -394,6 +400,10 @@
: ctype<_CharT>(__ref) {
this->_C_set_name (__name, _C_namebuf, sizeof _C_namebuf);
}
+
+protected:
+
-+ virtual ~ctype_byname () _THROWS(()) { }
++ virtual ~ctype_byname () { }
};
-@@ -405,6 +420,10 @@
+@@ -405,6 +415,10 @@
public:
_EXPLICIT ctype_byname (const char*, _RWSTD_SIZE_T = 0);
+
+protected:
+
-+ virtual ~ctype_byname () _THROWS (()) { }
++ virtual ~ctype_byname () { }
};
-@@ -484,7 +503,7 @@
+@@ -484,7 +498,7 @@
protected:
- virtual ~ctype ();
-+ virtual ~ctype () _THROWS(());
++ virtual ~ctype ();
// 22.2.1.1.2, p1
virtual bool do_is (mask, char_type) const;
-@@ -597,7 +616,7 @@
+@@ -597,7 +611,7 @@
protected:
- virtual ~ctype_byname ();
-+ virtual ~ctype_byname () _THROWS (());
++ virtual ~ctype_byname ();
virtual bool
do_is (mask, char_type) const;
-@@ -653,3 +672,4 @@
+@@ -653,3 +667,4 @@
#endif // _RWSTD_LOC_CTYPE_H_INCLUDED
+
-
#===========================================================================#
--- stdcxx-4.2.1/include/loc/_facet.h 2008-04-24 20:23:39.000000000 -0400
@@ -331,10 +321,9 @@
_RWSTD_MEMBER_EXPORT const locale& operator= (const locale&) _THROWS (());
#===========================================================================#
-
---- stdcxx-4.2.1/include/loc/_messages.h 2008-04-24 20:23:39.000000000 -0400
-+++ stdcxx-4.2.1/include/loc/_messages.h 2011-01-07 18:08:43.842940113 -0500
-@@ -63,9 +63,15 @@
+--- stdcxx-4.2.1/include/loc/_messages.h 2008-04-24 17:23:39.000000000 -0700
++++ stdcxx-4.2.1/include/loc/_messages.h 2011-06-16 10:59:37.994304507 -0700
+@@ -63,9 +63,12 @@
_RWSTD_NAMESPACE (std) {
@@ -344,23 +333,20 @@
+public:
typedef int catalog;
+
-+ messages_base () { }
-+
-+protected:
-+ virtual ~messages_base () _THROWS(()) { }
++ virtual ~messages_base () { }
};
-@@ -102,6 +108,8 @@
+@@ -102,6 +105,8 @@
protected:
-+ virtual ~messages () _THROWS(()) { }
++ virtual ~messages () { }
+
virtual catalog do_open (const string&, const locale&) const;
virtual string_type do_get (catalog, int, int, const string_type&) const;
-@@ -128,6 +136,7 @@
+@@ -128,6 +133,7 @@
template <class _CharT>
class messages_byname: public messages<_CharT>
{
@@ -368,18 +354,17 @@
char _C_namebuf [32];
public:
-@@ -136,6 +145,10 @@
+@@ -136,6 +142,10 @@
: messages<_CharT>(__refs) {
this->_C_set_name (__name, _C_namebuf, sizeof _C_namebuf);
}
+
+protected:
+
-+ virtual ~messages_byname () _THROWS(()) { }
++ virtual ~messages_byname () { }
};
} // namespace std
-
#===========================================================================#
--- stdcxx-4.2.1/include/loc/_money_get.h 2008-04-24 20:23:39.000000000 -0400
@@ -399,7 +384,7 @@
#endif // _RWSTD_NO_LONG_DOUBLE
-+ virtual ~money_get () _THROWS(()) { }
++ virtual ~money_get () { }
+
virtual iter_type
do_get (iter_type __it, iter_type __end, bool __intl, ios_base &__fl,
@@ -428,9 +413,9 @@
#===========================================================================#
---- stdcxx-4.2.1/include/loc/_moneypunct.h 2008-04-24 20:23:39.000000000 -0400
-+++ stdcxx-4.2.1/include/loc/_moneypunct.h 2011-01-07 18:33:27.698752664 -0500
-@@ -46,27 +46,35 @@
+--- stdcxx-4.2.1/include/loc/_moneypunct.h 2008-04-24 17:23:39.000000000 -0700
++++ stdcxx-4.2.1/include/loc/_moneypunct.h 2011-06-16 11:01:58.479524965 -0700
+@@ -46,27 +46,31 @@
_RWSTD_NAMESPACE (std) {
@@ -440,14 +425,10 @@
+class money_base
{
+public:
-+ money_base () { }
-+
enum part { none, space, symbol, sign, value };
struct pattern { char field [4]; };
+
-+protected:
-+
-+ virtual ~money_base () _THROWS (()) { }
++ virtual ~money_base () { }
};
@@ -470,27 +451,27 @@
char_type decimal_point () const {
return do_decimal_point ();
-@@ -110,6 +118,8 @@
+@@ -110,6 +114,8 @@
protected:
-+ virtual ~moneypunct () _THROWS(()) { }
++ virtual ~moneypunct () { }
+
// 22.2.6.3.1, p1
virtual char_type do_decimal_point () const {
return *_C_get (this, _RW::__rw_dp);
-@@ -211,6 +221,10 @@
+@@ -211,6 +217,10 @@
: moneypunct<_CharT, _Intl>(__ref) {
this->_C_set_name (__name, _C_namebuf, sizeof _C_namebuf);
}
+
+protected:
+
-+ virtual ~moneypunct_byname () _THROWS(()) { }
++ virtual ~moneypunct_byname () { }
};
-@@ -226,15 +240,15 @@
+@@ -226,15 +236,15 @@
#if _RWSTD_INSTANTIATE (_MONEYPUNCT, _CHAR)
@@ -510,12 +491,11 @@
#endif // _RWSTD_INSTANTIATE (_MONEYPUNCT, _WCHAR_T)
-@@ -247,3 +261,4 @@
+@@ -247,3 +257,4 @@
#endif // _RWSTD_LOC_MONEYPUNCT_H_INCLUDED
+
-
#===========================================================================#
--- stdcxx-4.2.1/include/loc/_money_put.h 2008-04-24 20:23:39.000000000 -0400
@@ -536,7 +516,7 @@
protected:
-+ virtual ~money_put () _THROWS (()) { }
++ virtual ~money_put () { }
+
// 22.2.6.2.2, p1
virtual iter_type
@@ -561,7 +541,7 @@
_EXPLICIT num_get (_RWSTD_SIZE_T __refs = 0)
: _RW::__rw_facet (__refs) { }
-+ virtual ~num_get() _THROWS(()) { }
++ virtual ~num_get() { }
+
#ifndef _RWSTD_NO_NATIVE_BOOL
@@ -611,7 +591,7 @@
protected:
-+ virtual ~numpunct () _THROWS(()) { }
++ virtual ~numpunct () { }
+
// 22.2.3.1.2, p1
virtual char_type do_decimal_point () const {
@@ -623,7 +603,7 @@
+
+protected:
+
-+ virtual ~numpunct_byname () _THROWS(()) { }
++ virtual ~numpunct_byname () { }
};
} // namespace std
@@ -653,7 +633,7 @@
template <class _CharT, class _OutputIter /* = ostreambuf_iterator<_CharT> */>
-/* virtual */ num_put<_CharT, _OutputIter>::~num_put ()
-+/* virtual */ num_put<_CharT, _OutputIter>::~num_put () _THROWS (())
++/* virtual */ num_put<_CharT, _OutputIter>::~num_put ()
{
// no-op
}
@@ -677,7 +657,7 @@
: _RW::__rw_facet (__refs) { }
- virtual ~num_put ();
-+ virtual ~num_put () _THROWS(());
++ virtual ~num_put ();
#ifndef _RWSTD_NO_BOOL
@@ -712,7 +692,7 @@
enum dateorder { no_order, dmy, mdy, ymd, ydm };
+
+ time_base() { }
-+ virtual ~time_base() _THROWS(()) { }
++ virtual ~time_base() { }
};
@@ -738,7 +718,7 @@
protected:
-+ virtual ~time_get () _THROWS(()) { }
++ virtual ~time_get () { }
+
virtual dateorder do_date_order() const {
return dateorder ();
@@ -749,7 +729,7 @@
}
+
+protected:
-+ virtual ~time_get_byname () _THROWS(()) { }
++ virtual ~time_get_byname () { }
};
} // namespace std
@@ -774,7 +754,7 @@
protected:
+ // 22.2.5.3
-+ virtual ~time_put() _THROWS(()) { }
++ virtual ~time_put() { }
+
// 22.2.5.3.2, p1
virtual iter_type
@@ -791,7 +771,7 @@
}
+
+protected:
-+ virtual ~time_put_byname() _THROWS(()) { }
++ virtual ~time_put_byname() { }
};
} // namespace std
@@ -827,7 +807,7 @@
-/* virtual */ codecvt<char, char, _RWSTD_MBSTATE_T>::~codecvt ()
+/* virtual */
-+codecvt<char, char, _RWSTD_MBSTATE_T>::~codecvt () _THROWS(())
++codecvt<char, char, _RWSTD_MBSTATE_T>::~codecvt ()
{
// no-op
}
@@ -836,7 +816,7 @@
}
+/* virtual */
-+codecvt<wchar_t, char, _RWSTD_MBSTATE_T>::~codecvt () _THROWS(())
++codecvt<wchar_t, char, _RWSTD_MBSTATE_T>::~codecvt ()
+{
+ // no-op
+}
@@ -859,7 +839,7 @@
-ctype<char>::~ctype ()
-+ctype<char>::~ctype () _THROWS (())
++ctype<char>::~ctype ()
{
if (_C_delete_it) {
delete[] _RWSTD_CONST_CAST (mask*, _C_mask_tab);
@@ -873,7 +853,7 @@
-ctype<wchar_t>::~ctype ()
-+ctype<wchar_t>::~ctype () _THROWS (())
++ctype<wchar_t>::~ctype ()
{
if (_C_delete_it) {
delete[] _RWSTD_CONST_CAST (mask*, _C_mask_tab);
@@ -883,7 +863,7 @@
-ctype_byname<wchar_t>::
-~ctype_byname ()
-+ctype_byname<wchar_t>::~ctype_byname () _THROWS (())
++ctype_byname<wchar_t>::~ctype_byname ()
{
// Release the codecvt database at this level
if (_C_cvtimpl != 0 && _C_cvtsize != 0)
@@ -906,7 +886,7 @@
+ explicit test_numpunct(size_t refs = 0)
+ : std::numpunct<charT> (refs) { }
+
-+ virtual ~test_numpunct () _THROWS (()) { }
++ virtual ~test_numpunct () { }
+};
+
/**************************************************************************/
--- a/usr/src/lib/tidy/METADATA Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-NAME: tidy
-VERSION: 1.0.0
-DESCRIPTION: program and library for checking and generating clean XHTML/HTML
-LICENSE: W3C
-PACKAGE: SUNWtidy
-PROJECT_URL: http://tidy.sourceforge.net/
-SOURCE_DOWNLOAD: http://tidy.sourceforge.net/tidy-1.0.0.tar.gz
-SUPPORT: C
-BUGTRAQ: solaris/library/tidy
-OSR: 5741
-COMMENTS:
--- a/usr/src/lib/tidy/Makefile.sfw Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,120 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# ident "@(#)Makefile.sfw 1.3 08/11/10 SMI"
-
-#
-# This makefile builds both 32 and 64 bit versions of the library.
-# Builds occur in separate directories.
-#
-
-VER=tidy-1.0.0
-VER64=$(VER)-64
-
-LARGEFILES= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
-PREFIX=/usr
-
-include ../Makefile.lib
-
-all: real-all
-
-all32: $(VER)/config.status
- (cd $(VER); env "CFLAGS=$(CFLAGS) $(XREGSFLAG) $(LARGEFILES)" \
- "LD_OPTIONS=-M $(SRC)/cmd/mapfile_noexstk -z ignore" \
- PATH=$(SFW_PATH) \
- "MAKE=$(CCSMAKE)" $(CCSMAKE) -e)
-
-all64: $(VER64)/config.status
- (cd $(VER64); env "CFLAGS=$(CFLAGS64) $(XREGSFLAG64) $(LARGEFILES)" \
- "LD_OPTIONS=-M $(SRC)/cmd/mapfile_noexstk -z ignore" \
- PATH=$(SFW_PATH) \
- "MAKE=$(CCSMAKE)" $(CCSMAKE) -e)
-
-# lint stuff
-LIBRARY=libtidy.a
-LINTOUT= lint.out
-LINTFLAGS= -I./include $(CCBITS32) $(LARGEFILES)
-LINTFLAGS64= -I./include $(CCBITS64) $(LARGEFILES)
-
-install: all
- $(SH) ./install-sfw
- MACH64=$(MACH64) $(SH) ./install-sfw-64
-
-real-all: all32 lint32 all64 lint64
-
-test: test32 test64
-
-$(VER)/config.status: $(VER)/configure
- (cd $(VER); \
- env "CC=$(CC)" "CFLAGS=$(CFLAGS)" \
- PATH=$(SFW_PATH) \
- "MAKE=$(CCSMAKE)" \
- ./configure --prefix=$(PREFIX) \
- --localstatedir=/var \
- --disable-static \
- --enable-access \
- --enable-utf16 \
- --enable-asian)
-
-$(VER64)/config.status: $(VER64)/configure
- (cd $(VER64); \
- env "CC=$(CC64)" "CFLAGS=$(CFLAGS64)" \
- PATH=$(SFW_PATH) \
- "MAKE=$(CCSMAKE)" \
- ./configure --prefix=$(PREFIX) \
- --bindir=$(PREFIX)/bin/$(MACH64) \
- --libdir=$(PREFIX)/lib/$(MACH64) \
- --libexecdir=$(PREFIX)/libexec/$(MACH64) \
- --localstatedir=/var \
- --disable-static \
- --enable-access \
- --enable-utf16 \
- --enable-asian)
-
-$(VER)/configure: $(VER).tar.gz
- mkdir -p tmp; gzip -dc $(VER).tar.gz | (cd tmp; tar xopf -)
- mv tmp/$(VER) $(VER); rmdir tmp
- touch $(VER)/configure
-
-$(VER64)/configure: $(VER).tar.gz
- mkdir -p tmp; gzip -dc $(VER).tar.gz | (cd tmp; tar xopf -)
- mv tmp/$(VER) $(VER64); rmdir tmp
- touch $(VER64)/configure
-
-clean:
- -rm -rf $(VER)
- -rm -rf $(VER64)
-
-lint32: $(VER)/config.status
- (cd $(VER); \
- $(LINT.c) -o $(LIBNAME) ../llib-ltidy > $(LINTOUT) 2>&1)
-
-lint64: $(VER64)/config.status
- (cd $(VER64); \
- $(LINT64.c) -o $(LIBNAME) ../llib-ltidy > $(LINTOUT) 2>&1)
-
-
-install_h:
-
-include ../Makefile.targ
--- a/usr/src/lib/tidy/Solaris/libtidy.3 Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-.\" libtidy man page for the Tidy Sourceforge project
-.TH libtidy 3 "1 Feb 2007" "HTML Tidy 1.0.0" "Libraries"
-.SH NAME
-\fBlibtidy\fR - validate, correct, and pretty-print HTML files
-.SH LIBRARY
-The Tidy HTML Parser Library (libtidy, -ltidy)
-.PP
-.br
-.SH DESCRIPTION
-.PP
-\fB#include <tidy.h>\fP
-.br
-\fB#include <buffio.h>\fP
-.PP
-.br
-The
-\fBtidy\fP
-library provides parsing facilities for validating HTML, similar to
-those found in
-\fBlint\fP(1).
-These functions are available in the
-\fBlibtidy\fP
-library.
-Programs should be linked with
-\fB\-ltidy\fP.
-.SH "SEE ALSO"
-\fBtidy\fP(1)
-.PP
-.br
-Complete documentation in HTML format is available under
-\fB/usr/share/doc/tidy/html\fP.
-.SH AUTHOR
-\fBTidy\fR was written by Dave Raggett <\[email protected]\fR>, and is now maintained and developed by the Tidy team at \fIhttp://tidy.sourceforge.net/\fR. It is released under the \fIMIT Licence\fR.
-.LP
-Generated automatically with HTML Tidy released on 1 September 2005.
-
--- a/usr/src/lib/tidy/Solaris/tab2space.1 Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-.\" tab2space man page for the Tidy Sourceforge project
-.TH tab2space 1 "1 Feb 2007" "HTML Tidy 1.0.0" "User commands"
-
-.SH NAME
-\fBtab2space\fR - Utility to expand tabs and ensure consistent line endings
-.br
-.SH SYNOPSIS
-\fBtab2space\fR [option ...] [[infile] [outfile]] ...
-.SH DESCRIPTION
-tab2space is a command-line utility which performs tab expansion and
-ensures consistent and appropriate line ending termination characters.
-tab2space is distributed as part of the tidy(1) package.
-.SH OPTIONS
-.TP
-\fB-help\fR, \fB-h\fR
-display detailed help message
-.TP
-\fB-dos\fR, \fB-crlf\fR
-set line ends to CRLF
-(\fIPC-DOS/Windows - default\fR)
-.TP
-\fB-mac\fR, \fB-cr\fR
-set line ends to CR
-(\fIclassic Mac OS\fR)
-.TP
-\fB-unix\fR, \fB-lf\fR
-set line ends to LF
-(\fIUnix\fR)
-.TP
-\fB-tabs\fR
-preserve tabs, e.g. for Makefile
-.TP
-\fB-t<n>\fR
-set tabs to <n> (default is 4) spaces
-.SH USAGE
-.LP
-Use \fB--\fR\fIhelp\fR or \fB-\fR\fIh\fR for detailed configuration options.
-.LP
-Input/Output default to stdin/stdout respectively.
-.LP
-For further info on HTML see \fIhttp://www.w3.org/MarkUp\fR.
-.LP
-For more information about HTML Tidy, visit the project home page at \fIhttp://tidy.sourceforge.net\fR. Here, you will find links to documentation, mailing lists (with searchable archives) and links to report bugs.
-.SH "EXIT STATUS"
-.IP 0
-All input files were processed successfully.
-.IP 1
-There were warnings.
-.IP 2
-There were errors.
-.SH "SEE ALSO"
-HTML Tidy Project Page at \fIhttp://tidy.sourceforge.net\fR
-.SH AUTHOR
-\fBTidy\fR was written by Dave Raggett <\[email protected]\fR>, and is now maintained and developed by the Tidy team at \fIhttp://tidy.sourceforge.net/\fR. It is released under the \fIMIT Licence\fR.
-.LP
-Generated automatically with HTML Tidy released on 1 September 2005.
--- a/usr/src/lib/tidy/Solaris/tidy.1 Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1405 +0,0 @@
-.\" tidy man page for the Tidy Sourceforge project
-.TH tidy 1 "1 Feb 2007" "HTML Tidy 1.0.0" "User commands"
-
-.SH NAME
-\fBtidy\fR - validate, correct, and pretty-print HTML files
-.br
-.SH SYNOPSIS
-\fBtidy\fR [option ...] [file ...] [option ...] [file ...]
-.SH DESCRIPTION
-Tidy reads HTML, XHTML and XML files and writes cleaned up markup. For
-HTML variants, it detects and corrects many common coding errors and
-strives to produce visually equivalent markup that is both W3C
-compliant and works on most browsers. A common use of Tidy is to
-convert plain HTML to XHTML. For generic XML files, Tidy is limited to
-correcting basic well-formedness errors and pretty printing.
-.LP
-If no input file is specified, Tidy reads the standard input. If no
-output file is specified, Tidy writes the tidied markup to the standard
-output. If no error file is specified, Tidy writes messages to the
-standard error.
-For command line options that expect a numerical argument, a default is
-assumed if no meaningful value can be found.
-.SH OPTIONS
-
-.SS File manipulation
-
-.TP
-\fB-output <file>\fR, \fB-o <file>\fR
-write output to the specified <file>
-(\fIoutput-file: <file>\fR)
-.TP
-\fB-config <file>\fR
-set configuration options from the specified <file>
-
-.TP
-\fB-file <file>\fR, \fB-f <file>\fR
-write errors to the specified <file>
-(\fIerror-file: <file>\fR)
-.TP
-\fB-modify\fR, \fB-m\fR
-modify the original input files
-(\fIwrite-back: yes\fR)
-.SS Processing directives
-
-.TP
-\fB-indent\fR, \fB-i\fR
-indent element content
-(\fIindent: auto\fR)
-.TP
-\fB-wrap <column>\fR, \fB-w <column>\fR
-wrap text at the specified <column>. 0 is assumed if <column> is
-missing. When this option is omitted, the default of the configuration
-option "wrap" applies.
-(\fIwrap: <column>\fR)
-.TP
-\fB-upper\fR, \fB-u\fR
-force tags to upper case
-(\fIuppercase-tags: yes\fR)
-.TP
-\fB-clean\fR, \fB-c\fR
-replace FONT, NOBR and CENTER tags by CSS
-(\fIclean: yes\fR)
-.TP
-\fB-bare\fR, \fB-b\fR
-strip out smart quotes and em dashes, etc.
-(\fIbare: yes\fR)
-.TP
-\fB-numeric\fR, \fB-n\fR
-output numeric rather than named entities
-(\fInumeric-entities: yes\fR)
-.TP
-\fB-errors\fR, \fB-e\fR
-only show errors
-(\fImarkup: no\fR)
-.TP
-\fB-quiet\fR, \fB-q\fR
-suppress nonessential output
-(\fIquiet: yes\fR)
-.TP
-\fB-omit\fR
-omit optional end tags
-(\fIhide-endtags: yes\fR)
-.TP
-\fB-xml\fR
-specify the input is well formed XML
-(\fIinput-xml: yes\fR)
-.TP
-\fB-asxml\fR, \fB-asxhtml\fR
-convert HTML to well formed XHTML
-(\fIoutput-xhtml: yes\fR)
-.TP
-\fB-ashtml\fR
-force XHTML to well formed HTML
-(\fIoutput-html: yes\fR)
-.TP
-\fB-access <level>\fR
-do additional accessibility checks (<level> = 0, 1, 2, 3). 0 is assumed
-if <level> is missing.
-(\fIaccessibility-check: <level>\fR)
-.SS Character encodings
-
-.TP
-\fB-raw\fR
-output values above 127 without conversion to entities
-
-.TP
-\fB-ascii\fR
-use ISO-8859-1 for input, US-ASCII for output
-
-.TP
-\fB-latin0\fR
-use ISO-8859-15 for input, US-ASCII for output
-
-.TP
-\fB-latin1\fR
-use ISO-8859-1 for both input and output
-
-.TP
-\fB-iso2022\fR
-use ISO-2022 for both input and output
-
-.TP
-\fB-utf8\fR
-use UTF-8 for both input and output
-
-.TP
-\fB-mac\fR
-use MacRoman for input, US-ASCII for output
-
-.TP
-\fB-win1252\fR
-use Windows-1252 for input, US-ASCII for output
-
-.TP
-\fB-ibm858\fR
-use IBM-858 (CP850+Euro) for input, US-ASCII for output
-
-.TP
-\fB-utf16le\fR
-use UTF-16LE for both input and output
-
-.TP
-\fB-utf16be\fR
-use UTF-16BE for both input and output
-
-.TP
-\fB-utf16\fR
-use UTF-16 for both input and output
-
-.TP
-\fB-big5\fR
-use Big5 for both input and output
-
-.TP
-\fB-shiftjis\fR
-use Shift_JIS for both input and output
-
-.TP
-\fB-language <lang>\fR
-set the two-letter language code <lang> (for future use)
-(\fIlanguage: <lang>\fR)
-.SS Miscellaneous
-
-.TP
-\fB-version\fR, \fB-v\fR
-show the version of Tidy
-
-.TP
-\fB-help\fR, \fB-h\fR, \fB-?\fR
-list the command line options
-
-.TP
-\fB-xml-help\fR
-list the command line options in XML format
-
-.TP
-\fB-help-config\fR
-list all configuration options
-
-.TP
-\fB-xml-config\fR
-list all configuration options in XML format
-
-.TP
-\fB-show-config\fR
-list the current configuration settings
-
-.SH USAGE
-.LP
-Use \fB--\fR\fIoptionX valueX\fR for the detailed configuration option
-"optionX" with argument "valueX". See also below under \fBDetailed
-Configuration Options\fR as to how to conveniently group all such
-options in a single config file.
-.LP
-Input/Output default to stdin/stdout respectively. Single letter
-options apart from \fB-f\fR and \fB-o\fR may be combined as in:
-.LP
-.in 1i
-\fBtidy -f errs.txt -imu foo.html\fR
-.LP
-For further info on HTML see \fIhttp://www.w3.org/MarkUp\fR.
-.LP
-For more information about HTML Tidy, visit the project home page at
-\fIhttp://tidy.sourceforge.net\fR. Here, you will find links to
-documentation, mailing lists (with searchable archives) and links to
-report bugs.
-.SH ENVIRONMENT
-.TP
-.B HTML_TIDY
-Name of the default configuration file. This should be an absolute
-path, since you will probably invoke \fBtidy\fR from different
-directories. The value of HTML_TIDY will be parsed after the
-compiled-in default (defined with -DTIDY_CONFIG_FILE), but before any
-of the files specified using \fB-config\fR.
-.SH "EXIT STATUS"
-.IP 0
-All input files were processed successfully.
-.IP 1
-There were warnings.
-.IP 2
-There were errors.
-
-.SH ______________________________
-.SH " "
-.SH "DETAILED CONFIGURATION OPTIONS"
-This section describes the Detailed (i.e., "expanded") Options, which
-may be specified by preceding each option with \fB--\fR at the command
-line, followed by its desired value, OR by placing the options and
-values in a configuration file, and telling tidy to read that file with
-the \fB-config\fR standard option.
-.SH SYNOPSIS
-\fBtidy --\fR\fIoption1 \fRvalue1 \fB--\fIoption2 \fRvalue2 [standard
-options ...]
-.br
-\fBtidy -config \fIconfig-file \fR[standard options ...]
-.SH WARNING
-The options detailed here do not include the "standard" command-line
-options (i.e., those preceded by a single '\fB-\fR') described above in
-the first section of this man page.
-.SH DESCRIPTION
-A list of options for configuring the behavior of Tidy, which can be
-passed either on the command line, or specified in a configuration
-file.
-.LP
-A Tidy configuration file is simply a text file, where each option
-is listed on a separate line in the form
-.LP
-.in 1i
-\fBoption1\fR: \fIvalue1\fR
-.br
-\fBoption2\fR: \fIvalue2\fR
-.br
-etc.
-.LP
-The permissible values for a given option depend on the option's
-\fBType\fR. There are five types: \fIBoolean\fR, \fIAutoBool\fR,
-\fIDocType\fR, \fIEnum\fR, and \fIString\fR. Boolean types allow any of
-\fIyes/no, y/n, true/false, t/f, 1/0\fR. AutoBools allow \fIauto\fR in
-addition to the values allowed by Booleans. Integer types take
-non-negative integers. String types generally have no defaults, and
-you should provide them in non-quoted form (unless you wish the output
-to contain the literal quotes).
-.LP
-Enum, Encoding, and DocType "types" have a fixed repertoire of items;
-consult the \fIExample\fR[s] provided below for the option[s] in
-question.
-.LP
-You only need to provide options and values for those whose defaults
-you wish to override, although you may wish to include some
-already-defaulted options and values for the sake of documentation and
-explicitness.
-.LP
-Here is a sample config file, with at least one example of each of the
-five Types:
-.LP
-\fI
- // sample Tidy configuration options
- output-xhtml: yes
- add-xml-decl: no
- doctype: strict
- char-encoding: ascii
- indent: auto
- wrap: 76
- repeated-attributes: keep-last
- error-file: errs.txt
-\fR
-.LP
-Below is a summary and brief description of each of the options. They
-are listed alphabetically within each category. There are five
-categories: \fIHTML, XHTML, XML\fR options, \fIDiagnostics\fR options,
-\fIPretty Print\fR options, \fICharacter Encoding\fR options, and
-\fIMiscellaneous\fR options.
-.LP
-.SH OPTIONS
-
-.SS HTML, XHTML, XML options:
-
-.TP
-\fBadd-xml-decl\fR
-
-Type: \fIBoolean\fR
-.br
-Default: \fIno\fR
-.br
-Example: \fIy/n, yes/no, t/f, true/false, 1/0\fR
-
-This option specifies if Tidy should add the XML declaration when
-outputting XML or XHTML. Note that if the input already includes an
-<?xml ... ?> declaration then this option will be ignored. If the
-encoding for the output is different from "ascii", one of the utf
-encodings or "raw", the declaration is always added as required by the
-XML standard.
-
-
-.rj 1
-\fBSee also\fR: \fIchar-encoding\fR, \fIoutput-encoding\fR
-.TP
-\fBadd-xml-space\fR
-
-Type: \fIBoolean\fR
-.br
-Default: \fIno\fR
-.br
-Example: \fIy/n, yes/no, t/f, true/false, 1/0\fR
-
-This option specifies if Tidy should add xml:space="preserve" to
-elements such as <PRE>, <STYLE> and <SCRIPT> when generating XML. This
-is needed if the whitespace in such elements is to be parsed
-appropriately without having access to the DTD.
-.TP
-\fBalt-text\fR
-
-Type: \fIString\fR
-.br
-Default: \fI-\fR
-.br
-Default: \fI-\fR
-
-This option specifies the default "alt=" text Tidy uses for <IMG>
-attributes. This feature is dangerous as it suppresses further
-accessibility warnings. You are responsible for making your documents
-accessible to people who can not see the images!
-.TP
-\fBassume-xml-procins\fR
-
-Type: \fIBoolean\fR
-.br
-Default: \fIno\fR
-.br
-Example: \fIy/n, yes/no, t/f, true/false, 1/0\fR
-
-This option specifies if Tidy should change the parsing of processing
-instructions to require ?> as the terminator rather than >. This option
-is automatically set if the input is in XML.
-.TP
-\fBbare\fR
-
-Type: \fIBoolean\fR
-.br
-Default: \fIno\fR
-.br
-Example: \fIy/n, yes/no, t/f, true/false, 1/0\fR
-
-This option specifies if Tidy should strip Microsoft specific HTML from
-Word 2000 documents, and output spaces rather than non-breaking spaces
-where they exist in the input.
-.TP
-\fBclean\fR
-
-Type: \fIBoolean\fR
-.br
-Default: \fIno\fR
-.br
-Example: \fIy/n, yes/no, t/f, true/false, 1/0\fR
-
-This option specifies if Tidy should strip out surplus presentational
-tags and attributes replacing them by style rules and structural markup
-as appropriate. It works well on the HTML saved by Microsoft Office
-products.
-.TP
-\fBcss-prefix\fR
-
-Type: \fIString\fR
-.br
-Default: \fI-\fR
-.br
-Default: \fI-\fR
-
-This option specifies the prefix that Tidy uses for styles rules. By
-default, "c" will be used.
-.TP
-\fBdoctype\fR
-
-Type: \fIDocType\fR
-.br
-Default: \fIauto\fR
-.br
-Example: \fIomit, auto, strict, transitional, user\fR
-
-This option specifies the DOCTYPE declaration generated by Tidy. If set
-to "omit" the output won't contain a DOCTYPE declaration. If set to
-"auto" (the default) Tidy will use an educated guess based upon the
-contents of the document. If set to "strict", Tidy will set the DOCTYPE
-to the strict DTD. If set to "loose", the DOCTYPE is set to the loose
-(transitional) DTD. Alternatively, you can supply a string for the
-formal public identifier (FPI).
-.br
-
-.br
-For example:
-.br
-doctype: "-//ACME//DTD HTML 3.14159//EN"
-.br
-
-.br
-If you specify the FPI for an XHTML document, Tidy will set the system
-identifier to the empty string. For an HTML document, Tidy adds a
-system identifier only if one was already present in order to preserve
-the processing mode of some browsers. Tidy leaves the DOCTYPE for
-generic XML documents unchanged. \fI--doctype omit\fR implies
-\fI--numeric-entities yes\fR.
-.TP
-\fBdrop-empty-paras\fR
-
-Type: \fIBoolean\fR
-.br
-Default: \fIyes\fR
-.br
-Example: \fIy/n, yes/no, t/f, true/false, 1/0\fR
-
-This option specifies if Tidy should discard empty paragraphs.
-.TP
-\fBdrop-font-tags\fR
-
-Type: \fIBoolean\fR
-.br
-Default: \fIno\fR
-.br
-Example: \fIy/n, yes/no, t/f, true/false, 1/0\fR
-
-This option specifies if Tidy should discard <FONT> and <CENTER> tags
-without creating the corresponding style rules. This option can be set
-independently of the clean option.
-.TP
-\fBdrop-proprietary-attributes\fR
-
-Type: \fIBoolean\fR
-.br
-Default: \fIno\fR
-.br
-Example: \fIy/n, yes/no, t/f, true/false, 1/0\fR
-
-This option specifies if Tidy should strip out proprietary attributes,
-such as MS data binding attributes.
-.TP
-\fBenclose-block-text\fR
-
-Type: \fIBoolean\fR
-.br
-Default: \fIno\fR
-.br
-Example: \fIy/n, yes/no, t/f, true/false, 1/0\fR
-
-This option specifies if Tidy should insert a <P> element to enclose
-any text it finds in any element that allows mixed content for HTML
-transitional but not HTML strict.
-.TP
-\fBenclose-text\fR
-
-Type: \fIBoolean\fR
-.br
-Default: \fIno\fR
-.br
-Example: \fIy/n, yes/no, t/f, true/false, 1/0\fR
-
-This option specifies if Tidy should enclose any text it finds in the
-body element within a <P> element. This is useful when you want to take
-existing HTML and use it with a style sheet.
-.TP
-\fBescape-cdata\fR
-
-Type: \fIBoolean\fR
-.br
-Default: \fIno\fR
-.br
-Example: \fIy/n, yes/no, t/f, true/false, 1/0\fR
-
-This option specifies if Tidy should convert <![CDATA[]]> sections to
-normal text.
-.TP
-\fBfix-backslash\fR
-
-Type: \fIBoolean\fR
-.br
-Default: \fIyes\fR
-.br
-Example: \fIy/n, yes/no, t/f, true/false, 1/0\fR
-
-This option specifies if Tidy should replace backslash characters
-"\fI\\\fR" in URLs by forward slashes "\fI/\fR".
-.TP
-\fBfix-bad-comments\fR
-
-Type: \fIBoolean\fR
-.br
-Default: \fIyes\fR
-.br
-Example: \fIy/n, yes/no, t/f, true/false, 1/0\fR
-
-This option specifies if Tidy should replace unexpected hyphens with
-"=" characters when it comes across adjacent hyphens. The default is
-yes. This option is provided for users of Cold Fusion which uses the
-comment syntax: <!--- --->
-.TP
-\fBfix-uri\fR
-
-Type: \fIBoolean\fR
-.br
-Default: \fIyes\fR
-.br
-Example: \fIy/n, yes/no, t/f, true/false, 1/0\fR
-
-This option specifies if Tidy should check attribute values that carry
-URIs for illegal characters and if such are found, escape them as HTML
-4 recommends.
-.TP
-\fBhide-comments\fR
-
-Type: \fIBoolean\fR
-.br
-Default: \fIno\fR
-.br
-Example: \fIy/n, yes/no, t/f, true/false, 1/0\fR
-
-This option specifies if Tidy should print out comments.
-.TP
-\fBhide-endtags\fR
-
-Type: \fIBoolean\fR
-.br
-Default: \fIno\fR
-.br
-Example: \fIy/n, yes/no, t/f, true/false, 1/0\fR
-
-This option specifies if Tidy should omit optional end-tags when
-generating the pretty printed markup. This option is ignored if you are
-outputting to XML.
-.TP
-\fBindent-cdata\fR
-
-Type: \fIBoolean\fR
-.br
-Default: \fIno\fR
-.br
-Example: \fIy/n, yes/no, t/f, true/false, 1/0\fR
-
-This option specifies if Tidy should indent <![CDATA[]]> sections.
-.TP
-\fBinput-xml\fR
-
-Type: \fIBoolean\fR
-.br
-Default: \fIno\fR
-.br
-Example: \fIy/n, yes/no, t/f, true/false, 1/0\fR
-
-This option specifies if Tidy should use the XML parser rather than the
-error correcting HTML parser.
-.TP
-\fBjoin-classes\fR
-
-Type: \fIBoolean\fR
-.br
-Default: \fIno\fR
-.br
-Example: \fIy/n, yes/no, t/f, true/false, 1/0\fR
-
-This option specifies if Tidy should combine class names to generate a
-single new class name, if multiple class assignments are detected on an
-element.
-
-
-.rj 1
-\fBSee also\fR: \fIjoin-styles\fR, \fIrepeated-attributes\fR
-.TP
-\fBjoin-styles\fR
-
-Type: \fIBoolean\fR
-.br
-Default: \fIyes\fR
-.br
-Example: \fIy/n, yes/no, t/f, true/false, 1/0\fR
-
-This option specifies if Tidy should combine styles to generate a
-single new style, if multiple style values are detected on an element.
-
-
-.rj 1
-\fBSee also\fR: \fIjoin-classes\fR, \fIrepeated-attributes\fR
-.TP
-\fBliteral-attributes\fR
-
-Type: \fIBoolean\fR
-.br
-Default: \fIno\fR
-.br
-Example: \fIy/n, yes/no, t/f, true/false, 1/0\fR
-
-This option specifies if Tidy should ensure that whitespace characters
-within attribute values are passed through unchanged.
-.TP
-\fBlogical-emphasis\fR
-
-Type: \fIBoolean\fR
-.br
-Default: \fIno\fR
-.br
-Example: \fIy/n, yes/no, t/f, true/false, 1/0\fR
-
-This option specifies if Tidy should replace any occurrence of <I> by
-<EM> and any occurrence of <B> by <STRONG>. In both cases, the
-attributes are preserved unchanged. This option can be set
-independently of the clean and drop-font-tags options.
-.TP
-\fBlower-literals\fR
-
-Type: \fIBoolean\fR
-.br
-Default: \fIyes\fR
-.br
-Example: \fIy/n, yes/no, t/f, true/false, 1/0\fR
-
-This option specifies if Tidy should convert the value of an attribute
-that takes a list of predefined values to lower case. This is required
-for XHTML documents.
-.TP
-\fBmerge-divs\fR
-
-Type: \fIAutoBool\fR
-.br
-Default: \fIauto\fR
-.br
-Example: \fIauto, y/n, yes/no, t/f, true/false, 1/0\fR
-
-Can be used to modify behavior of -c (--clean yes) option. This option
-specifies if Tidy should merge nested <div> such as
-"<div><div>...</div></div>". If set to "auto", the attributes of the
-inner <div> are moved to the outer one. As well, nested <div> with ID
-attributes are not merged. If set to "yes", the attributes of the inner
-<div> are discarded with the exception of "class" and "style".
-
-
-.rj 1
-\fBSee also\fR: \fIclean\fR
-.TP
-\fBncr\fR
-
-Type: \fIBoolean\fR
-.br
-Default: \fIyes\fR
-.br
-Example: \fIy/n, yes/no, t/f, true/false, 1/0\fR
-
-This option specifies if Tidy should allow numeric character
-references.
-.TP
-\fBnew-blocklevel-tags\fR
-
-Type: \fITag names\fR
-.br
-Default: \fI-\fR
-.br
-Example: \fItagX, tagY, ...\fR
-
-This option specifies new block-level tags. This option takes a space
-or comma separated list of tag names. Unless you declare new tags, Tidy
-will refuse to generate a tidied file if the input includes previously
-unknown tags. Note you can't change the content model for elements such
-as <TABLE>, <UL>, <OL> and <DL>.
-
-
-.rj 1
-\fBSee also\fR: \fInew-empty-tags\fR, \fInew-inline-tags\fR,
-\fInew-pre-tags\fR
-.TP
-\fBnew-empty-tags\fR
-
-Type: \fITag names\fR
-.br
-Default: \fI-\fR
-.br
-Example: \fItagX, tagY, ...\fR
-
-This option specifies new empty inline tags. This option takes a space
-or comma separated list of tag names. Unless you declare new tags, Tidy
-will refuse to generate a tidied file if the input includes previously
-unknown tags. Remember to also declare empty tags as either inline or
-blocklevel.
-
-
-.rj 1
-\fBSee also\fR: \fInew-blocklevel-tags\fR, \fInew-inline-tags\fR,
-\fInew-pre-tags\fR
-.TP
-\fBnew-inline-tags\fR
-
-Type: \fITag names\fR
-.br
-Default: \fI-\fR
-.br
-Example: \fItagX, tagY, ...\fR
-
-This option specifies new non-empty inline tags. This option takes a
-space or comma separated list of tag names. Unless you declare new
-tags, Tidy will refuse to generate a tidied file if the input includes
-previously unknown tags.
-
-
-.rj 1
-\fBSee also\fR: \fInew-blocklevel-tags\fR, \fInew-empty-tags\fR,
-\fInew-pre-tags\fR
-.TP
-\fBnew-pre-tags\fR
-
-Type: \fITag names\fR
-.br
-Default: \fI-\fR
-.br
-Example: \fItagX, tagY, ...\fR
-
-This option specifies new tags that are to be processed in exactly the
-same way as HTML's <PRE> element. This option takes a space or comma
-separated list of tag names. Unless you declare new tags, Tidy will
-refuse to generate a tidied file if the input includes previously
-unknown tags. Note you can not as yet add new CDATA elements (similar
-to <SCRIPT>).
-
-
-.rj 1
-\fBSee also\fR: \fInew-blocklevel-tags\fR, \fInew-empty-tags\fR,
-\fInew-inline-tags\fR
-.TP
-\fBnumeric-entities\fR
-
-Type: \fIBoolean\fR
-.br
-Default: \fIno\fR
-.br
-Example: \fIy/n, yes/no, t/f, true/false, 1/0\fR
-
-This option specifies if Tidy should output entities other than the
-built-in HTML entities (&, <, > and ") in the numeric
-rather than the named entity form.
-
-
-.rj 1
-\fBSee also\fR: \fIdoctype\fR
-.TP
-\fBoutput-html\fR
-
-Type: \fIBoolean\fR
-.br
-Default: \fIno\fR
-.br
-Example: \fIy/n, yes/no, t/f, true/false, 1/0\fR
-
-This option specifies if Tidy should generate pretty printed output,
-writing it as HTML.
-.TP
-\fBoutput-xhtml\fR
-
-Type: \fIBoolean\fR
-.br
-Default: \fIno\fR
-.br
-Example: \fIy/n, yes/no, t/f, true/false, 1/0\fR
-
-This option specifies if Tidy should generate pretty printed output,
-writing it as extensible HTML. This option causes Tidy to set the
-DOCTYPE and default namespace as appropriate to XHTML. If a DOCTYPE or
-namespace is given they will checked for consistency with the content
-of the document. In the case of an inconsistency, the corrected values
-will appear in the output. For XHTML, entities can be written as named
-or numeric entities according to the setting of the "numeric-entities"
-option. The original case of tags and attributes will be preserved,
-regardless of other options.
-.TP
-\fBoutput-xml\fR
-
-Type: \fIBoolean\fR
-.br
-Default: \fIno\fR
-.br
-Example: \fIy/n, yes/no, t/f, true/false, 1/0\fR
-
-This option specifies if Tidy should pretty print output, writing it as
-well-formed XML. Any entities not defined in XML 1.0 will be written as
-numeric entities to allow them to be parsed by a XML parser. The
-original case of tags and attributes will be preserved, regardless of
-other options.
-.TP
-\fBquote-ampersand\fR
-
-Type: \fIBoolean\fR
-.br
-Default: \fIyes\fR
-.br
-Example: \fIy/n, yes/no, t/f, true/false, 1/0\fR
-
-This option specifies if Tidy should output unadorned & characters as
-&.
-.TP
-\fBquote-marks\fR
-
-Type: \fIBoolean\fR
-.br
-Default: \fIno\fR
-.br
-Example: \fIy/n, yes/no, t/f, true/false, 1/0\fR
-
-This option specifies if Tidy should output " characters as " as
-is preferred by some editing environments. The apostrophe character '
-is written out as ' since many web browsers don't yet support
-'.
-.TP
-\fBquote-nbsp\fR
-
-Type: \fIBoolean\fR
-.br
-Default: \fIyes\fR
-.br
-Example: \fIy/n, yes/no, t/f, true/false, 1/0\fR
-
-This option specifies if Tidy should output non-breaking space
-characters as entities, rather than as the Unicode character value 160
-(decimal).
-.TP
-\fBrepeated-attributes\fR
-
-Type: \fIenum\fR
-.br
-Default: \fIkeep-last\fR
-.br
-Example: \fIkeep-first, keep-last\fR
-
-This option specifies if Tidy should keep the first or last attribute,
-if an attribute is repeated, e.g. has two align attributes.
-
-
-.rj 1
-\fBSee also\fR: \fIjoin-classes\fR, \fIjoin-styles\fR
-.TP
-\fBreplace-color\fR
-
-Type: \fIBoolean\fR
-.br
-Default: \fIno\fR
-.br
-Example: \fIy/n, yes/no, t/f, true/false, 1/0\fR
-
-This option specifies if Tidy should replace numeric values in color
-attributes by HTML/XHTML color names where defined, e.g. replace
-"#ffffff" with "white".
-.TP
-\fBshow-body-only\fR
-
-Type: \fIBoolean\fR
-.br
-Default: \fIno\fR
-.br
-Example: \fIy/n, yes/no, t/f, true/false, 1/0\fR
-
-This option specifies if Tidy should print only the contents of the
-body tag as an HTML fragment. Useful for incorporating existing whole
-pages as a portion of another page.
-.TP
-\fBuppercase-attributes\fR
-
-Type: \fIBoolean\fR
-.br
-Default: \fIno\fR
-.br
-Example: \fIy/n, yes/no, t/f, true/false, 1/0\fR
-
-This option specifies if Tidy should output attribute names in upper
-case. The default is no, which results in lower case attribute names,
-except for XML input, where the original case is preserved.
-.TP
-\fBuppercase-tags\fR
-
-Type: \fIBoolean\fR
-.br
-Default: \fIno\fR
-.br
-Example: \fIy/n, yes/no, t/f, true/false, 1/0\fR
-
-This option specifies if Tidy should output tag names in upper case.
-The default is no, which results in lower case tag names, except for
-XML input, where the original case is preserved.
-.TP
-\fBword-2000\fR
-
-Type: \fIBoolean\fR
-.br
-Default: \fIno\fR
-.br
-Example: \fIy/n, yes/no, t/f, true/false, 1/0\fR
-
-This option specifies if Tidy should go to great pains to strip out all
-the surplus stuff Microsoft Word 2000 inserts when you save Word
-documents as "Web pages". Doesn't handle embedded images or VML. You
-should consider using Word's "Save As: Web Page, Filtered".
-.SS Diagnostics options:
-
-.TP
-\fBaccessibility-check\fR
-
-Type: \fIenum\fR
-.br
-Default: \fI0 (Tidy Classic)\fR
-.br
-Example: \fI0 (Tidy Classic), 1 (Priority 1 Checks), 2 (Priority 2
-Checks), 3 (Priority 3 Checks)\fR
-
-This option specifies what level of accessibility checking, if any,
-that Tidy should do. Level 0 is equivalent to Tidy Classic's
-accessibility checking. For more information on Tidy's accessibility
-checking, visit the Adaptive Technology Resource Centre at the
-University of Toronto at
-\fIhttp://www.aprompt.ca/Tidy/accessibilitychecks.html\fR.
-.TP
-\fBshow-errors\fR
-
-Type: \fIInteger\fR
-.br
-Default: \fI6\fR
-.br
-Example: \fI0, 1, 2, ...\fR
-
-This option specifies the number Tidy uses to determine if further
-errors should be shown. If set to 0, then no errors are shown.
-.TP
-\fBshow-warnings\fR
-
-Type: \fIBoolean\fR
-.br
-Default: \fIyes\fR
-.br
-Example: \fIy/n, yes/no, t/f, true/false, 1/0\fR
-
-This option specifies if Tidy should suppress warnings. This can be
-useful when a few errors are hidden in a flurry of warnings.
-.SS Pretty Print options:
-
-.TP
-\fBbreak-before-br\fR
-
-Type: \fIBoolean\fR
-.br
-Default: \fIno\fR
-.br
-Example: \fIy/n, yes/no, t/f, true/false, 1/0\fR
-
-This option specifies if Tidy should output a line break before each
-<BR> element.
-.TP
-\fBindent\fR
-
-Type: \fIAutoBool\fR
-.br
-Default: \fIno\fR
-.br
-Example: \fIauto, y/n, yes/no, t/f, true/false, 1/0\fR
-
-This option specifies if Tidy should indent block-level tags. If set to
-"auto", this option causes Tidy to decide whether or not to indent the
-content of tags such as TITLE, H1-H6, LI, TD, TD, or P depending on
-whether or not the content includes a block-level element. You are
-advised to avoid setting indent to yes as this can expose layout bugs
-in some browsers.
-
-
-.rj 1
-\fBSee also\fR: \fIindent-spaces\fR
-.TP
-\fBindent-attributes\fR
-
-Type: \fIBoolean\fR
-.br
-Default: \fIno\fR
-.br
-Example: \fIy/n, yes/no, t/f, true/false, 1/0\fR
-
-This option specifies if Tidy should begin each attribute on a new
-line.
-.TP
-\fBindent-spaces\fR
-
-Type: \fIInteger\fR
-.br
-Default: \fI2\fR
-.br
-Example: \fI0, 1, 2, ...\fR
-
-This option specifies the number of spaces Tidy uses to indent content,
-when indentation is enabled.
-
-
-.rj 1
-\fBSee also\fR: \fIindent\fR
-.TP
-\fBmarkup\fR
-
-Type: \fIBoolean\fR
-.br
-Default: \fIyes\fR
-.br
-Example: \fIy/n, yes/no, t/f, true/false, 1/0\fR
-
-This option specifies if Tidy should generate a pretty printed version
-of the markup. Note that Tidy won't generate a pretty printed version
-if it finds significant errors (see force-output).
-.TP
-\fBpunctuation-wrap\fR
-
-Type: \fIBoolean\fR
-.br
-Default: \fIno\fR
-.br
-Example: \fIy/n, yes/no, t/f, true/false, 1/0\fR
-
-This option specifies if Tidy should line wrap after some Unicode or
-Chinese punctuation characters.
-.TP
-\fBsplit\fR
-
-Type: \fIBoolean\fR
-.br
-Default: \fIno\fR
-.br
-Example: \fIy/n, yes/no, t/f, true/false, 1/0\fR
-
-Currently not used. Tidy Classic only.
-.TP
-\fBtab-size\fR
-
-Type: \fIInteger\fR
-.br
-Default: \fI8\fR
-.br
-Example: \fI0, 1, 2, ...\fR
-
-This option specifies the number of columns that Tidy uses between
-successive tab stops. It is used to map tabs to spaces when reading the
-input. Tidy never outputs tabs.
-.TP
-\fBvertical-space\fR
-
-Type: \fIBoolean\fR
-.br
-Default: \fIno\fR
-.br
-Example: \fIy/n, yes/no, t/f, true/false, 1/0\fR
-
-This option specifies if Tidy should add some empty lines for
-readability.
-.TP
-\fBwrap\fR
-
-Type: \fIInteger\fR
-.br
-Default: \fI68\fR
-.br
-Example: \fI0 (no wrapping), 1, 2, ...\fR
-
-This option specifies the right margin Tidy uses for line wrapping.
-Tidy tries to wrap lines so that they do not exceed this length. Set
-wrap to zero if you want to disable line wrapping.
-.TP
-\fBwrap-asp\fR
-
-Type: \fIBoolean\fR
-.br
-Default: \fIyes\fR
-.br
-Example: \fIy/n, yes/no, t/f, true/false, 1/0\fR
-
-This option specifies if Tidy should line wrap text contained within
-ASP pseudo elements, which look like: <% ... %>.
-.TP
-\fBwrap-attributes\fR
-
-Type: \fIBoolean\fR
-.br
-Default: \fIno\fR
-.br
-Example: \fIy/n, yes/no, t/f, true/false, 1/0\fR
-
-This option specifies if Tidy should line wrap attribute values, for
-easier editing. This option can be set independently of
-wrap-script-literals.
-
-
-.rj 1
-\fBSee also\fR: \fIwrap-script-literals\fR
-.TP
-\fBwrap-jste\fR
-
-Type: \fIBoolean\fR
-.br
-Default: \fIyes\fR
-.br
-Example: \fIy/n, yes/no, t/f, true/false, 1/0\fR
-
-This option specifies if Tidy should line wrap text contained within
-JSTE pseudo elements, which look like: <# ... #>.
-.TP
-\fBwrap-php\fR
-
-Type: \fIBoolean\fR
-.br
-Default: \fIyes\fR
-.br
-Example: \fIy/n, yes/no, t/f, true/false, 1/0\fR
-
-This option specifies if Tidy should line wrap text contained within
-PHP pseudo elements, which look like: <?php ... ?>.
-.TP
-\fBwrap-script-literals\fR
-
-Type: \fIBoolean\fR
-.br
-Default: \fIno\fR
-.br
-Example: \fIy/n, yes/no, t/f, true/false, 1/0\fR
-
-This option specifies if Tidy should line wrap string literals that
-appear in script attributes. Tidy wraps long script string literals by
-inserting a backslash character before the line break.
-
-
-.rj 1
-\fBSee also\fR: \fIwrap-attributes\fR
-.TP
-\fBwrap-sections\fR
-
-Type: \fIBoolean\fR
-.br
-Default: \fIyes\fR
-.br
-Example: \fIy/n, yes/no, t/f, true/false, 1/0\fR
-
-This option specifies if Tidy should line wrap text contained within
-<![ ... ]> section tags.
-.SS Character Encoding options:
-
-.TP
-\fBascii-chars\fR
-
-Type: \fIBoolean\fR
-.br
-Default: \fIno\fR
-.br
-Example: \fIy/n, yes/no, t/f, true/false, 1/0\fR
-
-Can be used to modify behavior of -c (--clean yes) option. If set to
-"yes" when using -c, &emdash;, ”, and other named character
-entities are downgraded to their closest ascii equivalents.
-
-
-.rj 1
-\fBSee also\fR: \fIclean\fR
-.TP
-\fBchar-encoding\fR
-
-Type: \fIEncoding\fR
-.br
-Default: \fIascii\fR
-.br
-Example: \fIraw, ascii, latin0, latin1, utf8, iso2022, mac, win1252,
-ibm858, utf16le, utf16be, utf16, big5, shiftjis\fR
-
-This option specifies the character encoding Tidy uses for both the
-input and output. For ascii, Tidy will accept Latin-1 (ISO-8859-1)
-character values, but will use entities for all characters whose value
-> 127. For raw, Tidy will output values above 127 without translating
-them into entities. For latin1, characters above 255 will be written as
-entities. For utf8, Tidy assumes that both input and output is encoded
-as UTF-8. You can use iso2022 for files encoded using the ISO-2022
-family of encodings e.g. ISO-2022-JP. For mac and win1252, Tidy will
-accept vendor specific character values, but will use entities for all
-characters whose value > 127.
-
-
-.rj 1
-\fBSee also\fR: \fIinput-encoding\fR, \fIoutput-encoding\fR
-.TP
-\fBinput-encoding\fR
-
-Type: \fIEncoding\fR
-.br
-Default: \fIlatin1\fR
-.br
-Example: \fIraw, ascii, latin0, latin1, utf8, iso2022, mac, win1252,
-ibm858, utf16le, utf16be, utf16, big5, shiftjis\fR
-
-This option specifies the character encoding Tidy uses for the input.
-See char-encoding for more info.
-
-
-.rj 1
-\fBSee also\fR: \fIchar-encoding\fR
-.TP
-\fBlanguage\fR
-
-Type: \fIString\fR
-.br
-Default: \fI-\fR
-.br
-Default: \fI-\fR
-
-Currently not used, but this option specifies the language Tidy uses
-(for instance "en").
-.TP
-\fBnewline\fR
-
-Type: \fIenum\fR
-.br
-Default: \fI\fIPlatform dependent\fR\fR
-.br
-Example: \fILF, CRLF, CR\fR
-
-The default is appropriate to the current platform: CRLF on PC-DOS,
-MS-Windows and OS/2, CR on Classic Mac OS, and LF everywhere else (Unix
-and Linux).
-.TP
-\fBoutput-bom\fR
-
-Type: \fIAutoBool\fR
-.br
-Default: \fIauto\fR
-.br
-Example: \fIauto, y/n, yes/no, t/f, true/false, 1/0\fR
-
-This option specifies if Tidy should write a Unicode Byte Order Mark
-character (BOM; also known as Zero Width No-Break Space; has value of
-U+FEFF) to the beginning of the output; only for UTF-8 and UTF-16
-output encodings. If set to "auto", this option causes Tidy to write a
-BOM to the output only if a BOM was present at the beginning of the
-input. A BOM is always written for XML/XHTML output using UTF-16 output
-encodings.
-.TP
-\fBoutput-encoding\fR
-
-Type: \fIEncoding\fR
-.br
-Default: \fIascii\fR
-.br
-Example: \fIraw, ascii, latin0, latin1, utf8, iso2022, mac, win1252,
-ibm858, utf16le, utf16be, utf16, big5, shiftjis\fR
-
-This option specifies the character encoding Tidy uses for the output.
-See char-encoding for more info. May only be different from
-input-encoding for Latin encodings (ascii, latin0, latin1, mac,
-win1252, ibm858).
-
-
-.rj 1
-\fBSee also\fR: \fIchar-encoding\fR
-.SS Miscellaneous options:
-
-.TP
-\fBerror-file\fR
-
-Type: \fIString\fR
-.br
-Default: \fI-\fR
-.br
-Default: \fI-\fR
-
-This option specifies the error file Tidy uses for errors and warnings.
-Normally errors and warnings are output to "stderr".
-
-
-.rj 1
-\fBSee also\fR: \fIoutput-file\fR
-.TP
-\fBforce-output\fR
-
-Type: \fIBoolean\fR
-.br
-Default: \fIno\fR
-.br
-Example: \fIy/n, yes/no, t/f, true/false, 1/0\fR
-
-This option specifies if Tidy should produce output even if errors are
-encountered. Use this option with care - if Tidy reports an error, this
-means Tidy was not able to, or is not sure how to, fix the error, so
-the resulting output may not reflect your intention.
-.TP
-\fBgnu-emacs\fR
-
-Type: \fIBoolean\fR
-.br
-Default: \fIno\fR
-.br
-Example: \fIy/n, yes/no, t/f, true/false, 1/0\fR
-
-This option specifies if Tidy should change the format for reporting
-errors and warnings to a format that is more easily parsed by GNU
-Emacs.
-.TP
-\fBgnu-emacs-file\fR
-
-Type: \fIString\fR
-.br
-Default: \fI-\fR
-.br
-Default: \fI-\fR
-
-Used internally.
-.TP
-\fBkeep-time\fR
-
-Type: \fIBoolean\fR
-.br
-Default: \fIno\fR
-.br
-Example: \fIy/n, yes/no, t/f, true/false, 1/0\fR
-
-This option specifies if Tidy should keep the original modification
-time of files that Tidy modifies in place. The default is no. Setting
-the option to yes allows you to tidy files without causing these files
-to be uploaded to a web server when using a tool such as SiteCopy. Note
-this feature is not supported on some platforms.
-.TP
-\fBoutput-file\fR
-
-Type: \fIString\fR
-.br
-Default: \fI-\fR
-.br
-Default: \fI-\fR
-
-This option specifies the output file Tidy uses for markup. Normally
-markup is written to "stdout".
-
-
-.rj 1
-\fBSee also\fR: \fIerror-file\fR
-.TP
-\fBquiet\fR
-
-Type: \fIBoolean\fR
-.br
-Default: \fIno\fR
-.br
-Example: \fIy/n, yes/no, t/f, true/false, 1/0\fR
-
-This option specifies if Tidy should output the summary of the numbers
-of errors and warnings, or the welcome or informational messages.
-.TP
-\fBslide-style\fR
-
-Type: \fIString\fR
-.br
-Default: \fI-\fR
-.br
-Default: \fI-\fR
-
-Currently not used. Tidy Classic only.
-.TP
-\fBtidy-mark\fR
-
-Type: \fIBoolean\fR
-.br
-Default: \fIyes\fR
-.br
-Example: \fIy/n, yes/no, t/f, true/false, 1/0\fR
-
-This option specifies if Tidy should add a meta element to the document
-head to indicate that the document has been tidied. Tidy won't add a
-meta element if one is already present.
-.TP
-\fBwrite-back\fR
-
-Type: \fIBoolean\fR
-.br
-Default: \fIno\fR
-.br
-Example: \fIy/n, yes/no, t/f, true/false, 1/0\fR
-
-This option specifies if Tidy should write back the tidied markup to
-the same file it read from. You are advised to keep copies of important
-files before tidying them, as on rare occasions the result may not be
-what you expect.
-.SH "SEE ALSO"
-HTML Tidy Project Page at \fIhttp://tidy.sourceforge.net\fR
-.SH AUTHOR
-\fBTidy\fR was written by Dave Raggett <\[email protected]\fR>, and is now
-maintained and developed by the Tidy team at
-\fIhttp://tidy.sourceforge.net/\fR. It is released under the \fIMIT
-Licence\fR.
-.LP
-Generated automatically with HTML Tidy released on 1 September 2005.
Binary file usr/src/lib/tidy/doc.html.tar.gz has changed
--- a/usr/src/lib/tidy/install-sfw Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,73 +0,0 @@
-#! /usr/bin/sh
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#ident "@(#)install-sfw 1.1 07/07/26 SMI"
-
-VERS=tidy-1.0.0
-
-PREFIX=${ROOT}/usr
-LIBDIR=${PREFIX}/lib
-INCDIR=${PREFIX}/include/tidy
-BINDIR=${PREFIX}/bin
-DOCDIR=${PREFIX}/share/doc/tidy
-MAN1DIR=${PREFIX}/share/man/man1
-MAN3DIR=${PREFIX}/share/man/man3
-ROOTMAN1DIR=${MAN1DIR}
-ROOTMAN3DIR=${MAN3DIR}
-TOP=`pwd`
-
-MANSCRIPT=../sunman-stability
-. ${SRC}/tools/install.subr
-
-cd ${VERS}
-
-_install E console/.libs/tab2space ${BINDIR}/tab2space 0555
-_install E console/.libs/tidy ${BINDIR}/tidy 0555
-
-_install N include/buffio.h ${INCDIR}/buffio.h 0644
-_install N include/platform.h ${INCDIR}/platform.h 0644
-_install N include/tidy.h ${INCDIR}/tidy.h 0644
-_install N include/tidyenum.h ${INCDIR}/tidyenum.h 0644
-
-_install D src/.libs/libtidy-1.0.so.0.0.0 ${LIBDIR}/libtidy-1.0.so.0.0.0 0755
-_install L libtidy-1.0.so.0.0.0 ${LIBDIR}/libtidy-1.0.so.0
-_install L libtidy-1.0.so.0.0.0 ${LIBDIR}/libtidy-1.0.so
-_install L libtidy-1.0.so.0.0.0 ${LIBDIR}/libtidy.so
-
-_install N ../llib-ltidy ${LIBDIR}/llib-ltidy 0644
-_install N llib-ltidy.ln ${LIBDIR}/llib-ltidy.ln 0644
-
-_install M ../Solaris/tidy.1 ${MAN1DIR}/tidy.1 0644
-_install M ../Solaris/tab2space.1 ${MAN1DIR}/tab2space.1 0644
-_install M ../Solaris/libtidy.3 ${MAN3DIR}/libtidy.3 0644
-
-cd ${TOP}
-rm -rf ${DOCDIR}/html
-gzip -cd doc.html.tar | (cd ${DOCDIR} ; tar fx -)
-cd ${DOCDIR}
-find . -type f -exec chmod 0444 {} \;
-find . -type d -exec chmod 0755 {} \;
-cd ${TOP}
-
--- a/usr/src/lib/tidy/install-sfw-64 Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-#! /usr/bin/sh
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#ident "@(#)install-sfw-64 1.1 07/07/26 SMI"
-#
-
-VERS=tidy-1.0.0-64
-
-PREFIX=${ROOT}/usr
-LIBDIR=${PREFIX}/lib/${MACH64} # MACH64 passed in by makefile
-
-. ${SRC}/tools/install.subr
-
-cd ${VERS}
-
-_install D src/.libs/libtidy-1.0.so.0.0.0 ${LIBDIR}/libtidy-1.0.so.0.0.0 0755
-_install L libtidy-1.0.so.0.0.0 ${LIBDIR}/libtidy-1.0.so.0
-_install L libtidy-1.0.so.0.0.0 ${LIBDIR}/libtidy-1.0.so
-_install L libtidy-1.0.so.0.0.0 ${LIBDIR}/libtidy.so
-
-_install N llib-ltidy.ln ${LIBDIR}/llib-ltidy.ln 0644
-
--- a/usr/src/lib/tidy/llib-ltidy Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License (the "License").
- * You may not use this file except in compliance with the License.
- *
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- */
-
-/*
- * Copyright 2007 Sun Microsystems, Inc. All rights reserved.
- * Use is subject to license terms.
- */
-
-#pragma ident "@(#)llib-ltidy 1.1 07/07/26 SMI"
-
-/* LINTLIBRARY */
-/* PROTOLIB1 */
-
-/*
- * This little dance is necessary to avoid ftello/fseeko
- * complaints vs libc. We don't use them but we do #include
- * stdio.h and as we are large file aware they get defined
- * differently than libc.
- */
-#include <sys/types.h>
-#include <tidy.h>
--- a/usr/src/lib/tidy/sunman-stability Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-1i\
-'\\" t\
-\.\\"\
-\.\\" Modified for Solaris to to add the Solaris stability classification,\
-\.\\" and to add a note about source availability.\
-\.\\"\
-$a\
-\.\\" Begin Sun update\
-.SH ATTRIBUTES\
-See\
-.BR attributes (5)\
-for descriptions of the following attributes:\
-.sp\
-.TS\
-box;\
-cbp-1 | cbp-1\
-l | l .\
-ATTRIBUTE TYPE ATTRIBUTE VALUE\
-=\
-Availability text/tidy \
-=\
-Interface Stability Uncommitted \
-.TE \
-.PP\
-.SH NOTES\
-Source for Tidy is available on http://opensolaris.org.\
-\.\\" End Sun update
Binary file usr/src/lib/tidy/tidy-1.0.0.tar.gz has changed
--- a/usr/src/pkgdefs/Makefile Thu Jun 16 03:22:51 2011 -0700
+++ b/usr/src/pkgdefs/Makefile Fri Jul 15 23:48:44 2011 -0700
@@ -22,7 +22,7 @@
#
# Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
#
-# ident "@(#)Makefile 1.300 11/06/02 SMI"
+# ident "@(#)Makefile 1.301 11/06/15 SMI"
#
#
@@ -35,15 +35,13 @@
i386_SUBDIRS=
-COMMON_SUBDIRS= \
- SUNWaalib \
- SUNWactivation \
- SUNWaget \
+# These are not built, they're just here as exception lists
+# for things we have to still build for use by other really
+# packaged things
+NOT_BUILT = \
SUNWapch22d \
SUNWapch22r \
SUNWapch22u \
- SUNWapch22m-php52 \
- SUNWapch22r-php52 \
SUNWapch22m-fcgid \
SUNWapch22r-fcgid \
SUNWapch22m-jk \
@@ -56,7 +54,14 @@
SUNWapch22r-sed \
SUNWapch22m-xml2enc \
SUNWapch22m-proxy-html \
- SUNWapch22r-proxy-html \
+ SUNWapch22r-proxy-html
+
+COMMON_SUBDIRS= \
+ SUNWaalib \
+ SUNWactivation \
+ SUNWaget \
+ SUNWapch22m-php52 \
+ SUNWapch22r-php52 \
SUNWareca \
SUNWawstats \
SUNWbcc \
@@ -103,7 +108,6 @@
SUNWjrexx \
SUNWjunit \
SUNWkonkretcmpi \
- SUNWlexpt \
SUNWlibconfuse \
SUNWlibmcrypt \
SUNWlibmemcached \
@@ -112,7 +116,6 @@
SUNWlibpcap \
SUNWlibosip2 \
SUNWlibrsync \
- SUNWlibsndfile \
SUNWlibstdcxx4 \
SUNWlibxmlrpc-c \
SUNWlibyaz \
@@ -143,9 +146,6 @@
SUNWopenssl-libraries \
SUNWopenssl-man \
SUNWopensslr \
- SUNWpampkcs11r \
- SUNWpampkcs11u \
- SUNWpampkcs11-docs \
SUNWpconsoler \
SUNWpconsole \
SUNWpdsh \
@@ -195,13 +195,8 @@
SUNWslrn \
SUNWsnack \
SUNWspawn-fcgi \
- SUNWstunnelr \
- SUNWstunnelu \
- SUNWsudor \
- SUNWsudou \
SUNWsysbench \
SUNWtcltls \
- SUNWtidy \
SUNWtrove \
SUNWquaggar \
SUNWquaggau \
--- a/usr/src/pkgdefs/Makefile.prtarg Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-#
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# ident "@(#)Makefile.prtarg 1.3 06/03/18 SMI"
-#
-# Copyright 2004 by Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-
-#
-# To create package install scripts from templates
-#
-
-preinstall: preinstall.tmpl ../awk_procedure
- $(RM) $@; nawk -f ../awk_procedure [email protected] >$@
-
-postinstall: postinstall.tmpl ../awk_procedure
- $(RM) $@; nawk -f ../awk_procedure [email protected] >$@
-
-preremove: preremove.tmpl ../awk_procedure
- $(RM) $@; nawk -f ../awk_procedure [email protected] >$@
-
-postremove: postremove.tmpl ../awk_procedure
- $(RM) $@; nawk -f ../awk_procedure [email protected] >$@
--- a/usr/src/pkgdefs/SUNWlexpt/Makefile Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-#
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#ident "@(#)Makefile 1.3 06/03/18 SMI"
-#
-# Copyright 2004 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-
-include ../Makefile.com
-
-DATAFILES += depend
-
-.KEEP_STATE:
-
-all: $(FILES)
-install: all pkg
-
-include ../Makefile.targ
--- a/usr/src/pkgdefs/SUNWlexpt/copyright Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd
- and Clark Cooper
-Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006 Expat maintainers.
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
--- a/usr/src/pkgdefs/SUNWlexpt/pkginfo.tmpl Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-#
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-#ident "@(#)pkginfo.tmpl 1.6 10/07/22 SMI"
-#
-#
-# This required package information file describes characteristics of the
-# package, such as package abbreviation, full package name, package version,
-# and package architecture.
-#
-PKG="SUNWlexpt"
-NAME="libexpat - XML parser library"
-ARCH="ISA"
-VERSION="SFWVERS,REV=0.0.0"
-SUNW_PRODNAME="SunOS"
-SUNW_PRODVERS="RELEASE/VERSION"
-SUNW_PKGTYPE="usr"
-MAXINST="1000"
-CATEGORY="system"
-DESC="libexpat - XML parser library 2.0.1"
-VENDOR="COMPANY"
-HOTLINE="Please contact your local service provider"
-EMAIL=""
-CLASSES="none"
-BASEDIR=/
-SUNW_PKGVERS="1.0"
-SUNW_PKG_ALLZONES="false"
-SUNW_PKG_HOLLOW="false"
-SUNW_PKG_THISZONE="false"
-#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>"
--- a/usr/src/pkgdefs/SUNWlexpt/prototype_com Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-#
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#ident "@(#)prototype_com 1.5 07/08/31 SMI"
-#
-# 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 pkginfo
-i copyright
-i depend
-# source locations relative to the prototype file
-#
-# SUNWlexpt
-#
-d none usr 0755 root sys
-d none usr/include 755 root bin
-f none usr/include/expat.h 444 root bin
-f none usr/include/expat_external.h 444 root bin
-d none usr/lib 0755 root bin
-f none usr/lib/libexpat.so.1.5.2 555 root bin
-s none usr/lib/libexpat.so=libexpat.so.1.5.2 555 root bin
-s none usr/lib/libexpat.so.0=libexpat.so.1.5.2 555 root bin
-s none usr/lib/libexpat.so.1=libexpat.so.1.5.2 555 root bin
--- a/usr/src/pkgdefs/SUNWlexpt/prototype_i386 Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-#
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#pragma ident "@(#)prototype_i386 1.5 07/08/31 SMI"
-#
-# 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
-#
-#
-# SUNWlexpt
-#
-d none usr/lib/amd64 0755 root bin
-f none usr/lib/amd64/libexpat.so.1.5.2 555 root bin
-s none usr/lib/amd64/libexpat.so=libexpat.so.1.5.2 555 root bin
-s none usr/lib/amd64/libexpat.so.0=libexpat.so.1.5.2 555 root bin
-s none usr/lib/amd64/libexpat.so.1=libexpat.so.1.5.2 555 root bin
-
--- a/usr/src/pkgdefs/SUNWlexpt/prototype_sparc Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-#
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#ident "@(#)prototype_sparc 1.4 07/08/31 SMI"
-#
-# 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
-#
-#
-# SUNWlexpt
-#
-d none usr/lib/sparcv9 0755 root bin
-f none usr/lib/sparcv9/libexpat.so.1.5.2 555 root bin
-s none usr/lib/sparcv9/libexpat.so=libexpat.so.1.5.2 555 root bin
-s none usr/lib/sparcv9/libexpat.so.0=libexpat.so.1.5.2 555 root bin
-s none usr/lib/sparcv9/libexpat.so.1=libexpat.so.1.5.2 555 root bin
--- a/usr/src/pkgdefs/SUNWlibsndfile/Makefile Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-#
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#pragma ident "@(#)Makefile 1.1 09/01/13 SMI"
-
-include ../Makefile.com
-
-.KEEP_STATE:
-
-all: $(FILES)
-install: all pkg
-
-include ../Makefile.targ
--- a/usr/src/pkgdefs/SUNWlibsndfile/copyright Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,519 +0,0 @@
-Sun elects to have this package available under and governed by the
-Lesser General Public License v2.1 (LGPLv2.1)
-
--------------------------------------------------------------------
-
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified. Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
-
--------------------------------------------------------------------
-
- GNU LESSER GENERAL PUBLIC LICENSE
- Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL. It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
- This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it. You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
- When we speak of free software, we are referring to freedom of use,
-not price. Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
- To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights. These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
- For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you. You must make sure that they, too, receive or can get the source
-code. If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it. And you must show them these terms so they know their rights.
-
- We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
- To protect each distributor, we want to make it very clear that
-there is no warranty for the free library. Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
- Finally, software patents pose a constant threat to the existence of
-any free program. We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder. Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
- Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License. This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License. We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
- When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library. The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom. The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
- We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License. It also provides other free software developers Less
-of an advantage over competing non-free programs. These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries. However, the Lesser license provides advantages in certain
-special circumstances.
-
- For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard. To achieve this, non-free programs must be
-allowed to use the library. A more frequent case is that a free
-library does the same job as widely used non-free libraries. In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
- In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software. For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
- Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
- The precise terms and conditions for copying, distribution and
-modification follow. Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library". The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
- GNU LESSER GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
- A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
- The "Library", below, refers to any such software library or work
-which has been distributed under these terms. A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language. (Hereinafter, translation is
-included without limitation in the term "modification".)
-
- "Source code" for a work means the preferred form of the work for
-making modifications to it. For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
- Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it). Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
- 1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
- You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
- 2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) The modified work must itself be a software library.
-
- b) You must cause the files modified to carry prominent notices
- stating that you changed the files and the date of any change.
-
- c) You must cause the whole of the work to be licensed at no
- charge to all third parties under the terms of this License.
-
- d) If a facility in the modified Library refers to a function or a
- table of data to be supplied by an application program that uses
- the facility, other than as an argument passed when the facility
- is invoked, then you must make a good faith effort to ensure that,
- in the event an application does not supply such function or
- table, the facility still operates, and performs whatever part of
- its purpose remains meaningful.
-
- (For example, a function in a library to compute square roots has
- a purpose that is entirely well-defined independent of the
- application. Therefore, Subsection 2d requires that any
- application-supplied function or table used by this function must
- be optional: if the application does not supply it, the square
- root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library. To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License. (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.) Do not make any other change in
-these notices.
-
- Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
- This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
- 4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
- If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library". Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
- However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library". The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
- When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library. The
-threshold for this to be true is not precisely defined by law.
-
- If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work. (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
- Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
- 6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
- You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License. You must supply a copy of this License. If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License. Also, you must do one
-of these things:
-
- a) Accompany the work with the complete corresponding
- machine-readable source code for the Library including whatever
- changes were used in the work (which must be distributed under
- Sections 1 and 2 above); and, if the work is an executable linked
- with the Library, with the complete machine-readable "work that
- uses the Library", as object code and/or source code, so that the
- user can modify the Library and then relink to produce a modified
- executable containing the modified Library. (It is understood
- that the user who changes the contents of definitions files in the
- Library will not necessarily be able to recompile the application
- to use the modified definitions.)
-
- b) Use a suitable shared library mechanism for linking with the
- Library. A suitable mechanism is one that (1) uses at run time a
- copy of the library already present on the user's computer system,
- rather than copying library functions into the executable, and (2)
- will operate properly with a modified version of the library, if
- the user installs one, as long as the modified version is
- interface-compatible with the version that the work was made with.
-
- c) Accompany the work with a written offer, valid for at
- least three years, to give the same user the materials
- specified in Subsection 6a, above, for a charge no more
- than the cost of performing this distribution.
-
- d) If distribution of the work is made by offering access to copy
- from a designated place, offer equivalent access to copy the above
- specified materials from the same place.
-
- e) Verify that the user has already received a copy of these
- materials or that you have already sent this user a copy.
-
- For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it. However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
- It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system. Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
- 7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
- a) Accompany the combined library with a copy of the same work
- based on the Library, uncombined with any other library
- facilities. This must be distributed under the terms of the
- Sections above.
-
- b) Give prominent notice with the combined library of the fact
- that part of it is a work based on the Library, and explaining
- where to find the accompanying uncombined form of the same work.
-
- 8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License. Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License. However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
- 9. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Library or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
- 10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
- 11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all. For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded. In such case, this License incorporates the limitation as if
-written in the body of this License.
-
- 13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation. If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
- 14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission. For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this. Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
- NO WARRANTY
-
- 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
- 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Libraries
-
- If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change. You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
- To apply these terms, attach the following notices to the library. It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
- <one line to give the library's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the
- library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
- <signature of Ty Coon>, 1 April 1990
- Ty Coon, President of Vice
-
-That's all there is to it!
-
--- a/usr/src/pkgdefs/SUNWlibsndfile/depend Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#pragma ident "@(#)depend 1.1 09/01/13 SMI"
-#
-# 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 SUNWcakr Core Solaris Kernel Architecture (Root)
-P SUNWkvm Core Architecture, (Kvm)
-P SUNWcsr Core Solaris, (Root)
-P SUNWckr Core Solaris Kernel (Root)
-P SUNWcnetr Core Solaris Network Infrastructure (Root)
-P SUNWcsu Core Solaris, (Usr)
-P SUNWcsd Core Solaris Devices
-P SUNWcsl Core Solaris Libraries
-
-# libsndfile uses libFLAC and libogg
-P SUNWflac Free Lossless Audio Codec
-P SUNWogg-vorbis Ogg bitstream and Vorbis audio codec libraries
-P SUNWsqlite3 SQLite3
-P SUNWlibmsr Math & Microtasking Libraries (Root)
-
--- a/usr/src/pkgdefs/SUNWlibsndfile/pkginfo.tmpl Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-#
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-#ident "@(#)pkginfo.tmpl 1.3 10/11/24 SMI"
-#
-# This required package information file describes characteristics of the
-# package, such as package abbreviation, full package name, package version,
-# and package architecture.
-#
-PKG="SUNWlibsndfile"
-NAME="libsndfile"
-ARCH="ISA"
-VERSION="SFWVERS,REV=0.0.0"
-SUNW_PRODNAME="SunOS"
-SUNW_PRODVERS="RELEASE/VERSION"
-SUNW_PKGTYPE="usr"
-MAXINST="1000"
-CATEGORY="system"
-DESC="libsndfile - a library for reading/writing sound files (1.0.23)"
-VENDOR="COMPANY"
-HOTLINE="Please contact your local service provider"
-EMAIL=""
-CLASSES="none"
-BASEDIR=/
-SUNW_PKGVERS="1.0"
-SUNW_PKG_ALLZONES="false"
-SUNW_PKG_HOLLOW="false"
-SUNW_PKG_THISZONE="false"
-#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>"
--- a/usr/src/pkgdefs/SUNWlibsndfile/prototype_com Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,95 +0,0 @@
-#
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-#pragma ident "@(#)prototype_com 1.2 10/11/24 SMI"
-#
-#
-# 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 pkginfo
-i copyright
-i depend
-
-# source locations relative to the prototype file
-#
-# SUNWlibsndfile
-#
-d none usr 755 root sys
-d none usr/lib 755 root bin
-f none usr/lib/libsndfile.so.1.0.23 555 root bin
-s none usr/lib/libsndfile.so=libsndfile.so.1.0.23
-s none usr/lib/libsndfile.so.1=libsndfile.so.1.0.23
-
-d none usr/lib/pkgconfig 755 root other
-f none usr/lib/pkgconfig/sndfile.pc 444 root bin
-
-d none usr/include 755 root bin
-f none usr/include/sndfile.h 444 root bin
-f none usr/include/sndfile.hh 444 root bin
-
-d none usr/share 755 root sys
-d none usr/share/man 755 root bin
-d none usr/share/man/man1 755 root bin
-f none usr/share/man/man1/sndfile-info.1 444 root bin
-f none usr/share/man/man1/sndfile-play.1 444 root bin
-f none usr/share/man/man1/sndfile-convert.1 444 root bin
-
-d none usr/share/doc 755 root other
-d none usr/share/doc/libsndfile 755 root bin
-d none usr/share/doc/libsndfile/html 755 root bin
-f none usr/share/doc/libsndfile/html/libsndfile.jpg 444 root bin
-f none usr/share/doc/libsndfile/html/libsndfile.css 444 root bin
-f none usr/share/doc/libsndfile/html/api.html 444 root bin
-f none usr/share/doc/libsndfile/html/command.html 444 root bin
-f none usr/share/doc/libsndfile/html/bugs.html 444 root bin
-f none usr/share/doc/libsndfile/html/sndfile_info.html 444 root bin
-f none usr/share/doc/libsndfile/html/new_file_type.HOWTO 444 root bin
-f none usr/share/doc/libsndfile/html/pkgconfig.html 444 root bin
-f none usr/share/doc/libsndfile/html/win32.html 444 root bin
-f none usr/share/doc/libsndfile/html/FAQ.html 444 root bin
-f none usr/share/doc/libsndfile/html/lists.html 444 root bin
-f none usr/share/doc/libsndfile/html/embedded_files.html 444 root bin
-f none usr/share/doc/libsndfile/html/octave.html 444 root bin
-f none usr/share/doc/libsndfile/html/dither.html 444 root bin
-
-d none usr/share/octave 755 root bin
-d none usr/share/octave/site 755 root bin
-d none usr/share/octave/site/m 755 root bin
-f none usr/share/octave/site/m/sndfile_load.m 444 root bin
-f none usr/share/octave/site/m/sndfile_save.m 444 root bin
-f none usr/share/octave/site/m/sndfile_play.m 444 root bin
-
-d none usr/bin 755 root bin
-f none usr/bin/sndfile-info 555 root bin
-f none usr/bin/sndfile-play 555 root bin
-f none usr/bin/sndfile-convert 555 root bin
-f none usr/bin/sndfile-regtest 555 root bin
--- a/usr/src/pkgdefs/SUNWlibsndfile/prototype_i386 Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-#
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-#pragma ident "@(#)prototype_i386 1.2 10/11/24 SMI"
-#
-#
-# 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
-#
-# SUNWlibsndfile
-#
-d none usr/lib/amd64 755 root bin
-f none usr/lib/amd64/libsndfile.so.1.0.23 555 root bin
-s none usr/lib/amd64/libsndfile.so=libsndfile.so.1.0.23
-s none usr/lib/amd64/libsndfile.so.1=libsndfile.so.1.0.23
--- a/usr/src/pkgdefs/SUNWlibsndfile/prototype_sparc Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-#
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-#pragma ident "@(#)prototype_sparc 1.2 10/11/24 SMI"
-#
-#
-# 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
-#
-# SUNWlibsndfile
-d none usr/lib/sparcv9 755 root bin
-f none usr/lib/sparcv9/libsndfile.so.1.0.23 555 root bin
-s none usr/lib/sparcv9/libsndfile.so=libsndfile.so.1.0.23
-s none usr/lib/sparcv9/libsndfile.so.1=libsndfile.so.1.0.23
--- a/usr/src/pkgdefs/SUNWpampkcs11-docs/Makefile Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#ident "@(#)Makefile 1.1 08/05/20 SMI"
-#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-include ../Makefile.com
-
-DATAFILES= depend
-
-.KEEP_STATE:
-
-all: $(FILES)
-install: all pkg
-
-include ../Makefile.targ
--- a/usr/src/pkgdefs/SUNWpampkcs11-docs/copyright Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,514 +0,0 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified. Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
------------------------------------------------------------------------
-
- GNU LESSER GENERAL PUBLIC LICENSE
- Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL. It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
- This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it. You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
- When we speak of free software, we are referring to freedom of use,
-not price. Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
- To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights. These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
- For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you. You must make sure that they, too, receive or can get the source
-code. If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it. And you must show them these terms so they know their rights.
-
- We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
- To protect each distributor, we want to make it very clear that
-there is no warranty for the free library. Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
- Finally, software patents pose a constant threat to the existence of
-any free program. We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder. Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
- Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License. This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License. We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
- When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library. The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom. The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
- We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License. It also provides other free software developers Less
-of an advantage over competing non-free programs. These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries. However, the Lesser license provides advantages in certain
-special circumstances.
-
- For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard. To achieve this, non-free programs must be
-allowed to use the library. A more frequent case is that a free
-library does the same job as widely used non-free libraries. In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
- In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software. For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
- Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
- The precise terms and conditions for copying, distribution and
-modification follow. Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library". The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
- GNU LESSER GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
- A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
- The "Library", below, refers to any such software library or work
-which has been distributed under these terms. A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language. (Hereinafter, translation is
-included without limitation in the term "modification".)
-
- "Source code" for a work means the preferred form of the work for
-making modifications to it. For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
- Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it). Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
- 1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
- You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
- 2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) The modified work must itself be a software library.
-
- b) You must cause the files modified to carry prominent notices
- stating that you changed the files and the date of any change.
-
- c) You must cause the whole of the work to be licensed at no
- charge to all third parties under the terms of this License.
-
- d) If a facility in the modified Library refers to a function or a
- table of data to be supplied by an application program that uses
- the facility, other than as an argument passed when the facility
- is invoked, then you must make a good faith effort to ensure that,
- in the event an application does not supply such function or
- table, the facility still operates, and performs whatever part of
- its purpose remains meaningful.
-
- (For example, a function in a library to compute square roots has
- a purpose that is entirely well-defined independent of the
- application. Therefore, Subsection 2d requires that any
- application-supplied function or table used by this function must
- be optional: if the application does not supply it, the square
- root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library. To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License. (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.) Do not make any other change in
-these notices.
-
- Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
- This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
- 4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
- If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library". Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
- However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library". The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
- When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library. The
-threshold for this to be true is not precisely defined by law.
-
- If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work. (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
- Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
- 6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
- You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License. You must supply a copy of this License. If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License. Also, you must do one
-of these things:
-
- a) Accompany the work with the complete corresponding
- machine-readable source code for the Library including whatever
- changes were used in the work (which must be distributed under
- Sections 1 and 2 above); and, if the work is an executable linked
- with the Library, with the complete machine-readable "work that
- uses the Library", as object code and/or source code, so that the
- user can modify the Library and then relink to produce a modified
- executable containing the modified Library. (It is understood
- that the user who changes the contents of definitions files in the
- Library will not necessarily be able to recompile the application
- to use the modified definitions.)
-
- b) Use a suitable shared library mechanism for linking with the
- Library. A suitable mechanism is one that (1) uses at run time a
- copy of the library already present on the user's computer system,
- rather than copying library functions into the executable, and (2)
- will operate properly with a modified version of the library, if
- the user installs one, as long as the modified version is
- interface-compatible with the version that the work was made with.
-
- c) Accompany the work with a written offer, valid for at
- least three years, to give the same user the materials
- specified in Subsection 6a, above, for a charge no more
- than the cost of performing this distribution.
-
- d) If distribution of the work is made by offering access to copy
- from a designated place, offer equivalent access to copy the above
- specified materials from the same place.
-
- e) Verify that the user has already received a copy of these
- materials or that you have already sent this user a copy.
-
- For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it. However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
- It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system. Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
- 7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
- a) Accompany the combined library with a copy of the same work
- based on the Library, uncombined with any other library
- facilities. This must be distributed under the terms of the
- Sections above.
-
- b) Give prominent notice with the combined library of the fact
- that part of it is a work based on the Library, and explaining
- where to find the accompanying uncombined form of the same work.
-
- 8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License. Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License. However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
- 9. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Library or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
- 10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
- 11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all. For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded. In such case, this License incorporates the limitation as if
-written in the body of this License.
-
- 13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation. If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
- 14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission. For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this. Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
- NO WARRANTY
-
- 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
- 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Libraries
-
- If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change. You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
- To apply these terms, attach the following notices to the library. It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
- <one line to give the library's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the
- library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
- <signature of Ty Coon>, 1 April 1990
- Ty Coon, President of Vice
-
-That's all there is to it!
-
-
--- a/usr/src/pkgdefs/SUNWpampkcs11-docs/pkginfo.tmpl Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-#
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-#ident "@(#)pkginfo.tmpl 1.2 10/07/22 SMI"
-#
-#
-# This required package information file describes characteristics of the
-# package, such as package abbreviation, full package name, package version,
-# and package architecture.
-#
-PKG="SUNWpampkcs11-docs"
-NAME="The OpenSC PKCS#11 PAM Login Tools"
-ARCH="ISA"
-VERSION="SFWVERS,REV=0.0.0"
-SUNW_PRODNAME="SunOS"
-SUNW_PRODVERS="RELEASE/VERSION"
-SUNW_PKGTYPE="usr"
-MAXINST="1000"
-CATEGORY="system"
-DESC="The OpenSC PKCS#11 PAM Login Tools 0.6.0"
-VENDOR="COMPANY"
-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>"
--- a/usr/src/pkgdefs/SUNWpampkcs11-docs/prototype_com Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#ident "@(#)prototype_com 1.1 08/05/20 SMI"
-#
-# SUNWpampkcs11-docs
-#
-# packaging files
-i pkginfo
-i depend
-i copyright
-#
-d none usr 755 root sys
-d none usr/share 755 root sys
-d none usr/share/doc 755 root other
-d none usr/share/doc/pam_pkcs11 755 root bin
-f none usr/share/doc/pam_pkcs11/pam_pkcs11.html 0444 root bin
-f none usr/share/doc/pam_pkcs11/mappers_api.html 0444 root bin
--- a/usr/src/pkgdefs/SUNWpampkcs11-docs/prototype_i386 Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#ident "@(#)prototype_i386 1.1 08/05/20 SMI"
-#
-# 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
-#
-# SUNWpampkcs11-docs
-#
--- a/usr/src/pkgdefs/SUNWpampkcs11-docs/prototype_sparc Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#ident "@(#)prototype_sparc 1.1 08/05/20 SMI"
-#
-# 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
-#
-# SUNWpampkcs11-docs
-#
--- a/usr/src/pkgdefs/SUNWpampkcs11r/Makefile Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-#
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#ident "@(#)Makefile 1.2 08/07/22 SMI"
-#
-
-include ../Makefile.com
-
-DATAFILES = i.preserve
-
-.KEEP_STATE:
-
-all: $(FILES)
-install: all pkg
-
-include ../Makefile.targ
--- a/usr/src/pkgdefs/SUNWpampkcs11r/copyright Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,514 +0,0 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified. Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
------------------------------------------------------------------------
-
- GNU LESSER GENERAL PUBLIC LICENSE
- Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL. It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
- This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it. You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
- When we speak of free software, we are referring to freedom of use,
-not price. Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
- To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights. These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
- For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you. You must make sure that they, too, receive or can get the source
-code. If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it. And you must show them these terms so they know their rights.
-
- We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
- To protect each distributor, we want to make it very clear that
-there is no warranty for the free library. Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
- Finally, software patents pose a constant threat to the existence of
-any free program. We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder. Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
- Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License. This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License. We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
- When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library. The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom. The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
- We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License. It also provides other free software developers Less
-of an advantage over competing non-free programs. These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries. However, the Lesser license provides advantages in certain
-special circumstances.
-
- For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard. To achieve this, non-free programs must be
-allowed to use the library. A more frequent case is that a free
-library does the same job as widely used non-free libraries. In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
- In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software. For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
- Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
- The precise terms and conditions for copying, distribution and
-modification follow. Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library". The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
- GNU LESSER GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
- A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
- The "Library", below, refers to any such software library or work
-which has been distributed under these terms. A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language. (Hereinafter, translation is
-included without limitation in the term "modification".)
-
- "Source code" for a work means the preferred form of the work for
-making modifications to it. For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
- Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it). Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
- 1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
- You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
- 2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) The modified work must itself be a software library.
-
- b) You must cause the files modified to carry prominent notices
- stating that you changed the files and the date of any change.
-
- c) You must cause the whole of the work to be licensed at no
- charge to all third parties under the terms of this License.
-
- d) If a facility in the modified Library refers to a function or a
- table of data to be supplied by an application program that uses
- the facility, other than as an argument passed when the facility
- is invoked, then you must make a good faith effort to ensure that,
- in the event an application does not supply such function or
- table, the facility still operates, and performs whatever part of
- its purpose remains meaningful.
-
- (For example, a function in a library to compute square roots has
- a purpose that is entirely well-defined independent of the
- application. Therefore, Subsection 2d requires that any
- application-supplied function or table used by this function must
- be optional: if the application does not supply it, the square
- root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library. To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License. (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.) Do not make any other change in
-these notices.
-
- Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
- This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
- 4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
- If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library". Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
- However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library". The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
- When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library. The
-threshold for this to be true is not precisely defined by law.
-
- If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work. (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
- Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
- 6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
- You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License. You must supply a copy of this License. If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License. Also, you must do one
-of these things:
-
- a) Accompany the work with the complete corresponding
- machine-readable source code for the Library including whatever
- changes were used in the work (which must be distributed under
- Sections 1 and 2 above); and, if the work is an executable linked
- with the Library, with the complete machine-readable "work that
- uses the Library", as object code and/or source code, so that the
- user can modify the Library and then relink to produce a modified
- executable containing the modified Library. (It is understood
- that the user who changes the contents of definitions files in the
- Library will not necessarily be able to recompile the application
- to use the modified definitions.)
-
- b) Use a suitable shared library mechanism for linking with the
- Library. A suitable mechanism is one that (1) uses at run time a
- copy of the library already present on the user's computer system,
- rather than copying library functions into the executable, and (2)
- will operate properly with a modified version of the library, if
- the user installs one, as long as the modified version is
- interface-compatible with the version that the work was made with.
-
- c) Accompany the work with a written offer, valid for at
- least three years, to give the same user the materials
- specified in Subsection 6a, above, for a charge no more
- than the cost of performing this distribution.
-
- d) If distribution of the work is made by offering access to copy
- from a designated place, offer equivalent access to copy the above
- specified materials from the same place.
-
- e) Verify that the user has already received a copy of these
- materials or that you have already sent this user a copy.
-
- For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it. However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
- It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system. Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
- 7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
- a) Accompany the combined library with a copy of the same work
- based on the Library, uncombined with any other library
- facilities. This must be distributed under the terms of the
- Sections above.
-
- b) Give prominent notice with the combined library of the fact
- that part of it is a work based on the Library, and explaining
- where to find the accompanying uncombined form of the same work.
-
- 8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License. Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License. However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
- 9. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Library or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
- 10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
- 11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all. For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded. In such case, this License incorporates the limitation as if
-written in the body of this License.
-
- 13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation. If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
- 14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission. For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this. Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
- NO WARRANTY
-
- 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
- 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Libraries
-
- If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change. You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
- To apply these terms, attach the following notices to the library. It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
- <one line to give the library's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the
- library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
- <signature of Ty Coon>, 1 April 1990
- Ty Coon, President of Vice
-
-That's all there is to it!
-
-
--- a/usr/src/pkgdefs/SUNWpampkcs11r/depend Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# ident "@(#)depend 1.1 08/07/22 SMI"
-#
-# 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 SUNWcakr Core Solaris Kernel Architecture (Root)
-P SUNWkvm Core Architecture, (Kvm)
-P SUNWcsr Core Solaris, (Root)
-P SUNWckr Core Solaris Kernel (Root)
-P SUNWcnetr Core Solaris Network Infrastructure (Root)
-P SUNWcsu Core Solaris, (Usr)
-P SUNWcsd Core Solaris Devices
-P SUNWcsl Core Solaris Libraries
-P SUNWbash GNU Bourne-Again shell (bash)
--- a/usr/src/pkgdefs/SUNWpampkcs11r/pkginfo.tmpl Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-#
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-#ident "@(#)pkginfo.tmpl 1.2 10/07/22 SMI"
-#
-# This required package information file describes characteristics of the
-# package, such as package abbreviation, full package name, package version,
-# and package architecture.
-#
-PKG="SUNWpampkcs11r"
-NAME="The OpenSC PKCS#11 PAM Login Tools"
-ARCH="ISA"
-VERSION="SFWVERS,REV=0.0.0"
-SUNW_PRODNAME="SunOS"
-SUNW_PRODVERS="RELEASE/VERSION"
-SUNW_PKGTYPE="root"
-MAXINST="1000"
-CATEGORY="system"
-DESC="The OpenSC PKCS#11 PAM Login Tools 0.6.0"
-VENDOR="COMPANY"
-HOTLINE="Please contact your local service provider"
-EMAIL=""
-CLASSES="none preserve"
-BASEDIR=/
-SUNW_PKGVERS="1.0"
-SUNW_PKG_ALLZONES="false"
-SUNW_PKG_HOLLOW="false"
-SUNW_PKG_THISZONE="false"
-#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>"
--- a/usr/src/pkgdefs/SUNWpampkcs11r/prototype_com Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-#
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#ident "@(#)prototype_com 1.1 08/06/25 SMI"
-#
-# 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 pkginfo
-i copyright
-i depend
-
-# source locations relative to the prototype file
-#
-# SUNWpampkcs11r
-#
-d none etc 755 root sys
-d none etc/security 755 root sys
-d none etc/security/pam_pkcs11 755 root sys
-d none etc/security/pam_pkcs11/cacerts 755 root sys
-d none etc/security/pam_pkcs11/crls 755 root sys
-f none etc/security/pam_pkcs11/pam_pkcs11.conf 644 root sys
-f none etc/security/pam_pkcs11/digest_mapping.example 444 root sys
-f none etc/security/pam_pkcs11/subject_mapping.example 444 root sys
-f none etc/security/pam_pkcs11/mail_mapping.example 444 root sys
-f none etc/security/pam_pkcs11/make_hash_link.sh 755 root sys
--- a/usr/src/pkgdefs/SUNWpampkcs11r/prototype_i386 Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-#
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#ident "@(#)prototype_i386 1.1 08/05/20 SMI"
-#
-# 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
-#
-#
-# SUNWpampkcs11r - The OpenSC PKCS#11 PAM Login Tools 0.6.0
-#
-#
--- a/usr/src/pkgdefs/SUNWpampkcs11r/prototype_sparc Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-#
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#ident "@(#)prototype_sparc 1.1 08/05/20 SMI"
-#
-# 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
-#
-#
-# SUNWpampkcs11r - The OpenSC PKCS#11 PAM Login Tools 0.6.0
-#
-#
--- a/usr/src/pkgdefs/SUNWpampkcs11u/Makefile Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-#
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#ident "@(#)Makefile 1.1 08/05/30 SMI"
-#
-
-
-include ../Makefile.com
-
-
-.KEEP_STATE:
-
-all: $(FILES)
-install: all pkg
-
-include ../Makefile.targ
--- a/usr/src/pkgdefs/SUNWpampkcs11u/copyright Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,514 +0,0 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified. Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
------------------------------------------------------------------------
-
- GNU LESSER GENERAL PUBLIC LICENSE
- Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL. It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
- This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it. You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
- When we speak of free software, we are referring to freedom of use,
-not price. Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
- To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights. These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
- For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you. You must make sure that they, too, receive or can get the source
-code. If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it. And you must show them these terms so they know their rights.
-
- We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
- To protect each distributor, we want to make it very clear that
-there is no warranty for the free library. Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
- Finally, software patents pose a constant threat to the existence of
-any free program. We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder. Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
- Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License. This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License. We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
- When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library. The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom. The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
- We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License. It also provides other free software developers Less
-of an advantage over competing non-free programs. These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries. However, the Lesser license provides advantages in certain
-special circumstances.
-
- For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard. To achieve this, non-free programs must be
-allowed to use the library. A more frequent case is that a free
-library does the same job as widely used non-free libraries. In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
- In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software. For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
- Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
- The precise terms and conditions for copying, distribution and
-modification follow. Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library". The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
- GNU LESSER GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
- A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
- The "Library", below, refers to any such software library or work
-which has been distributed under these terms. A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language. (Hereinafter, translation is
-included without limitation in the term "modification".)
-
- "Source code" for a work means the preferred form of the work for
-making modifications to it. For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
- Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it). Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
- 1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
- You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
- 2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) The modified work must itself be a software library.
-
- b) You must cause the files modified to carry prominent notices
- stating that you changed the files and the date of any change.
-
- c) You must cause the whole of the work to be licensed at no
- charge to all third parties under the terms of this License.
-
- d) If a facility in the modified Library refers to a function or a
- table of data to be supplied by an application program that uses
- the facility, other than as an argument passed when the facility
- is invoked, then you must make a good faith effort to ensure that,
- in the event an application does not supply such function or
- table, the facility still operates, and performs whatever part of
- its purpose remains meaningful.
-
- (For example, a function in a library to compute square roots has
- a purpose that is entirely well-defined independent of the
- application. Therefore, Subsection 2d requires that any
- application-supplied function or table used by this function must
- be optional: if the application does not supply it, the square
- root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library. To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License. (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.) Do not make any other change in
-these notices.
-
- Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
- This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
- 4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
- If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library". Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
- However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library". The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
- When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library. The
-threshold for this to be true is not precisely defined by law.
-
- If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work. (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
- Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
- 6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
- You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License. You must supply a copy of this License. If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License. Also, you must do one
-of these things:
-
- a) Accompany the work with the complete corresponding
- machine-readable source code for the Library including whatever
- changes were used in the work (which must be distributed under
- Sections 1 and 2 above); and, if the work is an executable linked
- with the Library, with the complete machine-readable "work that
- uses the Library", as object code and/or source code, so that the
- user can modify the Library and then relink to produce a modified
- executable containing the modified Library. (It is understood
- that the user who changes the contents of definitions files in the
- Library will not necessarily be able to recompile the application
- to use the modified definitions.)
-
- b) Use a suitable shared library mechanism for linking with the
- Library. A suitable mechanism is one that (1) uses at run time a
- copy of the library already present on the user's computer system,
- rather than copying library functions into the executable, and (2)
- will operate properly with a modified version of the library, if
- the user installs one, as long as the modified version is
- interface-compatible with the version that the work was made with.
-
- c) Accompany the work with a written offer, valid for at
- least three years, to give the same user the materials
- specified in Subsection 6a, above, for a charge no more
- than the cost of performing this distribution.
-
- d) If distribution of the work is made by offering access to copy
- from a designated place, offer equivalent access to copy the above
- specified materials from the same place.
-
- e) Verify that the user has already received a copy of these
- materials or that you have already sent this user a copy.
-
- For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it. However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
- It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system. Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
- 7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
- a) Accompany the combined library with a copy of the same work
- based on the Library, uncombined with any other library
- facilities. This must be distributed under the terms of the
- Sections above.
-
- b) Give prominent notice with the combined library of the fact
- that part of it is a work based on the Library, and explaining
- where to find the accompanying uncombined form of the same work.
-
- 8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License. Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License. However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
- 9. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Library or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
- 10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
- 11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all. For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded. In such case, this License incorporates the limitation as if
-written in the body of this License.
-
- 13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation. If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
- 14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission. For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this. Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
- NO WARRANTY
-
- 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
- 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Libraries
-
- If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change. You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
- To apply these terms, attach the following notices to the library. It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
- <one line to give the library's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the
- library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
- <signature of Ty Coon>, 1 April 1990
- Ty Coon, President of Vice
-
-That's all there is to it!
-
-
--- a/usr/src/pkgdefs/SUNWpampkcs11u/depend Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#ident "@(#)depend 1.2 08/12/04 SMI"
-#
-# 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 SUNWcakr Core Solaris Kernel Architecture (Root)
-P SUNWkvm Core Architecture, (Kvm)
-P SUNWcsr Core Solaris, (Root)
-P SUNWckr Core Solaris Kernel (Root)
-P SUNWcnetr Core Solaris Network Infrastructure (Root)
-P SUNWcsu Core Solaris, (Usr)
-P SUNWcsd Core Solaris Devices
-P SUNWcsl Core Solaris Libraries
-P SUNWopensslr OpenSSL (Root)
-P SUNWopenssl-libraries OpenSSL Libraries (Usr)
-P SUNWpampkcs11r The OpenSC PKCS#11 PAM Login Tools (Root)
--- a/usr/src/pkgdefs/SUNWpampkcs11u/pkginfo.tmpl Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-#
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-#ident "@(#)pkginfo.tmpl 1.2 10/07/22 SMI"
-#
-#
-# This required package information file describes characteristics of the
-# package, such as package abbreviation, full package name, package version,
-# and package architecture.
-#
-PKG="SUNWpampkcs11u"
-NAME="The OpenSC PKCS#11 PAM Login Tools"
-ARCH="ISA"
-VERSION="SFWVERS,REV=0.0.0"
-SUNW_PRODNAME="SunOS"
-SUNW_PRODVERS="RELEASE/VERSION"
-SUNW_PKGTYPE="usr"
-MAXINST="1000"
-CATEGORY="system"
-DESC="The OpenSC PKCS#11 PAM Login Tools 0.6.0"
-VENDOR="COMPANY"
-HOTLINE="Please contact your local service provider"
-EMAIL=""
-CLASSES="none"
-BASEDIR=/
-SUNW_PKGVERS="1.0"
-SUNW_PKG_ALLZONES="false"
-SUNW_PKG_HOLLOW="false"
-SUNW_PKG_THISZONE="false"
-#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>"
--- a/usr/src/pkgdefs/SUNWpampkcs11u/prototype_com Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
-#
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#ident "@(#)prototype_com 1.1 08/06/25 SMI"
-#
-# 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 pkginfo
-i copyright
-i depend
-#
-# source locations relative to the prototype file
-#
-# SUNWpampkcs11u
-#
-d none usr 755 root sys
-d none usr/lib 755 root bin
-d none usr/lib/pam_pkcs11 755 root bin
-f none usr/lib/pam_pkcs11/ldap_mapper.so 755 root bin
-f none usr/lib/pam_pkcs11/opensc_mapper.so 755 root bin
-f none usr/lib/pam_pkcs11/openssh_mapper.so 755 root bin
-f none usr/lib/pam_pkcs11/pkcs11_inspect 555 root bin
-f none usr/lib/pam_pkcs11/pklogin_finder 555 root bin
-d none usr/lib/security 755 root bin
-f none usr/lib/security/pam_pkcs11.so 755 root bin
-d none usr/share 755 root sys
-d none usr/share/locale 755 root other
-d none usr/share/locale/fr 755 root other
-d none usr/share/locale/fr/LC_MESSAGES 755 root other
-f none usr/share/locale/fr/LC_MESSAGES/pam_pkcs11.mo 644 root sys
--- a/usr/src/pkgdefs/SUNWpampkcs11u/prototype_i386 Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-#
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#ident "@(#)prototype_i386 1.1 08/05/20 SMI"
-#
-# 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
-#
-#
-# SUNWpampkcs11u
-#
-d none usr/lib/security/amd64 755 root bin
-f none usr/lib/security/amd64/pam_pkcs11.so 755 root bin
-d none usr/lib/pam_pkcs11/amd64 755 root bin
-f none usr/lib/pam_pkcs11/amd64/ldap_mapper.so 755 root bin
-f none usr/lib/pam_pkcs11/amd64/opensc_mapper.so 755 root bin
-f none usr/lib/pam_pkcs11/amd64/openssh_mapper.so 755 root bin
--- a/usr/src/pkgdefs/SUNWpampkcs11u/prototype_sparc Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-#
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#ident "@(#)prototype_sparc 1.1 08/05/20 SMI"
-#
-# 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
-#
-#
-# SUNWpampkcs11u
-#
-d none usr/lib/security/sparcv9 755 root bin
-f none usr/lib/security/sparcv9/pam_pkcs11.so 755 root bin
-d none usr/lib/pam_pkcs11/sparcv9 755 root bin
-f none usr/lib/pam_pkcs11/sparcv9/ldap_mapper.so 755 root bin
-f none usr/lib/pam_pkcs11/sparcv9/opensc_mapper.so 755 root bin
-f none usr/lib/pam_pkcs11/sparcv9/openssh_mapper.so 755 root bin
--- a/usr/src/pkgdefs/SUNWstunnelr/Makefile Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-#
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#ident "@(#)Makefile 1.2 08/09/24 SMI"
-#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-
-include ../Makefile.com
-DATAFILES= depend
-
-.KEEP_STATE:
-
-all: $(FILES)
-install: all pkg
-
-include ../Makefile.targ
--- a/usr/src/pkgdefs/SUNWstunnelr/copyright Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,391 +0,0 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified. Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
-
-------------------------------------------------------------------------
-
-stunnel Universal SSL tunnel
-
-Copyright (C) 1998-2008 Michal Trojnara
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, see <http://www.gnu.org/licenses>.
-
-Linking stunnel statically or dynamically with other modules is making
-a combined work based on stunnel. Thus, the terms and conditions of the
-GNU General Public License cover the whole combination.
-
-In addition, as a special exception, the copyright holder of stunnel gives you
-permission to combine stunnel with free software programs or libraries that
-are released under the GNU LGPL and with code included in the standard release
-of OpenSSL under the OpenSSL License (or modified versions of such code, with
-unchanged license). You may copy and distribute such a system following the
-terms of the GNU GPL for stunnel and the licenses of the other code concerned.
-
-Note that people who make modified versions of stunnel are not obligated to
-grant this special exception for their modified versions; it is their choice
-whether to do so. The GNU General Public License gives permission to release
-a modified version without this exception; this exception also makes it
-possible to release a modified version which carries forward this exception.
-
-------------------------------------------------------------------------
-
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users. This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it. (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.) You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
- To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have. You must make sure that they, too, receive or can get the
-source code. And you must show them these terms so they know their
-rights.
-
- We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
- Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
- Finally, any free program is threatened constantly by software
-patents. We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary. To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
-
- GNU GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License. The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language. (Hereinafter, translation is included without limitation in
-the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
- 1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
- 2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) You must cause the modified files to carry prominent notices
- stating that you changed the files and the date of any change.
-
- b) You must cause any work that you distribute or publish, that in
- whole or in part contains or is derived from the Program or any
- part thereof, to be licensed as a whole at no charge to all third
- parties under the terms of this License.
-
- c) If the modified program normally reads commands interactively
- when run, you must cause it, when started running for such
- interactive use in the most ordinary way, to print or display an
- announcement including an appropriate copyright notice and a
- notice that there is no warranty (or else, saying that you provide
- a warranty) and that users may redistribute the program under
- these conditions, and telling the user how to view a copy of this
- License. (Exception: if the Program itself is interactive but
- does not normally print such an announcement, your work based on
- the Program is not required to print an announcement.)
-
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
- a) Accompany it with the complete corresponding machine-readable
- source code, which must be distributed under the terms of Sections
- 1 and 2 above on a medium customarily used for software interchange; or,
-
- b) Accompany it with a written offer, valid for at least three
- years, to give any third party, for a charge no more than your
- cost of physically performing source distribution, a complete
- machine-readable copy of the corresponding source code, to be
- distributed under the terms of Sections 1 and 2 above on a medium
- customarily used for software interchange; or,
-
- c) Accompany it with the information you received as to the offer
- to distribute corresponding source code. (This alternative is
- allowed only for noncommercial distribution and only if you
- received the program in object code or executable form with such
- an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it. For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable. However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-
- 4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License. Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
- 5. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Program or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
- 6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
- 7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all. For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-
- 8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded. In such case, this License incorporates
-the limitation as if written in the body of this License.
-
- 9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation. If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
- 10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission. For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this. Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
- NO WARRANTY
-
- 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
- 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
-
- Appendix: How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
- <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) 19yy <name of author>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
- Gnomovision version 69, Copyright (C) 19yy name of author
- Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the program
- `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
- <signature of Ty Coon>, 1 April 1989
- Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs. If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Library General
-Public License instead of this License.
-
--- a/usr/src/pkgdefs/SUNWstunnelr/pkginfo.tmpl Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-#
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-#ident "@(#)pkginfo.tmpl 1.3 10/07/22 SMI"
-#
-# This required package information file describes characteristics of the
-# package, such as package abbreviation, full package name, package version,
-# and package architecture.
-#
-PKG="SUNWstunnelr"
-NAME="stunnel root"
-ARCH="ISA"
-VERSION="SFWVERS,REV=0.0.0"
-SUNW_PRODNAME="SunOS"
-SUNW_PRODVERS="RELEASE/VERSION"
-SUNW_PKGTYPE="root"
-MAXINST="1000"
-CATEGORY="system"
-DESC="stunnel Universal SSL Wrapper"
-VENDOR="COMPANY"
-HOTLINE="Please contact your local service provider"
-EMAIL=""
-CLASSES="none manifest"
-BASEDIR=/
-SUNW_PKGVERS="1.0"
-SUNW_PKG_ALLZONES="false"
-SUNW_PKG_HOLLOW="false"
-SUNW_PKG_THISZONE="false"
-#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>"
--- a/usr/src/pkgdefs/SUNWstunnelr/prototype_com Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-#
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-#ident "@(#)prototype_com 1.5 10/04/22 SMI"
-#
-# 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 pkginfo
-i copyright
-i depend
-# source locations relative to the prototype file
-#
-# SUNWstunnelr - stunnel root components
-#
-d none lib 0755 root bin
-d none lib/svc 0755 root bin
-d none lib/svc/manifest 0755 root sys
-d none lib/svc/manifest/network 0755 root sys
-d none lib/svc/manifest/network/ssl 0755 root sys
-f manifest lib/svc/manifest/network/ssl/stunnel.xml 0444 root bin
-d none etc 755 root sys
-d none etc/stunnel 755 root sys
-f none etc/stunnel/stunnel.sample 444 root sys
-d none etc/security 755 root sys
-d none etc/security/auth_attr.d 755 root sys
-f none etc/security/auth_attr.d/stunnel 444 root sys
-d none etc/security/prof_attr.d 755 root sys
-f none etc/security/prof_attr.d/stunnel 444 root sys
--- a/usr/src/pkgdefs/SUNWstunnelr/prototype_i386 Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-#
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#ident "@(#)prototype_i386 1.1 08/07/09 SMI"
-#
-# 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
-#
-#
-# SUNWstunnelr
-#
--- a/usr/src/pkgdefs/SUNWstunnelr/prototype_sparc Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-#
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#ident "@(#)prototype_sparc 1.1 08/07/09 SMI"
-#
-# 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
-#
-#
-# SUNWstunnelr
-#
-#
--- a/usr/src/pkgdefs/SUNWstunnelu/Makefile Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-#
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#ident "@(#)Makefile 1.1 08/07/09 SMI"
-#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-
-include ../Makefile.com
-
-.KEEP_STATE:
-
-all: $(FILES)
-install: all pkg
-
-include ../Makefile.targ
--- a/usr/src/pkgdefs/SUNWstunnelu/copyright Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,391 +0,0 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified. Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
-
-------------------------------------------------------------------------
-
-stunnel Universal SSL tunnel
-
-Copyright (C) 1998-2008 Michal Trojnara
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, see <http://www.gnu.org/licenses>.
-
-Linking stunnel statically or dynamically with other modules is making
-a combined work based on stunnel. Thus, the terms and conditions of the
-GNU General Public License cover the whole combination.
-
-In addition, as a special exception, the copyright holder of stunnel gives you
-permission to combine stunnel with free software programs or libraries that
-are released under the GNU LGPL and with code included in the standard release
-of OpenSSL under the OpenSSL License (or modified versions of such code, with
-unchanged license). You may copy and distribute such a system following the
-terms of the GNU GPL for stunnel and the licenses of the other code concerned.
-
-Note that people who make modified versions of stunnel are not obligated to
-grant this special exception for their modified versions; it is their choice
-whether to do so. The GNU General Public License gives permission to release
-a modified version without this exception; this exception also makes it
-possible to release a modified version which carries forward this exception.
-
-------------------------------------------------------------------------
-
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users. This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it. (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.) You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
- To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have. You must make sure that they, too, receive or can get the
-source code. And you must show them these terms so they know their
-rights.
-
- We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
- Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
- Finally, any free program is threatened constantly by software
-patents. We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary. To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
-
- GNU GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License. The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language. (Hereinafter, translation is included without limitation in
-the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
- 1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
- 2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) You must cause the modified files to carry prominent notices
- stating that you changed the files and the date of any change.
-
- b) You must cause any work that you distribute or publish, that in
- whole or in part contains or is derived from the Program or any
- part thereof, to be licensed as a whole at no charge to all third
- parties under the terms of this License.
-
- c) If the modified program normally reads commands interactively
- when run, you must cause it, when started running for such
- interactive use in the most ordinary way, to print or display an
- announcement including an appropriate copyright notice and a
- notice that there is no warranty (or else, saying that you provide
- a warranty) and that users may redistribute the program under
- these conditions, and telling the user how to view a copy of this
- License. (Exception: if the Program itself is interactive but
- does not normally print such an announcement, your work based on
- the Program is not required to print an announcement.)
-
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
- a) Accompany it with the complete corresponding machine-readable
- source code, which must be distributed under the terms of Sections
- 1 and 2 above on a medium customarily used for software interchange; or,
-
- b) Accompany it with a written offer, valid for at least three
- years, to give any third party, for a charge no more than your
- cost of physically performing source distribution, a complete
- machine-readable copy of the corresponding source code, to be
- distributed under the terms of Sections 1 and 2 above on a medium
- customarily used for software interchange; or,
-
- c) Accompany it with the information you received as to the offer
- to distribute corresponding source code. (This alternative is
- allowed only for noncommercial distribution and only if you
- received the program in object code or executable form with such
- an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it. For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable. However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-
- 4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License. Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
- 5. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Program or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
- 6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
- 7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all. For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-
- 8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded. In such case, this License incorporates
-the limitation as if written in the body of this License.
-
- 9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation. If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
- 10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission. For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this. Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
- NO WARRANTY
-
- 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
- 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
-
- Appendix: How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
- <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) 19yy <name of author>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
- Gnomovision version 69, Copyright (C) 19yy name of author
- Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the program
- `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
- <signature of Ty Coon>, 1 April 1989
- Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs. If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Library General
-Public License instead of this License.
-
--- a/usr/src/pkgdefs/SUNWstunnelu/depend Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-#
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#ident "@(#)depend 1.2 08/12/04 SMI"
-#
-# 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 SUNWcakr Core Solaris Kernel Architecture (Root)
-P SUNWkvm Core Architecture, (Kvm)
-P SUNWcsr Core Solaris, (Root)
-P SUNWckr Core Solaris Kernel (Root)
-P SUNWcnetr Core Solaris Network Infrastructure (Root)
-P SUNWcsu Core Solaris, (Usr)
-P SUNWcsd Core Solaris Devices
-P SUNWcsl Core Solaris Libraries
-P SUNWopensslr OpenSSL (Root)
-P SUNWopenssl-libraries OpenSSL Libraries (Usr)
-P SUNWzlibr The Zip compression library (Root)
-P SUNWstunnelr SUNWstunnelr - stunnel root components
--- a/usr/src/pkgdefs/SUNWstunnelu/pkginfo.tmpl Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-#
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-#ident "@(#)pkginfo.tmpl 1.2 10/07/22 SMI"
-#
-# This required package information file describes characteristics of the
-# package, such as package abbreviation, full package name, package version,
-# and package architecture.
-#
-PKG="SUNWstunnelu"
-NAME="stunnel"
-ARCH="ISA"
-VERSION="SFWVERS,REV=0.0.0"
-SUNW_PRODNAME="SunOS"
-SUNW_PRODVERS="RELEASE/VERSION"
-SUNW_PKGTYPE="usr"
-MAXINST="1000"
-CATEGORY="system"
-DESC="stunnel Universal SSL Wrapper"
-VENDOR="COMPANY"
-HOTLINE="Please contact your local service provider"
-EMAIL=""
-CLASSES="none"
-BASEDIR=/
-SUNW_PKGVERS="1.0"
-SUNW_PKG_ALLZONES="false"
-SUNW_PKG_HOLLOW="false"
-SUNW_PKG_THISZONE="false"
-#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>"
--- a/usr/src/pkgdefs/SUNWstunnelu/prototype_com Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-#
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#ident "@(#)prototype_com 1.1 08/07/09 SMI"
-#
-# 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 pkginfo
-i copyright
-i depend
-# source locations relative to the prototype file
-#
-# SUNWstunnelu - stunnel usr components
-#
-
-d none usr 755 root sys
-d none usr/bin 755 root bin
-f none usr/bin/stunnel 555 root bin
-d none usr/share 755 root sys
-d none usr/share/man 755 root bin
-d none usr/share/man/man1 755 root bin
-f none usr/share/man/man1/stunnel.1 444 root bin
-d none usr/lib 755 root bin
-f none usr/lib/libstunnel.so 0555 root bin
--- a/usr/src/pkgdefs/SUNWstunnelu/prototype_i386 Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-#
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#ident "@(#)prototype_i386 1.1 08/07/09 SMI"
-#
-# 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
-#
-#
-# SUNWstunnelu
-#
--- a/usr/src/pkgdefs/SUNWstunnelu/prototype_sparc Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-#
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#ident "@(#)prototype_sparc 1.1 08/07/09 SMI"
-#
-# 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
-#
-#
-# SUNWstunnelu
-#
-#
--- a/usr/src/pkgdefs/SUNWsudor/Makefile Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# ident "@(#)Makefile 1.2 09/04/03 SMI"
-
-include ../Makefile.com
-
-DATAFILES= depend i.preserve
-
-.KEEP_STATE:
-
-all: $(FILES)
-install: all pkg
-
-include ../Makefile.targ
--- a/usr/src/pkgdefs/SUNWsudor/copyright Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,78 +0,0 @@
-Sudo is distributed under the following ISC-style license:
-
- Copyright (c) 1994-1996, 1998-2010
- Todd C. Miller <[email protected]>
-
- Permission to use, copy, modify, and distribute this software for any
- purpose with or without fee is hereby granted, provided that the above
- copyright notice and this permission notice appear in all copies.
-
- THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
- Sponsored in part by the Defense Advanced Research Projects
- Agency (DARPA) and Air Force Research Laboratory, Air Force
- Materiel Command, USAF, under agreement number F39502-99-1-0512.
-
-Additionally, fnmatch.c, fnmatch.h, getcwd.c, glob.c, glob.h and snprintf.c
-bear the following UCB license:
-
- Copyright (c) 1987, 1989, 1990, 1991, 1992, 1993, 1994
- The Regents of the University of California. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
- 3. Neither the name of the University nor the names of its contributors
- may be used to endorse or promote products derived from this software
- without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- SUCH DAMAGE.
-
-nonunix.h and vasgroups.c bear the following license:
-
- Copyright (c) 2006 Quest Software, Inc. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
-
- 1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
- 3. Neither the name of Quest Software, Inc. nor the names of its
- contributors may be used to endorse or promote products derived from
- this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- POSSIBILITY OF SUCH DAMAGE.
--- a/usr/src/pkgdefs/SUNWsudor/pkginfo.tmpl Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-# ident "@(#)pkginfo.tmpl 1.4 10/10/06 SMI"
-
-#
-#
-# This required package information file describes characteristics of the
-# package, such as package abbreviation, full package name, package version,
-# and package architecture.
-#
-PKG="SUNWsudor"
-NAME="sudo - Tool to allow certain tasks to be run as root by ordinary users (Root). "
-ARCH="ISA"
-VERSION="SFWVERS,REV=0.0.0"
-SUNW_PRODNAME="SunOS"
-SUNW_PRODVERS="RELEASE/VERSION"
-SUNW_PKGTYPE="root"
-MAXINST="1000"
-CATEGORY="system"
-DESC="sudo - Tool to allow certain tasks to be run as root by ordinary users (Root). 1.7.4p4"
-VENDOR="COMPANY"
-HOTLINE="Please contact your local service provider"
-EMAIL=""
-CLASSES="preserve none"
-BASEDIR=/
-SUNW_PKGVERS="1.0"
-SUNW_PKG_ALLZONES="false"
-SUNW_PKG_HOLLOW="false"
-SUNW_PKG_THISZONE="false"
-#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>"
--- a/usr/src/pkgdefs/SUNWsudor/prototype_com Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-# ident "@(#)prototype_com 1.3 10/10/06 SMI"
-#
-#
-# 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 pkginfo
-i i.preserve
-i depend
-i copyright
-#
-#
-# source locations relative to the prototype file
-#
-# SUNWsudor
-#
-d none etc 0755 root sys
-d none etc/sudoers.d 0750 root root
-e preserve etc/sudoers 0440 root root
--- a/usr/src/pkgdefs/SUNWsudor/prototype_i386 Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# ident "@(#)prototype_i386 1.1 08/08/18 SMI"
-
-#
-# 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
-#
-#
-# SUNWsudor
-#
--- a/usr/src/pkgdefs/SUNWsudor/prototype_sparc Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# ident "@(#)prototype_sparc 1.1 08/08/18 SMI"
-
-#
-# 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
-#
-#
-# SUNWsudor
-#
--- a/usr/src/pkgdefs/SUNWsudou/Makefile Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# ident "@(#)Makefile 1.1 08/08/18 SMI"
-
-include ../Makefile.com
-
-.KEEP_STATE:
-
-all: $(FILES)
-install: all pkg
-
-include ../Makefile.targ
--- a/usr/src/pkgdefs/SUNWsudou/copyright Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,78 +0,0 @@
-Sudo is distributed under the following ISC-style license:
-
- Copyright (c) 1994-1996, 1998-2010
- Todd C. Miller <[email protected]>
-
- Permission to use, copy, modify, and distribute this software for any
- purpose with or without fee is hereby granted, provided that the above
- copyright notice and this permission notice appear in all copies.
-
- THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
- Sponsored in part by the Defense Advanced Research Projects
- Agency (DARPA) and Air Force Research Laboratory, Air Force
- Materiel Command, USAF, under agreement number F39502-99-1-0512.
-
-Additionally, fnmatch.c, fnmatch.h, getcwd.c, glob.c, glob.h and snprintf.c
-bear the following UCB license:
-
- Copyright (c) 1987, 1989, 1990, 1991, 1992, 1993, 1994
- The Regents of the University of California. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
- 3. Neither the name of the University nor the names of its contributors
- may be used to endorse or promote products derived from this software
- without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- SUCH DAMAGE.
-
-nonunix.h and vasgroups.c bear the following license:
-
- Copyright (c) 2006 Quest Software, Inc. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
-
- 1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
- 3. Neither the name of Quest Software, Inc. nor the names of its
- contributors may be used to endorse or promote products derived from
- this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- POSSIBILITY OF SUCH DAMAGE.
--- a/usr/src/pkgdefs/SUNWsudou/depend Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# ident "@(#)depend 1.2 09/06/15 SMI"
-#
-# 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 SUNWcakr Core Solaris Kernel Architecture (Root)
-P SUNWkvm Core Architecture, (Kvm)
-P SUNWcsr Core Solaris, (Root)
-P SUNWckr Core Solaris Kernel (Root)
-P SUNWcnetr Core Solaris Network Infrastructure (Root)
-P SUNWcsu Core Solaris, (Usr)
-P SUNWcsd Core Solaris Devices
-P SUNWcsl Core Solaris Libraries
-P SUNWsudor sudo (Root)
-P SUNWperl584core Perl 5.8.4 (core)
--- a/usr/src/pkgdefs/SUNWsudou/pkginfo.tmpl Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-# ident "@(#)pkginfo.tmpl 1.3 10/10/06 SMI"
-#
-#
-# This required package information file describes characteristics of the
-# package, such as package abbreviation, full package name, package version,
-# and package architecture.
-#
-PKG="SUNWsudou"
-NAME="sudo - Tool to allow certain tasks to be run as root by ordinary users (usr)"
-ARCH="ISA"
-VERSION="SFWVERS,REV=0.0.0"
-SUNW_PRODNAME="SunOS"
-SUNW_PRODVERS="RELEASE/VERSION"
-SUNW_PKGTYPE="usr"
-MAXINST="1000"
-CATEGORY="system"
-DESC="sudo - Tool to allow certain tasks to be run as root by ordinary users (usr) 1.7.4p4"
-VENDOR="COMPANY"
-HOTLINE="Please contact your local service provider"
-EMAIL=""
-CLASSES="none"
-BASEDIR=/
-SUNW_PKGVERS="1.0"
-SUNW_PKG_ALLZONES="false"
-SUNW_PKG_HOLLOW="false"
-SUNW_PKG_THISZONE="false"
-#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>"
--- a/usr/src/pkgdefs/SUNWsudou/prototype_com Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,66 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-# ident "@(#)prototype_com 1.3 10/10/06 SMI"
-
-#
-# 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 pkginfo
-i copyright
-i depend
-#
-# source locations relative to the prototype file
-#
-# SUNWsudou
-#
-
-d none usr 0755 root sys
-d none usr/bin 0755 root bin
-f none usr/bin/sudo 4511 root bin
-l none usr/bin/sudoedit=sudo
-d none usr/lib 0755 root bin
-f none usr/lib/sudo_noexec.so 0755 root bin
-d none usr/sbin 0755 root bin
-f none usr/sbin/visudo 0511 root bin
-d none usr/share 0755 root sys
-d none usr/share/lib 0755 root sys
-d none usr/share/lib/ldif 0755 root sys
-f none usr/share/lib/ldif/sudo-schema.iPlanet 0444 root bin
-f none usr/share/lib/ldif/sudo-schema.OpenLDAP 0444 root bin
-f none usr/share/lib/ldif/sudoers2ldif 0444 root bin
-d none usr/share/man 0755 root bin
-d none usr/share/man/man1m 0755 root bin
-f none usr/share/man/man1m/sudo.1m 0444 root bin
-l none usr/share/man/man1m/sudoedit.1m=sudo.1m
-f none usr/share/man/man1m/visudo.1m 0444 root bin
-d none usr/share/man/man4 0755 root bin
-f none usr/share/man/man4/sudoers.4 0444 root bin
--- a/usr/src/pkgdefs/SUNWsudou/prototype_i386 Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# ident "@(#)prototype_i386 1.1 08/08/18 SMI"
-
-#
-# 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
-#
-#
-# SUNWsudou
-#
-d none usr/lib/amd64 0755 root bin
-f none usr/lib/amd64/sudo_noexec.so 0755 root bin
--- a/usr/src/pkgdefs/SUNWsudou/prototype_sparc Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# ident "@(#)prototype_sparc 1.1 08/08/18 SMI"
-
-#
-# 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
-#
-#
-# SUNWsudou
-#
-d none usr/lib/sparcv9 0755 root bin
-f none usr/lib/sparcv9/sudo_noexec.so 0755 root bin
--- a/usr/src/pkgdefs/SUNWtidy/Makefile Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# ident "@(#)Makefile 1.1 07/07/26 SMI"
-#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-
-include ../Makefile.com
-
-.KEEP_STATE:
-
-all: $(FILES)
-install: all pkg
-
-include ../Makefile.targ
--- a/usr/src/pkgdefs/SUNWtidy/copyright Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-HTML Tidy
-
-HTML parser and pretty printer
-
-Copyright (c) 1998-2003 World Wide Web Consortium
-(Massachusetts Institute of Technology, European Research
-Consortium for Informatics and Mathematics, Keio University).
-All Rights Reserved.
-
-This software and documentation is provided "as is," and
-the copyright holders and contributing author(s) make no
-representations or warranties, express or implied, including
-but not limited to, warranties of merchantability or fitness
-for any particular purpose or that the use of the software or
-documentation will not infringe any third party patents,
-copyrights, trademarks or other rights.
-
-The copyright holders and contributing author(s) will not be held
-liable for any direct, indirect, special or consequential damages
-arising out of any use of the software or documentation, even if
-advised of the possibility of such damage.
-
-Permission is hereby granted to use, copy, modify, and distribute
-this source code, or portions hereof, documentation and executables,
-for any purpose, without fee, subject to the following restrictions:
-
-1. The origin of this source code must not be misrepresented.
-2. Altered versions must be plainly marked as such and must
- not be misrepresented as being the original source.
-3. This Copyright notice may not be removed or altered from any
- source or altered source distribution.
-
-The copyright holders and contributing author(s) specifically
-permit, without fee, and encourage the use of this source code
-as a component for supporting the Hypertext Markup Language in
-commercial products. If you use this source code in a product,
-acknowledgment is not required but would be appreciated.
-
--- a/usr/src/pkgdefs/SUNWtidy/depend Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# ident "@(#)depend 1.1 07/07/26 SMI"
-#
-# 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 SUNWcakr Core Solaris Kernel Architecture (Root)
-P SUNWkvm Core Architecture, (Kvm)
-P SUNWcsr Core Solaris, (Root)
-P SUNWckr Core Solaris Kernel (Root)
-P SUNWcnetr Core Solaris Network Infrastructure (Root)
-P SUNWcsu Core Solaris, (Usr)
-P SUNWcsd Core Solaris Devices
-P SUNWcsl Core Solaris Libraries
--- a/usr/src/pkgdefs/SUNWtidy/pkginfo.tmpl Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-#
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-#ident "@(#)pkginfo.tmpl 1.2 10/07/22 SMI"
-#
-# This required package information file describes characteristics of the
-# package, such as package abbreviation, full package name, package version,
-# and package architecture.
-#
-PKG="SUNWtidy"
-NAME="The HTML Tidy Library"
-ARCH="ISA"
-VERSION="SFWVERS,REV=0.0.0"
-SUNW_PRODNAME="SunOS"
-SUNW_PRODVERS="RELEASE/VERSION"
-SUNW_PKGTYPE="usr"
-MAXINST="1000"
-CATEGORY="system"
-DESC="The HTML Tidy Library (1.0.0)"
-VENDOR="COMPANY"
-HOTLINE="Please contact your local service provider"
-EMAIL=""
-CLASSES="none"
-BASEDIR=/
-SUNW_PKGVERS="1.0"
-SUNW_PKG_ALLZONES="false"
-SUNW_PKG_HOLLOW="false"
-SUNW_PKG_THISZONE="false"
-#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>"
--- a/usr/src/pkgdefs/SUNWtidy/prototype_com Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,136 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# ident "@(#)prototype_com 1.1 07/07/26 SMI"
-#
-# 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 pkginfo
-i depend
-i copyright
-#
-# source locations relative to the prototype file
-#
-# SUNWtidy
-#
-d none usr 0755 root sys
-d none usr/bin 0755 root bin
-f none usr/bin/tab2space 0555 root bin
-f none usr/bin/tidy 0555 root bin
-d none usr/include 0755 root bin
-d none usr/include/tidy 0755 root bin
-f none usr/include/tidy/buffio.h 0644 root bin
-f none usr/include/tidy/platform.h 0644 root bin
-f none usr/include/tidy/tidy.h 0644 root bin
-f none usr/include/tidy/tidyenum.h 0644 root bin
-d none usr/lib 0755 root bin
-f none usr/lib/libtidy-1.0.so.0.0.0 0755 root bin
-s none usr/lib/libtidy-1.0.so.0=libtidy-1.0.so.0.0.0
-s none usr/lib/libtidy-1.0.so=libtidy-1.0.so.0.0.0
-s none usr/lib/libtidy.so=libtidy-1.0.so.0.0.0
-f none usr/lib/llib-ltidy 0644 root bin
-f none usr/lib/llib-ltidy.ln 0644 root bin
-d none usr/share 0755 root sys
-d none usr/share/doc 0755 root other
-d none usr/share/doc/tidy 0755 root bin
-d none usr/share/doc/tidy/html 0755 root bin
-d none usr/share/doc/tidy/html/api 0755 root bin
-f none usr/share/doc/tidy/html/Overview.html 0444 root bin
-f none usr/share/doc/tidy/html/api/annotated.html 0444 root bin
-f none usr/share/doc/tidy/html/api/buffio_8h-source.html 0444 root bin
-f none usr/share/doc/tidy/html/api/buffio_8h.html 0444 root bin
-f none usr/share/doc/tidy/html/api/doxygen.css 0444 root bin
-f none usr/share/doc/tidy/html/api/doxygen.png 0444 root bin
-f none usr/share/doc/tidy/html/api/fileio_8h-source.html 0444 root bin
-f none usr/share/doc/tidy/html/api/fileio_8h.html 0444 root bin
-f none usr/share/doc/tidy/html/api/files.html 0444 root bin
-f none usr/share/doc/tidy/html/api/ftv2blank.png 0444 root bin
-f none usr/share/doc/tidy/html/api/ftv2doc.png 0444 root bin
-f none usr/share/doc/tidy/html/api/ftv2folderclosed.png 0444 root bin
-f none usr/share/doc/tidy/html/api/ftv2folderopen.png 0444 root bin
-f none usr/share/doc/tidy/html/api/ftv2lastnode.png 0444 root bin
-f none usr/share/doc/tidy/html/api/ftv2link.png 0444 root bin
-f none usr/share/doc/tidy/html/api/ftv2mlastnode.png 0444 root bin
-f none usr/share/doc/tidy/html/api/ftv2mnode.png 0444 root bin
-f none usr/share/doc/tidy/html/api/ftv2node.png 0444 root bin
-f none usr/share/doc/tidy/html/api/ftv2plastnode.png 0444 root bin
-f none usr/share/doc/tidy/html/api/ftv2pnode.png 0444 root bin
-f none usr/share/doc/tidy/html/api/ftv2vertline.png 0444 root bin
-f none usr/share/doc/tidy/html/api/functions.html 0444 root bin
-f none usr/share/doc/tidy/html/api/globals.html 0444 root bin
-f none usr/share/doc/tidy/html/api/group__AttrGet.html 0444 root bin
-f none usr/share/doc/tidy/html/api/group__Attribute.html 0444 root bin
-f none usr/share/doc/tidy/html/api/group__Basic.html 0444 root bin
-f none usr/share/doc/tidy/html/api/group__Clean.html 0444 root bin
-f none usr/share/doc/tidy/html/api/group__Configuration.html 0444 root bin
-f none usr/share/doc/tidy/html/api/group__IO.html 0444 root bin
-f none usr/share/doc/tidy/html/api/group__Memory.html 0444 root bin
-f none usr/share/doc/tidy/html/api/group__NodeAsk.html 0444 root bin
-f none usr/share/doc/tidy/html/api/group__Opaque.html 0444 root bin
-f none usr/share/doc/tidy/html/api/group__Parse.html 0444 root bin
-f none usr/share/doc/tidy/html/api/group__Save.html 0444 root bin
-f none usr/share/doc/tidy/html/api/group__Tree.html 0444 root bin
-f none usr/share/doc/tidy/html/api/index.html 0444 root bin
-f none usr/share/doc/tidy/html/api/main.html 0444 root bin
-f none usr/share/doc/tidy/html/api/modules.html 0444 root bin
-f none usr/share/doc/tidy/html/api/structTidyAttr.html 0444 root bin
-f none usr/share/doc/tidy/html/api/structTidyDoc.html 0444 root bin
-f none usr/share/doc/tidy/html/api/structTidyNode.html 0444 root bin
-f none usr/share/doc/tidy/html/api/structTidyOption.html 0444 root bin
-f none usr/share/doc/tidy/html/api/struct__TidyBuffer.html 0444 root bin
-f none usr/share/doc/tidy/html/api/struct__TidyInputSource.html 0444 root bin
-f none usr/share/doc/tidy/html/api/struct__TidyOutputSink.html 0444 root bin
-f none usr/share/doc/tidy/html/api/tidy_8h-source.html 0444 root bin
-f none usr/share/doc/tidy/html/api/tidy_8h.html 0444 root bin
-f none usr/share/doc/tidy/html/api/tidyenum_8h-source.html 0444 root bin
-f none usr/share/doc/tidy/html/api/tidyenum_8h.html 0444 root bin
-f none usr/share/doc/tidy/html/api/tree.html 0444 root bin
-f none usr/share/doc/tidy/html/api/tree.js 0444 root bin
-f none usr/share/doc/tidy/html/api/treeview.js 0444 root bin
-f none usr/share/doc/tidy/html/checked_by_tidy.gif 0444 root bin
-f none usr/share/doc/tidy/html/doxygen.cfg 0444 root bin
-f none usr/share/doc/tidy/html/faq.html 0444 root bin
-f none usr/share/doc/tidy/html/grid.gif 0444 root bin
-f none usr/share/doc/tidy/html/license.html 0444 root bin
-f none usr/share/doc/tidy/html/pending.html 0444 root bin
-f none usr/share/doc/tidy/html/quickref-html.xsl 0444 root bin
-f none usr/share/doc/tidy/html/release-notes.html 0444 root bin
-f none usr/share/doc/tidy/html/tidy.css 0444 root bin
-f none usr/share/doc/tidy/html/tidy.gif 0444 root bin
-f none usr/share/doc/tidy/html/tidy1.xsl 0444 root bin
-d none usr/share/man 0755 root bin
-d none usr/share/man/man1 0755 root bin
-f none usr/share/man/man1/tidy.1 0644 root bin
-f none usr/share/man/man1/tab2space.1 0644 root bin
-d none usr/share/man/man3 0755 root bin
-f none usr/share/man/man3/libtidy.3 0644 root bin
-
--- a/usr/src/pkgdefs/SUNWtidy/prototype_i386 Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# ident "@(#)prototype_i386 1.1 07/07/26 SMI"
-#
-# 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
-#
-#
-# SUNWtidy
-#
-d none usr/lib/amd64 0755 root bin
-f none usr/lib/amd64/libtidy-1.0.so.0.0.0 0755 root bin
-s none usr/lib/amd64/libtidy-1.0.so.0=libtidy-1.0.so.0.0.0
-s none usr/lib/amd64/libtidy-1.0.so=libtidy-1.0.so.0.0.0
-s none usr/lib/amd64/libtidy.so=libtidy-1.0.so.0.0.0
-f none usr/lib/amd64/llib-ltidy.ln 0644 root bin
--- a/usr/src/pkgdefs/SUNWtidy/prototype_sparc Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# ident "@(#)prototype_sparc 1.2 07/07/26 SMI"
-#
-# 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
-#
-#
-# SUNWtidy
-#
-d none usr/lib/sparcv9 0755 root bin
-f none usr/lib/sparcv9/libtidy-1.0.so.0.0.0 0755 root bin
-s none usr/lib/sparcv9/libtidy-1.0.so.0=libtidy-1.0.so.0.0.0
-s none usr/lib/sparcv9/libtidy-1.0.so=libtidy-1.0.so.0.0.0
-s none usr/lib/sparcv9/libtidy.so=libtidy-1.0.so.0.0.0
-f none usr/lib/sparcv9/llib-ltidy.ln 0644 root bin
--- a/usr/src/pkgdefs/awk_procedure Thu Jun 16 03:22:51 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-#
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2004 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# ident "@(#)awk_procedure 1.3 06/03/18 SMI"
-#
-
-/^include / {
- system("cat ../common_files/proc."$2)
- next
-}
-{ print }