Import sfw build 135
Bugs Fixed
----------
6760685 No MOTD (message of the day) when using zsh, /etc/zprofile is needed
6916058 BIND 9.6.1-P3
6918313 [OSOL B131] Crash of Mysql server SSL connection security problem (5.1.30)(x86 only)
6923497 new gnu patch doesn't like dom4j
6924198 Update fetchmail to version 6.3.14
6924379 zsh 4.3.10
6924496 audit_pkg no longer needed in OpenSolaris world
6924503 enable "new-style" zsh completion by default
--- a/usr/src/Makefile Tue Feb 23 00:53:20 2010 +0200
+++ b/usr/src/Makefile Fri Mar 05 22:27:24 2010 +0200
@@ -19,10 +19,10 @@
#
# CDDL HEADER END
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#pragma ident "@(#)Makefile 1.14 09/05/07 SMI"
+#pragma ident "@(#)Makefile 1.15 10/02/19 SMI"
#
# Makefile for sfw source
#
@@ -81,10 +81,7 @@
headers: rootdirs .WAIT libheaders
-common_files: $(ROOTDIRS) $(ROOTFILES_555)
- cd common; pwd; $(MAKE) install
-
-rootdirs: $(ROOTDIRS) common_files
+rootdirs: $(ROOTDIRS) $(ROOTFILES_555)
$(ROOTDIRS):
$(INS.dir)
--- a/usr/src/Targetdirs Tue Feb 23 00:53:20 2010 +0200
+++ b/usr/src/Targetdirs Fri Mar 05 22:27:24 2010 +0200
@@ -23,7 +23,7 @@
# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "@(#)Targetdirs 1.247 10/01/29 SMI"
+# ident "@(#)Targetdirs 1.249 10/02/19 SMI"
#
#
@@ -65,6 +65,7 @@
ROOT.SYS= \
/etc \
+ /etc/user_attr.d \
/etc/bash \
/etc/bash/bash_completion.d \
/etc/inet \
@@ -75,9 +76,12 @@
/etc/rc2.d \
/etc/rc3.d \
/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 \
@@ -1688,6 +1692,7 @@
SYM.ROOT.BIN64= \
/usr/lib/64 \
+ /usr/sfw/lib/64 \
/usr/mysql/5.0/bin/64 \
/usr/mysql/5.0/lib/64 \
/usr/mysql/5.1/bin/64 \
@@ -1754,6 +1759,7 @@
$(ROOT)/usr/sfw/share/locale:= LINKDEST=../lib/locale
$(ROOT)/usr/sfw/src:= LINKDEST=share/src
$(ROOT)/usr/lib/64:= LINKDEST=$(MACH64)
+$(ROOT)/usr/sfw/lib/64:= LINKDEST=$(MACH64)
$(ROOT)/usr/mysql/5.0/bin/64:= LINKDEST=$(MACH64)
$(ROOT)/usr/mysql/5.0/lib/64:= LINKDEST=$(MACH64)
$(ROOT)/usr/mysql/5.1/bin/64:= LINKDEST=$(MACH64)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/cdrtools/exec_attr Fri Mar 05 22:27:24 2010 +0200
@@ -0,0 +1,3 @@
+Basic Solaris User:solaris:cmd:::/usr/bin/cdrecord.bin:privs=file_dac_read,sys_devices,proc_lock_memory,proc_priocntl,net_privaddr
+Basic Solaris User:solaris:cmd:::/usr/bin/readcd.bin:privs=file_dac_read,sys_devices,net_privaddr
+Basic Solaris User:solaris:cmd:::/usr/bin/cdda2wav.bin:privs=file_dac_read,sys_devices,proc_priocntl,net_privaddr
--- a/usr/src/cmd/cdrtools/install-cdrtools Tue Feb 23 00:53:20 2010 +0200
+++ b/usr/src/cmd/cdrtools/install-cdrtools Fri Mar 05 22:27:24 2010 +0200
@@ -20,10 +20,10 @@
# CDDL HEADER END
#
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "@(#)install-cdrtools 1.15 08/04/16 SMI"
+#ident "@(#)install-cdrtools 1.16 10/02/19 SMI"
PKGVERS=${VER}
PREFIX=${ROOT}/usr
@@ -72,7 +72,7 @@
RIGHTSDIR=${ROOT}/etc/security
# Install exec_attr with new entries for rbac to add.
-_install N ../../../common/rbac/exec_attr $RIGHTSDIR/exec_attr 644
+_install N ../exec_attr $RIGHTSDIR/exec_attr.d/cdrtools 444
BINDIR=${ROOT}/usr/bin
--- a/usr/src/cmd/cups/Makefile.sfw Tue Feb 23 00:53:20 2010 +0200
+++ b/usr/src/cmd/cups/Makefile.sfw Fri Mar 05 22:27:24 2010 +0200
@@ -19,10 +19,10 @@
#
# CDDL HEADER END
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
-#
-#ident "@(#)Makefile.sfw 1.10 09/11/05 SMI"
+#
+#ident "@(#)Makefile.sfw 1.11 10/02/19 SMI"
#
include ../Makefile.cmd
@@ -112,6 +112,8 @@
$(INSTALL_PROTO) -m 0555 Solaris/print-service-selector $(ROOT)/lib/svc/method/print-service-selector
$(MKDIR) -p $(ROOT)/var/svc/manifest/application/print
$(INSTALL_PROTO) -m 0444 Solaris/service-selector.xml $(ROOT)/var/svc/manifest/application/print/service-selector.xml
+ $(INSTALL_PROTO) -m 0444 auth_attr $(ROOT)/etc/security/auth_attr.d/cups
+ $(INSTALL_PROTO) -m 0444 prof_attr $(ROOT)/etc/security/prof_attr.d/cups
# clean up the turds
$(RM) $(ROOT)/etc/cups/snmp.conf.N $(ROOT)/etc/cups/cupsd.conf.N
$(RM) $(ROOT)/usr/share/cups/mime/mime.convs.O $(ROOT)/usr/share/cups/mime/mime.types.O
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/cups/auth_attr Fri Mar 05 22:27:24 2010 +0200
@@ -0,0 +1,1 @@
+solaris.smf.manage.cups:::Manage CUPS service states::help=ManageCUPS.html
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/cups/prof_attr Fri Mar 05 22:27:24 2010 +0200
@@ -0,0 +1,1 @@
+CUPS Administration::::auths=solaris.smf.manage.cups
--- a/usr/src/cmd/ejabberd/Makefile.sfw Tue Feb 23 00:53:20 2010 +0200
+++ b/usr/src/cmd/ejabberd/Makefile.sfw Fri Mar 05 22:27:24 2010 +0200
@@ -20,10 +20,10 @@
#
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "@(#)Makefile.sfw 1.2 09/06/18 SMI"
+# ident "@(#)Makefile.sfw 1.3 10/02/19 SMI"
#
VER = $(COMPONENT_NAME:sh)-$(COMPONENT_VERSION:sh)
@@ -50,6 +50,9 @@
install: all
-$(RM) $(ROOT)/etc/ejabberd/ejabberd.cfg
-$(RM) $(ROOT)/etc/ejabberd/ejabberdctl.cfg
+ $(INSTALL_PROTO) -m 0444 auth_attr $(ROOT)/etc/security/auth_attr.d/ejabberd
+ $(INSTALL_PROTO) -m 0444 exec_attr $(ROOT)/etc/security/exec_attr.d/ejabberd
+ $(INSTALL_PROTO) -m 0444 prof_attr $(ROOT)/etc/security/prof_attr.d/ejabberd
(cd $(ESRC); env - $(TARGET_ENV) $(GMAKE) -e $(TARGET))
# install man pages
$(SHELL) ./install-sfw
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/ejabberd/auth_attr Fri Mar 05 22:27:24 2010 +0200
@@ -0,0 +1,2 @@
+solaris.smf.value.ejabberd:::Change ejabberd value properties::
+solaris.smf.manage.ejabberd:::Manage ejabberd service states::
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/ejabberd/exec_attr Fri Mar 05 22:27:24 2010 +0200
@@ -0,0 +1,1 @@
+Ejabberd Administration:solaris:cmd:::/usr/sbin/ejabberdctl:uid=daemon;gid=daemon
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/ejabberd/prof_attr Fri Mar 05 22:27:24 2010 +0200
@@ -0,0 +1,1 @@
+Ejabberd Administration:::Ejabberd Service Administration:auths=solaris.smf.manage.ejabberd,solaris.smf.value.ejabberd
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/fping/exec_attr Fri Mar 05 22:27:24 2010 +0200
@@ -0,0 +1,1 @@
+Network Management:solaris:cmd:::/usr/bin/fping:privs=net_icmpaccess
--- a/usr/src/cmd/fping/install-sfw Tue Feb 23 00:53:20 2010 +0200
+++ b/usr/src/cmd/fping/install-sfw Fri Mar 05 22:27:24 2010 +0200
@@ -20,13 +20,13 @@
# CDDL HEADER END
#
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# install objects in the proto area, since it would
# really like to install locally, but that doesn't scale.
#
-#ident "@(#)install-sfw 1.1 08/10/28 SMI"
+#ident "@(#)install-sfw 1.2 10/02/19 SMI"
set -o errexit
VERS=2.4b2_to
@@ -59,4 +59,6 @@
manpage=fping.1m
_install M "${PKGVERS}/${manpage}" "${MAN1MDIR}/${manpage}" 444
+_install N "exec_attr" "${ROOT}/etc/security/exec_attr.d/fping" 444
+
exit 0
--- a/usr/src/cmd/gcc/Makefile.sfw Tue Feb 23 00:53:20 2010 +0200
+++ b/usr/src/cmd/gcc/Makefile.sfw Fri Mar 05 22:27:24 2010 +0200
@@ -20,12 +20,12 @@
#
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
#
-#ident "@(#)Makefile.sfw 1.15 09/05/15 SMI"
+#ident "@(#)Makefile.sfw 1.16 10/02/19 SMI"
#
VER=gcc-3.4.3
@@ -108,6 +108,7 @@
gpatch -p0 < patch.sparc.sol2-bi.h
gpatch -p0 < patch.i386.sol2-10.h
gpatch -p0 < patch.g++spec.c
+ gpatch -p0 < patch.c-parse.in
touch $(VER)/configure
$(VER)-$(MACH)-build:
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/gcc/patch.c-parse.in Fri Mar 05 22:27:24 2010 +0200
@@ -0,0 +1,35 @@
+--- gcc-3.4.3/gcc/c-parse.in.orig Tue Feb 16 13:13:29 2010
++++ gcc-3.4.3/gcc/c-parse.in Tue Feb 16 13:17:36 2010
+@@ -1730,7 +1730,7 @@
+
+ structsp_attr:
+ struct_head identifier '{'
+- { $$ = start_struct (RECORD_TYPE, $2);
++ { $<ttype>$ = start_struct (RECORD_TYPE, $2);
+ /* Start scope of tag before parsing components. */
+ }
+ component_decl_list '}' maybe_attribute
+@@ -1741,7 +1741,7 @@
+ nreverse ($3), chainon ($1, $5));
+ }
+ | union_head identifier '{'
+- { $$ = start_struct (UNION_TYPE, $2); }
++ { $<ttype>$ = start_struct (UNION_TYPE, $2); }
+ component_decl_list '}' maybe_attribute
+ { $$ = finish_struct ($<ttype>4, nreverse ($5),
+ chainon ($1, $7)); }
+@@ -1750,12 +1750,12 @@
+ nreverse ($3), chainon ($1, $5));
+ }
+ | enum_head identifier '{'
+- { $$ = start_enum ($2); }
++ { $<ttype>$ = start_enum ($2); }
+ enumlist maybecomma_warn '}' maybe_attribute
+ { $$ = finish_enum ($<ttype>4, nreverse ($5),
+ chainon ($1, $8)); }
+ | enum_head '{'
+- { $$ = start_enum (NULL_TREE); }
++ { $<ttype>$ = start_enum (NULL_TREE); }
+ enumlist maybecomma_warn '}' maybe_attribute
+ { $$ = finish_enum ($<ttype>3, nreverse ($4),
+ chainon ($1, $7)); }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/lighttpd14/auth_attr Fri Mar 05 22:27:24 2010 +0200
@@ -0,0 +1,2 @@
+solaris.smf.value.http/lighttpd14:::Change Lighttpd 14 value properties::
+solaris.smf.manage.http/lighttpd14:::Manage Lighttpd 14 service states::
--- a/usr/src/cmd/lighttpd14/install-sfw Tue Feb 23 00:53:20 2010 +0200
+++ b/usr/src/cmd/lighttpd14/install-sfw Fri Mar 05 22:27:24 2010 +0200
@@ -21,10 +21,10 @@
#
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "@(#)install-sfw 1.3 09/11/19 SMI"
+#ident "@(#)install-sfw 1.4 10/02/19 SMI"
set -o errexit
@@ -102,6 +102,10 @@
cd ${TOP}/Solaris
_install N fcgi-php.conf ${CONFDIR}/conf.d/fcgi-php.conf 644
_install N ssl.conf ${CONFDIR}/conf.d/ssl.conf 644
+
+ cd ${TOP}
+ _install N auth_attr ${ETC}/security/auth_attr.d/lighttpd 444
+ _install N prof_attr ${ETC}/security/prof_attr.d/lighttpd 444
}
install_symlinks() {
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/lighttpd14/prof_attr Fri Mar 05 22:27:24 2010 +0200
@@ -0,0 +1,1 @@
+Lighttpd 14 Administration::::auths=solaris.smf.manage.http/lighttpd14,solaris.smf.value.http/lighttpd14
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mysql-5-0/auth_attr Fri Mar 05 22:27:24 2010 +0200
@@ -0,0 +1,2 @@
+solaris.smf.manage.mysql/version_50:::Manage MySQL service states::
+solaris.smf.value.mysql/version_50:::Change MySQL value properties::
--- a/usr/src/cmd/mysql-5-0/install-mysql Tue Feb 23 00:53:20 2010 +0200
+++ b/usr/src/cmd/mysql-5-0/install-mysql Fri Mar 05 22:27:24 2010 +0200
@@ -20,10 +20,10 @@
# CDDL HEADER END
#
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "@(#)install-mysql 1.5 09/05/13 SMI"
+#ident "@(#)install-mysql 1.6 10/02/19 SMI"
# stop at the first error
set -o errexit
@@ -282,6 +282,13 @@
return 0;
}
+function install_rbac_files
+{
+ cd ${CWD}
+ _install N auth_attr ${ROOT}/etc/security/auth_attr.d/mysql-50 444
+ _install N prof_attr ${ROOT}/etc/security/prof_attr.d/mysql-50 444
+}
+
# ----- START HERE - actual script processing starts here -----
@@ -297,6 +304,7 @@
fix_install
install_docs
install_smf_files
+install_rbac_files
fix_perl_path
fix_ldpath
fix_permissions
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mysql-5-0/prof_attr Fri Mar 05 22:27:24 2010 +0200
@@ -0,0 +1,1 @@
+MySQL Administration::::auths=solaris.smf.manage.mysql/version_50,solaris.smf.value.mysql/version_50
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/ntpd/Solaris/auth_attr Fri Mar 05 22:27:24 2010 +0200
@@ -0,0 +1,2 @@
+solaris.smf.manage.ntp:::Manage NTP service states::help=SmfNTPStates.html
+solaris.smf.value.ntp:::Change NTP value properties::help=SmfValueNTP.html
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/ntpd/Solaris/prof_attr Fri Mar 05 22:27:24 2010 +0200
@@ -0,0 +1,1 @@
+NTP Management:::Manage the NTP service:auths=solaris.smf.manage.ntp,solaris.smf.value.ntp
--- a/usr/src/cmd/ntpd/install-sfw Tue Feb 23 00:53:20 2010 +0200
+++ b/usr/src/cmd/ntpd/install-sfw Fri Mar 05 22:27:24 2010 +0200
@@ -21,17 +21,18 @@
#
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# install objects in the proto area, since it would
# really like to install locally, but that doesn't scale.
#
-#ident "@(#)install-sfw 1.1 09/05/17 SMI"
+#ident "@(#)install-sfw 1.2 10/02/19 SMI"
set -o errexit
PKGVERS=$1
ETCDIR=${ROOT}/etc
+SECDIR=${ETCDIR}/security
SYSCONFDIR=${ETCDIR}/inet
BINDIR=${ROOT}/usr/sbin
LIBDIR=${ROOT}/usr/lib/inet
@@ -284,5 +285,8 @@
_install N Solaris/SmfNTPStates.html ${AUTHHDIR}/SmfNTPStates.html 0444
_install N Solaris/RtNTPMngmnt.html ${AUTHHDIR}/RtNTPMngmnt.html 0444
+_install N Solaris/auth_attr ${SECDIR}/auth_attr.d/ntp 0444
+_install N Solaris/prof_attr ${SECDIR}/prof_attr.d/ntp 0444
+
exit 0
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/openldap/exec_attr Fri Mar 05 22:27:24 2010 +0200
@@ -0,0 +1,9 @@
+OpenLDAP Server Administration:suser:cmd:::/usr/sbin/slapd:uid=openldap;gid=openlap;privs=basic,net_privaddr
+OpenLDAP Server Administration:suser:cmd:::/usr/sbin/slapacl:uid=openldap;gid=openldap
+OpenLDAP Server Administration:suser:cmd:::/usr/sbin/slapadd:uid=openldap;gid=openldap
+OpenLDAP Server Administration:suser:cmd:::/usr/sbin/slapauth:uid=openldap;gid=openldap
+OpenLDAP Server Administration:suser:cmd:::/usr/sbin/slapcat:uid=openldap;gid=openldap
+OpenLDAP Server Administration:suser:cmd:::/usr/sbin/slapdn:uid=openldap;gid=openldap
+OpenLDAP Server Administration:suser:cmd:::/usr/sbin/slapindex:uid=openldap;gid=openldap
+OpenLDAP Server Administration:suser:cmd:::/usr/sbin/slappasswd:uid=openldap;gid=openldap
+OpenLDAP Server Administration:suser:cmd:::/usr/sbin/slaptest:uid=openldap;gid=openldap
--- a/usr/src/cmd/openldap/install-openldap Tue Feb 23 00:53:20 2010 +0200
+++ b/usr/src/cmd/openldap/install-openldap Fri Mar 05 22:27:24 2010 +0200
@@ -25,7 +25,7 @@
#
# Install BIND's objects into the proto area ready for packaging.
#
-# ident "@(#)install-openldap 1.3 10/01/28 SMI"
+# ident "@(#)install-openldap 1.4 10/02/19 SMI"
# VERS should be provided on command line or set in environment
if [ $# -ge 2 ]; then
@@ -223,6 +223,10 @@
done
_install L guide.html ${DOCADMDIR}/index.html 444
cd $TOP
+
+_install N ../exec_attr ${ROOT}/etc/security/exec_attr.d/openldap 0444
+_install N ../prof_attr ${ROOT}/etc/security/prof_attr.d/openldap 0444
+
cd doc/guide/images
for i in *.gif
do
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/openldap/prof_attr Fri Mar 05 22:27:24 2010 +0200
@@ -0,0 +1,1 @@
+OpenLDAP Server Administration:::OpenLDAP Server scripts/commands:
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/openwsman/auth_attr Fri Mar 05 22:27:24 2010 +0200
@@ -0,0 +1,2 @@
+solaris.smf.manage.openwsmand:::Manage openwsmand value properties::
+solaris.smf.value.openwsmand:::Change openwsmand value properties::
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/openwsman/exec_attr Fri Mar 05 22:27:24 2010 +0200
@@ -0,0 +1,1 @@
+Openwsman Server Administration:solaris:cmd:::/usr/sbin/openwsmand:euid=0
--- a/usr/src/cmd/openwsman/install-sfw Tue Feb 23 00:53:20 2010 +0200
+++ b/usr/src/cmd/openwsman/install-sfw Fri Mar 05 22:27:24 2010 +0200
@@ -21,10 +21,10 @@
#
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "@(#)install-sfw 1.1 09/03/11 SMI"
+# ident "@(#)install-sfw 1.2 10/02/19 SMI"
# Stop at first error
set -o errexit
@@ -195,4 +195,8 @@
_install N openwsmand.8 ${MANDIR}/openwsmand.8 444
+_install N auth_attr ${ROOT}/etc/security/auth_attr.d/openwsman 0444
+_install N exec_attr ${ROOT}/etc/security/exec_attr.d/openwsman 0444
+_install N prof_attr ${ROOT}/etc/security/prof_attr.d/openwsman 0444
+
exit 0
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/openwsman/prof_attr Fri Mar 05 22:27:24 2010 +0200
@@ -0,0 +1,1 @@
+Openwsman Server Administration::::auths=solaris.smf.manage.openwsmand,solaris.smf.value.openwsmand
--- a/usr/src/cmd/pconsole/Makefile.sfw Tue Feb 23 00:53:20 2010 +0200
+++ b/usr/src/cmd/pconsole/Makefile.sfw Fri Mar 05 22:27:24 2010 +0200
@@ -19,10 +19,10 @@
#
# CDDL HEADER END
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "@(#)Makefile.sfw 1.3 09/10/07 SMI"
+#ident "@(#)Makefile.sfw 1.4 10/02/19 SMI"
#
@@ -45,6 +45,8 @@
# install the help
$(MKDIR) -p $(ROOT)/usr/lib/help/profiles/locale/C
$(INSTALL_PROTO) -m 0444 pconsole.html $(ROOT)/usr/lib/help/profiles/locale/C/pconsole.html
+ $(INSTALL_PROTO) -m 0444 exec_attr $(ROOT)/etc/security/exec_attr.d/pconsole
+ $(INSTALL_PROTO) -m 0444 prof_attr $(ROOT)/etc/security/prof_attr.d/pconsole
# install the bits in the proto area
cd $(VER); env SRC=$(SRC) \
DESTDIR=$(ROOT) \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/pconsole/exec_attr Fri Mar 05 22:27:24 2010 +0200
@@ -0,0 +1,1 @@
+Parallel Console Access:solaris:cmd:::/usr/sbin/pconsole-bin:privs=all
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/pconsole/prof_attr Fri Mar 05 22:27:24 2010 +0200
@@ -0,0 +1,1 @@
+Parallel Console Access:::Connect to remote consoles with pconsole:help=pconsole.html
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/postgres/postgresql-8.2/auth_attr Fri Mar 05 22:27:24 2010 +0200
@@ -0,0 +1,2 @@
+solaris.smf.value.postgres:::Change Postgres value properties::
+solaris.smf.manage.postgres:::Manage Postgres service states::
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/postgres/postgresql-8.2/exec_attr Fri Mar 05 22:27:24 2010 +0200
@@ -0,0 +1,7 @@
+Postgres Administration:solaris:cmd:::/usr/postgres/8.2/bin/initdb:uid=postgres
+Postgres Administration:solaris:cmd:::/usr/postgres/8.2/bin/ipcclean:uid=postgres
+Postgres Administration:solaris:cmd:::/usr/postgres/8.2/bin/pg_controldata:uid=postgres
+Postgres Administration:solaris:cmd:::/usr/postgres/8.2/bin/pg_ctl:uid=postgres
+Postgres Administration:solaris:cmd:::/usr/postgres/8.2/bin/pg_resetxlog:uid=postgres
+Postgres Administration:solaris:cmd:::/usr/postgres/8.2/bin/postgres:uid=postgres
+Postgres Administration:solaris:cmd:::/usr/postgres/8.2/bin/postmaster:uid=postgres
--- a/usr/src/cmd/postgres/postgresql-8.2/install-sfw Tue Feb 23 00:53:20 2010 +0200
+++ b/usr/src/cmd/postgres/postgresql-8.2/install-sfw Fri Mar 05 22:27:24 2010 +0200
@@ -19,10 +19,10 @@
#
# CDDL HEADER END
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "@(#)install-sfw 1.8 09/03/12 SMI""
+#ident "@(#)install-sfw 1.9 10/02/19 SMI""
. ${SRC}/tools/install.subr
@@ -245,6 +245,11 @@
ETC=${ROOT}/etc
RIGHTSDIR=${ROOT}/etc/security
+_install N user_attr ${ETC}/user_attr.d/postgres-82 0444
+_install N auth_attr ${RIGHTSDIR}/auth_attr.d/postgres-82 0444
+_install N exec_attr ${RIGHTSDIR}/exec_attr.d/postgres-82 0444
+_install N prof_attr ${RIGHTSDIR}/prof_attr.d/postgres-82 0444
+
nuke_archive_libs
move_config_files
add_locale
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/postgres/postgresql-8.2/prof_attr Fri Mar 05 22:27:24 2010 +0200
@@ -0,0 +1,1 @@
+Postgres Administration::::auths=solaris.smf.manage.postgres,solaris.smf.value.postgres
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/postgres/postgresql-8.2/user_attr Fri Mar 05 22:27:24 2010 +0200
@@ -0,0 +1,1 @@
+postgres::::type=role;profiles=Postgres Administration,All
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/postgres/postgresql-8.3/auth_attr Fri Mar 05 22:27:24 2010 +0200
@@ -0,0 +1,2 @@
+solaris.smf.value.postgres:::Change Postgres value properties::
+solaris.smf.manage.postgres:::Manage Postgres service states::
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/postgres/postgresql-8.3/exec_attr Fri Mar 05 22:27:24 2010 +0200
@@ -0,0 +1,14 @@
+Postgres Administration:solaris:cmd:::/usr/postgres/8.3/bin/initdb:uid=postgres
+Postgres Administration:solaris:cmd:::/usr/postgres/8.3/bin/ipcclean:uid=postgres
+Postgres Administration:solaris:cmd:::/usr/postgres/8.3/bin/pg_controldata:uid=postgres
+Postgres Administration:solaris:cmd:::/usr/postgres/8.3/bin/pg_ctl:uid=postgres
+Postgres Administration:solaris:cmd:::/usr/postgres/8.3/bin/pg_resetxlog:uid=postgres
+Postgres Administration:solaris:cmd:::/usr/postgres/8.3/bin/postgres:uid=postgres
+Postgres Administration:solaris:cmd:::/usr/postgres/8.3/bin/postmaster:uid=postgres
+Postgres Administration:solaris:cmd:::/usr/postgres/8.3/bin/64/initdb:uid=postgres
+Postgres Administration:solaris:cmd:::/usr/postgres/8.3/bin/64/ipcclean:uid=postgres
+Postgres Administration:solaris:cmd:::/usr/postgres/8.3/bin/64/pg_controldata:uid=postgres
+Postgres Administration:solaris:cmd:::/usr/postgres/8.3/bin/64/pg_ctl:uid=postgres
+Postgres Administration:solaris:cmd:::/usr/postgres/8.3/bin/64/pg_resetxlog:uid=postgres
+Postgres Administration:solaris:cmd:::/usr/postgres/8.3/bin/64/postgres:uid=postgres
+Postgres Administration:solaris:cmd:::/usr/postgres/8.3/bin/64/postmaster:uid=postgres
--- a/usr/src/cmd/postgres/postgresql-8.3/install-sfw Tue Feb 23 00:53:20 2010 +0200
+++ b/usr/src/cmd/postgres/postgresql-8.3/install-sfw Fri Mar 05 22:27:24 2010 +0200
@@ -19,10 +19,10 @@
#
# CDDL HEADER END
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "@(#)install-sfw 1.4 09/03/12 SMI"
+#ident "@(#)install-sfw 1.5 10/02/19 SMI"
. ${SRC}/tools/install.subr
@@ -279,10 +279,16 @@
MANIFESTDIR=${ROOT}/var/svc/manifest/application/database
METHODDIR=${ROOT}/lib/svc/method
ETC=${ROOT}/etc
+RIGHTSDIR=${ETC}/security
REGRDIR=${PREFIX}/lib/regress
ORIGREGR=${SRCDIR}/src/test/regress
SPIDIR=${SRCDIR}/contrib/spi
+_install N user_attr ${ETC}/user_attr.d/postgres-83 0444
+_install N auth_attr ${RIGHTSDIR}/auth_attr.d/postgres-83 0444
+_install N exec_attr ${RIGHTSDIR}/exec_attr.d/postgres-83 0444
+_install N prof_attr ${RIGHTSDIR}/prof_attr.d/postgres-83 0444
+
nuke_archive_libs
move_config_files
add_locale
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/postgres/postgresql-8.3/prof_attr Fri Mar 05 22:27:24 2010 +0200
@@ -0,0 +1,1 @@
+Postgres Administration::::auths=solaris.smf.manage.postgres,solaris.smf.value.postgres
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/postgres/postgresql-8.3/user_attr Fri Mar 05 22:27:24 2010 +0200
@@ -0,0 +1,1 @@
+postgres::::type=role;profiles=Postgres Administration,All
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/postgres/postgresql-8.4/auth_attr Fri Mar 05 22:27:24 2010 +0200
@@ -0,0 +1,2 @@
+solaris.smf.value.postgres:::Change Postgres value properties::
+solaris.smf.manage.postgres:::Manage Postgres service states::
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/postgres/postgresql-8.4/exec_attr Fri Mar 05 22:27:24 2010 +0200
@@ -0,0 +1,12 @@
+Postgres Administration:solaris:cmd:::/usr/postgres/8.4/bin/initdb:uid=postgres
+Postgres Administration:solaris:cmd:::/usr/postgres/8.4/bin/pg_controldata:uid=postgres
+Postgres Administration:solaris:cmd:::/usr/postgres/8.4/bin/pg_ctl:uid=postgres
+Postgres Administration:solaris:cmd:::/usr/postgres/8.4/bin/pg_resetxlog:uid=postgres
+Postgres Administration:solaris:cmd:::/usr/postgres/8.4/bin/postgres:uid=postgres
+Postgres Administration:solaris:cmd:::/usr/postgres/8.4/bin/postmaster:uid=postgres
+Postgres Administration:solaris:cmd:::/usr/postgres/8.4/bin/64/initdb:uid=postgres
+Postgres Administration:solaris:cmd:::/usr/postgres/8.4/bin/64/pg_controldata:uid=postgres
+Postgres Administration:solaris:cmd:::/usr/postgres/8.4/bin/64/pg_ctl:uid=postgres
+Postgres Administration:solaris:cmd:::/usr/postgres/8.4/bin/64/pg_resetxlog:uid=postgres
+Postgres Administration:solaris:cmd:::/usr/postgres/8.4/bin/64/postgres:uid=postgres
+Postgres Administration:solaris:cmd:::/usr/postgres/8.4/bin/64/postmaster:uid=postgres
--- a/usr/src/cmd/postgres/postgresql-8.4/install-sfw Tue Feb 23 00:53:20 2010 +0200
+++ b/usr/src/cmd/postgres/postgresql-8.4/install-sfw Fri Mar 05 22:27:24 2010 +0200
@@ -19,10 +19,10 @@
#
# CDDL HEADER END
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "@(#)install-sfw 1.1 09/10/13 SMI"
+#ident "@(#)install-sfw 1.2 10/02/19 SMI"
. ${SRC}/tools/install.subr
@@ -78,8 +78,14 @@
MANIFESTDIR=${ROOT}/var/svc/manifest/application/database
METHODDIR=${ROOT}/lib/svc/method
ETC=${ROOT}/etc
+RIGHTSDIR=${ETC}/security
REGRDIR=${PREFIX}/lib/regress
+_install N user_attr ${ETC}/user_attr.d/postgres-84 0444
+_install N auth_attr ${RIGHTSDIR}/auth_attr.d/postgres-84 0444
+_install N exec_attr ${RIGHTSDIR}/exec_attr.d/postgres-84 0444
+_install N prof_attr ${RIGHTSDIR}/prof_attr.d/postgres-84 0444
+
nuke_archive_libs
install_dir ${VARDIR} 755
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/postgres/postgresql-8.4/prof_attr Fri Mar 05 22:27:24 2010 +0200
@@ -0,0 +1,1 @@
+Postgres Administration::::auths=solaris.smf.manage.postgres,solaris.smf.value.postgres
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/postgres/postgresql-8.4/user_attr Fri Mar 05 22:27:24 2010 +0200
@@ -0,0 +1,1 @@
+postgres::::type=role;profiles=Postgres Administration,All
--- a/usr/src/cmd/quagga/Makefile.sfw Tue Feb 23 00:53:20 2010 +0200
+++ b/usr/src/cmd/quagga/Makefile.sfw Fri Mar 05 22:27:24 2010 +0200
@@ -18,10 +18,10 @@
#
# CDDL HEADER END
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#pragma ident "@(#)Makefile.sfw 1.9 09/07/14 SMI"
+#pragma ident "@(#)Makefile.sfw 1.10 10/02/19 SMI"
NAME=quagga
VERSION=0.99.8
@@ -79,6 +79,7 @@
(cd $(BUILDDIR) ; $(GMAKE) \
install MAKE="$(GMAKE)" DESTDIR="$(ROOT)" ; \
$(SH) ../post-install.sh "$(ROOT)" "$(SRCDIR)")
+ $(INSTALL_PROTO) -m 0444 exec_attr $(ROOT)/etc/security/exec_attr.d/quagga
$(BUILDDIR)/config.status: .prep
(cd $(BUILDDIR); env \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/quagga/exec_attr Fri Mar 05 22:27:24 2010 +0200
@@ -0,0 +1,2 @@
+Network Management:solaris:cmd:::/usr/sbin/quaggaadm:privs=basic
+Network Management:solaris:cmd:::/usr/sbin/zebraadm:privs=basic
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/sg3_utils/exec_attr Fri Mar 05 22:27:24 2010 +0200
@@ -0,0 +1,35 @@
+SCSI Device Info:solaris:cmd:::/usr/sbin/sg_get_config:euid=0;privs=file_dac_read,file_dac_write,sys_devices
+SCSI Device Info:solaris:cmd:::/usr/sbin/sg_ident:euid=0;privs=file_dac_read,file_dac_write,sys_devices
+SCSI Device Info:solaris:cmd:::/usr/sbin/sg_inq:euid=0;privs=file_dac_read,file_dac_write,sys_devices
+SCSI Device Info:solaris:cmd:::/usr/sbin/sg_logs:euid=0;privs=file_dac_read,file_dac_write,sys_devices
+SCSI Device Info:solaris:cmd:::/usr/sbin/sg_luns:euid=0;privs=file_dac_read,file_dac_write,sys_devices
+SCSI Device Info:solaris:cmd:::/usr/sbin/sg_modes:euid=0;privs=file_dac_read,file_dac_write,sys_devices
+SCSI Device Info:solaris:cmd:::/usr/sbin/sg_opcodes:euid=0;privs=file_dac_read,file_dac_write,sys_devices
+SCSI Device Info:solaris:cmd:::/usr/sbin/sg_read_buffer:euid=0;privs=file_dac_read,file_dac_write,sys_devices
+SCSI Device Info:solaris:cmd:::/usr/sbin/sg_read_long:euid=0;privs=file_dac_read,file_dac_write,sys_devices
+SCSI Device Info:solaris:cmd:::/usr/sbin/sg_readcap:euid=0;privs=file_dac_read,file_dac_write,sys_devices
+SCSI Device Info:solaris:cmd:::/usr/sbin/sg_requests:euid=0;privs=file_dac_read,file_dac_write,sys_devices
+SCSI Device Info:solaris:cmd:::/usr/sbin/sg_rmsn:euid=0;privs=file_dac_read,file_dac_write,sys_devices
+SCSI Device Info:solaris:cmd:::/usr/sbin/sg_rtpg:euid=0;privs=file_dac_read,file_dac_write,sys_devices
+SCSI Device Info:solaris:cmd:::/usr/sbin/sg_safte:euid=0;privs=file_dac_read,file_dac_write,sys_devices
+SCSI Device Info:solaris:cmd:::/usr/sbin/sg_sat_identify:euid=0;privs=file_dac_read,file_dac_write,sys_devices
+SCSI Device Info:solaris:cmd:::/usr/sbin/sg_sat_phy_event:euid=0;privs=file_dac_read,file_dac_write,sys_devices
+SCSI Device Info:solaris:cmd:::/usr/sbin/sg_vpd:euid=0;privs=file_dac_read,file_dac_write,sys_devices
+
+SCSI Device Management:solaris:cmd:::/usr/sbin/sg_sync:euid=0;privs=file_dac_read,file_dac_write,sys_devices
+SCSI Device Management:solaris:cmd:::/usr/sbin/sg_persist:euid=0;privs=file_dac_read,file_dac_write,sys_devices
+SCSI Device Management:solaris:cmd:::/usr/sbin/sg_prevent:euid=0;privs=file_dac_read,file_dac_write,sys_devices
+SCSI Device Management:solaris:cmd:::/usr/sbin/sg_raw:euid=0;privs=file_dac_read,file_dac_write,sys_devices
+SCSI Device Management:solaris:cmd:::/usr/sbin/sg_rdac:euid=0;privs=file_dac_read,file_dac_write,sys_devices
+SCSI Device Management:solaris:cmd:::/usr/sbin/sg_reassign:euid=0;privs=file_dac_read,file_dac_write,sys_devices
+SCSI Device Management:solaris:cmd:::/usr/sbin/sg_sat_set_features:euid=0;privs=file_dac_read,file_dac_write,sys_devices
+SCSI Device Management:solaris:cmd:::/usr/sbin/sg_senddiag:euid=0;privs=file_dac_read,file_dac_write,sys_devices
+SCSI Device Management:solaris:cmd:::/usr/sbin/sg_ses:euid=0;privs=file_dac_read,file_dac_write,sys_devices
+SCSI Device Management:solaris:cmd:::/usr/sbin/sg_start:euid=0;privs=file_dac_read,file_dac_write,sys_devices
+SCSI Device Management:solaris:cmd:::/usr/sbin/sg_stpg:euid=0;privs=file_dac_read,file_dac_write,sys_devices
+SCSI Device Management:solaris:cmd:::/usr/sbin/sg_sync:euid=0;privs=file_dac_read,file_dac_write,sys_devices
+SCSI Device Management:solaris:cmd:::/usr/sbin/sg_turs:euid=0;privs=file_dac_read,file_dac_write,sys_devices
+SCSI Device Management:solaris:cmd:::/usr/sbin/sg_verify:euid=0;privs=file_dac_read,file_dac_write,sys_devices
+SCSI Device Management:solaris:cmd:::/usr/sbin/sg_wr_mode:euid=0;privs=file_dac_read,file_dac_write,sys_devices
+SCSI Device Management:solaris:cmd:::/usr/sbin/sg_write_buffer:euid=0;privs=file_dac_read,file_dac_write,sys_devices
+SCSI Device Management:solaris:cmd:::/usr/sbin/sg_write_long:euid=0;privs=file_dac_read,file_dac_write,sys_devices
--- a/usr/src/cmd/sg3_utils/install-sfw Tue Feb 23 00:53:20 2010 +0200
+++ b/usr/src/cmd/sg3_utils/install-sfw Fri Mar 05 22:27:24 2010 +0200
@@ -21,10 +21,10 @@
#
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "@(#)install-sfw 1.1 09/02/09 SMI"
+# ident "@(#)install-sfw 1.2 10/02/19 SMI"
PREFIX=${ROOT}/usr
BINDIR=${PREFIX}/sbin
@@ -88,4 +88,7 @@
done
_install M ${VERS}/doc/sg3_utils.8 ${MAN1MDIR}/sg3_utils.1m 444
+_install N exec_attr ${ROOT}/etc/security/exec_attr.d/sg3_utils 444
+_install N prof_attr ${ROOT}/etc/security/prof_attr.d/sg3_utils 444
+
exit 0
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/sg3_utils/prof_attr Fri Mar 05 22:27:24 2010 +0200
@@ -0,0 +1,2 @@
+SCSI Device Info:::Inquiry, read device information
+SCSI Device Management:::Manage, modify device status or data:profiles=SCSI Device Info
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/snort/auth_attr Fri Mar 05 22:27:24 2010 +0200
@@ -0,0 +1,2 @@
+solaris.smf.manage.snort:::Manage snort service states::
+solaris.smf.value.snort:::Change snort value properties::
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/snort/exec_attr Fri Mar 05 22:27:24 2010 +0200
@@ -0,0 +1,1 @@
+Network Management:solaris:cmd:::/usr/bin/snort:privs=net_rawaccess
--- a/usr/src/cmd/snort/install-sfw Tue Feb 23 00:53:20 2010 +0200
+++ b/usr/src/cmd/snort/install-sfw Fri Mar 05 22:27:24 2010 +0200
@@ -21,10 +21,10 @@
#
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "@(#)install-sfw 1.1 09/06/18 SMI"
+# ident "@(#)install-sfw 1.2 10/02/19 SMI"
#
# stop at first error
@@ -79,4 +79,7 @@
_install N etc/classification.config ${ROOT}/etc/classification.config 644
_install N etc/reference.config ${ROOT}/etc/reference.config 644
+_install N ../auth_attr ${ROOT}/etc/security/auth_attr.d/snort 444
+_install N ../exec_attr ${ROOT}/etc/security/exec_attr.d/snort 444
+
exit 0
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/stunnel/auth_attr Fri Mar 05 22:27:24 2010 +0200
@@ -0,0 +1,2 @@
+solaris.smf.value.stunnel:::Change stunnel value properties::
+solaris.smf.manage.stunnel:::Manage stunnel service states::
--- a/usr/src/cmd/stunnel/install-sfw Tue Feb 23 00:53:20 2010 +0200
+++ b/usr/src/cmd/stunnel/install-sfw Fri Mar 05 22:27:24 2010 +0200
@@ -20,13 +20,13 @@
# CDDL HEADER END
#
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# install objects in the proto area, since it would
# really like to install locally, but that doesn't scale.
#
-#ident "@(#)install-sfw 1.1 08/07/11 SMI"
+#ident "@(#)install-sfw 1.2 10/02/19 SMI"
set -e
PKGNAME=${1}
@@ -59,5 +59,7 @@
_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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/stunnel/prof_attr Fri Mar 05 22:27:24 2010 +0200
@@ -0,0 +1,1 @@
+Stunnel Administration::::auths=solaris.smf.manage.stunnel,solaris.smf.value.stunnel
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/tor/auth_attr Fri Mar 05 22:27:24 2010 +0200
@@ -0,0 +1,2 @@
+solaris.smf.manage.tor:::Manage Tor service states::
+solaris.smf.value.tor:::Change Tor value properties::
--- a/usr/src/cmd/tor/install-sfw Tue Feb 23 00:53:20 2010 +0200
+++ b/usr/src/cmd/tor/install-sfw Fri Mar 05 22:27:24 2010 +0200
@@ -19,10 +19,10 @@
#
# CDDL HEADER END
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "@(#)install-sfw 1.1 09/05/18 SMI"
+# ident "@(#)install-sfw 1.2 10/02/19 SMI"
#
set -o errexit
@@ -49,6 +49,8 @@
_install N tor.xml ${MANIFESTDIR}/tor.xml 444
_install N tor.sh ${METHODDIR}/tor.sh 555
+_install N auth_attr ${ROOT}/etc/security/auth_attr.d/tor 444
+_install N prof_attr ${ROOT}/etc/security/prof_attr.d/tor 444
cd ${TOP}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/tor/prof_attr Fri Mar 05 22:27:24 2010 +0200
@@ -0,0 +1,1 @@
+Tor Administration::::auths=solaris.smf.manage.tor,solaris.smf.value.tor
--- a/usr/src/cmd/vim/runtime.patch Tue Feb 23 00:53:20 2010 +0200
+++ b/usr/src/cmd/vim/runtime.patch Fri Mar 05 22:27:24 2010 +0200
@@ -3101,7 +3101,7 @@
+ \%f:%l:%c:\ %m,
\%f:%l:\ %m,
\\"%f\"\\,\ line\ %l%*\\D%c%*[^\ ]\ %m,
- \10/02/15*\\a[%*\\d]:\ Entering\ directory\ `%f',
+ \10/03/01*\\a[%*\\d]:\ Entering\ directory\ `%f',
diff -Nur runtime.patched/compiler/jikes.vim runtime/compiler/jikes.vim
--- runtime.patched/compiler/jikes.vim 2004-06-07 07:32:36.000000000 -0700
+++ runtime/compiler/jikes.vim 2009-01-28 08:23:44.000000000 -0800
--- a/usr/src/cmd/wireshark/Makefile.sfw Tue Feb 23 00:53:20 2010 +0200
+++ b/usr/src/cmd/wireshark/Makefile.sfw Fri Mar 05 22:27:24 2010 +0200
@@ -20,10 +20,10 @@
#
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "@(#)Makefile.sfw 1.6 09/12/04 SMI"
+#ident "@(#)Makefile.sfw 1.7 10/02/19 SMI"
#
include ../Makefile.cmd
@@ -69,6 +69,7 @@
$(CP) $(VER)/wireshark.desktop $(ROOT)/usr/share/applications/
$(RM) $(ROOT)/usr/share/pixmaps/wireshark.png
$(CP) $(VER)/image/wsicon64.png $(ROOT)/usr/share/pixmaps/wireshark.png
+ $(INSTALL_PROTO) -m 0444 exec_attr $(ROOT)/etc/security/exec_attr.d/wireshark
install-protofix: install-target
for pkg in $(COMPONENT_PACKAGES:sh) ; do \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/wireshark/exec_attr Fri Mar 05 22:27:24 2010 +0200
@@ -0,0 +1,3 @@
+Network Management:solaris:cmd:::/usr/sbin/tshark:privs=net_rawaccess
+Network Management:solaris:cmd:::/usr/sbin/dumpcap:privs=net_rawaccess
+Network Management:solaris:cmd:::/usr/sbin/wireshark:privs=net_rawaccess
--- a/usr/src/common/Makefile Tue Feb 23 00:53:20 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +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/03/26 SMI"
-#
-# include global definitions
-include $(SRC)/Makefile.master
-#
-install:
- @cd rbac ; pwd ; $(MAKE) install
--- a/usr/src/common/rbac/Makefile Tue Feb 23 00:53:20 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +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/03/26 SMI"
-#
-# include global definitions
-include $(SRC)/Makefile.master
-#
-
-ETCSECURITYFILES = auth_attr exec_attr prof_attr
-ETCFILES = user_attr
-OWNER=root
-GROUP=sys
-FILEMODE=0644
-
-ROOTETCSECURITY=$(ROOTETC)/security
-ROOTETCSECURITYFILES=$(ETCSECURITYFILES:%=$(ROOTETCSECURITY)/%)
-ROOTETCFILES=$(ETCFILES:%=$(ROOTETC)/%)
-
-$(ROOTETCSECURITY)/% $(ROOTETC)/%: %
- $(INS.file)
-
-install: $(ROOTETCFILES) $(ROOTETCSECURITYFILES)
--- a/usr/src/common/rbac/auth_attr Tue Feb 23 00:53:20 2010 +0200
+++ /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 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# /etc/security/auth_attr
-#
-# execution attributes for profiles. see auth_attr(4)
-#
-#ident "@(#)auth_attr 1.13 09/06/18 SMI"
-#
-
-solaris.smf.manage.cups:::Manage CUPS service states::help=ManageCUPS.html
-solaris.smf.value.postgres:::Change Postgres value properties::
-solaris.smf.manage.postgres:::Manage Postgres service states::
-solaris.smf.value.mysql/version_50:::Change MySQL value properties::
-solaris.smf.manage.mysql/version_50:::Manage MySQL service states::
-solaris.smf.value.http/apache22:::Change Apache 22 value properties::
-solaris.smf.manage.http/apache22:::Manage Apache 22 service states::
-solaris.smf.value.memcached:::Change Memcached value properties::
-solaris.smf.manage.memcached:::Manage Memcached service states::
-solaris.smf.value.stunnel:::Change stunnel value properties::
-solaris.smf.manage.stunnel:::Manage stunnel service states::
-solaris.smf.value.http/lighttpd14:::Change Lighttpd 14 value properties::
-solaris.smf.manage.http/lighttpd14:::Manage Lighttpd 14 service states::
-solaris.smf.value.tcsd:::Change TPM Administation value properties::
-solaris.smf.manage.tcsd:::Manage TPM Administration service states::
-solaris.smf.value.openwsmand:::Change openwsmand value properties::
-solaris.smf.manage.openwsmand:::Manage openwsmand value properties::
-solaris.smf.manage.tor:::Manage Tor service states::
-solaris.smf.value.tor:::Change Tor value properties::
-solaris.smf.value.ntp:::Change NTP value properties::help=SmfValueNTP.html
-solaris.smf.manage.ntp:::Manage NTP service states::help=SmfNTPStates.html
-solaris.smf.value.ejabberd:::Change ejabberd value properties::
-solaris.smf.manage.ejabberd:::Manage ejabberd service states::
-solaris.smf.manage.snort:::Manage snort service states::
-solaris.smf.value.snort:::Change snort value properties::
--- a/usr/src/common/rbac/exec_attr Tue Feb 23 00:53:20 2010 +0200
+++ /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.
-#
-# /etc/security/exec_attr
-#
-# execution attributes for profiles. see exec_attr(4)
-#
-#ident "@(#)exec_attr 1.15 09/06/18 SMI"
-#
-
-Network Management:solaris:cmd:::/usr/bin/fping:privs=net_icmpaccess
-Network Management:solaris:cmd:::/usr/sbin/quaggaadm:privs=basic
-Network Management:solaris:cmd:::/usr/sbin/zebraadm:privs=basic
-Network Management:solaris:cmd:::/usr/sbin/tshark:privs=net_rawaccess
-Network Management:solaris:cmd:::/usr/sbin/dumpcap:privs=net_rawaccess
-Network Management:solaris:cmd:::/usr/sbin/wireshark:privs=net_rawaccess
-Network Management:solaris:cmd:::/usr/bin/snort:privs=net_rawaccess
-Basic Solaris User:solaris:cmd:::/usr/bin/cdrecord.bin:privs=file_dac_read,sys_devices,proc_lock_memory,proc_priocntl,net_privaddr
-Basic Solaris User:solaris:cmd:::/usr/bin/readcd.bin:privs=file_dac_read,sys_devices,net_privaddr
-Basic Solaris User:solaris:cmd:::/usr/bin/cdda2wav.bin:privs=file_dac_read,sys_devices,proc_priocntl,net_privaddr
-Ejabberd Administration:solaris:cmd:::/usr/sbin/ejabberdctl:uid=daemon;gid=daemon
-OpenLDAP Server Administration:suser:cmd:::/usr/sbin/slapd:uid=openldap;gid=openlap;privs=basic,net_privaddr
-OpenLDAP Server Administration:suser:cmd:::/usr/sbin/slapacl:uid=openldap;gid=openldap
-OpenLDAP Server Administration:suser:cmd:::/usr/sbin/slapadd:uid=openldap;gid=openldap
-OpenLDAP Server Administration:suser:cmd:::/usr/sbin/slapauth:uid=openldap;gid=openldap
-OpenLDAP Server Administration:suser:cmd:::/usr/sbin/slapcat:uid=openldap;gid=openldap
-OpenLDAP Server Administration:suser:cmd:::/usr/sbin/slapdn:uid=openldap;gid=openldap
-OpenLDAP Server Administration:suser:cmd:::/usr/sbin/slapindex:uid=openldap;gid=openldap
-OpenLDAP Server Administration:suser:cmd:::/usr/sbin/slappasswd:uid=openldap;gid=openldap
-OpenLDAP Server Administration:suser:cmd:::/usr/sbin/slaptest:uid=openldap;gid=openldap
-Openwsman Server Administration:solaris:cmd:::/usr/sbin/openwsmand:euid=0
-Postgres Administration:solaris:cmd:::/usr/postgres/8.2/bin/initdb:uid=postgres
-Postgres Administration:solaris:cmd:::/usr/postgres/8.2/bin/ipcclean:uid=postgres
-Postgres Administration:solaris:cmd:::/usr/postgres/8.2/bin/pg_controldata:uid=postgres
-Postgres Administration:solaris:cmd:::/usr/postgres/8.2/bin/pg_ctl:uid=postgres
-Postgres Administration:solaris:cmd:::/usr/postgres/8.2/bin/pg_resetxlog:uid=postgres
-Postgres Administration:solaris:cmd:::/usr/postgres/8.2/bin/postgres:uid=postgres
-Postgres Administration:solaris:cmd:::/usr/postgres/8.2/bin/postmaster:uid=postgres
-
-SCSI Device Info:solaris:cmd:::/usr/sbin/sg_get_config:euid=0;privs=file_dac_read,file_dac_write,sys_devices
-SCSI Device Info:solaris:cmd:::/usr/sbin/sg_ident:euid=0;privs=file_dac_read,file_dac_write,sys_devices
-SCSI Device Info:solaris:cmd:::/usr/sbin/sg_inq:euid=0;privs=file_dac_read,file_dac_write,sys_devices
-SCSI Device Info:solaris:cmd:::/usr/sbin/sg_logs:euid=0;privs=file_dac_read,file_dac_write,sys_devices
-SCSI Device Info:solaris:cmd:::/usr/sbin/sg_luns:euid=0;privs=file_dac_read,file_dac_write,sys_devices
-SCSI Device Info:solaris:cmd:::/usr/sbin/sg_modes:euid=0;privs=file_dac_read,file_dac_write,sys_devices
-SCSI Device Info:solaris:cmd:::/usr/sbin/sg_opcodes:euid=0;privs=file_dac_read,file_dac_write,sys_devices
-SCSI Device Info:solaris:cmd:::/usr/sbin/sg_read_buffer:euid=0;privs=file_dac_read,file_dac_write,sys_devices
-SCSI Device Info:solaris:cmd:::/usr/sbin/sg_read_long:euid=0;privs=file_dac_read,file_dac_write,sys_devices
-SCSI Device Info:solaris:cmd:::/usr/sbin/sg_readcap:euid=0;privs=file_dac_read,file_dac_write,sys_devices
-SCSI Device Info:solaris:cmd:::/usr/sbin/sg_requests:euid=0;privs=file_dac_read,file_dac_write,sys_devices
-SCSI Device Info:solaris:cmd:::/usr/sbin/sg_rmsn:euid=0;privs=file_dac_read,file_dac_write,sys_devices
-SCSI Device Info:solaris:cmd:::/usr/sbin/sg_rtpg:euid=0;privs=file_dac_read,file_dac_write,sys_devices
-SCSI Device Info:solaris:cmd:::/usr/sbin/sg_safte:euid=0;privs=file_dac_read,file_dac_write,sys_devices
-SCSI Device Info:solaris:cmd:::/usr/sbin/sg_sat_identify:euid=0;privs=file_dac_read,file_dac_write,sys_devices
-SCSI Device Info:solaris:cmd:::/usr/sbin/sg_sat_phy_event:euid=0;privs=file_dac_read,file_dac_write,sys_devices
-SCSI Device Info:solaris:cmd:::/usr/sbin/sg_vpd:euid=0;privs=file_dac_read,file_dac_write,sys_devices
-
-SCSI Device Management:solaris:cmd:::/usr/sbin/sg_sync:euid=0;privs=file_dac_read,file_dac_write,sys_devices
-SCSI Device Management:solaris:cmd:::/usr/sbin/sg_persist:euid=0;privs=file_dac_read,file_dac_write,sys_devices
-SCSI Device Management:solaris:cmd:::/usr/sbin/sg_prevent:euid=0;privs=file_dac_read,file_dac_write,sys_devices
-SCSI Device Management:solaris:cmd:::/usr/sbin/sg_raw:euid=0;privs=file_dac_read,file_dac_write,sys_devices
-SCSI Device Management:solaris:cmd:::/usr/sbin/sg_rdac:euid=0;privs=file_dac_read,file_dac_write,sys_devices
-SCSI Device Management:solaris:cmd:::/usr/sbin/sg_reassign:euid=0;privs=file_dac_read,file_dac_write,sys_devices
-SCSI Device Management:solaris:cmd:::/usr/sbin/sg_sat_set_features:euid=0;privs=file_dac_read,file_dac_write,sys_devices
-SCSI Device Management:solaris:cmd:::/usr/sbin/sg_senddiag:euid=0;privs=file_dac_read,file_dac_write,sys_devices
-SCSI Device Management:solaris:cmd:::/usr/sbin/sg_ses:euid=0;privs=file_dac_read,file_dac_write,sys_devices
-SCSI Device Management:solaris:cmd:::/usr/sbin/sg_start:euid=0;privs=file_dac_read,file_dac_write,sys_devices
-SCSI Device Management:solaris:cmd:::/usr/sbin/sg_stpg:euid=0;privs=file_dac_read,file_dac_write,sys_devices
-SCSI Device Management:solaris:cmd:::/usr/sbin/sg_sync:euid=0;privs=file_dac_read,file_dac_write,sys_devices
-SCSI Device Management:solaris:cmd:::/usr/sbin/sg_turs:euid=0;privs=file_dac_read,file_dac_write,sys_devices
-SCSI Device Management:solaris:cmd:::/usr/sbin/sg_verify:euid=0;privs=file_dac_read,file_dac_write,sys_devices
-SCSI Device Management:solaris:cmd:::/usr/sbin/sg_wr_mode:euid=0;privs=file_dac_read,file_dac_write,sys_devices
-SCSI Device Management:solaris:cmd:::/usr/sbin/sg_write_buffer:euid=0;privs=file_dac_read,file_dac_write,sys_devices
-SCSI Device Management:solaris:cmd:::/usr/sbin/sg_write_long:euid=0;privs=file_dac_read,file_dac_write,sys_devices
-
-Parallel Console Access:solaris:cmd:::/usr/sbin/pconsole-bin:privs=all
--- a/usr/src/common/rbac/prof_attr Tue Feb 23 00:53:20 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +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.
-#
-# /etc/security/prof_attr
-#
-# execution attributes for profiles. see prof_attr(4)
-#
-#ident "@(#)prof_attr 1.15 09/06/17 SMI"
-#
-
-CUPS Administration::::auths=solaris.smf.manage.cups
-Ejabberd Administration:::Ejabberd Service Administration:auths=solaris.smf.manage.ejabberd,solaris.smf.value.ejabberd
-OpenLDAP Server Administration:::OpenLDAP Server scripts/commands:
-Openwsman Server Administration::::auths=solaris.smf.manage.openwsmand,solaris.smf.value.openwsmand
-Postgres Administration::::auths=solaris.smf.manage.postgres,solaris.smf.value.postgres
-MySQL Administration::::auths=solaris.smf.manage.mysql/version_50,solaris.smf.value.mysql/version_50
-Apache 22 Administration::::auths=solaris.smf.manage.http/apache22,solaris.smf.value.http/apache22
-Memcached Administration::::auths=solaris.smf.manage.memcached,solaris.smf.value.memcached
-Stunnel Administration::::auths=solaris.smf.manage.stunnel,solaris.smf.value.stunnel
-Lighttpd 14 Administration::::auths=solaris.smf.manage.http/lighttpd14,solaris.smf.value.http/lighttpd14
-TPM Administration::::auths=solaris.smf.manage.tcsd,solaris.smf.value.tcsd
-SCSI Device Info:::Inquiry, read device information
-SCSI Device Management:::Manage, modify device status or data:profiles=SCSI Device Info
-Tor Administration::::auths=solaris.smf.manage.tor,solaris.smf.value.tor
-NTP Management:::Manage the NTP service:auths=solaris.smf.manage.ntp,solaris.smf.value.ntp
-Parallel Console Access:::Connect to remote consoles with pconsole:help=pconsole.html
-
--- a/usr/src/common/rbac/user_attr Tue Feb 23 00:53:20 2010 +0200
+++ /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 2007 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# /etc/user_attr
-#
-# execution attributes for profiles. see user_attr(4)
-#
-#ident "@(#)user_attr 1.2 07/11/14 SMI"
-#
-#
-postgres::::type=role;profiles=Postgres Administration,All
--- a/usr/src/lib/Makefile Tue Feb 23 00:53:20 2010 +0200
+++ b/usr/src/lib/Makefile Fri Mar 05 22:27:24 2010 +0200
@@ -23,7 +23,7 @@
# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "@(#)Makefile 1.91 10/01/28 SMI"
+# ident "@(#)Makefile 1.92 10/02/24 SMI"
#
#
@@ -144,7 +144,6 @@
saaj \
sane-backends \
snack \
- sqlite3 \
tcltls \
trousers \
unixodbc \
@@ -178,7 +177,6 @@
curl: openssl zlib idn
libxmlrpc-c: curl
memcached: libevent
-sqlite3: tcl
lcms: zlib
libmng: lcms
mpfr: gnump
--- a/usr/src/lib/curl/METADATA Tue Feb 23 00:53:20 2010 +0200
+++ b/usr/src/lib/curl/METADATA Fri Mar 05 22:27:24 2010 +0200
@@ -1,10 +1,10 @@
NAME: curl
-VERSION: 7.19.5
+VERSION: 7.20.0
DESCRIPTION: Command line URL transfer program
LICENSE: CURL
PACKAGE: SUNWcurl
PROJECT_URL: http://curl.haxx.se/
-SOURCE_DOWNLOAD: http://curl.haxx.se/download/curl-7.19.5.tar.gz
+SOURCE_DOWNLOAD: http://curl.haxx.se/download/curl-7.20.0.tar.gz
SUPPORT: B
BUGTRAQ: solaris/library/curl
OSR: 5739
@@ -13,21 +13,3 @@
=======================================================
-2009/08/17:
-
-Krister Johansen has submitted upstream a patch for CR 6868002. This
-patch is included in the current Nevada integration of CURL 7.19.5,
-and will be integrated upstream starting with CURL 7.19.7.
-
-Security Advisory
-
-http://curl.haxx.se/docs/adv_20090812.html
-
-is satisfied by upstream patch
-
-http://curl.haxx.se/CVE-2009-2417/curl-7.19.5-CVE-2009-2417.patch
-
-and is included with the current integration of CURL 7.19.5.
-
------
-
--- a/usr/src/lib/curl/Makefile.sfw Tue Feb 23 00:53:20 2010 +0200
+++ b/usr/src/lib/curl/Makefile.sfw Fri Mar 05 22:27:24 2010 +0200
@@ -19,16 +19,17 @@
# CDDL HEADER END
#
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "@(#)Makefile.sfw 1.9 09/08/24 SMI"
+#ident "@(#)Makefile.sfw 1.10 10/02/23 SMI"
#
# This makefile builds both 32 and 64 bit versions of the library.
# Builds occur in separate directories.
#
-VER=curl-7.19.5
+RELNUM=$(COMPONENT_VERSION:sh)
+VER=curl-$(RELNUM)
VER64=$(VER)-64
LARGEFILES= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
@@ -54,6 +55,9 @@
CONFIGURE_OPTIONS += --enable-file --enable-dict
CONFIGURE_OPTIONS += --enable-telnet --enable-tftp
CONFIGURE_OPTIONS += --enable-manual --disable-libgcc
+CONFIGURE_OPTIONS += --enable-rtsp --enable-proxy
+CONFIGURE_OPTIONS += --enable-telnet --enable-tftp --enable-pop3
+CONFIGURE_OPTIONS += --enable-imap --enable-smtp
CONFIGURE_OPTIONS += --enable-ipv6 --enable-nonblocking
CONFIGURE_OPTIONS += --enable-thread --enable-verbose
CONFIGURE_OPTIONS += --disable-sspi --enable-crypto-auth
@@ -110,8 +114,8 @@
LINTFLAGS64= -I./include -I. -Xc99=%all $(CCBITS64) $(LARGEFILES)
install: all
- $(SH) ./install-sfw
- MACH64=$(MACH64) $(SH) ./install-sfw-64
+ VERS=$(VER) $(SHELL) ./install-sfw
+ MACH64=$(MACH64) VERS=$(VER64) $(SHELL) ./install-sfw-64
real-all: all32 all64 lint32 lint64
@@ -178,8 +182,10 @@
$(CONFIGURE_OPTIONS) ; \
rm -f curl-config; \
cp -p ../Solaris/curl-config-64 curl-config; \
- touch -acm curl-config; \
- rm -f libcurl.pc; \
+ /usr/gnu/bin/sed -e "s#MACH64#$(MACH64)#g" curl-config > curl-config.sed ; \
+ cp -fp curl-config.sed curl-config ; \
+ touch -acm curl-config ; \
+ rm -f libcurl.pc ; \
cp -p ../Solaris/libcurl.pc .; \
/bin/ksh ../postprocess-pkgconfig-64 libcurl.pc )
@@ -187,12 +193,10 @@
mkdir -p tmp; gzip -dc $(VER).tar.gz | (cd tmp; tar xopf -)
mv tmp/$(VER) $(VER); rmdir tmp
( cd $(VER) ; \
- gpatch -p1 <../Solaris/diffs/configure.0.diff ; \
- gpatch -p1 <../Solaris/diffs/Makefile.in.1.diff ; \
- gpatch -p1 <../Solaris/diffs/curlbuild.h.2.diff ; \
- gpatch -p1 <../Solaris/diffs/Makefile.in.3.diff ; \
- gpatch -p1 < ../Solaris/diffs/curl-7.19.5-CVE-2009-2417.patch ; \
- gpatch -p1 < ../Solaris/diffs/curl-multi-crash-2.patch ; \
+ gpatch -p0 <../Solaris/diffs/configure.0.diff ; \
+ gpatch -p0 <../Solaris/diffs/Makefile.in.1.diff ; \
+ gpatch -p0 <../Solaris/diffs/curlbuild.h.2.diff ; \
+ gpatch -p0 <../Solaris/diffs/Makefile.in.3.diff ; \
touch -acm configure ; \
touch -acm include/curl/curlbuild.h ; \
chmod 0755 configure )
@@ -201,12 +205,10 @@
mkdir -p tmp; gzip -dc $(VER).tar.gz | (cd tmp; tar xopf -)
mv tmp/$(VER) $(VER64); rmdir tmp
( cd $(VER64) ; \
- gpatch -p1 <../Solaris/diffs/configure.0.diff ; \
- gpatch -p1 <../Solaris/diffs/Makefile.in.1.diff ; \
- gpatch -p1 <../Solaris/diffs/curlbuild.h.2.diff ; \
- gpatch -p1 <../Solaris/diffs/Makefile.in.3.diff ; \
- gpatch -p1 < ../Solaris/diffs/curl-7.19.5-CVE-2009-2417.patch ; \
- gpatch -p1 < ../Solaris/diffs/curl-multi-crash-2.patch ; \
+ gpatch -p0 <../Solaris/diffs/configure.0.diff ; \
+ gpatch -p0 <../Solaris/diffs/Makefile.in.1.diff ; \
+ gpatch -p0 <../Solaris/diffs/curlbuild.h.2.diff ; \
+ gpatch -p0 <../Solaris/diffs/Makefile.in.3.diff ; \
touch -acm configure ; \
touch -acm include/curl/curlbuild.h ; \
chmod 0755 configure )
--- a/usr/src/lib/curl/Solaris/curl-config Tue Feb 23 00:53:20 2010 +0200
+++ b/usr/src/lib/curl/Solaris/curl-config Fri Mar 05 22:27:24 2010 +0200
@@ -6,7 +6,7 @@
# | (__| |_| | _ <| |___
# \___|\___/|_| \_\_____|
#
-# Copyright (C) 2001 - 2006, Daniel Stenberg, <[email protected]>, et al.
+# Copyright (C) 2001 - 2010, Daniel Stenberg, <[email protected]>, et al.
#
# This software is licensed as described in the file COPYING, which
# you should have received as part of this distribution. The terms
@@ -27,7 +27,7 @@
#
# Modified to conform to Solaris installation paths conventions.
#
-# ident "@(#)curl-config 1.4 09/08/20 SMI"
+# ident "@(#)curl-config 1.5 10/02/18 SMI"
#
prefix=/usr
exec_prefix=${prefix}
@@ -75,7 +75,7 @@
;;
--cc)
- echo "/ws/onnv-tools/SUNWspro/SS11/bin/cc"
+ echo "/ws/onnv-tools/SUNWspro/SS12/bin/cc"
;;
--prefix)
@@ -83,67 +83,18 @@
;;
--feature|--features)
- if test "1" = "1"; then
- echo "SSL"
- NTLM=1 # OpenSSL implies NTLM
- elif test -n ""; then
- echo "SSL"
- fi
- if test "" = "1"; then
- echo "KRB4"
- fi
- if test "1" = "1"; then
- echo "IPv6"
- fi
- if test "1" = "1"; then
- echo "libz"
- fi
- if test "" = "1"; then
- echo "AsynchDNS"
- fi
- if test "1" = "1"; then
- echo "IDN"
- fi
- if test "" = "1"; then
- echo "SSPI"
- NTLM=1
- fi
- if test "$NTLM" = "1"; then
- echo "NTLM"
- fi
+ for feature in SSL IPv6 libz IDN NTLM "" ; do
+ test -n "$feature" && echo "$feature"
+ done
;;
--protocols)
- if test "" != "1"; then
- echo "HTTP"
- if test "1" = "1"; then
- echo "HTTPS"
- fi
- fi
- if test "" != "1"; then
- echo "FTP"
- if test "1" = "1"; then
- echo "FTPS"
- fi
- fi
- if test "" != "1"; then
- echo "FILE"
- fi
- if test "" != "1"; then
- echo "TELNET"
- fi
- if test "" != "1"; then
- echo "LDAP"
- fi
- if test "" != "1"; then
- echo "DICT"
- fi
- if test "" != "1"; then
- echo "TFTP"
- fi
+ for protocol in DICT FILE FTP FTPS HTTP HTTPS IMAP IMAPS LDAP POP3 POP3S RTSP SMTP SMTPS TELNET TFTP ; do
+ echo "$protocol"
+ done
;;
--version)
- echo libcurl 7.19.5
+ echo libcurl 7.20.0
exit 0
;;
@@ -155,20 +106,20 @@
# dash as that's used for things like version 1.2.3-CVS
cpatch=`echo $checkfor | cut -d. -f3 | cut -d- -f1`
checknum=`echo "$cmajor*256*256 + $cminor*256 + ${cpatch:-0}" | bc`
- numuppercase=`echo 071305 | tr 'a-f' 'A-F'`
+ numuppercase=`echo 071400 | tr 'a-f' 'A-F'`
nownum=`echo "obase=10; ibase=16; $numuppercase" | bc`
if test "$nownum" -ge "$checknum"; then
# silent success
exit 0
else
- echo "requested version $checkfor is newer than existing 7.19.5"
+ echo "requested version $checkfor is newer than existing 7.20.0"
exit 1
fi
;;
--vernum)
- echo 071305
+ echo 071400
exit 0
;;
@@ -193,3 +144,4 @@
done
exit 0
+
--- a/usr/src/lib/curl/Solaris/curl-config-64 Tue Feb 23 00:53:20 2010 +0200
+++ b/usr/src/lib/curl/Solaris/curl-config-64 Fri Mar 05 22:27:24 2010 +0200
@@ -6,7 +6,7 @@
# | (__| |_| | _ <| |___
# \___|\___/|_| \_\_____|
#
-# Copyright (C) 2001 - 2006, Daniel Stenberg, <[email protected]>, et al.
+# Copyright (C) 2001 - 2010, Daniel Stenberg, <[email protected]>, et al.
#
# This software is licensed as described in the file COPYING, which
# you should have received as part of this distribution. The terms
@@ -27,7 +27,7 @@
#
# Modified to conform to Solaris installation paths conventions.
#
-# ident "@(#)curl-config-64 1.4 09/08/20 SMI"
+# ident "@(#)curl-config-64 1.5 10/02/18 SMI"
#
prefix=/usr
exec_prefix=${prefix}
@@ -75,7 +75,7 @@
;;
--cc)
- echo "/ws/onnv-tools/SUNWspro/SS11/bin/cc"
+ echo "/ws/onnv-tools/SUNWspro/SS12/bin/cc"
;;
--prefix)
@@ -83,67 +83,18 @@
;;
--feature|--features)
- if test "1" = "1"; then
- echo "SSL"
- NTLM=1 # OpenSSL implies NTLM
- elif test -n ""; then
- echo "SSL"
- fi
- if test "" = "1"; then
- echo "KRB4"
- fi
- if test "1" = "1"; then
- echo "IPv6"
- fi
- if test "1" = "1"; then
- echo "libz"
- fi
- if test "" = "1"; then
- echo "AsynchDNS"
- fi
- if test "1" = "1"; then
- echo "IDN"
- fi
- if test "" = "1"; then
- echo "SSPI"
- NTLM=1
- fi
- if test "$NTLM" = "1"; then
- echo "NTLM"
- fi
+ for feature in SSL IPv6 libz IDN NTLM "" ; do
+ test -n "$feature" && echo "$feature"
+ done
;;
--protocols)
- if test "" != "1"; then
- echo "HTTP"
- if test "1" = "1"; then
- echo "HTTPS"
- fi
- fi
- if test "" != "1"; then
- echo "FTP"
- if test "1" = "1"; then
- echo "FTPS"
- fi
- fi
- if test "" != "1"; then
- echo "FILE"
- fi
- if test "" != "1"; then
- echo "TELNET"
- fi
- if test "" != "1"; then
- echo "LDAP"
- fi
- if test "" != "1"; then
- echo "DICT"
- fi
- if test "" != "1"; then
- echo "TFTP"
- fi
+ for protocol in DICT FILE FTP FTPS HTTP HTTPS IMAP IMAPS LDAP POP3 POP3S RTSP SMTP SMTPS TELNET TFTP ; do
+ echo "$protocol"
+ done
;;
--version)
- echo libcurl 7.19.5
+ echo libcurl 7.20.0
exit 0
;;
@@ -155,20 +106,20 @@
# dash as that's used for things like version 1.2.3-CVS
cpatch=`echo $checkfor | cut -d. -f3 | cut -d- -f1`
checknum=`echo "$cmajor*256*256 + $cminor*256 + ${cpatch:-0}" | bc`
- numuppercase=`echo 071305 | tr 'a-f' 'A-F'`
+ numuppercase=`echo 071400 | tr 'a-f' 'A-F'`
nownum=`echo "obase=10; ibase=16; $numuppercase" | bc`
if test "$nownum" -ge "$checknum"; then
# silent success
exit 0
else
- echo "requested version $checkfor is newer than existing 7.19.5"
+ echo "requested version $checkfor is newer than existing 7.20.0"
exit 1
fi
;;
--vernum)
- echo 071305
+ echo 071400
exit 0
;;
@@ -181,7 +132,7 @@
;;
--libs)
- echo -L/usr/lib${MACH64} -lc -lcurl -lgss -lidn -lsldap -lldap -lsocket -lnsl -lz -lssl -lcrypto
+ echo -L/usr/lib/MACH64 -lc -lcurl -lgss -lidn -lsldap -lldap -lsocket -lnsl -lz -lssl -lcrypto
;;
*)
@@ -193,3 +144,4 @@
done
exit 0
+
--- a/usr/src/lib/curl/Solaris/diffs/Makefile.in.1.diff Tue Feb 23 00:53:20 2010 +0200
+++ b/usr/src/lib/curl/Solaris/diffs/Makefile.in.1.diff Fri Mar 05 22:27:24 2010 +0200
@@ -1,19 +1,19 @@
---- old/lib/Makefile.in 2009-05-16 14:09:35.000000000 -0700
-+++ new/lib/Makefile.in 2009-08-17 14:19:20.044931769 -0700
-@@ -322,7 +322,7 @@
- -I$(top_builddir)/ares \
- -I$(top_srcdir)/ares
+--- lib/Makefile.in 2010-02-09 01:35:12.000000000 -0800
++++ lib/Makefile.in 2010-02-18 07:58:17.955749066 -0800
+@@ -342,7 +342,7 @@
+ @USE_EMBEDDED_ARES_TRUE@ -I$(top_builddir)/ares \
+ @USE_EMBEDDED_ARES_TRUE@ -I$(top_srcdir)/ares
--@SONAME_BUMP_FALSE@VERSIONINFO = -version-info 5:1:1
+-@SONAME_BUMP_FALSE@VERSIONINFO = -version-info 6:0:2
+@SONAME_BUMP_FALSE@VERSIONINFO = -version-info 3:0:0
#
# Bumping of SONAME conditionally may seem like a weird thing to do, and yeah
-@@ -333,7 +333,7 @@
+@@ -353,7 +353,7 @@
#
# This conditional soname bump SHOULD be removed at next "proper" bump.
#
--@SONAME_BUMP_TRUE@VERSIONINFO = -version-info 6:1:1
+-@SONAME_BUMP_TRUE@VERSIONINFO = -version-info 7:0:2
+@SONAME_BUMP_TRUE@VERSIONINFO = -version-info 3:0:0
# This flag accepts an argument of the form current[:revision[:age]]. So,
--- a/usr/src/lib/curl/Solaris/diffs/Makefile.in.3.diff Tue Feb 23 00:53:20 2010 +0200
+++ b/usr/src/lib/curl/Solaris/diffs/Makefile.in.3.diff Fri Mar 05 22:27:24 2010 +0200
@@ -1,6 +1,6 @@
---- old/tests/server/Makefile.in 2009-05-16 14:09:37.000000000 -0700
-+++ new/tests/server/Makefile.in 2009-08-17 18:12:42.806597124 -0700
-@@ -152,7 +152,7 @@
+--- tests/server/Makefile.in 2010-02-04 13:42:22.000000000 -0800
++++ tests/server/Makefile.in 2010-02-18 07:59:36.882323096 -0800
+@@ -161,7 +161,7 @@
LDFLAGS = @LDFLAGS@
LIBCURL_LIBS = @LIBCURL_LIBS@
LIBOBJS = @LIBOBJS@
--- a/usr/src/lib/curl/Solaris/diffs/configure.0.diff Tue Feb 23 00:53:20 2010 +0200
+++ b/usr/src/lib/curl/Solaris/diffs/configure.0.diff Fri Mar 05 22:27:24 2010 +0200
@@ -1,12 +1,21 @@
---- old/configure 2009-05-16 14:09:34.000000000 -0700
-+++ new/configure 2009-08-17 16:07:32.688406975 -0700
+--- configure 2010-02-04 13:42:19.000000000 -0800
++++ configure 2010-02-18 08:53:28.907210846 -0800
@@ -1,4 +1,4 @@
-#! /bin/sh
-+#! /bin/bash
++#!/bin/bash
# Guess values for system-dependent variables and create Makefiles.
- # Generated by GNU Autoconf 2.63 for curl -.
+ # Generated by GNU Autoconf 2.65 for curl -.
#
-@@ -648,7 +648,7 @@
+@@ -274,7 +274,7 @@
+ fi
+ fi
+ fi
+-SHELL=${CONFIG_SHELL-/bin/sh}
++SHELL=${CONFIG_SHELL-/bin/bash}
+ export SHELL
+ # Unset more variables known to interfere with behavior of common tools.
+ CLICOLOR_FORCE= GREP_OPTIONS=
+@@ -565,7 +565,7 @@
# Check that we are running under the correct shell.
@@ -15,7 +24,7 @@
case X$lt_ECHO in
X*--fallback-echo)
-@@ -732,7 +732,7 @@
+@@ -649,7 +649,7 @@
elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
test "X$CONFIG_SHELL" != X/bin/ksh; then
# If we have ksh, try running configure again with it.
@@ -24,7 +33,7 @@
export ORIGINAL_CONFIG_SHELL
CONFIG_SHELL=/bin/ksh
export CONFIG_SHELL
-@@ -774,7 +774,7 @@
+@@ -691,7 +691,7 @@
if test "$prev" != 'sed 50q "$0"'; then
echo_test_string=`eval $prev`
export echo_test_string
@@ -33,53 +42,100 @@
else
# Oops. We lost completely, so just stick with echo.
ECHO=echo
-@@ -830,7 +830,7 @@
- subdirs=
- MFLAGS=
- MAKEFLAGS=
--SHELL=${CONFIG_SHELL-/bin/sh}
-+SHELL=${CONFIG_SHELL-/bin/bash}
-
- # Identity of this package.
- PACKAGE_NAME='curl'
-@@ -841,7 +841,7 @@
-
- ac_unique_file="lib/urldata.h"
- # Factoring default headers for most tests.
--ac_includes_default="\
-+ac_includes_default='
- #include <stdio.h>
- #ifdef HAVE_SYS_TYPES_H
- # include <sys/types.h>
-@@ -858,9 +858,6 @@
- # endif
- #endif
- #ifdef HAVE_STRING_H
--# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
--# include <memory.h>
--# endif
- # include <string.h>
- #endif
- #ifdef HAVE_STRINGS_H
-@@ -874,7 +871,7 @@
- #endif
- #ifdef HAVE_UNISTD_H
- # include <unistd.h>
--#endif"
-+#endif'
-
- enable_option_checking=no
- ac_subst_vars='LTLIBOBJS
-@@ -2310,7 +2307,7 @@
+@@ -1969,6 +1969,13 @@
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+ $4
++#include <stdio.h>
++#include <stdlib.h>
++#include <limits.h>
++#include <sys/types.h>
++#include <stdint.h>
++#include <inttypes.h>
++#include <sys/socket.h>
+ int main (void)
+ {
+ static int test_array [1 - 2 * !(($2) >= 0)];
+@@ -1984,6 +1991,13 @@
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+ $4
++#include <stdio.h>
++#include <stdlib.h>
++#include <limits.h>
++#include <sys/types.h>
++#include <stdint.h>
++#include <inttypes.h>
++#include <sys/socket.h>
+ int main (void)
+ {
+ static int test_array [1 - 2 * !(($2) <= $ac_mid)];
+@@ -2009,6 +2023,13 @@
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+ $4
++#include <stdio.h>
++#include <stdlib.h>
++#include <limits.h>
++#include <sys/types.h>
++#include <stdint.h>
++#include <inttypes.h>
++#include <sys/socket.h>
+ int main (void)
+ {
+ static int test_array [1 - 2 * !(($2) < 0)];
+@@ -2024,6 +2045,13 @@
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+ $4
++#include <stdio.h>
++#include <stdlib.h>
++#include <limits.h>
++#include <sys/types.h>
++#include <stdint.h>
++#include <inttypes.h>
++#include <sys/socket.h>
+ int main (void)
+ {
+ static int test_array [1 - 2 * !(($2) >= $ac_mid)];
+@@ -2057,6 +2085,13 @@
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+ $4
++#include <stdio.h>
++#include <stdlib.h>
++#include <limits.h>
++#include <sys/types.h>
++#include <stdint.h>
++#include <inttypes.h>
++#include <sys/socket.h>
+ int main (void)
+ {
+ static int test_array [1 - 2 * !(($2) <= $ac_mid)];
+@@ -2766,7 +2801,7 @@
--ac_config_headers="$ac_config_headers lib/config.h src/config.h include/curl/curlbuild.h"
-+ac_config_headers="$ac_config_headers lib/config.h src/config.h"
+-ac_config_headers="$ac_config_headers lib/curl_config.h src/curl_config.h include/curl/curlbuild.h"
++ac_config_headers="$ac_config_headers lib/curl_config.h src/curl_config.h"
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
+ $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
+@@ -3194,13 +3229,6 @@
+ as_fn_error "ar not found in PATH. Cannot continue without ar." "$LINENO" 5
+ fi
- { $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
- $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
-@@ -3001,7 +2998,7 @@
+-
+-
+-
+-if test -f ${srcdir}/include/curl/curlbuild.h; then
+- rm -f ${srcdir}/include/curl/curlbuild.h
+-fi
+-
+ VERSION=`$SED -ne 's/^#define LIBCURL_VERSION "\(.*\)"/\1/p' ${srcdir}/include/curl/curlver.h`
+ am__api_version="1.9"
+ ac_aux_dir=
+@@ -3464,7 +3492,7 @@
$as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
@@ -88,7 +144,7 @@
all:
@echo '@@@%%%=$(MAKE)=@@@%%%'
_ACEOF
-@@ -4353,7 +4350,7 @@
+@@ -4660,7 +4688,7 @@
for i in 1 2 3 4 5 6; do
echo '#include "conftst'$i'.h"' >> sub/conftest.c
# Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
@@ -97,21 +153,7 @@
touch sub/conftst$i.h
done
echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-@@ -5150,7 +5147,12 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
--$ac_includes_default
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <limits.h>
-+#include <sys/types.h>
-+#include <stdint.h>
-+
- int main (void)
- {
- static int test_array [1 - 2 * !(((long int) (sizeof (long))) >= 0)];
-@@ -9142,7 +9144,7 @@
+@@ -7959,7 +7987,7 @@
for i in 1 2 3 4 5 6 7 8 ; do
teststring=$teststring$teststring
done
@@ -120,7 +162,7 @@
# If test is not a shell built-in, we'll probably end up computing a
# maximum length that is only half of the actual maximum length, but
# we can't tell.
-@@ -10403,8 +10405,8 @@
+@@ -9191,8 +9219,8 @@
case $lt_cv_prog_gnu_ld in
yes*) LD="${LD-ld} -m elf64_sparc" ;;
*)
@@ -131,7 +173,7 @@
fi
;;
esac
-@@ -15283,7 +15285,7 @@
+@@ -13582,7 +13610,7 @@
$as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
@@ -140,7 +182,7 @@
all:
@echo '@@@%%%=$(MAKE)=@@@%%%'
_ACEOF
-@@ -23133,7 +23135,7 @@
+@@ -18847,7 +18875,7 @@
GSSAPI_LIBS=`$GSSAPI_ROOT/bin/krb5-config --libs gssapi`
elif test "$GSSAPI_ROOT" != "yes"; then
GSSAPI_INCS="-I$GSSAPI_ROOT/include"
@@ -149,7 +191,7 @@
fi
fi
-@@ -23690,13 +23692,13 @@
+@@ -18968,13 +18996,13 @@
LIBS="$LIBS $gss_libs"
elif test "$GSSAPI_ROOT" != "yes"; then
LDFLAGS="$LDFLAGS -L$GSSAPI_ROOT/lib$libsuff"
@@ -166,414 +208,18 @@
fi
else
CPPFLAGS="$save_CPPFLAGS"
-@@ -29210,6 +29212,12 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <limits.h>
-+#include <inttypes.h>
-+#include <sys/types.h>
-+
- int main (void)
- {
- static int test_array [1 - 2 * !(((long int) (sizeof (long))) >= 0)];
-@@ -29246,6 +29254,12 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <limits.h>
-+#include <inttypes.h>
-+#include <sys/types.h>
-+
- int main (void)
- {
- static int test_array [1 - 2 * !(((long int) (sizeof (long))) <= $ac_mid)];
-@@ -29299,6 +29313,12 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <limits.h>
-+#include <inttypes.h>
-+#include <sys/types.h>
-+
- int main (void)
- {
- static int test_array [1 - 2 * !(((long int) (sizeof (long))) < 0)];
-@@ -29335,6 +29355,12 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <limits.h>
-+#include <inttypes.h>
-+#include <sys/types.h>
-+
- int main (void)
- {
- static int test_array [1 - 2 * !(((long int) (sizeof (long))) >= $ac_mid)];
-@@ -29398,6 +29424,12 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <limits.h>
-+#include <inttypes.h>
-+#include <sys/types.h>
-+
- int main (void)
- {
- static int test_array [1 - 2 * !(((long int) (sizeof (long))) <= $ac_mid)];
-@@ -29457,6 +29489,12 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <limits.h>
-+#include <inttypes.h>
-+#include <sys/types.h>
-+
- static long int longval () { return (long int) (sizeof (long)); }
- static unsigned long int ulongval () { return (long int) (sizeof (long)); }
- #include <stdio.h>
-@@ -29541,7 +29579,11 @@
-
-
- cat >>confdefs.h <<_ACEOF
--#define SIZEOF_LONG $ac_cv_sizeof_long
-+#if defined(__amd64) || defined(__sparcv9)
-+#define SIZEOF_LONG 8
-+#else
-+#define SIZEOF_LONG 4
-+#endif
- _ACEOF
+@@ -19000,7 +19028,7 @@
+ if test x$cross_compiling != xyes; then
+ PKGTEST="yes"
+ fi
+- PREFIX_OPENSSL=/usr/local/ssl
++ PREFIX_OPENSSL="/usr"
+ LIB_OPENSSL="$PREFIX_OPENSSL/lib$libsuff"
+ ;;
+ off)
+@@ -22104,20 +22132,11 @@
-@@ -29576,6 +29618,14 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <limits.h>
-+#include <inttypes.h>
-+#include <sys/types.h>
-+#include <time.h>
-+#include <sys/time.h>
-+
- int main (void)
- {
- static int test_array [1 - 2 * !(((long int) (sizeof (time_t))) >= 0)];
-@@ -29586,6 +29636,7 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
-+cp -fp conftest.$ac_ext ../conftest.$ac_ext.time_t.0
- if { (ac_try="$ac_compile"
- case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-@@ -29612,6 +29663,14 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <limits.h>
-+#include <inttypes.h>
-+#include <sys/types.h>
-+#include <time.h>
-+#include <sys/time.h>
-+
- int main (void)
- {
- static int test_array [1 - 2 * !(((long int) (sizeof (time_t))) <= $ac_mid)];
-@@ -29622,6 +29681,7 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
-+cp -fp conftest.$ac_ext ../conftest.$ac_ext.time_t.1
- if { (ac_try="$ac_compile"
- case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-@@ -29665,6 +29725,14 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <limits.h>
-+#include <stdint.h>
-+#include <sys/types.h>
-+#include <time.h>
-+#include <sys/time.h>
-+
- int main (void)
- {
- static int test_array [1 - 2 * !(((long int) (sizeof (time_t))) < 0)];
-@@ -29675,6 +29743,7 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
-+cp -fp conftest.$ac_ext ../conftest.$ac_ext.time_t.2
- if { (ac_try="$ac_compile"
- case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-@@ -29701,6 +29770,14 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <limits.h>
-+#include <stdint.h>
-+#include <sys/types.h>
-+#include <time.h>
-+#include <sys/time.h>
-+
- int main (void)
- {
- static int test_array [1 - 2 * !(((long int) (sizeof (time_t))) >= $ac_mid)];
-@@ -29711,6 +29788,7 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
-+cp -fp conftest.$ac_ext ../conftest.$ac_ext.time_t.3
- if { (ac_try="$ac_compile"
- case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-@@ -29764,6 +29842,14 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <limits.h>
-+#include <inttypes.h>
-+#include <sys/types.h>
-+#include <time.h>
-+#include <sys/time.h>
-+
- int main (void)
- {
- static int test_array [1 - 2 * !(((long int) (sizeof (time_t))) <= $ac_mid)];
-@@ -29774,6 +29860,7 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
-+cp -fp conftest.$ac_ext ../conftest.$ac_ext.time_t.4
- if { (ac_try="$ac_compile"
- case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-@@ -29822,11 +29909,16 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
--$ac_includes_default
--static long int longval () { return (long int) (sizeof (time_t)); }
--static unsigned long int ulongval () { return (long int) (sizeof (time_t)); }
- #include <stdio.h>
- #include <stdlib.h>
-+#include <stdint.h>
-+#include <limits.h>
-+#include <time.h>
-+#include <sys/time.h>
-+
-+static long int longval () { return (long int) (sizeof (time_t)); }
-+static unsigned long int ulongval () { return (long int) (sizeof (time_t)); }
-+
- int main (void)
- {
-
-@@ -29856,6 +29948,7 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
-+cp -fp conftest.$ac_ext ../conftest.$ac_ext.time_t.5
- if { (ac_try="$ac_link"
- case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-@@ -29907,7 +30000,11 @@
-
-
- cat >>confdefs.h <<_ACEOF
--#define SIZEOF_TIME_T $ac_cv_sizeof_time_t
-+#if defined(__amd64) || defined(__sparcv9)
-+#define SIZEOF_TIME_T 8
-+#else
-+#define SIZEOF_TIME_T 4
-+#endif
- _ACEOF
-
-
-@@ -29929,6 +30026,12 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <limits.h>
-+#include <inttypes.h>
-+#include <sys/types.h>
-+
- int main (void)
- {
- static int test_array [1 - 2 * !(((long int) (sizeof (off_t))) >= 0)];
-@@ -29939,6 +30042,7 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
-+cp -fp conftest.$ac_ext ../conftest.$ac_ext.off_t.0
- if { (ac_try="$ac_compile"
- case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-@@ -29965,6 +30069,12 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <limits.h>
-+#include <inttypes.h>
-+#include <sys/types.h>
-+
- int main (void)
- {
- static int test_array [1 - 2 * !(((long int) (sizeof (off_t))) <= $ac_mid)];
-@@ -29975,6 +30085,7 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
-+cp -fp conftest.$ac_ext ../conftest.$ac_ext.off_t.1
- if { (ac_try="$ac_compile"
- case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-@@ -30018,6 +30129,12 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <limits.h>
-+#include <inttypes.h>
-+#include <sys/types.h>
-+
- int main (void)
- {
- static int test_array [1 - 2 * !(((long int) (sizeof (off_t))) < 0)];
-@@ -30028,6 +30145,7 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
-+cp -fp conftest.$ac_ext ../conftest.$ac_ext.off_t.2
- if { (ac_try="$ac_compile"
- case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-@@ -30054,6 +30172,12 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <limits.h>
-+#include <inttypes.h>
-+#include <sys/types.h>
-+
- int main (void)
- {
- static int test_array [1 - 2 * !(((long int) (sizeof (off_t))) >= $ac_mid)];
-@@ -30064,6 +30188,7 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
-+cp -fp conftest.$ac_ext ../conftest.$ac_ext.off_t.3
- if { (ac_try="$ac_compile"
- case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-@@ -30117,6 +30242,12 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <limits.h>
-+#include <inttypes.h>
-+#include <sys/types.h>
-+
- int main (void)
- {
- static int test_array [1 - 2 * !(((long int) (sizeof (off_t))) <= $ac_mid)];
-@@ -30127,6 +30258,7 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
-+cp -fp conftest.$ac_ext ../conftest.$ac_ext.off_t.4
- if { (ac_try="$ac_compile"
- case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-@@ -30154,6 +30286,9 @@
-
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
-+ac_hi=8
-+ac_lo=8
-+
- case $ac_lo in
- ?*) ac_cv_sizeof_off_t=$ac_lo;;
- '') if test "$ac_cv_type_off_t" = yes; then
-@@ -30176,10 +30311,15 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
--static long int longval () { return (long int) (sizeof (off_t)); }
--static unsigned long int ulongval () { return (long int) (sizeof (off_t)); }
- #include <stdio.h>
- #include <stdlib.h>
-+#include <limits.h>
-+#include <inttypes.h>
-+#include <sys/types.h>
-+
-+static long int longval () { return (long int) (sizeof (off_t)); }
-+static unsigned long int ulongval () { return (long int) (sizeof (off_t)); }
-+
- int main (void)
- {
-
-@@ -30209,6 +30349,7 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
-+cp -fp conftest.$ac_ext ../conftest.$ac_ext.off_t.5
- if { (ac_try="$ac_link"
- case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-@@ -30289,6 +30430,12 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <limits.h>
-+#include <inttypes.h>
-+#include <sys/types.h>
-+
- int main (void)
- {
- if (sizeof (long long))
-@@ -30985,22 +31132,13 @@
-
- done
-
-+# THIS IS GETTING BETTER AND BETTER
-
-+curl_preprocess_callconv=""
-curl_preprocess_callconv="\
-/* preprocess start */
@@ -584,31 +230,21 @@
-#endif
-/* preprocess end */"
-
--
++curl_preprocess_callconv=""
+
- #
- { $as_echo "$as_me:$LINENO: checking for curl_socklen_t data type" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for curl_socklen_t data type" >&5
$as_echo_n "checking for curl_socklen_t data type... " >&6; }
- curl_typeof_curl_socklen_t="unknown"
-+ curl_typeof_curl_socklen_t="socklen_t"
++ curl_typeof_curl_socklen_t="socklen_t"
for arg1 in int SOCKET; do
for arg2 in 'struct sockaddr' void; do
for t in socklen_t int size_t 'unsigned int' long 'unsigned long' void; do
-@@ -31012,11 +31150,13 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
--
-- $curl_includes_ws2tcpip
-- $curl_includes_sys_socket
-- $curl_preprocess_callconv
-- extern int FUNCALLCONV getpeername($arg1, $arg2 *, $t *);
-+$ac_includes_default
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <inttypes.h>
-+#include <limits.h>
-+#include <sys/types.h>
-+#include <sys/socket.h>
-
- int main (void)
- {
+@@ -35019,7 +35038,6 @@
+ case $ac_config_target in
+ "lib/curl_config.h") CONFIG_HEADERS="$CONFIG_HEADERS lib/curl_config.h" ;;
+ "src/curl_config.h") CONFIG_HEADERS="$CONFIG_HEADERS src/curl_config.h" ;;
+- "include/curl/curlbuild.h") CONFIG_HEADERS="$CONFIG_HEADERS include/curl/curlbuild.h" ;;
+ "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
+ "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
+ "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
--- a/usr/src/lib/curl/Solaris/diffs/curl-7.19.5-CVE-2009-2417.patch Tue Feb 23 00:53:20 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,80 +0,0 @@
---- old/lib/ssluse.c 2009-08-03 16:01:58.000000000 +0200
-+++ new/lib/ssluse.c 2009-08-03 16:07:17.000000000 +0200
-@@ -1092,7 +1092,8 @@
- if(check->type == target) {
- /* get data and length */
- const char *altptr = (char *)ASN1_STRING_data(check->d.ia5);
-- size_t altlen;
-+ size_t altlen = (size_t) ASN1_STRING_length(check->d.ia5);
-+
-
- switch(target) {
- case GEN_DNS: /* name/pattern comparison */
-@@ -1106,14 +1107,16 @@
- "I checked the 0.9.6 and 0.9.8 sources before my patch and
- it always 0-terminates an IA5String."
- */
-- if(cert_hostcheck(altptr, conn->host.name))
-+ if((altlen == strlen(altptr)) &&
-+ /* if this isn't true, there was an embedded zero in the name
-+ string and we cannot match it. */
-+ cert_hostcheck(altptr, conn->host.name))
- matched = TRUE;
- break;
-
- case GEN_IPADD: /* IP address comparison */
- /* compare alternative IP address if the data chunk is the same size
- our server IP address is */
-- altlen = (size_t) ASN1_STRING_length(check->d.ia5);
- if((altlen == addrlen) && !memcmp(altptr, &addr, altlen))
- matched = TRUE;
- break;
-@@ -1153,18 +1156,27 @@
- string manually to avoid the problem. This code can be made
- conditional in the future when OpenSSL has been fixed. Work-around
- brought by Alexis S. L. Carvalho. */
-- if(tmp && ASN1_STRING_type(tmp) == V_ASN1_UTF8STRING) {
-- j = ASN1_STRING_length(tmp);
-- if(j >= 0) {
-- peer_CN = OPENSSL_malloc(j+1);
-- if(peer_CN) {
-- memcpy(peer_CN, ASN1_STRING_data(tmp), j);
-- peer_CN[j] = '\0';
-+ if(tmp) {
-+ if(ASN1_STRING_type(tmp) == V_ASN1_UTF8STRING) {
-+ j = ASN1_STRING_length(tmp);
-+ if(j >= 0) {
-+ peer_CN = OPENSSL_malloc(j+1);
-+ if(peer_CN) {
-+ memcpy(peer_CN, ASN1_STRING_data(tmp), j);
-+ peer_CN[j] = '\0';
-+ }
- }
- }
-+ else /* not a UTF8 name */
-+ j = ASN1_STRING_to_UTF8(&peer_CN, tmp);
-+
-+ if(peer_CN && ((int)strlen((char *)peer_CN) != j)) {
-+ /* there was a terminating zero before the end of string, this
-+ cannot match and we return failure! */
-+ failf(data, "SSL: illegal cert name field");
-+ res = CURLE_PEER_FAILED_VERIFICATION;
-+ }
- }
-- else /* not a UTF8 name */
-- j = ASN1_STRING_to_UTF8(&peer_CN, tmp);
- }
-
- if(peer_CN == nulstr)
-@@ -1182,7 +1194,10 @@
- }
- #endif /* CURL_DOES_CONVERSIONS */
-
-- if(!peer_CN) {
-+ if(res)
-+ /* error already detected, pass through */
-+ ;
-+ else if(!peer_CN) {
- failf(data,
- "SSL: unable to obtain common name from peer certificate");
- return CURLE_PEER_FAILED_VERIFICATION;
--- a/usr/src/lib/curl/Solaris/diffs/curl-multi-crash-2.patch Tue Feb 23 00:53:20 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,442 +0,0 @@
---- old/lib/multi.c Mon Aug 17 11:33:36 2009
-+++ new/lib/multi.c Mon Aug 17 11:33:35 2009
-@@ -192,8 +192,10 @@
- static CURLcode addHandleToSendOrPendPipeline(struct SessionHandle *handle,
- struct connectdata *conn);
- static int checkPendPipeline(struct connectdata *conn);
--static void moveHandleFromSendToRecvPipeline(struct SessionHandle *habdle,
-+static void moveHandleFromSendToRecvPipeline(struct SessionHandle *handle,
- struct connectdata *conn);
-+static void moveHandleFromRecvToDonePipeline(struct SessionHandle *handle,
-+ struct connectdata *conn);
- static bool isHandleAtHead(struct SessionHandle *handle,
- struct curl_llist *pipeline);
-
-@@ -233,14 +235,16 @@
- easy->state = state;
-
- #ifdef CURLDEBUG
-- if(easy->state > CURLM_STATE_CONNECT &&
-- easy->state < CURLM_STATE_COMPLETED)
-- connectindex = easy->easy_conn->connectindex;
-+ if(easy->easy_conn) {
-+ if(easy->state > CURLM_STATE_CONNECT &&
-+ easy->state < CURLM_STATE_COMPLETED)
-+ connectindex = easy->easy_conn->connectindex;
-
-- infof(easy->easy_handle,
-- "STATE: %s => %s handle %p; (connection #%ld) \n",
-- statename[oldstate], statename[easy->state],
-- (char *)easy, connectindex);
-+ infof(easy->easy_handle,
-+ "STATE: %s => %s handle %p; (connection #%ld) \n",
-+ statename[oldstate], statename[easy->state],
-+ (char *)easy, connectindex);
-+ }
- #endif
- if(state == CURLM_STATE_COMPLETED)
- /* changing to COMPLETED means there's one less easy handle 'alive' */
-@@ -925,7 +929,7 @@
- break;
- }
-
-- if(easy->state > CURLM_STATE_CONNECT &&
-+ if(easy->easy_conn && easy->state > CURLM_STATE_CONNECT &&
- easy->state < CURLM_STATE_COMPLETED)
- /* Make sure we set the connection's current owner */
- easy->easy_conn->data = easy->easy_handle;
-@@ -1149,7 +1153,6 @@
- &dophase_done);
-
- if(CURLE_OK == easy->result) {
--
- if(!dophase_done) {
- /* DO was not completed in one function call, we must continue
- DOING... */
-@@ -1170,6 +1173,49 @@
- result = CURLM_CALL_MULTI_PERFORM;
- }
- }
-+ else if ((CURLE_SEND_ERROR == easy->result) &&
-+ easy->easy_conn->bits.reuse) {
-+ /*
-+ * In this situation, a connection that we were trying to use
-+ * may have unexpectedly died. If possible, send the connection
-+ * back to the CONNECT phase so we can try again.
-+ */
-+ char *newurl;
-+ followtype follow=FOLLOW_NONE;
-+ CURLcode drc;
-+ bool retry = Curl_retry_request(easy->easy_conn, &newurl);
-+
-+ Curl_posttransfer(easy->easy_handle);
-+ drc = Curl_done(&easy->easy_conn, easy->result, FALSE);
-+
-+ /* When set to retry the connection, we must to go back to
-+ * the CONNECT state */
-+ if(retry) {
-+ if ((drc == CURLE_OK) || (drc == CURLE_SEND_ERROR)) {
-+ follow = FOLLOW_RETRY;
-+ drc = Curl_follow(easy->easy_handle, newurl, follow);
-+ if(drc == CURLE_OK) {
-+ multistate(easy, CURLM_STATE_CONNECT);
-+ result = CURLM_CALL_MULTI_PERFORM;
-+ easy->result = CURLE_OK;
-+ }
-+ else {
-+ /* Follow failed */
-+ easy->result = drc;
-+ free(newurl);
-+ }
-+ }
-+ else {
-+ /* done didn't return OK or SEND_ERROR */
-+ easy->result = drc;
-+ free(newurl);
-+ }
-+ }
-+ else {
-+ /* Have error handler disconnect conn if we can't retry */
-+ disconnect_conn = TRUE;
-+ }
-+ }
- else {
- /* failure detected */
- Curl_posttransfer(easy->easy_handle);
-@@ -1331,8 +1377,8 @@
- Curl_posttransfer(easy->easy_handle);
-
- /* we're no longer receving */
-- Curl_removeHandleFromPipeline(easy->easy_handle,
-- easy->easy_conn->recv_pipe);
-+ moveHandleFromRecvToDonePipeline(easy->easy_handle,
-+ easy->easy_conn);
-
- /* expire the new receiving pipeline head */
- if(easy->easy_conn->recv_pipe->head)
-@@ -1386,22 +1432,36 @@
- break;
-
- case CURLM_STATE_DONE:
-- /* Remove ourselves from the receive pipeline */
-- Curl_removeHandleFromPipeline(easy->easy_handle,
-- easy->easy_conn->recv_pipe);
-- /* Check if we can move pending requests to send pipe */
-- checkPendPipeline(easy->easy_conn);
-
-- if(easy->easy_conn->bits.stream_was_rewound) {
-- /* This request read past its response boundary so we quickly let the
-- other requests consume those bytes since there is no guarantee that
-- the socket will become active again */
-- result = CURLM_CALL_MULTI_PERFORM;
-- }
-+ if(easy->easy_conn) {
-+ /* Remove ourselves from the receive and done pipelines. Handle
-+ should be on one of these lists, depending upon how we got here. */
-+ Curl_removeHandleFromPipeline(easy->easy_handle,
-+ easy->easy_conn->recv_pipe);
-+ Curl_removeHandleFromPipeline(easy->easy_handle,
-+ easy->easy_conn->done_pipe);
-+ /* Check if we can move pending requests to send pipe */
-+ checkPendPipeline(easy->easy_conn);
-
-- /* post-transfer command */
-- easy->result = Curl_done(&easy->easy_conn, CURLE_OK, FALSE);
-+ if(easy->easy_conn->bits.stream_was_rewound) {
-+ /* This request read past its response boundary so we quickly let the
-+ other requests consume those bytes since there is no guarantee that
-+ the socket will become active again */
-+ result = CURLM_CALL_MULTI_PERFORM;
-+ }
-
-+ /* post-transfer command */
-+ easy->result = Curl_done(&easy->easy_conn, CURLE_OK, FALSE);
-+ /*
-+ * If there are other handles on the pipeline, Curl_done won't
-+ * set easy_conn to NULL. In such a case, curl_multi_remove_handle()
-+ * can access free'd data, if the connection is free'd and the handle
-+ * removed before we perform the processing in CURLM_STATE_COMPLETED
-+ */
-+ if (easy->easy_conn)
-+ easy->easy_conn = NULL;
-+ }
-+
- /* after we have DONE what we're supposed to do, go COMPLETED, and
- it doesn't matter what the Curl_done() returned! */
- multistate(easy, CURLM_STATE_COMPLETED);
-@@ -1443,6 +1503,8 @@
- easy->easy_conn->send_pipe);
- Curl_removeHandleFromPipeline(easy->easy_handle,
- easy->easy_conn->recv_pipe);
-+ Curl_removeHandleFromPipeline(easy->easy_handle,
-+ easy->easy_conn->done_pipe);
- /* Check if we can move pending requests to send pipe */
- checkPendPipeline(easy->easy_conn);
- }
-@@ -2174,6 +2236,21 @@
- }
- }
-
-+static void moveHandleFromRecvToDonePipeline(struct SessionHandle *handle,
-+ struct connectdata *conn)
-+{
-+ struct curl_llist_element *curr;
-+
-+ curr = conn->recv_pipe->head;
-+ while(curr) {
-+ if(curr->ptr == handle) {
-+ Curl_llist_move(conn->recv_pipe, curr,
-+ conn->done_pipe, conn->done_pipe->tail);
-+ break;
-+ }
-+ curr = curr->next;
-+ }
-+}
- static bool isHandleAtHead(struct SessionHandle *handle,
- struct curl_llist *pipeline)
- {
---- old/lib/transfer.c Mon Aug 17 11:33:37 2009
-+++ new/lib/transfer.c Mon Aug 17 11:33:36 2009
-@@ -2492,6 +2492,61 @@
- return res;
- }
-
-+CURLcode
-+Curl_reconnect_request(struct connectdata **connp)
-+{
-+ CURLcode result = CURLE_OK;
-+ struct connectdata *conn = *connp;
-+ struct SessionHandle *data = conn->data;
-+
-+ /* This was a re-use of a connection and we got a write error in the
-+ * DO-phase. Then we DISCONNECT this connection and have another attempt
-+ * to CONNECT and then DO again! The retry cannot possibly find another
-+ * connection to re-use, since we only keep one possible connection for
-+ * each. */
-+
-+ infof(data, "Re-used connection seems dead, get a new one\n");
-+
-+ conn->bits.close = TRUE; /* enforce close of this connection */
-+ result = Curl_done(&conn, result, FALSE); /* we are so done with this */
-+
-+ /* conn may no longer be a good pointer */
-+
-+ /*
-+ * According to bug report #1330310. We need to check for
-+ * CURLE_SEND_ERROR here as well. I figure this could happen when the
-+ * request failed on a FTP connection and thus Curl_done() itself tried
-+ * to use the connection (again). Slight Lack of feedback in the report,
-+ * but I don't think this extra check can do much harm.
-+ */
-+ if((CURLE_OK == result) || (CURLE_SEND_ERROR == result)) {
-+ bool async;
-+ bool protocol_done = TRUE;
-+
-+ /* Now, redo the connect and get a new connection */
-+ result = Curl_connect(data, connp, &async, &protocol_done);
-+ if(CURLE_OK == result) {
-+ /* We have connected or sent away a name resolve query fine */
-+
-+ conn = *connp; /* setup conn to again point to something nice */
-+ if(async) {
-+ /* Now, if async is TRUE here, we need to wait for the name
-+ to resolve */
-+ result = Curl_wait_for_resolv(conn, NULL);
-+ if(result)
-+ return result;
-+
-+ /* Resolved, continue with the connection */
-+ result = Curl_async_resolved(conn, &protocol_done);
-+ if(result)
-+ return result;
-+ }
-+ }
-+ }
-+
-+ return result;
-+}
-+
- /* Returns TRUE and sets '*url' if a request retry is wanted.
-
- NOTE: that the *url is malloc()ed. */
---- old/lib/transfer.h Mon Aug 17 11:33:37 2009
-+++ new/lib/transfer.h Mon Aug 17 11:33:37 2009
-@@ -46,6 +46,7 @@
- int numsocks);
- CURLcode Curl_readrewind(struct connectdata *conn);
- CURLcode Curl_fillreadbuffer(struct connectdata *conn, int bytes, int *nreadp);
-+CURLcode Curl_reconnect_request(struct connectdata **connp);
- bool Curl_retry_request(struct connectdata *conn, char **url);
-
- /* This sets up a forthcoming transfer */
---- old/lib/url.c Mon Aug 17 11:33:38 2009
-+++ new/lib/url.c Mon Aug 17 11:33:38 2009
-@@ -142,7 +142,7 @@
- /* Local static prototypes */
- static long ConnectionKillOne(struct SessionHandle *data);
- static void conn_free(struct connectdata *conn);
--static void signalPipeClose(struct curl_llist *pipeline);
-+static void signalPipeClose(struct curl_llist *pipeline, bool pipe_broke);
-
- #ifdef CURL_DISABLE_VERBOSE_STRINGS
- #define verboseconnect(x) do { } while (0)
-@@ -410,6 +410,16 @@
- }
- }
- }
-+ pipeline = connptr->done_pipe;
-+ if(pipeline) {
-+ for (curr = pipeline->head; curr; curr=curr->next) {
-+ if(data == (struct SessionHandle *) curr->ptr) {
-+ fprintf(stderr,
-+ "MAJOR problem we %p are still in done pipe for %p done %d\n",
-+ data, connptr, (int)connptr->bits.done);
-+ }
-+ }
-+ }
- pipeline = connptr->pend_pipe;
- if(pipeline) {
- for (curr = pipeline->head; curr; curr=curr->next) {
-@@ -2275,6 +2285,7 @@
- Curl_llist_destroy(conn->send_pipe, NULL);
- Curl_llist_destroy(conn->recv_pipe, NULL);
- Curl_llist_destroy(conn->pend_pipe, NULL);
-+ Curl_llist_destroy(conn->done_pipe, NULL);
-
- /* possible left-overs from the async name resolvers */
- #if defined(USE_ARES)
-@@ -2374,9 +2385,10 @@
-
- /* Indicate to all handles on the pipe that we're dead */
- if(Curl_isPipeliningEnabled(data)) {
-- signalPipeClose(conn->send_pipe);
-- signalPipeClose(conn->recv_pipe);
-- signalPipeClose(conn->pend_pipe);
-+ signalPipeClose(conn->send_pipe, TRUE);
-+ signalPipeClose(conn->recv_pipe, TRUE);
-+ signalPipeClose(conn->pend_pipe, TRUE);
-+ signalPipeClose(conn->done_pipe, FALSE);
- }
-
- conn_free(conn);
-@@ -2494,9 +2506,10 @@
- if(Curl_removeHandleFromPipeline(data, conn->send_pipe) && send_head)
- conn->writechannel_inuse = FALSE;
- Curl_removeHandleFromPipeline(data, conn->pend_pipe);
-+ Curl_removeHandleFromPipeline(data, conn->done_pipe);
- }
-
--static void signalPipeClose(struct curl_llist *pipeline)
-+static void signalPipeClose(struct curl_llist *pipeline, bool pipe_broke)
- {
- struct curl_llist_element *curr;
-
-@@ -2515,7 +2528,8 @@
- }
- #endif
-
-- data->state.pipe_broke = TRUE;
-+ if (pipe_broke)
-+ data->state.pipe_broke = TRUE;
- Curl_multi_handlePipeBreak(data);
- Curl_llist_remove(pipeline, curr, NULL);
- curr = next;
-@@ -4174,6 +4188,7 @@
- Curl_llist_destroy(old_conn->send_pipe, NULL);
- Curl_llist_destroy(old_conn->recv_pipe, NULL);
- Curl_llist_destroy(old_conn->pend_pipe, NULL);
-+ Curl_llist_destroy(old_conn->done_pipe, NULL);
- Curl_safefree(old_conn->master_buffer);
- }
-
-@@ -4276,7 +4291,9 @@
- conn->send_pipe = Curl_llist_alloc((curl_llist_dtor) llist_dtor);
- conn->recv_pipe = Curl_llist_alloc((curl_llist_dtor) llist_dtor);
- conn->pend_pipe = Curl_llist_alloc((curl_llist_dtor) llist_dtor);
-- if(!conn->send_pipe || !conn->recv_pipe || !conn->pend_pipe)
-+ conn->done_pipe = Curl_llist_alloc((curl_llist_dtor) llist_dtor);
-+ if(!conn->send_pipe || !conn->recv_pipe || !conn->pend_pipe ||
-+ !conn->done_pipe)
- return CURLE_OUT_OF_MEMORY;
-
- /* This initing continues below, see the comment "Continue connectdata
-@@ -4955,53 +4972,22 @@
-
- /* This was formerly done in transfer.c, but we better do it here */
- if((CURLE_SEND_ERROR == result) && conn->bits.reuse) {
-- /* This was a re-use of a connection and we got a write error in the
-- * DO-phase. Then we DISCONNECT this connection and have another attempt
-- * to CONNECT and then DO again! The retry cannot possibly find another
-- * connection to re-use, since we only keep one possible connection for
-- * each. */
-+ /*
-+ * If the connection is using an easy handle, call reconnect
-+ * to re-establish the connection. Otherwise, let the multi logic
-+ * figure out how to re-establish the connection.
-+ */
-+ if(!data->multi) {
-+ result = Curl_reconnect_request(connp);
-
-- infof(data, "Re-used connection seems dead, get a new one\n");
--
-- conn->bits.close = TRUE; /* enforce close of this connection */
-- result = Curl_done(&conn, result, FALSE); /* we are so done with this */
--
-- /* conn may no longer be a good pointer */
--
-- /*
-- * According to bug report #1330310. We need to check for
-- * CURLE_SEND_ERROR here as well. I figure this could happen when the
-- * request failed on a FTP connection and thus Curl_done() itself tried
-- * to use the connection (again). Slight Lack of feedback in the report,
-- * but I don't think this extra check can do much harm.
-- */
-- if((CURLE_OK == result) || (CURLE_SEND_ERROR == result)) {
-- bool async;
-- bool protocol_done = TRUE;
--
-- /* Now, redo the connect and get a new connection */
-- result = Curl_connect(data, connp, &async, &protocol_done);
-- if(CURLE_OK == result) {
-- /* We have connected or sent away a name resolve query fine */
--
-- conn = *connp; /* setup conn to again point to something nice */
-- if(async) {
-- /* Now, if async is TRUE here, we need to wait for the name
-- to resolve */
-- result = Curl_wait_for_resolv(conn, NULL);
-- if(result)
-- return result;
--
-- /* Resolved, continue with the connection */
-- result = Curl_async_resolved(conn, &protocol_done);
-- if(result)
-- return result;
-- }
--
-- /* ... finally back to actually retry the DO phase */
-- result = conn->handler->do_it(conn, done);
-- }
-- }
-+ if(result == CURLE_OK) {
-+ /* ... finally back to actually retry the DO phase */
-+ result = conn->handler->do_it(conn, done);
-+ }
-+ }
-+ else {
-+ return result;
-+ }
- }
-
- if((result == CURLE_OK) && *done)
---- old/lib/urldata.h Mon Aug 17 11:33:40 2009
-+++ new/lib/urldata.h Mon Aug 17 11:33:39 2009
-@@ -1020,6 +1020,8 @@
- their responses on this pipeline */
- struct curl_llist *pend_pipe; /* List of pending handles on
- this pipeline */
-+ struct curl_llist *done_pipe; /* Handles that are finished, but
-+ still reference this connectdata */
- #define MAX_PIPELINE_LENGTH 5
-
- char* master_buffer; /* The master buffer allocated on-demand;
--- a/usr/src/lib/curl/Solaris/diffs/curlbuild.h.2.diff Tue Feb 23 00:53:20 2010 +0200
+++ b/usr/src/lib/curl/Solaris/diffs/curlbuild.h.2.diff Fri Mar 05 22:27:24 2010 +0200
@@ -1,11 +1,11 @@
---- old/include/curl/curlbuild.h 2009-05-18 00:08:10.000000000 -0700
-+++ new/include/curl/curlbuild.h 2009-08-17 14:55:34.500811583 -0700
+--- include/curl/curlbuild.h 2010-02-09 02:08:03.000000000 -0800
++++ include/curl/curlbuild.h 2010-02-18 08:03:03.083778547 -0800
@@ -497,6 +497,45 @@
# define CURL_SIZEOF_CURL_SOCKLEN_T 4
/* ===================================== */
-+ /* SunPro Compilers */
-+ /* ===================================== */
++/* SunPro Compilers */
++/* ===================================== */
+
+#elif defined(__SUNPRO_C) || defined(__SUNPRO_CC)
+#include <stdint.h>
@@ -27,11 +27,11 @@
+# define CURL_SIZEOF_LONG 4
+# if _FILE_OFFSET_BITS == 64 && _LARGEFILE_SOURCE != 0
+# define CURL_SIZEOF_CURL_OFF_T 8
-+# define CURL_FORMAT_CURL_OFF_T "lld"
-+# define CURL_FORMAT_CURL_OFF_TU "llu"
-+# define CURL_FORMAT_OFF_T "%lld"
-+# define CURL_SUFFIX_CURL_OFF_T LL
-+# define CURL_SUFFIX_CURL_OFF_TU ULL
++# define CURL_FORMAT_CURL_OFF_T "lld"
++# define CURL_FORMAT_CURL_OFF_TU "llu"
++# define CURL_FORMAT_OFF_T "%lld"
++# define CURL_SUFFIX_CURL_OFF_T LL
++# define CURL_SUFFIX_CURL_OFF_TU ULL
+# else
+# define CURL_SIZEOF_CURL_OFF_T 4
+# define CURL_FORMAT_CURL_OFF_T "ld"
--- a/usr/src/lib/curl/Solaris/libcurl.pc Tue Feb 23 00:53:20 2010 +0200
+++ b/usr/src/lib/curl/Solaris/libcurl.pc Fri Mar 05 22:27:24 2010 +0200
@@ -19,22 +19,22 @@
# CDDL HEADER END
#
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "@(#)libcurl.pc 1.4 09/08/20 SMI"
+# ident "@(#)libcurl.pc 1.5 10/02/18 SMI"
#
prefix=/usr
exec_prefix=${prefix}
libdir=${exec_prefix}/lib
includedir=${prefix}/include/curl
-supported_protocols=" HTTP HTTPS FTP FTPS FILE TELNET LDAP DICT TFTP"
+supported_protocols=" DICT FILE FTP FTPS HTTP HTTPS IMAP IMAPS LDAP POP3 POP3S RTSP SMTP SMTPS TELNET TFTP"
supported_features=" SSL IPv6 libz IDN NTLM"
Name: libcurl
URL: http://curl.haxx.se/
Description: Library to transfer files with ftp, http, etc.
-Version: 7.19.5
+Version: 7.20.0
Libs: -L${libdir} -lc -lcurl -lgss -lidn -lsocket -lnsl -lz -lssl -lcrypto
Libs.private: -lidn -lssl -lcrypto -lsldap -lldap -lgss -lssl -lcrypto -lsocket -lnsl -lc -lz
Cflags: -I${includedir}
Binary file usr/src/lib/curl/curl-7.19.5.tar.gz has changed
Binary file usr/src/lib/curl/curl-7.20.0.tar.gz has changed
--- a/usr/src/lib/curl/install-sfw Tue Feb 23 00:53:20 2010 +0200
+++ b/usr/src/lib/curl/install-sfw Fri Mar 05 22:27:24 2010 +0200
@@ -20,12 +20,12 @@
# CDDL HEADER END
#
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "@(#)install-sfw 1.4 09/08/20 SMI"
+# ident "@(#)install-sfw 1.5 10/02/23 SMI"
-VERS=curl-7.19.5
+# VERS=curl-7.20.0
PREFIX=${ROOT}/usr
LIBDIR=${PREFIX}/lib
@@ -44,11 +44,12 @@
cd ${VERS}
+_install S curl-config ${BINDIR}/curl-config 0755
+
elfedit -e 'dyn:delete RUNPATH' ./src/.libs/curl
elfedit -e 'dyn:delete RPATH' ./src/.libs/curl
_install E src/.libs/curl ${BINDIR}/curl 0755
-_install S curl-config ${BINDIR}/curl-config 0755
_install N docs/index.html ${HTMLDOCEXEDIR}/index.html 0444
_install N docs/curl.html ${HTMLDOCEXEDIR}/curl.html 0444
--- a/usr/src/lib/curl/install-sfw-64 Tue Feb 23 00:53:20 2010 +0200
+++ b/usr/src/lib/curl/install-sfw-64 Fri Mar 05 22:27:24 2010 +0200
@@ -20,12 +20,12 @@
# CDDL HEADER END
#
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "@(#)install-sfw-64 1.4 09/08/20 SMI"
+# ident "@(#)install-sfw-64 1.5 10/02/23 SMI"
-VERS=curl-7.19.5-64
+# VERS=curl-7.20.0-64
PREFIX=${ROOT}/usr
LIBDIR=${PREFIX}/lib/${MACH64} # MACH64 passed in by makefile
--- a/usr/src/lib/gd2/METADATA Tue Feb 23 00:53:20 2010 +0200
+++ b/usr/src/lib/gd2/METADATA Fri Mar 05 22:27:24 2010 +0200
@@ -1,10 +1,10 @@
NAME: gd
-VERSION: 2.0.34
+VERSION: 2.0.35
DESCRIPTION: library for the dynamic creation of images
LICENSE: GD
PACKAGE: SUNWgd2
PROJECT_URL: http://www.libgd.org/
-SOURCE_DOWNLOAD: http://www.libgd.org/releases/gd-2.0.34.tar.gz
+SOURCE_DOWNLOAD: http://www.libgd.org/releases/gd-2.0.35.tar.gz
SUPPORT: C
BUGTRAQ: solaris/library/gd2
OSR: 10150
--- a/usr/src/lib/gd2/Makefile.sfw Tue Feb 23 00:53:20 2010 +0200
+++ b/usr/src/lib/gd2/Makefile.sfw Fri Mar 05 22:27:24 2010 +0200
@@ -22,14 +22,15 @@
# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "@(#)Makefile.sfw 1.6 10/01/22 SMI"
+# ident "@(#)Makefile.sfw 1.7 10/02/19 SMI"
#
# This makefile builds both 32 and 64 bit versions of the library.
# Builds occur in separate directories.
#
-VER=gd-2.0.34
+RELNUM=$(COMPONENT_VERSION:sh)
+VER=gd-$(RELNUM)
VER64=$(VER)-64
LARGEFILES= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
@@ -70,8 +71,8 @@
LINTFLAGS64= -I. $(CCBITS64) $(LARGEFILES)
install: all
- $(SH) ./install-sfw
- MACH64=$(MACH64) $(SH) ./install-sfw-64
+ VERS=$(VER) $(SHELL) ./install-sfw
+ MACH64=$(MACH64) VERS=$(VER64) $(SHELL) ./install-sfw-64
real-all: all32 all64 lint32 lint64
@@ -139,12 +140,22 @@
$(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
+ ( cd $(VER) ; \
+ gpatch -p0 <../Solaris/Makefile.in.0.diff ; \
+ gpatch -p0 <../Solaris/Makefile.in.1.diff ; \
+ touch -acm configure ; \
+ chmod 0755 configure ; \
+ cd - )
$(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
+ ( cd $(VER64) ; \
+ gpatch -p0 <../Solaris/Makefile.in.0.diff ; \
+ gpatch -p0 <../Solaris/Makefile.in.1.diff ; \
+ touch -acm configure ; \
+ chmod 0755 configure ; \
+ cd - )
clean:
-$(RM) -r $(VER)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/lib/gd2/Solaris/Makefile.in.0.diff Fri Mar 05 22:27:24 2010 +0200
@@ -0,0 +1,68 @@
+--- Makefile.in 2007-04-23 07:57:51.000000000 -0700
++++ Makefile.in 2010-02-09 14:53:57.185810388 -0800
+@@ -339,7 +339,7 @@
+ target_vendor = @target_vendor@
+ AUTOMAKE_OPTIONS = foreign 1.7
+ ACLOCAL_AMFLAGS = -I config
+-SUBDIRS = config test
++SUBDIRS = . test
+ bin_SCRIPTS = bdftogd config/gdlib-config
+ EXTRA_DIST = README-JPEG.TXT README.TXT configure.pl bdftogd demoin.png err.out index.html install-item makefile.sample readme.jpn entities.html entities.tcl
+ include_HEADERS = gd.h gdfx.h gd_io.h gdcache.h gdfontg.h gdfontl.h gdfontmb.h gdfonts.h gdfontt.h entities.h
+@@ -351,24 +351,10 @@
+ all: config.h
+ $(MAKE) $(AM_MAKEFLAGS) all-recursive
+
+-.SUFFIXES:
+ .SUFFIXES: .c .lo .o .obj
+-am--refresh:
+- @:
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
+- cd $(srcdir) && $(AUTOMAKE) --foreign \
+- && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
+- cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign Makefile
++
+ .PRECIOUS: Makefile
++
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+@@ -379,14 +365,9 @@
+ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
+ esac;
+
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++$(top_builddir)/config.status: $(top_srcdir)/configure
+ $(SHELL) ./config.status --recheck
+
+-$(top_srcdir)/configure: $(am__configure_deps)
+- cd $(srcdir) && $(AUTOCONF)
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+-
+ config.h: stamp-h1
+ @if test ! -f $@; then \
+ rm -f stamp-h1; \
+@@ -397,12 +378,12 @@
+ @rm -f stamp-h1
+ cd $(top_builddir) && $(SHELL) ./config.status config.h
+ $(srcdir)/config.hin: $(am__configure_deps)
+- cd $(top_srcdir) && $(AUTOHEADER)
+ rm -f stamp-h1
+ touch $@
+
+ distclean-hdr:
+ -rm -f config.h stamp-h1
++
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+ test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/lib/gd2/Solaris/Makefile.in.1.diff Fri Mar 05 22:27:24 2010 +0200
@@ -0,0 +1,40 @@
+--- test/Makefile.in 2007-04-23 07:57:51.000000000 -0700
++++ test/Makefile.in 2010-02-09 15:01:16.365755104 -0800
+@@ -174,19 +174,10 @@
+ all: all-am
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign test/Makefile'; \
+- cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign test/Makefile
++$(srcdir)/Makefile.in: $(srcdir)/Makefile.am
++
+ .PRECIOUS: Makefile
++
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+@@ -196,13 +187,7 @@
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: $(am__configure_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++$(top_builddir)/config.status: $(top_srcdir)/configure
+
+ mostlyclean-libtool:
+ -rm -f *.lo
Binary file usr/src/lib/gd2/gd-2.0.34.tar.gz has changed
Binary file usr/src/lib/gd2/gd-2.0.35.tar.gz has changed
--- a/usr/src/lib/gd2/install-sfw Tue Feb 23 00:53:20 2010 +0200
+++ b/usr/src/lib/gd2/install-sfw Fri Mar 05 22:27:24 2010 +0200
@@ -20,12 +20,10 @@
# CDDL HEADER END
#
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "@(#)install-sfw 1.2 09/02/08 SMI"
-
-VERS=gd-2.0.34
+#ident "@(#)install-sfw 1.3 10/02/19 SMI"
PREFIX=${ROOT}/usr
LIBDIR=${PREFIX}/lib
--- a/usr/src/lib/gd2/install-sfw-64 Tue Feb 23 00:53:20 2010 +0200
+++ b/usr/src/lib/gd2/install-sfw-64 Fri Mar 05 22:27:24 2010 +0200
@@ -20,12 +20,10 @@
# CDDL HEADER END
#
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "@(#)install-sfw-64 1.2 09/02/08 SMI"
-
-VERS=gd-2.0.34-64
+#ident "@(#)install-sfw-64 1.3 10/02/19 SMI"
UNAMEP=`uname -p`
MACH=""
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/lib/memcached/auth_attr Fri Mar 05 22:27:24 2010 +0200
@@ -0,0 +1,2 @@
+solaris.smf.value.memcached:::Change Memcached value properties::
+solaris.smf.manage.memcached:::Manage Memcached service states::
--- a/usr/src/lib/memcached/install-sfw Tue Feb 23 00:53:20 2010 +0200
+++ b/usr/src/lib/memcached/install-sfw Fri Mar 05 22:27:24 2010 +0200
@@ -20,10 +20,10 @@
# CDDL HEADER END
#
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "@(#)install-sfw 1.3 09/10/15 SMI"
+# ident "@(#)install-sfw 1.4 10/02/19 SMI"
#
# Memcached 1.4.1 is dependent on libevent
@@ -46,6 +46,9 @@
_install N Solaris/memcached "${METHODDIR}/memcached" 555
_install M Solaris/memcached.1m "${MAN1MDIR}/memcached.1m" 444
+_install N auth_attr ${RIGHTSDIR}/auth_attr.d/memcached 444
+_install N prof_attr ${RIGHTSDIR}/prof_attr.d/memcached 444
+
# install the wrapper program using isaexec()
_install E memcached "${LIBDIR}/memcached" 555
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/lib/memcached/prof_attr Fri Mar 05 22:27:24 2010 +0200
@@ -0,0 +1,1 @@
+Memcached Administration::::auths=solaris.smf.manage.memcached,solaris.smf.value.memcached
--- a/usr/src/lib/openssl/Makefile.com Tue Feb 23 00:53:20 2010 +0200
+++ b/usr/src/lib/openssl/Makefile.com Fri Mar 05 22:27:24 2010 +0200
@@ -20,11 +20,11 @@
#
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "@(#)Makefile.com 1.2 09/11/10 SMI"
+# ident "@(#)Makefile.com 1.3 10/01/29 SMI"
METAINFO_FILE = ../METADATA
VER = $(COMPONENT_NAME:sh)-$(COMPONENT_VERSION:sh)
@@ -72,7 +72,7 @@
$(CONFIGURE_OPTIONS64_$(MACH)) \
--pk11-libname=$(PKCS11_LIB64)
-CONFIGURE_OPTIONS_i386 = 386 solaris-x86-cc-sunw
+CONFIGURE_OPTIONS_i386 = solaris-x86-cc-sunw
CONFIGURE_OPTIONS_sparc = solaris-sparcv8-cc-sunw
CONFIGURE_OPTIONS = $(GENERIC_CONFIGURE_OPTIONS) \
$(CONFIGURE_OPTIONS_$(MACH)) \
--- a/usr/src/lib/openssl/fips/Makefile.sfw Tue Feb 23 00:53:20 2010 +0200
+++ b/usr/src/lib/openssl/fips/Makefile.sfw Fri Mar 05 22:27:24 2010 +0200
@@ -20,11 +20,11 @@
#
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "@(#)Makefile.sfw 1.2 09/11/24 SMI"
+# ident "@(#)Makefile.sfw 1.3 10/01/29 SMI"
include $(SRC)/lib/Makefile.lib
include ../Makefile.com
@@ -97,7 +97,7 @@
install: all install32 install64
install32: all32
- VERDIR=$(VER) VERSION=$(VERSION) $(SHELL) ./install-sfw
+ MACH32=$(MACH32) VERDIR=$(VER) VERSION=$(VERSION) $(SHELL) ./install-sfw
install64: all64
MACH64=$(MACH64) VERDIR=$(VER64) \
--- a/usr/src/lib/openssl/fips/install-sfw Tue Feb 23 00:53:20 2010 +0200
+++ b/usr/src/lib/openssl/fips/install-sfw Fri Mar 05 22:27:24 2010 +0200
@@ -21,11 +21,11 @@
#
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "@(#)install-sfw 1.1 09/11/05 SMI"
+# ident "@(#)install-sfw 1.2 10/01/29 SMI"
set -o errexit
@@ -38,6 +38,12 @@
cd ${VERDIR}
+# Remove SSE and MMX from the Capabilities section (x86 only)
+if [[ ${MACH32} = "i86" ]]; then
+ elfedit -e 'cap:hw1 -and -cmp sse2' \
+ -e 'cap:hw1 -and -cmp mmx' libcrypto.so.${LIBVER}
+fi
+
# Install libraries
mkdir -p ${LIBDIR}
_install D libcrypto.so.${LIBVER} ${LIBDIR}/libcrypto.so.${LIBVER} 0755
--- a/usr/src/lib/openssl/fips/openssl-fips/Makefile.sfw Tue Feb 23 00:53:20 2010 +0200
+++ b/usr/src/lib/openssl/fips/openssl-fips/Makefile.sfw Fri Mar 05 22:27:24 2010 +0200
@@ -20,11 +20,11 @@
#
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "@(#)Makefile.sfw 1.1 09/11/05 SMI"
+# ident "@(#)Makefile.sfw 1.2 10/01/29 SMI"
VER =$(COMPONENT_NAME:sh)-$(COMPONENT_VERSION:sh)
TARBALL =$(VER).tar.gz
@@ -59,11 +59,11 @@
all64: $(VER64)/$(BUILD_STAMP) $(VER64)/$(VERIFIED)
-# Command set U1
+# Command set U2
$(VER)/$(BUILD_STAMP): $(FAKE_APPS) $(VER)/$(SFW_STAMP_UNPACKED)
cd $(VER); env - \
PATH=$(FIPS_PATH) CCSMAKE=$(CCSMAKE) $(SHELL) -c " \
- ./config fipscanisterbuild no-asm; \
+ ./config fipscanisterbuild; \
make; \
make install"
$(TOUCH) $@
--- a/usr/src/lib/openssl/non-fips/Makefile.sfw Tue Feb 23 00:53:20 2010 +0200
+++ b/usr/src/lib/openssl/non-fips/Makefile.sfw Fri Mar 05 22:27:24 2010 +0200
@@ -20,11 +20,11 @@
#
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "@(#)Makefile.sfw 1.2 09/11/24 SMI"
+# ident "@(#)Makefile.sfw 1.3 10/01/29 SMI"
include $(SRC)/lib/Makefile.lib
include ../Makefile.com
@@ -83,7 +83,7 @@
install: all lint install32 install64 install_docs
install32: all32
- VERDIR=$(VER) VERSION=$(VERSION) $(SHELL) ./install-sfw
+ MACH32=$(MACH32) VERDIR=$(VER) VERSION=$(VERSION) $(SHELL) ./install-sfw
install64: all64
MACH64=$(MACH64) VERDIR=$(VER64) \
--- a/usr/src/lib/openssl/non-fips/install-sfw Tue Feb 23 00:53:20 2010 +0200
+++ b/usr/src/lib/openssl/non-fips/install-sfw Fri Mar 05 22:27:24 2010 +0200
@@ -21,11 +21,11 @@
#
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "@(#)install-sfw 1.3 09/11/24 SMI"
+# ident "@(#)install-sfw 1.4 10/01/29 SMI"
set -o errexit
@@ -46,6 +46,12 @@
cd $VERDIR
+# Remove SSE and MMX from the Capabilities section (x86 only)
+if [[ ${MACH32} = "i86" ]]; then
+ elfedit -e 'cap:hw1 -and -cmp sse2' \
+ -e 'cap:hw1 -and -cmp mmx' libcrypto.so.${LIBVER}
+fi
+
# Install libraries
_install D libcrypto.so.${LIBVER} ${LIBDIR}/libcrypto.so.${LIBVER} 0755
_install L libcrypto.so.${LIBVER} ${LIBDIR}/libcrypto.so
--- a/usr/src/lib/sqlite3/METADATA Tue Feb 23 00:53:20 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-NAME: sqlite3
-VERSION: 3.6.17
-DESCRIPTION: SQLite3
-LICENSE: SQLite
-PACKAGE: SUNWsqlite3 SUNWsqlite3docs SUNWsqlite3tcl
-PROJECT_URL: http://sqlite.org/download.html
-SOURCE_DOWNLOAD: http://sqlite.org/sqlite-3.6.17.tar.gz
-SUPPORT: C
-BUGTRAQ: solaris/database/sqlite3
-OSR: 7854
-COMMENTS:
-No notable modifications.
--- a/usr/src/lib/sqlite3/Makefile.sfw Tue Feb 23 00:53:20 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,250 +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.8 09/08/21 SMI"
-
-# We modify SQLite3's Makefile.in to support building the three desired
-# ELF files in ./solaris (relative to the extracted source) using the
-# SQLite3 source code "amalgamation". This gets libtool out of the way
-# at a tiny price: a small patch to Makefile.in that adds the requisite
-# targets, and these are trivial targets because they use the
-# amalgamation (i.e., there's only one source file to build, no
-# dependencies, nothing). This also causes the sqlite3 command shell
-# and the libtclsqlite3.so Tcl extension to be properly linked with
-# libsqlite3.so (as opposed to compiling in the library's code).
-#
-# There's no support in SQLite3's build system for building 32-bit and
-# 64-bit objects, so we build it twice here. And we provide our own
-# version of pkgIndex.tcl that works with both, 32-bit and 64-bit Tcl +
-# libtclsqlite3.
-
-include ../Makefile.lib
-
-C99MODE= $(C99_DISABLE)
-
-TOP=$(SRC)/lib/$(COMPONENT_NAME:sh)
-SQLITE_VER = $(COMPONENT_VERSION:sh)
-SQLITE_DOC_VER = echo $(SQLITE_VER) | \
- /usr/xpg4/bin/sed 's/\([0-9]*\)\.\([0-9]*\).\([0-9]*\)[^0-9]*.*$$/\1_\2_\3/'
-VER=sqlite-$(SQLITE_VER)
-VER64=$(VER)-64
-SQLITE3DOCS=sqlite_docs_$(SQLITE_DOC_VER:sh).zip
-
-# VERS, PROG, MAN1FILES and LIBLINKS (below) are here to get the
-# $SRC/lib/Makefile.(lib|targ) targets/macros to install the command
-# shell, compilation links and manpage
-VERS=.0
-PROG= $(COMPONENT_NAME:sh)
-MAN1FILES= $(COMPONENT_NAME:sh).1
-
-# Various macros for install purposes
-TCLDIR= /usr/lib/tcl8.4/$(COMPONENT_NAME:sh)
-ROOTSQLITE3TCLDIR= $(ROOT)$(TCLDIR)
-ROOTSQLITE3TCLDIR64= $(ROOTSQLITE3TCLDIR)/$(MACH64)
-ROOTINCLUDEDIR= $(ROOT)/usr/include
-ROOTPKGCONFIGDIR= $(ROOT)/usr/lib/pkgconfig
-
-ROOTLIBSOFILES= $(ROOTLIB)/libsqlite3.so.0 \
- $(ROOTLIB64)/libsqlite3.so.0
-ROOTTCLLIBSOFILES= $(ROOTSQLITE3TCLDIR)/libtclsqlite3.so \
- $(ROOTSQLITE3TCLDIR64)/libtclsqlite3.so
-ROOTHDRFILES= $(ROOTINCLUDEDIR)/sqlite3.h
-ROOTTCLFILES= $(ROOTSQLITE3TCLDIR)/pkgIndex.tcl
-ROOTPKGCONFIGFILES= $(ROOTPKGCONFIGDIR)/sqlite3.pc
-
-# 3.6.7's autoconf support isn't very well done. For example, it
-# auto-discovers whether the host has usleep(3C) and fdatasync(3C), but
-# doesn't actually substitute the resulting flags into any makefiles.
-#
-# Nor is there ./configure option to tell SQLite3 to use pread(2)/
-# pwrite(2), nor does SQLite3 default to using them when they are
-# available, but using them is a win.
-#
-# So we manually add -DUSE_PREAD, -DHAVE_*. HAVE_STATVFS is a
-# Sun-specific addition to make SQLite3 pick a better default page size
-# (a ticket with the relevant diffs has been filed, ticket #3452).
-#
-# Also, beware: -DSQLITE_SECURE_DELETE=1 does not really mean "secure"
-# deletion -- it just causes SQLite3 to zero out freed database pages,
-# which can help with compressibility (e.g., on ZFS).
-#
-# Finally, we put -I. before -I$(ROOT)/usr/include so that sqlite3.h in
-# the proto isn't found first. Technically SQLite3 currently doesn't
-# need anything from the SFW proto area, so we could just leave this
-# out, but someday (e.g., when we add libreadline/libeditline support)
-# it will be needed.
-#
-SQLITE3_CFLAGS= -DSQLITE_SECURE_DELETE -DSQLITE_ENABLE_FTS3 \
- -DUSE_PREAD -DHAVE_USLEEP -DHAVE_FDATASYNC -DHAVE_STATVFS \
- -I. -I$(ROOT)/usr/include
-
-CONFIGURE_OPTIONS += --enable-threadsafe
-CONFIGURE_OPTIONS += --enable-cross-thread-connections
-CONFIGURE_OPTIONS += --enable-shared
-CONFIGURE_OPTIONS += --enable-load-extension
-CONFIGURE_OPTIONS += --disable-static
-CONFIGURE_OPTIONS += --with-tcl="$(ROOTLIB)"
-CONFIGURE_OPTIONS += LDFLAGS="-L$(ROOT)/usr/lib -Bdirect"
-
-
-# We set LIBLINKS here because ../Makefile.lib wants to set it based on
-# LIBRARY; we could set LIBRARY, but that creates a target that won't
-# build.
-LIBLINKS=libsqlite3.so
-
-# Install targets
-$(ROOTSQLITE3TCLDIR):
- $(INS.dir)
- $(RM) $(ROOTSQLITE3TCLDIR)/32
- $(SYMLINK) . $(ROOTSQLITE3TCLDIR)/32
-
-$(ROOTSQLITE3TCLDIR64):
- $(INS.dir)
- $(RM) $(ROOTSQLITE3TCLDIR)/64
- $(SYMLINK) $(MACH64) $(ROOTSQLITE3TCLDIR)/64
-
-$(ROOTLIB)/%.so.0: $(VER)/solaris/%.so.0
- $(SRC)/tools/post_process_so $<
- $(INS.file)
-
-$(ROOTLIB64)/%.so.0: $(VER64)/solaris/%.so.0
- $(SRC)/tools/post_process_so $<
- $(INS.file)
-
-$(ROOTSQLITE3TCLDIR)/%.so: $(VER)/solaris/%.so
- $(SRC)/tools/post_process_so $<
- $(INS.file)
-
-$(ROOTSQLITE3TCLDIR64)/%.so: $(VER64)/solaris/%.so
- $(SRC)/tools/post_process_so $<
- $(INS.file)
-
-$(ROOTINCLUDEDIR)/% $(ROOTPKGCONFIGDIR)/%: $(VER)/%
- $(INS.file)
-
-$(ROOTSQLITE3TCLDIR)/%: $(TOP)/%
- $(INS.file)
-
-$(ROOTMAN1)/%: sunman/%
- $(INS.file)
-
-$(ROOTBIN)/%: $(VER)/solaris/%
- $(INS.file)
-
-sunman:
- mkdir -p sunman
-
-# Append ATTRIBUTES and NOTES sections to the sqlite3.1 manpage
-sunman/%: sunman $(VER)/config.status $(VER)/%
- $(SED) -f sunman-stability $< > $@
-
-installdocs: $(ROOTDOC)/sqlite3/index.html
-
-install_h:
-
-install: all installdocs .WAIT $(ROOTSQLITE3TCLDIR) $(ROOTSQLITE3TCLDIR64) \
- $(ROOTLIBSOFILES) $(ROOTTCLLIBSOFILES) $(ROOTMAN1FILES) \
- $(ROOTHDRFILES) $(ROOTTCLFILES) $(ROOTPKGCONFIGFILES) $(ROOTPROG) \
- $(ROOTLIB)/$(LIBLINKS) $(ROOTLIB64)/$(LIBLINKS) install_h
- $(SRC)/tools/protofix --perm --pkg SUNWsqlite3
- $(SRC)/tools/protofix --perm --pkg SUNWsqlite3tcl
- $(SRC)/tools/protofix --perm --pkg SUNWsqlite3docs
-
-# Build SQLite3
-all: all32 all64
-
-all32: $(VER)/config.status
- (cd $(VER); unset SRC; env -i \
- CC=$(CC) \
- CMD_MAPFILE=$(SRC)/cmd/mapfile_noexstk \
- LIBSQLITE_MAPFILE=$(TOP)/mapfile-libsqlite3 \
- INSTALL=/usr/ucb/install \
- PATH=$(SFW_PATH) \
- MAKE=$(GMAKE) \
- $(GMAKE) solaris/libsqlite3.so solaris/libtclsqlite3.so \
- solaris/sqlite3 )
- test "`elfedit -r -osimple -e ehdr:ei_class \
- $(VER)/solaris/libsqlite3.so.0`" = ELFCLASS32
- test "`elfedit -r -osimple -e ehdr:ei_class \
- $(VER)/solaris/libtclsqlite3.so`" = ELFCLASS32
-
-all64: $(VER64)/config.status
- (cd $(VER64); unset SRC; env -i \
- CC=$(CC) \
- CMD_MAPFILE=$(SRC)/cmd/mapfile_noexstk \
- LIBSQLITE_MAPFILE=$(TOP)/mapfile-libsqlite3 \
- INSTALL=/usr/ucb/install \
- PATH=$(SFW_PATH) \
- MAKE=$(GMAKE) \
- $(GMAKE) solaris/libsqlite3.so solaris/libtclsqlite3.so \
- solaris/sqlite3 )
- test "`elfedit -r -osimple -e ehdr:ei_class \
- $(VER64)/solaris/libsqlite3.so.0`" = ELFCLASS64
- test "`elfedit -r -osimple -e ehdr:ei_class \
- $(VER64)/solaris/libtclsqlite3.so`" = ELFCLASS64
-
-# Configure SQLite3
-$(VER)/config.status: $(VER)/configure
- (cd $(VER); unset SRC; \
- gpatch -u -p 1 < ../patch; \
- env -i \
- CC=$(CC) "CFLAGS=$(CFLAGS) $(SQLITE3_CFLAGS)" \
- INSTALL=/usr/ucb/install \
- PATH=$(SFW_PATH) \
- MAKE=$(GMAKE) \
- ./configure $(CONFIGURE_OPTIONS) )
-
-$(VER64)/config.status: $(VER64)/configure
- (cd $(VER64); unset SRC; \
- gpatch -u -p 1 < ../patch; \
- env -i \
- CC=$(CC) "CFLAGS=$(CFLAGS64) $(SQLITE3_CFLAGS)" \
- INSTALL=/usr/ucb/install \
- PATH=$(SFW_PATH) \
- MAKE=$(GMAKE) \
- ./configure $(CONFIGURE_OPTIONS) )
-
-.PARALLEL: all32 all64
-
-# Unpack SQLite3
-$(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 -)
- mv tmp/$(VER) $(VER64)
- touch $(VER64)/configure
-
-# Unpack SQLite3 docs
-$(ROOTDOC)/sqlite3/index.html: $(TOP)/$(SQLITE3DOCS)
- rm -rf $(ROOTDOC)/sqlite3
- (cd $(ROOTDOC) && unzip $(TOP)/$(SQLITE3DOCS) && \
- $(MV) sqlite-$(SQLITE_DOC_VER:sh)-docs sqlite3)
- touch $(ROOTDOC)/sqlite3/index.html
-
-clean:
- -rm -rf $(VER) $(VER64)
-
-include ../Makefile.targ
-
--- a/usr/src/lib/sqlite3/mapfile-libsqlite3 Tue Feb 23 00:53:20 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,213 +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 "@(#)mapfile-libsqlite3 1.4 09/06/05 SMI"
-#
-# Defines the public interface to SQLite3
-#
-sqlite_3.6.17 {
- global:
- sqlite3_enable_load_extension;
- sqlite3_load_extension;
- sqlite3_strnicmp;
-} sqlite_3.5.4;
-
-sqlite_3.5.4 {
- global:
- # exported functions
- sqlite3_aggregate_context;
- sqlite3_aggregate_count;
- sqlite3_auto_extension;
- sqlite3_backup_finish;
- sqlite3_backup_init;
- sqlite3_backup_pagecount;
- sqlite3_backup_remaining;
- sqlite3_backup_step;
- sqlite3_bind_blob;
- sqlite3_bind_double;
- sqlite3_bind_int;
- sqlite3_bind_int64;
- sqlite3_bind_null;
- sqlite3_bind_parameter_count;
- sqlite3_bind_parameter_index;
- sqlite3_bind_parameter_name;
- sqlite3_bind_text;
- sqlite3_bind_text16;
- sqlite3_bind_value;
- sqlite3_bind_zeroblob;
- sqlite3_blob_bytes;
- sqlite3_blob_close;
- sqlite3_blob_open;
- sqlite3_blob_read;
- sqlite3_blob_write;
- sqlite3_busy_handler;
- sqlite3_busy_timeout;
- sqlite3_changes;
- sqlite3_clear_bindings;
- sqlite3_close;
- sqlite3_collation_needed;
- sqlite3_collation_needed16;
- sqlite3_column_blob;
- sqlite3_column_bytes;
- sqlite3_column_bytes16;
- sqlite3_column_count;
- sqlite3_column_decltype;
- sqlite3_column_decltype16;
- sqlite3_column_double;
- sqlite3_column_int;
- sqlite3_column_int64;
- sqlite3_column_name;
- sqlite3_column_name16;
- sqlite3_column_text;
- sqlite3_column_text16;
- sqlite3_column_type;
- sqlite3_column_value;
- sqlite3_commit_hook;
- sqlite3_complete;
- sqlite3_complete16;
- sqlite3_config;
- sqlite3_context_db_handle;
- sqlite3_create_collation;
- sqlite3_create_collation16;
- sqlite3_create_collation_v2;
- sqlite3_create_function;
- sqlite3_create_function16;
- sqlite3_create_module;
- sqlite3_create_module_v2;
- sqlite3_data_count;
- sqlite3_db_config;
- sqlite3_db_handle;
- sqlite3_db_mutex;
- sqlite3_db_status;
- sqlite3_declare_vtab;
- sqlite3_enable_shared_cache;
- sqlite3_errcode;
- sqlite3_errmsg;
- sqlite3_errmsg16;
- sqlite3_exec;
- sqlite3_expired;
- sqlite3_extended_errcode;
- sqlite3_extended_result_codes;
- sqlite3_file_control;
- sqlite3_finalize;
- sqlite3_free;
- sqlite3_free_table;
- sqlite3_get_autocommit;
- sqlite3_get_auxdata;
- sqlite3_get_table;
- sqlite3_global_recover;
- sqlite3_initialize;
- sqlite3_interrupt;
- sqlite3_last_insert_rowid;
- sqlite3_libversion;
- sqlite3_libversion_number;
- sqlite3_limit;
- sqlite3_malloc;
- sqlite3_memory_alarm;
- sqlite3_memory_highwater;
- sqlite3_memory_used;
- sqlite3_mprintf;
- sqlite3_mutex_alloc;
- sqlite3_mutex_enter;
- sqlite3_mutex_free;
- sqlite3_mutex_leave;
- sqlite3_mutex_try;
- sqlite3_next_stmt;
- sqlite3_open;
- sqlite3_open16;
- sqlite3_open_v2;
- sqlite3_os_end;
- sqlite3_os_init;
- sqlite3_overload_function;
- sqlite3_prepare;
- sqlite3_prepare16;
- sqlite3_prepare16_v2;
- sqlite3_prepare_v2;
- sqlite3_profile;
- sqlite3_progress_handler;
- sqlite3_randomness;
- sqlite3_realloc;
- sqlite3_release_memory;
- sqlite3_reset;
- sqlite3_reset_auto_extension;
- sqlite3_result_blob;
- sqlite3_result_double;
- sqlite3_result_error;
- sqlite3_result_error16;
- sqlite3_result_error_code;
- sqlite3_result_error_nomem;
- sqlite3_result_error_toobig;
- sqlite3_result_int;
- sqlite3_result_int64;
- sqlite3_result_null;
- sqlite3_result_text;
- sqlite3_result_text16;
- sqlite3_result_text16be;
- sqlite3_result_text16le;
- sqlite3_result_value;
- sqlite3_result_zeroblob;
- sqlite3_rollback_hook;
- sqlite3_set_authorizer;
- sqlite3_set_auxdata;
- sqlite3_shutdown;
- sqlite3_sleep;
- sqlite3_snprintf;
- sqlite3_soft_heap_limit;
- sqlite3_sql;
- sqlite3_status;
- sqlite3_step;
- sqlite3_stmt_status;
- sqlite3_test_control;
- sqlite3_thread_cleanup;
- sqlite3_threadsafe;
- sqlite3_total_changes;
- sqlite3_trace;
- sqlite3_transfer_bindings;
- sqlite3_update_hook;
- sqlite3_user_data;
- sqlite3_value_blob;
- sqlite3_value_bytes;
- sqlite3_value_bytes16;
- sqlite3_value_double;
- sqlite3_value_int;
- sqlite3_value_int64;
- sqlite3_value_numeric_type;
- sqlite3_value_text;
- sqlite3_value_text16;
- sqlite3_value_text16be;
- sqlite3_value_text16le;
- sqlite3_value_type;
- sqlite3_vfs_find;
- sqlite3_vfs_register;
- sqlite3_vfs_unregister;
- sqlite3_vmprintf;
- sqlite3StrICmp;
- sqlite3ErrStr;
-
- # exported data
- sqlite3_temp_directory;
- sqlite3_version;
-
- local:
- *;
-};
--- a/usr/src/lib/sqlite3/patch Tue Feb 23 00:53:20 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
---- sqlite-3.6.14.2-old/Makefile.in Mon May 25 06:13:30 2009
-+++ sqlite-3.6.14.2/Makefile.in Thu Jun 11 18:58:34 2009
-@@ -484,9 +484,15 @@
- # all that automatic generation.
- #
- .target_source: $(SRC)
-- rm -rf tsrc
- mkdir -p tsrc
-- cp $(SRC) tsrc
-+ for i in $(SRC); \
-+ do \
-+ if /bin/test $$i -nt tsrc/$$i; \
-+ then \
-+ cp $$i tsrc; \
-+ touch target_source; \
-+ fi; \
-+ done
- rm tsrc/sqlite.h.in tsrc/parse.y
- touch .target_source
-
-@@ -796,7 +802,7 @@
- clean:
- rm -f *.lo *.la *.o sqlite3$(TEXE) libsqlite3.la
- rm -f sqlite3.h opcodes.*
-- rm -rf .libs .deps tsrc
-+ rm -rf .libs .deps tsrc solaris
- rm -f lemon$(BEXE) lempar.c parse.* sqlite*.tar.gz
- rm -f mkkeywordhash$(BEXE) keywordhash.h
- rm -f $(PUBLISH)
-@@ -826,3 +832,30 @@
- sqlite3.dll: $(REAL_LIBOBJ) sqlite3.def
- $(TCC) -shared -o $@ sqlite3.def \
- -Wl,"--strip-all" $(REAL_LIBOBJ)
-+
-+solaris:
-+ mkdir -p solaris
-+
-+solaris/libsqlite3.so.0: solaris sqlite3.c
-+ rm -f solaris/libsqlite3.so.0
-+ $(TCC) -DSQLITE_PRIVATE= -o solaris/libsqlite3.so.0 -G -KPIC sqlite3.c \
-+ -Bdirect -L$(ROOT)/usr/lib -M $(LIBSQLITE_MAPFILE) \
-+ -h libsqlite3.so.0 -lc $(TLIBS)
-+
-+solaris/libsqlite3.so: solaris/libsqlite3.so.0
-+ rm -f solaris/libsqlite3.so
-+ ln -s libsqlite3.so.0 solaris/libsqlite3.so
-+
-+solaris/sqlite3: solaris/libsqlite3.so
-+ rm -f solaris/sqlite3
-+ $(TCC) -o solaris/sqlite3 $(TOP)/src/shell.c \
-+ -I$(ROOT)/usr/include -Bdirect -L$(TOP)/solaris \
-+ -L$(ROOT)/usr/lib $(TLIBS) -M $(CMD_MAPFILE) -lsqlite3
-+
-+solaris/libtclsqlite3.so: solaris/libsqlite3.so
-+ rm -f solaris/libtclsqlite3.so
-+ $(TCC) -o solaris/libtclsqlite3.so -G -KPIC $(TOP)/src/tclsqlite.c \
-+ -I$(ROOT)/usr/include -Bdirect -L$(TOP)/solaris \
-+ -L$(ROOT)/usr/lib -h libtclsqlite3.so.0 -lsqlite3 -L/usr/lib \
-+ -ltclstub8.4
-+
--- a/usr/src/lib/sqlite3/pkgIndex.tcl Tue Feb 23 00:53:20 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-package ifneeded sqlite3 3.6 [list load [file join $dir [expr $::tcl_platform(wordSize) * 8] libtclsqlite3.so] sqlite3]
Binary file usr/src/lib/sqlite3/sqlite-3.6.17.tar.gz has changed
Binary file usr/src/lib/sqlite3/sqlite_docs_3_6_17.zip has changed
--- a/usr/src/lib/sqlite3/sunman-stability Tue Feb 23 00:53:20 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +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 SUNWsqlite3\
-=\
-Interface Stability See NOTES\
-.TE \
-.PP\
-.SH NOTES\
-Source for SQLite3 is available at http://opensolaris.org \
-and at http://sqlite.org. Documentation is available \
-at file:///usr/share/doc/sqlite3, and at http://sqlite.org.\
-.PP\
-This command's stability is Committed, but its options and \
-dot-commands are Volatile. The SQL syntax is Uncommitted, \
-but any portions declared "obsolete" or "experimental" \
-in file://usr/share/doc/sqlite3/lang.html are Obsolete Volatile \
-or Volatile, respectively.\
-\.\\" End Sun update
--- a/usr/src/lib/sqlite3/update-mapfile Tue Feb 23 00:53:20 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,275 +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 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# ident "@(#)update-mapfile 1.1 09/08/21 SMI"
-
-# Utility for updating the libsqlite3 mapfile. This is intended to be
-# run manually; the mapfile it generates must be reviewed, and likely
-# will need to be edited.
-
-PROG=${0##*/}
-OIFS="$IFS"
-IFS=
-set -o noglob
-
-EXPORTED_SYM_PAT=sqlite3_
-
-function usage {
- cat <<EOF
-Usage: $PROG [-p] [-c] [-x] [-N sqlite3_version] [-O sqlite3_version]
-
- $PROG generates a mapfile for libsqlite3, including proper
- versioning. This is intended to be run manually; the mapfile it
- generates must be reviewed, and likely will need to be edited.
-
- The -N and -O options specify the new and old versions,
- respectively, of SQLite3 to use in building a new mapfile.
- One of -N or -O must be given. If one is not given, then the
- current version string from the METADATA file will be used.
- Both versions must be different.
-
- On exit the name of the new mapfile will be output to standard
- output.
-
- This program builds SQLite3 at least twice, once for the old
- version, once for the new version. On success the new mapfile
- name (in $TMPDIR) will be printed to standard output.
-
- The Makefile.sfw must allow for overriding SQLITE_VER and
- LIBSQLITE_MAPFILE.
-
- Use the -p option to generate a mapfile with a private version
- for exporting private symbols.
-
- Use -c to cause dmake clobber.
-
- Use -x for debugging.
-EOF
- exit 1
-}
-
-keep_private_syms=false
-VER=$(perl $SRC/tools/metainfo.pl --key VERSION)
-OLDVER=$VER
-NEWVER=$VER
-debug=false
-clobber=false
-while getopts O:N:cpx opt
-do
- case $opt in
- p) keep_private_syms=:;;
- O) OLDVER=$OPTARG;;
- N) NEWVER=$OPTARG;;
- c) clobber=:;;
- x) debug=:; set -x;;
- ?) usage;;
- esac
-done
-
-[[ $OLDVER = $NEWVER ]] && usage
-
-# Cleanup on exit
-set -A rmfiles --
-trap '$debug || rm -f "${rmfiles[@]}"' EXIT
-
-# Make temp files
-function tmpfiles {
- typeset arg
-
- for arg in "$@"
- do
- nameref var=$arg
- var=$(mktemp -t "${arg}XXXX")
- rmfiles[${#rmfiles[@]}]=$var
- done
-}
-
-function buildone {
- typeset mapfile
-
- nameref log=${1}log
- shift
-
- if (( $# == 2 ))
- then
- mapfile=LIBSQLITE_MAPFILE=$2
- fi
-
- print "Building SQLITE_VER=$1; see $log"
- $clobber && print "\tdoing a make clobber SQLITE_VER=$1..."
- $clobber && dmake -f Makefile.sfw- SQLITE_VER=$1 clobber >> $log 2>&1
- print "\tbuilding SQLITE_VER=$1..."
- dmake -f Makefile.sfw- SQLITE_VER=$1 $mapfile install >> $log 2>&1
- return $?
-}
-
-function getglobs {
- nameref globs=${1}globs
- elfdump -s sqlite-$2/solaris/libsqlite3.so| grep GLOB | grep -v UNDEF | \
- /usr/xpg4/bin/egrep 'FUNC|\.data\>|\.rodata\>'| \
- awk '{print $9}' | grep -v '^_' | sort -u > $globs
- nameref out=${1}api
- grep "^${EXPORTED_SYM_PAT}" $globs > $out
- nameref out=${1}private
- grep -v '^sqlite3_' $globs > $out
-}
-
-function finish {
- finalmap=$(mktemp -t mapfile-libsqlite3-new-XXXX)
- cp $newmap $finalmap
- print "New mapfile: $finalmap"
- $debug && print "Temporary files (debug): " "${rmfiles[@]}"
- exit 0
-}
-
-$debug && typeset -ft tmpfiles buildone getglobs finish
-
-tmpfiles empty newmap oldglobs newglobs oldapi newapi oldprivate \
- newprivate oldlog newlog
-
-# First build the new version with the existing mapfile to detect
-# backwards-incompatible changes where previously exported symbols have
-# disappeared
-
-if ! buildone new $NEWVER
-then
- # Let's see if the the problem was missing symbols
- #
- # Build the old version
- if ! buildone old $OLDVER
- then
- print -u2 "\nCouldn't build either the new nor the old versions"
- exit 2
- fi
- # and get the global symbols from it
- getglobs old $OLDVER
-
- # Now Build the new version with no mapfile
- if ! buildone new $NEWVER $empty
- then
- print -u2 "\nCouldn't build the new version"
- exit 3
- fi
- getglobs new $NEWVER
-
- print -u2 "\nPlease check for backwards-incompatible changes (lines"
- print -u2 "starting with '<'):"
- diff $oldglobs $newglobs
- exit 4
-fi
-
-buildone old $OLDVER
-getglobs old $OLDVER
-
-clobber=: buildone new $NEWVER $empty
-getglobs new $NEWVER
-
-## Build new mapfile
-
-print "Building new mapfile..."
-
-# First, copy the header comments from the old one to the new one
-while read -r line
-do
- if [[ "$line" = \#* ]]
- then
- print -r -- "$line"
- else
- break
- fi
-done < mapfile-libsqlite3 > $newmap
-
-# Create the new version
-print "sqlite_$NEWVER {\c" >> $newmap
-first=:
-
-# Add the new API symbols, allowing for the possibility that there are
-# no new exported symbols
-diff $oldapi $newapi | grep '^>' | awk '{print $2}' | while read newsym
-do
- $first && {
- print -- "\n global:"
- first=false
- }
- print -- "\t${newsym};"
-done >> $newmap
-
-
-# Close the new version and make it inherit from the old
-$first && print " \c" >> $newmap
-if /usr/xpg4/bin/grep -q "^sqlite_${OLDVER}.{" mapfile-libsqlite3
-then
- print "} sqlite_${OLDVER};" >> $newmap
-else
- print "} sqlite_3.5.4;" >> $newmap
-fi
-
-# Now add the remainder of the previous mapfile, excluding
-# SQLITE_PRIVATE versions.
-header=:
-while read -r line
-do
- # Skip the header comments
- $header && [[ "$line" = \#* ]] && {
- header=false
- while read -r line
- do
- [[ "$line" = \#* ]] && continue
- break
- done
- }
-
- [[ "$line" = SQLITE_PRIVATE*[\;] ]] && continue
- if [[ "$line" = SQLITE_PRIVATE* ]]
- then
- while read -r line
- do
- [[ "$line" = *[}]*[\;] ]] && break
- done
- continue
- fi
- print -r -- "$line"
-done < mapfile-libsqlite3 >> $newmap
-
-# Optionally add a single private version with all private symbols
-$keep_private_syms || finish
-
-print "\nSQLITE_PRIVATE_$NEWVER {\c" >> $newmap
-first=:
-while read sym
-do
- # These two symbols were already exported earlier, not as
- # private symbols, so skip them here
- [[ $sym = sqlite3StrICmp || $sym = sqlite3ErrStr ]] && continue
-
- $first && {
- print "\n global:"
- first=false
- }
- print "\t${sym};"
-done < $newprivate >> $newmap
-$first && print " \c" >> $newmap
-print "};" >> $newmap
-
-finish
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/lib/trousers/auth_attr Fri Mar 05 22:27:24 2010 +0200
@@ -0,0 +1,2 @@
+solaris.smf.value.tcsd:::Change TPM Administation value properties::
+solaris.smf.manage.tcsd:::Manage TPM Administration service states::
--- a/usr/src/lib/trousers/install-sfw Tue Feb 23 00:53:20 2010 +0200
+++ b/usr/src/lib/trousers/install-sfw Fri Mar 05 22:27:24 2010 +0200
@@ -20,10 +20,10 @@
# CDDL HEADER END
#
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "@(#)install-sfw 1.5 09/08/19 SMI"
+#ident "@(#)install-sfw 1.6 10/02/19 SMI"
VERS=trousers-0.3.2
@@ -59,6 +59,9 @@
_install N tcsd.xml ${MANIFESTDIR}/tcsd.xml 444
_install N tcsd.sh ${METHODDIR}/tcsd.sh 555
+_install N auth_attr ${ROOT}/etc/security/auth_attr.d/trousers 444
+_install N prof_attr ${ROOT}/etc/security/prof_attr.d/trousers 444
+
cd ${VERS}
mkdir -p ${ROOT}/etc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/lib/trousers/prof_attr Fri Mar 05 22:27:24 2010 +0200
@@ -0,0 +1,1 @@
+TPM Administration::::auths=solaris.smf.manage.tcsd,solaris.smf.value.tcsd
--- a/usr/src/pkgdefs/Makefile Tue Feb 23 00:53:20 2010 +0200
+++ b/usr/src/pkgdefs/Makefile Fri Mar 05 22:27:24 2010 +0200
@@ -23,7 +23,7 @@
# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "@(#)Makefile 1.278 10/02/08 SMI"
+# ident "@(#)Makefile 1.279 10/02/19 SMI"
#
#
@@ -429,9 +429,6 @@
SUNWsnortu \
SUNWsound-exchange \
SUNWspawn-fcgi \
- SUNWsqlite3 \
- SUNWsqlite3docs \
- SUNWsqlite3tcl \
SUNWsquidr \
SUNWsquidu \
SUNWstunnelr \
--- a/usr/src/pkgdefs/SUNWcupsr/pkginfo.tmpl Tue Feb 23 00:53:20 2010 +0200
+++ b/usr/src/pkgdefs/SUNWcupsr/pkginfo.tmpl Fri Mar 05 22:27:24 2010 +0200
@@ -20,10 +20,10 @@
#
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "@(#)pkginfo.tmpl 1.4 09/10/02 SMI"
+# ident "@(#)pkginfo.tmpl 1.5 10/02/19 SMI"
#
@@ -40,7 +40,7 @@
VENDOR="Sun Microsystems, Inc."
HOTLINE="Please contact your local service provider"
EMAIL=""
-CLASSES="none preserve manifest rbac"
+CLASSES="none preserve manifest"
BASEDIR=/
SUNW_PKGVERS="1.0"
SUNW_PKG_ALLZONES="false"
--- a/usr/src/pkgdefs/SUNWcupsr/prototype_com Tue Feb 23 00:53:20 2010 +0200
+++ b/usr/src/pkgdefs/SUNWcupsr/prototype_com Fri Mar 05 22:27:24 2010 +0200
@@ -20,10 +20,10 @@
#
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "@(#)prototype_com 1.6 09/10/23 SMI"
+# ident "@(#)prototype_com 1.7 10/02/19 SMI"
#
i pkginfo
@@ -43,8 +43,10 @@
d none etc/dbus-1/system.d 0755 root bin
f none etc/dbus-1/system.d/cups.conf 0444 root bin
d none etc/security 0755 root sys
-e rbac etc/security/auth_attr 0644 root sys
-e rbac etc/security/prof_attr 0644 root sys
+d none etc/security/auth_attr.d 0755 root sys
+f none etc/security/auth_attr.d/cups 0444 root sys
+d none etc/security/prof_attr.d 0755 root sys
+f none etc/security/prof_attr.d/cups 0444 root sys
d none lib 0755 root bin
d none lib/svc 0755 root bin
d none lib/svc/method 0755 root bin
--- a/usr/src/pkgdefs/SUNWcurl/pkginfo.tmpl Tue Feb 23 00:53:20 2010 +0200
+++ b/usr/src/pkgdefs/SUNWcurl/pkginfo.tmpl Fri Mar 05 22:27:24 2010 +0200
@@ -18,10 +18,10 @@
#
# CDDL HEADER END
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "@(#)pkginfo.tmpl 1.3 09/08/20 SMI"
+# ident "@(#)pkginfo.tmpl 1.4 10/02/23 SMI"
#
# This required package information file describes characteristics of the
# package, such as package abbreviation, full package name, package version,
@@ -36,7 +36,7 @@
SUNW_PKGTYPE="usr"
MAXINST="1000"
CATEGORY="system"
-DESC="CURL - The C-URL Wrappers Library (7.19.5)"
+DESC="CURL - The C-URL Wrappers Library (7.20.0)"
VENDOR="Sun Microsystems, Inc."
HOTLINE="Please contact your local service provider"
EMAIL=""
--- a/usr/src/pkgdefs/SUNWejabberdr/pkginfo.tmpl Tue Feb 23 00:53:20 2010 +0200
+++ b/usr/src/pkgdefs/SUNWejabberdr/pkginfo.tmpl Fri Mar 05 22:27:24 2010 +0200
@@ -20,10 +20,10 @@
#
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "@(#)pkginfo.tmpl 1.2 09/06/18 SMI"
+# ident "@(#)pkginfo.tmpl 1.3 10/02/19 SMI"
#
#
@@ -44,7 +44,7 @@
VENDOR="Sun Microsystems, Inc."
HOTLINE="Please contact your local service provider"
EMAIL=""
-CLASSES="none manifest preserve rbac"
+CLASSES="none manifest preserve"
BASEDIR=/
SUNW_PKGVERS="1.0"
SUNW_PKG_ALLZONES="false"
--- a/usr/src/pkgdefs/SUNWejabberdr/prototype_com Tue Feb 23 00:53:20 2010 +0200
+++ b/usr/src/pkgdefs/SUNWejabberdr/prototype_com Fri Mar 05 22:27:24 2010 +0200
@@ -20,10 +20,10 @@
#
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "@(#)prototype_com 1.2 09/06/18 SMI"
+# ident "@(#)prototype_com 1.3 10/02/19 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
@@ -52,9 +52,12 @@
e preserve etc/ejabberd/ejabberdctl.cfg 0644 root bin
e preserve etc/ejabberd/inetrc 0644 root bin
d none etc/security 0755 root sys
-e rbac etc/security/auth_attr 0644 root sys
-e rbac etc/security/exec_attr 0644 root sys
-e rbac etc/security/prof_attr 0644 root sys
+d none etc/security/auth_attr.d 0755 root sys
+f none etc/security/auth_attr.d/ejabberd 0444 root sys
+d none etc/security/exec_attr.d 0755 root sys
+f none etc/security/exec_attr.d/ejabberd 0444 root sys
+d none etc/security/prof_attr.d 0755 root sys
+f none etc/security/prof_attr.d/ejabberd 0444 root sys
d none lib 755 root bin
d none lib/svc 755 root bin
d none lib/svc/method 755 root bin
--- a/usr/src/pkgdefs/SUNWfpingr/pkginfo.tmpl Tue Feb 23 00:53:20 2010 +0200
+++ b/usr/src/pkgdefs/SUNWfpingr/pkginfo.tmpl Fri Mar 05 22:27:24 2010 +0200
@@ -19,10 +19,10 @@
#
# CDDL HEADER END
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "@(#)pkginfo.tmpl 1.1 08/10/28 SMI"
+#ident "@(#)pkginfo.tmpl 1.2 10/02/19 SMI"
#
#
# This required package information file describes characteristics of the
@@ -42,7 +42,7 @@
VENDOR="Sun Microsystems, Inc."
HOTLINE="Please contact your local service provider"
EMAIL=""
-CLASSES="none rbac"
+CLASSES="none"
BASEDIR=/
SUNW_PKGVERS="1.0"
SUNW_PKG_ALLZONES="false"
--- a/usr/src/pkgdefs/SUNWfpingr/prototype_com Tue Feb 23 00:53:20 2010 +0200
+++ b/usr/src/pkgdefs/SUNWfpingr/prototype_com Fri Mar 05 22:27:24 2010 +0200
@@ -19,10 +19,10 @@
#
# CDDL HEADER END
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "@(#)prototype_com 1.1 08/10/28 SMI"
+#ident "@(#)prototype_com 1.2 10/02/19 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
@@ -45,4 +45,5 @@
#
d none etc 755 root sys
d none etc/security 755 root sys
-e rbac etc/security/exec_attr 644 root sys
+d none etc/security/exec_attr.d 755 root sys
+f none etc/security/exec_attr.d/fping 444 root sys
--- a/usr/src/pkgdefs/SUNWgccruntime/prototype_i386 Tue Feb 23 00:53:20 2010 +0200
+++ b/usr/src/pkgdefs/SUNWgccruntime/prototype_i386 Fri Mar 05 22:27:24 2010 +0200
@@ -18,10 +18,10 @@
#
# CDDL HEADER END
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "@(#)prototype_i386 1.8 07/06/05 SMI"
+#ident "@(#)prototype_i386 1.9 10/02/19 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
@@ -77,3 +77,4 @@
s none usr/sfw/lib/amd64/libobjc.so=libobjc.so.1.0.0
s none usr/sfw/lib/amd64/libobjc.so.1=libobjc.so.1.0.0
f none usr/sfw/lib/amd64/libfrtbegin.a 555 root bin
+s none usr/sfw/lib/64=amd64
--- a/usr/src/pkgdefs/SUNWgccruntime/prototype_sparc Tue Feb 23 00:53:20 2010 +0200
+++ b/usr/src/pkgdefs/SUNWgccruntime/prototype_sparc Fri Mar 05 22:27:24 2010 +0200
@@ -18,10 +18,10 @@
#
# CDDL HEADER END
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "@(#)prototype_sparc 1.8 07/06/05 SMI"
+#ident "@(#)prototype_sparc 1.9 10/02/19 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
@@ -76,3 +76,4 @@
s none usr/sfw/lib/sparcv9/libobjc.so=libobjc.so.1.0.0
s none usr/sfw/lib/sparcv9/libobjc.so.1=libobjc.so.1.0.0
f none usr/sfw/lib/sparcv9/libfrtbegin.a 555 root bin
+s none usr/sfw/lib/64=sparcv9
--- a/usr/src/pkgdefs/SUNWgd2/pkginfo.tmpl Tue Feb 23 00:53:20 2010 +0200
+++ b/usr/src/pkgdefs/SUNWgd2/pkginfo.tmpl Fri Mar 05 22:27:24 2010 +0200
@@ -18,10 +18,10 @@
#
# CDDL HEADER END
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "@(#)pkginfo.tmpl 1.1 07/07/27 SMI"
+# ident "@(#)pkginfo.tmpl 1.2 10/02/22 SMI"
#
# This required package information file describes characteristics of the
# package, such as package abbreviation, full package name, package version,
@@ -36,7 +36,7 @@
SUNW_PKGTYPE="usr"
MAXINST="1000"
CATEGORY="system"
-DESC="GD - The Graphics Draw Library (2.0.34)"
+DESC="GD - The Graphics Draw Library (2.0.35)"
VENDOR="Sun Microsystems, Inc."
HOTLINE="Please contact your local service provider"
EMAIL=""
--- a/usr/src/pkgdefs/SUNWlighttpd14r/pkginfo.tmpl Tue Feb 23 00:53:20 2010 +0200
+++ b/usr/src/pkgdefs/SUNWlighttpd14r/pkginfo.tmpl Fri Mar 05 22:27:24 2010 +0200
@@ -20,10 +20,10 @@
#
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "@(#)pkginfo.tmpl 1.3 09/11/19 SMI"
+# ident "@(#)pkginfo.tmpl 1.4 10/02/19 SMI"
#
#
# This required package information file describes characteristics of the
@@ -43,7 +43,7 @@
VENDOR="Sun Microsystems, Inc."
HOTLINE="Please contact your local service provider"
EMAIL=""
-CLASSES="none renamenew manifest rbac"
+CLASSES="none renamenew manifest"
BASEDIR=/
SUNW_PKGVERS="1.0"
SUNW_PKG_ALLZONES="false"
--- a/usr/src/pkgdefs/SUNWlighttpd14r/prototype_com Tue Feb 23 00:53:20 2010 +0200
+++ b/usr/src/pkgdefs/SUNWlighttpd14r/prototype_com Fri Mar 05 22:27:24 2010 +0200
@@ -20,10 +20,10 @@
#
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "@(#)prototype_com 1.3 09/11/19 SMI"
+# ident "@(#)prototype_com 1.4 10/02/19 SMI"
#
# SUNWlighttpd14r
#
@@ -41,8 +41,10 @@
e renamenew etc/lighttpd/1.4/conf.d/fcgi-php.conf 0644 root bin
e renamenew etc/lighttpd/1.4/lighttpd.conf 0644 root bin
d none etc/security 0755 root sys
-e rbac etc/security/auth_attr 0644 root sys
-e rbac etc/security/prof_attr 0644 root sys
+d none etc/security/auth_attr.d 0755 root sys
+f none etc/security/auth_attr.d/lighttpd 0444 root sys
+d none etc/security/prof_attr.d 0755 root sys
+f none etc/security/prof_attr.d/lighttpd 0444 root sys
d none lib 0755 root bin
d none lib/svc 0755 root bin
d none lib/svc/method 0755 root bin
--- a/usr/src/pkgdefs/SUNWmemcachedr/pkginfo.tmpl Tue Feb 23 00:53:20 2010 +0200
+++ b/usr/src/pkgdefs/SUNWmemcachedr/pkginfo.tmpl Fri Mar 05 22:27:24 2010 +0200
@@ -19,10 +19,10 @@
#
# CDDL HEADER END
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "@(#)pkginfo.tmpl 1.3 09/10/20 SMI"
+# ident "@(#)pkginfo.tmpl 1.4 10/02/19 SMI"
#
# This required package information file describes characteristics of the
# package, such as package abbreviation, full package name, package version,
@@ -41,7 +41,7 @@
VENDOR="Sun Microsystems, Inc."
HOTLINE="Please contact your local service provider"
EMAIL=""
-CLASSES="none manifest rbac"
+CLASSES="none manifest"
BASEDIR=/
SUNW_PKGVERS="1.0"
SUNW_PKG_ALLZONES="false"
--- a/usr/src/pkgdefs/SUNWmemcachedr/prototype_com Tue Feb 23 00:53:20 2010 +0200
+++ b/usr/src/pkgdefs/SUNWmemcachedr/prototype_com Fri Mar 05 22:27:24 2010 +0200
@@ -18,10 +18,10 @@
#
# CDDL HEADER END
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "@(#)prototype_com 1.3 08/09/24 SMI"
+# ident "@(#)prototype_com 1.4 10/02/19 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
@@ -44,8 +44,10 @@
#
d none etc 755 root sys
d none etc/security 755 root sys
-e rbac etc/security/auth_attr 644 root sys
-e rbac etc/security/prof_attr 644 root sys
+d none etc/security/auth_attr.d 755 root sys
+f none etc/security/auth_attr.d/memcached 444 root sys
+d none etc/security/prof_attr.d 755 root sys
+f none etc/security/prof_attr.d/memcached 444 root sys
d none lib 755 root bin
d none lib/svc 755 root bin
d none lib/svc/method 755 root bin
--- a/usr/src/pkgdefs/SUNWmkcdr/pkginfo.tmpl Tue Feb 23 00:53:20 2010 +0200
+++ b/usr/src/pkgdefs/SUNWmkcdr/pkginfo.tmpl Fri Mar 05 22:27:24 2010 +0200
@@ -19,10 +19,10 @@
#
# CDDL HEADER END
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "@(#)pkginfo.tmpl 1.1 06/07/18 SMI"
+#ident "@(#)pkginfo.tmpl 1.2 10/02/19 SMI"
#
#
# This required package information file describes characteristics of the
@@ -42,7 +42,7 @@
VENDOR="Sun Microsystems, Inc."
HOTLINE="Please contact your local service provider"
EMAIL=""
-CLASSES="none rbac"
+CLASSES="none"
BASEDIR=/
SUNW_PKGVERS="1.0"
SUNW_PKG_ALLZONES="false"
--- a/usr/src/pkgdefs/SUNWmkcdr/prototype_com Tue Feb 23 00:53:20 2010 +0200
+++ b/usr/src/pkgdefs/SUNWmkcdr/prototype_com Fri Mar 05 22:27:24 2010 +0200
@@ -19,10 +19,10 @@
#
# CDDL HEADER END
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "@(#)prototype_com 1.2 08/09/24 SMI"
+#ident "@(#)prototype_com 1.3 10/02/19 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
@@ -45,4 +45,5 @@
#
d none etc 755 root sys
d none etc/security 755 root sys
-e rbac etc/security/exec_attr 644 root sys
+d none etc/security/exec_attr.d 755 root sys
+f none etc/security/exec_attr.d/cdrtools 444 root sys
--- a/usr/src/pkgdefs/SUNWmysql5r/prototype_com Tue Feb 23 00:53:20 2010 +0200
+++ b/usr/src/pkgdefs/SUNWmysql5r/prototype_com Fri Mar 05 22:27:24 2010 +0200
@@ -19,10 +19,10 @@
#
# CDDL HEADER END
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "@(#)prototype_com 1.3 09/02/18 SMI"
+#ident "@(#)prototype_com 1.4 10/02/19 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
@@ -53,6 +53,11 @@
f none etc/mysql/5.0/my-large.cnf 0644 root bin
f none etc/mysql/5.0/my-medium.cnf 0644 root bin
f none etc/mysql/5.0/my.innodb-heavy-4G.cnf 0644 root bin
+d none etc/security 0755 root sys
+d none etc/security/auth_attr.d 0755 root sys
+f none etc/security/auth_attr.d/mysql-50 0444 root bin
+d none etc/security/prof_attr.d 0755 root sys
+f none etc/security/prof_attr.d/mysql-50 0444 root bin
d none var 0755 root sys
d none var/mysql 0700 mysql mysql
d none var/mysql/5.0 0700 mysql mysql
--- a/usr/src/pkgdefs/SUNWntpr/pkginfo.tmpl Tue Feb 23 00:53:20 2010 +0200
+++ b/usr/src/pkgdefs/SUNWntpr/pkginfo.tmpl Fri Mar 05 22:27:24 2010 +0200
@@ -20,11 +20,11 @@
#
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "@(#)pkginfo.tmpl 1.2 09/06/29 SMI"
+#ident "@(#)pkginfo.tmpl 1.3 10/02/19 SMI"
#
#
# This required package information file describes characteristics of the
@@ -44,7 +44,7 @@
VENDOR="Sun Microsystems, Inc."
HOTLINE="Please contact your local service provider"
EMAIL=""
-CLASSES="none manifest rbac"
+CLASSES="none manifest"
BASEDIR=/
SUNW_PKGVERS="1.0"
SUNW_PKG_ALLZONES="false"
--- a/usr/src/pkgdefs/SUNWntpr/prototype_com Tue Feb 23 00:53:20 2010 +0200
+++ b/usr/src/pkgdefs/SUNWntpr/prototype_com Fri Mar 05 22:27:24 2010 +0200
@@ -21,10 +21,10 @@
#
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "@(#)prototype_com 1.1 09/05/17 SMI"
+#ident "@(#)prototype_com 1.2 10/02/19 SMI"
#
# This required package information file contains a list of package contents.
@@ -47,8 +47,10 @@
#
d none etc 755 root sys
d none etc/security 755 root sys
-e rbac etc/security/prof_attr 644 root sys
-e rbac etc/security/auth_attr 644 root sys
+d none etc/security/auth_attr.d 755 root sys
+f none etc/security/auth_attr.d/ntp 444 root sys
+d none etc/security/prof_attr.d 755 root sys
+f none etc/security/prof_attr.d/ntp 444 root sys
d none etc/inet 755 root sys
f none etc/inet/ntp.client 644 root sys
f none etc/inet/ntp.server 644 root sys
--- a/usr/src/pkgdefs/SUNWopenldapr/pkginfo.tmpl Tue Feb 23 00:53:20 2010 +0200
+++ b/usr/src/pkgdefs/SUNWopenldapr/pkginfo.tmpl Fri Mar 05 22:27:24 2010 +0200
@@ -19,10 +19,10 @@
#
# CDDL HEADER END
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "@(#)pkginfo.tmpl 1.2 08/10/27 SMI"
+# ident "@(#)pkginfo.tmpl 1.3 10/02/19 SMI"
#
# This required package information file describes characteristics of the
# package, such as package abbreviation, full package name, package version,
@@ -41,7 +41,7 @@
VENDOR="Sun Microsystems, Inc."
HOTLINE="Please contact your local service provider"
EMAIL=""
-CLASSES="none rbac renamenew manifest"
+CLASSES="none renamenew manifest"
BASEDIR=/
SUNW_PKGVERS="1.0"
SUNW_PKG_ALLZONES="false"
--- a/usr/src/pkgdefs/SUNWopenldapr/prototype_com Tue Feb 23 00:53:20 2010 +0200
+++ b/usr/src/pkgdefs/SUNWopenldapr/prototype_com Fri Mar 05 22:27:24 2010 +0200
@@ -23,7 +23,7 @@
# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "@(#)prototype_com 1.3 10/01/29 SMI"
+# ident "@(#)prototype_com 1.4 10/02/19 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
@@ -71,8 +71,10 @@
f none etc/openldap/schema/openldap.schema 444 root sys
f none etc/openldap/schema/ppolicy.schema 444 root sys
d none etc/security 755 root sys
-e rbac etc/security/exec_attr 644 root sys
-e rbac etc/security/prof_attr 644 root sys
+d none etc/security/exec_attr.d 755 root sys
+f none etc/security/exec_attr.d/openldap 444 root sys
+d none etc/security/prof_attr.d 755 root sys
+f none etc/security/prof_attr.d/openldap 444 root sys
d none lib 755 root bin
d none lib/svc 755 root bin
d none lib/svc/method 755 root bin
--- a/usr/src/pkgdefs/SUNWopenwsmanr/pkginfo.tmpl Tue Feb 23 00:53:20 2010 +0200
+++ b/usr/src/pkgdefs/SUNWopenwsmanr/pkginfo.tmpl Fri Mar 05 22:27:24 2010 +0200
@@ -18,10 +18,10 @@
#
# CDDL HEADER END
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "@(#)pkginfo.tmpl 1.1 09/03/11 SMI"
+# ident "@(#)pkginfo.tmpl 1.2 10/02/19 SMI"
#
# This required package information file describes characteristics of the
# package, such as package abbreviation, full package name, package version,
@@ -40,7 +40,7 @@
VENDOR="Sun Microsystems, Inc."
HOTLINE="Please contact your local service provider"
EMAIL=""
-CLASSES="none manifest rbac"
+CLASSES="none manifest"
BASEDIR=/
SUNW_PKGVERS="1.0"
SUNW_PKG_ALLZONES="false"
--- a/usr/src/pkgdefs/SUNWopenwsmanr/prototype_com Tue Feb 23 00:53:20 2010 +0200
+++ b/usr/src/pkgdefs/SUNWopenwsmanr/prototype_com Fri Mar 05 22:27:24 2010 +0200
@@ -20,10 +20,10 @@
#
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "@(#)prototype_com 1.1 09/03/11 SMI"
+# ident "@(#)prototype_com 1.2 10/02/19 SMI"
#
# This required package information file contains a list of package contents.
@@ -67,6 +67,9 @@
#RBAC changes
d none etc/security 0755 root sys
-e rbac etc/security/auth_attr 0644 root sys
-e rbac etc/security/exec_attr 0644 root sys
-e rbac etc/security/prof_attr 0644 root sys
+d none etc/security/auth_attr.d 0755 root sys
+f none etc/security/auth_attr.d/openwsman 0444 root sys
+d none etc/security/exec_attr.d 0755 root sys
+f none etc/security/exec_attr.d/openwsman 0444 root sys
+d none etc/security/prof_attr.d 0755 root sys
+f none etc/security/prof_attr.d/openwsman 0444 root sys
--- a/usr/src/pkgdefs/SUNWpconsoler/pkginfo.tmpl Tue Feb 23 00:53:20 2010 +0200
+++ b/usr/src/pkgdefs/SUNWpconsoler/pkginfo.tmpl Fri Mar 05 22:27:24 2010 +0200
@@ -18,10 +18,10 @@
#
# CDDL HEADER END
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "@(#)pkginfo.tmpl 1.2 09/11/25 SMI"
+#ident "@(#)pkginfo.tmpl 1.3 10/02/19 SMI"
#
# This required package information file describes characteristics of the
# package, such as package abbreviation, full package name, package version,
@@ -40,7 +40,7 @@
VENDOR="Sun Microsystems, Inc."
HOTLINE="Please contact your local service provider"
EMAIL=""
-CLASSES="none rbac"
+CLASSES="none"
BASEDIR=/
SUNW_PKGVERS="1.0"
SUNW_PKG_ALLZONES="false"
--- a/usr/src/pkgdefs/SUNWpconsoler/prototype_com Tue Feb 23 00:53:20 2010 +0200
+++ b/usr/src/pkgdefs/SUNWpconsoler/prototype_com Fri Mar 05 22:27:24 2010 +0200
@@ -20,10 +20,10 @@
#
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "@(#)prototype_com 1.1 09/06/09 SMI"
+# ident "@(#)prototype_com 1.2 10/02/19 SMI"
#
# This required package information file contains a list of package contents.
@@ -49,5 +49,7 @@
#RBAC changes
d none etc 0755 root sys
d none etc/security 0755 root sys
-e rbac etc/security/exec_attr 0644 root sys
-e rbac etc/security/prof_attr 0644 root sys
+d none etc/security/exec_attr.d 0755 root sys
+f none etc/security/exec_attr.d/pconsole 0444 root sys
+d none etc/security/prof_attr.d 0755 root sys
+f none etc/security/prof_attr.d/pconsole 0444 root sys
--- a/usr/src/pkgdefs/SUNWpostgr-82-server-data-root/pkginfo.tmpl Tue Feb 23 00:53:20 2010 +0200
+++ b/usr/src/pkgdefs/SUNWpostgr-82-server-data-root/pkginfo.tmpl Fri Mar 05 22:27:24 2010 +0200
@@ -18,10 +18,10 @@
#
# CDDL HEADER END
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "@(#)pkginfo.tmpl 1.8 08/11/19 SMI"
+#ident "@(#)pkginfo.tmpl 1.9 10/02/19 SMI"
#
# This required package information file describes characteristics of the
# package, such as package abbreviation, full package name, package version,
@@ -40,7 +40,7 @@
VENDOR="Sun Microsystems, Inc."
HOTLINE="Please contact your local service provider"
EMAIL=""
-CLASSES="none manifest rbac"
+CLASSES="none manifest"
BASEDIR="/"
SUNW_PKGVERS="1.0"
#VSTOCK="<reserved by Release Engineering for package part #>"
--- a/usr/src/pkgdefs/SUNWpostgr-82-server-data-root/prototype_com Tue Feb 23 00:53:20 2010 +0200
+++ b/usr/src/pkgdefs/SUNWpostgr-82-server-data-root/prototype_com Fri Mar 05 22:27:24 2010 +0200
@@ -18,10 +18,10 @@
#
# CDDL HEADER END
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "@(#)prototype_com 1.5 09/01/07 SMI"
+#ident "@(#)prototype_com 1.6 10/02/19 SMI"
#
# SUNWpostgr-82-server-data-root
#
@@ -32,11 +32,15 @@
i postinstall
#
d none etc 755 root sys
-e rbac etc/user_attr 644 root sys
+d none etc/user_attr.d 755 root sys
+f none etc/user_attr.d/postgres-82 444 root sys
d none etc/security 755 root sys
-e rbac etc/security/auth_attr 644 root sys
-e rbac etc/security/prof_attr 644 root sys
-e rbac etc/security/exec_attr 644 root sys
+d none etc/security/auth_attr.d 755 root sys
+f none etc/security/auth_attr.d/postgres-82 0444 root sys
+d none etc/security/exec_attr.d 755 root sys
+f none etc/security/exec_attr.d/postgres-82 0444 root sys
+d none etc/security/prof_attr.d 755 root sys
+f none etc/security/prof_attr.d/postgres-82 0444 root sys
d none lib 755 root bin
d none lib/svc 755 root bin
d none lib/svc/method 755 root bin
--- a/usr/src/pkgdefs/SUNWpostgr-83-server-data-root/pkginfo.tmpl Tue Feb 23 00:53:20 2010 +0200
+++ b/usr/src/pkgdefs/SUNWpostgr-83-server-data-root/pkginfo.tmpl Fri Mar 05 22:27:24 2010 +0200
@@ -18,10 +18,10 @@
#
# CDDL HEADER END
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "@(#)pkginfo.tmpl 1.2 08/08/14 SMI"
+#ident "@(#)pkginfo.tmpl 1.3 10/02/19 SMI"
#
# This required package information file describes characteristics of the
# package, such as package abbreviation, full package name, package version,
@@ -40,7 +40,7 @@
VENDOR="Sun Microsystems, Inc."
HOTLINE="Please contact your local service provider"
EMAIL=""
-CLASSES="none manifest rbac"
+CLASSES="none manifest"
BASEDIR="/"
SUNW_PKGVERS="1.0"
#VSTOCK="<reserved by Release Engineering for package part #>"
--- a/usr/src/pkgdefs/SUNWpostgr-83-server-data-root/prototype_com Tue Feb 23 00:53:20 2010 +0200
+++ b/usr/src/pkgdefs/SUNWpostgr-83-server-data-root/prototype_com Fri Mar 05 22:27:24 2010 +0200
@@ -18,10 +18,10 @@
#
# CDDL HEADER END
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "@(#)prototype_com 1.2 08/09/24 SMI"
+#ident "@(#)prototype_com 1.3 10/02/19 SMI"
#
# SUNWpostgr-83-server-data-root
#
@@ -31,11 +31,15 @@
i copyright
#
d none etc 755 root sys
-e rbac etc/user_attr 644 root sys
+d none etc/user_attr.d 755 root sys
+f none etc/user_attr.d/postgres-83 444 root sys
d none etc/security 755 root sys
-e rbac etc/security/auth_attr 644 root sys
-e rbac etc/security/prof_attr 644 root sys
-e rbac etc/security/exec_attr 644 root sys
+d none etc/security/auth_attr.d 755 root sys
+f none etc/security/auth_attr.d/postgres-83 0444 root sys
+d none etc/security/exec_attr.d 755 root sys
+f none etc/security/exec_attr.d/postgres-83 0444 root sys
+d none etc/security/prof_attr.d 755 root sys
+f none etc/security/prof_attr.d/postgres-83 0444 root sys
d none lib 755 root bin
d none lib/svc 755 root bin
d none lib/svc/method 755 root bin
--- a/usr/src/pkgdefs/SUNWpostgr-84-server-data-root/pkginfo.tmpl Tue Feb 23 00:53:20 2010 +0200
+++ b/usr/src/pkgdefs/SUNWpostgr-84-server-data-root/pkginfo.tmpl Fri Mar 05 22:27:24 2010 +0200
@@ -18,10 +18,10 @@
#
# CDDL HEADER END
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "@(#)pkginfo.tmpl 1.1 09/10/13 SMI"
+#ident "@(#)pkginfo.tmpl 1.2 10/02/19 SMI"
#
# This required package information file describes characteristics of the
# package, such as package abbreviation, full package name, package version,
@@ -40,7 +40,7 @@
VENDOR="Sun Microsystems, Inc."
HOTLINE="Please contact your local service provider"
EMAIL=""
-CLASSES="none manifest rbac"
+CLASSES="none manifest"
BASEDIR="/"
SUNW_PKGVERS="1.0"
#VSTOCK="<reserved by Release Engineering for package part #>"
--- a/usr/src/pkgdefs/SUNWpostgr-84-server-data-root/prototype_com Tue Feb 23 00:53:20 2010 +0200
+++ b/usr/src/pkgdefs/SUNWpostgr-84-server-data-root/prototype_com Fri Mar 05 22:27:24 2010 +0200
@@ -18,10 +18,10 @@
#
# CDDL HEADER END
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "@(#)prototype_com 1.1 09/10/13 SMI"
+#ident "@(#)prototype_com 1.2 10/02/19 SMI"
#
# SUNWpostgr-84-server-data-root
#
@@ -31,11 +31,15 @@
i copyright
#
d none etc 755 root sys
-e rbac etc/user_attr 644 root sys
+d none etc/user_attr.d 755 root sys
+f none etc/user_attr.d/postgres-84 444 root sys
d none etc/security 755 root sys
-e rbac etc/security/auth_attr 644 root sys
-e rbac etc/security/prof_attr 644 root sys
-e rbac etc/security/exec_attr 644 root sys
+d none etc/security/auth_attr.d 755 root sys
+f none etc/security/auth_attr.d/postgres-84 0444 root sys
+d none etc/security/exec_attr.d 755 root sys
+f none etc/security/exec_attr.d/postgres-84 0444 root sys
+d none etc/security/prof_attr.d 755 root sys
+f none etc/security/prof_attr.d/postgres-84 0444 root sys
d none lib 755 root bin
d none lib/svc 755 root bin
d none lib/svc/method 755 root bin
--- a/usr/src/pkgdefs/SUNWquaggar/pkginfo.tmpl Tue Feb 23 00:53:20 2010 +0200
+++ b/usr/src/pkgdefs/SUNWquaggar/pkginfo.tmpl Fri Mar 05 22:27:24 2010 +0200
@@ -19,10 +19,10 @@
#
# CDDL HEADER END
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#pragma ident "@(#)pkginfo.tmpl 1.2 07/10/02 SMI"
+#pragma ident "@(#)pkginfo.tmpl 1.3 10/02/19 SMI"
#
# This required package information file describes characteristics of the
# package, such as package abbreviation, full package name, package version,
@@ -41,7 +41,7 @@
VENDOR="Sun Microsystems, Inc"
HOTLINE="Please contact your local service provider"
EMAIL=""
-CLASSES="none rbac manifest"
+CLASSES="none manifest"
BASEDIR=/
SUNW_PKGVERS="1.0"
SUNW_PKG_ALLZONES="false"
--- a/usr/src/pkgdefs/SUNWquaggar/prototype_com Tue Feb 23 00:53:20 2010 +0200
+++ b/usr/src/pkgdefs/SUNWquaggar/prototype_com Fri Mar 05 22:27:24 2010 +0200
@@ -19,10 +19,10 @@
#
# CDDL HEADER END
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "@(#)prototype_com 1.5 09/07/14 SMI"
+# ident "@(#)prototype_com 1.6 10/02/19 SMI"
#
#
# This required package information file contains a list of package contents.
@@ -45,8 +45,24 @@
# SUNWquaggar
#
d none etc 755 root sys
+d none etc/quagga 755 root bin
+f none etc/quagga/README.Solaris 644 root bin
+f none etc/quagga/bgpd.conf.sample 644 root bin
+f none etc/quagga/bgpd.conf.sample2 644 root bin
+f none etc/quagga/isisd.conf.sample 644 root bin
+f none etc/quagga/ospf6d.conf.sample 644 root bin
+f none etc/quagga/ospfd.HA.conf.sample 644 root bin
+f none etc/quagga/ospfd.conf.sample 644 root bin
+f none etc/quagga/ripd.conf.sample 644 root bin
+f none etc/quagga/ripngd.conf.sample 644 root bin
+f none etc/quagga/zebra.conf.sample 644 root bin
d none etc/security 755 root sys
-d none etc/quagga 755 root bin
+d none etc/security/exec_attr.d 755 root sys
+f none etc/security/exec_attr.d/quagga 444 root sys
+d none lib 755 root bin
+d none lib/svc 755 root bin
+d none lib/svc/method 755 root bin
+f none lib/svc/method/quagga 0555 root bin
d none var 755 root sys
d none var/svc 0755 root sys
d none var/svc/manifest 0755 root sys
@@ -54,18 +70,3 @@
d none var/svc/manifest/network/routing 0755 root sys
f manifest var/svc/manifest/network/routing/quagga.xml 0444 root bin
f manifest var/svc/manifest/network/routing/trill.xml 0444 root bin
-d none lib 755 root bin
-d none lib/svc 755 root bin
-d none lib/svc/method 755 root bin
-f none lib/svc/method/quagga 0555 root bin
-f none etc/quagga/README.Solaris 644 root bin
-f none etc/quagga/bgpd.conf.sample 644 root bin
-f none etc/quagga/bgpd.conf.sample2 644 root bin
-f none etc/quagga/isisd.conf.sample 644 root bin
-f none etc/quagga/ospfd.HA.conf.sample 644 root bin
-f none etc/quagga/ospfd.conf.sample 644 root bin
-f none etc/quagga/ospf6d.conf.sample 644 root bin
-f none etc/quagga/ripd.conf.sample 644 root bin
-f none etc/quagga/ripngd.conf.sample 644 root bin
-f none etc/quagga/zebra.conf.sample 644 root bin
-e rbac etc/security/exec_attr 644 root sys
--- a/usr/src/pkgdefs/SUNWsg3utilsr/pkginfo.tmpl Tue Feb 23 00:53:20 2010 +0200
+++ b/usr/src/pkgdefs/SUNWsg3utilsr/pkginfo.tmpl Fri Mar 05 22:27:24 2010 +0200
@@ -20,10 +20,10 @@
#
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "@(#)pkginfo.tmpl 1.1 09/02/09 SMI"
+# ident "@(#)pkginfo.tmpl 1.2 10/02/19 SMI"
#
#
# This required package information file describes characteristics of the
@@ -43,7 +43,7 @@
VENDOR="Sun Microsystems, Inc."
HOTLINE="Please contact your local service provider"
EMAIL=""
-CLASSES="none rbac"
+CLASSES="none"
BASEDIR=/
SUNW_PKGVERS="1.0"
SUNW_PKG_ALLZONES="false"
--- a/usr/src/pkgdefs/SUNWsg3utilsr/prototype_com Tue Feb 23 00:53:20 2010 +0200
+++ b/usr/src/pkgdefs/SUNWsg3utilsr/prototype_com Fri Mar 05 22:27:24 2010 +0200
@@ -20,10 +20,10 @@
#
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "@(#)prototype_com 1.1 09/02/09 SMI"
+# ident "@(#)prototype_com 1.2 10/02/19 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
@@ -42,5 +42,7 @@
d none etc 0755 root sys
d none etc/security 0755 root sys
-e rbac etc/security/exec_attr 0644 root sys
-e rbac etc/security/prof_attr 0644 root sys
+d none etc/security/exec_attr.d 0755 root sys
+f none etc/security/exec_attr.d/sg3_utils 0444 root sys
+d none etc/security/prof_attr.d 0755 root sys
+f none etc/security/prof_attr.d/sg3_utils 0444 root sys
--- a/usr/src/pkgdefs/SUNWsnortr/pkginfo.tmpl Tue Feb 23 00:53:20 2010 +0200
+++ b/usr/src/pkgdefs/SUNWsnortr/pkginfo.tmpl Fri Mar 05 22:27:24 2010 +0200
@@ -20,10 +20,10 @@
#
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
-#
-# ident "@(#)pkginfo.tmpl 1.1 09/06/18 SMI"
+#
+# ident "@(#)pkginfo.tmpl 1.2 10/02/19 SMI"
#
# This required package information file describes characteristics of the
@@ -43,7 +43,7 @@
VENDOR="Sun Microsystems, Inc."
HOTLINE="Please contact your local service provider"
EMAIL=""
-CLASSES="none renamenew rbac manifest"
+CLASSES="none renamenew manifest"
BASEDIR=/
SUNW_PKGVERS="1.0"
SUNW_PKG_ALLZONES="false"
--- a/usr/src/pkgdefs/SUNWsnortr/prototype_com Tue Feb 23 00:53:20 2010 +0200
+++ b/usr/src/pkgdefs/SUNWsnortr/prototype_com Fri Mar 05 22:27:24 2010 +0200
@@ -20,10 +20,10 @@
#
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "@(#)prototype_com 1.1 09/06/18 SMI"
+# ident "@(#)prototype_com 1.2 10/02/19 SMI"
#
# This required package information file contains a list of package contents.
@@ -56,8 +56,10 @@
f none etc/attribute_table.dtd 0644 root bin
f none etc/unicode.map 0644 root bin
d none etc/security 0755 root sys
-e rbac etc/security/auth_attr 0644 root sys
-e rbac etc/security/exec_attr 0644 root sys
+d none etc/security/auth_attr.d 0755 root sys
+f none etc/security/auth_attr.d/snort 0444 root sys
+d none etc/security/exec_attr.d 0755 root sys
+f none etc/security/exec_attr.d/snort 0444 root sys
d none lib 0755 root bin
d none lib/svc 0755 root bin
d none lib/svc/method 0755 root bin
--- a/usr/src/pkgdefs/SUNWsqlite3/Makefile Tue Feb 23 00:53:20 2010 +0200
+++ /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.1 08/03/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/SUNWsqlite3/copyright Tue Feb 23 00:53:20 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,72 +0,0 @@
-SQLite is in the Public Domain
-
-All of the deliverable code in SQLite has been dedicated to the public
-domain by the authors. All code authors, and representatives of the
-companies they work for, have signed affidavits dedicating their
-contributions to the public domain and originals of those signed
-affidavits are stored in a firesafe at the main offices of Hwaci. Anyone
-is free to copy, modify, publish, use, compile, sell, or distribute the
-original SQLite code, either in source code form or as a compiled
-binary, for any purpose, commercial or non-commercial, and by any means.
-
-The previous paragraph applies to the deliverable code in SQLite - those
-parts of the SQLite library that you actually bundle and ship with a
-larger application. Portions of the documentation and some code used as
-part of the build process might fall under other licenses. The details
-here are unclear. We do not worry about the licensing of the
-documentation and build code so much because none of these things are
-part of the core deliverable SQLite library.
-
-All of the deliverable code in SQLite has been written from scratch. No
-code has been taken from other projects or from the open internet. Every
-line of code can be traced back to its original author, and all of those
-authors have public domain dedications on file. So the SQLite code base
-is clean and is uncontaminated with licensed code from other projects.
-Obtaining An Explicit License To Use SQLite
-
-Even though SQLite is in the public domain and does not require a
-license, some users want to obtain a license anyway. Some reasons for
-obtaining a license include:
-
- * You are using SQLite in a jurisdiction that does not recognize the
- public domain.
- * You are using SQLite in a jurisdiction that does not recognize the
- right of an author to dedicate their work to the public domain.
- * You want to hold a tangible legal document as evidence that you
- have the legal right to use and distribute SQLite.
- * Your legal department tells you that you have to purchase a
- license.
-
-If you feel like you really have to purchase a license for SQLite,
-Hwaci, the company that employs the architect and principal developers
-of SQLite, will sell you one. Contributed Code
-
-In order to keep SQLite completely free and unencumbered by copyright,
-all new contributors to the SQLite code base are asked to dedicate their
-contributions to the public domain. If you want to send a patch or
-enhancement for possible inclusion in the SQLite source tree, please
-accompany the patch with the following statement:
-
-The author or authors of this code dedicate any and all copyright
-interest in this code to the public domain. We make this dedication for
-the benefit of the public at large and to the detriment of our heirs and
-successors. We intend this dedication to be an overt act of
-relinquishment in perpetuity of all present and future rights to this
-code under copyright law.
-
-We are not able to accept patches or changes to SQLite that are not
-accompanied by a statement such as the above. In addition, if you make
-changes or enhancements as an employee, then a simple statement such as
-the above is insufficient. You must also send by surface mail a
-copyright release signed by a company officer. A signed original of the
-copyright release should be mailed to:
-
- Hwaci
- 6200 Maple Cove Lane
- Charlotte, NC 28269
- USA
-
-A template copyright release is available in PDF or HTML. You can use
-this release to make future changes. This page last modified 2007/11/14
-15:25:42 UTC
-
--- a/usr/src/pkgdefs/SUNWsqlite3/pkginfo.tmpl Tue Feb 23 00:53:20 2010 +0200
+++ /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 "@(#)pkginfo.tmpl 1.1 08/03/20 SMI"
-#
-# This required package information file describes characteristics of the
-# package, such as package abbreviation, full package name, package version,
-# and package architecture.
-#
-PKG="SUNWsqlite3"
-NAME="SQLite3"
-ARCH="ISA"
-VERSION="SFWVERS,REV=0.0.0"
-SUNW_PRODNAME="SunOS"
-SUNW_PRODVERS="RELEASE/VERSION"
-SUNW_PKGTYPE="usr"
-MAXINST="1000"
-CATEGORY="system"
-DESC="SQLite3, an embeddable, zero-conf, self-contained, serverless transactional SQL engine (3.5.4)"
-VENDOR="Sun Microsystems, Inc."
-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/SUNWsqlite3/prototype_com Tue Feb 23 00:53:20 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +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/03/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
-
-# packaging files
-i pkginfo
-i copyright
-i depend
-#
-# source locations relative to the prototype file
-#
-# SUNWsqlite3
-#
-d none usr 755 root sys
-d none usr/bin 755 root bin
-f none usr/bin/sqlite3 555 root bin
-d none usr/include 755 root bin
-f none usr/include/sqlite3.h 0444 root bin
-d none usr/lib 755 root bin
-f none usr/lib/libsqlite3.so.0 555 root bin
-s none usr/lib/libsqlite3.so=libsqlite3.so.0
-d none usr/lib/pkgconfig 755 root other
-f none usr/lib/pkgconfig/sqlite3.pc 0444 root bin
-d none usr/share 755 root sys
-d none usr/share/doc 755 root other
-d none usr/share/man 755 root bin
-d none usr/share/man/man1 755 root bin
-f none usr/share/man/man1/sqlite3.1 0444 root bin
--- a/usr/src/pkgdefs/SUNWsqlite3/prototype_i386 Tue Feb 23 00:53:20 2010 +0200
+++ /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 2008 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#pragma ident "@(#)prototype_i386 1.1 08/03/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
-#
-#
-# SUNWsqlite3
-#
-d none usr/lib/amd64 755 root bin
-f none usr/lib/amd64/libsqlite3.so.0 555 root bin
-s none usr/lib/amd64/libsqlite3.so=libsqlite3.so.0
--- a/usr/src/pkgdefs/SUNWsqlite3/prototype_sparc Tue Feb 23 00:53:20 2010 +0200
+++ /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 2008 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#ident "@(#)prototype_sparc 1.1 08/03/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
-#
-#
-# SUNWsqlite3
-#
-d none usr/lib/sparcv9 755 root bin
-f none usr/lib/sparcv9/libsqlite3.so.0 555 root bin
-s none usr/lib/sparcv9/libsqlite3.so=libsqlite3.so.0
--- a/usr/src/pkgdefs/SUNWsqlite3docs/Makefile Tue Feb 23 00:53:20 2010 +0200
+++ /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.1 08/03/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/SUNWsqlite3docs/copyright Tue Feb 23 00:53:20 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,72 +0,0 @@
-SQLite is in the Public Domain
-
-All of the deliverable code in SQLite has been dedicated to the public
-domain by the authors. All code authors, and representatives of the
-companies they work for, have signed affidavits dedicating their
-contributions to the public domain and originals of those signed
-affidavits are stored in a firesafe at the main offices of Hwaci. Anyone
-is free to copy, modify, publish, use, compile, sell, or distribute the
-original SQLite code, either in source code form or as a compiled
-binary, for any purpose, commercial or non-commercial, and by any means.
-
-The previous paragraph applies to the deliverable code in SQLite - those
-parts of the SQLite library that you actually bundle and ship with a
-larger application. Portions of the documentation and some code used as
-part of the build process might fall under other licenses. The details
-here are unclear. We do not worry about the licensing of the
-documentation and build code so much because none of these things are
-part of the core deliverable SQLite library.
-
-All of the deliverable code in SQLite has been written from scratch. No
-code has been taken from other projects or from the open internet. Every
-line of code can be traced back to its original author, and all of those
-authors have public domain dedications on file. So the SQLite code base
-is clean and is uncontaminated with licensed code from other projects.
-Obtaining An Explicit License To Use SQLite
-
-Even though SQLite is in the public domain and does not require a
-license, some users want to obtain a license anyway. Some reasons for
-obtaining a license include:
-
- * You are using SQLite in a jurisdiction that does not recognize the
- public domain.
- * You are using SQLite in a jurisdiction that does not recognize the
- right of an author to dedicate their work to the public domain.
- * You want to hold a tangible legal document as evidence that you
- have the legal right to use and distribute SQLite.
- * Your legal department tells you that you have to purchase a
- license.
-
-If you feel like you really have to purchase a license for SQLite,
-Hwaci, the company that employs the architect and principal developers
-of SQLite, will sell you one. Contributed Code
-
-In order to keep SQLite completely free and unencumbered by copyright,
-all new contributors to the SQLite code base are asked to dedicate their
-contributions to the public domain. If you want to send a patch or
-enhancement for possible inclusion in the SQLite source tree, please
-accompany the patch with the following statement:
-
-The author or authors of this code dedicate any and all copyright
-interest in this code to the public domain. We make this dedication for
-the benefit of the public at large and to the detriment of our heirs and
-successors. We intend this dedication to be an overt act of
-relinquishment in perpetuity of all present and future rights to this
-code under copyright law.
-
-We are not able to accept patches or changes to SQLite that are not
-accompanied by a statement such as the above. In addition, if you make
-changes or enhancements as an employee, then a simple statement such as
-the above is insufficient. You must also send by surface mail a
-copyright release signed by a company officer. A signed original of the
-copyright release should be mailed to:
-
- Hwaci
- 6200 Maple Cove Lane
- Charlotte, NC 28269
- USA
-
-A template copyright release is available in PDF or HTML. You can use
-this release to make future changes. This page last modified 2007/11/14
-15:25:42 UTC
-
--- a/usr/src/pkgdefs/SUNWsqlite3docs/pkginfo.tmpl Tue Feb 23 00:53:20 2010 +0200
+++ /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 "@(#)pkginfo.tmpl 1.1 08/03/20 SMI"
-#
-# This required package information file describes characteristics of the
-# package, such as package abbreviation, full package name, package version,
-# and package architecture.
-#
-PKG="SUNWsqlite3docs"
-NAME="SQLite3 Documentation"
-ARCH="ISA"
-VERSION="SFWVERS,REV=0.0.0"
-SUNW_PRODNAME="SunOS"
-SUNW_PRODVERS="RELEASE/VERSION"
-SUNW_PKGTYPE="usr"
-MAXINST="1000"
-CATEGORY="system"
-DESC="SQLite3 HTML Documentation (3.5.4)"
-VENDOR="Sun Microsystems, Inc."
-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/SUNWsqlite3docs/prototype_com Tue Feb 23 00:53:20 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,551 +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 "@(#)prototype_com 1.5 09/08/21 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
-#
-# SUNWsqlite3
-#
-d none usr 755 root sys
-d none usr/share 755 root sys
-d none usr/share/doc 755 root other
-#
-# The following lines were generated with the following shell pipeline:
-#
-# find $ROOT/usr/share/doc/sqlite3 \( \
-# \( -type d -exec echo d none {} 755 root bin \; \) -o \
-# \( -type f -exec echo f none {} 0444 root bin \; \) \) | \
-# sed s,$ROOT/,, | sort
-#
-d none usr/share/doc/sqlite3 755 root bin
-d none usr/share/doc/sqlite3/c3ref 755 root bin
-d none usr/share/doc/sqlite3/images 755 root bin
-d none usr/share/doc/sqlite3/images/ac 755 root bin
-d none usr/share/doc/sqlite3/images/fileformat 755 root bin
-d none usr/share/doc/sqlite3/images/foreignlogos 755 root bin
-d none usr/share/doc/sqlite3/images/syntax 755 root bin
-d none usr/share/doc/sqlite3/releaselog 755 root bin
-f none usr/share/doc/sqlite3/34to35.html 0444 root bin
-f none usr/share/doc/sqlite3/35to36.html 0444 root bin
-f none usr/share/doc/sqlite3/about.html 0444 root bin
-f none usr/share/doc/sqlite3/amalgamation.html 0444 root bin
-f none usr/share/doc/sqlite3/arch.html 0444 root bin
-f none usr/share/doc/sqlite3/asyncvfs.html 0444 root bin
-f none usr/share/doc/sqlite3/atomiccommit.html 0444 root bin
-f none usr/share/doc/sqlite3/audit.html 0444 root bin
-f none usr/share/doc/sqlite3/autoinc.html 0444 root bin
-f none usr/share/doc/sqlite3/backup.html 0444 root bin
-f none usr/share/doc/sqlite3/btreemodule.html 0444 root bin
-f none usr/share/doc/sqlite3/c_interface.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/aggregate_context.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/aggregate_count.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/auto_extension.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/backup_finish.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/backup.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/bind_blob.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/bind_parameter_count.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/bind_parameter_index.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/bind_parameter_name.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/blob_bytes.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/blob_close.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/blob_open.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/blob_read.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/blob_write.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/blob.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/busy_handler.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/busy_timeout.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/c_abort.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/c_access_exists.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/c_alter_table.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/c_any.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/c_blob.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/c_config_getmalloc.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/c_dbconfig_lookaside.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/c_dbstatus_lookaside_used.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/c_deny.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/c_fcntl_lockstate.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/c_index_constraint_eq.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/c_iocap_atomic.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/c_ioerr_access.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/c_limit_attached.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/c_lock_exclusive.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/c_mutex_fast.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/c_open_create.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/c_static.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/c_status_malloc_size.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/c_stmtstatus_fullscan_step.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/c_sync_dataonly.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/c_testctrl_always.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/c_version.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/changes.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/clear_bindings.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/close.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/collation_needed.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/column_blob.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/column_count.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/column_database_name.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/column_decltype.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/column_name.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/commit_hook.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/complete.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/config.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/constlist.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/context_db_handle.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/context.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/create_collation.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/create_function.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/create_module_v2.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/create_module.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/data_count.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/db_config.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/db_handle.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/db_mutex.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/db_status.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/declare_vtab.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/enable_load_extension.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/enable_shared_cache.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/errcode.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/exec.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/experimental.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/extended_result_codes.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/file_control.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/file.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/finalize.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/free_table.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/free.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/funclist.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/get_autocommit.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/get_auxdata.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/initialize.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/int64.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/interrupt.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/intro.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/io_methods.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/last_insert_rowid.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/libversion.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/limit.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/load_extension.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/mem_methods.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/memory_highwater.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/module.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/mprintf.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/mutex_alloc.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/mutex_held.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/mutex_methods.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/mutex.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/next_stmt.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/objlist.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/open.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/overload_function.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/pcache_methods.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/pcache.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/prepare.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/profile.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/progress_handler.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/randomness.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/release_memory.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/reset_auto_extension.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/reset.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/result_blob.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/set_authorizer.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/sleep.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/soft_heap_limit.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/sql.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/sqlite3.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/status.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/step.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/stmt_status.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/stmt.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/strnicmp.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/table_column_metadata.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/temp_directory.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/test_control.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/threadsafe.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/total_changes.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/unlock_notify.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/update_hook.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/user_data.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/value_blob.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/value.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/vfs_find.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/vfs.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/vtab_cursor.html 0444 root bin
-f none usr/share/doc/sqlite3/c3ref/vtab.html 0444 root bin
-f none usr/share/doc/sqlite3/capi3.html 0444 root bin
-f none usr/share/doc/sqlite3/capi3ref.html 0444 root bin
-f none usr/share/doc/sqlite3/changes.html 0444 root bin
-f none usr/share/doc/sqlite3/cintro.html 0444 root bin
-f none usr/share/doc/sqlite3/compile.html 0444 root bin
-f none usr/share/doc/sqlite3/conflict.html 0444 root bin
-f none usr/share/doc/sqlite3/consortium_agreement-20071201.html 0444 root bin
-f none usr/share/doc/sqlite3/consortium.html 0444 root bin
-f none usr/share/doc/sqlite3/copyright-release.html 0444 root bin
-f none usr/share/doc/sqlite3/copyright-release.pdf 0444 root bin
-f none usr/share/doc/sqlite3/copyright.html 0444 root bin
-f none usr/share/doc/sqlite3/crew.html 0444 root bin
-f none usr/share/doc/sqlite3/custombuild.html 0444 root bin
-f none usr/share/doc/sqlite3/cvstrac.css 0444 root bin
-f none usr/share/doc/sqlite3/datatype3.html 0444 root bin
-f none usr/share/doc/sqlite3/datatypes.html 0444 root bin
-f none usr/share/doc/sqlite3/different.html 0444 root bin
-f none usr/share/doc/sqlite3/doc_backlink_crossref.html 0444 root bin
-f none usr/share/doc/sqlite3/doc_keyword_crossref.html 0444 root bin
-f none usr/share/doc/sqlite3/doc_pagelink_crossref.html 0444 root bin
-f none usr/share/doc/sqlite3/doc_target_crossref.html 0444 root bin
-f none usr/share/doc/sqlite3/docs.html 0444 root bin
-f none usr/share/doc/sqlite3/download.html 0444 root bin
-f none usr/share/doc/sqlite3/dynload.html 0444 root bin
-f none usr/share/doc/sqlite3/errlist.html 0444 root bin
-f none usr/share/doc/sqlite3/famous.html 0444 root bin
-f none usr/share/doc/sqlite3/faq.html 0444 root bin
-f none usr/share/doc/sqlite3/favicon.ico 0444 root bin
-f none usr/share/doc/sqlite3/features.html 0444 root bin
-f none usr/share/doc/sqlite3/fileformat.html 0444 root bin
-f none usr/share/doc/sqlite3/fileio.html 0444 root bin
-f none usr/share/doc/sqlite3/formatchng.html 0444 root bin
-f none usr/share/doc/sqlite3/hlr10000.html 0444 root bin
-f none usr/share/doc/sqlite3/hlr20000.html 0444 root bin
-f none usr/share/doc/sqlite3/hlr30000.html 0444 root bin
-f none usr/share/doc/sqlite3/hlr40000.html 0444 root bin
-f none usr/share/doc/sqlite3/images/2005osaward.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/ac/commit-0.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/ac/commit-1.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/ac/commit-2.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/ac/commit-3.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/ac/commit-4.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/ac/commit-5.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/ac/commit-6.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/ac/commit-7.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/ac/commit-8.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/ac/commit-9.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/ac/commit-A.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/ac/commit-B.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/ac/multi-0.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/ac/multi-1.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/ac/multi-2.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/ac/multi-3.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/ac/multi-4.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/ac/multi-5.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/ac/rollback-0.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/ac/rollback-1.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/ac/rollback-2.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/ac/rollback-3.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/ac/rollback-4.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/ac/rollback-5.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/arch.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/arch.png 0444 root bin
-f none usr/share/doc/sqlite3/images/arch2.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/btreemodule_balance_deeper.svg 0444 root bin
-f none usr/share/doc/sqlite3/images/btreemodule_balance_quick.svg 0444 root bin
-f none usr/share/doc/sqlite3/images/btreemodule_balance_shallower.svg 0444 root bin
-f none usr/share/doc/sqlite3/images/btreemodule_delete1.svg 0444 root bin
-f none usr/share/doc/sqlite3/images/btreemodule_overview.svg 0444 root bin
-f none usr/share/doc/sqlite3/images/chw.jpg 0444 root bin
-f none usr/share/doc/sqlite3/images/dan1.jpg 0444 root bin
-f none usr/share/doc/sqlite3/images/direct1b.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/drh1.jpg 0444 root bin
-f none usr/share/doc/sqlite3/images/fileformat/db_connection.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/fileformat/examplepop.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/fileformat/fileio_diagrams.odg 0444 root bin
-f none usr/share/doc/sqlite3/images/fileformat/filesystem1.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/fileformat/filesystem2.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/fileformat/freelistpage.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/fileformat/indexlongrecord.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/fileformat/indexpage.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/fileformat/indexpage.odg 0444 root bin
-f none usr/share/doc/sqlite3/images/fileformat/indexshortrecord.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/fileformat/indextree.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/fileformat/journal_format.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/fileformat/journal_header.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/fileformat/journal_record.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/fileformat/master_journal_ptr.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/fileformat/overflowpage.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/fileformat/pointermapentry.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/fileformat/recordformat.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/fileformat/rtdocs.css 0444 root bin
-f none usr/share/doc/sqlite3/images/fileformat/rtdocs.js 0444 root bin
-f none usr/share/doc/sqlite3/images/fileformat/tablelongrecord.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/fileformat/tablenodecell.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/fileformat/tableshortrecord.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/fileformat/tabletree.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/fileformat/vfs_role.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/fileformat/write_transaction.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/foreignlogos/adobe-logo.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/foreignlogos/adobe.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/foreignlogos/apple.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/foreignlogos/bloomberg.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/foreignlogos/firefox.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/foreignlogos/ge.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/foreignlogos/google.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/foreignlogos/mcaffee.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/foreignlogos/microsoft.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/foreignlogos/monotone.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/foreignlogos/mozilla.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/foreignlogos/philips.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/foreignlogos/php.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/foreignlogos/python.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/foreignlogos/realbasic.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/foreignlogos/skype.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/foreignlogos/sony.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/foreignlogos/sunmicro.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/foreignlogos/symbian.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/foreignlogos/toshiba.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/fullscanb.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/index-ex1-x-b.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/indirect1b1.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/ne.png 0444 root bin
-f none usr/share/doc/sqlite3/images/nocopy.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/nw.png 0444 root bin
-f none usr/share/doc/sqlite3/images/powered_by_sqlite.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/private_branch.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/se.png 0444 root bin
-f none usr/share/doc/sqlite3/images/shane1.jpg 0444 root bin
-f none usr/share/doc/sqlite3/images/shared.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/SQLite_big.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/SQLite.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/sw.png 0444 root bin
-f none usr/share/doc/sqlite3/images/syntax/alter-table-stmt.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/syntax/analyze-stmt.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/syntax/attach-stmt.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/syntax/begin-stmt.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/syntax/column-constraint.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/syntax/column-def.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/syntax/comment-syntax.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/syntax/commit-stmt.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/syntax/compound-operator.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/syntax/conflict-clause.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/syntax/create-index-stmt.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/syntax/create-table-stmt.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/syntax/create-trigger-stmt.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/syntax/create-view-stmt.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/syntax/create-virtual-table-stmt.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/syntax/delete-stmt-limited.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/syntax/delete-stmt.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/syntax/detach-stmt.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/syntax/drop-index-stmt.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/syntax/drop-table-stmt.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/syntax/drop-trigger-stmt.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/syntax/drop-view-stmt.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/syntax/expr.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/syntax/foreign-key-clause.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/syntax/foreign-key-clause2.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/syntax/indexed-column.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/syntax/insert-stmt.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/syntax/join-constraint.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/syntax/join-op.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/syntax/join-source.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/syntax/literal-value.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/syntax/ordering-term.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/syntax/pragma-stmt.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/syntax/pragma-value.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/syntax/qualified-table-name.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/syntax/raise-function.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/syntax/reindex-stmt.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/syntax/release-stmt.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/syntax/result-column.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/syntax/rollback-stmt.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/syntax/savepoint-stmt.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/syntax/select-core.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/syntax/select-stmt.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/syntax/signed-number.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/syntax/single-source.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/syntax/sql-stmt-list.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/syntax/sql-stmt.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/syntax/table-constraint.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/syntax/type-name.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/syntax/update-stmt-limited.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/syntax/update-stmt.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/syntax/vacuum-stmt.gif 0444 root bin
-f none usr/share/doc/sqlite3/images/table-ex1b2.gif 0444 root bin
-f none usr/share/doc/sqlite3/index.html 0444 root bin
-f none usr/share/doc/sqlite3/inmemorydb.html 0444 root bin
-f none usr/share/doc/sqlite3/lang_aggfunc.html 0444 root bin
-f none usr/share/doc/sqlite3/lang_altertable.html 0444 root bin
-f none usr/share/doc/sqlite3/lang_analyze.html 0444 root bin
-f none usr/share/doc/sqlite3/lang_attach.html 0444 root bin
-f none usr/share/doc/sqlite3/lang_comment.html 0444 root bin
-f none usr/share/doc/sqlite3/lang_conflict.html 0444 root bin
-f none usr/share/doc/sqlite3/lang_corefunc.html 0444 root bin
-f none usr/share/doc/sqlite3/lang_createindex.html 0444 root bin
-f none usr/share/doc/sqlite3/lang_createtable.html 0444 root bin
-f none usr/share/doc/sqlite3/lang_createtrigger.html 0444 root bin
-f none usr/share/doc/sqlite3/lang_createview.html 0444 root bin
-f none usr/share/doc/sqlite3/lang_createvtab.html 0444 root bin
-f none usr/share/doc/sqlite3/lang_datefunc.html 0444 root bin
-f none usr/share/doc/sqlite3/lang_delete.html 0444 root bin
-f none usr/share/doc/sqlite3/lang_detach.html 0444 root bin
-f none usr/share/doc/sqlite3/lang_dropindex.html 0444 root bin
-f none usr/share/doc/sqlite3/lang_droptable.html 0444 root bin
-f none usr/share/doc/sqlite3/lang_droptrigger.html 0444 root bin
-f none usr/share/doc/sqlite3/lang_dropview.html 0444 root bin
-f none usr/share/doc/sqlite3/lang_explain.html 0444 root bin
-f none usr/share/doc/sqlite3/lang_expr.html 0444 root bin
-f none usr/share/doc/sqlite3/lang_indexedby.html 0444 root bin
-f none usr/share/doc/sqlite3/lang_insert.html 0444 root bin
-f none usr/share/doc/sqlite3/lang_keywords.html 0444 root bin
-f none usr/share/doc/sqlite3/lang_reindex.html 0444 root bin
-f none usr/share/doc/sqlite3/lang_replace.html 0444 root bin
-f none usr/share/doc/sqlite3/lang_savepoint.html 0444 root bin
-f none usr/share/doc/sqlite3/lang_select.html 0444 root bin
-f none usr/share/doc/sqlite3/lang_transaction.html 0444 root bin
-f none usr/share/doc/sqlite3/lang_update.html 0444 root bin
-f none usr/share/doc/sqlite3/lang_vacuum.html 0444 root bin
-f none usr/share/doc/sqlite3/lang.html 0444 root bin
-f none usr/share/doc/sqlite3/limits.html 0444 root bin
-f none usr/share/doc/sqlite3/lockingv3.html 0444 root bin
-f none usr/share/doc/sqlite3/malloc.html 0444 root bin
-f none usr/share/doc/sqlite3/mingw.html 0444 root bin
-f none usr/share/doc/sqlite3/mostdeployed.html 0444 root bin
-f none usr/share/doc/sqlite3/news.html 0444 root bin
-f none usr/share/doc/sqlite3/nulls.html 0444 root bin
-f none usr/share/doc/sqlite3/oldnews.html 0444 root bin
-f none usr/share/doc/sqlite3/omitted.html 0444 root bin
-f none usr/share/doc/sqlite3/onefile.html 0444 root bin
-f none usr/share/doc/sqlite3/opcode.html 0444 root bin
-f none usr/share/doc/sqlite3/optoverview.html 0444 root bin
-f none usr/share/doc/sqlite3/pragma.html 0444 root bin
-f none usr/share/doc/sqlite3/pressrelease-20071212.html 0444 root bin
-f none usr/share/doc/sqlite3/privatebranch.html 0444 root bin
-f none usr/share/doc/sqlite3/quickstart.html 0444 root bin
-f none usr/share/doc/sqlite3/releaselog/3_0_0.html 0444 root bin
-f none usr/share/doc/sqlite3/releaselog/3_0_1.html 0444 root bin
-f none usr/share/doc/sqlite3/releaselog/3_0_2.html 0444 root bin
-f none usr/share/doc/sqlite3/releaselog/3_0_3.html 0444 root bin
-f none usr/share/doc/sqlite3/releaselog/3_0_4.html 0444 root bin
-f none usr/share/doc/sqlite3/releaselog/3_0_5.html 0444 root bin
-f none usr/share/doc/sqlite3/releaselog/3_0_6.html 0444 root bin
-f none usr/share/doc/sqlite3/releaselog/3_0_7.html 0444 root bin
-f none usr/share/doc/sqlite3/releaselog/3_0_8.html 0444 root bin
-f none usr/share/doc/sqlite3/releaselog/3_1_0.html 0444 root bin
-f none usr/share/doc/sqlite3/releaselog/3_1_1.html 0444 root bin
-f none usr/share/doc/sqlite3/releaselog/3_1_2.html 0444 root bin
-f none usr/share/doc/sqlite3/releaselog/3_1_3.html 0444 root bin
-f none usr/share/doc/sqlite3/releaselog/3_1_4.html 0444 root bin
-f none usr/share/doc/sqlite3/releaselog/3_1_5.html 0444 root bin
-f none usr/share/doc/sqlite3/releaselog/3_1_6.html 0444 root bin
-f none usr/share/doc/sqlite3/releaselog/3_2_0.html 0444 root bin
-f none usr/share/doc/sqlite3/releaselog/3_2_1.html 0444 root bin
-f none usr/share/doc/sqlite3/releaselog/3_2_2.html 0444 root bin
-f none usr/share/doc/sqlite3/releaselog/3_2_3.html 0444 root bin
-f none usr/share/doc/sqlite3/releaselog/3_2_4.html 0444 root bin
-f none usr/share/doc/sqlite3/releaselog/3_2_5.html 0444 root bin
-f none usr/share/doc/sqlite3/releaselog/3_2_6.html 0444 root bin
-f none usr/share/doc/sqlite3/releaselog/3_2_7.html 0444 root bin
-f none usr/share/doc/sqlite3/releaselog/3_2_8.html 0444 root bin
-f none usr/share/doc/sqlite3/releaselog/3_3_0.html 0444 root bin
-f none usr/share/doc/sqlite3/releaselog/3_3_1.html 0444 root bin
-f none usr/share/doc/sqlite3/releaselog/3_3_10.html 0444 root bin
-f none usr/share/doc/sqlite3/releaselog/3_3_11.html 0444 root bin
-f none usr/share/doc/sqlite3/releaselog/3_3_12.html 0444 root bin
-f none usr/share/doc/sqlite3/releaselog/3_3_13.html 0444 root bin
-f none usr/share/doc/sqlite3/releaselog/3_3_14.html 0444 root bin
-f none usr/share/doc/sqlite3/releaselog/3_3_15.html 0444 root bin
-f none usr/share/doc/sqlite3/releaselog/3_3_16.html 0444 root bin
-f none usr/share/doc/sqlite3/releaselog/3_3_17.html 0444 root bin
-f none usr/share/doc/sqlite3/releaselog/3_3_2.html 0444 root bin
-f none usr/share/doc/sqlite3/releaselog/3_3_3.html 0444 root bin
-f none usr/share/doc/sqlite3/releaselog/3_3_4.html 0444 root bin
-f none usr/share/doc/sqlite3/releaselog/3_3_5.html 0444 root bin
-f none usr/share/doc/sqlite3/releaselog/3_3_6.html 0444 root bin
-f none usr/share/doc/sqlite3/releaselog/3_3_7.html 0444 root bin
-f none usr/share/doc/sqlite3/releaselog/3_3_8.html 0444 root bin
-f none usr/share/doc/sqlite3/releaselog/3_3_9.html 0444 root bin
-f none usr/share/doc/sqlite3/releaselog/3_4_0.html 0444 root bin
-f none usr/share/doc/sqlite3/releaselog/3_4_1.html 0444 root bin
-f none usr/share/doc/sqlite3/releaselog/3_4_2.html 0444 root bin
-f none usr/share/doc/sqlite3/releaselog/3_5_0.html 0444 root bin
-f none usr/share/doc/sqlite3/releaselog/3_5_1.html 0444 root bin
-f none usr/share/doc/sqlite3/releaselog/3_5_2.html 0444 root bin
-f none usr/share/doc/sqlite3/releaselog/3_5_3.html 0444 root bin
-f none usr/share/doc/sqlite3/releaselog/3_5_4.html 0444 root bin
-f none usr/share/doc/sqlite3/releaselog/3_5_5.html 0444 root bin
-f none usr/share/doc/sqlite3/releaselog/3_5_6.html 0444 root bin
-f none usr/share/doc/sqlite3/releaselog/3_5_7.html 0444 root bin
-f none usr/share/doc/sqlite3/releaselog/3_5_8.html 0444 root bin
-f none usr/share/doc/sqlite3/releaselog/3_5_9.html 0444 root bin
-f none usr/share/doc/sqlite3/releaselog/3_6_0.html 0444 root bin
-f none usr/share/doc/sqlite3/releaselog/3_6_1.html 0444 root bin
-f none usr/share/doc/sqlite3/releaselog/3_6_10.html 0444 root bin
-f none usr/share/doc/sqlite3/releaselog/3_6_11.html 0444 root bin
-f none usr/share/doc/sqlite3/releaselog/3_6_12.html 0444 root bin
-f none usr/share/doc/sqlite3/releaselog/3_6_13.html 0444 root bin
-f none usr/share/doc/sqlite3/releaselog/3_6_14_1.html 0444 root bin
-f none usr/share/doc/sqlite3/releaselog/3_6_14_2.html 0444 root bin
-f none usr/share/doc/sqlite3/releaselog/3_6_14.html 0444 root bin
-f none usr/share/doc/sqlite3/releaselog/3_6_15.html 0444 root bin
-f none usr/share/doc/sqlite3/releaselog/3_6_16.html 0444 root bin
-f none usr/share/doc/sqlite3/releaselog/3_6_17.html 0444 root bin
-f none usr/share/doc/sqlite3/releaselog/3_6_2.html 0444 root bin
-f none usr/share/doc/sqlite3/releaselog/3_6_3.html 0444 root bin
-f none usr/share/doc/sqlite3/releaselog/3_6_4.html 0444 root bin
-f none usr/share/doc/sqlite3/releaselog/3_6_5.html 0444 root bin
-f none usr/share/doc/sqlite3/releaselog/3_6_6_1.html 0444 root bin
-f none usr/share/doc/sqlite3/releaselog/3_6_6_2.html 0444 root bin
-f none usr/share/doc/sqlite3/releaselog/3_6_6.html 0444 root bin
-f none usr/share/doc/sqlite3/releaselog/3_6_7.html 0444 root bin
-f none usr/share/doc/sqlite3/releaselog/3_6_8.html 0444 root bin
-f none usr/share/doc/sqlite3/releaselog/3_6_9.html 0444 root bin
-f none usr/share/doc/sqlite3/reqmatrix.html 0444 root bin
-f none usr/share/doc/sqlite3/requirements.html 0444 root bin
-f none usr/share/doc/sqlite3/robots.txt 0444 root bin
-f none usr/share/doc/sqlite3/rtree.html 0444 root bin
-f none usr/share/doc/sqlite3/selfcontained.html 0444 root bin
-f none usr/share/doc/sqlite3/serverless.html 0444 root bin
-f none usr/share/doc/sqlite3/sharedcache.html 0444 root bin
-f none usr/share/doc/sqlite3/sitemap.html 0444 root bin
-f none usr/share/doc/sqlite3/specification.html 0444 root bin
-f none usr/share/doc/sqlite3/speed.html 0444 root bin
-f none usr/share/doc/sqlite3/sqlite.html 0444 root bin
-f none usr/share/doc/sqlite3/support.html 0444 root bin
-f none usr/share/doc/sqlite3/syntaxdiagrams.html 0444 root bin
-f none usr/share/doc/sqlite3/sysreq.html 0444 root bin
-f none usr/share/doc/sqlite3/tclsqlite.html 0444 root bin
-f none usr/share/doc/sqlite3/tempfiles.html 0444 root bin
-f none usr/share/doc/sqlite3/testing.html 0444 root bin
-f none usr/share/doc/sqlite3/th3.html 0444 root bin
-f none usr/share/doc/sqlite3/threadsafe.html 0444 root bin
-f none usr/share/doc/sqlite3/transactional.html 0444 root bin
-f none usr/share/doc/sqlite3/unlock_notify.html 0444 root bin
-f none usr/share/doc/sqlite3/vdbe.html 0444 root bin
-f none usr/share/doc/sqlite3/version3.html 0444 root bin
-f none usr/share/doc/sqlite3/vtab.html 0444 root bin
-f none usr/share/doc/sqlite3/whentouse.html 0444 root bin
-f none usr/share/doc/sqlite3/zeroconf.html 0444 root bin
--- a/usr/src/pkgdefs/SUNWsqlite3docs/prototype_i386 Tue Feb 23 00:53:20 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +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.
-#
-#pragma ident "@(#)prototype_i386 1.1 08/03/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
-#
--- a/usr/src/pkgdefs/SUNWsqlite3docs/prototype_sparc Tue Feb 23 00:53:20 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +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/03/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
-#
--- a/usr/src/pkgdefs/SUNWsqlite3tcl/Makefile Tue Feb 23 00:53:20 2010 +0200
+++ /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/03/20 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/SUNWsqlite3tcl/copyright Tue Feb 23 00:53:20 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,72 +0,0 @@
-SQLite is in the Public Domain
-
-All of the deliverable code in SQLite has been dedicated to the public
-domain by the authors. All code authors, and representatives of the
-companies they work for, have signed affidavits dedicating their
-contributions to the public domain and originals of those signed
-affidavits are stored in a firesafe at the main offices of Hwaci. Anyone
-is free to copy, modify, publish, use, compile, sell, or distribute the
-original SQLite code, either in source code form or as a compiled
-binary, for any purpose, commercial or non-commercial, and by any means.
-
-The previous paragraph applies to the deliverable code in SQLite - those
-parts of the SQLite library that you actually bundle and ship with a
-larger application. Portions of the documentation and some code used as
-part of the build process might fall under other licenses. The details
-here are unclear. We do not worry about the licensing of the
-documentation and build code so much because none of these things are
-part of the core deliverable SQLite library.
-
-All of the deliverable code in SQLite has been written from scratch. No
-code has been taken from other projects or from the open internet. Every
-line of code can be traced back to its original author, and all of those
-authors have public domain dedications on file. So the SQLite code base
-is clean and is uncontaminated with licensed code from other projects.
-Obtaining An Explicit License To Use SQLite
-
-Even though SQLite is in the public domain and does not require a
-license, some users want to obtain a license anyway. Some reasons for
-obtaining a license include:
-
- * You are using SQLite in a jurisdiction that does not recognize the
- public domain.
- * You are using SQLite in a jurisdiction that does not recognize the
- right of an author to dedicate their work to the public domain.
- * You want to hold a tangible legal document as evidence that you
- have the legal right to use and distribute SQLite.
- * Your legal department tells you that you have to purchase a
- license.
-
-If you feel like you really have to purchase a license for SQLite,
-Hwaci, the company that employs the architect and principal developers
-of SQLite, will sell you one. Contributed Code
-
-In order to keep SQLite completely free and unencumbered by copyright,
-all new contributors to the SQLite code base are asked to dedicate their
-contributions to the public domain. If you want to send a patch or
-enhancement for possible inclusion in the SQLite source tree, please
-accompany the patch with the following statement:
-
-The author or authors of this code dedicate any and all copyright
-interest in this code to the public domain. We make this dedication for
-the benefit of the public at large and to the detriment of our heirs and
-successors. We intend this dedication to be an overt act of
-relinquishment in perpetuity of all present and future rights to this
-code under copyright law.
-
-We are not able to accept patches or changes to SQLite that are not
-accompanied by a statement such as the above. In addition, if you make
-changes or enhancements as an employee, then a simple statement such as
-the above is insufficient. You must also send by surface mail a
-copyright release signed by a company officer. A signed original of the
-copyright release should be mailed to:
-
- Hwaci
- 6200 Maple Cove Lane
- Charlotte, NC 28269
- USA
-
-A template copyright release is available in PDF or HTML. You can use
-this release to make future changes. This page last modified 2007/11/14
-15:25:42 UTC
-
--- a/usr/src/pkgdefs/SUNWsqlite3tcl/depend Tue Feb 23 00:53:20 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-#
-# Copyright 2008 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 08/03/20 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 SUNWTcl Tcl - Tool Command Language
-P SUNWsqlite3 SQLite3 - Embeddable SQL Engine
--- a/usr/src/pkgdefs/SUNWsqlite3tcl/pkginfo.tmpl Tue Feb 23 00:53:20 2010 +0200
+++ /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 "@(#)pkginfo.tmpl 1.1 08/03/20 SMI"
-#
-# This required package information file describes characteristics of the
-# package, such as package abbreviation, full package name, package version,
-# and package architecture.
-#
-PKG="SUNWsqlite3tcl"
-NAME="Tcl Bindings for SQLite3"
-ARCH="ISA"
-VERSION="SFWVERS,REV=0.0.0"
-SUNW_PRODNAME="SunOS"
-SUNW_PRODVERS="RELEASE/VERSION"
-SUNW_PKGTYPE="usr"
-MAXINST="1000"
-CATEGORY="system"
-DESC="Tcl Bindings for SQLite3 (3.5.4)"
-VENDOR="Sun Microsystems, Inc."
-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/SUNWsqlite3tcl/prototype_com Tue Feb 23 00:53:20 2010 +0200
+++ /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 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#ident "@(#)prototype_com 1.2 09/01/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 copyright
-i depend
-#
-# source locations relative to the prototype file
-#
-# SUNWsqlite3
-#
-d none usr 755 root sys
-d none usr/lib 755 root bin
-d none usr/lib/tcl8.4 755 root bin
-d none usr/lib/tcl8.4/sqlite3 755 root bin
-s none usr/lib/tcl8.4/sqlite3/32=.
-f none usr/lib/tcl8.4/sqlite3/libtclsqlite3.so 555 root bin
-f none usr/lib/tcl8.4/sqlite3/pkgIndex.tcl 0444 root bin
--- a/usr/src/pkgdefs/SUNWsqlite3tcl/prototype_i386 Tue Feb 23 00:53:20 2010 +0200
+++ /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 2008 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#pragma ident "@(#)prototype_i386 1.1 08/03/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
-#
-#
-# SUNWsqlite3
-#
-s none usr/lib/tcl8.4/sqlite3/64=amd64
-d none usr/lib/tcl8.4/sqlite3/amd64 755 root bin
-f none usr/lib/tcl8.4/sqlite3/amd64/libtclsqlite3.so 555 root bin
--- a/usr/src/pkgdefs/SUNWsqlite3tcl/prototype_sparc Tue Feb 23 00:53:20 2010 +0200
+++ /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 2008 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#ident "@(#)prototype_sparc 1.1 08/03/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
-#
-#
-# SUNWsqlite3
-#
-s none usr/lib/tcl8.4/sqlite3/64=sparcv9
-d none usr/lib/tcl8.4/sqlite3/sparcv9 755 root bin
-f none usr/lib/tcl8.4/sqlite3/sparcv9/libtclsqlite3.so 555 root bin
--- a/usr/src/pkgdefs/SUNWstunnelr/pkginfo.tmpl Tue Feb 23 00:53:20 2010 +0200
+++ b/usr/src/pkgdefs/SUNWstunnelr/pkginfo.tmpl Fri Mar 05 22:27:24 2010 +0200
@@ -19,10 +19,10 @@
#
# CDDL HEADER END
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "@(#)pkginfo.tmpl 1.1 08/07/09 SMI"
+#ident "@(#)pkginfo.tmpl 1.2 10/02/19 SMI"
#
# This required package information file describes characteristics of the
# package, such as package abbreviation, full package name, package version,
@@ -41,7 +41,7 @@
VENDOR="Sun Microsystems, Inc."
HOTLINE="Please contact your local service provider"
EMAIL=""
-CLASSES="none manifest rbac"
+CLASSES="none manifest"
BASEDIR=/
SUNW_PKGVERS="1.0"
SUNW_PKG_ALLZONES="false"
--- a/usr/src/pkgdefs/SUNWstunnelr/prototype_com Tue Feb 23 00:53:20 2010 +0200
+++ b/usr/src/pkgdefs/SUNWstunnelr/prototype_com Fri Mar 05 22:27:24 2010 +0200
@@ -19,10 +19,10 @@
#
# CDDL HEADER END
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "@(#)prototype_com 1.3 08/09/24 SMI"
+#ident "@(#)prototype_com 1.4 10/02/19 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
@@ -51,5 +51,7 @@
d none etc/stunnel 755 root sys
f none etc/stunnel/stunnel.sample 444 root sys
d none etc/security 755 root sys
-e rbac etc/security/prof_attr 644 root sys
-e rbac etc/security/auth_attr 644 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/SUNWtor-root/pkginfo.tmpl Tue Feb 23 00:53:20 2010 +0200
+++ b/usr/src/pkgdefs/SUNWtor-root/pkginfo.tmpl Fri Mar 05 22:27:24 2010 +0200
@@ -18,10 +18,10 @@
#
# CDDL HEADER END
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#pragma ident "@(#)pkginfo.tmpl 1.2 09/12/16 SMI"
+#pragma ident "@(#)pkginfo.tmpl 1.3 10/02/19 SMI"
#
# This required package information file describes characteristics of the
@@ -42,7 +42,7 @@
VENDOR="Sun Microsystems, Inc."
HOTLINE="Please contact your local service provider"
EMAIL=""
-CLASSES="none preserve manifest rbac"
+CLASSES="none preserve manifest"
BASEDIR=/
SUNW_PKGVERS="1.0"
SUNW_PKG_ALLZONES="false"
--- a/usr/src/pkgdefs/SUNWtor-root/prototype_com Tue Feb 23 00:53:20 2010 +0200
+++ b/usr/src/pkgdefs/SUNWtor-root/prototype_com Fri Mar 05 22:27:24 2010 +0200
@@ -18,10 +18,10 @@
#
# CDDL HEADER END
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#pragma ident "@(#)prototype_com 1.2 09/05/19 SMI"
+#pragma ident "@(#)prototype_com 1.3 10/02/19 SMI"
#
#
# This required package information file contains a list of package contents.
@@ -44,8 +44,10 @@
#
d none etc 0755 root sys
d none etc/security 0755 root sys
-e rbac etc/security/auth_attr 0644 root sys
-e rbac etc/security/prof_attr 0644 root sys
+d none etc/security/auth_attr.d 0755 root sys
+f none etc/security/auth_attr.d/tor 0444 root sys
+d none etc/security/prof_attr.d 0755 root sys
+f none etc/security/prof_attr.d/tor 0444 root sys
e preserve etc/torrc 0644 root sys
--- a/usr/src/pkgdefs/SUNWtss-root/pkginfo.tmpl Tue Feb 23 00:53:20 2010 +0200
+++ b/usr/src/pkgdefs/SUNWtss-root/pkginfo.tmpl Fri Mar 05 22:27:24 2010 +0200
@@ -19,10 +19,10 @@
#
# CDDL HEADER END
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#pragma ident "@(#)pkginfo.tmpl 1.2 09/05/14 SMI"
+#pragma ident "@(#)pkginfo.tmpl 1.3 10/02/19 SMI"
#
# This required package information file describes characteristics of the
@@ -43,7 +43,7 @@
VENDOR="Sun Microsystems, Inc."
HOTLINE="Please contact your local service provider"
EMAIL=""
-CLASSES="none preserve manifest rbac"
+CLASSES="none preserve manifest"
BASEDIR=/
SUNW_PKGVERS="1.0"
SUNW_PKG_ALLZONES="false"
--- a/usr/src/pkgdefs/SUNWtss-root/prototype_com Tue Feb 23 00:53:20 2010 +0200
+++ b/usr/src/pkgdefs/SUNWtss-root/prototype_com Fri Mar 05 22:27:24 2010 +0200
@@ -19,10 +19,10 @@
#
# CDDL HEADER END
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#pragma ident "@(#)prototype_com 1.2 09/03/11 SMI"
+#pragma ident "@(#)prototype_com 1.3 10/02/19 SMI"
#
#
@@ -44,8 +44,10 @@
d none etc 0755 root sys
d none etc/security 0755 root sys
e preserve etc/security/tcsd.conf 0644 root sys
-e rbac etc/security/auth_attr 0644 root sys
-e rbac etc/security/prof_attr 0644 root sys
+d none etc/security/auth_attr.d 0755 root sys
+f none etc/security/auth_attr.d/trousers 0444 root sys
+d none etc/security/prof_attr.d 0755 root sys
+f none etc/security/prof_attr.d/trousers 0444 root sys
d none lib 0755 root bin
d none lib/svc 0755 root bin
--- a/usr/src/pkgdefs/SUNWunison/depend Tue Feb 23 00:53:20 2010 +0200
+++ b/usr/src/pkgdefs/SUNWunison/depend Fri Mar 05 22:27:24 2010 +0200
@@ -21,7 +21,7 @@
# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "@(#)depend 1.3 10/01/15 SMI"
+#ident "@(#)depend 1.4 10/02/20 SMI"
#
# This package information file defines software dependencies associated
# with the pkg. You can define three types of pkg dependencies with this file:
@@ -52,6 +52,7 @@
P SUNWfontconfig Fontconfig library
P SUNWfreetype2 FreeType2 Font library
P SUNWlexpt libexpat - XML parser library
+P SUNWlibms Math & Microtasking Libraries (Usr)
P SUNWlibmsr Math & Microtasking Libraries (Root)
P SUNWpng Portable Network Graphics library
P SUNWxorg-clientlibs X.Org Foundation X Client Libraries
--- a/usr/src/pkgdefs/SUNWwiresharkr/pkginfo.tmpl Tue Feb 23 00:53:20 2010 +0200
+++ b/usr/src/pkgdefs/SUNWwiresharkr/pkginfo.tmpl Fri Mar 05 22:27:24 2010 +0200
@@ -20,11 +20,11 @@
#
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "@(#)pkginfo.tmpl 1.2 09/06/25 SMI"
+#ident "@(#)pkginfo.tmpl 1.3 10/02/19 SMI"
#
#
# This required package information file describes characteristics of the
@@ -44,7 +44,7 @@
VENDOR="Sun Microsystems, Inc."
HOTLINE="Please contact your local service provider"
EMAIL=""
-CLASSES="none rbac"
+CLASSES="none"
BASEDIR=/
SUNW_PKGVERS="1.0"
SUNW_PKG_ALLZONES="false"
--- a/usr/src/pkgdefs/SUNWwiresharkr/prototype_com Tue Feb 23 00:53:20 2010 +0200
+++ b/usr/src/pkgdefs/SUNWwiresharkr/prototype_com Fri Mar 05 22:27:24 2010 +0200
@@ -21,10 +21,10 @@
#
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "@(#)prototype_com 1.1 09/04/14 SMI"
+#ident "@(#)prototype_com 1.2 10/02/19 SMI"
#
# This required package information file contains a list of package contents.
@@ -48,4 +48,5 @@
d none etc 755 root sys
d none etc/security 755 root sys
-e rbac etc/security/exec_attr 644 root sys
+d none etc/security/exec_attr.d 755 root sys
+f none etc/security/exec_attr.d/wireshark 444 root sys
--- a/usr/src/pkgdefs/etc/exception_list_i386 Tue Feb 23 00:53:20 2010 +0200
+++ b/usr/src/pkgdefs/etc/exception_list_i386 Fri Mar 05 22:27:24 2010 +0200
@@ -19,10 +19,10 @@
# CDDL HEADER END
#
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "@(#)exception_list_i386 1.20 09/12/10 SMI"
+# ident "@(#)exception_list_i386 1.21 10/02/19 SMI"
#
# Exception List for protocmp
#
@@ -32,9 +32,6 @@
#
#####################################################################
#
-etc/security/auth_attr i386
-etc/security/exec_attr i386
-etc/security/prof_attr i386
usr/lib/libedit.a i386
usr/lib/amd64/libedit.a i386
usr/include/editline/readline.h i386
@@ -50,6 +47,3 @@
usr/postgres/8.2/lib/64 i386
usr/postgres/8.3/bin/64 i386
usr/postgres/8.4/bin/64 i386
-etc/user_attr i386
-etc/security/auth_attr i386
-etc/security/prof_attr i386
--- a/usr/src/pkgdefs/etc/exception_list_sparc Tue Feb 23 00:53:20 2010 +0200
+++ b/usr/src/pkgdefs/etc/exception_list_sparc Fri Mar 05 22:27:24 2010 +0200
@@ -19,10 +19,10 @@
# CDDL HEADER END
#
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "@(#)exception_list_sparc 1.22 09/12/10 SMI"
+# ident "@(#)exception_list_sparc 1.23 10/02/19 SMI"
#
# Exception List for protocmp
#
@@ -32,9 +32,6 @@
#
######################################################################
#
-etc/security/auth_attr sparc
-etc/security/exec_attr sparc
-etc/security/prof_attr sparc
usr/lib/libedit.a sparc
usr/lib/sparcv9/libedit.a sparc
usr/include/editline/readline.h sparc
@@ -50,6 +47,3 @@
usr/postgres/8.2/lib/64 sparc
usr/postgres/8.3/bin/64 sparc
usr/postgres/8.4/bin/64 sparc
-etc/user_attr sparc
-etc/security/auth_attr sparc
-etc/security/prof_attr sparc