Import sfw build 133
Bugs Fixed
----------
6462216 tomcat fails to build with java 1.6
6766826 SUNWopenldapr becomes inconsistent after a reboot
6900262 OpenSSL PKCS#11 engine files are not cstyle clean again
6902029 DoS vulnerability in ntpd NTP mode 7 (MODE_PRIVATE) handling [CVE-2009-3563]
6908571 77.5% snv_129 openssl-rsa1024-ncp_engine-verifys performance regression sparc
6909632 PKCS#11 engine should use CK_(TRUE|FALSE) instead of TRUE/FALSE
6910922 Apache 1.3 JServ module removal
6912691 don't need to reference /usr/openwin so much anymore
6912906 Apache 1.3 init.d script shouldn't refer to Tomcat
6913689 Several sfw packages no longer need to depend on SUNWmlib and SUNWmlibl
6917046 upgrade ncftp to 3.2.3
6918442 when /usr/bin/patch becomes gnu patch in opensolaris 131, it upsets a few things
6919344 SUNWgnu-readline consumers have undefined tgetent symbol
6919686 Tomcat vulnerable for CVE-2009-2901, CVE-2009-2902 and CVE-2009-2693
6920566 SUNWgnupg license is incorrect for gpgme
6920613 Apache Tomcat 6.0.24 stable
6920817 Wireshark update to version 1.2.6
6920889 make OpenSSL fips and non-fips builds run in parallel
6921161 SUNWusbccid should have gone away with SUNWocf
--- a/usr/src/Targetdirs Mon Feb 08 12:51:29 2010 +0200
+++ b/usr/src/Targetdirs Mon Feb 08 15:41:40 2010 +0200
@@ -23,7 +23,7 @@
# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "@(#)Targetdirs 1.244 10/01/06 SMI"
+# ident "@(#)Targetdirs 1.247 10/01/29 SMI"
#
#
@@ -93,7 +93,6 @@
/var/ntp \
/var/ntp/ntpstats \
/var/run \
- /var/run/openldap \
/var/svc \
/var/svc/manifest \
/var/svc/manifest/application \
@@ -145,8 +144,6 @@
/usr/apache/bin \
/usr/apache/htdocs \
/usr/apache/include \
- /usr/apache/jserv \
- /usr/apache/jserv/docs \
/usr/apache/libexec \
/usr/apache/man \
/usr/apache/man/man1 \
@@ -415,7 +412,6 @@
/usr/lib/sane \
/usr/lib/security \
/usr/lib/slib \
- /usr/lib/smartcard \
/usr/lib/svn \
/usr/lib/tcl8.4 \
/usr/lib/tcl8.4/encoding \
@@ -1186,7 +1182,6 @@
/usr/share/man/man3lib \
/usr/share/man/man3oldap \
/usr/share/man/man3openssl \
- /usr/share/man/man3smartcard \
/usr/share/man/man3tcl \
/usr/share/man/man3tk \
/usr/share/man/man4 \
@@ -1301,7 +1296,6 @@
/var/apache/cgi-bin \
/var/apache/htdocs \
/var/apache/icons \
- /var/apache/servlets\
/var/apache2 \
/var/apache2/2.2 \
/var/ejabberd \
Binary file usr/src/cmd/apache/ApacheJServ-1.1.2.tar.gz has changed
--- a/usr/src/cmd/apache/Makefile.sfw Mon Feb 08 12:51:29 2010 +0200
+++ b/usr/src/cmd/apache/Makefile.sfw Mon Feb 08 15:41:40 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.35 09/11/23 SMI"
+#ident "@(#)Makefile.sfw 1.36 10/01/14 SMI"
# Note to maintainers. I'm sorry...please forgive me for all
# that follows.
@@ -58,16 +58,6 @@
SSL_MODULE=mod_ssl-2.8.31-1.3.41
AUTH_GSS_MODULE=mod_auth_gss
-# the following is needed for jserv support
-# jserv is obsolete, but we need to keep it around until
-# we can officially EOF it
-#
-JSERV_MODULE=ApacheJServ-1.1.2
-JSDK=jsdk.jar # we don't build this ourself
-ROOTJSDKDIR=$(ROOT)/usr/apache/libexec
-ROOTJSDK=$(JSDK:%=$(ROOTJSDKDIR)/%)
-JSERV_MAKEFILES=jserv-makefiles
-
LDOPTS=-M $(SRC)/cmd/mapfile_noexstk -zcombreloc
# hack - webapp always uses gcc if it finds it, so we null out
@@ -87,7 +77,6 @@
MODULES= \
$(SSL_MODULE) \
$(PERL_MODULE) \
- $(JSERV_MODULE) \
$(TOMCATCON_MODULE)
# stuff to whack when we do 'make clean'
@@ -274,22 +263,6 @@
PERL=$(PERL) \
$(CCSMAKE) install)
-# currently, mod_jserv only likes to build with gnu make. So to
-# get around this, I have a bunch of makefiles that work with
-# regular make, and we drop these into the tree as "Makefile.sfw"
-# and build with them instead. Someday, maybe gmake will be in the
-# CBE and we can use it.
-
-$(JSERV_MODULE): $(ROOTJSDK)
- gzip -dc $(JSERV_MODULE).tar.gz | tar xopf -
- gpatch -p0 < ./Solaris/mod_jserv.patch
- (cd $(JSERV_MODULE); \
- gzip -dc ../$(JSERV_MAKEFILES).tar.gz| tar xopf - ; \
- sed s/apache_1.3.34/$(SERVER)/ src/c/Makefile.sfw > src/c/Makefile.sfw.new; \
- mv src/c/Makefile.sfw.new src/c/Makefile.sfw; \
- env MAKE=$(CCSMAKE) \
- $(CCSMAKE) -f Makefile.sfw)
-
$(TOMCATCON_MODULE): $(TOMCATCON_SOURCE)/native/config.status
(cd $(TOMCATCON_SOURCE)/native; env - \
PATH=$(SFW_PATH) \
--- a/usr/src/cmd/apache/Solaris/README Mon Feb 08 12:51:29 2010 +0200
+++ b/usr/src/cmd/apache/Solaris/README Mon Feb 08 15:41:40 2010 +0200
@@ -1,4 +1,3 @@
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
#
# CDDL HEADER START
#
@@ -19,9 +18,10 @@
#
# CDDL HEADER END
#
-# Use subject to license terms.
+# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
#
-#ident "@(#)README 1.5 08/12/12 SMI"
+#ident "@(#)README 1.6 10/01/14 SMI"
Contained in this directory are all the various patches and
configuration file templates that are applied to the Solaris
@@ -33,6 +33,5 @@
apachectl.patch - patch for contract interface from PSARC/2001/244
httpdconf.sed - sed script to "fix" httpd.conf-example
manpage.patches - fix apache server manpages for solaris
-mod_jserv.patch - large file fixes for mod_jserv
jk.conf - configuration file for mod_jk
workers.properties - worker definition used by mod_jk
--- a/usr/src/cmd/apache/Solaris/README.Solaris Mon Feb 08 12:51:29 2010 +0200
+++ b/usr/src/cmd/apache/Solaris/README.Solaris Mon Feb 08 15:41:40 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 "@(#)README.Solaris 1.6 08/12/12 SMI"
+#ident "@(#)README.Solaris 1.7 10/01/14 SMI"
Solaris specific build/configuration information.
@@ -62,20 +62,16 @@
which makes it easy to enable Tomcat and see the examples and
documentation, as well as test httpd locally.
-By default, all supplied modules are enabled, except mod_jserv and
-mod_jk (see below). This may not be an optimal configuration, as
-you may not want or need many of the modules. In particular,
-mod_perl is a memory hog (if you don't need it).
+By default, all supplied modules are enabled, except mod_jk (see below).
+This may not be an optimal configuration, as you may not want or need
+many of the modules. In particular, mod_perl is a memory hog (if you
+don't need it).
Java support:
-We include mod_jserv, which supports the Java Servlet API V 2.0 (now
-obsolete). We also include mod_jk, which is a web connector used
-to interface httpd to Apache Tomcat, which supports the Servlet API
-V2.5 as well as Java Server Pages V2.1.
-
-You may enable either mod_jserv or mod_jk, but not both
-at the same time. See the comments in the example httpd.conf file.
+We include mod_jk, which is a web connector used to interface httpd to
+Apache Tomcat, which supports the Servlet API V2.5 as well as Java
+Server Pages V2.1.
If you enable mod_jk, you will probably need to start Apache Tomcat.
For more information how to do it see tomcat(1m) man page.
--- a/usr/src/cmd/apache/Solaris/apache.sh Mon Feb 08 12:51:29 2010 +0200
+++ b/usr/src/cmd/apache/Solaris/apache.sh Mon Feb 08 15:41:40 2010 +0200
@@ -20,16 +20,15 @@
# 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 "@(#)apache.sh 1.8 08/10/08 SMI"
+#ident "@(#)apache.sh 1.9 10/01/14 SMI"
APACHE_HOME=/usr/apache
CONF_FILE=/etc/apache/httpd.conf
RUNDIR=/var/run/apache
PIDFILE=${RUNDIR}/httpd.pid
-TOMCAT_CF=/var/apache/tomcat/conf/server.xml
if [ ! -f ${CONF_FILE} ]; then
exit 0
@@ -39,42 +38,16 @@
/usr/bin/mkdir -p -m 755 ${RUNDIR}
fi
-# see if we need to start/stop tomcat also
-
-CF=`egrep '^[ \t]*include[ \t]*/etc/apache/tomcat.conf' $CONF_FILE`
-if [ -n "$CF" -a -f $TOMCAT_CF ]; then
- TOMCAT=yes
- TC_USER=`egrep '^[ \t]*User[ \t]' $CONF_FILE | nawk '{print $2}'`
-else
- TOMCAT=no
-fi
-
case "$1" in
start|startssl|sslstart|start-SSL)
/bin/rm -f ${PIDFILE}
cmdtext="starting"
- if [ "x$TOMCAT" != xno ]; then
- (CATALINA_HOME=${APACHE_HOME}/tomcat; export CATALINA_HOME; \
- CATALINA_BASE=/var/apache/tomcat; export CATALINA_BASE; \
- JAVA_HOME=/usr/java; export JAVA_HOME; \
- /bin/su - $TC_USER -c \
- "$CATALINA_HOME/bin/startup.sh") \
- >/dev/null 2>&1
- fi
;;
restart)
cmdtext="restarting"
;;
stop)
cmdtext="stopping"
- if [ "x$TOMCAT" != xno ]; then
- (CATALINA_HOME=${APACHE_HOME}/tomcat; export CATALINA_HOME; \
- CATALINA_BASE=/var/apache/tomcat; export CATALINA_BASE; \
- JAVA_HOME=/usr/java; export JAVA_HOME; \
- /bin/su - $TC_USER -c \
- "$CATALINA_HOME/bin/shutdown.sh") \
- >/dev/null 2>&1
- fi
;;
*)
echo "Usage: $0 {start|stop|restart}"
--- a/usr/src/cmd/apache/Solaris/httpdconf.sed Mon Feb 08 12:51:29 2010 +0200
+++ b/usr/src/cmd/apache/Solaris/httpdconf.sed Mon Feb 08 15:41:40 2010 +0200
@@ -1,4 +1,4 @@
-#ident "@(#)httpdconf.sed 1.10 08/12/12 SMI"
+#ident "@(#)httpdconf.sed 1.11 10/01/14 SMI"
#
# CDDL HEADER START
#
@@ -19,8 +19,8 @@
#
# CDDL HEADER END
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
-# Use subject to license terms.
+# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
/^# the directives/a\
#\
@@ -77,18 +77,5 @@
#</Location>\
#</IfModule>\
\
-# To enable the old mod_jserv support (java servlets), uncomment\
-# the 'include /etc/apache/jserv.conf' line. For Apache Tomcat\
-# support, uncomment the 'include /etc/apache/jk.conf' line.\
-# Tomcat supports both servlets and java server pages. Do not\
-# uncomment *both* lines. Choose one or the other.\
-\
-# Java Servlet support\
-#include /etc/apache/jserv.conf\
-\
-# If enabling Tomcat, also be sure to rename/edit the Tomcat\
-# configuration file /var/apache/tomcat/conf/server.xml-example\
-# to /var/apache/tomcat/conf/server.xml.\
-\
# Apache Tomcat support\
#include /etc/apache/jk.conf
--- a/usr/src/cmd/apache/Solaris/mod_jserv.patch Mon Feb 08 12:51:29 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-*** ApacheJServ-1.1.2/src/c/jserv_utils.c.orig Fri Aug 3 14:51:44 2001
---- ApacheJServ-1.1.2/src/c/jserv_utils.c Fri Aug 3 14:59:22 2001
-***************
-*** 124,131 ****
- FILE *file;
- char *filename;
- char *filebuffer;
-! long filesize;
-! long filelen;
- int x;
-
- /* Check our file name */
---- 124,131 ----
- FILE *file;
- char *filename;
- char *filebuffer;
-! off_t filesize;
-! off_t filelen;
- int x;
-
- /* Check our file name */
-***************
-*** 153,164 ****
- return ap_pstrcat(p,"file '",filename,"' cannot be opened",NULL);
-
- /* Seek file to end and check */
-! x=fseek(file,0,SEEK_END);
- if (x!=0)
- return ap_pstrcat(p,"file '", filename,"' can not seek to end", NULL);
-
- /* Get file size, check and rewind */
-! filesize=ftell(file);
- if (filesize==-1)
- return ap_pstrcat(p, "cannot get file '",filename,"' length", NULL);
- rewind(file);
---- 153,164 ----
- return ap_pstrcat(p,"file '",filename,"' cannot be opened",NULL);
-
- /* Seek file to end and check */
-! x=fseeko(file,0,SEEK_END);
- if (x!=0)
- return ap_pstrcat(p,"file '", filename,"' can not seek to end", NULL);
-
- /* Get file size, check and rewind */
-! filesize=ftello(file);
- if (filesize==-1)
- return ap_pstrcat(p, "cannot get file '",filename,"' length", NULL);
- rewind(file);
--- a/usr/src/cmd/apache/install-apache Mon Feb 08 12:51:29 2010 +0200
+++ b/usr/src/cmd/apache/install-apache Mon Feb 08 15:41:40 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-apache 1.21 09/05/25 SMI"
+#ident "@(#)install-apache 1.22 10/01/14 SMI"
. ${SRC}/tools/install.subr
@@ -36,30 +36,6 @@
_install N ${iprog} ${idir}/${iprog} ${imode}
}
-install_jserv() {
- cd ${TOP}/${JSERV_VERSION}/src/c
- ins_file jserv_shmedit ${BINDIR} 555
- ins_file mod_jserv.so ${LIBEXECDIR} 555
-
- cd ../java
- ins_file ApacheJServ.jar ${LIBEXECDIR} 555
-
- cd ../..
- find docs -depth -print | cpio -pdum ${JSERVDIR}
- rm -f ${JSERVDIR}/docs/Makefile*
- rm -f ${JSERVDIR}/docs/STATUS.txt
- rm -f ${JSERVDIR}/docs/api/Makefile*
-
- cd example
- ins_file Hello.class ${VARDIR}/servlets 644
- ins_file IsItWorking.class ${VARDIR}/servlets 644
-
- cd ../conf
- ins_file jserv.conf ${CONFDIR} 555
- ins_file jserv.properties ${CONFDIR} 555
- ins_file zone.properties ${CONFDIR} 555
-}
-
disable_suexec() {
cd ${BINDIR}
rm -f suexec.disabled
@@ -68,7 +44,7 @@
install_logs() {
mkdir -p ${VARDIR}/logs
- for i in access_log error_log suexec_log mod_jserv.log
+ for i in access_log error_log suexec_log
do
rm -f ${VARDIR}/logs/$i
touch ${VARDIR}/logs/$i
@@ -135,7 +111,7 @@
post_process() {
cd ${BINDIR}
- for i in ab htdigest htpasswd httpd jserv_shmedit logresolve \
+ for i in ab htdigest htpasswd httpd logresolve \
rotatelogs suexec.disabled
do
chmod u+w ${i}
@@ -181,7 +157,7 @@
# end of mod_ssl fixups
cd ${PREFIX}
- APDIRS="bin htdocs include jserv libexec man perl5"
+ APDIRS="bin htdocs include libexec man perl5"
find ${APDIRS} -type d -exec chmod 755 {} \;
find ${APDIRS} -type f -exec chmod 555 {} \;
@@ -195,7 +171,7 @@
find . -type f -exec chmod 644 {} \;
cd ${VARDIR}
- APDIRS="cgi-bin htdocs icons logs proxy servlets"
+ APDIRS="cgi-bin htdocs icons logs proxy"
find ${APDIRS} -type d -exec chmod 755 {} \;
find ${APDIRS} -type f -exec chmod 644 {} \;
@@ -210,12 +186,6 @@
chmod 644 *
}
-fix_jserv_perms() {
- cd ${JSERVDIR}
- find . -type d -exec chmod 755 {} \;
- find . -type f -exec chmod 644 {} \;
-}
-
fix_apachectl() {
cd ${BINDIR}
rm -f apachectl.out
@@ -246,7 +216,6 @@
# is a function, so it's relatively easy to add new stuff.
APACHE_VERSION=`grep "^SERVER=" Makefile.sfw | sed s/SERVER=//`
-JSERV_VERSION=ApacheJServ-1.1.2
MOD_PERL_VERSION=mod_perl-1.31
TOMCATCON_VERSION=tomcat-connectors-1.2.27-src
@@ -260,7 +229,6 @@
USRHTDOCS=${PREFIX}/htdocs
INCLUDEDIR=${PREFIX}/include
LIBEXECDIR=${PREFIX}/libexec
-JSERVDIR=${PREFIX}/jserv
MANDIR=${PREFIX}/man
MAN1DIR=${PREFIX}/man/man1
MAN3DIR=${PREFIX}/man/man3
@@ -271,7 +239,6 @@
TOP=`pwd`
-install_jserv
disable_suexec
install_logs
install_proxydir
@@ -288,7 +255,6 @@
# that fixup permissions can get everything that is installed.
fix_apache_perms
-fix_jserv_perms
# also need to make one last fix to apachectl after it's installed.
# can't patch it prior to install, because apache install runs sed
Binary file usr/src/cmd/apache/jsdk.jar has changed
Binary file usr/src/cmd/apache/jserv-makefiles.tar.gz has changed
--- a/usr/src/cmd/bonnieplus/Makefile.sfw Mon Feb 08 12:51:29 2010 +0200
+++ b/usr/src/cmd/bonnieplus/Makefile.sfw Mon Feb 08 15:41:40 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 "@(#)Makefile.sfw 1.2 08/10/27 SMI"
+#ident "@(#)Makefile.sfw 1.3 10/01/22 SMI"
#
VER=bonnie++-1.03c
@@ -52,8 +52,8 @@
PATH=$(SFW_PATH) \
MAKE=$(GMAKE) \
./configure $(CONFIGURE_OPTIONS))
- patch -p0 < bon_csv2html.patch
- patch -p0 < bon_csv2txt.patch
+ $(GPATCH) -p0 < bon_csv2html.patch
+ $(GPATCH) -p0 < bon_csv2txt.patch
$(VER)/configure: $(VER).tgz
gzip -dc $(VER).tgz | tar xopf -
--- a/usr/src/cmd/bonnieplus/bon_csv2txt.patch Mon Feb 08 12:51:29 2010 +0200
+++ b/usr/src/cmd/bonnieplus/bon_csv2txt.patch Mon Feb 08 15:41:40 2010 +0200
@@ -1,9 +1,8 @@
---- bonnie++-1.03c/bon_csv2txt.old Fri Oct 24 21:27:35 2008
-+++ bonnie++-1.03c/bon_csv2txt Fri Oct 24 21:29:39 2008
-@@ -1,5 +1,6 @@
+--- bonnie++-1.03c/bon_csv2txt.orig Tue Jan 19 16:43:56 2010
++++ bonnie++-1.03c/bon_csv2txt Tue Jan 19 16:44:08 2010
+@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/perl5/bin/perl -w
{
my $line;
- $iocount = 0;
--- a/usr/src/cmd/gnupg/Makefile.sfw Mon Feb 08 12:51:29 2010 +0200
+++ b/usr/src/cmd/gnupg/Makefile.sfw Mon Feb 08 15:41:40 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 "@(#)Makefile.sfw 1.3 09/12/21 SMI"
+#ident "@(#)Makefile.sfw 1.4 10/01/25 SMI"
#
include ../Makefile.cmd
@@ -36,8 +36,7 @@
LDFLAGS += \
-L$(ROOT)/usr/lib \
- -M $(SRC)/cmd/mapfile_noexstk \
- -z ignore
+ -M $(SRC)/cmd/mapfile_noexstk
LIBS=-lnsl -lsocket
--- a/usr/src/cmd/jruby/Makefile.sfw Mon Feb 08 12:51:29 2010 +0200
+++ b/usr/src/cmd/jruby/Makefile.sfw Mon Feb 08 15:41:40 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 "@(#)Makefile.sfw 1.4 09/05/13 SMI"
+#ident "@(#)Makefile.sfw 1.5 10/01/22 SMI"
JRUBY_VER=1.1.3
JRUBY_HOME=jruby-${JRUBY_VER}
@@ -41,9 +41,9 @@
${JRUBY_HOME}:
gzip -dc jruby-src-${JRUBY_VER}.tar.gz | \
$(GTAR) xpf - --no-same-owner
- patch -i build_xml.patch ${JRUBY_HOME}/build.xml
- patch -i jruby.patch ${JRUBY_HOME}/bin/jruby
- patch -u -p0 -d ./${JRUBY_HOME}<rb.patch
+ $(GPATCH) -i build_xml.patch ${JRUBY_HOME}/build.xml
+ $(GPATCH) -i jruby.patch ${JRUBY_HOME}/bin/jruby
+ $(GPATCH) -u -p0 -d ./${JRUBY_HOME}<rb.patch
install: all
--- a/usr/src/cmd/jruby/build_xml.patch Mon Feb 08 12:51:29 2010 +0200
+++ b/usr/src/cmd/jruby/build_xml.patch Mon Feb 08 15:41:40 2010 +0200
@@ -1,8 +1,8 @@
apt ant task was replaced by standard Java Annotation Processing Tool (apt)
---- build.xml 2008-07-20 20:31:50.000000000 +0200
-+++ build.xml 2008-09-15 20:32:18.359375000 +0200
-@@ -144,14 +144,33 @@
+--- jruby-1.1.3/build.xml.orig Tue Jan 19 16:48:54 2010
++++ jruby-1.1.3/build.xml Tue Jan 19 16:49:26 2010
+@@ -144,14 +144,30 @@
</target>
<target name="compile-jruby" depends="compile-tasks, compile-annotation-binder, check-for-optional-packages">
--- a/usr/src/cmd/ncftp/METADATA Mon Feb 08 12:51:29 2010 +0200
+++ b/usr/src/cmd/ncftp/METADATA Mon Feb 08 15:41:40 2010 +0200
@@ -1,10 +1,10 @@
NAME: ncftp
-VERSION: 3.2.2
+VERSION: 3.2.3
DESCRIPTION: Alternative to the standard ftp
LICENSE: Artistic
PACKAGE: SUNWncft
PROJECT_URL: http://www.ncftp.com/ncftp
-SOURCE_DOWNLOAD: ftp://ftp.ncftp.com/ncftp/ncftp-3.2.2-src.tar.bz2
+SOURCE_DOWNLOAD: ftp://ftp.ncftp.com/ncftp/ncftp-3.2.3-src.tar.bz2
SUPPORT: C
BUGTRAQ: solaris/utility/ncftp-client
OSR: 1443
Binary file usr/src/cmd/ncftp/ncftp-3.2.2-src.tar.bz2 has changed
Binary file usr/src/cmd/ncftp/ncftp-3.2.3-src.tar.bz2 has changed
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/ntpd/Patches/cve20093563.patch Mon Feb 08 15:41:40 2010 +0200
@@ -0,0 +1,29 @@
+--- ntpd/ntp_request.c.fcs Thu Dec 31 15:12:40 2009
++++ ntpd/ntp_request.c Thu Dec 31 15:20:26 2009
+@@ -441,18 +441,20 @@
+ #endif
+
+ /*
+- * Do some sanity checks on the packet. Return a format
+- * error if it fails.
++ * Do some sanity checks on the packet. Drop it if it is
++ * malformed or a response packet. Return a format
++ * error if it fails any other tests.
+ */
+- ec = 0;
+- if ( (++ec, ISRESPONSE(inpkt->rm_vn_mode))
+- || (++ec, ISMORE(inpkt->rm_vn_mode))
++ if (rbufp->recv_length < REQ_LEN_HDR ||
++ ISRESPONSE(inpkt->rm_vn_mode)) return;
++
++ ec = 1;
++ if ( (++ec, ISMORE(inpkt->rm_vn_mode))
+ || (++ec, INFO_VERSION(inpkt->rm_vn_mode) > NTP_VERSION)
+ || (++ec, INFO_VERSION(inpkt->rm_vn_mode) < NTP_OLDVERSION)
+ || (++ec, INFO_SEQ(inpkt->auth_seq) != 0)
+ || (++ec, INFO_ERR(inpkt->err_nitems) != 0)
+ || (++ec, INFO_MBZ(inpkt->mbz_itemsize) != 0)
+- || (++ec, rbufp->recv_length < REQ_LEN_HDR)
+ ) {
+ msyslog(LOG_ERR, "process_private: INFO_ERR_FMT: test %d failed, pkt from %s", ec, stoa(srcadr));
+ req_ack(srcadr, inter, inpkt, INFO_ERR_FMT);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/openldap/Solaris/ldap-olslapd Mon Feb 08 15:41:40 2010 +0200
@@ -0,0 +1,67 @@
+#! /usr/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 2010 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
+#
+# ident "@(#)ldap-olslapd 1.1 10/01/28 SMI"
+#
+
+source /lib/svc/share/smf_include.sh
+
+typeset -r LDAPUSR=openldap
+typeset -r LDAPGRP=openldap
+typeset -r VARRUNDIR=/var/run/openldap
+typeset -r PIDFILE=${VARRUNDIR}/slapd.pid
+typeset -r CONF_FILE=/etc/openldap/slapd.conf
+typeset -r SLAPD="/usr/lib/slapd -u ${LDAPUSR} -g ${LDAPGRP} -f ${CONF_FILE}"
+
+[[ ! -f ${CONF_FILE} ]] && exit $SMF_EXIT_ERR_CONFIG
+
+
+case "$1" in
+start)
+ if [[ ! -d ${VARRUNDIR} ]] ; then
+ /usr/bin/mkdir -m 755 ${VARRUNDIR} || exit $SMF_EXIT_ERR_CONFIG
+ /usr/bin/chown ${LDAPUSR}:${LDAPGRP} ${VARRUNDIR}
+ else
+ /bin/rm -f ${PIDFILE}
+ fi
+
+ exec ${SLAPD} 2>&1
+ ;;
+stop)
+ # Use the actual contract, not ${PIDFILE}
+ smf_kill_contract $2 TERM 1 30
+ ret=$?
+ [ $ret -ne 0 ] && exit 1
+ exit $ret
+ ;;
+*)
+ print "Usage: $0 {start|stop}"
+ exit 1
+ ;;
+esac
+
+# not reached
--- a/usr/src/cmd/openldap/Solaris/ldap-olslapd.xml Mon Feb 08 12:51:29 2010 +0200
+++ b/usr/src/cmd/openldap/Solaris/ldap-olslapd.xml Mon Feb 08 15:41:40 2010 +0200
@@ -22,10 +22,10 @@
<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
<!--
- Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+ Copyright 2010 Sun Microsystems, Inc. All rights reserved.
Use is subject to license terms.
- ident "@(#)ldap-olslapd.xml 1.1 08/10/24 SMI"
+ ident "@(#)ldap-olslapd.xml 1.2 10/01/28 SMI"
-->
<service_bundle type='manifest' name='SUNWopenldapr:slapd'>
@@ -66,18 +66,14 @@
<exec_method
type='method'
name='start'
- exec='/usr/lib/slapd -u openldap -g openldap -f /etc/openldap/slapd.conf'
+ exec='/lib/svc/method/ldap-olslapd start'
timeout_seconds='60'>
- <method_context>
- <method_credential user='openldap' group='openldap'
- privileges='basic,net_privaddr' />
- </method_context>
</exec_method>
<exec_method
type='method'
name='stop'
- exec='/usr/bin/kill `cat /var/run/openldap/slapd.pid`'
+ exec='/lib/svc/method/ldap-olslapd stop %{restarter/contract}'
timeout_seconds='60' />
<property_group name='startd' type='framework'>
--- a/usr/src/cmd/openldap/install-openldap Mon Feb 08 12:51:29 2010 +0200
+++ b/usr/src/cmd/openldap/install-openldap Mon Feb 08 15:41:40 2010 +0200
@@ -20,12 +20,12 @@
# 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 BIND's objects into the proto area ready for packaging.
#
-# ident "@(#)install-openldap 1.2 08/10/27 SMI"
+# ident "@(#)install-openldap 1.3 10/01/28 SMI"
# VERS should be provided on command line or set in environment
if [ $# -ge 2 ]; then
@@ -165,6 +165,8 @@
cd ../Solaris
i=ldap-olslapd.xml
_install N ${i} ${ROOT}/var/svc/manifest/network/ldap/${i} 444
+i=ldap-olslapd
+_install N ${i} ${ROOT}/lib/svc/method/${i} 555
cd $TOP
#
--- a/usr/src/cmd/php5/Makefile.sfw Mon Feb 08 12:51:29 2010 +0200
+++ b/usr/src/cmd/php5/Makefile.sfw Mon Feb 08 15:41:40 2010 +0200
@@ -21,7 +21,7 @@
# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#pragma ident "@(#)Makefile.sfw 1.38 10/01/08 SMI"
+#pragma ident "@(#)Makefile.sfw 1.39 10/01/22 SMI"
PHP_REL=5.2
#
@@ -32,7 +32,8 @@
PHP_VER=$(COMPONENT_VERSION:sh)
PHP_DIR=php-$(PHP_VER)
PHP_CGI=$(PHP_DIR)-cgi
-PHP_CGI_BIN=$(PWD)/$(PHP_DIR)-cgi/sapi/cgi/php-cgi
+PHP_LOC=$(SRC)/cmd/php5
+PHP_CGI_BIN=$(PHP_LOC)/$(PHP_DIR)-cgi/sapi/cgi/php-cgi
PHP_NSAPI=$(PHP_DIR)-nsapi
TOP_DIR=/usr/php/$(PHP_REL)
@@ -75,8 +76,8 @@
MEMCACHE_ZTS=$(MEMCACHE_DIR)-zts
IMAP_CLIENT_VERSION=-2007e
-IMAP_CLIENT_DIR=$(PWD)/imap$(IMAP_CLIENT_VERSION)/c-client
-IMAP_DIR=$(PWD)/imap$(IMAP_CLIENT_VERSION)
+IMAP_CLIENT_DIR=$(PHP_LOC)/imap$(IMAP_CLIENT_VERSION)/c-client
+IMAP_DIR=$(PHP_LOC)/imap$(IMAP_CLIENT_VERSION)
PHP_LFS=-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
@@ -315,7 +316,7 @@
--with-pcre-regex \
--with-png-dir=/usr \
--with-xmlrpc \
- --with-xpm-dir=/usr/openwin \
+ --with-xpm-dir=/usr/X11 \
--with-xsl \
--with-zlib \
--with-zend-vm=CALL \
@@ -400,7 +401,7 @@
--with-mysql=shared,$(ROOT)$(MYSQL_DIR) \
--with-mysql-sock=/tmp/mysql.sock \
--with-mysqli=shared,$(ROOT)$(MYSQL_DIR)/bin/mysql_config \
- --with-nsapi=$(PWD)/webserver7-spi \
+ --with-nsapi=$(PHP_LOC)/webserver7-spi \
--with-openssl=shared \
--with-pear=$(PEAR_DIR) \
--with-pdo-mysql=shared,$(ROOT)$(MYSQL_DIR) \
--- a/usr/src/cmd/php5/install-php5 Mon Feb 08 12:51:29 2010 +0200
+++ b/usr/src/cmd/php5/install-php5 Mon Feb 08 15:41:40 2010 +0200
@@ -23,7 +23,7 @@
# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#pragma ident "@(#)install-php5 1.15 10/01/06 SMI"
+#pragma ident "@(#)install-php5 1.16 10/01/22 SMI"
set -o errexit
@@ -207,17 +207,17 @@
# Ensure basic file permissions.
chmod u+w pecl php-config;
- patch -i ${CWD}/patches/pear_pecl.patch;
- patch -i ${CWD}/patches/pear_php_config.patch;
+ gpatch -i ${CWD}/patches/pear_pecl.patch;
+ gpatch -i ${CWD}/patches/pear_php_config.patch;
chmod u-w pear peardev pecl php-config;
cd ${LIBDIR}/build;
- patch -i ${CWD}/patches/pear_Makefile_global.patch;
+ gpatch --no-backup-if-mismatch -i ${CWD}/patches/pear_Makefile_global.patch;
cd ${PEAR_TOPDIR};
- patch -i ${CWD}/patches/pear_Builder_php.patch;
- patch -i ${CWD}/patches/pear_all-tests.php.patch;
- patch -i ${CWD}/patches/pear_genpackage.xml.pl.patch;
+ gpatch -p0 -i ${CWD}/patches/pear_Builder_php.patch;
+ gpatch -p0 -i ${CWD}/patches/pear_all-tests.php.patch;
+ gpatch -p0 -i ${CWD}/patches/pear_genpackage.xml.pl.patch;
# Ship default PEAR registry files as generated registry files
# are corrupted by default.
--- a/usr/src/cmd/tomcat/METADATA Mon Feb 08 12:51:29 2010 +0200
+++ b/usr/src/cmd/tomcat/METADATA Mon Feb 08 15:41:40 2010 +0200
@@ -1,10 +1,10 @@
NAME: tomcat
-VERSION: 6.0.20
+VERSION: 6.0.24
DESCRIPTION: for Java Servlet and JavaServer Pages
LICENSE: Apache
PACKAGE: SUNWtcatr SUNWtcatu SUNWtcat-examples
PROJECT_URL: http://jakarta.apache.org/tomcat
-SOURCE_DOWNLOAD: http://apache.ziply.com/tomcat/tomcat-6/v6.0.20/bin/apache-tomcat-6.0.20-src.tar.gz
+SOURCE_DOWNLOAD: http://apache.ziply.com/tomcat/tomcat-6/v6.0.24/src/apache-tomcat-6.0.24-src.tar.gz
SUPPORT: C
BUGTRAQ: solaris/utility/apache
OSR: 6819
--- a/usr/src/cmd/tomcat/Makefile.sfw Mon Feb 08 12:51:29 2010 +0200
+++ b/usr/src/cmd/tomcat/Makefile.sfw Mon Feb 08 15:41:40 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.23 09/06/11 SMI"
+#ident "@(#)Makefile.sfw 1.24 10/01/27 SMI"
#
include ../Makefile.cmd
@@ -34,6 +34,7 @@
VER = apache-tomcat-$(COMPONENT_VERSION:sh)-src
TARBALL = $(VER).tar.gz
PATCHES:sh = echo Patches/*.patch
+COMMON_DBCP = commons-dbcp-1.2.2-src
GPATCH_FLAGS = -p1 --no-backup-if-mismatch
UNPACKARCHIVE= TAR=/usr/bin/gtar $(SRC)/tools/unpack-archive
@@ -65,7 +66,7 @@
"ANT_HOME=$(ANTHOME)" \
$(ANTCMD) )
-lib: $(VER)/.patched $(BUILD_PROPERTIES) $(TCLIB_DIR)
+lib: $(VER)/.patched $(BUILD_PROPERTIES) $(TCLIB_DIR) $(COMMON_DBCP).tar.gz.patched
cp $(BUILD_PROPERTIES) $(VER)
(cd $(VER); unset ANT_HOME || true; env \
JAVA_HOME=$(JDK) \
@@ -101,7 +102,15 @@
$(TCLIB_DIR):
-mkdir -p $(TCLIB_DIR)
+# Enable DBCP to build on a 1.6 JDK
+# (see: https://issues.apache.org/jira/browse/DBCP-191)
+$(COMMON_DBCP).tar.gz.patched: $(COMMON_DBCP).tar.gz
+ gtar xfz $(COMMON_DBCP).tar.gz
+ gpatch -p0 < Solaris/java16.diff
+ gtar cfz $(COMMON_DBCP).tar.gz.patched $(COMMON_DBCP)
+ rm -rf $(COMMON_DBCP)
+
clean:
- -rm -rf $(CLEANDIRS) $(CLEANFILES)
+ -rm -rf $(CLEANDIRS) $(CLEANFILES) $(COMMON_DBCP).tar.gz.patched
include ../Makefile.targ
--- a/usr/src/cmd/tomcat/Patches/build.xml.patch Mon Feb 08 12:51:29 2010 +0200
+++ b/usr/src/cmd/tomcat/Patches/build.xml.patch Mon Feb 08 15:41:40 2010 +0200
@@ -1,9 +1,27 @@
---- apache-tomcat-6.0.20-src/build.xml.orig Wed Jun 3 04:46:59 2009
-+++ apache-tomcat-6.0.20-src/build.xml Wed Jun 3 04:47:15 2009
-@@ -439,12 +439,6 @@
-
- <target name="deploy" depends="build-only,build-docs,warn.dbcp">
+--- apache-tomcat-6.0.24-src/build.xml.orig Wed Jan 27 04:36:32 2010
++++ apache-tomcat-6.0.24-src/build.xml Wed Jan 27 04:43:55 2010
+@@ -92,8 +92,6 @@
+ <property name="jasper-jdt.home" value="${base.path}/tomcat${version.major}-deps/jdt" />
+ <property name="tomcat-dbcp.jar" value="${tomcat-dbcp.home}/tomcat-dbcp.jar"/>
+ <property name="jasper-jdt.jar" value="${jasper-jdt.home}/jasper-jdt.jar"/>
+- <available property="tomcat-dbcp.present" file="${tomcat-dbcp.jar}" />
+- <available property="jdk16.present" classname="javax.sql.StatementEvent" />
+ <!-- Classpath -->
+ <path id="tomcat.classpath">
+@@ -488,20 +486,8 @@
+ </xslt>
+ </target>
+
+- <target name="warn.dbcp" unless="tomcat-dbcp.present">
+- <echo>WARNING: tomcat-dbcp.jar not included, this build can't be used
+- in a release. Please run 'ant download' with JDK1.5 if you are
+- building a tomcat release.</echo>
+- </target>
++ <target name="deploy" depends="build-only,build-docs">
+
+- <target name="deploy" depends="build-only,build-docs,warn.dbcp">
+-
- <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"
- file="${tomcat-native.tar.gz}" />
-
@@ -13,9 +31,19 @@
<!-- Copy scripts -->
<copy todir="${tomcat.build}/bin">
<fileset dir="bin">
-@@ -640,35 +634,8 @@
- <target name="download"
- description="Builds and download dependent components">
+@@ -654,8 +640,7 @@
+ </fileset>
+ </txt2html>
+
+- <copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib"
+- failonerror="false"/>
++ <copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib" />
+ <copy file="${jasper-jdt.jar}" todir="${tomcat.build}/lib" />
+
+ </target>
+@@ -720,35 +705,6 @@
+ description="Download (and build as necessary) dependent components"
+ depends="build-manifests">
- <antcall target="downloadfile">
- <param name="sourcefile" value="${tomcat-native.loc}"/>
@@ -35,6 +63,12 @@
- <param name="destdir" value="${tomcat-native.home}"/>
- </antcall>
-
+- <antcall target="downloadfile">
+- <param name="sourcefile" value="${tomcat-native.dll}/win64/ia64/tcnative-1.dll"/>
+- <param name="destfile" value="${tomcat-native.home}/tcnative-1.dll.i64"/>
+- <param name="destdir" value="${tomcat-native.home}"/>
+- </antcall>
+-
- <antcall target="downloadgz">
- <param name="sourcefile" value="${commons-daemon.loc}"/>
- <param name="destfile" value="${commons-daemon.jar}"/>
@@ -42,14 +76,8 @@
-
<!-- Build Tomcat DBCP bundle -->
<antcall target="downloadgz">
-- <param name="sourcefile" value="${commons-collections-src.loc}"/>
-- <param name="destfile" value="${tomcat-dbcp.jar}" />
-- </antcall>
-- <antcall target="downloadgz">
<param name="sourcefile" value="${commons-pool-src.loc}"/>
- <param name="destfile" value="${tomcat-dbcp.jar}" />
- </antcall>
-@@ -692,12 +659,6 @@
+@@ -774,15 +730,9 @@
<param name="basedir" value="${jasper-jdt.home}" />
</antcall>
@@ -61,4 +89,8 @@
-
</target>
- <target name="build-tomcat-dbcp" unless="jdk16.present">
+- <target name="build-tomcat-dbcp" unless="jdk16.present">
++ <target name="build-tomcat-dbcp">
+ <copy todir="${tomcat-dbcp.home}">
+ <fileset dir="${commons-pool.home}">
+ <include name="**/*.java" />
--- a/usr/src/cmd/tomcat/Solaris/build.properties.sed Mon Feb 08 12:51:29 2010 +0200
+++ b/usr/src/cmd/tomcat/Solaris/build.properties.sed Mon Feb 08 15:41:40 2010 +0200
@@ -1,4 +1,4 @@
-#ident "@(#)build.properties.sed 1.2 08/02/14 SMI"
+#ident "@(#)build.properties.sed 1.3 10/01/27 SMI"
#
# CDDL HEADER START
#
@@ -19,11 +19,11 @@
#
# CDDL HEADER END
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
-# Use subject to license terms.
+# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
# substitute the only direct URL (so we can handle it like others)
-s/http:\/\/www\.eclipse\.org/\${base-tomcat\.loc}/
+s/http:\/\/archive\.eclipse\.org\/eclipse\/downloads\/drops\/R-3.3.1-200709211145/\${base-tomcat\.loc}/
# change http:// URLs to file:// pointing to cmd/tomcat directory
/^base-commons/s/=.*/=file:\/\/${base.path}\/..\//
--- a/usr/src/cmd/tomcat/Solaris/http-tomcat6 Mon Feb 08 12:51:29 2010 +0200
+++ b/usr/src/cmd/tomcat/Solaris/http-tomcat6 Mon Feb 08 15:41:40 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 "@(#)http-tomcat6 1.2 09/10/30 SMI"
+#ident "@(#)http-tomcat6 1.3 10/01/28 SMI"
#
. /lib/svc/share/smf_include.sh
@@ -46,7 +46,6 @@
CATALINA_BASE=/var/tomcat6
CATALINA_PID=$CATALINA_BASE/logs/pid
JAVA_HOME=/usr/java
-rm -f $CATALINA_PID
export CATALINA_HOME CATALINA_BASE CATALINA_PID JAVA_HOME
$CATALINA_HOME/bin/catalina.sh $cmd 2>&1
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/tomcat/Solaris/java16.diff Mon Feb 08 15:41:40 2010 +0200
@@ -0,0 +1,1965 @@
+--- commons-dbcp-1.2.2-src/src/java/org/apache/commons/dbcp/PoolingDataSource.java.orig Wed Jan 27 07:09:09 2010
++++ commons-dbcp-1.2.2-src/src/java/org/apache/commons/dbcp/PoolingDataSource.java Wed Jan 27 07:18:43 2010
+@@ -84,6 +84,14 @@
+ public void setAccessToUnderlyingConnectionAllowed(boolean allow) {
+ this.accessToUnderlyingConnectionAllowed = allow;
+ }
++
++ public boolean isWrapperFor(Class<?> iface) throws SQLException {
++ return false;
++ }
++
++ public <T> T unwrap(Class<T> iface) throws SQLException {
++ throw new SQLException("PoolingDataSource is not a wrapper.");
++ }
+
+ //--- DataSource methods -----------------------------------------
+
+--- commons-dbcp-1.2.2-src/src/java/org/apache/commons/dbcp/BasicDataSource.java.orig Sun Mar 25 14:51:25 2007
++++ commons-dbcp-1.2.2-src/src/java/org/apache/commons/dbcp/BasicDataSource.java Wed Jan 27 07:12:35 2010
+@@ -1101,6 +1101,15 @@
+ }
+
+
++ public boolean isWrapperFor(Class<?> iface) throws SQLException {
++ return false;
++ }
++
++ public <T> T unwrap(Class<T> iface) throws SQLException {
++ throw new SQLException("BasicDataSource is not a wrapper.");
++ }
++
++
+ // ------------------------------------------------------ Protected Methods
+
+
+--- commons-dbcp-1.2.2-src/src/java/org/apache/commons/dbcp/DelegatingResultSet.java.orig Wed Jan 27 07:09:09 2010
++++ commons-dbcp-1.2.2-src/src/java/org/apache/commons/dbcp/DelegatingResultSet.java Wed Jan 27 07:17:08 2010
+@@ -34,6 +34,11 @@
+ import java.sql.Clob;
+ import java.sql.Array;
+ import java.util.Calendar;
++/* JDBC_4_ANT_KEY_BEGIN */
++import java.sql.NClob;
++import java.sql.RowId;
++import java.sql.SQLXML;
++/* JDBC_4_ANT_KEY_END */
+
+ /**
+ * A base delegating implementation of {@link ResultSet}.
+@@ -585,6 +590,459 @@
+
+ public void updateArray(String columnName, java.sql.Array x) throws SQLException
+ { try { _res.updateArray(columnName, x); } catch (SQLException e) { handleException(e); } }
+-
+ /* JDBC_3_ANT_KEY_END */
++/* JDBC_4_ANT_KEY_BEGIN */
++
++ public boolean isWrapperFor(Class<?> iface) throws SQLException {
++ return _res.isWrapperFor(iface);
++ }
++
++ public <T> T unwrap(Class<T> iface) throws SQLException {
++ return _res.unwrap(iface);
++ }
++
++ public RowId getRowId(int columnIndex) throws SQLException {
++ try {
++ return _res.getRowId(columnIndex);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ return null;
++ }
++ }
++
++ public RowId getRowId(String columnLabel) throws SQLException {
++ try {
++ return _res.getRowId(columnLabel);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ return null;
++ }
++ }
++
++ public void updateRowId(int columnIndex, RowId value) throws SQLException {
++ try {
++ _res.updateRowId(columnIndex, value);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ }
++ }
++
++ public void updateRowId(String columnLabel, RowId value) throws SQLException {
++ try {
++ _res.updateRowId(columnLabel, value);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ }
++ }
++
++ public int getHoldability() throws SQLException {
++ try {
++ return _res.getHoldability();
++ }
++ catch (SQLException e) {
++ handleException(e);
++ return 0;
++ }
++ }
++
++ public boolean isClosed() throws SQLException {
++ try {
++ return _res.isClosed();
++ }
++ catch (SQLException e) {
++ handleException(e);
++ return false;
++ }
++ }
++
++ public void updateNString(int columnIndex, String value) throws SQLException {
++ try {
++ _res.updateNString(columnIndex, value);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ }
++ }
++
++ public void updateNString(String columnLabel, String value) throws SQLException {
++ try {
++ _res.updateNString(columnLabel, value);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ }
++ }
++
++ public void updateNClob(int columnIndex, NClob value) throws SQLException {
++ try {
++ _res.updateNClob(columnIndex, value);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ }
++ }
++
++ public void updateNClob(String columnLabel, NClob value) throws SQLException {
++ try {
++ _res.updateNClob(columnLabel, value);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ }
++ }
++
++ public NClob getNClob(int columnIndex) throws SQLException {
++ try {
++ return _res.getNClob(columnIndex);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ return null;
++ }
++ }
++
++ public NClob getNClob(String columnLabel) throws SQLException {
++ try {
++ return _res.getNClob(columnLabel);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ return null;
++ }
++ }
++
++ public SQLXML getSQLXML(int columnIndex) throws SQLException {
++ try {
++ return _res.getSQLXML(columnIndex);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ return null;
++ }
++ }
++
++ public SQLXML getSQLXML(String columnLabel) throws SQLException {
++ try {
++ return _res.getSQLXML(columnLabel);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ return null;
++ }
++ }
++
++ public void updateSQLXML(int columnIndex, SQLXML value) throws SQLException {
++ try {
++ _res.updateSQLXML(columnIndex, value);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ }
++ }
++
++ public void updateSQLXML(String columnLabel, SQLXML value) throws SQLException {
++ try {
++ _res.updateSQLXML(columnLabel, value);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ }
++ }
++
++ public String getNString(int columnIndex) throws SQLException {
++ try {
++ return _res.getNString(columnIndex);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ return null;
++ }
++ }
++
++ public String getNString(String columnLabel) throws SQLException {
++ try {
++ return _res.getNString(columnLabel);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ return null;
++ }
++ }
++
++ public Reader getNCharacterStream(int columnIndex) throws SQLException {
++ try {
++ return _res.getNCharacterStream(columnIndex);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ return null;
++ }
++ }
++
++ public Reader getNCharacterStream(String columnLabel) throws SQLException {
++ try {
++ return _res.getNCharacterStream(columnLabel);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ return null;
++ }
++ }
++
++ public void updateNCharacterStream(int columnIndex, Reader reader, long length) throws SQLException {
++ try {
++ _res.updateNCharacterStream(columnIndex, reader, length);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ }
++ }
++
++ public void updateNCharacterStream(String columnLabel, Reader reader, long length) throws SQLException {
++ try {
++ _res.updateNCharacterStream(columnLabel, reader, length);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ }
++ }
++
++ public void updateAsciiStream(int columnIndex, InputStream inputStream, long length) throws SQLException {
++ try {
++ _res.updateAsciiStream(columnIndex, inputStream, length);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ }
++ }
++
++ public void updateBinaryStream(int columnIndex, InputStream inputStream, long length) throws SQLException {
++ try {
++ _res.updateBinaryStream(columnIndex, inputStream, length);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ }
++ }
++
++ public void updateCharacterStream(int columnIndex, Reader reader, long length) throws SQLException {
++ try {
++ _res.updateCharacterStream(columnIndex, reader, length);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ }
++ }
++
++ public void updateAsciiStream(String columnLabel, InputStream inputStream, long length) throws SQLException {
++ try {
++ _res.updateAsciiStream(columnLabel, inputStream, length);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ }
++ }
++
++ public void updateBinaryStream(String columnLabel, InputStream inputStream, long length) throws SQLException {
++ try {
++ _res.updateBinaryStream(columnLabel, inputStream, length);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ }
++ }
++
++ public void updateCharacterStream(String columnLabel, Reader reader, long length) throws SQLException {
++ try {
++ _res.updateCharacterStream(columnLabel, reader, length);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ }
++ }
++
++ public void updateBlob(int columnIndex, InputStream inputStream, long length) throws SQLException {
++ try {
++ _res.updateBlob(columnIndex, inputStream, length);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ }
++ }
++
++ public void updateBlob(String columnLabel, InputStream inputStream, long length) throws SQLException {
++ try {
++ _res.updateBlob(columnLabel, inputStream, length);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ }
++ }
++
++ public void updateClob(int columnIndex, Reader reader, long length) throws SQLException {
++ try {
++ _res.updateClob(columnIndex, reader, length);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ }
++ }
++
++ public void updateClob(String columnLabel, Reader reader, long length) throws SQLException {
++ try {
++ _res.updateClob(columnLabel, reader, length);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ }
++ }
++
++ public void updateNClob(int columnIndex, Reader reader, long length) throws SQLException {
++ try {
++ _res.updateNClob(columnIndex, reader, length);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ }
++ }
++
++ public void updateNClob(String columnLabel, Reader reader, long length) throws SQLException {
++ try {
++ _res.updateNClob(columnLabel, reader, length);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ }
++ }
++
++ public void updateNCharacterStream(int columnIndex, Reader reader) throws SQLException {
++ try {
++ _res.updateNCharacterStream(columnIndex, reader);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ }
++ }
++
++ public void updateNCharacterStream(String columnLabel, Reader reader) throws SQLException {
++ try {
++ _res.updateNCharacterStream(columnLabel, reader);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ }
++ }
++
++ public void updateAsciiStream(int columnIndex, InputStream inputStream) throws SQLException {
++ try {
++ _res.updateAsciiStream(columnIndex, inputStream);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ }
++ }
++
++ public void updateBinaryStream(int columnIndex, InputStream inputStream) throws SQLException {
++ try {
++ _res.updateBinaryStream(columnIndex, inputStream);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ }
++ }
++
++ public void updateCharacterStream(int columnIndex, Reader reader) throws SQLException {
++ try {
++ _res.updateCharacterStream(columnIndex, reader);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ }
++ }
++
++ public void updateAsciiStream(String columnLabel, InputStream inputStream) throws SQLException {
++ try {
++ _res.updateAsciiStream(columnLabel, inputStream);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ }
++ }
++
++ public void updateBinaryStream(String columnLabel, InputStream inputStream) throws SQLException {
++ try {
++ _res.updateBinaryStream(columnLabel, inputStream);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ }
++ }
++
++ public void updateCharacterStream(String columnLabel, Reader reader) throws SQLException {
++ try {
++ _res.updateCharacterStream(columnLabel, reader);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ }
++ }
++
++ public void updateBlob(int columnIndex, InputStream inputStream) throws SQLException {
++ try {
++ _res.updateBlob(columnIndex, inputStream);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ }
++ }
++
++ public void updateBlob(String columnLabel, InputStream inputStream) throws SQLException {
++ try {
++ _res.updateBlob(columnLabel, inputStream);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ }
++ }
++
++ public void updateClob(int columnIndex, Reader reader) throws SQLException {
++ try {
++ _res.updateClob(columnIndex, reader);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ }
++ }
++
++ public void updateClob(String columnLabel, Reader reader) throws SQLException {
++ try {
++ _res.updateClob(columnLabel, reader);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ }
++ }
++
++ public void updateNClob(int columnIndex, Reader reader) throws SQLException {
++ try {
++ _res.updateNClob(columnIndex, reader);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ }
++ }
++
++ public void updateNClob(String columnLabel, Reader reader) throws SQLException {
++ try {
++ _res.updateNClob(columnLabel, reader);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ }
++ }
++/* JDBC_4_ANT_KEY_END */
+ }
+--- commons-dbcp-1.2.2-src/src/java/org/apache/commons/dbcp/DelegatingPreparedStatement.java.orig Wed Jan 27 07:09:09 2010
++++ commons-dbcp-1.2.2-src/src/java/org/apache/commons/dbcp/DelegatingPreparedStatement.java Wed Jan 27 07:15:34 2010
+@@ -27,6 +27,13 @@
+ import java.sql.ResultSetMetaData;
+ import java.sql.SQLException;
+ import java.util.Calendar;
++/* JDBC_4_ANT_KEY_BEGIN */
++import java.io.InputStream;
++import java.io.Reader;
++import java.sql.NClob;
++import java.sql.RowId;
++import java.sql.SQLXML;
++/* JDBC_4_ANT_KEY_END */
+
+ /**
+ * A base delegating implementation of {@link PreparedStatement}.
+@@ -221,6 +228,187 @@
+
+ public java.sql.ParameterMetaData getParameterMetaData() throws SQLException
+ { checkOpen(); try { return _stmt.getParameterMetaData(); } catch (SQLException e) { handleException(e); return null; } }
+-
+ /* JDBC_3_ANT_KEY_END */
++/* JDBC_4_ANT_KEY_BEGIN */
++
++ public void setRowId(int parameterIndex, RowId value) throws SQLException {
++ checkOpen();
++ try {
++ _stmt.setRowId(parameterIndex, value);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ }
++ }
++
++ public void setNString(int parameterIndex, String value) throws SQLException {
++ checkOpen();
++ try {
++ _stmt.setNString(parameterIndex, value);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ }
++ }
++
++ public void setNCharacterStream(int parameterIndex, Reader value, long length) throws SQLException {
++ checkOpen();
++ try {
++ _stmt.setNCharacterStream(parameterIndex, value, length);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ }
++ }
++
++ public void setNClob(int parameterIndex, NClob value) throws SQLException {
++ checkOpen();
++ try {
++ _stmt.setNClob(parameterIndex, value);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ }
++ }
++
++ public void setClob(int parameterIndex, Reader reader, long length) throws SQLException {
++ checkOpen();
++ try {
++ _stmt.setClob(parameterIndex, reader, length);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ }
++ }
++
++ public void setBlob(int parameterIndex, InputStream inputStream, long length) throws SQLException {
++ checkOpen();
++ try {
++ _stmt.setBlob(parameterIndex, inputStream, length);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ }
++ }
++
++ public void setNClob(int parameterIndex, Reader reader, long length) throws SQLException {
++ checkOpen();
++ try {
++ _stmt.setNClob(parameterIndex, reader, length);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ }
++ }
++
++ public void setSQLXML(int parameterIndex, SQLXML value) throws SQLException {
++ checkOpen();
++ try {
++ _stmt.setSQLXML(parameterIndex, value);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ }
++ }
++
++ public void setAsciiStream(int parameterIndex, InputStream inputStream, long length) throws SQLException {
++ checkOpen();
++ try {
++ _stmt.setAsciiStream(parameterIndex, inputStream, length);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ }
++ }
++
++ public void setBinaryStream(int parameterIndex, InputStream inputStream, long length) throws SQLException {
++ checkOpen();
++ try {
++ _stmt.setBinaryStream(parameterIndex, inputStream, length);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ }
++ }
++
++ public void setCharacterStream(int parameterIndex, Reader reader, long length) throws SQLException {
++ checkOpen();
++ try {
++ _stmt.setCharacterStream(parameterIndex, reader, length);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ }
++ }
++
++ public void setAsciiStream(int parameterIndex, InputStream inputStream) throws SQLException {
++ checkOpen();
++ try {
++ _stmt.setAsciiStream(parameterIndex, inputStream);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ }
++ }
++
++ public void setBinaryStream(int parameterIndex, InputStream inputStream) throws SQLException {
++ checkOpen();
++ try {
++ _stmt.setBinaryStream(parameterIndex, inputStream);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ }
++ }
++
++ public void setCharacterStream(int parameterIndex, Reader reader) throws SQLException {
++ checkOpen();
++ try {
++ _stmt.setCharacterStream(parameterIndex, reader);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ }
++ }
++
++ public void setNCharacterStream(int parameterIndex, Reader reader) throws SQLException {
++ checkOpen();
++ try {
++ _stmt.setNCharacterStream(parameterIndex, reader);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ }
++ }
++
++ public void setClob(int parameterIndex, Reader reader) throws SQLException {
++ checkOpen();
++ try {
++ _stmt.setClob(parameterIndex, reader);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ }
++ }
++
++ public void setBlob(int parameterIndex, InputStream inputStream) throws SQLException {
++ checkOpen();
++ try {
++ _stmt.setBlob(parameterIndex, inputStream);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ }
++ }
++
++ public void setNClob(int parameterIndex, Reader reader) throws SQLException {
++ checkOpen();
++ try {
++ _stmt.setNClob(parameterIndex, reader);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ }
++ }
++/* JDBC_4_ANT_KEY_END */
+ }
+--- commons-dbcp-1.2.2-src/src/java/org/apache/commons/dbcp/datasources/InstanceKeyDataSource.java.orig Wed Jan 27 07:09:09 2010
++++ commons-dbcp-1.2.2-src/src/java/org/apache/commons/dbcp/datasources/InstanceKeyDataSource.java Wed Jan 27 07:21:52 2010
+@@ -154,6 +154,14 @@
+ */
+ public abstract void close() throws Exception;
+
++ public boolean isWrapperFor(Class<?> iface) throws SQLException {
++ return false;
++ }
++
++ public <T> T unwrap(Class<T> iface) throws SQLException {
++ throw new SQLException("InstanceKeyDataSource is not a wrapper.");
++ }
++
+ // -------------------------------------------------------------------
+ // Properties
+
+--- commons-dbcp-1.2.2-src/src/java/org/apache/commons/dbcp/cpdsadapter/ConnectionImpl.java.orig Sun Mar 25 14:51:25 2007
++++ commons-dbcp-1.2.2-src/src/java/org/apache/commons/dbcp/cpdsadapter/ConnectionImpl.java Wed Jan 27 07:19:51 2010
+@@ -25,6 +25,19 @@
+ import java.sql.Statement;
+ import java.sql.SQLWarning;
+ import java.sql.SQLException;
++/* JDBC_4_ANT_KEY_BEGIN */
++import java.sql.Array;
++import java.sql.Blob;
++import java.sql.ClientInfoStatus;
++import java.sql.Clob;
++import java.sql.NClob;
++import java.sql.SQLClientInfoException;
++import java.sql.SQLXML;
++import java.sql.Struct;
++import java.util.Collections;
++import java.util.Map;
++import java.util.Properties;
++/* JDBC_4_ANT_KEY_END */
+
+ /**
+ * This class is the <code>Connection</code> that will be returned
+@@ -42,6 +55,11 @@
+ private static final String CLOSED
+ = "Attempted to use Connection after closed() was called.";
+
++/* JDBC_4_ANT_KEY_BEGIN */
++ private static final Map<String, ClientInfoStatus> EMPTY_FAILED_PROPERTIES =
++ Collections.<String, ClientInfoStatus>emptyMap();
++/* JDBC_4_ANT_KEY_END */
++
+ /** The JDBC database connection. */
+ private Connection connection;
+
+@@ -452,6 +470,86 @@
+ assertOpen();
+ return connection.prepareStatement(sql, columnNames);
+ }
+-
+ /* JDBC_3_ANT_KEY_END */
++/* JDBC_4_ANT_KEY_BEGIN */
++
++ public boolean isWrapperFor(Class<?> iface) throws SQLException {
++ return connection.isWrapperFor(iface);
++ }
++
++ public <T> T unwrap(Class<T> iface) throws SQLException {
++ return connection.unwrap(iface);
++ }
++
++ public Array createArrayOf(String typeName, Object[] elements) throws SQLException {
++ assertOpen();
++ return connection.createArrayOf(typeName, elements);
++ }
++
++ public Blob createBlob() throws SQLException {
++ assertOpen();
++ return connection.createBlob();
++ }
++
++ public Clob createClob() throws SQLException {
++ assertOpen();
++ return connection.createClob();
++ }
++
++ public NClob createNClob() throws SQLException {
++ assertOpen();
++ return connection.createNClob();
++ }
++
++ public SQLXML createSQLXML() throws SQLException {
++ assertOpen();
++ return connection.createSQLXML();
++ }
++
++ public Struct createStruct(String typeName, Object[] attributes) throws SQLException {
++ assertOpen();
++ return connection.createStruct(typeName, attributes);
++ }
++
++ public boolean isValid(int timeout) throws SQLException {
++ assertOpen();
++ return connection.isValid(timeout);
++ }
++
++ public void setClientInfo(String name, String value) throws SQLClientInfoException {
++ try {
++ assertOpen();
++ connection.setClientInfo(name, value);
++ }
++ catch (SQLClientInfoException e) {
++ throw e;
++ }
++ catch (SQLException e) {
++ throw new SQLClientInfoException("Connection is closed.", EMPTY_FAILED_PROPERTIES, e);
++ }
++ }
++
++ public void setClientInfo(Properties properties) throws SQLClientInfoException {
++ try {
++ assertOpen();
++ connection.setClientInfo(properties);
++ }
++ catch (SQLClientInfoException e) {
++ throw e;
++ }
++ catch (SQLException e) {
++ throw new SQLClientInfoException("Connection is closed.", EMPTY_FAILED_PROPERTIES, e);
++ }
++ }
++
++ public Properties getClientInfo() throws SQLException {
++ assertOpen();
++ return connection.getClientInfo();
++ }
++
++ public String getClientInfo(String name) throws SQLException {
++ assertOpen();
++ return connection.getClientInfo(name);
++ }
++/* JDBC_4_ANT_KEY_END */
+ }
+--- commons-dbcp-1.2.2-src/src/java/org/apache/commons/dbcp/cpdsadapter/PooledConnectionImpl.java.orig Wed Jan 27 07:09:09 2010
++++ commons-dbcp-1.2.2-src/src/java/org/apache/commons/dbcp/cpdsadapter/PooledConnectionImpl.java Wed Jan 27 07:20:48 2010
+@@ -26,6 +26,7 @@
+ import javax.sql.ConnectionEvent;
+ import javax.sql.ConnectionEventListener;
+ import javax.sql.PooledConnection;
++import javax.sql.StatementEventListener;
+
+ import org.apache.commons.dbcp.DelegatingConnection;
+ import org.apache.commons.dbcp.DelegatingPreparedStatement;
+@@ -66,6 +67,11 @@
+ private Vector eventListeners;
+
+ /**
++ * StatementEventListeners
++ */
++ private Vector statementEventListeners;
++
++ /**
+ * flag set to true, once close() is called.
+ */
+ boolean isClosed;
+@@ -101,6 +107,12 @@
+ }
+ }
+
++ public void addStatementEventListener(StatementEventListener listener) {
++ if (!statementEventListeners.contains(listener)) {
++ statementEventListeners.add(listener);
++ }
++ }
++
+ /**
+ * Closes the physical connection and marks this
+ * <code>PooledConnection</code> so that it may not be used
+@@ -169,6 +181,10 @@
+ eventListeners.remove(listener);
+ }
+
++ public void removeStatementEventListener(StatementEventListener listener) {
++ statementEventListeners.remove(listener);
++ }
++
+ /**
+ * Closes the physical connection and checks that the logical connection
+ * was closed as well.
+--- commons-dbcp-1.2.2-src/src/java/org/apache/commons/dbcp/DelegatingConnection.java.orig Sun Mar 25 14:51:25 2007
++++ commons-dbcp-1.2.2-src/src/java/org/apache/commons/dbcp/DelegatingConnection.java Wed Jan 27 07:14:49 2010
+@@ -26,6 +26,19 @@
+ import java.sql.Statement;
+ import java.util.List;
+ import java.util.Map;
++/* JDBC_4_ANT_KEY_BEGIN */
++import java.sql.Array;
++import java.sql.Blob;
++import java.sql.ClientInfoStatus;
++import java.sql.Clob;
++import java.sql.NClob;
++import java.sql.SQLClientInfoException;
++import java.sql.SQLXML;
++import java.sql.Struct;
++import java.util.Collections;
++import java.util.Map;
++import java.util.Properties;
++/* JDBC_4_ANT_KEY_END */
+
+ /**
+ * A base delegating implementation of {@link Connection}.
+@@ -50,6 +63,12 @@
+ */
+ public class DelegatingConnection extends AbandonedTrace
+ implements Connection {
++
++/* JDBC_4_ANT_KEY_BEGIN */
++ private static final Map<String, ClientInfoStatus> EMPTY_FAILED_PROPERTIES =
++ Collections.<String, ClientInfoStatus>emptyMap();
++/* JDBC_4_ANT_KEY_END */
++
+ /** My delegate {@link Connection}. */
+ protected Connection _conn = null;
+
+@@ -488,4 +507,139 @@
+ }
+ }
+ /* JDBC_3_ANT_KEY_END */
++/* JDBC_4_ANT_KEY_BEGIN */
++
++ public boolean isWrapperFor(Class<?> iface) throws SQLException {
++ return _conn.isWrapperFor(iface);
++ }
++
++ public <T> T unwrap(Class<T> iface) throws SQLException {
++ return _conn.unwrap(iface);
++ }
++
++ public Array createArrayOf(String typeName, Object[] elements) throws SQLException {
++ checkOpen();
++ try {
++ return _conn.createArrayOf(typeName, elements);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ return null;
++ }
++ }
++
++ public Blob createBlob() throws SQLException {
++ checkOpen();
++ try {
++ return _conn.createBlob();
++ }
++ catch (SQLException e) {
++ handleException(e);
++ return null;
++ }
++ }
++
++ public Clob createClob() throws SQLException {
++ checkOpen();
++ try {
++ return _conn.createClob();
++ }
++ catch (SQLException e) {
++ handleException(e);
++ return null;
++ }
++ }
++
++ public NClob createNClob() throws SQLException {
++ checkOpen();
++ try {
++ return _conn.createNClob();
++ }
++ catch (SQLException e) {
++ handleException(e);
++ return null;
++ }
++ }
++
++ public SQLXML createSQLXML() throws SQLException {
++ checkOpen();
++ try {
++ return _conn.createSQLXML();
++ }
++ catch (SQLException e) {
++ handleException(e);
++ return null;
++ }
++ }
++
++ public Struct createStruct(String typeName, Object[] attributes) throws SQLException {
++ checkOpen();
++ try {
++ return _conn.createStruct(typeName, attributes);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ return null;
++ }
++ }
++
++ public boolean isValid(int timeout) throws SQLException {
++ checkOpen();
++ try {
++ return _conn.isValid(timeout);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ return false;
++ }
++ }
++
++ public void setClientInfo(String name, String value) throws SQLClientInfoException {
++ try {
++ checkOpen();
++ _conn.setClientInfo(name, value);
++ }
++ catch (SQLClientInfoException e) {
++ throw e;
++ }
++ catch (SQLException e) {
++ throw new SQLClientInfoException("Connection is closed.", EMPTY_FAILED_PROPERTIES, e);
++ }
++ }
++
++ public void setClientInfo(Properties properties) throws SQLClientInfoException {
++ try {
++ checkOpen();
++ _conn.setClientInfo(properties);
++ }
++ catch (SQLClientInfoException e) {
++ throw e;
++ }
++ catch (SQLException e) {
++ throw new SQLClientInfoException("Connection is closed.", EMPTY_FAILED_PROPERTIES, e);
++ }
++ }
++
++ public Properties getClientInfo() throws SQLException {
++ checkOpen();
++ try {
++ return _conn.getClientInfo();
++ }
++ catch (SQLException e) {
++ handleException(e);
++ return null;
++ }
++ }
++
++ public String getClientInfo(String name) throws SQLException {
++ checkOpen();
++ try {
++ return _conn.getClientInfo(name);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ return null;
++ }
++ }
++/* JDBC_4_ANT_KEY_END */
+ }
+--- commons-dbcp-1.2.2-src/src/java/org/apache/commons/dbcp/DelegatingStatement.java.orig Sun Mar 25 14:51:25 2007
++++ commons-dbcp-1.2.2-src/src/java/org/apache/commons/dbcp/DelegatingStatement.java Wed Jan 27 07:17:45 2010
+@@ -128,10 +128,6 @@
+
+ protected boolean _closed = false;
+
+- protected boolean isClosed() {
+- return _closed;
+- }
+-
+ protected void checkOpen() throws SQLException {
+ if(isClosed()) {
+ throw new SQLException
+@@ -339,4 +335,39 @@
+ { checkOpen(); try { return _stmt.getResultSetHoldability(); } catch (SQLException e) { handleException(e); return 0; } }
+
+ /* JDBC_3_ANT_KEY_END */
++/* JDBC_4_ANT_KEY_BEGIN */
++
++ public boolean isWrapperFor(Class<?> iface) throws SQLException {
++ return _conn.isWrapperFor(iface);
++ }
++
++ public <T> T unwrap(Class<T> iface) throws SQLException {
++ return _conn.unwrap(iface);
++ }
++
++ public boolean isClosed() throws SQLException {
++ return _closed;
++ }
++
++ public void setPoolable(boolean poolable) throws SQLException {
++ checkOpen();
++ try {
++ _stmt.setPoolable(poolable);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ }
++ }
++
++ public boolean isPoolable() throws SQLException {
++ checkOpen();
++ try {
++ return _stmt.isPoolable();
++ }
++ catch (SQLException e) {
++ handleException(e);
++ return false;
++ }
++ }
++/* JDBC_4_ANT_KEY_END */
+ }
+--- commons-dbcp-1.2.2-src/src/java/org/apache/commons/dbcp/DelegatingCallableStatement.java.orig Sun Mar 25 14:51:25 2007
++++ commons-dbcp-1.2.2-src/src/java/org/apache/commons/dbcp/DelegatingCallableStatement.java Wed Jan 27 07:13:48 2010
+@@ -32,6 +32,11 @@
+ import java.io.InputStream;
+ import java.io.Reader;
+ import java.sql.SQLException;
++/* JDBC_4_ANT_KEY_BEGIN */
++import java.sql.NClob;
++import java.sql.RowId;
++import java.sql.SQLXML;
++/* JDBC_4_ANT_KEY_END */
+
+ /**
+ * A base delegating implementation of {@link CallableStatement}.
+@@ -332,6 +337,337 @@
+
+ public URL getURL(String parameterName) throws SQLException
+ { checkOpen(); try { return _stmt.getURL(parameterName); } catch (SQLException e) { handleException(e); return null; } }
+-
+ /* JDBC_3_ANT_KEY_END */
++/* JDBC_4_ANT_KEY_BEGIN */
++
++ public RowId getRowId(int parameterIndex) throws SQLException {
++ checkOpen();
++ try {
++ return _stmt.getRowId(parameterIndex);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ return null;
++ }
++ }
++
++ public RowId getRowId(String parameterName) throws SQLException {
++ checkOpen();
++ try {
++ return _stmt.getRowId(parameterName);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ return null;
++ }
++ }
++
++ public void setRowId(String parameterName, RowId value) throws SQLException {
++ checkOpen();
++ try {
++ _stmt.setRowId(parameterName, value);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ }
++ }
++
++ public void setNString(String parameterName, String value) throws SQLException {
++ checkOpen();
++ try {
++ _stmt.setNString(parameterName, value);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ }
++ }
++
++ public void setNCharacterStream(String parameterName, Reader reader, long length) throws SQLException {
++ checkOpen();
++ try {
++ _stmt.setNCharacterStream(parameterName, reader, length);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ }
++ }
++
++ public void setNClob(String parameterName, NClob value) throws SQLException {
++ checkOpen();
++ try {
++ _stmt.setNClob(parameterName, value);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ }
++ }
++
++ public void setClob(String parameterName, Reader reader, long length) throws SQLException {
++ checkOpen();
++ try {
++ _stmt.setClob(parameterName, reader, length);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ }
++ }
++
++ public void setBlob(String parameterName, InputStream inputStream, long length) throws SQLException {
++ checkOpen();
++ try {
++ _stmt.setBlob(parameterName, inputStream, length);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ }
++ }
++
++ public void setNClob(String parameterName, Reader reader, long length) throws SQLException {
++ checkOpen();
++ try {
++ _stmt.setNClob(parameterName, reader, length);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ }
++ }
++
++ public NClob getNClob(int parameterIndex) throws SQLException {
++ checkOpen();
++ try {
++ return _stmt.getNClob(parameterIndex);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ return null;
++ }
++ }
++
++ public NClob getNClob(String parameterName) throws SQLException {
++ checkOpen();
++ try {
++ return _stmt.getNClob(parameterName);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ return null;
++ }
++ }
++
++ public void setSQLXML(String parameterName, SQLXML value) throws SQLException {
++ checkOpen();
++ try {
++ _stmt.setSQLXML(parameterName, value);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ }
++ }
++
++ public SQLXML getSQLXML(int parameterIndex) throws SQLException {
++ checkOpen();
++ try {
++ return _stmt.getSQLXML(parameterIndex);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ return null;
++ }
++ }
++
++ public SQLXML getSQLXML(String parameterName) throws SQLException {
++ checkOpen();
++ try {
++ return _stmt.getSQLXML(parameterName);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ return null;
++ }
++ }
++
++ public String getNString(int parameterIndex) throws SQLException {
++ checkOpen();
++ try {
++ return _stmt.getNString(parameterIndex);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ return null;
++ }
++ }
++
++ public String getNString(String parameterName) throws SQLException {
++ checkOpen();
++ try {
++ return _stmt.getNString(parameterName);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ return null;
++ }
++ }
++
++ public Reader getNCharacterStream(int parameterIndex) throws SQLException {
++ checkOpen();
++ try {
++ return _stmt.getNCharacterStream(parameterIndex);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ return null;
++ }
++ }
++
++ public Reader getNCharacterStream(String parameterName) throws SQLException {
++ checkOpen();
++ try {
++ return _stmt.getNCharacterStream(parameterName);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ return null;
++ }
++ }
++
++ public Reader getCharacterStream(int parameterIndex) throws SQLException {
++ checkOpen();
++ try {
++ return _stmt.getCharacterStream(parameterIndex);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ return null;
++ }
++ }
++
++ public Reader getCharacterStream(String parameterName) throws SQLException {
++ checkOpen();
++ try {
++ return _stmt.getCharacterStream(parameterName);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ return null;
++ }
++ }
++
++ public void setBlob(String parameterName, Blob blob) throws SQLException {
++ checkOpen();
++ try {
++ _stmt.setBlob(parameterName, blob);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ }
++ }
++
++ public void setClob(String parameterName, Clob clob) throws SQLException {
++ checkOpen();
++ try {
++ _stmt.setClob(parameterName, clob);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ }
++ }
++
++ public void setAsciiStream(String parameterName, InputStream inputStream, long length) throws SQLException {
++ checkOpen();
++ try {
++ _stmt.setAsciiStream(parameterName, inputStream, length);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ }
++ }
++
++ public void setBinaryStream(String parameterName, InputStream inputStream, long length) throws SQLException {
++ checkOpen();
++ try {
++ _stmt.setBinaryStream(parameterName, inputStream, length);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ }
++ }
++
++ public void setCharacterStream(String parameterName, Reader reader, long length) throws SQLException {
++ checkOpen();
++ try {
++ _stmt.setCharacterStream(parameterName, reader, length);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ }
++ }
++
++ public void setAsciiStream(String parameterName, InputStream inputStream) throws SQLException {
++ checkOpen();
++ try {
++ _stmt.setAsciiStream(parameterName, inputStream);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ }
++ }
++
++ public void setBinaryStream(String parameterName, InputStream inputStream) throws SQLException {
++ checkOpen();
++ try {
++ _stmt.setBinaryStream(parameterName, inputStream);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ }
++ }
++
++ public void setCharacterStream(String parameterName, Reader reader) throws SQLException {
++ checkOpen();
++ try {
++ _stmt.setCharacterStream(parameterName, reader);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ }
++ }
++
++ public void setNCharacterStream(String parameterName, Reader reader) throws SQLException {
++ checkOpen();
++ try {
++ _stmt.setNCharacterStream(parameterName, reader);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ }
++ }
++
++ public void setClob(String parameterName, Reader reader) throws SQLException {
++ checkOpen();
++ try {
++ _stmt.setClob(parameterName, reader);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ } }
++
++ public void setBlob(String parameterName, InputStream inputStream) throws SQLException {
++ checkOpen();
++ try {
++ _stmt.setBlob(parameterName, inputStream);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ } }
++
++ public void setNClob(String parameterName, Reader reader) throws SQLException {
++ checkOpen();
++ try {
++ _stmt.setNClob(parameterName, reader);
++ }
++ catch (SQLException e) {
++ handleException(e);
++ }
++ }
++/* JDBC_4_ANT_KEY_END */
+ }
+--- commons-dbcp-1.2.2-src/src/test/org/apache/commons/dbcp/TesterResultSet.java.orig Sun Mar 25 14:51:25 2007
++++ commons-dbcp-1.2.2-src/src/test/org/apache/commons/dbcp/TesterResultSet.java Wed Jan 27 07:24:08 2010
+@@ -28,6 +28,13 @@
+ import java.sql.SQLWarning;
+ import java.sql.Statement;
+ import java.util.Calendar;
++/* JDBC_4_ANT_KEY_BEGIN */
++import java.io.InputStream;
++import java.io.Reader;
++import java.sql.NClob;
++import java.sql.RowId;
++import java.sql.SQLXML;
++/* JDBC_4_ANT_KEY_END */
+
+ /**
+ * A dummy {@link ResultSet}, for testing purposes.
+@@ -757,7 +764,207 @@
+ throws SQLException {
+ throw new SQLException("Not implemented.");
+ }
+-
+ /* JDBC_3_ANT_KEY_END */
++/* JDBC_4_ANT_KEY_BEGIN */
+
++ public boolean isWrapperFor(Class<?> iface) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public <T> T unwrap(Class<T> iface) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public RowId getRowId(int columnIndex) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public RowId getRowId(String columnLabel) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void updateRowId(int columnIndex, RowId value) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void updateRowId(String columnLabel, RowId value) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public int getHoldability() throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public boolean isClosed() throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void updateNString(int columnIndex, String value) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void updateNString(String columnLabel, String value) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void updateNClob(int columnIndex, NClob value) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void updateNClob(String columnLabel, NClob value) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public NClob getNClob(int columnIndex) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public NClob getNClob(String columnLabel) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public SQLXML getSQLXML(int columnIndex) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public SQLXML getSQLXML(String columnLabel) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void updateSQLXML(int columnIndex, SQLXML value) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void updateSQLXML(String columnLabel, SQLXML value) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public String getNString(int columnIndex) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public String getNString(String columnLabel) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public Reader getNCharacterStream(int columnIndex) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public Reader getNCharacterStream(String columnLabel) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void updateNCharacterStream(int columnIndex, Reader reader, long length) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void updateNCharacterStream(String columnLabel, Reader reader, long length) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void updateAsciiStream(int columnIndex, InputStream inputStream, long length) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void updateBinaryStream(int columnIndex, InputStream inputStream, long length) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void updateCharacterStream(int columnIndex, Reader reader, long length) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void updateAsciiStream(String columnLabel, InputStream inputStream, long length) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void updateBinaryStream(String columnLabel, InputStream inputStream, long length) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void updateCharacterStream(String columnLabel, Reader reader, long length) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void updateBlob(int columnIndex, InputStream inputStream, long length) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void updateBlob(String columnLabel, InputStream inputStream, long length) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void updateClob(int columnIndex, Reader reader, long length) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void updateClob(String columnLabel, Reader reader, long length) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void updateNClob(int columnIndex, Reader reader, long length) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void updateNClob(String columnLabel, Reader reader, long length) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void updateNCharacterStream(int columnIndex, Reader reader) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void updateNCharacterStream(String columnLabel, Reader reader) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void updateAsciiStream(int columnIndex, InputStream inputStream) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void updateBinaryStream(int columnIndex, InputStream inputStream) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void updateCharacterStream(int columnIndex, Reader reader) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void updateAsciiStream(String columnLabel, InputStream inputStream) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void updateBinaryStream(String columnLabel, InputStream inputStream) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void updateCharacterStream(String columnLabel, Reader reader) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void updateBlob(int columnIndex, InputStream inputStream) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void updateBlob(String columnLabel, InputStream inputStream) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void updateClob(int columnIndex, Reader reader) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void updateClob(String columnLabel, Reader reader) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void updateNClob(int columnIndex, Reader reader) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void updateNClob(String columnLabel, Reader reader) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++/* JDBC_4_ANT_KEY_END */
+ }
+--- commons-dbcp-1.2.2-src/src/test/org/apache/commons/dbcp/TesterStatement.java.orig Sun Mar 25 14:51:25 2007
++++ commons-dbcp-1.2.2-src/src/test/org/apache/commons/dbcp/TesterStatement.java Wed Jan 27 07:24:50 2010
+@@ -264,5 +264,26 @@
+ throw new SQLException("Not implemented.");
+ }
+ /* JDBC_3_ANT_KEY_END */
++/* JDBC_4_ANT_KEY_BEGIN */
+
++ public boolean isWrapperFor(Class<?> iface) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public <T> T unwrap(Class<T> iface) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public boolean isClosed() throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void setPoolable(boolean poolable) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public boolean isPoolable() throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++/* JDBC_4_ANT_KEY_END */
+ }
+--- commons-dbcp-1.2.2-src/src/test/org/apache/commons/dbcp/TesterPreparedStatement.java.orig Wed Jan 27 07:09:09 2010
++++ commons-dbcp-1.2.2-src/src/test/org/apache/commons/dbcp/TesterPreparedStatement.java Wed Jan 27 07:23:34 2010
+@@ -28,6 +28,13 @@
+ import java.sql.ResultSetMetaData;
+ import java.sql.SQLException;
+ import java.util.Calendar;
++/* JDBC_4_ANT_KEY_BEGIN */
++import java.io.InputStream;
++import java.io.Reader;
++import java.sql.NClob;
++import java.sql.RowId;
++import java.sql.SQLXML;
++/* JDBC_4_ANT_KEY_END */
+
+ /**
+ * A dummy {@link PreparedStatement}, for testing purposes.
+@@ -288,7 +295,79 @@
+ public java.sql.ParameterMetaData getParameterMetaData() throws SQLException {
+ throw new SQLException("Not implemented.");
+ }
+-
+ /* JDBC_3_ANT_KEY_END */
++/* JDBC_4_ANT_KEY_BEGIN */
+
++ public void setRowId(int parameterIndex, RowId value) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void setNString(int parameterIndex, String value) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void setNCharacterStream(int parameterIndex, Reader value, long length) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void setNClob(int parameterIndex, NClob value) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void setClob(int parameterIndex, Reader reader, long length) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void setBlob(int parameterIndex, InputStream inputStream, long length) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void setNClob(int parameterIndex, Reader reader, long length) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void setSQLXML(int parameterIndex, SQLXML value) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void setAsciiStream(int parameterIndex, InputStream inputStream, long length) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void setBinaryStream(int parameterIndex, InputStream inputStream, long length) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void setCharacterStream(int parameterIndex, Reader reader, long length) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void setAsciiStream(int parameterIndex, InputStream inputStream) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void setBinaryStream(int parameterIndex, InputStream inputStream) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void setCharacterStream(int parameterIndex, Reader reader) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void setNCharacterStream(int parameterIndex, Reader reader) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void setClob(int parameterIndex, Reader reader) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void setBlob(int parameterIndex, InputStream inputStream) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void setNClob(int parameterIndex, Reader reader) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++/* JDBC_4_ANT_KEY_END */
+ }
+--- commons-dbcp-1.2.2-src/src/test/org/apache/commons/dbcp/TesterConnection.java.orig Sun Mar 25 14:51:25 2007
++++ commons-dbcp-1.2.2-src/src/test/org/apache/commons/dbcp/TesterConnection.java Wed Jan 27 07:22:56 2010
+@@ -25,6 +25,16 @@
+ import java.sql.SQLWarning;
+ import java.sql.Statement;
+ import java.util.Map;
++/* JDBC_4_ANT_KEY_BEGIN */
++import java.sql.Array;
++import java.sql.Blob;
++import java.sql.Clob;
++import java.sql.NClob;
++import java.sql.SQLClientInfoException;
++import java.sql.SQLXML;
++import java.sql.Struct;
++import java.util.Properties;
++/* JDBC_4_ANT_KEY_END */
+
+ /**
+ * A dummy {@link Connection}, for testing purposes.
+@@ -274,6 +284,59 @@
+ throws SQLException {
+ throw new SQLException("Not implemented.");
+ }
+-
+ /* JDBC_3_ANT_KEY_END */
++/* JDBC_4_ANT_KEY_BEGIN */
++
++ public boolean isWrapperFor(Class<?> iface) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public <T> T unwrap(Class<T> iface) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public Array createArrayOf(String typeName, Object[] elements) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public Blob createBlob() throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public Clob createClob() throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public NClob createNClob() throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public SQLXML createSQLXML() throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public Struct createStruct(String typeName, Object[] attributes) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public boolean isValid(int timeout) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public void setClientInfo(String name, String value) throws SQLClientInfoException {
++ throw new SQLClientInfoException();
++ }
++
++ public void setClientInfo(Properties properties) throws SQLClientInfoException {
++ throw new SQLClientInfoException();
++ }
++
++ public Properties getClientInfo() throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++
++ public String getClientInfo(String name) throws SQLException {
++ throw new SQLException("Not implemented.");
++ }
++/* JDBC_4_ANT_KEY_END */
+ }
+--- commons-dbcp-1.2.2-src/build.xml.orig Wed Jan 27 07:09:09 2010
++++ commons-dbcp-1.2.2-src/build.xml Wed Jan 27 07:11:50 2010
+@@ -70,10 +70,10 @@
+ <property name="javac.optimize" value="false"/>
+ <property name="javac.debug" value="true"/>
+ <property name="javac.deprecation" value="false"/>
+- <property name="javac.source" value="1.4" />
+
+ <available property="jndi.present" classname="javax.naming.Context"/>
+ <available property="jdbc3.present" classname="java.sql.Savepoint"/>
++ <available property="jdbc4.present" classname="java.sql.Wrapper"/>
+ </target>
+
+ <!-- ######################################################### -->
+@@ -110,8 +110,37 @@
+ <property name="src.test.dir" value="${src.dir}/test"/>
+ </target>
+
+- <target name="prepare" depends="init,prepare-nojdbc3,prepare-jdbc3"/>
++ <target name="prepare-nojdbc4" depends="init" unless="jdbc4.present">
++ <echo message="Commenting out the jdbc4 additional methods since JDBC 4 was not detected."/>
++ <property name="src.dir" value="${build.dir}/src"/>
++ <property name="src.java.dir" value="${src.dir}/java"/>
++ <property name="src.test.dir" value="${src.dir}/test"/>
++ <property name="javac.source" value="1.4" />
+
++ <mkdir dir="${src.dir}"/>
++ <copy todir="${src.dir}" filtering="yes">
++ <fileset dir="${basedir}/src" defaultexcludes="no">
++ <include name="**/*.java"/>
++ <include name="**/*.xml"/>
++ <include name="**/*.properties"/>
++ <include name="**/*.jocl"/>
++ <include name="**/package.html"/>
++ </fileset>
++ </copy>
++ <replace dir="${src.dir}" token="/* JDBC_4_ANT_KEY_BEGIN */" value="/*"/>
++ <replace dir="${src.dir}" token="/* JDBC_4_ANT_KEY_END */" value="*/"/>
++ </target>
++
++ <target name="prepare-jdbc4" depends="init" if="jdbc4.present">
++ <echo message="JDBC 4 was detected."/>
++ <property name="src.dir" value="${basedir}/src"/>
++ <property name="src.java.dir" value="${src.dir}/java"/>
++ <property name="src.test.dir" value="${src.dir}/test"/>
++ <property name="javac.source" value="1.5" />
++ </target>
++
++ <target name="prepare" depends="init,prepare-nojdbc3,prepare-jdbc3,prepare-nojdbc4,prepare-jdbc4"/>
++
+ <target name="javadoc" depends="prepare" description="generates javadocs">
+ <mkdir dir="${javadoc.dir}"/>
+ <javadoc packagenames="org.*"
Binary file usr/src/cmd/tomcat/apache-tomcat-6.0.20-src.tar.gz has changed
Binary file usr/src/cmd/tomcat/apache-tomcat-6.0.24-src.tar.gz has changed
--- a/usr/src/cmd/tomcat/build.properties.in Mon Feb 08 12:51:29 2010 +0200
+++ b/usr/src/cmd/tomcat/build.properties.in Mon Feb 08 15:41:40 2010 +0200
@@ -21,21 +21,15 @@
# modules that Tomcat depends on. Copy this file to "build.properties"
# in the top-level source directory, and customize it as needed.
#
-# $Id: build.properties.default 677507 2008-07-17 06:14:31Z mturk $
+# $Id: build.properties.default 900770 2010-01-19 13:24:49Z jfclere $
# -----------------------------------------------------------------------------
-# ----- Vesion Control Flags -----
+# ----- Version Control Flags -----
version.major=6
version.minor=0
-version.build=20
+version.build=24
version.patch=0
-version=6.0-20
-
-# ----- Proxy setup -----
-# Uncomment if using a proxy server
-#proxy.host=webcache
-#proxy.port=8080
-#proxy.use=on
+version=6.0.24
# ----- Default Base Path for Dependent Packages -----
# Please note this path must be absolute, not relative,
@@ -65,38 +59,31 @@
jdt.home=${base.path}/eclipse/plugins
jdt.lib=${jdt.home}
jdt.jar=${jdt.lib}/org.eclipse.jdt.core_3.3.1.v_780_R33x.jar
-jdt.loc=http://www.eclipse.org/downloads/download.php?file=/eclipse/downloads/drops/R-3.3.1-200709211145/eclipse-JDT-3.3.1.zip
+jdt.loc=http://archive.eclipse.org/eclipse/downloads/drops/R-3.3.1-200709211145/eclipse-JDT-3.3.1.zip
# ----- Tomcat native library -----
-tomcat-native.version=1.1.14
+tomcat-native.version=1.1.19
tomcat-native.home=${base.path}/tomcat-native-${tomcat-native.version}
tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz
-tomcat-native.loc=${base-tomcat.loc}/tomcat-connectors/native/tomcat-native-${tomcat-native.version}-src.tar.gz
+tomcat-native.loc=${base-tomcat.loc}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
tomcat-native.dll=${base-tomcat.loc}/tomcat-connectors/native/${tomcat-native.version}/binaries
# ----- Commons DBCP, version 1.1 or later -----
commons-dbcp.version=1.2.2
commons-dbcp.home=${base.path}/commons-dbcp-1.2.2-src
-commons-dbcp-src.loc=${base-commons.loc}/dbcp/source/commons-dbcp-1.2.2-src.tar.gz
+commons-dbcp-src.loc=${base-commons.loc}/dbcp/source/commons-dbcp-1.2.2-src.tar.gz.patched
# ----- Commons Pool, version 1.1 or later -----
-commons-pool.home=${base.path}/commons-pool-1.4-src
-commons-pool-src.loc=${base-commons.loc}/pool/source/commons-pool-1.4-src.tar.gz
-
-# ----- Commons Collections, version 2.0 or later -----
-commons-collections.home=${base.path}/commons-collections-3.2-src
-commons-collections.lib=${commons-collections.home}
-commons-collections.jar=${commons-collections.lib}/commons-collections-3.2.jar
-commons-collections.loc=${base-jakarta.loc}/commons/collections/binaries/commons-collections-3.2.tar.gz
-commons-collections-src.loc=${base-commons.loc}/collections/source/commons-collections-3.2-src.tar.gz
+commons-pool.home=${base.path}/commons-pool-1.5.4-src
+commons-pool-src.loc=${base-commons.loc}/pool/source/commons-pool-1.5.4-src.tar.gz
# ----- NSIS, version 2.0 or later -----
-nsis.home=${base.path}/nsis-2.37
+nsis.home=${base.path}/nsis-2.45
nsis.exe=${nsis.home}/makensis.exe
nsis.installoptions.dll=${nsis.home}/Plugins/InstallOptions.dll
nsis.nsexec.dll=${nsis.home}/Plugins/nsExec.dll
nsis.nsisdl.dll=${nsis.home}/Plugins/NSISdl.dll
-nsis.loc=${base-sf.loc}/nsis/nsis-2.37.zip
+nsis.loc=${base-sf.loc}/nsis/nsis-2.45.zip
# ----- Commons Daemon, version 1.0-Alpha or later -----
commons-daemon.home=${base.path}/commons-daemon-1.0.1
Binary file usr/src/cmd/tomcat/commons-pool-1.4-src.tar.gz has changed
Binary file usr/src/cmd/tomcat/commons-pool-1.5.4-src.tar.gz has changed
--- a/usr/src/cmd/vim/runtime.patch Mon Feb 08 12:51:29 2010 +0200
+++ b/usr/src/cmd/vim/runtime.patch Mon Feb 08 15:41:40 2010 +0200
@@ -3101,7 +3101,7 @@
+ \%f:%l:%c:\ %m,
\%f:%l:\ %m,
\\"%f\"\\,\ line\ %l%*\\D%c%*[^\ ]\ %m,
- \10/01/20*\\a[%*\\d]:\ Entering\ directory\ `%f',
+ \10/02/02*\\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/METADATA Mon Feb 08 12:51:29 2010 +0200
+++ b/usr/src/cmd/wireshark/METADATA Mon Feb 08 15:41:40 2010 +0200
@@ -1,10 +1,10 @@
NAME: wireshark
-VERSION: 1.2.5
+VERSION: 1.2.6
DESCRIPTION: Wireshark Network protocol analyzer
LICENSE: GPLv3
PACKAGE: SUNWwireshark SUNWwiresharkr
PROJECT_URL: http://www.wireshark.org/
-SOURCE_DOWNLOAD: http://media-2.cacetech.com/wireshark/src/wireshark-1.2.5.tar.bz2
+SOURCE_DOWNLOAD: http://media-2.cacetech.com/wireshark/src/wireshark-1.2.6.tar.bz2
SUPPORT: C
BUGTRAQ: solaris/network/wireshark
OSR: 12637
Binary file usr/src/cmd/wireshark/wireshark-1.2.5.tar.bz2 has changed
Binary file usr/src/cmd/wireshark/wireshark-1.2.6.tar.bz2 has changed
--- a/usr/src/lib/Makefile Mon Feb 08 12:51:29 2010 +0200
+++ b/usr/src/lib/Makefile Mon Feb 08 15:41:40 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 1.90 09/11/10 SMI"
+# ident "@(#)Makefile 1.91 10/01/28 SMI"
#
#
@@ -125,7 +125,6 @@
qdox \
slang \
tidy \
- usb_ccid_ifd \
wxwidgets \
xom \
xsdlib \
@@ -175,7 +174,6 @@
gtk+: glib tk
libneon: openssl zlib libxml2
libxslt: libxml2
-usb_ccid_ifd: libusb libusbugen
libusbugen: libusb
curl: openssl zlib idn
libxmlrpc-c: curl
--- a/usr/src/lib/gd2/Makefile.sfw Mon Feb 08 12:51:29 2010 +0200
+++ b/usr/src/lib/gd2/Makefile.sfw Mon Feb 08 15:41:40 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.5 09/02/08 SMI"
+# ident "@(#)Makefile.sfw 1.6 10/01/22 SMI"
#
# This makefile builds both 32 and 64 bit versions of the library.
@@ -37,17 +37,13 @@
# We need to do this because of missing freetype-config for 64-bit,
# and because gd's libtool generator adds the wrong RPATH to LDFLAGS
-EXTRA_LDFLAGS32 = -Y P,/usr/openwin/lib:/usr/sfw/lib:/usr/lib -i
+EXTRA_LDFLAGS32 = -Y P,/usr/sfw/lib:/usr/lib -i
EXTRA_LDFLAGS32 += -L/usr/sfw/lib
-EXTRA_LDFLAGS32 += -L/usr/openwin/lib
EXTRA_LDFLAGS32 += -R/usr/sfw/lib
-EXTRA_LDFLAGS32 += -R/usr/openwin/lib
-EXTRA_LDFLAGS64 = -Y P,/usr/openwin/lib/$(MACH64):/usr/sfw/lib/$(MACH64):/usr/lib/$(MACH64) -i
+EXTRA_LDFLAGS64 = -Y P,/usr/sfw/lib/$(MACH64):/usr/lib/$(MACH64) -i
EXTRA_LDFLAGS64 += -L/usr/sfw/lib/$(MACH64)
-EXTRA_LDFLAGS64 += -L/usr/openwin/lib/$(MACH64)
EXTRA_LDFLAGS64 += -R/usr/sfw/lib/$(MACH64)
-EXTRA_LDFLAGS64 += -R/usr/openwin/lib/$(MACH64)
include ../Makefile.lib
@@ -102,7 +98,7 @@
--with-jpeg=$(PREFIX) \
--with-fontconfig=$(PREFIX) \
--with-freetype=$(PREFIX)/sfw \
- --with-xpm=$(PREFIX)/openwin \
+ --with-xpm=$(PREFIX)/X11 \
--with-x \
--with-pic)
@@ -136,7 +132,7 @@
--with-jpeg=$(PREFIX) \
--with-fontconfig=$(PREFIX) \
--with-freetype=$(PREFIX)/sfw \
- --with-xpm=$(PREFIX)/openwin \
+ --with-xpm=$(PREFIX)/X11 \
--with-x \
--with-pic)
--- a/usr/src/lib/openssl/Makefile.sfw Mon Feb 08 12:51:29 2010 +0200
+++ b/usr/src/lib/openssl/Makefile.sfw Mon Feb 08 15:41:40 2010 +0200
@@ -18,18 +18,19 @@
#
# 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.6 09/11/05 SMI"
+# ident "@(#)Makefile.sfw 1.7 10/02/01 SMI"
+#
include ../Makefile.lib
SUBDIRS = fips non-fips
+# Make fips and non-fips builds parallel.
+.PARALLEL: $(SUBDIRS)
+
all := TARGET = all
all32 := TARGET = all32
all64 := TARGET = all64
--- a/usr/src/lib/openssl/Patches/pkcs11-engine/hw_pk11.c Mon Feb 08 12:51:29 2010 +0200
+++ b/usr/src/lib/openssl/Patches/pkcs11-engine/hw_pk11.c Mon Feb 08 15:41:40 2010 +0200
@@ -1,9 +1,9 @@
/*
- * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2010 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
-#pragma ident "@(#)hw_pk11.c 1.2 09/11/10 SMI"
+#pragma ident "@(#)hw_pk11.c 1.3 10/02/01 SMI"
/* crypto/engine/hw_pk11.c */
/*
@@ -805,14 +805,14 @@
*/
static const char def_PK11_LIBNAME[] = PK11_LIB_LOCATION;
-static CK_BBOOL true = TRUE;
-static CK_BBOOL false = FALSE;
+static CK_BBOOL pk11_true = CK_TRUE;
+static CK_BBOOL pk11_false = CK_FALSE;
/* Needed in hw_pk11_pub.c as well so that's why it is not static. */
CK_SLOT_ID pubkey_SLOTID = 0;
static CK_SLOT_ID rand_SLOTID = 0;
static CK_SLOT_ID SLOTID = 0;
-static CK_BBOOL pk11_library_initialized = FALSE;
-static CK_BBOOL pk11_atfork_initialized = FALSE;
+static CK_BBOOL pk11_library_initialized = CK_FALSE;
+static CK_BBOOL pk11_atfork_initialized = CK_FALSE;
static int pk11_pid = 0;
static DSO *pk11_dso = NULL;
@@ -1296,7 +1296,7 @@
digest_count = 0;
}
- pk11_library_initialized = TRUE;
+ pk11_library_initialized = CK_TRUE;
pk11_pid = getpid();
/*
* if initialization of the locks fails pk11_init_all_locks()
@@ -1321,7 +1321,7 @@
PK11err(PK11_F_LIBRARY_INIT, PK11_R_ATFORK_FAILED);
goto err;
}
- pk11_atfork_initialized = TRUE;
+ pk11_atfork_initialized = CK_TRUE;
}
return (1);
@@ -1381,7 +1381,7 @@
}
pk11_dso = NULL;
pFuncList = NULL;
- pk11_library_initialized = FALSE;
+ pk11_library_initialized = CK_FALSE;
pk11_pid = 0;
/*
* There is no way how to unregister atfork handlers (other than
@@ -1682,7 +1682,7 @@
sp = NULL;
goto err;
}
- if (pk11_token_relogin(sp->session) == 0)
+ if (pk11_token_relogin(sp->session) == 0)
{
/*
* We will keep the session in the cache list and let
@@ -1877,7 +1877,7 @@
* We are probably a child process so force the
* reinitialize of the session
*/
- pk11_library_initialized = FALSE;
+ pk11_library_initialized = CK_FALSE;
if (!pk11_library_init(NULL))
return (0);
rv = pFuncList->C_OpenSession(myslot, CKF_SERIAL_SESSION,
@@ -1936,6 +1936,32 @@
}
#ifndef OPENSSL_NO_RSA
+/*
+ * Destroy all non-NULL RSA parameters. For the RSA keys by reference code,
+ * public components 'n'/'e' are the key components we use to check for the
+ * cache hit even for the private keys. So, no matter whether we are destroying
+ * a public or a private key, we always free what we can.
+ */
+static void
+destroy_all_rsa_params(PK11_SESSION *sp)
+ {
+ if (sp->opdata_rsa_n_num != NULL)
+ {
+ BN_free(sp->opdata_rsa_n_num);
+ sp->opdata_rsa_n_num = NULL;
+ }
+ if (sp->opdata_rsa_e_num != NULL)
+ {
+ BN_free(sp->opdata_rsa_e_num);
+ sp->opdata_rsa_e_num = NULL;
+ }
+ if (sp->opdata_rsa_d_num != NULL)
+ {
+ BN_free(sp->opdata_rsa_d_num);
+ sp->opdata_rsa_d_num = NULL;
+ }
+ }
+
/* Destroy RSA public key from single session. */
int
pk11_destroy_rsa_object_pub(PK11_SESSION *sp, CK_BBOOL uselock)
@@ -1948,16 +1974,7 @@
ret, uselock, OP_RSA);
sp->opdata_rsa_pub_key = CK_INVALID_HANDLE;
sp->opdata_rsa_pub = NULL;
- if (sp->opdata_rsa_n_num != NULL)
- {
- BN_free(sp->opdata_rsa_n_num);
- sp->opdata_rsa_n_num = NULL;
- }
- if (sp->opdata_rsa_e_num != NULL)
- {
- BN_free(sp->opdata_rsa_e_num);
- sp->opdata_rsa_e_num = NULL;
- }
+ destroy_all_rsa_params(sp);
}
return (ret);
@@ -1975,27 +1992,7 @@
ret, uselock, OP_RSA);
sp->opdata_rsa_priv_key = CK_INVALID_HANDLE;
sp->opdata_rsa_priv = NULL;
- if (sp->opdata_rsa_d_num != NULL)
- {
- BN_free(sp->opdata_rsa_d_num);
- sp->opdata_rsa_d_num = NULL;
- }
-
- /*
- * For the RSA key by reference code, public components 'n'/'e'
- * are the key components we use to check for the cache hit. We
- * must free those as well.
- */
- if (sp->opdata_rsa_n_num != NULL)
- {
- BN_free(sp->opdata_rsa_n_num);
- sp->opdata_rsa_n_num = NULL;
- }
- if (sp->opdata_rsa_e_num != NULL)
- {
- BN_free(sp->opdata_rsa_e_num);
- sp->opdata_rsa_e_num = NULL;
- }
+ destroy_all_rsa_params(sp);
}
return (ret);
@@ -2011,7 +2008,7 @@
int ret = 1;
PK11_SESSION *sp = NULL;
PK11_SESSION *local_free_session;
- CK_BBOOL uselock = TRUE;
+ CK_BBOOL uselock = CK_TRUE;
if (session != NULL)
local_free_session = session;
@@ -2019,7 +2016,7 @@
{
(void) pthread_mutex_lock(session_cache[OP_RSA].lock);
local_free_session = session_cache[OP_RSA].head;
- uselock = FALSE;
+ uselock = CK_FALSE;
}
/*
@@ -2107,7 +2104,7 @@
int ret = 1;
PK11_SESSION *sp = NULL;
PK11_SESSION *local_free_session;
- CK_BBOOL uselock = TRUE;
+ CK_BBOOL uselock = CK_TRUE;
if (session != NULL)
local_free_session = session;
@@ -2115,7 +2112,7 @@
{
(void) pthread_mutex_lock(session_cache[OP_DSA].lock);
local_free_session = session_cache[OP_DSA].head;
- uselock = FALSE;
+ uselock = CK_FALSE;
}
/*
@@ -2183,7 +2180,7 @@
int ret = 1;
PK11_SESSION *sp = NULL;
PK11_SESSION *local_free_session;
- CK_BBOOL uselock = TRUE;
+ CK_BBOOL uselock = CK_TRUE;
if (session != NULL)
local_free_session = session;
@@ -2191,7 +2188,7 @@
{
(void) pthread_mutex_lock(session_cache[OP_DH].lock);
local_free_session = session_cache[OP_DH].head;
- uselock = FALSE;
+ uselock = CK_FALSE;
}
while ((sp = local_free_session) != NULL)
@@ -2710,9 +2707,9 @@
{
{CKA_CLASS, (void*) NULL, sizeof (CK_OBJECT_CLASS)},
{CKA_KEY_TYPE, (void*) NULL, sizeof (CK_KEY_TYPE)},
- {CKA_TOKEN, &false, sizeof (false)},
- {CKA_ENCRYPT, &true, sizeof (true)},
- {CKA_DECRYPT, &true, sizeof (true)},
+ {CKA_TOKEN, &pk11_false, sizeof (pk11_false)},
+ {CKA_ENCRYPT, &pk11_true, sizeof (pk11_true)},
+ {CKA_DECRYPT, &pk11_true, sizeof (pk11_true)},
{CKA_VALUE, (void*) NULL, 0},
};
--- a/usr/src/lib/openssl/Patches/pkcs11-engine/hw_pk11_err.h Mon Feb 08 12:51:29 2010 +0200
+++ b/usr/src/lib/openssl/Patches/pkcs11-engine/hw_pk11_err.h Mon Feb 08 15:41:40 2010 +0200
@@ -1,9 +1,9 @@
/*
- * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2010 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
-#pragma ident "@(#)hw_pk11_err.h 1.2 09/11/10 SMI"
+#pragma ident "@(#)hw_pk11_err.h 1.3 10/02/01 SMI"
/*
* This product includes software developed by the OpenSSL Project for
@@ -140,8 +140,8 @@
#define PK11_F_GET_PIN 159
#define PK11_F_FIND_ONE_OBJECT 160
#define PK11_F_CHECK_TOKEN_ATTRS 161
-#define PK11_F_CACHE_PIN 162
-#define PK11_F_MLOCK_PIN_IN_MEMORY 163
+#define PK11_F_CACHE_PIN 162
+#define PK11_F_MLOCK_PIN_IN_MEMORY 163
#define PK11_F_TOKEN_LOGIN 164
#define PK11_F_TOKEN_RELOGIN 165
#define PK11_F_RUN_ASKPASS 166
--- a/usr/src/lib/openssl/Patches/pkcs11-engine/hw_pk11_pub.c Mon Feb 08 12:51:29 2010 +0200
+++ b/usr/src/lib/openssl/Patches/pkcs11-engine/hw_pk11_pub.c Mon Feb 08 15:41:40 2010 +0200
@@ -1,9 +1,9 @@
/*
- * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2010 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
-#pragma ident "@(#)hw_pk11_pub.c 1.2 09/11/10 SMI"
+#pragma ident "@(#)hw_pk11_pub.c 1.3 10/02/01 SMI"
/* crypto/engine/hw_pk11_pub.c */
/*
@@ -146,14 +146,11 @@
static int pk11_RSA_private_decrypt_low(int flen, const unsigned char *from,
unsigned char *to, RSA *rsa);
-static CK_OBJECT_HANDLE pk11_get_public_rsa_key(RSA* rsa, RSA** key_ptr,
- BIGNUM **rsa_n_num, BIGNUM **rsa_e_num, CK_SESSION_HANDLE session);
-static CK_OBJECT_HANDLE pk11_get_private_rsa_key(RSA* rsa, RSA** key_ptr,
- BIGNUM **rsa_d_num, BIGNUM **rsa_n_num, BIGNUM **rsa_e_num,
- CK_SESSION_HANDLE session);
-
-static int check_new_rsa_key_pub(PK11_SESSION *sp, const RSA *rsa);
-static int check_new_rsa_key_priv(PK11_SESSION *sp, const RSA *rsa);
+static CK_OBJECT_HANDLE pk11_get_public_rsa_key(RSA* rsa, PK11_SESSION *sp);
+static CK_OBJECT_HANDLE pk11_get_private_rsa_key(RSA* rsa, PK11_SESSION *sp);
+
+static int pk11_check_new_rsa_key_pub(PK11_SESSION *sp, const RSA *rsa);
+static int pk11_check_new_rsa_key_priv(PK11_SESSION *sp, const RSA *rsa);
#endif
/* DSA stuff */
@@ -202,15 +199,20 @@
#endif
/*
- * increment/create reference for an asymmetric key handle via active list
- * manipulation. If active list operation fails, unlock (if locked), set error
- * variable and jump to the specified label.
+ * Increment existing or create a new reference for an asymmetric key PKCS#11
+ * object handle in the active object list. If the operation fails, unlock (if
+ * locked), set error variable and jump to the specified label. We use this list
+ * so that we can track how many references to the PKCS#11 objects are used from
+ * all our sessions structures. If we are replacing an object reference in the
+ * session structure and the ref count for the reference being replaced gets to
+ * 0 we know that we can safely free the object itself via C_ObjectDestroy().
+ * See also TRY_OBJ_DESTROY.
*/
#define KEY_HANDLE_REFHOLD(key_handle, alg_type, unlock, var, label) \
{ \
if (pk11_active_add(key_handle, alg_type) < 0) \
{ \
- var = TRUE; \
+ var = CK_TRUE; \
if (unlock) \
UNLOCK_OBJSTORE(alg_type); \
goto label; \
@@ -460,8 +462,8 @@
#define DSA_DATA_LEN 20
#define DSA_SIGNATURE_LEN 40
-static CK_BBOOL true = TRUE;
-static CK_BBOOL false = FALSE;
+static CK_BBOOL pk11_true = CK_TRUE;
+static CK_BBOOL pk11_false = CK_FALSE;
#ifndef OPENSSL_NO_RSA
/*
@@ -744,14 +746,12 @@
if ((sp = pk11_get_session(OP_RSA)) == NULL)
return (-1);
- (void) check_new_rsa_key_pub(sp, rsa);
+ (void) pk11_check_new_rsa_key_pub(sp, rsa);
h_pub_key = sp->opdata_rsa_pub_key;
if (h_pub_key == CK_INVALID_HANDLE)
h_pub_key = sp->opdata_rsa_pub_key =
- pk11_get_public_rsa_key(rsa, &sp->opdata_rsa_pub,
- &sp->opdata_rsa_n_num, &sp->opdata_rsa_e_num,
- sp->session);
+ pk11_get_public_rsa_key(rsa, sp);
if (h_pub_key != CK_INVALID_HANDLE)
{
@@ -803,16 +803,12 @@
if ((sp = pk11_get_session(OP_RSA)) == NULL)
return (-1);
- (void) check_new_rsa_key_priv(sp, rsa);
+ (void) pk11_check_new_rsa_key_priv(sp, rsa);
h_priv_key = sp->opdata_rsa_priv_key;
if (h_priv_key == CK_INVALID_HANDLE)
- {
h_priv_key = sp->opdata_rsa_priv_key =
- pk11_get_private_rsa_key(rsa, &sp->opdata_rsa_priv,
- &sp->opdata_rsa_d_num, &sp->opdata_rsa_n_num,
- &sp->opdata_rsa_e_num, sp->session);
- }
+ pk11_get_private_rsa_key(rsa, sp);
if (h_priv_key != CK_INVALID_HANDLE)
{
@@ -865,14 +861,12 @@
if ((sp = pk11_get_session(OP_RSA)) == NULL)
return (-1);
- (void) check_new_rsa_key_priv(sp, rsa);
+ (void) pk11_check_new_rsa_key_priv(sp, rsa);
h_priv_key = sp->opdata_rsa_priv_key;
if (h_priv_key == CK_INVALID_HANDLE)
h_priv_key = sp->opdata_rsa_priv_key =
- pk11_get_private_rsa_key(rsa, &sp->opdata_rsa_priv,
- &sp->opdata_rsa_d_num, &sp->opdata_rsa_n_num,
- &sp->opdata_rsa_e_num, sp->session);
+ pk11_get_private_rsa_key(rsa, sp);
if (h_priv_key != CK_INVALID_HANDLE)
{
@@ -924,14 +918,12 @@
if ((sp = pk11_get_session(OP_RSA)) == NULL)
return (-1);
- (void) check_new_rsa_key_pub(sp, rsa);
+ (void) pk11_check_new_rsa_key_pub(sp, rsa);
h_pub_key = sp->opdata_rsa_pub_key;
if (h_pub_key == CK_INVALID_HANDLE)
h_pub_key = sp->opdata_rsa_pub_key =
- pk11_get_public_rsa_key(rsa, &sp->opdata_rsa_pub,
- &sp->opdata_rsa_n_num, &sp->opdata_rsa_e_num,
- sp->session);
+ pk11_get_public_rsa_key(rsa, sp);
if (h_pub_key != CK_INVALID_HANDLE)
{
@@ -1075,15 +1067,12 @@
if ((sp = pk11_get_session(OP_RSA)) == NULL)
goto err;
- (void) check_new_rsa_key_priv(sp, rsa);
+ (void) pk11_check_new_rsa_key_priv(sp, rsa);
h_priv_key = sp->opdata_rsa_priv_key;
if (h_priv_key == CK_INVALID_HANDLE)
h_priv_key = sp->opdata_rsa_priv_key =
- pk11_get_private_rsa_key((RSA *)rsa,
- &sp->opdata_rsa_priv, &sp->opdata_rsa_d_num,
- &sp->opdata_rsa_n_num, &sp->opdata_rsa_e_num,
- sp->session);
+ pk11_get_private_rsa_key((RSA *)rsa, sp);
if (h_priv_key != CK_INVALID_HANDLE)
{
@@ -1196,14 +1185,12 @@
if ((sp = pk11_get_session(OP_RSA)) == NULL)
goto err;
- (void) check_new_rsa_key_pub(sp, rsa);
+ (void) pk11_check_new_rsa_key_pub(sp, rsa);
h_pub_key = sp->opdata_rsa_pub_key;
if (h_pub_key == CK_INVALID_HANDLE)
h_pub_key = sp->opdata_rsa_pub_key =
- pk11_get_public_rsa_key((RSA *)rsa, &sp->opdata_rsa_pub,
- &sp->opdata_rsa_n_num, &sp->opdata_rsa_e_num,
- sp->session);
+ pk11_get_public_rsa_key((RSA *)rsa, sp);
if (h_pub_key != CK_INVALID_HANDLE)
{
@@ -1257,8 +1244,8 @@
int ret;
pkcs11_uri uri_struct;
CK_RV rv;
- CK_BBOOL is_token = TRUE;
- CK_BBOOL rollback = FALSE;
+ CK_BBOOL is_token = CK_TRUE;
+ CK_BBOOL rollback = CK_FALSE;
CK_BYTE attr_data[8][MAXATTR];
CK_OBJECT_CLASS key_class = CKO_PRIVATE_KEY;
CK_OBJECT_HANDLE ks_key = CK_INVALID_HANDLE; /* key in keystore */
@@ -1333,7 +1320,7 @@
* and object handle cleaned and pk11_destroy_object() reports
* the failure to the OpenSSL error message buffer.
*/
- (void) pk11_destroy_rsa_object_priv(sp, TRUE);
+ (void) pk11_destroy_rsa_object_priv(sp, CK_TRUE);
sp->opdata_rsa_priv_key = ks_key;
/* This object shall not be deleted on a cache miss. */
@@ -1360,7 +1347,7 @@
* We do not use pk11_get_private_rsa_key() here so we must take
* care of handle management ourselves.
*/
- KEY_HANDLE_REFHOLD(ks_key, OP_RSA, FALSE, rollback, err);
+ KEY_HANDLE_REFHOLD(ks_key, OP_RSA, CK_FALSE, rollback, err);
/*
* Those are the sensitive components we do not want to export
@@ -1382,29 +1369,28 @@
if (EVP_PKEY_set1_RSA(pkey, rsa) == 0)
goto err;
}
- else if ((privkey = fopen(file, read_mode_flags)) != NULL)
- {
- pkey = PEM_read_PrivateKey(privkey, NULL, NULL, NULL);
- (void) fclose(privkey);
- if (pkey != NULL)
+ else
+ if ((privkey = fopen(file, read_mode_flags)) != NULL)
{
- rsa = EVP_PKEY_get1_RSA(pkey);
- if (rsa != NULL)
+ pkey = PEM_read_PrivateKey(privkey, NULL, NULL, NULL);
+ (void) fclose(privkey);
+ if (pkey != NULL)
{
- (void) check_new_rsa_key_priv(sp, rsa);
-
- h_priv_key = sp->opdata_rsa_priv_key =
- pk11_get_private_rsa_key(rsa,
- &sp->opdata_rsa_priv, &sp->opdata_rsa_d_num,
- &sp->opdata_rsa_n_num,
- &sp->opdata_rsa_e_num, sp->session);
- if (h_priv_key == CK_INVALID_HANDLE)
+ rsa = EVP_PKEY_get1_RSA(pkey);
+ if (rsa != NULL)
+ {
+ (void) pk11_check_new_rsa_key_priv(sp,
+ rsa);
+
+ h_priv_key = sp->opdata_rsa_priv_key =
+ pk11_get_private_rsa_key(rsa, sp);
+ if (h_priv_key == CK_INVALID_HANDLE)
+ goto err;
+ }
+ else
goto err;
}
- else
- goto err;
}
- }
pk11_return_session(sp, OP_RSA);
return (pkey);
@@ -1434,7 +1420,7 @@
const char *file;
pkcs11_uri uri_struct;
CK_RV rv;
- CK_BBOOL is_token = TRUE;
+ CK_BBOOL is_token = CK_TRUE;
CK_BYTE attr_data[2][MAXATTR];
CK_OBJECT_CLASS key_class = CKO_PUBLIC_KEY;
CK_OBJECT_HANDLE ks_key = CK_INVALID_HANDLE; /* key in keystore */
@@ -1491,7 +1477,7 @@
* We load a new public key so we will create a new RSA
* structure. No cache hit is possible.
*/
- (void) pk11_destroy_rsa_object_pub(sp, TRUE);
+ (void) pk11_destroy_rsa_object_pub(sp, CK_TRUE);
sp->opdata_rsa_pub_key = ks_key;
if ((rsa = sp->opdata_rsa_pub = RSA_new_method(e)) == NULL)
@@ -1536,44 +1522,43 @@
* object is in play - the 'd' component is NULL in that case.
*/
h_pub_key = sp->opdata_rsa_pub_key =
- pk11_get_public_rsa_key(rsa,
- &sp->opdata_rsa_pub, &sp->opdata_rsa_n_num,
- &sp->opdata_rsa_e_num, sp->session);
+ pk11_get_public_rsa_key(rsa, sp);
if (h_pub_key == CK_INVALID_HANDLE)
goto err;
}
- else if ((pubkey = fopen(file, read_mode_flags)) != NULL)
- {
- pkey = PEM_read_PUBKEY(pubkey, NULL, NULL, NULL);
- (void) fclose(pubkey);
- if (pkey != NULL)
+ else
+ if ((pubkey = fopen(file, read_mode_flags)) != NULL)
{
- rsa = EVP_PKEY_get1_RSA(pkey);
- if (rsa != NULL)
+ pkey = PEM_read_PUBKEY(pubkey, NULL, NULL, NULL);
+ (void) fclose(pubkey);
+ if (pkey != NULL)
{
- /*
- * This will always destroy the RSA object since
- * we have a new RSA structure here.
- */
- (void) check_new_rsa_key_pub(sp, rsa);
-
- h_pub_key = sp->opdata_rsa_pub_key =
- pk11_get_public_rsa_key(rsa,
- &sp->opdata_rsa_pub, &sp->opdata_rsa_n_num,
- &sp->opdata_rsa_e_num, sp->session);
- if (h_pub_key == CK_INVALID_HANDLE)
+ rsa = EVP_PKEY_get1_RSA(pkey);
+ if (rsa != NULL)
+ {
+ /*
+ * This will always destroy the RSA
+ * object since we have a new RSA
+ * structure here.
+ */
+ (void) pk11_check_new_rsa_key_pub(sp,
+ rsa);
+
+ h_pub_key = sp->opdata_rsa_pub_key =
+ pk11_get_public_rsa_key(rsa, sp);
+ if (h_pub_key == CK_INVALID_HANDLE)
+ {
+ EVP_PKEY_free(pkey);
+ pkey = NULL;
+ }
+ }
+ else
{
EVP_PKEY_free(pkey);
pkey = NULL;
}
}
- else
- {
- EVP_PKEY_free(pkey);
- pkey = NULL;
- }
}
- }
pk11_return_session(sp, OP_RSA);
return (pkey);
@@ -1589,12 +1574,16 @@
}
/*
- * Create a public key object in a session from a given rsa structure.
- * The *rsa_n_num and *rsa_e_num pointers are non-NULL for RSA public keys.
+ * Get a public key object in a session from a given rsa structure. If the
+ * PKCS#11 session object already exists it is found, reused, and
+ * the counter in the active object list incremented. If not found, a new
+ * session object is created and put also onto the active object list.
+ *
+ * We use the session field from sp, and we cache rsa->(n|e) in
+ * opdata_rsa_(n|e|d)_num, respectively.
*/
-static CK_OBJECT_HANDLE pk11_get_public_rsa_key(RSA* rsa,
- RSA** key_ptr, BIGNUM **rsa_n_num, BIGNUM **rsa_e_num,
- CK_SESSION_HANDLE session)
+static CK_OBJECT_HANDLE
+pk11_get_public_rsa_key(RSA* rsa, PK11_SESSION *sp)
{
CK_RV rv;
CK_OBJECT_HANDLE h_key = CK_INVALID_HANDLE;
@@ -1602,15 +1591,15 @@
CK_OBJECT_CLASS o_key = CKO_PUBLIC_KEY;
CK_KEY_TYPE k_type = CKK_RSA;
CK_ULONG ul_key_attr_count = 7;
- CK_BBOOL rollback = FALSE;
+ CK_BBOOL rollback = CK_FALSE;
CK_ATTRIBUTE a_key_template[] =
{
{CKA_CLASS, (void *) NULL, sizeof (CK_OBJECT_CLASS)},
{CKA_KEY_TYPE, (void *) NULL, sizeof (CK_KEY_TYPE)},
- {CKA_TOKEN, &false, sizeof (true)},
- {CKA_ENCRYPT, &true, sizeof (true)},
- {CKA_VERIFY_RECOVER, &true, sizeof (true)},
+ {CKA_TOKEN, &pk11_false, sizeof (pk11_false)},
+ {CKA_ENCRYPT, &pk11_true, sizeof (pk11_true)},
+ {CKA_VERIFY_RECOVER, &pk11_true, sizeof (pk11_true)},
{CKA_MODULUS, (void *)NULL, 0},
{CKA_PUBLIC_EXPONENT, (void *)NULL, 0}
};
@@ -1645,7 +1634,7 @@
/* see find_lock array definition for more info on object locking */
LOCK_OBJSTORE(OP_RSA);
- rv = pFuncList->C_FindObjectsInit(session, a_key_template,
+ rv = pFuncList->C_FindObjectsInit(sp->session, a_key_template,
ul_key_attr_count);
if (rv != CKR_OK)
@@ -1655,7 +1644,7 @@
goto err;
}
- rv = pFuncList->C_FindObjects(session, &h_key, 1, &found);
+ rv = pFuncList->C_FindObjects(sp->session, &h_key, 1, &found);
if (rv != CKR_OK)
{
@@ -1664,7 +1653,7 @@
goto err;
}
- rv = pFuncList->C_FindObjectsFinal(session);
+ rv = pFuncList->C_FindObjectsFinal(sp->session);
if (rv != CKR_OK)
{
@@ -1675,7 +1664,7 @@
if (found == 0)
{
- rv = pFuncList->C_CreateObject(session,
+ rv = pFuncList->C_CreateObject(sp->session,
a_key_template, ul_key_attr_count, &h_key);
if (rv != CKR_OK)
{
@@ -1685,27 +1674,25 @@
}
}
- if (rsa_n_num != NULL)
- if ((*rsa_n_num = BN_dup(rsa->n)) == NULL)
- {
- PK11err(PK11_F_GET_PUB_RSA_KEY, PK11_R_MALLOC_FAILURE);
- rollback = TRUE;
- goto err;
- }
- if (rsa_e_num != NULL)
- if ((*rsa_e_num = BN_dup(rsa->e)) == NULL)
- {
- PK11err(PK11_F_GET_PUB_RSA_KEY, PK11_R_MALLOC_FAILURE);
- BN_free(*rsa_n_num);
- *rsa_n_num = NULL;
- rollback = TRUE;
- goto err;
- }
+ if ((sp->opdata_rsa_n_num = BN_dup(rsa->n)) == NULL)
+ {
+ PK11err(PK11_F_GET_PUB_RSA_KEY, PK11_R_MALLOC_FAILURE);
+ rollback = CK_TRUE;
+ goto err;
+ }
+
+ if ((sp->opdata_rsa_e_num = BN_dup(rsa->e)) == NULL)
+ {
+ PK11err(PK11_F_GET_PUB_RSA_KEY, PK11_R_MALLOC_FAILURE);
+ BN_free(sp->opdata_rsa_n_num);
+ sp->opdata_rsa_n_num = NULL;
+ rollback = CK_TRUE;
+ goto err;
+ }
/* LINTED: E_CONSTANT_CONDITION */
- KEY_HANDLE_REFHOLD(h_key, OP_RSA, FALSE, rollback, err);
- if (key_ptr != NULL)
- *key_ptr = rsa;
+ KEY_HANDLE_REFHOLD(h_key, OP_RSA, CK_FALSE, rollback, err);
+ sp->opdata_rsa_pub = rsa;
err:
if (rollback)
@@ -1715,7 +1702,7 @@
* since we are doing rollback.
*/
if (found == 0)
- (void) pFuncList->C_DestroyObject(session, h_key);
+ (void) pFuncList->C_DestroyObject(sp->session, h_key);
h_key = CK_INVALID_HANDLE;
}
@@ -1735,12 +1722,13 @@
}
/*
- * Create a private key object in the session from a given rsa structure.
- * The *rsa_d_num pointer is non-NULL for RSA private keys.
+ * Function similar to pk11_get_public_rsa_key(). In addition to 'n' and 'e'
+ * components, it also caches 'd' if present. Note that if RSA keys by reference
+ * are used, 'd' is never extracted from the token in which case it would be
+ * NULL here.
*/
static CK_OBJECT_HANDLE
-pk11_get_private_rsa_key(RSA* rsa, RSA** key_ptr, BIGNUM **rsa_d_num,
- BIGNUM **rsa_n_num, BIGNUM **rsa_e_num, CK_SESSION_HANDLE session)
+pk11_get_private_rsa_key(RSA* rsa, PK11_SESSION *sp)
{
CK_RV rv;
CK_OBJECT_HANDLE h_key = CK_INVALID_HANDLE;
@@ -1749,17 +1737,19 @@
CK_OBJECT_CLASS o_key = CKO_PRIVATE_KEY;
CK_KEY_TYPE k_type = CKK_RSA;
CK_ULONG ul_key_attr_count = 14;
- CK_BBOOL rollback = FALSE;
-
- /* Both CKA_TOKEN and CKA_SENSITIVE have to be FALSE for session keys */
+ CK_BBOOL rollback = CK_FALSE;
+
+ /*
+ * Both CKA_TOKEN and CKA_SENSITIVE have to be CK_FALSE for session keys
+ */
CK_ATTRIBUTE a_key_template[] =
{
{CKA_CLASS, (void *) NULL, sizeof (CK_OBJECT_CLASS)},
{CKA_KEY_TYPE, (void *) NULL, sizeof (CK_KEY_TYPE)},
- {CKA_TOKEN, &false, sizeof (true)},
- {CKA_SENSITIVE, &false, sizeof (true)},
- {CKA_DECRYPT, &true, sizeof (true)},
- {CKA_SIGN, &true, sizeof (true)},
+ {CKA_TOKEN, &pk11_false, sizeof (pk11_false)},
+ {CKA_SENSITIVE, &pk11_false, sizeof (pk11_false)},
+ {CKA_DECRYPT, &pk11_true, sizeof (pk11_true)},
+ {CKA_SIGN, &pk11_true, sizeof (pk11_true)},
{CKA_MODULUS, (void *)NULL, 0},
{CKA_PUBLIC_EXPONENT, (void *)NULL, 0},
{CKA_PRIVATE_EXPONENT, (void *)NULL, 0},
@@ -1810,10 +1800,10 @@
* We will perform the search in the token, not in the existing
* session keys.
*/
- a_key_template[2].pValue = &true;
+ a_key_template[2].pValue = &pk11_true;
}
- rv = pFuncList->C_FindObjectsInit(session, a_key_template,
+ rv = pFuncList->C_FindObjectsInit(sp->session, a_key_template,
ul_key_attr_count);
if (rv != CKR_OK)
@@ -1823,7 +1813,7 @@
goto err;
}
- rv = pFuncList->C_FindObjects(session, &h_key, 1, &found);
+ rv = pFuncList->C_FindObjects(sp->session, &h_key, 1, &found);
if (rv != CKR_OK)
{
@@ -1832,7 +1822,7 @@
goto err;
}
- rv = pFuncList->C_FindObjectsFinal(session);
+ rv = pFuncList->C_FindObjectsFinal(sp->session);
if (rv != CKR_OK)
{
@@ -1857,7 +1847,7 @@
goto err;
}
- rv = pFuncList->C_CreateObject(session,
+ rv = pFuncList->C_CreateObject(sp->session,
a_key_template, ul_key_attr_count, &h_key);
if (rv != CKR_OK)
{
@@ -1867,41 +1857,48 @@
}
}
- if (rsa_d_num != NULL)
+ /*
+ * When RSA keys by reference code is used, we never extract private
+ * components from the keystore. In that case 'd' was set to NULL and we
+ * expect the application to properly cope with that. It is documented
+ * in openssl(5). In general, if keys by reference are used we expect it
+ * to be used exclusively using the high level API and then there is no
+ * problem. If the application expects the private components to be read
+ * from the keystore then that is not a supported way of usage.
+ */
+ if (rsa->d != NULL && (sp->opdata_rsa_d_num = BN_dup(rsa->d)) == NULL)
{
- /*
- * When RSA keys by reference code is used, we never extract
- * private components from the keystore. In that case 'd' was
- * set to NULL and we expect the application to properly cope
- * with that. It is documented in openssl(5). In general, if
- * keys by reference are used we expect it to be used
- * exclusively using the high level API and then there is no
- * problem. If the application expects the private components to
- * be read from the keystore then that is not a supported way of
- * usage.
- */
- if (rsa->d != NULL && (*rsa_d_num = BN_dup(rsa->d)) == NULL)
- {
- PK11err(PK11_F_GET_PRIV_RSA_KEY, PK11_R_MALLOC_FAILURE);
- rollback = TRUE;
- goto err;
- }
- else
- *rsa_d_num = NULL;
+ PK11err(PK11_F_GET_PRIV_RSA_KEY, PK11_R_MALLOC_FAILURE);
+ rollback = CK_TRUE;
+ goto err;
}
+ else
+ sp->opdata_rsa_d_num = NULL;
/*
* For the key by reference code, we need public components as well
* since 'd' component is always NULL. For that reason, we always cache
* 'n'/'e' components as well.
*/
- *rsa_n_num = BN_dup(rsa->n);
- *rsa_e_num = BN_dup(rsa->e);
+ if ((sp->opdata_rsa_n_num = BN_dup(rsa->n)) == NULL)
+ {
+ PK11err(PK11_F_GET_PUB_RSA_KEY, PK11_R_MALLOC_FAILURE);
+ sp->opdata_rsa_n_num = NULL;
+ rollback = CK_TRUE;
+ goto err;
+ }
+ if ((sp->opdata_rsa_e_num = BN_dup(rsa->e)) == NULL)
+ {
+ PK11err(PK11_F_GET_PUB_RSA_KEY, PK11_R_MALLOC_FAILURE);
+ BN_free(sp->opdata_rsa_n_num);
+ sp->opdata_rsa_n_num = NULL;
+ rollback = CK_TRUE;
+ goto err;
+ }
/* LINTED: E_CONSTANT_CONDITION */
- KEY_HANDLE_REFHOLD(h_key, OP_RSA, FALSE, rollback, err);
- if (key_ptr != NULL)
- *key_ptr = rsa;
+ KEY_HANDLE_REFHOLD(h_key, OP_RSA, CK_FALSE, rollback, err);
+ sp->opdata_rsa_priv = rsa;
err:
if (rollback)
@@ -1911,7 +1908,7 @@
* since we are doing rollback.
*/
if (found == 0)
- (void) pFuncList->C_DestroyObject(session, h_key);
+ (void) pFuncList->C_DestroyObject(sp->session, h_key);
h_key = CK_INVALID_HANDLE;
}
@@ -1937,10 +1934,12 @@
}
/*
- * Check for cache miss and clean the object pointer and handle
- * in such case. Return 1 for cache hit, 0 for cache miss.
+ * Check for cache miss. Objects are cleaned only if we have a full cache miss,
+ * meaning that it's a different RSA key pair. Return 1 for cache hit, 0 for
+ * cache miss.
*/
-static int check_new_rsa_key_pub(PK11_SESSION *sp, const RSA *rsa)
+static int
+pk11_check_new_rsa_key_pub(PK11_SESSION *sp, const RSA *rsa)
{
/*
* Provide protection against RSA structure reuse by making the
@@ -1954,28 +1953,38 @@
* key. That would not work, you cannot have one PKCS#11 object for
* both data signing and verifying.
*/
- if (sp->opdata_rsa_pub != rsa ||
- BN_cmp(sp->opdata_rsa_n_num, rsa->n) != 0 ||
- BN_cmp(sp->opdata_rsa_e_num, rsa->e) != 0 ||
- sp->opdata_rsa_priv_key != CK_INVALID_HANDLE)
+ if (sp->opdata_rsa_pub == rsa &&
+ BN_cmp(sp->opdata_rsa_n_num, rsa->n) == 0 &&
+ BN_cmp(sp->opdata_rsa_e_num, rsa->e) == 0)
{
- /*
- * We do not check the return value because even in case of
- * failure the sp structure will have both key pointer
- * and object handle cleaned and pk11_destroy_object()
- * reports the failure to the OpenSSL error message buffer.
- */
- (void) pk11_destroy_rsa_object_pub(sp, TRUE);
- return (0);
+ if (sp->opdata_rsa_pub_key != CK_INVALID_HANDLE)
+ return (1);
+ else
+ /*
+ * No public key object yet but we have the right RSA
+ * structure with potentially existing private key
+ * object. We can just create a public object and move
+ * on with this session structure.
+ */
+ return (0);
}
- return (1);
+
+ /*
+ * A different RSA key pair was using this session structure previously
+ * or it's an empty structure. Destroy what we can.
+ */
+ (void) pk11_destroy_rsa_object_pub(sp, CK_TRUE);
+ (void) pk11_destroy_rsa_object_priv(sp, CK_TRUE);
+ return (0);
}
/*
- * Check for cache miss and clean the object pointer and handle
- * in such case. Return 1 for cache hit, 0 for cache miss.
+ * Check for cache miss. Objects are cleaned only if we have a full cache miss,
+ * meaning that it's a different RSA key pair. Return 1 for cache hit, 0 for
+ * cache miss.
*/
-static int check_new_rsa_key_priv(PK11_SESSION *sp, const RSA *rsa)
+static int
+pk11_check_new_rsa_key_priv(PK11_SESSION *sp, const RSA *rsa)
{
/*
* Provide protection against RSA structure reuse by making the
@@ -1983,24 +1992,32 @@
* key with value cached in PK11_SESSION structure should
* be sufficient. Note that we want to compare the public component
* since with the keys by reference mechanism, private components are
- * not in the RSA structure. Also, see check_new_rsa_key_pub() about why
- * we compare the handle as well.
+ * not in the RSA structure. Also, see pk11_check_new_rsa_key_pub()
+ * about why we compare the handle as well.
*/
- if (sp->opdata_rsa_priv != rsa ||
- BN_cmp(sp->opdata_rsa_n_num, rsa->n) != 0 ||
- BN_cmp(sp->opdata_rsa_e_num, rsa->e) != 0 ||
- sp->opdata_rsa_pub_key != CK_INVALID_HANDLE)
+ if (sp->opdata_rsa_priv == rsa &&
+ BN_cmp(sp->opdata_rsa_n_num, rsa->n) == 0 &&
+ BN_cmp(sp->opdata_rsa_e_num, rsa->e) == 0)
{
- /*
- * We do not check the return value because even in case of
- * failure the sp structure will have both key pointer
- * and object handle cleaned and pk11_destroy_object()
- * reports the failure to the OpenSSL error message buffer.
- */
- (void) pk11_destroy_rsa_object_priv(sp, TRUE);
- return (0);
+ if (sp->opdata_rsa_priv_key != CK_INVALID_HANDLE)
+ return (1);
+ else
+ /*
+ * No private key object yet but we have the right RSA
+ * structure with potentially existing public key
+ * object. We can just create a private object and move
+ * on with this session structure.
+ */
+ return (0);
}
- return (1);
+
+ /*
+ * A different RSA key pair was using this session structure previously
+ * or it's an empty structure. Destroy what we can.
+ */
+ (void) pk11_destroy_rsa_object_priv(sp, CK_TRUE);
+ (void) pk11_destroy_rsa_object_pub(sp, CK_TRUE);
+ return (0);
}
#endif
@@ -2234,15 +2251,15 @@
CK_ULONG found;
CK_KEY_TYPE k_type = CKK_DSA;
CK_ULONG ul_key_attr_count = 8;
- CK_BBOOL rollback = FALSE;
+ CK_BBOOL rollback = CK_FALSE;
int i;
CK_ATTRIBUTE a_key_template[] =
{
{CKA_CLASS, (void *) NULL, sizeof (CK_OBJECT_CLASS)},
{CKA_KEY_TYPE, (void *) NULL, sizeof (CK_KEY_TYPE)},
- {CKA_TOKEN, &false, sizeof (true)},
- {CKA_VERIFY, &true, sizeof (true)},
+ {CKA_TOKEN, &pk11_false, sizeof (pk11_false)},
+ {CKA_VERIFY, &pk11_true, sizeof (pk11_true)},
{CKA_PRIME, (void *)NULL, 0}, /* p */
{CKA_SUBPRIME, (void *)NULL, 0}, /* q */
{CKA_BASE, (void *)NULL, 0}, /* g */
@@ -2311,12 +2328,12 @@
if ((*dsa_pub_num = BN_dup(dsa->pub_key)) == NULL)
{
PK11err(PK11_F_GET_PUB_DSA_KEY, PK11_R_MALLOC_FAILURE);
- rollback = TRUE;
+ rollback = CK_TRUE;
goto err;
}
/* LINTED: E_CONSTANT_CONDITION */
- KEY_HANDLE_REFHOLD(h_key, OP_DSA, FALSE, rollback, err);
+ KEY_HANDLE_REFHOLD(h_key, OP_DSA, CK_FALSE, rollback, err);
if (key_ptr != NULL)
*key_ptr = dsa;
@@ -2361,16 +2378,18 @@
CK_ULONG found;
CK_KEY_TYPE k_type = CKK_DSA;
CK_ULONG ul_key_attr_count = 9;
- CK_BBOOL rollback = FALSE;
-
- /* Both CKA_TOKEN and CKA_SENSITIVE have to be FALSE for session keys */
+ CK_BBOOL rollback = CK_FALSE;
+
+ /*
+ * Both CKA_TOKEN and CKA_SENSITIVE have to be CK_FALSE for session keys
+ */
CK_ATTRIBUTE a_key_template[] =
{
{CKA_CLASS, (void *) NULL, sizeof (CK_OBJECT_CLASS)},
{CKA_KEY_TYPE, (void *) NULL, sizeof (CK_KEY_TYPE)},
- {CKA_TOKEN, &false, sizeof (true)},
- {CKA_SENSITIVE, &false, sizeof (true)},
- {CKA_SIGN, &true, sizeof (true)},
+ {CKA_TOKEN, &pk11_false, sizeof (pk11_false)},
+ {CKA_SENSITIVE, &pk11_false, sizeof (pk11_false)},
+ {CKA_SIGN, &pk11_true, sizeof (pk11_true)},
{CKA_PRIME, (void *)NULL, 0}, /* p */
{CKA_SUBPRIME, (void *)NULL, 0}, /* q */
{CKA_BASE, (void *)NULL, 0}, /* g */
@@ -2440,12 +2459,12 @@
if ((*dsa_priv_num = BN_dup(dsa->priv_key)) == NULL)
{
PK11err(PK11_F_GET_PRIV_DSA_KEY, PK11_R_MALLOC_FAILURE);
- rollback = TRUE;
+ rollback = CK_TRUE;
goto err;
}
/* LINTED: E_CONSTANT_CONDITION */
- KEY_HANDLE_REFHOLD(h_key, OP_DSA, FALSE, rollback, err);
+ KEY_HANDLE_REFHOLD(h_key, OP_DSA, CK_FALSE, rollback, err);
if (key_ptr != NULL)
*key_ptr = dsa;
@@ -2503,7 +2522,7 @@
* and object handle cleaned and pk11_destroy_object()
* reports the failure to the OpenSSL error message buffer.
*/
- (void) pk11_destroy_dsa_object_pub(sp, TRUE);
+ (void) pk11_destroy_dsa_object_pub(sp, CK_TRUE);
return (0);
}
return (1);
@@ -2530,7 +2549,7 @@
* and object handle cleaned and pk11_destroy_object()
* reports the failure to the OpenSSL error message buffer.
*/
- (void) pk11_destroy_dsa_object_priv(sp, TRUE);
+ (void) pk11_destroy_dsa_object_priv(sp, CK_TRUE);
return (0);
}
return (1);
@@ -2576,7 +2595,7 @@
CK_ULONG ul_pub_key_attr_count = 3;
CK_ATTRIBUTE pub_key_template[] =
{
- {CKA_PRIVATE, &false, sizeof (false)},
+ {CKA_PRIVATE, &pk11_false, sizeof (pk11_false)},
{CKA_PRIME, (void *)NULL, 0},
{CKA_BASE, (void *)NULL, 0}
};
@@ -2584,9 +2603,9 @@
CK_ULONG ul_priv_key_attr_count = 3;
CK_ATTRIBUTE priv_key_template[] =
{
- {CKA_PRIVATE, &false, sizeof (false)},
- {CKA_SENSITIVE, &false, sizeof (false)},
- {CKA_DERIVE, &true, sizeof (true)}
+ {CKA_PRIVATE, &pk11_false, sizeof (pk11_false)},
+ {CKA_SENSITIVE, &pk11_false, sizeof (pk11_false)},
+ {CKA_DERIVE, &pk11_true, sizeof (pk11_true)}
};
CK_ULONG pub_key_attr_result_count = 1;
@@ -2964,7 +2983,7 @@
CK_OBJECT_CLASS class = CKO_PRIVATE_KEY;
CK_KEY_TYPE key_type = CKK_DH;
CK_ULONG found;
- CK_BBOOL rollback = FALSE;
+ CK_BBOOL rollback = CK_FALSE;
int i;
CK_ULONG ul_key_attr_count = 7;
@@ -2972,8 +2991,8 @@
{
{CKA_CLASS, (void*) NULL, sizeof (class)},
{CKA_KEY_TYPE, (void*) NULL, sizeof (key_type)},
- {CKA_DERIVE, &true, sizeof (true)},
- {CKA_PRIVATE, &false, sizeof (false)},
+ {CKA_DERIVE, &pk11_true, sizeof (pk11_true)},
+ {CKA_PRIVATE, &pk11_false, sizeof (pk11_false)},
{CKA_PRIME, (void *) NULL, 0},
{CKA_BASE, (void *) NULL, 0},
{CKA_VALUE, (void *) NULL, 0},
@@ -3059,12 +3078,12 @@
if ((*dh_priv_num = BN_dup(dh->priv_key)) == NULL)
{
PK11err(PK11_F_GET_DH_KEY, PK11_R_MALLOC_FAILURE);
- rollback = TRUE;
+ rollback = CK_TRUE;
goto err;
}
/* LINTED: E_CONSTANT_CONDITION */
- KEY_HANDLE_REFHOLD(h_key, OP_DH, FALSE, rollback, err);
+ KEY_HANDLE_REFHOLD(h_key, OP_DH, CK_FALSE, rollback, err);
if (key_ptr != NULL)
*key_ptr = dh;
@@ -3119,7 +3138,7 @@
* and object handle cleaned and pk11_destroy_object()
* reports the failure to the OpenSSL error message buffer.
*/
- (void) pk11_destroy_dh_object(sp, TRUE);
+ (void) pk11_destroy_dh_object(sp, CK_TRUE);
return (0);
}
return (1);
@@ -3200,11 +3219,12 @@
PK11_R_MORE_THAN_ONE_OBJECT_FOUND);
goto err;
}
- else if (objcnt == 0)
- {
- PK11err(PK11_F_FIND_ONE_OBJECT, PK11_R_NO_OBJECT_FOUND);
- goto err;
- }
+ else
+ if (objcnt == 0)
+ {
+ PK11err(PK11_F_FIND_ONE_OBJECT, PK11_R_NO_OBJECT_FOUND);
+ goto err;
+ }
(void) pFuncList->C_FindObjectsFinal(s);
UNLOCK_OBJSTORE(op);
--- a/usr/src/lib/openssl/Patches/pkcs11-engine/hw_pk11_uri.c Mon Feb 08 12:51:29 2010 +0200
+++ b/usr/src/lib/openssl/Patches/pkcs11-engine/hw_pk11_uri.c Mon Feb 08 15:41:40 2010 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2010 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
/*
@@ -48,7 +48,7 @@
* OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#pragma ident "@(#)hw_pk11_uri.c 1.1 09/11/10 SMI"
+#pragma ident "@(#)hw_pk11_uri.c 1.2 10/02/01 SMI"
#include <stdio.h>
#include <stdlib.h>
@@ -116,17 +116,7 @@
/* Initialize as an error. */
*pin = NULL;
- /*
- * This is the "exec:" case. We will get the PIN from the output of an
- * external command.
- */
- if (strncmp(dialog, EXEC_SPEC, strlen(EXEC_SPEC)) == 0)
- {
- dialog += strlen(EXEC_SPEC);
- if ((*pin = run_askpass(dialog)) == NULL)
- goto err;
- }
- else if (strcmp(dialog, BUILTIN_SPEC) == 0)
+ if (strcmp(dialog, BUILTIN_SPEC) == 0)
{
/* The getpassphrase() function is not MT safe. */
(void) pthread_mutex_lock(uri_lock);
@@ -161,9 +151,25 @@
}
else
{
- /* Invalid specification in the passphrasedialog keyword. */
- PK11err(PK11_F_GET_PIN, PK11_R_BAD_PASSPHRASE_SPEC);
- goto err;
+ /*
+ * This is the "exec:" case. We will get the PIN from the output
+ * of an external command.
+ */
+ if (strncmp(dialog, EXEC_SPEC, strlen(EXEC_SPEC)) == 0)
+ {
+ dialog += strlen(EXEC_SPEC);
+ if ((*pin = run_askpass(dialog)) == NULL)
+ goto err;
+ }
+ else
+ {
+ /*
+ * Invalid specification in the passphrasedialog
+ * keyword.
+ */
+ PK11err(PK11_F_GET_PIN, PK11_R_BAD_PASSPHRASE_SPEC);
+ goto err;
+ }
}
return (1);
@@ -494,11 +500,12 @@
PK11err(PK11_F_CACHE_PIN, PK11_R_MALLOC_FAILURE);
goto err;
}
- else if (pk11_get_pin_caching_policy() == POLICY_MLOCKED_MEMORY)
- {
- if (mlock_pin_in_memory(pin) == 0)
- goto err;
- }
+ else
+ if (pk11_get_pin_caching_policy() == POLICY_MLOCKED_MEMORY)
+ {
+ if (mlock_pin_in_memory(pin) == 0)
+ goto err;
+ }
ok:
(void) pthread_mutex_unlock(uri_lock);
@@ -838,7 +845,7 @@
buf = (char *)OPENSSL_malloc(PK11_MAX_PIN_LEN + 1);
if (buf == NULL)
{
- PK11err(PK11_F_RUN_ASKPASS,
+ PK11err(PK11_F_RUN_ASKPASS,
PK11_R_MALLOC_FAILURE);
return (NULL);
}
@@ -855,7 +862,7 @@
buf[n] = '\0';
(void) waitpid(pid, NULL, 0);
- }
+ }
return (buf);
}
--- a/usr/src/lib/unixodbc/Makefile.sfw Mon Feb 08 12:51:29 2010 +0200
+++ b/usr/src/lib/unixodbc/Makefile.sfw Mon Feb 08 15:41:40 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.1 09/04/17 SMI"
+# ident "@(#)Makefile.sfw 1.2 10/01/22 SMI"
#
VER=unixODBC-2.2.14
@@ -109,8 +109,8 @@
--includedir="$(CFGPREFIX)/include/odbc" \
--localstatedir=/var \
--sysconfdir=/etc/odbc \
- --x-includes="/usr/X11/include -I/usr/openwin/include" \
- --x-libraries="/usr/X11/lib -L/usr/openwin/lib" \
+ --x-includes="/usr/X11/include" \
+ --x-libraries="/usr/X11/lib" \
$(CONFIGURE_COMMON_OPTIONS) ; \
cd .. )
@@ -133,8 +133,8 @@
--sbindir="$(CFGPREFIX)/sbin/$(SUFFIX_64)" \
--localstatedir=/var \
--sysconfdir=/etc/odbc \
- --x-includes="/usr/X11/include -I/usr/openwin/include" \
- --x-libraries="/usr/X11/lib/$(SUFFIX_64) -L/usr/openwin/lib/$(SUFFIX_64)" \
+ --x-includes="/usr/X11/include" \
+ --x-libraries="/usr/X11/lib/$(SUFFIX_64)" \
$(CONFIGURE_COMMON_OPTIONS) ; \
cd .. )
--- a/usr/src/lib/usb_ccid_ifd/METADATA Mon Feb 08 12:51:29 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-NAME: usb_ccid_ifd
-VERSION: 0.9.4
-DESCRIPTION: USB CCID IFD Handler
-LICENSE: GPLv2
-PACKAGE: SUNWusbccid
-PROJECT_URL: http://www.musclecard.com/
-SOURCE_DOWNLOAD: https://alioth.debian.org/frs/download.php/116/mcardapplet-0.9.10.tar.gz/METADATA
-SUPPORT: C
-BUGTRAQ: solaris/library/libusb
-OSR: 6629
-COMMENTS:
- The source appears to have originated from the above archive, but was checked
- in unpacked
- https://alioth.debian.org/frs/download.php/116/mcardapplet-0.9.10.tar.gz
--- a/usr/src/lib/usb_ccid_ifd/Makefile.com Mon Feb 08 12:51:29 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,80 +0,0 @@
-#
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#pragma ident "@(#)Makefile.com 1.7 09/03/24 SMI"
-#
-#
-
-LIBRARY = ifdh_usbccid.a
-VERS = .1
-OBJECTS = ccid.o ccid_usb.o commands.o debug.o \
- ifdhandler.o parse.o tokenparser.o utils.o \
- pps.o protocol_t1.o t1_block.o atr.o
-
-SRCDIR = ../common
-
-include ../../Makefile.lib
-
-LDLIBS = -ldl
-
-MAPFILE = ../common/ifdh_usbccid.mapfile
-
-DYNFLAGS += -M $(MAPFILE)
-
-HDLR_DIR = ../common
-INCLUDES += -I$(HDLR_DIR) -I$(ROOT)/usr/include
-
-LIBS = $(DYNLIB)
-LDLIBS += -lc
-
-# the handler needs libusb support
-# XXX is this really where a -L should go?
-DYNFLAGS += -L$(ROOT)/usr/lib -R/usr/lib
-LDLIBS += -lusb
-
-CFLAGS += $(CCVERBOSE)
-
-# the -DHAVE_CONFIG_H is to fool the handler into thinking that it's
-# being built on a system with full PC/SC and MUSCLE support installed
-CPPFLAGS += -I../inc -I../../common/inc -D_REENTRANT $(INCLUDES) -DHAVE_CONFIG_H
-
-OBJS= $(OBJECTS:%=pics/%)
-CLOBBERFILES += $(DYNLIB)
-CLOBBERFILES += $(OBJS)
-
-.KEEP_STATE:
-
-all:
-
-DYNLIBS: $(MAPFILE)
-
-include ../../Makefile.targ
-
-pics/%.o: $(SRCDIR)/%.c
- @ echo "LDLIBS = $(LDLIBS)"
- $(COMPILE.c) -o $@ $<
- $(POST_PROCESS_O)
-
-clean :
- -$(RM) $(CLOBBERFILES)
--- a/usr/src/lib/usb_ccid_ifd/Makefile.sfw Mon Feb 08 12:51:29 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-#
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#pragma ident "@(#)Makefile.sfw 1.10 09/04/06 SMI"
-#
-#
-
-include ../Makefile.lib
-
-SRCTAR = usb_ccid_ifd.tar
-
-SUBDIRS = $(MACH)
-
-XGETFLAGS += -a
-
-all: src .WAIT $(SUBDIRS)
-
-src: common $(SRCTAR).gz
-
-common:
- gzip -dc $(SRCTAR).gz | tar xopf -
-
-$(SUBDIRS) : FRC
- @cd $@; pwd; $(MAKE)
-
-install_h:
-
-install: all
- $(SH) ./install-ifdh_usbccid
-
-include ../Makefile.targ
-
-clean: FRC
- @cd $(MACH); pwd; $(MAKE) clean
- -rm -rf common
-
-FRC:
--- a/usr/src/lib/usb_ccid_ifd/docs/README Mon Feb 08 12:51:29 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-July 10, 2005
-
-This is the Solaris build of the MUSCLE USB CCID IFD Handler. This
-handler is built to operate with the Solaris Smartcard Framework
-which consists of an OCF server and an IFD Handler SPI translation
-layer.
-
-This handler may or may not work in a native PC/SC installation.
-
-----
--- a/usr/src/lib/usb_ccid_ifd/docs/usb_ccid_ifd.3smartcard Mon Feb 08 12:51:29 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-Smartcard Library Functions usb_ccid_ifd(3SMARTCARD)
-
-
-NAME
- usb_ccid_ifd - USB CCID IFD Handler
-
-SYNOPSYS
- /usr/lib/smartcard/ifdh_usbccid.so.1
-
-DESCRIPTION
- This is the opensource USB CCID IFD Handler built to operate
- with the Solaris Smartcard Framework. It supports a number
- of USB CCID compliant smartcard readers.
-
-ATTRIBUTES
- See attributes(5) for descriptions of the following attri-
- butes:
-
- ____________________________________________________________
- | ATTRIBUTE TYPE | ATTRIBUTE VALUE |
- |_____________________________|_____________________________|
- | Interface Stability | External |
- |_____________________________|_____________________________|
-
-
-SEE ALSO
- smartcard(1M), attributes(5), IFD*(3SMARTCARD)
-
-NOTES
- This build of the IFD Handler may or may not work properly
- with a native PC/SC installation on Solaris.
-
-
-SunOS 5.11 Last change: 10 July 2005 1
-
-
-
--- a/usr/src/lib/usb_ccid_ifd/i386/Makefile Mon Feb 08 12:51:29 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 2005 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# ident "@(#)Makefile 1.4 06/03/18 SMI"
-#
-
-include ../Makefile.com
-
-all: $(LIBS)
-
-install: all
--- a/usr/src/lib/usb_ccid_ifd/install-ifdh_usbccid Mon Feb 08 12:51:29 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,69 +0,0 @@
-#!/bin/sh
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# pragma ident "@(#)install-ifdh_usbccid 1.9 07/04/02 SMI"
-#
-
-#
-# install the USB CCID IFD Handler's objects in the proto area
-# These are: manpages, libraries
-#
-
-VERS=1.1
-
-# BUILD_DIR - the root of the build directory
-BUILD_DIR=`pwd`
-BUILD_LIBDIR=${BUILD_DIR}/${MACH}
-
-# LIBDIR - where we put the IFD handler, note that the handler
-# is delivered to /usr/lib/smartcard, not somewhare in
-# the /usr/sfw tree!
-LIBDIR=${ROOT}/usr/lib/smartcard
-
-# SHAREDIR - where we put the IFD handler's man page, note that
-# the manpage is delivered to the 3smartcard directory,
-# not somewhere in the /usr/sfw tree!
-SHAREDIR=${ROOT}/usr/share
-MANDIR=${SHAREDIR}/man/man3smartcard
-MANSRCDIR=${BUILD_DIR}/docs
-MANPAGE=usb_ccid_ifd.3smartcard
-
-# LIBNAME - IFD handler .so file
-LIBNAME=ifdh_usbccid.so
-LIBVERS=1
-
-. ${SRC}/tools/install.subr
-
-#install man page
-
-_install N ${MANSRCDIR}/${MANPAGE} ${MANDIR}/${MANPAGE} 444
-
-#install libs
-_install D ${BUILD_LIBDIR}/${LIBNAME}.${LIBVERS} \
- ${LIBDIR}/${LIBNAME}.${LIBVERS} \
- 755
-_install L ${LIBNAME}.${LIBVERS} ${LIBDIR}/${LIBNAME}
-
-exit 0
--- a/usr/src/lib/usb_ccid_ifd/sparc/Makefile Mon Feb 08 12:51:29 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 2005 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# ident "@(#)Makefile 1.4 06/03/18 SMI"
-#
-
-include ../Makefile.com
-
-all: $(LIBS)
-
-install: all
Binary file usr/src/lib/usb_ccid_ifd/usb_ccid_ifd.tar.gz has changed
--- a/usr/src/pkgdefs/Makefile Mon Feb 08 12:51:29 2010 +0200
+++ b/usr/src/pkgdefs/Makefile Mon Feb 08 15:41:40 2010 +0200
@@ -23,7 +23,7 @@
# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "@(#)Makefile 1.276 10/01/04 SMI"
+# ident "@(#)Makefile 1.277 10/01/28 SMI"
#
#
@@ -498,7 +498,6 @@
SUNWwisemanu \
SUNWwxwidgets \
SUNWwxwidgets-devel \
- SUNWusbccid \
SUNWdiffstat
# STUB_ON_SUBDIRS are directories that are placeholder stubs
--- a/usr/src/pkgdefs/SUNWapchd/copyright Mon Feb 08 12:51:29 2010 +0200
+++ b/usr/src/pkgdefs/SUNWapchd/copyright Mon Feb 08 15:41:40 2010 +0200
@@ -533,53 +533,3 @@
OF THE POSSIBILITY OF SUCH DAMAGE.
====================================================================
-
-
-For the mod_jserv component:
-
-Copyright (c) 1997-1999 The Java Apache Project. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
-3. All advertising materials mentioning features or use of this software must
- display the following acknowledgment: "This product includes software
- developed by the Java Apache Project for use in the Apache JServ Servlet
- Engine <http://java.apache.org/>."
-
-4. The names "Apache JServ", "Apache JServ Servlet Engine", "Java Apache
- Group" and "Java Apache Project" must not be used to endorse or promote
- products derived from this software without prior written permission.
-
-5. Products derived from this software may not be called "Apache JServ" nor
- may "Apache" nor "Apache JServ" appear in their names without prior written
- permission of the Java Apache Project.
-
-6. Redistributions of any form whatsoever must retain the following
- acknowledgment: "This product includes software developed by the Java Apache
- Project for use in the Apache JServ Servlet Engine
- <http://java.apache.org/>."
-
-THIS SOFTWARE IS PROVIDED BY THE JAVA APACHE PROJECT "AS IS" AND ANY
-EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE JAVA APACHE PROJECT OR ITS
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-This software consists of voluntary contributions made by many individuals on
-behalf of the Java Apache Project. For more information on the Java Apache
-Project and the Apache JServ Servlet Engine project, please see
-<http://java.apache.org/>.
--- a/usr/src/pkgdefs/SUNWapchd/prototype_com Mon Feb 08 12:51:29 2010 +0200
+++ b/usr/src/pkgdefs/SUNWapchd/prototype_com Mon Feb 08 15:41:40 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.13 08/09/24 SMI"
+#ident "@(#)prototype_com 1.14 10/01/14 SMI"
#
# SUNWapchd
#
@@ -444,150 +444,3 @@
f none usr/apache/man/man8/logresolve.8 444 root bin
f none usr/apache/man/man8/rotatelogs.8 444 root bin
f none usr/apache/man/man8/suexec.8 444 root bin
-d none usr/apache/jserv 755 root bin
-d none usr/apache/jserv/docs 755 root bin
-d none usr/apache/jserv/docs/future 755 root bin
-f none usr/apache/jserv/docs/future/index.html 644 root bin
-f none usr/apache/jserv/docs/future/sandboxing.html 644 root bin
-d none usr/apache/jserv/docs/images 755 root bin
-f none usr/apache/jserv/docs/images/apache_pb.gif 644 root bin
-f none usr/apache/jserv/docs/images/java-apache-project.gif 644 root bin
-f none usr/apache/jserv/docs/images/lbfail001.gif 644 root bin
-f none usr/apache/jserv/docs/images/lbfail002.gif 644 root bin
-f none usr/apache/jserv/docs/images/lbfail003.gif 644 root bin
-f none usr/apache/jserv/docs/images/lbprod001.gif 644 root bin
-f none usr/apache/jserv/docs/images/lbprod002.gif 644 root bin
-f none usr/apache/jserv/docs/images/lbshm001.gif 644 root bin
-d none usr/apache/jserv/docs/install 755 root bin
-f none usr/apache/jserv/docs/install/howto.security.html 644 root bin
-f none usr/apache/jserv/docs/install/howto.servlets.html 644 root bin
-f none usr/apache/jserv/docs/install/howto.status.html 644 root bin
-f none usr/apache/jserv/docs/install/howto.unix_install.html 644 root bin
-f none usr/apache/jserv/docs/install/howto.win32_install.html 644 root bin
-f none usr/apache/jserv/docs/install/index.html 644 root bin
-d none usr/apache/jserv/docs/protocol 755 root bin
-f none usr/apache/jserv/docs/protocol/AJPv1.html 644 root bin
-f none usr/apache/jserv/docs/protocol/AJPv11.html 644 root bin
-f none usr/apache/jserv/docs/protocol/AJPv2.html 644 root bin
-f none usr/apache/jserv/docs/protocol/AJPv21.html 644 root bin
-d none usr/apache/jserv/docs/api 755 root bin
-d none usr/apache/jserv/docs/api/org 755 root bin
-d none usr/apache/jserv/docs/api/org/apache 755 root bin
-d none usr/apache/jserv/docs/api/org/apache/java 755 root bin
-d none usr/apache/jserv/docs/api/org/apache/java/io 755 root bin
-f none usr/apache/jserv/docs/api/org/apache/java/io/LogRecord.html 644 root bin
-f none usr/apache/jserv/docs/api/org/apache/java/io/package-summary.html 644 root bin
-f none usr/apache/jserv/docs/api/org/apache/java/io/LogWriter.Agent.html 644 root bin
-f none usr/apache/jserv/docs/api/org/apache/java/io/LogWriter.html 644 root bin
-f none usr/apache/jserv/docs/api/org/apache/java/io/Logger.html 644 root bin
-f none usr/apache/jserv/docs/api/org/apache/java/io/ReadFullyInputStream.html 644 root bin
-f none usr/apache/jserv/docs/api/org/apache/java/io/SimpleFileFilter.html 644 root bin
-f none usr/apache/jserv/docs/api/org/apache/java/io/package-frame.html 644 root bin
-f none usr/apache/jserv/docs/api/org/apache/java/io/package-tree.html 644 root bin
-d none usr/apache/jserv/docs/api/org/apache/java/lang 755 root bin
-f none usr/apache/jserv/docs/api/org/apache/java/lang/Bytes.html 644 root bin
-f none usr/apache/jserv/docs/api/org/apache/java/lang/Lock.html 644 root bin
-f none usr/apache/jserv/docs/api/org/apache/java/lang/Semaphore.html 644 root bin
-f none usr/apache/jserv/docs/api/org/apache/java/lang/AdaptiveClassLoader.ClassCacheEntry.html 644 root bin
-f none usr/apache/jserv/docs/api/org/apache/java/lang/AdaptiveClassLoader.html 644 root bin
-f none usr/apache/jserv/docs/api/org/apache/java/lang/Stoppable.html 644 root bin
-f none usr/apache/jserv/docs/api/org/apache/java/lang/TimeoutException.html 644 root bin
-f none usr/apache/jserv/docs/api/org/apache/java/lang/package-frame.html 644 root bin
-f none usr/apache/jserv/docs/api/org/apache/java/lang/package-summary.html 644 root bin
-f none usr/apache/jserv/docs/api/org/apache/java/lang/package-tree.html 644 root bin
-d none usr/apache/jserv/docs/api/org/apache/java/net 755 root bin
-f none usr/apache/jserv/docs/api/org/apache/java/net/AuthenticatedServerSocket.html 644 root bin
-f none usr/apache/jserv/docs/api/org/apache/java/net/AuthenticatedSocket.html 644 root bin
-f none usr/apache/jserv/docs/api/org/apache/java/net/AuthenticationException.html 644 root bin
-f none usr/apache/jserv/docs/api/org/apache/java/net/package-frame.html 644 root bin
-f none usr/apache/jserv/docs/api/org/apache/java/net/package-summary.html 644 root bin
-f none usr/apache/jserv/docs/api/org/apache/java/net/package-tree.html 644 root bin
-d none usr/apache/jserv/docs/api/org/apache/java/recycle 755 root bin
-d none usr/apache/jserv/docs/api/org/apache/java/recycle/pool 755 root bin
-f none usr/apache/jserv/docs/api/org/apache/java/recycle/pool/Worker.html 644 root bin
-f none usr/apache/jserv/docs/api/org/apache/java/recycle/pool/WorkerContainer.html 644 root bin
-f none usr/apache/jserv/docs/api/org/apache/java/recycle/pool/WorkerPool.html 644 root bin
-f none usr/apache/jserv/docs/api/org/apache/java/recycle/pool/package-frame.html 644 root bin
-f none usr/apache/jserv/docs/api/org/apache/java/recycle/pool/package-summary.html 644 root bin
-f none usr/apache/jserv/docs/api/org/apache/java/recycle/pool/package-tree.html 644 root bin
-f none usr/apache/jserv/docs/api/org/apache/java/recycle/AdaptiveController.html 644 root bin
-f none usr/apache/jserv/docs/api/org/apache/java/recycle/package-frame.html 644 root bin
-f none usr/apache/jserv/docs/api/org/apache/java/recycle/Container.html 644 root bin
-f none usr/apache/jserv/docs/api/org/apache/java/recycle/ControlledContainer.html 644 root bin
-f none usr/apache/jserv/docs/api/org/apache/java/recycle/Controller.html 644 root bin
-f none usr/apache/jserv/docs/api/org/apache/java/recycle/ControllerFactory.html 644 root bin
-f none usr/apache/jserv/docs/api/org/apache/java/recycle/DefaultController.html 644 root bin
-f none usr/apache/jserv/docs/api/org/apache/java/recycle/GaussianController.html 644 root bin
-f none usr/apache/jserv/docs/api/org/apache/java/recycle/LimitedContainer.html 644 root bin
-f none usr/apache/jserv/docs/api/org/apache/java/recycle/MinMaxController.html 644 root bin
-f none usr/apache/jserv/docs/api/org/apache/java/recycle/Recyclable.html 644 root bin
-f none usr/apache/jserv/docs/api/org/apache/java/recycle/RecycleBin.html 644 root bin
-f none usr/apache/jserv/docs/api/org/apache/java/recycle/RecycleBinIsEmpty.html 644 root bin
-f none usr/apache/jserv/docs/api/org/apache/java/recycle/RecycleBinIsFull.html 644 root bin
-f none usr/apache/jserv/docs/api/org/apache/java/recycle/package-summary.html 644 root bin
-f none usr/apache/jserv/docs/api/org/apache/java/recycle/package-tree.html 644 root bin
-d none usr/apache/jserv/docs/api/org/apache/java/security 755 root bin
-f none usr/apache/jserv/docs/api/org/apache/java/security/MD5.html 644 root bin
-f none usr/apache/jserv/docs/api/org/apache/java/security/MessageDigest.html 644 root bin
-f none usr/apache/jserv/docs/api/org/apache/java/security/package-frame.html 644 root bin
-f none usr/apache/jserv/docs/api/org/apache/java/security/package-summary.html 644 root bin
-f none usr/apache/jserv/docs/api/org/apache/java/security/package-tree.html 644 root bin
-d none usr/apache/jserv/docs/api/org/apache/java/util 755 root bin
-f none usr/apache/jserv/docs/api/org/apache/java/util/Configurations.html 644 root bin
-f none usr/apache/jserv/docs/api/org/apache/java/util/ConfigurationsRepository.html 644 root bin
-f none usr/apache/jserv/docs/api/org/apache/java/util/ExtendedProperties.PropertiesReader.html 644 root bin
-f none usr/apache/jserv/docs/api/org/apache/java/util/ExtendedProperties.PropertiesTokenizer.html 644 root bin
-f none usr/apache/jserv/docs/api/org/apache/java/util/ExtendedProperties.html 644 root bin
-f none usr/apache/jserv/docs/api/org/apache/java/util/SimpleQueue.html 644 root bin
-f none usr/apache/jserv/docs/api/org/apache/java/util/package-frame.html 644 root bin
-f none usr/apache/jserv/docs/api/org/apache/java/util/package-summary.html 644 root bin
-f none usr/apache/jserv/docs/api/org/apache/java/util/package-tree.html 644 root bin
-d none usr/apache/jserv/docs/api/org/apache/jserv 755 root bin
-f none usr/apache/jserv/docs/api/org/apache/jserv/Ajpv12InputStream.html 644 root bin
-f none usr/apache/jserv/docs/api/org/apache/jserv/JServ.html 644 root bin
-f none usr/apache/jserv/docs/api/org/apache/jserv/JServConnection.html 644 root bin
-f none usr/apache/jserv/docs/api/org/apache/jserv/JServConnection.JServInputStream.html 644 root bin
-f none usr/apache/jserv/docs/api/org/apache/jserv/JServConnection.JServOutputStream.html 644 root bin
-f none usr/apache/jserv/docs/api/org/apache/jserv/JServContext.html 644 root bin
-f none usr/apache/jserv/docs/api/org/apache/jserv/JServDefs.html 644 root bin
-f none usr/apache/jserv/docs/api/org/apache/jserv/JServLog.html 644 root bin
-f none usr/apache/jserv/docs/api/org/apache/jserv/JServLogChannels.html 644 root bin
-f none usr/apache/jserv/docs/api/org/apache/jserv/JServSTMStore.html 644 root bin
-f none usr/apache/jserv/docs/api/org/apache/jserv/JServSendError.html 644 root bin
-f none usr/apache/jserv/docs/api/org/apache/jserv/JServServletManager.ACLObjectInputStream.html 644 root bin
-f none usr/apache/jserv/docs/api/org/apache/jserv/JServServletManager.html 644 root bin
-f none usr/apache/jserv/docs/api/org/apache/jserv/JServSession.html 644 root bin
-f none usr/apache/jserv/docs/api/org/apache/jserv/JServUtils.html 644 root bin
-f none usr/apache/jserv/docs/api/org/apache/jserv/package-frame.html 644 root bin
-f none usr/apache/jserv/docs/api/org/apache/jserv/package-summary.html 644 root bin
-f none usr/apache/jserv/docs/api/org/apache/jserv/package-tree.html 644 root bin
-f none usr/apache/jserv/docs/api/allclasses-frame.html 644 root bin
-f none usr/apache/jserv/docs/api/deprecated-list.html 644 root bin
-f none usr/apache/jserv/docs/api/help-doc.html 644 root bin
-f none usr/apache/jserv/docs/api/index-all.html 644 root bin
-f none usr/apache/jserv/docs/api/index.html 644 root bin
-f none usr/apache/jserv/docs/api/overview-frame.html 644 root bin
-f none usr/apache/jserv/docs/api/overview-summary.html 644 root bin
-f none usr/apache/jserv/docs/api/overview-tree.html 644 root bin
-f none usr/apache/jserv/docs/api/package-list 644 root bin
-f none usr/apache/jserv/docs/api/packages.html 644 root bin
-f none usr/apache/jserv/docs/api/serialized-form.html 644 root bin
-f none usr/apache/jserv/docs/api/stylesheet.css 644 root bin
-f none usr/apache/jserv/docs/FAQ.html 644 root bin
-f none usr/apache/jserv/docs/bugs.html 644 root bin
-f none usr/apache/jserv/docs/changes.html 644 root bin
-f none usr/apache/jserv/docs/contributing.html 644 root bin
-f none usr/apache/jserv/docs/contributors.html 644 root bin
-f none usr/apache/jserv/docs/features.html 644 root bin
-f none usr/apache/jserv/docs/glossary.html 644 root bin
-f none usr/apache/jserv/docs/howto.load-balancing.html 644 root bin
-f none usr/apache/jserv/docs/index.html 644 root bin
-f none usr/apache/jserv/docs/license.html 644 root bin
-f none usr/apache/jserv/docs/modules.html 644 root bin
-f none usr/apache/jserv/docs/operation.html 644 root bin
-f none usr/apache/jserv/docs/security.html 644 root bin
-f none usr/apache/jserv/docs/sendbug.html 644 root bin
-f none usr/apache/jserv/docs/support.html 644 root bin
-f none usr/apache/jserv/docs/upgrade.html 644 root bin
-f none usr/apache/jserv/docs/y2k.html 644 root bin
-f none usr/apache/jserv/docs/zones.html 644 root bin
--- a/usr/src/pkgdefs/SUNWapchr/copyright Mon Feb 08 12:51:29 2010 +0200
+++ b/usr/src/pkgdefs/SUNWapchr/copyright Mon Feb 08 15:41:40 2010 +0200
@@ -533,53 +533,3 @@
OF THE POSSIBILITY OF SUCH DAMAGE.
====================================================================
-
-
-For the mod_jserv component:
-
-Copyright (c) 1997-1999 The Java Apache Project. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
-3. All advertising materials mentioning features or use of this software must
- display the following acknowledgment: "This product includes software
- developed by the Java Apache Project for use in the Apache JServ Servlet
- Engine <http://java.apache.org/>."
-
-4. The names "Apache JServ", "Apache JServ Servlet Engine", "Java Apache
- Group" and "Java Apache Project" must not be used to endorse or promote
- products derived from this software without prior written permission.
-
-5. Products derived from this software may not be called "Apache JServ" nor
- may "Apache" nor "Apache JServ" appear in their names without prior written
- permission of the Java Apache Project.
-
-6. Redistributions of any form whatsoever must retain the following
- acknowledgment: "This product includes software developed by the Java Apache
- Project for use in the Apache JServ Servlet Engine
- <http://java.apache.org/>."
-
-THIS SOFTWARE IS PROVIDED BY THE JAVA APACHE PROJECT "AS IS" AND ANY
-EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE JAVA APACHE PROJECT OR ITS
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-This software consists of voluntary contributions made by many individuals on
-behalf of the Java Apache Project. For more information on the Java Apache
-Project and the Apache JServ Servlet Engine project, please see
-<http://java.apache.org/>.
--- a/usr/src/pkgdefs/SUNWapchr/prototype_com Mon Feb 08 12:51:29 2010 +0200
+++ b/usr/src/pkgdefs/SUNWapchr/prototype_com Mon Feb 08 15:41:40 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.11 08/12/12 SMI"
+#ident "@(#)prototype_com 1.12 10/01/14 SMI"
#
# SUNWapchr
#
@@ -42,11 +42,9 @@
d none var/apache/cgi-bin 755 root bin
d none var/apache/htdocs 755 root bin
d none var/apache/logs 755 nobody bin
-d none var/apache/servlets 755 root bin
e preserve var/apache/logs/access_log 644 nobody bin
e preserve var/apache/logs/error_log 644 nobody bin
e preserve var/apache/logs/suexec_log 644 nobody bin
-e preserve var/apache/logs/mod_jserv.log 644 nobody bin
d none var/apache/proxy 755 nobody nobody
f none var/apache/cgi-bin/printenv 555 root bin
f none var/apache/cgi-bin/test-cgi 555 root bin
@@ -81,8 +79,6 @@
f none var/apache/htdocs/index.html.ru.utf8 644 root bin
f none var/apache/htdocs/index.html.se 644 root bin
f none var/apache/htdocs/index.html.zh-tw.big5 644 root bin
-f none var/apache/servlets/Hello.class 644 root bin
-f none var/apache/servlets/IsItWorking.class 644 root bin
d none var/apache/icons 0755 root bin
f none var/apache/icons/README 0644 root bin
f none var/apache/icons/README.html 0644 root bin
@@ -322,9 +318,6 @@
e renamenew etc/apache/magic 644 root bin
e renamenew etc/apache/mime.types 644 root bin
e renamenew etc/apache/srm.conf 644 root bin
-e renamenew etc/apache/jserv.conf 644 root bin
-e renamenew etc/apache/jserv.properties 644 root bin
-e renamenew etc/apache/zone.properties 644 root bin
e renamenew etc/apache/jk.conf 644 root bin
e renamenew etc/apache/workers.properties 644 root bin
d none etc/apache/ssl.crl 755 root bin
--- a/usr/src/pkgdefs/SUNWapchu/copyright Mon Feb 08 12:51:29 2010 +0200
+++ b/usr/src/pkgdefs/SUNWapchu/copyright Mon Feb 08 15:41:40 2010 +0200
@@ -533,53 +533,3 @@
OF THE POSSIBILITY OF SUCH DAMAGE.
====================================================================
-
-
-For the mod_jserv component:
-
-Copyright (c) 1997-1999 The Java Apache Project. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
-3. All advertising materials mentioning features or use of this software must
- display the following acknowledgment: "This product includes software
- developed by the Java Apache Project for use in the Apache JServ Servlet
- Engine <http://java.apache.org/>."
-
-4. The names "Apache JServ", "Apache JServ Servlet Engine", "Java Apache
- Group" and "Java Apache Project" must not be used to endorse or promote
- products derived from this software without prior written permission.
-
-5. Products derived from this software may not be called "Apache JServ" nor
- may "Apache" nor "Apache JServ" appear in their names without prior written
- permission of the Java Apache Project.
-
-6. Redistributions of any form whatsoever must retain the following
- acknowledgment: "This product includes software developed by the Java Apache
- Project for use in the Apache JServ Servlet Engine
- <http://java.apache.org/>."
-
-THIS SOFTWARE IS PROVIDED BY THE JAVA APACHE PROJECT "AS IS" AND ANY
-EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE JAVA APACHE PROJECT OR ITS
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-This software consists of voluntary contributions made by many individuals on
-behalf of the Java Apache Project. For more information on the Java Apache
-Project and the Apache JServ Servlet Engine project, please see
-<http://java.apache.org/>.
--- a/usr/src/pkgdefs/SUNWapchu/prototype_com Mon Feb 08 12:51:29 2010 +0200
+++ b/usr/src/pkgdefs/SUNWapchu/prototype_com Mon Feb 08 15:41:40 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.11 08/12/12 SMI"
+#ident "@(#)prototype_com 1.12 10/01/14 SMI"
#
# SUNWapchu
#
@@ -39,9 +39,7 @@
d none usr/apache/include 755 root bin
d none usr/apache/libexec 755 root bin
d none usr/apache/perl5 755 root bin
-f none usr/apache/libexec/ApacheJServ.jar 555 root bin
f none usr/apache/libexec/httpd.exp 555 root bin
-f none usr/apache/libexec/jsdk.jar 555 root bin
f none usr/apache/libexec/libproxy.so 555 root bin
f none usr/apache/libexec/libperl.so 555 root bin
f none usr/apache/libexec/libssl.so 555 root bin
@@ -67,7 +65,6 @@
f none usr/apache/libexec/mod_include.so 555 root bin
f none usr/apache/libexec/mod_info.so 555 root bin
f none usr/apache/libexec/mod_jk.so 555 root bin
-f none usr/apache/libexec/mod_jserv.so 555 root bin
f none usr/apache/libexec/mod_log_agent.so 555 root bin
f none usr/apache/libexec/mod_log_config.so 555 root bin
f none usr/apache/libexec/mod_log_forensic.so 555 root bin
@@ -92,7 +89,6 @@
f none usr/apache/bin/htdigest 555 root bin
f none usr/apache/bin/htpasswd 555 root bin
f none usr/apache/bin/httpd 555 root bin
-f none usr/apache/bin/jserv_shmedit 555 root bin
f none usr/apache/bin/logresolve 555 root bin
f none usr/apache/bin/rotatelogs 555 root bin
f none usr/apache/bin/suexec.disabled 700 root bin
--- a/usr/src/pkgdefs/SUNWghostscriptu/depend Mon Feb 08 12:51:29 2010 +0200
+++ b/usr/src/pkgdefs/SUNWghostscriptu/depend Mon Feb 08 15:41:40 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 "@(#)depend 1.4 09/09/09 SMI"
+#ident "@(#)depend 1.5 10/01/07 SMI"
#
# This package information file defines software dependencies associated
# with the pkg. You can define three types of pkg dependencies with this file:
@@ -64,6 +64,5 @@
P SUNWgtk2 GTK+ - GIMP toolkit libraries
P SUNWlibatk GNOME accesibility toolkit libraries
P SUNWpango GNOME core text and font handling libraries
-P SUNWmlib mediaLib - Shared Libraries
P SUNWfreetype2 FreeType2 Font library
P SUNWxorg-clientlibs X.Org Foundation X Client Libraries
--- a/usr/src/pkgdefs/SUNWgnu-emacs-gtk/depend Mon Feb 08 12:51:29 2010 +0200
+++ b/usr/src/pkgdefs/SUNWgnu-emacs-gtk/depend Mon Feb 08 15:41:40 2010 +0200
@@ -17,9 +17,9 @@
#
# CDDL HEADER END
#
-# ident "@(#)depend 1.4 09/12/14 SMI"
+# ident "@(#)depend 1.5 10/01/07 SMI"
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
#
@@ -64,7 +64,6 @@
P SUNWlibmsr Math & Microtasking Libraries (Root)
P SUNWlibms Math & Microtasking Libraries (Usr)
P SUNWlibrsvg SVG-format scalable graphics support library
-P SUNWmlib mediaLib - Shared Libraries
P SUNWpango GNOME core text and font handling libraries
P SUNWpng Portable Network Graphics library
P SUNWTiff libtiff - library for reading and writing TIFF
--- a/usr/src/pkgdefs/SUNWgnu-emacs-x/depend Mon Feb 08 12:51:29 2010 +0200
+++ b/usr/src/pkgdefs/SUNWgnu-emacs-x/depend Mon Feb 08 15:41:40 2010 +0200
@@ -17,9 +17,9 @@
#
# CDDL HEADER END
#
-# ident "@(#)depend 1.3 09/12/14 SMI"
+# ident "@(#)depend 1.4 10/01/07 SMI"
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
#
@@ -63,7 +63,6 @@
P SUNWlibmsr Math & Microtasking Libraries (Root)
P SUNWlibms Math & Microtasking Libraries (Usr)
P SUNWlibrsvg SVG-format scalable graphics support library
-P SUNWmlib mediaLib - Shared Libraries
P SUNWpng Portable Network Graphics library
P SUNWTiff libtiff - library for reading and writing TIFF
P SUNWxwice X Window System Inter-Client Exchange (ICE) Components
--- a/usr/src/pkgdefs/SUNWgnupg/copyright Mon Feb 08 12:51:29 2010 +0200
+++ b/usr/src/pkgdefs/SUNWgnupg/copyright Mon Feb 08 15:41:40 2010 +0200
@@ -686,7 +686,7 @@
=====================================================
-libassuan is licensed under LGPL 2.1:
+gpgme and libassuan are licensed under LGPL 2.1:
For the avoidance of doubt, except that if any license choice other
than GPL or LGPL is available it will apply instead, Sun elects to
@@ -1208,7 +1208,7 @@
That's all there is to it!
========================================================================
-GPGME and pinentry are licensed under GPLv2
+pinentry is licensed under GPLv2
For the avoidance of doubt, except that if any license choice other
than GPL or LGPL is available it will apply instead, Sun elects to
use only the General Public License version 2 (GPLv2) at this time
--- a/usr/src/pkgdefs/SUNWgnuplot/depend Mon Feb 08 12:51:29 2010 +0200
+++ b/usr/src/pkgdefs/SUNWgnuplot/depend Mon Feb 08 15:41:40 2010 +0200
@@ -21,7 +21,7 @@
#
# CDDL HEADER END
#
-#ident "@(#)depend 1.1 10/01/04 SMI"
+#ident "@(#)depend 1.2 10/01/15 SMI"
#
# This package information file defines software dependencies associated
# with the pkg. You can define three types of pkg dependencies with this file:
@@ -61,7 +61,6 @@
P SUNWlibC Sun Workshop Compilers Bundled libC
P SUNWlibatk GNOME accesibility toolkit libraries
P SUNWlibms Math & Microtasking Libraries (Usr)
-P SUNWmlibl mediaLib symbolic links for legacy shared libraries
P SUNWpango GNOME core text and font handling libraries
P SUNWpng Portable Network Graphics library
P SUNWwxwidgets wxWidgets - A cross-platform GUI toolkit (2.8.9)
--- a/usr/src/pkgdefs/SUNWgutenprint/depend Mon Feb 08 12:51:29 2010 +0200
+++ b/usr/src/pkgdefs/SUNWgutenprint/depend Mon Feb 08 15:41:40 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 "@(#)depend 1.6 09/10/20 SMI"
+#ident "@(#)depend 1.7 10/01/07 SMI"
#
# This package information file defines software dependencies associated
# with the pkg. You can define three types of pkg dependencies with this file:
@@ -59,7 +59,6 @@
P SUNWxwplt X Window System platform software
P SUNWxorg-clientlibs X.Org Foundation X Client Libraries
P SUNWcairo Vector graphics library
-P SUNWmlib mediaLib - Shared Libraries
P SUNWfreetype2 FreeType2 Font library
P SUNWfontconfig Fontconfig library
P SUNWperl584core Perl 5.8.4 (core)
--- a/usr/src/pkgdefs/SUNWgvim/depend Mon Feb 08 12:51:29 2010 +0200
+++ b/usr/src/pkgdefs/SUNWgvim/depend Mon Feb 08 15:41:40 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 "@(#)depend 1.3 09/05/21 SMI"
+#ident "@(#)depend 1.4 10/01/07 SMI"
#
# This package information file defines software dependencies associated
# with the pkg. You can define three types of pkg dependencies with this file:
@@ -54,10 +54,8 @@
P SUNWfontconfig Fontconfig library
P SUNWlibms Math & Microtasking Libraries (Usr)
P SUNWlibmsr Math & Microtasking Libraries (Root)
-P SUNWmlibl mediaLib - Library Links
P SUNWpng Portable Network Graphics library
P SUNWxorg-clientlibs X.Org Foundation X Client Libraries
-P SUNWmlib mediaLib - Shared Libraries
P SUNWxwice X Window System Inter-Client Exchange (ICE) Components
P SUNWxwplt X Window System platform software
P SUNWzlib The Zip compression library
--- a/usr/src/pkgdefs/SUNWimagick/depend Mon Feb 08 12:51:29 2010 +0200
+++ b/usr/src/pkgdefs/SUNWimagick/depend Mon Feb 08 15:41:40 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 "@(#)depend 1.10 09/09/15 SMI"
+#ident "@(#)depend 1.11 10/01/07 SMI"
#
# This package information file defines software dependencies associated
# with the pkg. You can define three types of pkg dependencies with this file:
@@ -59,7 +59,6 @@
P SUNWfreetype2 FreeType2 Font library
P SUNWlibrsvg SVG-format scalable graphics support library
P SUNWlxml The XML library
-P SUNWmlib mediaLib - Shared Libraries
P SUNWlcms Little Color Management System
P SUNWbzip The bzip compression utility
P SUNWxwice X Window System Inter-Client Exchange (ICE) Components
--- a/usr/src/pkgdefs/SUNWlablgtk/depend Mon Feb 08 12:51:29 2010 +0200
+++ b/usr/src/pkgdefs/SUNWlablgtk/depend Mon Feb 08 15:41:40 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 "@(#)depend 1.4 09/12/14 SMI"
+#ident "@(#)depend 1.5 10/01/07 SMI"
#
# This package information file defines software dependencies associated
# with the pkg. You can define three types of pkg dependencies with this file:
@@ -63,7 +63,6 @@
P SUNWfontconfig Fontconfig library
P SUNWlxmlr The XML library (Root)
P SUNWlxml The XML library
-P SUNWmlib mediaLib shared libraries
P SUNWxorg-clientlibs X.Org Foundation X Client Libraries
P SUNWxwice X Window System Inter-Client Exchange (ICE) Components
P SUNWlibpopt SUNWlibpopt Command line parsing library
--- a/usr/src/pkgdefs/SUNWncft/pkginfo.tmpl Mon Feb 08 12:51:29 2010 +0200
+++ b/usr/src/pkgdefs/SUNWncft/pkginfo.tmpl Mon Feb 08 15:41:40 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 "@(#)pkginfo.tmpl 1.6 09/07/14 SMI"
+#ident "@(#)pkginfo.tmpl 1.7 10/01/22 SMI"
#
# This required package information file describes characteristics of the
# package, such as package abbreviation, full package name, package version,
@@ -37,7 +37,7 @@
SUNW_PKGTYPE="usr"
MAXINST="1000"
CATEGORY="system"
-DESC="NcFTP ncftp - File Transfer Protocol(FTP) 3.2.2"
+DESC="NcFTP ncftp - File Transfer Protocol(FTP) 3.2.3"
VENDOR="Sun Microsystems, Inc."
HOTLINE="Please contact your local service provider"
EMAIL=""
--- a/usr/src/pkgdefs/SUNWnmap/depend Mon Feb 08 12:51:29 2010 +0200
+++ b/usr/src/pkgdefs/SUNWnmap/depend Mon Feb 08 15:41:40 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 "@(#)depend 1.7 09/02/11 SMI"
+#ident "@(#)depend 1.8 10/01/07 SMI"
#
#
# This package information file defines software dependencies associated
@@ -56,7 +56,6 @@
P SUNWlibms Math & Microtasking Libraries (Usr)
P SUNWlibmsr Math & Microtasking Libraries (Root)
P SUNWgnome-base-libs GNOME base GUI libraries
-P SUNWmlib mediaLib - Shared Libraries
P SUNWxwplt X Window System platform software
P SUNWxorg-clientlibs X.Org Foundation X Client Libraries
P SUNWfontconfig Fontconfig library
--- a/usr/src/pkgdefs/SUNWopenldapr/prototype_com Mon Feb 08 12:51:29 2010 +0200
+++ b/usr/src/pkgdefs/SUNWopenldapr/prototype_com Mon Feb 08 15:41:40 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 "@(#)prototype_com 1.1 08/10/24 SMI"
+# ident "@(#)prototype_com 1.3 10/01/29 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
@@ -73,10 +73,12 @@
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 lib 755 root bin
+d none lib/svc 755 root bin
+d none lib/svc/method 755 root bin
+f none lib/svc/method/ldap-olslapd 555 root bin
d none var 755 root sys
d none var/openldap 755 openldap openldap
-d none var/run 755 root sys
-d none var/run/openldap 755 openldap openldap
d none var/svc 755 root sys
d none var/svc/manifest 755 root sys
d none var/svc/manifest/network 755 root sys
--- a/usr/src/pkgdefs/SUNWpgadmin3/depend Mon Feb 08 12:51:29 2010 +0200
+++ b/usr/src/pkgdefs/SUNWpgadmin3/depend Mon Feb 08 15:41:40 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.
#
-#pragma ident "@(#)depend 1.2 08/09/17 SMI"
+#pragma ident "@(#)depend 1.3 10/01/07 SMI"
#
# This package information file defines software dependencies associated
# with the pkg. You can define three types of pkg dependencies with this file:
@@ -40,7 +40,6 @@
# ...
P SUNWcsl Core Solaris, (Shared Libs)
-P SUNWmlib mediaLib - Shared Libraries
P SUNWxwrtl X Window System & Graphics Runtime Library Links in /usr/lib
P SUNWpng Portable Network Graphics library
P SUNWjpg jpeg - The Independent JPEG Groups JPEG software
--- a/usr/src/pkgdefs/SUNWsane-frontend/depend Mon Feb 08 12:51:29 2010 +0200
+++ b/usr/src/pkgdefs/SUNWsane-frontend/depend Mon Feb 08 15:41:40 2010 +0200
@@ -1,5 +1,5 @@
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# CDDL HEADER START
@@ -21,7 +21,7 @@
#
# CDDL HEADER END
#
-#ident "@(#)depend 1.4 09/12/14 SMI"
+#ident "@(#)depend 1.5 10/01/07 SMI"
#
# This package information file defines software dependencies associated
@@ -56,7 +56,6 @@
P SUNWxwplt X Window System platform software
P SUNWlibmsr Math & Microtasking Libraries (Root)
P SUNWlibms Math & Microtasking Libraries (Usr)
-P SUNWmlib mediaLib - Shared Libraries
P SUNWfontconfig Fontconfig library
P SUNWxorg-clientlibs X.Org Foundation X Client Libraries
P SUNWfreetype2 FreeType2 Font library
--- a/usr/src/pkgdefs/SUNWtcatu/prototype_com Mon Feb 08 12:51:29 2010 +0200
+++ b/usr/src/pkgdefs/SUNWtcatu/prototype_com Mon Feb 08 15:41:40 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.13 09/06/10 SMI"
+#ident "@(#)prototype_com 1.14 10/01/27 SMI"
#
# This required package information file contains a list of package contents.
@@ -198,6 +198,7 @@
f none usr/tomcat6/lib/tomcat-coyote.jar 0644 root bin
f none usr/tomcat6/lib/catalina-ha.jar 0644 root bin
f none usr/tomcat6/lib/el-api.jar 0644 root bin
+f none usr/tomcat6/lib/tomcat-dbcp.jar 0644 root bin
f none usr/tomcat6/lib/servlet-api.jar 0644 root bin
f none usr/tomcat6/lib/annotations-api.jar 0644 root bin
f none usr/tomcat6/lib/catalina-ant.jar 0644 root bin
--- a/usr/src/pkgdefs/SUNWunison/depend Mon Feb 08 12:51:29 2010 +0200
+++ b/usr/src/pkgdefs/SUNWunison/depend Mon Feb 08 15:41:40 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 "@(#)depend 1.2 09/05/21 SMI"
+#ident "@(#)depend 1.3 10/01/15 SMI"
#
# This package information file defines software dependencies associated
# with the pkg. You can define three types of pkg dependencies with this file:
@@ -53,7 +53,6 @@
P SUNWfreetype2 FreeType2 Font library
P SUNWlexpt libexpat - XML parser library
P SUNWlibmsr Math & Microtasking Libraries (Root)
-P SUNWmlib mediaLib - Shared Libraries
P SUNWpng Portable Network Graphics library
P SUNWxorg-clientlibs X.Org Foundation X Client Libraries
P SUNWxwplt X Window System platform software
--- a/usr/src/pkgdefs/SUNWusbccid/Makefile Mon Feb 08 12:51:29 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-#
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#pragma ident "@(#)Makefile 1.4 06/03/18 SMI"
-#
-
-
-include ../Makefile.com
-
-# We deliver our own depend file
-# DATAFILES= depend
-
-.KEEP_STATE:
-
-all: $(FILES)
-install: all pkg
-
-include ../Makefile.targ
--- a/usr/src/pkgdefs/SUNWusbccid/copyright Mon Feb 08 12:51:29 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,765 +0,0 @@
-========================================================================
-
-For the avoidance of doubt, except that if any license choice other
-than GPL or LGPL is available it will apply instead, Sun elects to
-use only the General Public License version 2 (GPLv2) at this time
-for any software where a choice of GPL license versions is made
-available with the language indicating that GPLv2 or any later
-version may be used, or where a choice of which version of the GPL
-is applied is otherwise unspecified.
-
-========================================================================
-
-GNU GENERAL PUBLIC LICENSE
-
-Version 2, June 1991
-
-Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
-
-Everyone is permitted to copy and distribute verbatim copies
-of this license document, but changing it is not allowed.
-
-Preamble
-
-The licenses for most software are designed to take away your freedom
-to share and change it. By contrast, the GNU General Public License is
-intended to guarantee your freedom to share and change free software--to
-make sure the software is free for all its users. This General Public
-License applies to most of the Free Software Foundation's software and
-to any other program whose authors commit to using it. (Some other Free
-Software Foundation software is covered by the GNU Lesser General Public
-License instead.) You can apply it to your programs, too.
-
-When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it in
-new free programs; and that you know you can do these things.
-
-To protect your rights, we need to make restrictions that forbid anyone
-to deny you these rights or to ask you to surrender the rights. These
-restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-For example, if you distribute copies of such a program, whether gratis or
-for a fee, you must give the recipients all the rights that you have. You
-must make sure that they, too, receive or can get the source code. And
-you must show them these terms so they know their rights.
-
-We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on,
-we want its recipients to know that what they have is not the original,
-so that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-Finally, any free program is threatened constantly by software
-patents. We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary. To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-The precise terms and conditions for copying, distribution and
-modification follow.
-TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License. The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language. (Hereinafter, translation is included without limitation in
-the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of running
-the Program is not restricted, and the output from the Program is covered
-only if its contents constitute a work based on the Program (independent
-of having been made by running the Program). Whether that is true depends
-on what the Program does.
-
-1. You may copy and distribute verbatim copies of the Program's source
-code as you receive it, in any medium, provided that you conspicuously
-and appropriately publish on each copy an appropriate copyright notice
-and disclaimer of warranty; keep intact all the notices that refer to
-this License and to the absence of any warranty; and give any other
-recipients of the Program a copy of this License along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-2. You may modify your copy or copies of the Program or any portion of
-it, thus forming a work based on the Program, and copy and distribute
-such modifications or work under the terms of Section 1 above, provided
-that you also meet all of these conditions:
-
- a) You must cause the modified files to carry prominent notices
- stating that you changed the files and the date of any change.
- b) You must cause any work that you distribute or publish, that in
- whole or in part contains or is derived from the Program or any part
- thereof, to be licensed as a whole at no charge to all third parties
- under the terms of this License.
- c) If the modified program normally reads commands interactively when
- run, you must cause it, when started running for such interactive
- use in the most ordinary way, to print or display an announcement
- including an appropriate copyright notice and a notice that there
- is no warranty (or else, saying that you provide a warranty) and
- that users may redistribute the program under these conditions, and
- telling the user how to view a copy of this License. (Exception: if
- the Program itself is interactive but does not normally print such
- an announcement, your work based on the Program is not required to
- print an announcement.)
-
-These requirements apply to the modified work as a whole. If identifiable
-sections of that work are not derived from the Program, and can be
-reasonably considered independent and separate works in themselves,
-then this License, and its terms, do not apply to those sections when
-you distribute them as separate works. But when you distribute the same
-sections as part of a whole which is a work based on the Program, the
-distribution of the whole must be on the terms of this License, whose
-permissions for other licensees extend to the entire whole, and thus to
-each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest your
-rights to work written entirely by you; rather, the intent is to exercise
-the right to control the distribution of derivative or collective works
-based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of a
-storage or distribution medium does not bring the other work under the
-scope of this License.
-
-3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
- a) Accompany it with the complete corresponding machine-readable
- source code, which must be distributed under the terms of Sections 1
- and 2 above on a medium customarily used for software interchange; or,
- b) Accompany it with a written offer, valid for at least three years,
- to give any third party, for a charge no more than your cost of
- physically performing source distribution, a complete machine-readable
- copy of the corresponding source code, to be distributed under the
- terms of Sections 1 and 2 above on a medium customarily used for
- software interchange; or,
- c) Accompany it with the information you received as to the offer to
- distribute corresponding source code. (This alternative is allowed
- only for noncommercial distribution and only if you received the
- program in object code or executable form with such an offer, in
- accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for making
-modifications to it. For an executable work, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the executable. However, as a special exception,
-the source code distributed need not include anything that is normally
-distributed (in either source or binary form) with the major components
-(compiler, kernel, and so on) of the operating system on which the
-executable runs, unless that component itself accompanies the executable.
-
-If distribution of executable or object code is made by offering access
-to copy from a designated place, then offering equivalent access to
-copy the source code from the same place counts as distribution of the
-source code, even though third parties are not compelled to copy the
-source along with the object code.
-
-4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License. Any attempt otherwise
-to copy, modify, sublicense or distribute the Program is void, and will
-automatically terminate your rights under this License. However, parties
-who have received copies, or rights, from you under this License will
-not have their licenses terminated so long as such parties remain in
-full compliance.
-
-5. You are not required to accept this License, since you have not signed
-it. However, nothing else grants you permission to modify or distribute
-the Program or its derivative works. These actions are prohibited
-by law if you do not accept this License. Therefore, by modifying or
-distributing the Program (or any work based on the Program), you indicate
-your acceptance of this License to do so, and all its terms and conditions
-for copying, distributing or modifying the Program or works based on it.
-
-6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions. You may not impose any further restrictions
-on the recipients' exercise of the rights granted herein. You are not
-responsible for enforcing compliance by third parties to this License.
-
-7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot distribute
-so as to satisfy simultaneously your obligations under this License
-and any other pertinent obligations, then as a consequence you may not
-distribute the Program at all. For example, if a patent license would
-not permit royalty-free redistribution of the Program by all those who
-receive copies directly or indirectly through you, then the only way you
-could satisfy both it and this License would be to refrain entirely from
-distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any such
-claims; this section has the sole purpose of protecting the integrity of
-the free software distribution system, which is implemented by public
-license practices. Many people have made generous contributions to the
-wide range of software distributed through that system in reliance on
-consistent application of that system; it is up to the author/donor to
-decide if he or she is willing to distribute software through any other
-system and a licensee cannot impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-8. If the distribution and/or use of the Program is restricted in certain
-countries either by patents or by copyrighted interfaces, the original
-copyright holder who places the Program under this License may add an
-explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded. In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail
-to address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation. If the Program does not specify a version
-number of this License, you may choose any version ever published by
-the Free Software Foundation.
-
-10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission. For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this. Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software
-and of promoting the sharing and reuse of software generally.
-
-NO WARRANTY
-
-11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK
-AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL
-DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING
-BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR
-LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM
-TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY
-HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-END OF TERMS AND CONDITIONS
-
-=========================================================================
-
-GNU LESSER GENERAL PUBLIC LICENSE
-
-Version 2.1, February 1999
-
-Copyright (C) 1991, 1999 Free Software Foundation, Inc. 51 Franklin
-Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted
-to copy and distribute verbatim copies of this license document, but
-changing it is not allowed.
-
-[This is the first released version of the Lesser GPL. It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-Preamble
-
-The licenses for most software are designed to take away your freedom
-to share and change it. By contrast, the GNU General Public Licenses are
-intended to guarantee your freedom to share and change free software--to
-make sure the software is free for all its users.
-
-This license, the Lesser General Public License, applies to some specially
-designated software packages--typically libraries--of the Free Software
-Foundation and other authors who decide to use it. You can use it too,
-but we suggest you first think carefully about whether this license or
-the ordinary General Public License is the better strategy to use in
-any particular case, based on the explanations below.
-
-When we speak of free software, we are referring to freedom of use,
-not price. Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get it
-if you want it; that you can change the software and use pieces of it in
-new free programs; and that you are informed that you can do these things.
-
-To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights. These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you. You must make sure that they, too, receive or can get the source
-code. If you link other code with the library, you must provide complete
-object files to the recipients, so that they can relink them with the
-library after making changes to the library and recompiling it. And you
-must show them these terms so they know their rights.
-
-We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-To protect each distributor, we want to make it very clear that there
-is no warranty for the free library. Also, if the library is modified
-by someone else and passed on, the recipients should know that what they
-have is not the original version, so that the original author's reputation
-will not be affected by problems that might be introduced by others.
-
-Finally, software patents pose a constant threat to the existence of
-any free program. We wish to make sure that a company cannot effectively
-restrict the users of a free program by obtaining a restrictive license
-from a patent holder. Therefore, we insist that any patent license
-obtained for a version of the library must be consistent with the full
-freedom of use specified in this license.
-
-Most GNU software, including some libraries, is covered by the ordinary
-GNU General Public License. This license, the GNU Lesser General
-Public License, applies to certain designated libraries, and is quite
-different from the ordinary General Public License. We use this license
-for certain libraries in order to permit linking those libraries into
-non-free programs.
-
-When a program is linked with a library, whether statically or using a
-shared library, the combination of the two is legally speaking a combined
-work, a derivative of the original library. The ordinary General Public
-License therefore permits such linking only if the entire combination
-fits its criteria of freedom. The Lesser General Public License permits
-more lax criteria for linking other code with the library.
-
-We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License. It also provides other free software developers Less
-of an advantage over competing non-free programs. These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries. However, the Lesser license provides advantages in certain
-special circumstances.
-
-For example, on rare occasions, there may be a special need to encourage
-the widest possible use of a certain library, so that it becomes a
-de-facto standard. To achieve this, non-free programs must be allowed
-to use the library. A more frequent case is that a free library does
-the same job as widely used non-free libraries. In this case, there
-is little to gain by limiting the free library to free software only,
-so we use the Lesser General Public License.
-
-In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of free
-software. For example, permission to use the GNU C Library in non-free
-programs enables many more people to use the whole GNU operating system,
-as well as its variant, the GNU/Linux operating system.
-
-Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is linked
-with the Library has the freedom and the wherewithal to run that program
-using a modified version of the Library.
-
-The precise terms and conditions for copying, distribution and
-modification follow. Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library". The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-0. This License Agreement applies to any software library or other program
-which contains a notice placed by the copyright holder or other authorized
-party saying it may be distributed under the terms of this Lesser General
-Public License (also called "this License"). Each licensee is addressed as
-"you".
-
-A "library" means a collection of software functions and/or data prepared
-so as to be conveniently linked with application programs (which use
-some of those functions and data) to form executables.
-
-The "Library", below, refers to any such software library or work which
-has been distributed under these terms. A "work based on the Library"
-means either the Library or any derivative work under copyright law:
-that is to say, a work containing the Library or a portion of it, either
-verbatim or with modifications and/or translated straightforwardly into
-another language. (Hereinafter, translation is included without limitation
-in the term "modification".)
-
-"Source code" for a work means the preferred form of the work for making
-modifications to it. For a library, complete source code means all the
-source code for all modules it contains, plus any associated interface
-definition files, plus the scripts used to control compilation and
-installation of the library.
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of running
-a program using the Library is not restricted, and output from such a
-program is covered only if its contents constitute a work based on the
-Library (independent of the use of the Library in a tool for writing
-it). Whether that is true depends on what the Library does and what the
-program that uses the Library does.
-
-1. You may copy and distribute verbatim copies of the Library's complete
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and distribute a copy of this License along with the Library.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-2. You may modify your copy or copies of the Library or any portion of
-it, thus forming a work based on the Library, and copy and distribute
-such modifications or work under the terms of Section 1 above, provided
-that you also meet all of these conditions:
-
- * a) The modified work must itself be a software library. * b) You
- must cause the files modified to carry prominent notices stating
- that you changed the files and the date of any change. * c) You
- must cause the whole of the work to be licensed at no charge to all
- third parties under the terms of this License. * d) If a facility
- in the modified Library refers to a function or a table of data to
- be supplied by an application program that uses the facility, other
- than as an argument passed when the facility is invoked, then you must
- make a good faith effort to ensure that, in the event an application
- does not supply such function or table, the facility still operates,
- and performs whatever part of its purpose remains meaningful.
-
- (For example, a function in a library to compute square roots
- has a purpose that is entirely well-defined independent of
- the application. Therefore, Subsection 2d requires that any
- application-supplied function or table used by this function must
- be optional: if the application does not supply it, the square
- root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole. If identifiable
-sections of that work are not derived from the Library, and can be
-reasonably considered independent and separate works in themselves,
-then this License, and its terms, do not apply to those sections when
-you distribute them as separate works. But when you distribute the same
-sections as part of a whole which is a work based on the Library, the
-distribution of the whole must be on the terms of this License, whose
-permissions for other licensees extend to the entire whole, and thus to
-each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest your
-rights to work written entirely by you; rather, the intent is to exercise
-the right to control the distribution of derivative or collective works
-based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of a
-storage or distribution medium does not bring the other work under the
-scope of this License.
-
-3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library. To do
-this, you must alter all the notices that refer to this License, so that
-they refer to the ordinary GNU General Public License, version 2, instead
-of to this License. (If a newer version than version 2 of the ordinary
-GNU General Public License has appeared, then you can specify that version
-instead if you wish.) Do not make any other change in these notices.
-
-Once this change is made in a given copy, it is irreversible for that
-copy, so the ordinary GNU General Public License applies to all subsequent
-copies and derivative works made from that copy.
-
-This option is useful when you wish to copy part of the code of the
-Library into a program that is not a library.
-
-4. You may copy and distribute the Library (or a portion or derivative of
-it, under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you accompany it with the complete
-corresponding machine-readable source code, which must be distributed
-under the terms of Sections 1 and 2 above on a medium customarily used
-for software interchange.
-
-If distribution of object code is made by offering access to copy from
-a designated place, then offering equivalent access to copy the source
-code from the same place satisfies the requirement to distribute the
-source code, even though third parties are not compelled to copy the
-source along with the object code.
-
-5. A program that contains no derivative of any portion of the Library,
-but is designed to work with the Library by being compiled or linked with
-it, is called a "work that uses the Library". Such a work, in isolation,
-is not a derivative work of the Library, and therefore falls outside
-the scope of this License.
-
-However, linking a "work that uses the Library" with the Library creates
-an executable that is a derivative of the Library (because it contains
-portions of the Library), rather than a "work that uses the library". The
-executable is therefore covered by this License. Section 6 states terms
-for distribution of such executables.
-
-When a "work that uses the Library" uses material from a header file that
-is part of the Library, the object code for the work may be a derivative
-work of the Library even though the source code is not. Whether this
-is true is especially significant if the work can be linked without the
-Library, or if the work is itself a library. The threshold for this to
-be true is not precisely defined by law.
-
-If such an object file uses only numerical parameters, data structure
-layouts and accessors, and small macros and small inline functions (ten
-lines or less in length), then the use of the object file is unrestricted,
-regardless of whether it is legally a derivative work. (Executables
-containing this object code plus portions of the Library will still fall
-under Section 6.)
-
-Otherwise, if the work is a derivative of the Library, you may distribute
-the object code for the work under the terms of Section 6. Any executables
-containing that work also fall under Section 6, whether or not they are
-linked directly with the Library itself.
-
-6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a work
-containing portions of the Library, and distribute that work under terms
-of your choice, provided that the terms permit modification of the work
-for the customer's own use and reverse engineering for debugging such
-modifications.
-
-You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License. You must supply a copy of this License. If the work during
-execution displays copyright notices, you must include the copyright
-notice for the Library among them, as well as a reference directing the
-user to the copy of this License. Also, you must do one of these things:
-
- * a) Accompany the work with the complete corresponding
- machine-readable source code for the Library including whatever
- changes were used in the work (which must be distributed under
- Sections 1 and 2 above); and, if the work is an executable linked
- with the Library, with the complete machine-readable "work that
- uses the Library", as object code and/or source code, so that the
- user can modify the Library and then relink to produce a modified
- executable containing the modified Library. (It is understood
- that the user who changes the contents of definitions files in the
- Library will not necessarily be able to recompile the application to
- use the modified definitions.) * b) Use a suitable shared library
- mechanism for linking with the Library. A suitable mechanism is one
- that (1) uses at run time a copy of the library already present on
- the user's computer system, rather than copying library functions
- into the executable, and (2) will operate properly with a modified
- version of the library, if the user installs one, as long as the
- modified version is interface-compatible with the version that the
- work was made with. * c) Accompany the work with a written offer,
- valid for at least three years, to give the same user the materials
- specified in Subsection 6a, above, for a charge no more than the cost
- of performing this distribution. * d) If distribution of the work
- is made by offering access to copy from a designated place, offer
- equivalent access to copy the above specified materials from the
- same place. * e) Verify that the user has already received a copy
- of these materials or that you have already sent this user a copy.
-
-For an executable, the required form of the "work that uses the Library"
-must include any data and utility programs needed for reproducing the
-executable from it. However, as a special exception, the materials to
-be distributed need not include anything that is normally distributed
-(in either source or binary form) with the major components (compiler,
-kernel, and so on) of the operating system on which the executable runs,
-unless that component itself accompanies the executable.
-
-It may happen that this requirement contradicts the license restrictions
-of other proprietary libraries that do not normally accompany the
-operating system. Such a contradiction means you cannot use both them
-and the Library together in an executable that you distribute.
-
-7. You may place library facilities that are a work based on the Library
-side-by-side in a single library together with other library facilities
-not covered by this License, and distribute such a combined library,
-provided that the separate distribution of the work based on the Library
-and of the other library facilities is otherwise permitted, and provided
-that you do these two things:
-
- * a) Accompany the combined library with a copy of the same work based
- on the Library, uncombined with any other library facilities. This
- must be distributed under the terms of the Sections above. * b)
- Give prominent notice with the combined library of the fact that
- part of it is a work based on the Library, and explaining where to
- find the accompanying uncombined form of the same work.
-
-8. You may not copy, modify, sublicense, link with, or distribute the
-Library except as expressly provided under this License. Any attempt
-otherwise to copy, modify, sublicense, link with, or distribute the
-Library is void, and will automatically terminate your rights under
-this License. However, parties who have received copies, or rights,
-from you under this License will not have their licenses terminated so
-long as such parties remain in full compliance.
-
-9. You are not required to accept this License, since you have not signed
-it. However, nothing else grants you permission to modify or distribute
-the Library or its derivative works. These actions are prohibited
-by law if you do not accept this License. Therefore, by modifying or
-distributing the Library (or any work based on the Library), you indicate
-your acceptance of this License to do so, and all its terms and conditions
-for copying, distributing or modifying the Library or works based on it.
-
-10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the original
-licensor to copy, distribute, link with or modify the Library subject to
-these terms and conditions. You may not impose any further restrictions
-on the recipients' exercise of the rights granted herein. You are not
-responsible for enforcing compliance by third parties with this License.
-
-11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot distribute
-so as to satisfy simultaneously your obligations under this License
-and any other pertinent obligations, then as a consequence you may not
-distribute the Library at all. For example, if a patent license would
-not permit royalty-free redistribution of the Library by all those who
-receive copies directly or indirectly through you, then the only way you
-could satisfy both it and this License would be to refrain entirely from
-distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any such
-claims; this section has the sole purpose of protecting the integrity
-of the free software distribution system which is implemented by public
-license practices. Many people have made generous contributions to the
-wide range of software distributed through that system in reliance on
-consistent application of that system; it is up to the author/donor to
-decide if he or she is willing to distribute software through any other
-system and a licensee cannot impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-12. If the distribution and/or use of the Library is restricted in certain
-countries either by patents or by copyrighted interfaces, the original
-copyright holder who places the Library under this License may add an
-explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded. In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-13. The Free Software Foundation may publish revised and/or new versions
-of the Lesser General Public License from time to time. Such new versions
-will be similar in spirit to the present version, but may differ in
-detail to address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation. If the Library does not specify a license
-version number, you may choose any version ever published by the Free
-Software Foundation.
-
-14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these, write
-to the author to ask for permission. For software which is copyrighted
-by the Free Software Foundation, write to the Free Software Foundation;
-we sometimes make exceptions for this. Our decision will be guided by the
-two goals of preserving the free status of all derivatives of our free
-software and of promoting the sharing and reuse of software generally.
-
-NO WARRANTY
-
-15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK
-AS TO THE QUALITY AND PERFORMANCE OF THE LIBRARY IS WITH YOU. SHOULD THE
-LIBRARY PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL
-DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE LIBRARY (INCLUDING
-BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR
-LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE LIBRARY
-TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF SUCH HOLDER OR OTHER PARTY
-HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-END OF TERMS AND CONDITIONS How to Apply These Terms to Your New Libraries
-
-If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change. You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of
-the ordinary General Public License).
-
-To apply these terms, attach the following notices to the library. It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
-one line to give the library's name and an idea of what it does.
-Copyright (C) year name of author
-
-This library is free software; you can redistribute it and/or modify it
-under the terms of the GNU Lesser General Public License as published
-by the Free Software Foundation; either version 2.1 of the License, or
-(at your option) any later version.
-
-This library is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-License for more details.
-
-You should have received a copy of the GNU Lesser General Public License
-along with this library; if not, write to the Free Software Foundation,
-Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or
-your school, if any, to sign a "copyright disclaimer" for the library,
-if necessary. Here is a sample; alter the names:
-
-Yoyodyne, Inc., hereby disclaims all copyright interest in the library
-`Frob' (a library for tweaking knobs) written by James Random Hacker.
-
-signature of Ty Coon, 1 April 1990 Ty Coon, President of Vice
-
-That's all there is to it!
-
-=========================================================================
-
-Copyright (C) 2003-2005 Ludovic Rousseau
-Copyright (C) 1999 David Corcoran, Ludovic Rousseau
-Copyright (c) 2003, Olaf Kirch <[email protected]>
-Copyright (c) 2003, Andreas Jellinghaus <[email protected]>
-Copyright Matthias Bruestle 1999-2002
-Copyright (C) 2000-2001 Carlos Prados <[email protected]>
-
-=========================================================================
-
--- a/usr/src/pkgdefs/SUNWusbccid/depend Mon Feb 08 12:51:29 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#ident "@(#)depend 1.5 06/10/11 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 SUNWocf Open Card Framework - core libraries and utilities
-P SUNWlibusb Sun wrapper library for libusb
--- a/usr/src/pkgdefs/SUNWusbccid/pkginfo.tmpl Mon Feb 08 12:51:29 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 2006 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# pragma ident "@(#)pkginfo.tmpl 1.4 06/03/30 SMI"
-#
-#
-# SUNWusbccid
-
-PKG="SUNWusbccid"
-NAME="USB CCID IFD Handler"
-ARCH="ISA"
-VERSION="SFWVERS,REV=0.0.0"
-SUNW_PRODNAME="SunOS"
-SUNW_PRODVERS="RELEASE/VERSION"
-SUNW_PKGTYPE="usr"
-MAXINST="1000"
-CATEGORY="system"
-DESC="USB CCID IFD Handler ccid-0.9.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/SUNWusbccid/prototype_com Mon Feb 08 12:51:29 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-#
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# pragma ident "@(#)prototype_com 1.4 09/09/04 SMI"
-#
-# SUNWusbccid
-#
-
-# packaging files
-i pkginfo
-i copyright
-i depend
-i thirdpartylicensereadme.txt
-
-# source locations relative to the prototype file
-d none usr 755 root sys
-d none usr/lib 755 root bin
-d none usr/lib/smartcard 755 root bin
-f none usr/lib/smartcard/ifdh_usbccid.so.1 755 root bin
-s none usr/lib/smartcard/ifdh_usbccid.so=ifdh_usbccid.so.1
-d none usr/share 755 root sys
-d none usr/share/man 755 root bin
-d none usr/share/man/man3smartcard 755 root bin
-f none usr/share/man/man3smartcard/usb_ccid_ifd.3smartcard 444 root bin
--- a/usr/src/pkgdefs/SUNWusbccid/prototype_i386 Mon Feb 08 12:51:29 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-#
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# pragma ident "@(#)prototype_i386 1.4 06/03/18 SMI"
-#
-# SUNWusbccid
-#
-
-#
-# 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/SUNWusbccid/prototype_sparc Mon Feb 08 12:51:29 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-#
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# pragma ident "@(#)prototype_sparc 1.3 06/03/18 SMI"
-#
-# SUNWusbccid
-#
-
-#
-# 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/SUNWusbccid/thirdpartylicensereadme.txt Mon Feb 08 12:51:29 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
- This library is free software; you can redistribute it and/or modify it
-under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation; either version 2.1 of the License, or (at
-your option) any later version.
-
- This library is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser
-General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
-along with this library; if not, write to the Free Software Foundation,
-Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
--- a/usr/src/pkgdefs/SUNWwireshark/depend Mon Feb 08 12:51:29 2010 +0200
+++ b/usr/src/pkgdefs/SUNWwireshark/depend Mon Feb 08 15:41:40 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 "@(#)depend 1.4 09/07/09 SMI"
+#ident "@(#)depend 1.5 10/01/07 SMI"
#
#
@@ -69,7 +69,6 @@
P SUNWxwrtl X Window System & Graphics Runtime Library Links in /usr/lib
P SUNWxorg-clientlibs X Window System client libraries based on X.Org Foundation open source release
P SUNWfreetype2 FreeType2 Font library
-P SUNWmlib mediaLib shared libraries
P SUNWfontconfig Fontconfig library
P SUNWcairo Vector graphics library
P SUNWpango GNOME core text and font handling libraries
--- a/usr/src/pkgdefs/SUNWwireshark/pkginfo.tmpl Mon Feb 08 12:51:29 2010 +0200
+++ b/usr/src/pkgdefs/SUNWwireshark/pkginfo.tmpl Mon Feb 08 15:41:40 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.9 09/12/18 SMI"
+#ident "@(#)pkginfo.tmpl 1.10 10/01/28 SMI"
#
#
# This required package information file describes characteristics of the
@@ -40,7 +40,7 @@
SUNW_PKGTYPE="usr"
MAXINST="1000"
CATEGORY="system"
-DESC="Wireshark - Network protocol analyzer (1.2.5)"
+DESC="Wireshark - Network protocol analyzer (1.2.6)"
VENDOR="Sun Microsystems, Inc."
HOTLINE="Please contact your local service provider"
EMAIL=""
--- a/usr/src/pkgdefs/SUNWwireshark/prototype_com Mon Feb 08 12:51:29 2010 +0200
+++ b/usr/src/pkgdefs/SUNWwireshark/prototype_com Mon Feb 08 15:41:40 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.9 09/12/18 SMI"
+#ident "@(#)prototype_com 1.10 10/01/28 SMI"
#
# This required package information file contains a list of package contents.
@@ -58,25 +58,25 @@
s none usr/lib/libwsutil.so=libwsutil.so.0.0.0
d none usr/lib/wireshark 0755 root bin
d none usr/lib/wireshark/plugins 0755 root bin
-d none usr/lib/wireshark/plugins/1.2.5 0755 root bin
-f none usr/lib/wireshark/plugins/1.2.5/asn1.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.5/coseventcomm.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.5/cosnaming.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.5/docsis.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.5/ethercat.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.5/gryphon.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.5/irda.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.5/m2m.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.5/mate.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.5/opcua.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.5/parlay.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.5/profinet.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.5/sercosiii.so 0755 root bin
-f none usr/lib/wireshark/plugins/1.2.5/stats_tree.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.5/tango.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.5/unistim.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.5/wimax.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.5/wimaxasncp.so 0555 root bin
+d none usr/lib/wireshark/plugins/1.2.6 0755 root bin
+f none usr/lib/wireshark/plugins/1.2.6/asn1.so 0555 root bin
+f none usr/lib/wireshark/plugins/1.2.6/coseventcomm.so 0555 root bin
+f none usr/lib/wireshark/plugins/1.2.6/cosnaming.so 0555 root bin
+f none usr/lib/wireshark/plugins/1.2.6/docsis.so 0555 root bin
+f none usr/lib/wireshark/plugins/1.2.6/ethercat.so 0555 root bin
+f none usr/lib/wireshark/plugins/1.2.6/gryphon.so 0555 root bin
+f none usr/lib/wireshark/plugins/1.2.6/irda.so 0555 root bin
+f none usr/lib/wireshark/plugins/1.2.6/m2m.so 0555 root bin
+f none usr/lib/wireshark/plugins/1.2.6/mate.so 0555 root bin
+f none usr/lib/wireshark/plugins/1.2.6/opcua.so 0555 root bin
+f none usr/lib/wireshark/plugins/1.2.6/parlay.so 0555 root bin
+f none usr/lib/wireshark/plugins/1.2.6/profinet.so 0555 root bin
+f none usr/lib/wireshark/plugins/1.2.6/sercosiii.so 0755 root bin
+f none usr/lib/wireshark/plugins/1.2.6/stats_tree.so 0555 root bin
+f none usr/lib/wireshark/plugins/1.2.6/tango.so 0555 root bin
+f none usr/lib/wireshark/plugins/1.2.6/unistim.so 0555 root bin
+f none usr/lib/wireshark/plugins/1.2.6/wimax.so 0555 root bin
+f none usr/lib/wireshark/plugins/1.2.6/wimaxasncp.so 0555 root bin
d none usr/sbin 0755 root bin
f none usr/sbin/capinfos 0555 root bin
f none usr/sbin/dumpcap 0555 root bin
--- a/usr/src/pkgdefs/SUNWwxwidgets/depend Mon Feb 08 12:51:29 2010 +0200
+++ b/usr/src/pkgdefs/SUNWwxwidgets/depend Mon Feb 08 15:41:40 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 "@(#)depend 1.3 09/05/21 SMI"
+#pragma ident "@(#)depend 1.4 10/01/07 SMI"
#
# This package information file defines software dependencies associated
# with the pkg. You can define three types of pkg dependencies with this file:
@@ -43,7 +43,6 @@
P SUNWpng Portable Network Graphics library
P SUNWjpg jpeg - The Independent JPEG Groups JPEG software
P SUNWlibC Sun Workshop Compilers Bundled libC
-P SUNWmlib mediaLib shared libraries
P SUNWfontconfig Fontconfig library
P SUNWlibms Math & Microtasking Libraries (Usr)
P SUNWlibmsr Math & Microtasking Libraries (Root)