Import sfw build 153
Bugs Fixed
----------
6917181 svc-net-snmp does not work on OpenSolaris
6917302 Apache HTTPD 1.3 removal
6921017 RFE: update tcpdump to version 4.1.1 after release
6921019 RFE: update libpcap to version 1.1.1
6932608 core found from snmpd SIGSEGV at netsnmp_access_systemstats_entry_update
6934478 snmpd dumps core in var_extensible_vmstat
6956251 snmpd cores with SIGFPE in update_stats
6981644 Upgrade bash to 4.1
6983060 BIND Packages Description needs updating when version changes.
6984919 SMA snmpd takes a long time to service ifOperStatus and ifAdminStatus requests
6985355 trousers should use /var/user/$USERNAME subdirectories to store data
6992874 Upgrade CURL to 7.21.2
6993289 Please migrate rdiff-backup to Python 2.6 or otherwise remove Python 2.4 dependency
6993295 Please migrate grails to Python 2.6.
6993306 antlr-2 packages depend on Python 2.4, but do not seem to require Python 2.4 at all.
6993308 pywbem seems to depend on Python 2.4 but actually uses Python 2.6
6993310 Please remove python 2.4 pycups bindings
6993610 Wireshark update to version 1.2.12
6995326 switch sfw to sunstudio12.1
--- a/usr/src/Makefile.master Sat Oct 30 12:35:08 2010 -0700
+++ b/usr/src/Makefile.master Tue Nov 16 22:41:08 2010 -0800
@@ -20,7 +20,7 @@
#
# Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
#
-#pragma ident "@(#)Makefile.master 1.48 10/10/07 SMI"
+#pragma ident "@(#)Makefile.master 1.49 10/10/28 SMI"
#
# Makefile.master, global definitions for system source
#
@@ -590,7 +590,7 @@
# Defined here so it can be overridden by developer.
#
SPRO_ROOT= $(BUILD_TOOLS)/SUNWspro
-SPRO_VROOT= $(SPRO_ROOT)/SS12
+SPRO_VROOT= $(SPRO_ROOT)/sunstudio12.1
# All sub-Makefiles should pass a specific path when building
# (such as with configure/make/perl) to ensure that the right
--- a/usr/src/Targetdirs Sat Oct 30 12:35:08 2010 -0700
+++ b/usr/src/Targetdirs Tue Nov 16 22:41:08 2010 -0800
@@ -22,7 +22,7 @@
#
# Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
#
-# ident "@(#)Targetdirs 1.257 10/08/05 SMI"
+# ident "@(#)Targetdirs 1.259 10/11/01 SMI"
#
#
@@ -40,7 +40,7 @@
SYMLINKS += $(SYM.ROOT.BIN64)
-TARGETDIRS= $(ROOT.SYS) $(ROOT.BIN) $(BIN.BIN) $(NOBODY.BIN) \
+TARGETDIRS= $(ROOT.SYS) $(ROOT.BIN) $(BIN.BIN) \
$(WEBSERVD.BIN) $(ROOT.OTHER)
TARGETDIRS += $(LP.LP) $(ROOT.LP)
@@ -68,11 +68,6 @@
/etc/bash/bash_completion.d \
/etc/inet \
/etc/init.d \
- /etc/rcS.d \
- /etc/rc0.d \
- /etc/rc1.d \
- /etc/rc2.d \
- /etc/rc3.d \
/etc/security \
/etc/security/auth_attr.d \
/etc/security/exec_attr.d \
@@ -94,7 +89,6 @@
/var \
/var/ntp \
/var/ntp/ntpstats \
- /var/run \
/lib/svc/manifest \
/lib/svc/manifest/application \
/lib/svc/manifest/application/management \
@@ -116,7 +110,6 @@
/etc/sfw \
/etc/sfw/private \
/etc/webmin \
- /etc/apache \
/etc/apache2 \
/etc/apache2/2.2 \
/etc/apache2/2.2/conf.d \
@@ -140,16 +133,6 @@
/lib \
/lib/svc \
/lib/svc/method \
- /usr/apache \
- /usr/apache/bin \
- /usr/apache/htdocs \
- /usr/apache/include \
- /usr/apache/libexec \
- /usr/apache/man \
- /usr/apache/man/man1 \
- /usr/apache/man/man3 \
- /usr/apache/man/man8 \
- /usr/apache/perl5 \
/usr/apr/1.3 \
/usr/apr/1.3/bin \
/usr/apr/1.3/build \
@@ -357,7 +340,6 @@
/usr/lib/python2.4/vendor-packages/mercurial/templates/spartan \
/usr/lib/python2.4/vendor-packages/mercurial/templates/static \
/usr/lib/python2.4/vendor-packages/libsvn \
- /usr/lib/python2.4/vendor-packages/rdiff_backup \
/usr/lib/python2.4/vendor-packages/svn \
/usr/lib/python2.4/vendor-packages/OpenSSL \
/usr/lib/python2.4/vendor-packages/OpenSSL/64 \
@@ -405,6 +387,7 @@
/usr/lib/python2.6/vendor-packages/pylint/checkers \
/usr/lib/python2.6/vendor-packages/pylint-0.18.0-py2.6.egg-info \
/usr/lib/python2.6/vendor-packages/radialnet \
+ /usr/lib/python2.6/vendor-packages/rdiff_backup \
/usr/lib/python2.6/vendor-packages/svn \
/usr/lib/python2.6/vendor-packages/zenmapCore \
/usr/lib/python2.6/vendor-packages/zenmapGUI \
@@ -1269,10 +1252,6 @@
/usr/squid/share/errors/Ukrainian-utf8 \
/usr/squid/share/icons \
/usr/tomcat6 \
- /var/apache \
- /var/apache/cgi-bin \
- /var/apache/htdocs \
- /var/apache/icons \
/var/apache2 \
/var/apache2/2.2 \
/var/ejabberd \
@@ -1415,10 +1394,6 @@
/usr/lib/$(MACH64)/wx/include/gtk2-unicode-release-2.8 \
/usr/lib/$(MACH64)/wx/include/gtk2-unicode-release-2.8/wx
-
-NOBODY.BIN= \
- /var/apache/logs
-
WEBSERVD.BIN= \
/var/apache2/2.2/logs \
/var/apache2/2.2/proxy \
--- a/usr/src/cmd/Makefile Sat Oct 30 12:35:08 2010 -0700
+++ b/usr/src/cmd/Makefile Tue Nov 16 22:41:08 2010 -0800
@@ -22,7 +22,7 @@
#
# Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
#
-# ident "@(#)Makefile 1.193 10/10/07 SMI"
+# ident "@(#)Makefile 1.194 10/10/27 SMI"
#
#
@@ -45,7 +45,6 @@
aget \
apr/apr-1.3 \
apr-util/apr-util-1.3 \
- apache \
apache2 \
apache2-modperl \
areca \
--- a/usr/src/cmd/apache/METADATA Sat Oct 30 12:35:08 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-NAME: apache
-VERSION: 1.3.41
-DESCRIPTION: Apache 1.3.X web server
-LICENSE: Apache v2.0, BSD, MIT, MPL
-PACKAGE: SUNWapchd SUNWapchr SUNWapchu
-PROJECT_URL: http://www.apache.org/
-SOURCE_DOWNLOAD: http://download.filehat.com/apache/httpd/apache_1.3.41.tar.gz
-SUPPORT: B
-BUGTRAQ: solaris/utility/apache
-OSR: 10265
-COMMENTS:
--- a/usr/src/cmd/apache/Makefile.sfw Sat Oct 30 12:35:08 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,297 +0,0 @@
-#
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-#ident "@(#)Makefile.sfw 1.37 10/09/03 SMI"
-
-# Note to maintainers. I'm sorry...please forgive me for all
-# that follows.
-
-# Currently, here's a brief overview of how apache is built:
-#
-# First the main server code is extracted, and the EAPI patch
-# is applied. Next, we build all the various add-on modules
-# we intend to ship - mod_perl, mod_jserv, and mod_webapp.
-# The perl side of mod_perl gets installed by building the
-# mod_perl module.
-#
-# Then, we massage various configuration files and scripts
-# and add in some Sun goodness (:-)) before a massive shell
-# script installs the whole wad in the proto area.
-
-BUILD_TOP=$(SRC)/cmd/apache
-TMPWORK=$(BUILD_TOP)/tmp # work dir
-
-.NO_PARALLEL: $(MODULES)
-
-# so the mod_perl build knows where to install the perl side.
-
-PERL=/usr/perl5/bin/perl
-PERL_ARCH:sh = arch
-AP_PERL5LIB=/usr/apache/perl5/5.8.4/$(PERL_ARCH)-solaris
-ROOTAP_PERL5LIB=$(AP_PERL5LIB:%=$(ROOT)/%)
-ROOT_PERLMAN=$(ROOT)/usr/apache/man
-APXS=/usr/apache/bin/apxs
-
-SERVER=apache_1.3.41
-PERL_MODULE=mod_perl-1.31
-SSL_MODULE=mod_ssl-2.8.31-1.3.41
-AUTH_GSS_MODULE=mod_auth_gss
-
-LDOPTS=-M $(SRC)/cmd/mapfile_noexstk -zcombreloc
-
-# hack - webapp always uses gcc if it finds it, so we null out
-# the path and point at our cc path before running configure.
-# The following kludge allows us to get the path cleanly without having
-# to hardwire anything in the makefile
-#
-# Note that it's very tough to get the WEBAPP_MODULE piece to use anything
-# other than gcc - that's one reason why $(CCPATH) is explicitly in the path.
-
-CCPATH=$(NATIVECC:%/cc=%)
-SFW_PATH="$(CCPATH):/usr/ccs/bin:/usr/bin:/usr/sfw/bin"
-
-TOMCATCON_SOURCE=tomcat-connectors-1.2.27-src
-TOMCATCON_MODULE=$(TOMCATCON_SOURCE)/native/apache-1.3/.libs/mod_jk.so
-
-MODULES= \
- $(SSL_MODULE) \
- $(PERL_MODULE) \
- $(TOMCATCON_MODULE)
-
-# stuff to whack when we do 'make clean'
-
-CLEANDIRS=$(SERVER) $(MODULES) $(TOMCATCON_SOURCE)
-
-# hack alert - the 'echo' command in the all target is the only
-# architecture-independent way of getting the mod_perl path compiled
-# in via redefinition of APACHE_PERL5LIB (src/modules/perl/mod_perl.c).
-# All other methods result in the backquoted quotes getting stripped
-# by shell expansion in the apache configuration script. Sorry...
-
-all: $(SERVER) .WAIT $(SERVER)/Makefile
- echo "echo '-DAPACHE_PERL5LIB=\"$(AP_PERL5LIB)\"'" \
- >> $(SERVER)/src/apaci
- (cd $(SERVER); env - \
- PATH=$(SFW_PATH) \
- "LD_OPTIONS=-L/usr/sfw/lib -R/usr/sfw/lib" \
- CC=$(CC) \
- 'CFLAGS=$(CFLAGS)' \
- MAKE=$(CCSMAKE) \
- $(CCSMAKE) root=$(ROOT))
- (cd $(SERVER); env - \
- PATH=$(SFW_PATH) \
- CC=$(CC) \
- 'CFLAGS=$(CFLAGS)' \
- MAKE=$(CCSMAKE) \
- $(CCSMAKE) certificate TYPE=dummy)
-
-include ../Makefile.cmd
-
-# currently, apache is a bit lacking in large-file awareness, but
-# much of it works, and we need to turn it on for compatibility with
-# perl now.
-
-CFLAGS += -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
-
-install: all
- if [ -d $(ROOT)/usr/apache/perl5/5.8.4 ]; then \
- rm -f $(ROOT)/usr/apache/libexec/httpd.exp; \
- chmod -R u+w $(ROOT)/usr/apache/perl5/5.8.4; \
- fi
- (cd $(SERVER); env - \
- PATH=$(SFW_PATH) \
- CC=$(CC) \
- 'CFLAGS=$(CFLAGS)' \
- 'CFLAGS_SHLIB=$(CFLAGS) -DPIC -KPIC' \
- LDFLAGS="$(LDOPTS)" \
- LDFLAGS_SHLIB="$(LDOPTS) -G" \
- MAKE=$(CCSMAKE) \
- $(CCSMAKE) install root=$(ROOT))
- sh ./install-apache
- # clean up perllocal.pod
- $(RM) -f $(ROOT)/usr/apache/perl5/5.8.4/`/bin/arch`-solaris/perllocal.pod
-
-$(SERVER)/Makefile: $(SERVER)/configure
- (cd $(SERVER); env - \
- PATH=$(SFW_PATH) \
- CC=$(CC) \
- 'CFLAGS=$(CFLAGS) -DUSE_SO_LINGER -DHARD_SERVER_LIMIT=2048 -DSSL_EXPERIMENTAL_PERDIRCA_IGNORE -DSSL_EXPERIMENTAL_PROXY_IGNORE' \
- 'CFLAGS_SHLIB=$(CFLAGS) -DPIC -KPIC -DUSE_SO_LINGER -DHARD_SERVER_LIMIT=2048 -DSSL_EXPERIMENTAL_PERDIRCA_IGNORE -DSSL_EXPERIMENTAL_PROXY_IGNORE' \
- LDFLAGS="$(LDOPTS)" \
- LDFLAGS_SHLIB="$(LDOPTS) -G" \
- PERL=$(PERL) \
- MAKE=$(CCSMAKE) \
- ./configure --with-layout=Solaris \
- --prefix=/usr/apache \
- --with-perl=$(PERL) \
- --verbose \
- --enable-module=all \
- --enable-module=ssl \
- --enable-shared=ssl \
- --disable-module=auth_db \
- --enable-rule=EAPI \
- --enable-rule=SSL_SDBM \
- --enable-rule=SSL_EXPERIMENTAL \
- --bindir=/usr/apache/bin \
- --sbindir=/usr/apache/bin \
- --libexecdir=/usr/apache/libexec \
- --mandir=/usr/apache/man \
- --sysconfdir=/etc/apache \
- --datadir=/var/apache \
- --includedir=/usr/apache/include \
- --cgidir=/var/apache/cgi-bin \
- --localstatedir=/usr/apache \
- --runtimedir=/var/run/apache \
- --logfiledir=/var/apache/logs \
- --proxycachedir=/var/apache/proxy \
- --enable-suexec \
- --suexec-caller=nobody \
- --suexec-safepath=/usr/bin \
- --enable-shared=max \
- --activate-module=src/modules/perl/libperl.a \
- --enable-shared=perl)
-
-$(SERVER):
- gzip -dc $(SERVER).tar.gz | tar xopf -
- (cd $(SERVER); gpatch -p1 < ../Solaris/manpage.patches)
- (cd $(SERVER); gpatch -p1 < ../Solaris/apachectl.patch) # PSARC/2001/244
- (cd $(SERVER); gpatch -p1 < ../Solaris/getline.patches)
- # remove nasty chown
- rm -f $(SERVER)/Makefile.tmpl.orig
- mv $(SERVER)/Makefile.tmpl \
- $(SERVER)/Makefile.tmpl.orig
- sed -e 's,chown,/bin/true,' -e 's,chmod,/bin/true,' \
- < $(SERVER)/Makefile.tmpl.orig \
- > $(SERVER)/Makefile.tmpl
-
-
-# The server configure file needs to depend on all the modules
-# that add source to the server tree. The next rule guarantees
-# that we will build all the modules before configuring apache.
-
-$(SERVER)/configure: $(MODULES) auth_gss_dir
-
-# The rest is a bunch of individual rules that build the
-# various modules and pieces.
-
-$(SSL_MODULE):
- gzip -dc $(SSL_MODULE).tar.gz | tar xopf -
- (cd $(SSL_MODULE); env - \
- PATH=$(SFW_PATH) \
- CC=$(CC) "CFLAGS=$(CFLAGS) -DPIC -KPIC" \
- "LD_OPTIONS=-L/usr/sfw/lib -R/usr/sfw/lib" \
- LDFLAGS="$(LDOPTS)" \
- LDDLFLAGS="$(LDOPTS) -G" \
- MAKE=$(CCSMAKE) \
- PERL=$(PERL) \
- ./configure \
- --with-apache=../$(SERVER) )
-
-# The perl side of mod_perl
-# gets installed in the proto area here (though with wrong
-# permissions, etc) by the make install. The apache side
-# gets installed by the main install-apache script. It's
-# disgusting, but perl is pretty picky about how it wants
-# to build stuff. Note also that $(PERL_MODULE) is a
-# dependency of the main apache build, since it needs
-# to copy stuff into the server tree before the server
-# gets built. Also pay attention to the fact that we
-# need to edit the generated Makefiles to get the right
-# CC and LD in them - because by default they use whatever
-# perl was compiled with (in this case just "cc").
-
-$(PERL_MODULE):
- if [ -d $(ROOT)/usr/apache/perl5/5.8.4 ]; then \
- chmod -R u+w $(ROOT)/usr/apache/perl5/5.8.4; \
- fi
- gzip -dc $(PERL_MODULE).tar.gz | tar xopf -
- gpatch -p0 < perlbug38084.patch
- (cd $(PERL_MODULE); env - \
- PATH=$(SFW_PATH) \
- CC=$(CC) "CFLAGS=$(CFLAGS) -DPIC -KPIC" \
- LDFLAGS="$(LDOPTS)" \
- LDDLFLAGS="$(LDOPTS) -G" \
- MAKE=$(CCSMAKE) \
- PERL=$(PERL) \
- $(PERL) Makefile.PL \
- INSTALLDIRS=perl \
- USE_APACI=1 \
- APACHE_SRC=../$(SERVER)/src \
- DO_HTTPD=1 \
- PREP_HTTPD=1 \
- EVERYTHING=1 \
- INSTALLSITELIB=$(ROOTAP_PERL5LIB) \
- INSTALLARCHLIB=$(ROOTAP_PERL5LIB) \
- INSTALLSITEARCH=$(ROOTAP_PERL5LIB) \
- INSTALLPRIVLIB=$(ROOTAP_PERL5LIB) \
- SITEARCHEXP=$(ROOTAP_PERL5LIB) \
- SITELIBEXP=$(ROOTAP_PERL5LIB) \
- INSTALLMAN1DIR=$(ROOT_PERLMAN)/man1 \
- INSTALLMAN3DIR=$(ROOT_PERLMAN)/man3; \
- for i in `find . -name Makefile` ; \
- do \
- sed -e '/^CC/s;CC = cc;CC = $(CC);' \
- -e '/^LD =/s;LD = cc;LD = $(CC);' \
- $$i > $$i.1; \
- mv $$i.1 $$i; \
- done)
- (cd $(PERL_MODULE); env - \
- PATH=$(SFW_PATH) \
- CC=$(CC) "CFLAGS=$(CFLAGS)" \
- MAKE=$(CCSMAKE) \
- MAKEFLAGS=e \
- PERL=$(PERL) \
- $(CCSMAKE) install)
-
-$(TOMCATCON_MODULE): $(TOMCATCON_SOURCE)/native/config.status
- (cd $(TOMCATCON_SOURCE)/native; env - \
- PATH=$(SFW_PATH) \
- CC=$(CC) "CFLAGS=$(CFLAGS)" \
- MAKE=$(GMAKE) $(GMAKE))
-
-$(TOMCATCON_SOURCE)/native/config.status: $(TOMCATCON_SOURCE)/native/configure
- (cd $(TOMCATCON_SOURCE)/native; env - \
- PATH=$(SFW_PATH) \
- CC=$(CC) "CFLAGS=$(CFLAGS)" \
- MAKE=$(GMAKE) \
- ./configure --with-apxs=/usr/apache/bin/apxs)
-
-# Note that we need to avoid any error message from nightly log.
-$(TOMCATCON_SOURCE)/native/configure:
- /usr/sfw/bin/gtar xpfz $(TOMCATCON_SOURCE).tar.gz
- (cd $(TOMCATCON_SOURCE)/native; \
- sed 's/throws an error of the form/throws a message of the form/' \
- configure > configure.new; \
- cat configure.new > configure; rm configure.new)
-
-auth_gss_dir:
- (cd $(AUTH_GSS_MODULE); SERVER=$(SERVER) make all)
-
-$(ROOTJSDKDIR)/%: %
- $(INS.file)
-
-clean:
- -rm -rf $(CLEANDIRS)
- (cd $(AUTH_GSS_MODULE); make clean;)
-
-include ../Makefile.targ
--- a/usr/src/cmd/apache/Solaris/README Sat Oct 30 12:35:08 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#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
-version of Apache (prior to or during the build). Additional
-fixes are done to the built image by the install-apache script
-that is run by the Makefile.sfw.
-
-apache.sh - the script that goes in etc/init.d to start apache
-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
-jk.conf - configuration file for mod_jk
-workers.properties - worker definition used by mod_jk
--- a/usr/src/cmd/apache/Solaris/README.Solaris Sat Oct 30 12:35:08 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,77 +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 2010 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#ident "@(#)README.Solaris 1.7 10/01/14 SMI"
-
-Solaris specific build/configuration information.
-
-Source is available on http://opensolaris.org.
-
-EAPI patches have been applied to the source tree, so things
-that need it can be dropped in without rebuilding the server.
-
-Configure options:
- ./configure --with-layout=Solaris \
- --prefix=/usr/apache \
- --with-perl=/usr/perl5/bin/perl \
- --enable-module=all \
- --disable-module=auth_db \
- --enable-rule=EAPI \
- --bindir=/usr/apache/bin \
- --sbindir=/usr/apache/bin \
- --libexecdir=/usr/apache/libexec \
- --mandir=/usr/apache/man \
- --sysconfdir=/etc/apache \
- --datadir=/var/apache \
- --includedir=/usr/apache/include \
- --cgidir=/var/apache/cgi-bin \
- --localstatedir=/usr/apache \
- --runtimedir=/var/run \
- --logfiledir=/var/apache/logs \
- --proxycachedir=/var/apache/proxy \
- --enable-suexec \
- --suexec-caller=nobody \
- --suexec-safepath=/usr/bin \
- --enable-shared=max \
- --activate-module=src/modules/perl/libperl.a \
- --enable-shared=perl
-
-A sample config file is shipped in /etc/apache/httpd.conf-example.
-This file can be copied to /etc/apache/httpd.conf, to be used as a
-starting point for setup. ServerName is set to 127.0.0.1 by default,
-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_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_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 Sat Oct 30 12:35:08 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,67 +0,0 @@
-#!/sbin/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 2010 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#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
-
-if [ ! -f ${CONF_FILE} ]; then
- exit 0
-fi
-
-if [ ! -d ${RUNDIR} ]; then
- /usr/bin/mkdir -p -m 755 ${RUNDIR}
-fi
-
-case "$1" in
-start|startssl|sslstart|start-SSL)
- /bin/rm -f ${PIDFILE}
- cmdtext="starting"
- ;;
-restart)
- cmdtext="restarting"
- ;;
-stop)
- cmdtext="stopping"
- ;;
-*)
- echo "Usage: $0 {start|stop|restart}"
- exit 1
- ;;
-esac
-
-echo "httpd $cmdtext."
-
-/bin/sh -c "${APACHE_HOME}/bin/apachectl $1" 2>&1 &
-status=$?
-
-if [ $status != 0 ]; then
- echo "exit status $status"
- exit 1
-fi
-exit 0
--- a/usr/src/cmd/apache/Solaris/apachectl.patch Sat Oct 30 12:35:08 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-*** apache_1.3.34/src/support/apachectl.orig Mon Dec 6 18:30:45 2004
---- apache_1.3.34/src/support/apachectl Mon Dec 6 18:32:17 2004
-***************
-*** 60,65 ****
---- 60,75 ----
- ARGS="help"
- fi
-
-+ mkdir -p /var/run/apache
-+
-+ NCAKMODCONF=/etc/nca/ncakmod.conf
-+ if [ -f $NCAKMODCONF ]; then
-+ . $NCAKMODCONF
-+ if [ "x$status" = "xenabled" ]; then
-+ GOOP="env LD_PRELOAD=/usr/lib/ncad_addr.so $HTTPD"
-+ fi
-+ fi
-+
- for ARG in $@ $ARGS
- do
- # check for pidfile
--- a/usr/src/cmd/apache/Solaris/getline.patches Sat Oct 30 12:35:08 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,142 +0,0 @@
-*** apache_1.3.41/src/support/htpasswd.c.orig Thu Sep 2 11:04:04 2010
---- apache_1.3.41/src/support/htpasswd.c Thu Sep 2 11:04:15 2010
-***************
-*** 98,104 ****
- * Get a line of input from the user, not including any terminating
- * newline.
- */
-! static int getline(char *s, int n, FILE *f)
- {
- register int i = 0;
-
---- 98,104 ----
- * Get a line of input from the user, not including any terminating
- * newline.
- */
-! static int my_getline(char *s, int n, FILE *f)
- {
- register int i = 0;
-
-***************
-*** 547,553 ****
- char scratch[MAX_STRING_LEN];
-
- fpw = fopen(pwfilename, "r");
-! while (! (getline(line, sizeof(line), fpw))) {
- char *colon;
-
- if ((line[0] == '#') || (line[0] == '\0')) {
---- 547,553 ----
- char scratch[MAX_STRING_LEN];
-
- fpw = fopen(pwfilename, "r");
-! while (! (my_getline(line, sizeof(line), fpw))) {
- char *colon;
-
- if ((line[0] == '#') || (line[0] == '\0')) {
-*** apache_1.3.41/src/support/htdigest.c.orig Thu Sep 2 11:06:24 2010
---- apache_1.3.41/src/support/htdigest.c Thu Sep 2 11:06:37 2010
-***************
-*** 71,77 ****
- while ((line[y++] = line[x++]));
- }
-
-! static int getline(char *s, int n, FILE *f)
- {
- register int i = 0;
-
---- 71,77 ----
- while ((line[y++] = line[x++]));
- }
-
-! static int my_getline(char *s, int n, FILE *f)
- {
- register int i = 0;
-
-***************
-*** 158,164 ****
- {
- static char line[MAX_STRING_LEN];
-
-! while (!(getline(line, MAX_STRING_LEN, source))) {
- putline(target, line);
- }
- }
---- 158,164 ----
- {
- static char line[MAX_STRING_LEN];
-
-! while (!(my_getline(line, MAX_STRING_LEN, source))) {
- putline(target, line);
- }
- }
-***************
-*** 216,222 ****
- ap_cpystrn(realm, argv[2], sizeof(realm));
-
- found = 0;
-! while (!(getline(line, MAX_STRING_LEN, f))) {
- if (found || (line[0] == '#') || (!line[0])) {
- putline(tfp, line);
- continue;
---- 216,222 ----
- ap_cpystrn(realm, argv[2], sizeof(realm));
-
- found = 0;
-! while (!(my_getline(line, MAX_STRING_LEN, f))) {
- if (found || (line[0] == '#') || (!line[0])) {
- putline(tfp, line);
- continue;
-*** apache_1.3.41/src/support/logresolve.c.orig Thu Sep 2 11:07:36 2010
---- apache_1.3.41/src/support/logresolve.c Thu Sep 2 11:08:07 2010
-***************
-*** 71,77 ****
- #endif /* !MPE && !WIN32*/
-
- static void cgethost(struct in_addr ipnum, char *string, int check);
-! static int getline(char *s, int n);
- static void stats(FILE *output);
-
-
---- 71,77 ----
- #endif /* !MPE && !WIN32*/
-
- static void cgethost(struct in_addr ipnum, char *string, int check);
-! static int my_getline(char *s, int n);
- static void stats(FILE *output);
-
-
-***************
-*** 278,284 ****
- * gets a line from stdin
- */
-
-! static int getline (char *s, int n)
- {
- char *cp;
-
---- 278,284 ----
- * gets a line from stdin
- */
-
-! static int my_getline (char *s, int n)
- {
- char *cp;
-
-***************
-*** 326,332 ****
- for (i = 0; i < MAX_ERR + 2; i++)
- errors[i] = 0;
-
-! while (getline(line, MAXLINE)) {
- if (line[0] == '\0')
- continue;
- entries++;
---- 326,332 ----
- for (i = 0; i < MAX_ERR + 2; i++)
- errors[i] = 0;
-
-! while (my_getline(line, MAXLINE)) {
- if (line[0] == '\0')
- continue;
- entries++;
--- a/usr/src/cmd/apache/Solaris/httpdconf.sed Sat Oct 30 12:35:08 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,81 +0,0 @@
-#ident "@(#)httpdconf.sed 1.11 10/01/14 SMI"
-#
-# 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.
-
-/^# the directives/a\
-#\
-# Solaris Quick Configuration Information\
-#\
-# 1. Set ServerName if necessary (default is 127.0.0.1)\
-# 2. Set ServerAdmin to a valid email address\
-# 3. If configuring Jserv or Tomcat, read comments at\
-# the bottom of this file.\
-#
-s/\/usr\/apache\/conf/\/etc\/apache/g
-/^ServerAdmin/c\
-ServerAdmin [email protected]
-/^#ServerName/c\
-ServerName 127.0.0.1
-/^ServerName/c\
-ServerName 127.0.0.1
-/^Group/c\
-Group nobody
-/^LoadModule auth_module/a\
-LoadModule auth_gss_module libexec/mod_auth_gss.so
-/^AddModule mod_auth.c/a\
-AddModule mod_auth_gss.c
-/^<IfModule mod_alias.c>/a\
-\
-Alias /manual/ "/usr/apache/htdocs/manual/"\
-<Directory "/usr/apache/htdocs/manual" >\
- Options Indexes FollowSymLinks MultiViews\
- AllowOverride None\
-</Directory>
-/^<IfModule mod_ssl.c>/a\
-#\
-# Use pkcs11 crypto device to use Solaris crypro framework\
-# (and also to use hardware acceleration)\
-#\
-SSLCryptoDevice pkcs11\
-#
-/^SSLCipherSuite/c\
-# AES with keylengths > 128 bit is not supported by default on Solaris\
-# to operate with AES256 you must install the SUNWcry and SUNWcryr\
-# packages from the Solaris 10 Data Encryption Kit.\
-SSLCipherSuite ALL:!ADH:!EXPORT56:-AES256-SHA:-DHE-RSA-AES256-SHA:-DHE-DSS-AES256-SHA:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP:+eNULL\
-
-$a\
-\
-#<IfModule mod_perl.c>\
-#\
-#<Location /perl-status>\
-# SetHandler perl-script\
-# PerlHandler Apache::Status\
-# order deny,allow\
-# deny from all\
-# allow from yourhost\
-#</Location>\
-#</IfModule>\
-\
-# Apache Tomcat support\
-#include /etc/apache/jk.conf
--- a/usr/src/cmd/apache/Solaris/jk.conf Sat Oct 30 12:35:08 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-LoadModule jk_module libexec/mod_jk.so
-
-<IfModule mod_jk.c>
- JkWorkersFile /etc/apache/workers.properties
- # Where to put jk shared memory
- # Update this path to match your local state directory or logs directory
- JkShmFile /var/apache/logs/mod_jk.shm
- # Where to put jk logs
- # Update this path to match your logs directory location (put mod_jk.log next to access_log)
- JkLogFile /var/apache/logs/mod_jk.log
- # Set the jk log level [debug/error/info]
- JkLogLevel info
- # Select the timestamp log format
- JkLogStampFormat "[%a %b %d %H:%M:%S %Y] "
- # Send everything for context /examples to worker named worker1 (ajp13)
- JkMount /examples/* worker1
-</IfModule>
-
--- a/usr/src/cmd/apache/Solaris/manpage.patches Sat Oct 30 12:35:08 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,190 +0,0 @@
-*** apache_1.3.34/src/support/ab.8.orig Mon Dec 6 16:28:17 2004
---- apache_1.3.34/src/support/ab.8 Mon Dec 6 16:28:51 2004
-***************
-*** 226,232 ****
- some 'expected' forms of responses.
- .P
- The rather heavy use of
-! .BR strstr(3)
- by the program may skew performance results, since it uses significant
- CPU resources. Make sure that performance limits are not hit by
- .B ab
---- 226,233 ----
- some 'expected' forms of responses.
- .P
- The rather heavy use of
-! .\" section number changed for solaris - [email protected]
-! .BR strstr(3C)
- by the program may skew performance results, since it uses significant
- CPU resources. Make sure that performance limits are not hit by
- .B ab
-*** apache_1.3.34/src/support/apxs.8.orig Mon Dec 6 16:29:01 2004
---- apache_1.3.34/src/support/apxs.8 Mon Dec 6 16:29:33 2004
-***************
-*** 421,426 ****
-
- .PD
- .SH SEE ALSO
-! .BR apachectl(1),
- .BR httpd(8).
- .
---- 421,427 ----
-
- .PD
- .SH SEE ALSO
-! .\" fixed section number - [email protected]
-! .BR apachectl(8),
- .BR httpd(8).
- .
-*** apache_1.3.34/src/support/httpd.8.orig Mon Dec 6 16:29:46 2004
---- apache_1.3.34/src/support/httpd.8 Mon Dec 6 16:34:09 2004
-***************
-*** 70,76 ****
- this process is written to a file as given in the configuration file.
- Alternatively
- .B httpd
-! may be invoked by the Internet daemon inetd(8) each
- time a connection to the HTTP service is made.
- .PP
- This manual page only lists the command line arguments. For details
---- 70,77 ----
- this process is written to a file as given in the configuration file.
- Alternatively
- .B httpd
-! .\" section number changed for solaris - [email protected]
-! may be invoked by the Internet daemon inetd(1M) each
- time a connection to the HTTP service is made.
- .PP
- This manual page only lists the command line arguments. For details
-***************
-*** 91,106 ****
- placed into a dynamic shared object (DSO) file. This file
- is searched in a hardcoded path under ServerRoot per default. Use this
- option if you want to override it.
- .TP 12
- .BI \-d " serverroot"
- Set the initial value for the ServerRoot directive to \fIserverroot\fP. This
- can be overridden by the ServerRoot command in the configuration file. The
-! default is \fB/usr/local/apache\fP.
- .TP
- .BI \-f " config"
- Execute the commands in the file \fIconfig\fP on startup. If \fIconfig\fP
- does not begin with a /, then it is taken to be a path relative to
-! the ServerRoot. The default is \fBconf/httpd.conf\fP.
- .TP
- .BI \-C " directive"
- Process the configuration \fIdirective\fP before reading config files.
---- 92,109 ----
- placed into a dynamic shared object (DSO) file. This file
- is searched in a hardcoded path under ServerRoot per default. Use this
- option if you want to override it.
-+ .\" fix serverroot for solaris - [email protected]
- .TP 12
- .BI \-d " serverroot"
- Set the initial value for the ServerRoot directive to \fIserverroot\fP. This
- can be overridden by the ServerRoot command in the configuration file. The
-! default is \fB/usr/apache\fP.
-! .\" fix conf file location for solaris - [email protected]
- .TP
- .BI \-f " config"
- Execute the commands in the file \fIconfig\fP on startup. If \fIconfig\fP
- does not begin with a /, then it is taken to be a path relative to
-! the ServerRoot. The default is \fB/etc/apcahe/httpd.conf\fP.
- .TP
- .BI \-C " directive"
- Process the configuration \fIdirective\fP before reading config files.
-***************
-*** 151,173 ****
- Print the version and build parameters of
- .B httpd
- , and then exit.
- .SH FILES
- .PD 0
-! .B /usr/local/apache/conf/httpd.conf
- .br
-! .B /usr/local/apache/conf/srm.conf
- .br
-! .B /usr/local/apache/conf/access.conf
- .br
-! .B /usr/local/apache/conf/mime.types
- .br
-! .B /usr/local/apache/conf/magic
- .br
-! .B /usr/local/apache/logs/error_log
- .br
-! .B /usr/local/apache/logs/access_log
- .br
-! .B /usr/local/apache/logs/httpd.pid
- .PD
- .SH SEE ALSO
-! .BR inetd (8).
---- 154,177 ----
- Print the version and build parameters of
- .B httpd
- , and then exit.
-+ .\" fix pathnames for solaris - [email protected]
- .SH FILES
- .PD 0
-! .B /etc/apache/httpd.conf
- .br
-! .B /etc/apache/srm.conf
- .br
-! .B /etc/apache/access.conf
- .br
-! .B /etc/apache/mime.types
- .br
-! .B /etc/apache/magic
- .br
-! .B /var/apache/logs/error_log
- .br
-! .B /var/apache/logs/access_log
- .br
-! .B /var/run/apache/httpd.pid
- .PD
- .SH SEE ALSO
-! .BR inetd (1M).
-*** apache_1.3.34/src/support/suexec.8.orig Mon Dec 6 16:34:22 2004
---- apache_1.3.34/src/support/suexec.8 Mon Dec 6 16:36:00 2004
-***************
-*** 13,18 ****
---- 13,21 ----
- .\" See the License for the specific language governing permissions and
- .\" limitations under the License.
- .\"
-+ .\" modified to include solaris notes about suexec being shipped
-+ .\" disabled and how to enable it. [email protected]
-+ .\"
- .SH NAME
- suexec \- Switch User For Exec
- .SH SYNOPSIS
-***************
-*** 34,38 ****
---- 37,64 ----
- Display the list of compile-time settings used when \fBsuexec\fP
- was built. No other action is taken.
- .PD
-+ .SH NOTES
-+ Because some sites may not wish to run \fBsuexec\fP, it is
-+ disabled by default. The \fBsuexec\fP binary is installed
-+ as \fB/usr/apache/bin/suexec.disabled\fP.
-+ .PP
-+ To enable \fBsuexec\fP operation, do the following (as root):
-+ .PP
-+ .RS
-+ .nf
-+ .ft 4
-+ .ta +.5i +1i
-+ # cd /usr/apache/bin
-+ # cp suexec.disabled suexec
-+ # chmod 4711 suexec
-+ # chown root suexec
-+ .fi
-+ .ta
-+ .ft 1
-+ .RE
-+ .PP
-+ Then stop and start the http server (you must fully stop and start
-+ it - restart is not sufficient).
-+
- .SH SEE ALSO
- .BR httpd(8)
--- a/usr/src/cmd/apache/Solaris/workers.properties Sat Oct 30 12:35:08 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-# Define 1 real worker using ajp13
-worker.list=worker1
-# Set properties for worker1 (ajp13)
-worker.worker1.type=ajp13
-worker.worker1.host=localhost
-worker.worker1.port=8009
Binary file usr/src/cmd/apache/apache_1.3.41.tar.gz has changed
--- a/usr/src/cmd/apache/install-apache Sat Oct 30 12:35:08 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,276 +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 2010 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#ident "@(#)install-apache 1.22 10/01/14 SMI"
-
-. ${SRC}/tools/install.subr
-
-# functions - search for "START HERE" to find start of control flow
-
-ins_file() {
- iprog=$1
- idir=$2
- imode=$3
- _install N ${iprog} ${idir}/${iprog} ${imode}
-}
-
-disable_suexec() {
- cd ${BINDIR}
- rm -f suexec.disabled
- mv suexec suexec.disabled
-}
-
-install_logs() {
- mkdir -p ${VARDIR}/logs
- for i in access_log error_log suexec_log
- do
- rm -f ${VARDIR}/logs/$i
- touch ${VARDIR}/logs/$i
- done
-}
-
-install_proxydir() {
- mkdir -p ${VARDIR}/proxy
-}
-
-# apache installs the manual in the document root, but we
-# really want it in /usr/apache instead of /var/apache
-#
-move_htdocs() {
- cd ${VARHTDOCS}
- if [ -d manual ]; then
- find manual -depth -print | cpio -pdum ${USRHTDOCS}
- rm -rf manual
- fi
-}
-
-install_startup_files() {
- cd ${TOP}/Solaris
- _install N apache.sh ${ROOT}/etc/init.d/apache 744
- _install H ${ROOT}/etc/init.d/apache ${ROOT}/etc/rc3.d/S50apache
- _install H ${ROOT}/etc/init.d/apache ${ROOT}/etc/rc2.d/K16apache
- _install H ${ROOT}/etc/init.d/apache ${ROOT}/etc/rc1.d/K16apache
- _install H ${ROOT}/etc/init.d/apache ${ROOT}/etc/rc0.d/K16apache
- _install H ${ROOT}/etc/init.d/apache ${ROOT}/etc/rcS.d/K16apache
-}
-
-install_readme() {
- cd ${TOP}/Solaris
- ins_file README.Solaris ${CONFDIR} 444
-}
-
-install_tomcatcon() {
- cd ${TOP}/${TOMCATCON_VERSION}/native/apache-1.3
- ins_file mod_jk.so ${LIBEXECDIR} 555 root bin
-
- cd ${TOP}/Solaris
- ins_file jk.conf ${CONFDIR} 555
- ins_file workers.properties ${CONFDIR} 555
-}
-
-install_auth_gss() {
- cd ${TOP}/mod_auth_gss
- ins_file mod_auth_gss.so ${LIBEXECDIR} 555
-}
-
-fix_config_files() {
- cd ${CONFDIR}
- rm -f *.default
- sed -f ${TOP}/Solaris/httpdconf.sed httpd.conf > httpd.conf-example
- rm -f httpd.conf
-}
-
-# remove stuff from the proto dir that apache installs and that
-# we don't want to ship
-
-cleanup_proto() {
- rm -rf ${ROOT}/var/run/apache
-}
-
-post_process() {
- cd ${BINDIR}
- for i in ab htdigest htpasswd httpd logresolve \
- rotatelogs suexec.disabled
- do
- chmod u+w ${i}
- ${SRC}/tools/post_process ${i}
- chmod u-w ${i}
- done
-
- cd ${LIBEXECDIR}
- for i in *.so
- do
- chmod u+w ${i}
- ${SRC}/tools/post_process_so ${i}
- chmod u-w ${i}
- done
-}
-
-fix_apache_perms() {
- chmod 744 ${ROOT}/etc/init.d/apache
-
- cd ${CONFDIR}
- find . -type d -exec chmod 755 {} \;
- find . -type f -exec chmod 644 {} \;
-
-# special fixups for mod_ssl config dirs/files
-
- chmod 700 ssl.key
-
-# for distribution packages, we don't ship server
-# certs or keys, but for testing, you can comment
-# the following lines, and the dummy certificate
-# we generate during the build will be left in place.
-
- cd ssl.crt
- rm -f *.[01] .[01]
- rm -f *.crt
- cd ../ssl.csr
- rm -f *.csr
- cd ../ssl.key
- rm -f *.key
- cd ../ssl.prm
- rm -f *.prm
-
-# end of mod_ssl fixups
-
- cd ${PREFIX}
- APDIRS="bin htdocs include libexec man perl5"
- find ${APDIRS} -type d -exec chmod 755 {} \;
- find ${APDIRS} -type f -exec chmod 555 {} \;
-
- cd ${BINDIR}
- chmod 700 suexec.disabled
-
- cd ${MANDIR}
- find . -type f -exec chmod 444 {} \;
-
- cd ${INCLUDEDIR}
- find . -type f -exec chmod 644 {} \;
-
- cd ${VARDIR}
- APDIRS="cgi-bin htdocs icons logs proxy"
- find ${APDIRS} -type d -exec chmod 755 {} \;
- find ${APDIRS} -type f -exec chmod 644 {} \;
-
- cd ${VARDIR}/cgi-bin
- chmod 555 *
-
- chmod 755 ${VARDIR}/proxy
-
- chmod 755 ${VARDIR}/logs
-
- cd ${VARDIR}/logs
- chmod 644 *
-}
-
-fix_apachectl() {
- cd ${BINDIR}
- rm -f apachectl.out
- sed -e 's/GOOP/HTTPD/g' apachectl > apachectl.out
- rm -f apachectl
- mv apachectl.out apachectl
- chmod 555 apachectl
-}
-
-fix_apxs() {
- cd ${BINDIR}
- rm -f apxs.out
- sed -e '/^my $CFG_CC/c\
-my $CFG_CC = q(cc);' apxs > apxs.out
- rm -f apxs
- mv apxs.out apxs
- chmod 555 apxs
-}
-
-# START HERE - actual script processing starts here
-
-# Even though this is called "install-apache", it doesn't really
-# install the whole thing. The perl side of mod_perl is installed
-# by make all, we just need to fix permissions. Much of apache
-# itself is installed by make install - again, we need to fix
-# permissions. What we install here are modules that apache
-# won't install as part of its normal build. Each install task
-# is a function, so it's relatively easy to add new stuff.
-
-APACHE_VERSION=`grep "^SERVER=" Makefile.sfw | sed s/SERVER=//`
-MOD_PERL_VERSION=mod_perl-1.31
-TOMCATCON_VERSION=tomcat-connectors-1.2.27-src
-
-# install locations
-
-PREFIX=${ROOT}/usr/apache
-CONFDIR=${ROOT}/etc/apache
-VARDIR=${ROOT}/var/apache
-DEFDIR=${ROOT}/etc/default
-BINDIR=${PREFIX}/bin
-USRHTDOCS=${PREFIX}/htdocs
-INCLUDEDIR=${PREFIX}/include
-LIBEXECDIR=${PREFIX}/libexec
-MANDIR=${PREFIX}/man
-MAN1DIR=${PREFIX}/man/man1
-MAN3DIR=${PREFIX}/man/man3
-MAN8DIR=${PREFIX}/man/man8
-PERLDIR=${PREFIX}/perl5
-
-VARHTDOCS=${VARDIR}/htdocs
-
-TOP=`pwd`
-
-disable_suexec
-install_logs
-install_proxydir
-install_readme
-install_tomcatcon
-install_auth_gss
-move_htdocs
-install_startup_files
-cleanup_proto
-fix_config_files
-post_process
-
-# all installation should be done before this point, so the functions
-# that fixup permissions can get everything that is installed.
-
-fix_apache_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
-# on it and messes up our change. Also, apxs winds up with the
-# path to cc that we use to compile, so we need to fix that to
-# be generic.
-
-fix_apachectl
-fix_apxs
-
-for pmfile in ${PERLDIR}/5.8.4/*/Apache/Resource.pm
-do
- if [ -f ${pmfile} ]; then
- _fixup_perl ${pmfile}
- chmod 555 ${pmfile}
- fi
-done
-
-exit 0
--- a/usr/src/cmd/apache/mod_auth_gss/Makefile Sat Oct 30 12:35:08 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#ident "@(#)Makefile 1.3 07/03/09 SMI"
-#
-
-include ../../Makefile.cmd
-
-GSS_CPPFLAGS = -DEAPI -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -I/usr/include/gssapi
-GSS_LDFLAGS = -lgss -lresolv
-
-CPPFLAGS = -I. $(GSS_CPPFLAGS) $(DEFS) -I../$(SERVER)/src/include -I../$(SERVER)/src/os/unix
-LDFLAGS = -zcombreloc -G $(GSS_LDFLAGS)
-CFLAGS =
-
-all: mod_auth_gss.so
-
-install: mod_auth_gss.so
- ../$(SERVER)/src/helpers/install.sh -c -m 755 mod_auth_gss.so $(ROOT)/usr/apache/libexec/mod_auth_gss.so
-
-clobber clean:
- $(RM) *.o *.so *.la *.lo core
-
-.SUFFIXES: .o .so
-
-.c.o:
- $(CC) -c $(CPPFLAGS) $<
-
-.c.so:
- $(CC) -c $(CPPFLAGS) $<
- $(LD) $(LDFLAGS) -o $@ $*.o
-
-.PHONY: all install clean distclean
--- a/usr/src/cmd/apache/mod_auth_gss/README Sat Oct 30 12:35:08 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,122 +0,0 @@
-Instructions on testing the negotiateauth
-mozilla extension with Apache.
-
-Introduction
------------------
-mod_auth_gss (originally from http://modauthkerb.sourceforge.net/) is an
-Apache module designed to provide GSSAPI authentication to the Apache
-web server. Using the "Negotiate" Auth mechanism, which performs full
-Kerberos authentication based on ticket exchanges and does not require
-users to insert their passwords to the browser. In order to use the
-Negotiate method you need a browser supporting it (currently standard IE6.0 or
-Mozilla with the negotiateauth extension).
-
-The Negotiate mechanism can be only used with Kerberos v5. The module supports
-both 1.x and 2.x versions of Apache.
-
-The use of SSL encryption is also recommended (but not required) if you are
-using the Negotiate method.
-
-Installing mod_auth_gss
-------------------------
-
-Prerequisites
-* Apache server installed.
- Both 1.x and 2.x series of Apache are supported (make sure the apache
- installation contains the apxs command)
- In Solaris - the necessary Apache libraries and headers are
- usually found in /usr/apache.
-* Working C compiler.
-* GSSAPI library (Solaris - /usr/lib/libgss.so.1)
-
-1. Building the Apache module is simple.
- Find the directory with the source code and Makefile for
- mod_auth_gss.so.
- $ make
-
-2. Installing the Apache module requires 'root' privilege.
- # cp mod_auth_gss.so /usr/apache/libexec
-
-3. Configure apache to use the new module.
- Add following line to /etc/apache/httpd.conf:
- LoadModule auth_gss_module libexec/mod_auth_gss.so
-
-4. Set permissions on the newly created keytab file so that only the
- apache owner can read the file. For example, if the apache server
- is configured to run as user "nobody":
-
- $ chown nobody /var/apache/http.keytab
- $ chmod 400 /var/apache/http.keytab
-
-5. Create a directory in the apache 'htdocs' tree that will be used
- to test the GSSAPI/KerberosV5 authentication.
- $ mkdir /var/apache/htdocs/krb5
-
-6. Create a ".htaccess" file for the Kerberos directory (step 4),
- it should contain the following entries:
- AuthType GSSAPI
- Krb5Keytab /var/apache/http.keytab
- GssDebug 1
-
- * GssDebug is only needed for testing purposes, it causes extra
- DEBUG level messages to be displayed in the Apache error_log file
- (/var/apache/logs/error_log).
-
-7. Put some content in the Kerberos web directory so the tester can
- verify that they accessed the page correctly.
-
-8. Set the "AllowOverride" parameter in /etc/apache/httpd.conf
- to "All" for the Kerberos directory created in step 5.
-Ex:
-<Directory "/var/apache/htdocs/krb5">
- Options Indexes FollowSymLinks MultiViews
- AllowOverride All
- Order allow,deny
- Allow from all
-</Directory>
-
-
-Configurating Kerberos
------------------------
-
-1. Set up Kerberos Server (if you don't already have one).
- Follow basic instructions given at docs.sun.com. Search for
- "Configuring Kerberos" in the
- "Solaris Administration Guide: Security Services" book.
-
- - The KDC should be a protected, standalone system. But for
- internal testing purposes it may be hosted on the same system
- as the Apache web server.
-
-2. Create a Kerberos service key for the Apache server to use for
- authenticating the clients. Also create a user principal testing
- the browser later.
- The "Negotiate" method used by IIS and IE is "HTTP/<hostname>@REALM".
- To create this principal for use with the Apache module do the following:
- [ As 'root', on the Apache server ]
- a. /usr/sbin/kadmin
- - this assumes the KDC setup procedure was followed (step 1).
- b. kadmin: addprinc -randkey HTTP/<fully_qualified_host_name>
- c. kadmin: ktadd -k /var/apache/http.keytab HTTP/<fully_qualified_host_name>
- d. kadmin: addprinc tester
- e. kadmin: quit
-
-Testing the 'Negotiate' plugin with mozilla:
---------------------------------------------
-
-1. The client system must be configured to use Kerberos.
- Setup /etc/krb5/krb5.conf to use the KDC created earlier
-
-2. 'kinit' to get a TGT as the "tester" principal created
- above in step 2d.
- $ kinit tester
- ( enter password )
-
-3. Use mozilla (with 'negotiateauth' extension installed)
- to access the Kerberos protected page (created above
- in steps 4-6).
-
- If the pages do not show up, its probably due to
- a misconfigured Kerberos configuration on the client
- or the server (or both). There is very little that
- needs to be done for Mozilla or apache.
--- a/usr/src/cmd/apache/mod_auth_gss/mod_auth_gss.c Sat Oct 30 12:35:08 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,598 +0,0 @@
-/*
- * Wyllys Ingersoll <[email protected]>
- *
- * Based on work by
- * Daniel Kouril <[email protected]>
- * James E. Robinson, III <[email protected]>
- * Daniel Henninger <[email protected]>
- * Ludek Sulak <[email protected]>
- */
-
-/* ====================================================================
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 2000-2003 The Apache Software Foundation. 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. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
- * "This product includes software developed by the
- * Apache Software Foundation (http://www.apache.org/)."
- * Alternately, this acknowledgment may appear in the software itself,
- * if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Apache" and "Apache Software Foundation" must
- * not be used to endorse or promote products derived from this
- * software without prior written permission. For written
- * permission, please contact [email protected].
- *
- * 5. Products derived from this software may not be called "Apache",
- * nor may "Apache" appear in their name, without prior written
- * permission of the Apache Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED ``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 APACHE SOFTWARE FOUNDATION 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 Apache Software Foundation. For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- *
- * Portions of this software are based upon public domain software
- * originally written at the National Center for Supercomputing Applications,
- * University of Illinois, Urbana-Champaign.
- */
-
-/*
- * Copyright 2007 Sun Microsystems, Inc. All rights reserved.
- * Use is subject to license terms.
- */
-
-#pragma ident "@(#)mod_auth_gss.c 1.1 07/01/18 SMI"
-
-
-#include <sys/types.h>
-#include <strings.h>
-
-#include "httpd.h"
-#include "http_config.h"
-#include "http_core.h"
-#include "http_log.h"
-#include "http_protocol.h"
-#include "http_request.h"
-
-#include <gssapi/gssapi.h>
-#include <gssapi/gssapi_ext.h>
-
-module auth_gss_module;
-
-static void *gss_create_dir_config(pool *, char *);
-
-int gss_authenticate(request_rec *);
-
-typedef struct {
- char *gss_service_name;
- char *keytab_file;
- int gss_debug;
-} gss_auth_config;
-
-static const command_rec gss_auth_cmds[] = {
- { "ServiceName",
- ap_set_string_slot,
- (void *)XtOffsetOf(gss_auth_config, gss_service_name),
- OR_AUTHCFG,
- TAKE1,
- "Service name used for authentication."
- },
-
- { "KeytabFile",
- ap_set_file_slot,
- (void *)XtOffsetOf(gss_auth_config, keytab_file),
- OR_AUTHCFG,
- TAKE1,
- "Location of Kerberos V5 keytab file."
- },
-
- { "GssDebug",
- ap_set_flag_slot,
- (void *)XtOffsetOf(gss_auth_config, gss_debug),
- OR_AUTHCFG,
- TAKE1,
- "Enable debug logging in error_log"
- },
- { NULL }
-};
-
-module MODULE_VAR_EXPORT auth_gss_module = {
- STANDARD_MODULE_STUFF,
- NULL, /* module initializer */
- gss_create_dir_config, /* per-directory config creator */
- NULL, /* per-directory config merger */
- NULL, /* per-server config creator */
- NULL, /* per-server config merger */
- gss_auth_cmds, /* command table */
- NULL, /* [ 9] content handlers */
- NULL, /* [ 2] URI-to-filename translation */
- gss_authenticate, /* [ 5] check/validate user_id */
- NULL, /* [ 6] check user_id is valid *here* */
- NULL, /* [ 4] check access by host address */
- NULL, /* [ 7] MIME type checker/setter */
- NULL, /* [ 8] fixups */
- NULL, /* [10] logger */
- NULL, /* [ 3] header parser */
- NULL, /* process initialization */
- NULL, /* process exit/cleanup */
- NULL /* [ 1] post read_request handling */
-};
-
-typedef struct {
- gss_ctx_id_t context;
- gss_cred_id_t server_creds;
-} gss_connection_t;
-
-static gss_connection_t *gss_connection = NULL;
-
-static void *
-gss_create_dir_config(pool *p, char *d)
-{
- gss_auth_config *rec =
- (gss_auth_config *) ap_pcalloc(p, sizeof(gss_auth_config));
-
- ((gss_auth_config *)rec)->gss_service_name = "HTTP";
- ((gss_auth_config *)rec)->keytab_file = "/var/apache/http.keytab";
- ((gss_auth_config *)rec)->gss_debug = 0;
-
- return rec;
-}
-
-void log_rerror(const char *file, int line, int level, int status,
- const request_rec *r, const char *fmt, ...)
-{
- char errstr[1024];
- va_list ap;
-
- va_start(ap, fmt);
- vsnprintf(errstr, sizeof(errstr), fmt, ap);
- va_end(ap);
-
- ap_log_rerror(file, line, level | APLOG_NOERRNO, r, "%s", errstr);
-}
-
-/*********************************************************************
- * GSSAPI Authentication
- ********************************************************************/
-static const char *
-gss_error_msg(pool *p, OM_uint32 maj, OM_uint32 min, char *prefix)
-{
- OM_uint32 maj_stat, min_stat;
- OM_uint32 msg_ctx = 0;
- gss_buffer_desc msg;
-
- char *err_msg = (char *)ap_pstrdup(p, prefix);
- do {
- maj_stat = gss_display_status (&min_stat,
- maj, GSS_C_GSS_CODE, GSS_C_NO_OID,
- &msg_ctx, &msg);
- if (GSS_ERROR(maj_stat))
- break;
-
- err_msg = ap_pstrcat(p, err_msg, ": ", (char*) msg.value, NULL);
- (void) gss_release_buffer(&min_stat, &msg);
-
- maj_stat = gss_display_status (&min_stat,
- min, GSS_C_MECH_CODE, GSS_C_NULL_OID,
- &msg_ctx, &msg);
-
- if (!GSS_ERROR(maj_stat)) {
- err_msg = ap_pstrcat(p, err_msg,
- " (", (char*) msg.value, ")", NULL);
- (void) gss_release_buffer(&min_stat, &msg);
- }
- } while (!GSS_ERROR(maj_stat) && msg_ctx != 0);
-
- return (err_msg);
-}
-
-static void
-cleanup_gss_connection(void *data)
-{
- OM_uint32 ret;
- OM_uint32 minor_status;
- gss_connection_t *gss_conn = (gss_connection_t *)data;
-
- if (data == NULL)
- return;
-
- if (gss_conn->context != GSS_C_NO_CONTEXT) {
- (void) gss_delete_sec_context(&minor_status,
- &gss_conn->context, GSS_C_NO_BUFFER);
- }
-
- if (gss_conn->server_creds != GSS_C_NO_CREDENTIAL) {
- (void) gss_release_cred(&minor_status, &gss_conn->server_creds);
- }
-
- gss_connection = NULL;
-
- return;
-}
-
-static int
-acquire_server_creds(request_rec *r,
- gss_auth_config *conf,
- gss_OID_set mechset,
- gss_cred_id_t *server_creds)
-{
- int ret = 0;
- gss_buffer_desc input_token = GSS_C_EMPTY_BUFFER;
- OM_uint32 major_status, minor_status, minor_status2;
- gss_name_t server_name = GSS_C_NO_NAME;
- char buf[1024];
-
- snprintf(buf, sizeof(buf), "%s@%s",
- conf->gss_service_name, r->hostname);
-
- if (conf->gss_debug)
- log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
- "acquire_server_creds for %s", buf);
-
- input_token.value = buf;
- input_token.length = strlen(buf) + 1;
-
- major_status = gss_import_name(&minor_status, &input_token,
- GSS_C_NT_HOSTBASED_SERVICE, &server_name);
-
- if (GSS_ERROR(major_status)) {
- log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
- "%s", gss_error_msg(r->pool, major_status, minor_status,
- "gss_import_name() failed"));
- return (HTTP_INTERNAL_SERVER_ERROR);
- }
-
- major_status = gss_acquire_cred(&minor_status, server_name,
- GSS_C_INDEFINITE, mechset, GSS_C_ACCEPT,
- server_creds, NULL, NULL);
-
- if (GSS_ERROR(major_status)) {
- log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
- "%s", gss_error_msg(r->pool, major_status, minor_status,
- "gss_acquire_cred() failed"));
- ret = HTTP_INTERNAL_SERVER_ERROR;
- }
- (void) gss_release_name(&minor_status2, &server_name);
-
- return (ret);
-}
-
-static int
-authenticate_user_gss(request_rec *r, gss_auth_config *conf,
- const char *auth_line, char **negotiate_ret_value)
-{
- int ret = 0;
- OM_uint32 major_status, minor_status, minor_status2;
- gss_buffer_desc input_token = GSS_C_EMPTY_BUFFER;
- gss_buffer_desc output_token = GSS_C_EMPTY_BUFFER;
- const char *auth_param = NULL;
- gss_name_t client_name = GSS_C_NO_NAME;
- gss_cred_id_t delegated_cred = GSS_C_NO_CREDENTIAL;
-
- if (conf->gss_debug)
- log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
- "authenticate_user_gss called");
-
- *negotiate_ret_value = (char *)"";
-
- if (gss_connection == NULL) {
- gss_connection = ap_pcalloc(r->connection->pool, sizeof(*gss_connection));
- if (gss_connection == NULL) {
- log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
- "ap_pcalloc() failed (not enough memory)");
- ret = HTTP_INTERNAL_SERVER_ERROR;
- goto end;
- }
- (void) memset(gss_connection, 0, sizeof(*gss_connection));
- ap_register_cleanup(r->connection->pool, gss_connection,
- cleanup_gss_connection, ap_null_cleanup);
- }
-
- if (conf->keytab_file) {
- char *ktname;
- /*
- * We don't use the ap_* calls here, since the string passed to putenv()
- * will become part of the enviroment and shouldn't be free()ed by apache
- */
- ktname = malloc(strlen("KRB5_KTNAME=") + strlen(conf->keytab_file) + 1);
- if (ktname == NULL) {
- log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
- "malloc() failed: not enough memory");
- ret = HTTP_INTERNAL_SERVER_ERROR;
- goto end;
- }
- /*
- * Put the keytab name in the environment so that Kerberos
- * knows where to look later.
- */
- sprintf(ktname, "KRB5_KTNAME=%s", conf->keytab_file);
- putenv(ktname);
- if (conf->gss_debug)
- log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
- "Using keytab: %s", ktname);
- }
-
- /* ap_getword() shifts parameter */
- auth_param = ap_getword_white(r->pool, &auth_line);
- if (auth_param == NULL) {
- log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
- "No Authorization parameter in request from client");
- ret = HTTP_UNAUTHORIZED;
- goto end;
- }
-
- input_token.length = ap_base64decode_len(auth_param) + 1;
- input_token.value = ap_pcalloc(r->connection->pool, input_token.length);
-
- if (input_token.value == NULL) {
- log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
- "ap_pcalloc() failed (not enough memory)");
- ret = HTTP_INTERNAL_SERVER_ERROR;
- goto end;
- }
- input_token.length = ap_base64decode(input_token.value, auth_param);
-
- if (gss_connection->server_creds == GSS_C_NO_CREDENTIAL) {
- gss_OID_set_desc desiredMechs;
- gss_OID_desc client_mech_desc;
- gss_OID client_mechoid = &client_mech_desc;
- char *mechstr = NULL;
-
- if (!__gss_get_mech_type(client_mechoid, &input_token)) {
- mechstr = (char *)__gss_oid_to_mech(client_mechoid);
- }
- if (mechstr == NULL) {
- client_mechoid = GSS_C_NULL_OID;
- mechstr = "<unknown>";
- }
-
- if (conf->gss_debug)
- log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
- "Client wants GSS mech: %s", mechstr);
-
- desiredMechs.count = 1;
- desiredMechs.elements = client_mechoid;
-
- /* Get creds using the mechanism that the client requested */
- ret = acquire_server_creds(r, conf, &desiredMechs,
- &gss_connection->server_creds);
- if (ret)
- goto end;
- }
- /*
- * Try to display the server creds information.
- */
- if (conf->gss_debug) {
- gss_name_t sname;
- gss_buffer_desc dname;
-
- major_status = gss_inquire_cred(&minor_status,
- gss_connection->server_creds,
- &sname, NULL, NULL, NULL);
- if (major_status == GSS_S_COMPLETE) {
- major_status = gss_display_name(&minor_status,
- sname, &dname, NULL);
- }
- if (major_status == GSS_S_COMPLETE) {
- log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
- "got server creds for: %.*s",
- (int)dname.length,
- (char *)dname.value);
- (void) gss_release_name(&minor_status, &sname);
- (void) gss_release_buffer(&minor_status, &dname);
- }
- }
-
- major_status = gss_accept_sec_context(&minor_status,
- &gss_connection->context,
- gss_connection->server_creds,
- &input_token,
- GSS_C_NO_CHANNEL_BINDINGS,
- &client_name,
- NULL,
- &output_token,
- NULL,
- NULL,
- &delegated_cred);
-
- if (output_token.length) {
- char *token = NULL;
- size_t len;
-
- len = ap_base64encode_len(output_token.length) + 1;
- token = ap_pcalloc(r->connection->pool, len + 1);
- if (token == NULL) {
- log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
- "ap_pcalloc() failed (not enough memory)");
- ret = HTTP_INTERNAL_SERVER_ERROR;
- gss_release_buffer(&minor_status2, &output_token);
- goto end;
- }
- ap_base64encode(token, output_token.value, output_token.length);
- token[len] = '\0';
- *negotiate_ret_value = token;
- }
-
- if (GSS_ERROR(major_status)) {
- log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
- "%s", gss_error_msg(r->pool, major_status, minor_status,
- "gss_accept_sec_context() failed"));
- /* Don't offer the Negotiate method again if call to GSS layer failed */
- *negotiate_ret_value = NULL;
- ret = HTTP_UNAUTHORIZED;
- goto end;
- }
-
- if (major_status == GSS_S_CONTINUE_NEEDED) {
- /*
- * Some GSSAPI mechanisms may require multiple iterations to
- * establish authentication. Most notably, when MUTUAL_AUTHENTICATION
- * flag is used, multiple round trips are needed.
- */
- ret = HTTP_UNAUTHORIZED;
- goto end;
- }
-
- if (client_name != GSS_C_NO_NAME) {
- gss_buffer_desc name_token = GSS_C_EMPTY_BUFFER;
-
- major_status = gss_display_name(&minor_status, client_name,
- &name_token, NULL);
-
- if (GSS_ERROR(major_status)) {
- log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
- "%s", gss_error_msg(r->pool, major_status, minor_status,
- "gss_export_name() failed"));
- ret = HTTP_INTERNAL_SERVER_ERROR;
- goto end;
- }
- if (name_token.length) {
- r->connection->user = ap_pstrdup(r->pool, name_token.value);
- gss_release_buffer(&minor_status, &name_token);
- }
- if (conf->gss_debug)
- log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
- "Authenticated user: %s",
- r->connection->user ?
- r->connection->user : "<unknown>");
-
- }
-
- r->connection->ap_auth_type = "Negotiate";
- ret = OK;
-
-end:
- if (delegated_cred)
- gss_release_cred(&minor_status, &delegated_cred);
-
- if (output_token.length)
- gss_release_buffer(&minor_status, &output_token);
-
- if (client_name != GSS_C_NO_NAME)
- gss_release_name(&minor_status, &client_name);
-
- cleanup_gss_connection(gss_connection);
-
- return ret;
-}
-
-static int
-already_succeeded(request_rec *r)
-{
- if (ap_is_initial_req(r) || r->connection->ap_auth_type == NULL)
- return 0;
-
- return (strcmp(r->connection->ap_auth_type, "Negotiate") ||
- (strcmp(r->connection->ap_auth_type, "Basic") &&
- strchr(r->connection->user, '@')));
-}
-
-static void
-note_gss_auth_failure(request_rec *r, const gss_auth_config *conf,
- char *negotiate_ret_value)
-{
- const char *auth_name = NULL;
- int set_basic = 0;
- char *negoauth_param;
-
- /* get the user realm specified in .htaccess */
- auth_name = ap_auth_name(r);
-
- if (conf->gss_debug)
- log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
- "note_gss_auth_failure: auth_name = %s",
- auth_name ? auth_name : "<undefined>");
-
- if (negotiate_ret_value != NULL) {
- negoauth_param = (*negotiate_ret_value == '\0') ? "Negotiate" :
- ap_pstrcat(r->pool, "Negotiate ", negotiate_ret_value, NULL);
- ap_table_add(r->err_headers_out, "WWW-Authenticate", negoauth_param);
- }
-}
-
-int gss_authenticate(request_rec *r)
-{
- int ret;
- gss_auth_config *conf =
- (gss_auth_config *) ap_get_module_config(r->per_dir_config,
- &auth_gss_module);
- const char *auth_type = NULL;
- const char *auth_line = NULL;
- const char *type = NULL;
- char *negotiate_ret_value;
- static int last_return = HTTP_UNAUTHORIZED;
-
- /* get the type specified in .htaccess */
- type = ap_auth_type(r);
-
- if (conf->gss_debug)
- log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
- "gss_authenticate: type = %s", type);
-
- if (type == NULL || (strcasecmp(type, "GSSAPI") != 0)) {
- return DECLINED;
- }
-
- /* get what the user sent us in the HTTP header */
- auth_line = ap_table_get(r->headers_in, "Authorization");
-
- if (!auth_line) {
- if (conf->gss_debug)
- log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
- "No authentication data found");
- note_gss_auth_failure(r, conf, "\0");
- return HTTP_UNAUTHORIZED;
- }
- auth_type = ap_getword_white(r->pool, &auth_line);
-
- if (already_succeeded(r))
- return last_return;
-
- if (strcasecmp(auth_type, "Negotiate") == 0) {
- ret = authenticate_user_gss(r, conf, auth_line, &negotiate_ret_value);
- } else {
- ret = HTTP_UNAUTHORIZED;
- }
-
- if (ret == HTTP_UNAUTHORIZED) {
- if (conf->gss_debug)
- log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
- "Authentication failed.");
- note_gss_auth_failure(r, conf, negotiate_ret_value);
- }
-
- last_return = ret;
- return ret;
-}
-
-
--- a/usr/src/cmd/apache/mod_auth_gss/mod_auth_gss.html Sat Oct 30 12:35:08 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,174 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
- <meta name="generator" content="HTML Tidy, see www.w3.org" />
-
- <title>Apache module mod_auth_gss</title>
- </head>
- <!-- Background white, links blue (unvisited), navy (visited), red (active) -->
-
- <body bgcolor="#FFFFFF" text="#000000" link="#0000FF"
- vlink="#000080" alink="#FF0000">
- <div align="CENTER">
- <img src="../images/sub.gif" alt="[APACHE DOCUMENTATION]" />
-
- <h3>Apache HTTP Server Version 1.3</h3>
- </div>
-
- <h1 align="CENTER">Module mod_auth_gss</h1>
- <p>This module provides for user authentication using GSSAPI Authentication.</p>
-
- <p><a href="module-dict.html#Status"
- rel="Help"><strong>Status:</strong></a> Extension<br />
- <a href="module-dict.html#SourceFile"
- rel="Help"><strong>Source File:</strong></a> mod_auth_gss.c<br />
- <a href="module-dict.html#ModuleIdentifier"
- rel="Help"><strong>Module Identifier:</strong></a>
- auth_gss_module<br />
-
- <h2>Summary</h2>
-
- <p>This module implements GSSAPI authentication using the
- "WWW-Authenticate: Negotiate" protocol. This typically
- requires the client and the server systems to have support for
- GSSAPI and a properly configured security mechanism (usually
- Kerberos V5) to be used by GSSAPI.
-
- <h2>Directives</h2>
-
- <ul>
- <li><a href="#authgssservicename">AuthGSSServiceName</a></li>
- <li><a href="#authgsskeytabfile">AuthGSSKeytabFile</a></li>
- <li><a href="#aughgssdebug">AuthGSSDebug</a></li>
- </ul>
-
- <h2>Using GSSAPI Authentication</h2>
-
- <p>Before using GSSAPI authentication with Apache, the
- system must already have been configured to use Kerberos V5
- authentication. All of the major Kerberos V5
- implementation (MIT KRB5, Heimdal, Sun, IBM, HP, Microsoft)
- currently support Kerberos V5 GSSAPI mechanisms.
- Configuring Kerberos is beyond the scope of this document.
- Adding GSSAPI authentication support to the web extends
- Single sign on capabilities to the intranet and reduces
- the risks involved in having users constantly entering
- username/password combinations when accessing websites.
- <p>
- <h3>Configure a Service Principal</h3>
- <p>The default service principal that mod_auth_gss will
- try to use is "HTTP/f.q.d.n". The key for this principal
- must be stored in a keytab file that is readable by the
- Apache server, but it should be protected from access
- by anyone else, and should <b>definitely not</b> be
- stored in an area that can be browsed by clients.
- <p>
- Example: the Apache server is on host "www.foo.com".
- Create a principal called "HTTP/www.foo.com".
- Store the key for this principal in a protected keytab
- file. Using MIT Kerberos V5:
- <br>
- <pre>
- $ kadmin
- $ kadmin> ktadd -k /var/apache/http.keytab HTTP/www.foo.com
- $ kadmin> quit
- </pre>
-
- <p>Once the keys are created and stored, using GSSAPI
- authentication is very simple. Set up the authentication
- type for the directories being protected to be "GSSAPI".
- If the keytab or service name chosen is not the defaults
- ("HTTP" and "/var/apache/http.keytab", respectively), then
- you may use the above mentioned directives to override
- the default values. Example:
-<br>
-<pre>
-<Directory /var/apache/htdocs/krb5>
- AuthType GSSAPI
- ServiceName HTTP
- KeytabFile /var/apache/http.keytab
- GssDebug 0
- Require valid-user
- AllowOverride All
-</Directory>
-</pre>
-
- <p>GSSAPI authentication provides a more secure authentication
- system, but only works with supporting browsers. As of this writing
- (April 2004), the only major browsers which support digest
- authentication are <a href="http://www.mozilla.org">Mozilla 1.7
- (and later)</a>, and <a href="http://www.microsoft.com/windows/ie/">MS Internet
- Explorer 5.0</a>.
-
- <p>It is recommended that this authentication method be combined
- with TLS security (mod_ssl, for example) to further secure the
- authentication data being exchanged.
-
- <h2><a id="authgssservicename"
- name="authgssservicename">AuthGSSServiceName</a> directive</h2>
- <a href="directive-dict.html#Syntax"
- rel="Help"><strong>Syntax:</strong></a> AuthGSSServiceName
- <em>name</em><br />
- <a href="directive-dict.html#Context"
- rel="Help"><strong>Context:</strong></a> directory,
- .htaccess<br />
- <a href="directive-dict.html#Override"
- rel="Help"><strong>Override:</strong></a> FileInfo, Indexes, Limit, Options<br />
- <a href="directive-dict.html#Status"
- rel="Help"><strong>Status:</strong></a> Extension<br />
- <a href="directive-dict.html#Module"
- rel="Help"><strong>Module:</strong></a> mod_auth_gss
-
- <p>The AuthGSSServiceName directive sets the name of Kerberos service
- principal that the server uses to authenticate the client requests.
- The name given is appended with the fully qualified host name to
- make the complete service principal name. Ex: <b>HTTP/www.fooc.om</b>
- </p>
-
- <h2><a id="authgsskeytabfile"
- name="authgsskeytabfile">AuthGSSKeytabFile</a> directive</h2>
- <a href="directive-dict.html#Syntax"
- rel="Help"><strong>Syntax:</strong></a> AuthGSSKeytabFile
- <em>filename</em><br />
- <a href="directive-dict.html#Context"
- rel="Help"><strong>Context:</strong></a> directory,
- .htaccess<br />
- <a href="directive-dict.html#Override"
- rel="Help"><strong>Override:</strong></a> FileInfo, Indexes, Limit, Options<br />
- <a href="directive-dict.html#Status"
- rel="Help"><strong>Status:</strong></a> Extension<br />
- <a href="directive-dict.html#Module"
- rel="Help"><strong>Module:</strong></a> mod_auth_gss
-
- <p>The AuthGSSKeytabFile directive sets the filename of the
- file where the Apache server's Kerberos credentials are stored.
-
- <h2><a id="authgssdebug"
- name="authgsskeytabfile">AuthGSSDebug</a> directive</h2>
- <a href="directive-dict.html#Syntax"
- rel="Help"><strong>Syntax:</strong></a> AuthGSSDebug
- <em>0 | 1</em><br />
- <a href="directive-dict.html#Context"
- rel="Help"><strong>Context:</strong></a> directory,
- .htaccess<br />
- <a href="directive-dict.html#Override"
- rel="Help"><strong>Override:</strong></a> FileInfo, Indexes, Limit, Options<br />
- <a href="directive-dict.html#Status"
- rel="Help"><strong>Status:</strong></a> Extension<br />
- <a href="directive-dict.html#Module"
- rel="Help"><strong>Module:</strong></a> mod_auth_gss
-
- <p>The AuthGSSDebug directive toggles the debug logging
- facility used by the GSSAPI authentication module. 0 disables
- debug logging, 1 enables it.
-
- <hr />
- <h3 align="CENTER">Apache HTTP Server Version 1.3</h3>
- <a href="./"><img src="../images/index.gif" alt="Index" /></a>
- <a href="../"><img src="../images/home.gif" alt="Home" /></a>
-
- </body>
-</html>
-
Binary file usr/src/cmd/apache/mod_perl-1.31.tar.gz has changed
Binary file usr/src/cmd/apache/mod_ssl-2.8.31-1.3.41.tar.gz has changed
--- a/usr/src/cmd/apache/perlbug38084.patch Sat Oct 30 12:35:08 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
---- mod_perl-1.31/lib/Apache/SizeLimit.pm.orig Mon Nov 23 02:34:21 2009
-+++ mod_perl-1.31/lib/Apache/SizeLimit.pm Mon Nov 23 04:09:45 2009
-@@ -174,8 +174,9 @@
- }
-
- BEGIN {
-+ my ($major,$minor) = split(/\./, $Config{'osvers'});
- if ( $Config{'osname'} eq 'solaris'
-- && $Config{'osvers'} >= 2.6 ) {
-+ && (($major > 2) || ($major == 2 && $minor >= 6))) {
- *_platform_check_size = \&_solaris_2_6_size_check;
- *_platform_getppid = \&_perl_getppid;
- }
Binary file usr/src/cmd/apache/tomcat-connectors-1.2.27-src.tar.gz has changed
--- a/usr/src/cmd/bash/METADATA Sat Oct 30 12:35:08 2010 -0700
+++ b/usr/src/cmd/bash/METADATA Tue Nov 16 22:41:08 2010 -0800
@@ -1,10 +1,10 @@
NAME: bash
-VERSION: 4.0
+VERSION: 4.1
DESCRIPTION: GNU Bourne Again Shell
LICENSE: GPLv3, GFDLv1.2
PACKAGE: SUNWbash
PROJECT_URL: http://www.gnu.org/software/bash/bash.html
-SOURCE_DOWNLOAD: ftp://ftp.gnu.org/gnu/bash/bash-4.0.tar.gz
+SOURCE_DOWNLOAD: ftp://ftp.gnu.org/gnu/bash/bash-4.1.tar.gz
SUPPORT: B
BUGTRAQ: solaris/utility/bash
OSR: 12655
@@ -59,11 +59,7 @@
===============================================================
-Known Bugs:
-
-Memory leak within read builtin in both bash 4.0.x and 3.[12].x:
+All upstream bash 4.1 patches are incorporated in this release.
-http://www.mail-archive.com/[email protected]/msg05774.html
+===============================================================
------
-
--- a/usr/src/cmd/bash/Makefile.sfw Sat Oct 30 12:35:08 2010 -0700
+++ b/usr/src/cmd/bash/Makefile.sfw Tue Nov 16 22:41:08 2010 -0800
@@ -19,10 +19,9 @@
#
# CDDL HEADER END
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright 2001, 2010, Oracle and/or its affiliates. All rights reserved.
#
-# ident "@(#)Makefile.sfw 1.18 09/10/05 SMI"
+# ident "@(#)Makefile.sfw 1.19 10/11/08 SMI"
#
VER = $(COMPONENT_NAME:sh)-$(COMPONENT_VERSION:sh)
@@ -97,7 +96,7 @@
( cd $(VER) ; env "DESTDIR=$(DESTDIR)" \
$(GMAKE) DESTDIR=$(DESTDIR) \
INSTALL=$(GINSTALL) install )
- INSTDIR=$(DESTDIR) SCRIPTDIR=$(SCRIPTDIR) $(SH) ./install-sfw
+ INSTDIR=$(DESTDIR) SCRIPTDIR=$(SCRIPTDIR) VERS=$(VER) $(SHELL) ./install-sfw
$(VER)/configure: $(VER)/$(SFW_STAMP_UNPACKED)
@@ -105,7 +104,7 @@
( cd $(VER) ; \
cp -fp ../Solaris/apply_patches.sh . ; \
chmod 0755 ./apply_patches.sh ; \
- $(SH) ./apply_patches.sh )
+ $(SHELL) ./apply_patches.sh )
$(VER)/config.status: $(VER)/apply_patches.sh
(cd $(VER); env - $(TARGET_ENV) \
--- a/usr/src/cmd/bash/Patches-4.0/bash40-001 Sat Oct 30 12:35:08 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,162 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.0
-Patch-ID: bash40-001
-
-Bug-Reported-by: Mike Frysinger <[email protected]>
-Bug-Reference-ID: <[email protected]>
-Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2009-02/msg00147.html
-
-Bug-Description:
-
-Bash has problems parsing certain constructs inside Posix-style $(...)
-command substitutions, mostly with backslash-quoting and reserved word
-recognition. This is an issue because the contents are parsed at the
-time the word containing the command substitution is read.
-
-Patch:
-
-*** ../bash-4.0/parse.y 2009-01-08 08:29:12.000000000 -0500
---- parse.y 2009-03-06 20:32:35.000000000 -0500
-***************
-*** 2928,2931 ****
---- 2932,2936 ----
- #define LEX_HEREDELIM 0x100 /* reading here-doc delimiter */
- #define LEX_STRIPDOC 0x200 /* <<- strip tabs from here doc delim */
-+ #define LEX_INWORD 0x400
-
- #define COMSUB_META(ch) ((ch) == ';' || (ch) == '&' || (ch) == '|')
-***************
-*** 3180,3184 ****
- int *lenp, flags;
- {
-! int count, ch, peekc, tflags, lex_rwlen, lex_firstind;
- int nestlen, ttranslen, start_lineno;
- char *ret, *nestret, *ttrans, *heredelim;
---- 3188,3192 ----
- int *lenp, flags;
- {
-! int count, ch, peekc, tflags, lex_rwlen, lex_wlen, lex_firstind;
- int nestlen, ttranslen, start_lineno;
- char *ret, *nestret, *ttrans, *heredelim;
-***************
-*** 3201,3205 ****
-
- start_lineno = line_number;
-! lex_rwlen = 0;
-
- heredelim = 0;
---- 3209,3213 ----
-
- start_lineno = line_number;
-! lex_rwlen = lex_wlen = 0;
-
- heredelim = 0;
-***************
-*** 3268,3271 ****
---- 3276,3319 ----
- }
-
-+ if (tflags & LEX_PASSNEXT) /* last char was backslash */
-+ {
-+ /*itrace("parse_comsub:%d: lex_passnext -> 0 ch = `%c' (%d)", line_number, ch, __LINE__);*/
-+ tflags &= ~LEX_PASSNEXT;
-+ if (qc != '\'' && ch == '\n') /* double-quoted \<newline> disappears. */
-+ {
-+ if (retind > 0)
-+ retind--; /* swallow previously-added backslash */
-+ continue;
-+ }
-+
-+ RESIZE_MALLOCED_BUFFER (ret, retind, 2, retsize, 64);
-+ if MBTEST(ch == CTLESC || ch == CTLNUL)
-+ ret[retind++] = CTLESC;
-+ ret[retind++] = ch;
-+ continue;
-+ }
-+
-+ /* If this is a shell break character, we are not in a word. If not,
-+ we either start or continue a word. */
-+ if MBTEST(shellbreak (ch))
-+ {
-+ tflags &= ~LEX_INWORD;
-+ /*itrace("parse_comsub:%d: lex_inword -> 0 ch = `%c' (%d)", line_number, ch, __LINE__);*/
-+ }
-+ else
-+ {
-+ if (tflags & LEX_INWORD)
-+ {
-+ lex_wlen++;
-+ /*itrace("parse_comsub:%d: lex_inword == 1 ch = `%c' lex_wlen = %d (%d)", line_number, ch, lex_wlen, __LINE__);*/
-+ }
-+ else
-+ {
-+ /*itrace("parse_comsub:%d: lex_inword -> 1 ch = `%c' (%d)", line_number, ch, __LINE__);*/
-+ tflags |= LEX_INWORD;
-+ lex_wlen = 0;
-+ }
-+ }
-+
- /* Skip whitespace */
- if MBTEST(shellblank (ch) && lex_rwlen == 0)
-***************
-*** 3400,3428 ****
- }
- else
-! ch = peekc; /* fall through and continue XXX - this skips comments if peekc == '#' */
- }
-! /* Not exactly right yet, should handle shell metacharacters, too. If
-! any changes are made to this test, make analogous changes to subst.c:
-! extract_delimited_string(). */
-! else if MBTEST((tflags & LEX_CKCOMMENT) && (tflags & LEX_INCOMMENT) == 0 && ch == '#' && (retind == 0 || ret[retind-1] == '\n' || shellblank (ret[retind - 1])))
- tflags |= LEX_INCOMMENT;
-
-! if (tflags & LEX_PASSNEXT) /* last char was backslash */
-! {
-! tflags &= ~LEX_PASSNEXT;
-! if (qc != '\'' && ch == '\n') /* double-quoted \<newline> disappears. */
-! {
-! if (retind > 0)
-! retind--; /* swallow previously-added backslash */
-! continue;
-! }
-!
-! RESIZE_MALLOCED_BUFFER (ret, retind, 2, retsize, 64);
-! if MBTEST(ch == CTLESC || ch == CTLNUL)
-! ret[retind++] = CTLESC;
-! ret[retind++] = ch;
-! continue;
-! }
-! else if MBTEST(ch == CTLESC || ch == CTLNUL) /* special shell escapes */
- {
- RESIZE_MALLOCED_BUFFER (ret, retind, 2, retsize, 64);
---- 3442,3454 ----
- }
- else
-! ch = peekc; /* fall through and continue XXX */
- }
-! else if MBTEST((tflags & LEX_CKCOMMENT) && (tflags & LEX_INCOMMENT) == 0 && ch == '#' && (((tflags & LEX_RESWDOK) && lex_rwlen == 0) || ((tflags & LEX_INWORD) && lex_wlen == 0)))
-! {
-! /*itrace("parse_comsub:%d: lex_incomment -> 1 (%d)", line_number, __LINE__);*/
- tflags |= LEX_INCOMMENT;
-+ }
-
-! if MBTEST(ch == CTLESC || ch == CTLNUL) /* special shell escapes */
- {
- RESIZE_MALLOCED_BUFFER (ret, retind, 2, retsize, 64);
-*** ../bash-4.0/patchlevel.h 2009-01-04 14:32:40.000000000 -0500
---- patchlevel.h 2009-02-22 16:11:31.000000000 -0500
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 0
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 1
-
- #endif /* _PATCHLEVEL_H_ */
--- a/usr/src/cmd/bash/Patches-4.0/bash40-002 Sat Oct 30 12:35:08 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.0
-Patch-ID: bash40-002
-
-Bug-Reported-by: [email protected]
-Bug-Reference-ID: <[email protected]>
-Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2009-02/msg00142.html
-
-Bug-Description:
-
-A line inadvertenly omitted from a submitted patch results in core dumps
-when attempting filename completion while using the bash-completion
-package.
-
-Patch:
-
-*** ../bash-4.0/pcomplete.c 2009-02-01 17:12:31.000000000 -0500
---- pcomplete.c 2009-02-22 17:08:25.000000000 -0500
-***************
-*** 1033,1036 ****
---- 1033,1037 ----
-
- pps = &ps;
-+ save_parser_state (pps);
- begin_unwind_frame ("gen-shell-function-matches");
- add_unwind_protect (restore_parser_state, (char *)pps);
-*** ../bash-4.0/patchlevel.h 2009-01-04 14:32:40.000000000 -0500
---- patchlevel.h 2009-02-22 16:11:31.000000000 -0500
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 1
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 2
-
- #endif /* _PATCHLEVEL_H_ */
--- a/usr/src/cmd/bash/Patches-4.0/bash40-003 Sat Oct 30 12:35:08 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,70 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.0
-Patch-ID: bash40-003
-
-Bug-Reported-by: Bernd Eggink <[email protected]>
-Bug-Reference-ID: <[email protected]>
-Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2009-02/msg00177.html
-
-Bug-Description:
-
-Under certain circumstances, constructs containing command substitutions
-prevent PS1 from being re-evaluated and updated before being displayed.
-
-Patch:
-
-*** ../bash-4.0/parse.y 2009-01-08 08:29:12.000000000 -0500
---- parse.y 2009-02-25 15:58:25.000000000 -0500
-***************
-*** 1616,1623 ****
- int *ret;
-
-! ret = (int *)xmalloc (3 * sizeof (int));
- ret[0] = last_read_token;
- ret[1] = token_before_that;
- ret[2] = two_tokens_ago;
- return ret;
- }
---- 1616,1624 ----
- int *ret;
-
-! ret = (int *)xmalloc (4 * sizeof (int));
- ret[0] = last_read_token;
- ret[1] = token_before_that;
- ret[2] = two_tokens_ago;
-+ ret[3] = current_token;
- return ret;
- }
-***************
-*** 1632,1635 ****
---- 1633,1637 ----
- token_before_that = ts[1];
- two_tokens_ago = ts[2];
-+ current_token = ts[3];
- }
-
-***************
-*** 2669,2672 ****
---- 2671,2675 ----
- word_desc_to_read = (WORD_DESC *)NULL;
-
-+ current_token = '\n'; /* XXX */
- last_read_token = '\n';
- token_to_read = '\n';
-*** ../bash-4.0/patchlevel.h 2009-01-04 14:32:40.000000000 -0500
---- patchlevel.h 2009-02-22 16:11:31.000000000 -0500
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 2
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 3
-
- #endif /* _PATCHLEVEL_H_ */
--- a/usr/src/cmd/bash/Patches-4.0/bash40-004 Sat Oct 30 12:35:08 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.0
-Patch-ID: bash40-004
-
-Bug-Reported-by: Mike Frysinger <[email protected]>
-Bug-Reference-ID: <[email protected]>
-Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2009-02/msg00176.html
-
-Bug-Description:
-
-In some cases, enabling the `checkjobs' shell option will cause the shell
-to core dump when executing the `exit' builtin.
-
-Patch:
-
-*** ../bash-4.0/builtins/exit.def 2009-01-04 14:32:22.000000000 -0500
---- builtins/exit.def 2009-02-23 22:56:58.000000000 -0500
-***************
-*** 114,118 ****
- if (jobs[i] && STOPPED (i))
- stopmsg = JSTOPPED;
-! else if (check_jobs_at_exit && stopmsg == 0 && RUNNING (i))
- stopmsg = JRUNNING;
-
---- 114,118 ----
- if (jobs[i] && STOPPED (i))
- stopmsg = JSTOPPED;
-! else if (check_jobs_at_exit && stopmsg == 0 && jobs[i] && RUNNING (i))
- stopmsg = JRUNNING;
-
-*** ../bash-4.0/patchlevel.h 2009-01-04 14:32:40.000000000 -0500
---- patchlevel.h 2009-02-22 16:11:31.000000000 -0500
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 3
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 4
-
- #endif /* _PATCHLEVEL_H_ */
--- a/usr/src/cmd/bash/Patches-4.0/bash40-005 Sat Oct 30 12:35:08 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,63 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.0
-Patch-ID: bash40-005
-
-Bug-Reported-by: Pierre Gaston <[email protected]>
-Bug-Reference-ID: <[email protected]>
-Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2009-02/msg00206.html
-
-Bug-Description:
-
-The `declare' builtin dumped core when attempting to assign associative
-array indices containing some special characters, even when they were
-quoted before being expanded.
-
-Patch:
-
-*** ../bash-4.0/builtins/declare.def 2009-01-04 14:32:22.000000000 -0500
---- builtins/declare.def 2009-02-26 11:40:16.000000000 -0500
-***************
-*** 296,299 ****
---- 296,306 ----
- if (t = strchr (name, '[')) /* ] */
- {
-+ /* If offset != 0 we have already validated any array reference */
-+ if (offset == 0 && valid_array_reference (name) == 0)
-+ {
-+ sh_invalidid (name);
-+ assign_error++;
-+ NEXT_VARIABLE ();
-+ }
- subscript_start = t;
- *t = '\0';
-***************
-*** 485,489 ****
- /* declare -a name[[n]] or declare name[n] makes name an indexed
- array variable. */
-! else if ((making_array_special || (flags_on & att_array)) && array_p (var) == 0)
- var = convert_var_to_array (var);
- #endif /* ARRAY_VARS */
---- 492,496 ----
- /* declare -a name[[n]] or declare name[n] makes name an indexed
- array variable. */
-! else if ((making_array_special || (flags_on & att_array)) && array_p (var) == 0 && assoc_p (var) == 0)
- var = convert_var_to_array (var);
- #endif /* ARRAY_VARS */
-*** ../bash-4.0/patchlevel.h 2009-01-04 14:32:40.000000000 -0500
---- patchlevel.h 2009-02-22 16:11:31.000000000 -0500
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 4
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 5
-
- #endif /* _PATCHLEVEL_H_ */
-
--- a/usr/src/cmd/bash/Patches-4.0/bash40-006 Sat Oct 30 12:35:08 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.0
-Patch-ID: bash40-006
-
-Bug-Reported-by: Evgeniy Zhemchugov <[email protected]>
-Bug-Reference-ID: <[email protected]>
-Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2009-02/msg00202.html
-
-Bug-Description:
-
-Bash did not parse pipelines using the |& construct correctly if the
-pipeline elements were not simple commands.
-
-Patch:
-
-*** ../bash-4.0/parse.y 2009-01-08 08:29:12.000000000 -0500
---- parse.y 2009-02-25 17:25:56.000000000 -0500
-***************
-*** 4478,4481 ****
---- 4478,4482 ----
- case AND_AND:
- case BANG:
-+ case BAR_AND:
- case DO:
- case DONE:
-*** ../bash-4.0/patchlevel.h 2009-01-04 14:32:40.000000000 -0500
---- patchlevel.h 2009-02-22 16:11:31.000000000 -0500
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 5
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 6
-
- #endif /* _PATCHLEVEL_H_ */
-
--- a/usr/src/cmd/bash/Patches-4.0/bash40-007 Sat Oct 30 12:35:08 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,263 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.0
-Patch-ID: bash40-007
-
-Bug-Reported-by: AnMaster <[email protected]>
-Bug-Reference-ID: <[email protected]>
-Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2009-02/msg00188.html
-
-Bug-Description:
-
-Bash had a number of problems parsing associative array subscripts containing
-special characters. The subscripts are supposed to be read as if they are
-enclosed between double quotes.
-
-Patch:
-
-*** ../bash-4.0/parse.y 2009-01-08 08:29:12.000000000 -0500
---- parse.y 2009-02-25 17:25:56.000000000 -0500
-***************
-*** 2919,2922 ****
---- 2919,2923 ----
- #define P_COMMAND 0x08 /* parsing a command, so look for comments */
- #define P_BACKQUOTE 0x10 /* parsing a backquoted command substitution */
-+ #define P_ARRAYSUB 0x20 /* parsing a [...] array subscript for assignment */
-
- /* Lexical state while parsing a grouping construct or $(...). */
-***************
-*** 3134,3137 ****
---- 3134,3139 ----
- FREE (nestret);
- }
-+ else if ((flags & P_ARRAYSUB) && (tflags & LEX_WASDOL) && (ch == '(' || ch == '{' || ch == '[')) /* ) } ] */
-+ goto parse_dollar_word;
- }
- /* Parse an old-style command substitution within double quotes as a
-***************
-*** 3150,3153 ****
---- 3150,3154 ----
- /* check for $(), $[], or ${} inside quoted string. */
- {
-+ parse_dollar_word:
- if (open == ch) /* undo previous increment */
- count--;
-***************
-*** 4277,4281 ****
- (token_index == 0 && (parser_state&PST_COMPASSIGN))))
- {
-! ttok = parse_matched_pair (cd, '[', ']', &ttoklen, 0);
- if (ttok == &matched_pair_error)
- return -1; /* Bail immediately. */
---- 4277,4281 ----
- (token_index == 0 && (parser_state&PST_COMPASSIGN))))
- {
-! ttok = parse_matched_pair (cd, '[', ']', &ttoklen, P_ARRAYSUB);
- if (ttok == &matched_pair_error)
- return -1; /* Bail immediately. */
-*** ../bash-4.0/arrayfunc.c 2009-01-04 14:32:21.000000000 -0500
---- arrayfunc.c 2009-02-25 07:58:54.000000000 -0500
-***************
-*** 605,666 ****
- }
-
-! /* This function assumes s[i] == '['; returns with s[ret] == ']' if
-! an array subscript is correctly parsed. */
-! int
-! skipsubscript (s, i)
-! const char *s;
-! int i;
-! {
-! int count, c;
-! #if defined (HANDLE_MULTIBYTE)
-! mbstate_t state, state_bak;
-! size_t slength, mblength;
-! #endif
-!
-! #if defined (HANDLE_MULTIBYTE)
-! memset (&state, '\0', sizeof (mbstate_t));
-! slength = strlen (s + i);
-! #endif
-!
-! count = 1;
-! while (count)
-! {
-! /* Advance one (possibly multibyte) character in S starting at I. */
-! #if defined (HANDLE_MULTIBYTE)
-! if (MB_CUR_MAX > 1)
-! {
-! state_bak = state;
-! mblength = mbrlen (s + i, slength, &state);
-!
-! if (MB_INVALIDCH (mblength))
-! {
-! state = state_bak;
-! i++;
-! slength--;
-! }
-! else if (MB_NULLWCH (mblength))
-! return i;
-! else
-! {
-! i += mblength;
-! slength -= mblength;
-! }
-! }
-! else
-! #endif
-! ++i;
-!
-! c = s[i];
-!
-! if (c == 0)
-! break;
-! else if (c == '[')
-! count++;
-! else if (c == ']')
-! count--;
-! }
-!
-! return i;
-! }
-
- /* This function is called with SUB pointing to just after the beginning
---- 605,609 ----
- }
-
-! /* skipsubscript moved to subst.c to use private functions. 2009/02/24. */
-
- /* This function is called with SUB pointing to just after the beginning
-*** ../bash-4.0/subst.c 2009-01-28 14:34:12.000000000 -0500
---- subst.c 2009-02-25 09:18:33.000000000 -0500
-***************
-*** 223,226 ****
---- 223,227 ----
- static char *extract_delimited_string __P((char *, int *, char *, char *, char *, int));
- static char *extract_dollar_brace_string __P((char *, int *, int, int));
-+ static int skip_matched_pair __P((const char *, int, int, int, int));
-
- static char *pos_params __P((char *, int, int, int));
-***************
-*** 1375,1378 ****
---- 1376,1480 ----
- #define CQ_RETURN(x) do { no_longjmp_on_fatal_error = 0; return (x); } while (0)
-
-+ /* This function assumes s[i] == open; returns with s[ret] == close; used to
-+ parse array subscripts. FLAGS currently unused. */
-+ static int
-+ skip_matched_pair (string, start, open, close, flags)
-+ const char *string;
-+ int start, open, close, flags;
-+ {
-+ int i, pass_next, backq, si, c, count;
-+ size_t slen;
-+ char *temp, *ss;
-+ DECLARE_MBSTATE;
-+
-+ slen = strlen (string + start) + start;
-+ no_longjmp_on_fatal_error = 1;
-+
-+ i = start + 1; /* skip over leading bracket */
-+ count = 1;
-+ pass_next = backq = 0;
-+ ss = (char *)string;
-+ while (c = string[i])
-+ {
-+ if (pass_next)
-+ {
-+ pass_next = 0;
-+ if (c == 0)
-+ CQ_RETURN(i);
-+ ADVANCE_CHAR (string, slen, i);
-+ continue;
-+ }
-+ else if (c == '\\')
-+ {
-+ pass_next = 1;
-+ i++;
-+ continue;
-+ }
-+ else if (backq)
-+ {
-+ if (c == '`')
-+ backq = 0;
-+ ADVANCE_CHAR (string, slen, i);
-+ continue;
-+ }
-+ else if (c == '`')
-+ {
-+ backq = 1;
-+ i++;
-+ continue;
-+ }
-+ else if (c == open)
-+ {
-+ count++;
-+ i++;
-+ continue;
-+ }
-+ else if (c == close)
-+ {
-+ count--;
-+ if (count == 0)
-+ break;
-+ i++;
-+ continue;
-+ }
-+ else if (c == '\'' || c == '"')
-+ {
-+ i = (c == '\'') ? skip_single_quoted (ss, slen, ++i)
-+ : skip_double_quoted (ss, slen, ++i);
-+ /* no increment, the skip functions increment past the closing quote. */
-+ }
-+ else if (c == '$' && (string[i+1] == LPAREN || string[i+1] == LBRACE))
-+ {
-+ si = i + 2;
-+ if (string[si] == '\0')
-+ CQ_RETURN(si);
-+
-+ if (string[i+1] == LPAREN)
-+ temp = extract_delimited_string (ss, &si, "$(", "(", ")", SX_NOALLOC|SX_COMMAND); /* ) */
-+ else
-+ temp = extract_dollar_brace_string (ss, &si, 0, SX_NOALLOC);
-+ i = si;
-+ if (string[i] == '\0') /* don't increment i past EOS in loop */
-+ break;
-+ i++;
-+ continue;
-+ }
-+ else
-+ ADVANCE_CHAR (string, slen, i);
-+ }
-+
-+ CQ_RETURN(i);
-+ }
-+
-+ #if defined (ARRAY_VARS)
-+ int
-+ skipsubscript (string, start)
-+ const char *string;
-+ int start;
-+ {
-+ return (skip_matched_pair (string, start, '[', ']', 0));
-+ }
-+ #endif
-+
- /* Skip characters in STRING until we find a character in DELIMS, and return
- the index of that character. START is the index into string at which we
-*** ../bash-4.0/patchlevel.h 2009-01-04 14:32:40.000000000 -0500
---- patchlevel.h 2009-02-22 16:11:31.000000000 -0500
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 6
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 7
-
- #endif /* _PATCHLEVEL_H_ */
--- a/usr/src/cmd/bash/Patches-4.0/bash40-008 Sat Oct 30 12:35:08 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.0
-Patch-ID: bash40-008
-
-Bug-Reported-by: Mike Frysinger <[email protected]>
-Bug-Reference-ID: <[email protected]>
-Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2009-02/msg00230.html
-
-Bug-Description:
-
-Patch:
-
-*** ../bash-4.0/parse.y 2009-01-08 08:29:12.000000000 -0500
---- parse.y 2009-02-26 17:22:15.000000000 -0500
-***************
-*** 3443,3448 ****
- else
- shell_ungetc (peekc);
-! tflags |= LEX_HEREDELIM;
-! lex_firstind = -1;
- continue;
- }
---- 3443,3451 ----
- else
- shell_ungetc (peekc);
-! if (peekc != '<')
-! {
-! tflags |= LEX_HEREDELIM;
-! lex_firstind = -1;
-! }
- continue;
- }
-*** ../bash-4.0/patchlevel.h 2009-01-04 14:32:40.000000000 -0500
---- patchlevel.h 2009-02-22 16:11:31.000000000 -0500
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 7
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 8
-
- #endif /* _PATCHLEVEL_H_ */
--- a/usr/src/cmd/bash/Patches-4.0/bash40-009 Sat Oct 30 12:35:08 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.0
-Patch-ID: bash40-009
-
-Bug-Reported-by: "Chris F.A. Johnson" <[email protected]>
-Bug-Reference-ID: <[email protected]>
-Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2009-02/msg00255.html
-
-Bug-Description:
-
-When the read builtin returned due to a timeout supplied with the -t option,
-it did not restore any modified terminal attribtues.
-
-Patch:
-
-*** ../bash-4.0/builtins/read.def 2009-01-15 23:11:21.000000000 -0500
---- builtins/read.def 2009-03-02 10:15:39.000000000 -0500
-***************
-*** 370,381 ****
- if (code)
- {
-! #if 0
- run_unwind_frame ("read_builtin");
-- return (EXECUTION_FAILURE);
-- #else
- input_string[i] = '\0'; /* make sure it's terminated */
-! retval = 128+SIGALRM;;
- goto assign_vars;
-- #endif
- }
- old_alrm = set_signal_handler (SIGALRM, sigalrm);
---- 370,381 ----
- if (code)
- {
-! /* Tricky. The top of the unwind-protect stack is the free of
-! input_string. We want to run all the rest and use input_string,
-! so we have to remove it from the stack. */
-! remove_unwind_protect ();
- run_unwind_frame ("read_builtin");
- input_string[i] = '\0'; /* make sure it's terminated */
-! retval = 128+SIGALRM;
- goto assign_vars;
- }
- old_alrm = set_signal_handler (SIGALRM, sigalrm);
-*** ../bash-4.0/patchlevel.h 2009-01-04 14:32:40.000000000 -0500
---- patchlevel.h 2009-02-22 16:11:31.000000000 -0500
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 8
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 9
-
- #endif /* _PATCHLEVEL_H_ */
--- a/usr/src/cmd/bash/Patches-4.0/bash40-010 Sat Oct 30 12:35:08 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,63 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.0
-Patch-ID: bash40-010
-
-Bug-Reported-by: Mike Frysinger <[email protected]>
-Bug-Reference-ID: <[email protected]>
-Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2009-03/msg00023.html
-
-Bug-Description:
-
-Bash has problems parsing comments in case statements when they appear in
-$(...) subshells.
-
-Patch:
-
-*** ../bash-4.0/parse.y 2009-03-07 15:18:35.000000000 -0500
---- parse.y 2009-03-07 14:16:32.000000000 -0500
-***************
-*** 3413,3419 ****
- tflags &= ~LEX_RESWDOK;
- }
-! else if (shellbreak (ch) == 0)
- {
-! tflags &= ~LEX_RESWDOK;
- /*itrace("parse_comsub:%d: found `%c', lex_reswordok -> 0", line_number, ch);*/
- }
---- 3415,3433 ----
- tflags &= ~LEX_RESWDOK;
- }
-! else if MBTEST((tflags & LEX_CKCOMMENT) && ch == '#' && (lex_rwlen == 0 || ((tflags & LEX_INWORD) && lex_wlen == 0)))
-! ; /* don't modify LEX_RESWDOK if we're starting a comment */
-! else if MBTEST((tflags & LEX_INCASE) && ch != '\n')
-! /* If we can read a reserved word and we're in case, we're at the
-! point where we can read a new pattern list or an esac. We
-! handle the esac case above. If we read a newline, we want to
-! leave LEX_RESWDOK alone. If we read anything else, we want to
-! turn off LEX_RESWDOK, since we're going to read a pattern list. */
- {
-! tflags &= ~LEX_RESWDOK;
-! /*itrace("parse_comsub:%d: lex_incase == 1 found `%c', lex_reswordok -> 0", line_number, ch);*/
-! }
-! else if MBTEST(shellbreak (ch) == 0)
-! {
-! tflags &= ~LEX_RESWDOK;
- /*itrace("parse_comsub:%d: found `%c', lex_reswordok -> 0", line_number, ch);*/
- }
-*** ../bash-4.0/patchlevel.h 2009-01-04 14:32:40.000000000 -0500
---- patchlevel.h 2009-02-22 16:11:31.000000000 -0500
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 9
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 10
-
- #endif /* _PATCHLEVEL_H_ */
--- a/usr/src/cmd/bash/Patches-4.0/bash40-011 Sat Oct 30 12:35:08 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.0
-Patch-ID: bash40-011
-
-Bug-Reported-by: Matt Zyzik <[email protected]>n
-Bug-Reference-ID: <[email protected]>
-Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2009-03/msg00092.html
-
-Bug-Description:
-
-When using the new |& operator following a simple command with a redirection,
-the redirection of stderr through the pipe was not performed under certain
-circumstances.
-
-Patch:
-
-*** ../bash-4.0-patched/parse.y 2009-03-08 21:24:47.000000000 -0400
---- parse.y 2009-03-12 21:36:23.000000000 -0400
-***************
-*** 1123,1127 ****
- REDIRECT *r;
-
-! tc = $1;
- rd.dest = 1;
- r = make_redirection (2, r_duplicating_output, rd);
---- 1123,1127 ----
- REDIRECT *r;
-
-! tc = $1->type == cm_simple ? (COMMAND *)$1->value.Simple : $1;
- rd.dest = 1;
- r = make_redirection (2, r_duplicating_output, rd);
-*** ../bash-4.0/patchlevel.h 2009-01-04 14:32:40.000000000 -0500
---- patchlevel.h 2009-02-22 16:11:31.000000000 -0500
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 10
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 11
-
- #endif /* _PATCHLEVEL_H_ */
-
--- a/usr/src/cmd/bash/Patches-4.0/bash40-012 Sat Oct 30 12:35:08 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.0
-Patch-ID: bash40-012
-
-Bug-Reported-by: "Clark J. Wang" <[email protected]>
-Bug-Reference-ID: <[email protected]>
-Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2009-03/msg00129.html
-
-Bug-Description:
-
-A case statement using the ;& pattern terminator followed immediately by
-"esac" caused a core dump due to a null pointer dereference.
-
-Patch:
-
-*** ../bash-4.0-patched/execute_cmd.c 2009-02-13 16:41:41.000000000 -0500
---- execute_cmd.c 2009-03-14 13:23:00.000000000 -0400
-***************
-*** 2931,2935 ****
- }
- while ((clauses->flags & CASEPAT_FALLTHROUGH) && (clauses = clauses->next));
-! if ((clauses->flags & CASEPAT_TESTNEXT) == 0)
- EXIT_CASE ();
- else
---- 2931,2935 ----
- }
- while ((clauses->flags & CASEPAT_FALLTHROUGH) && (clauses = clauses->next));
-! if (clauses == 0 || (clauses->flags & CASEPAT_TESTNEXT) == 0)
- EXIT_CASE ();
- else
-*** ../bash-4.0/patchlevel.h 2009-01-04 14:32:40.000000000 -0500
---- patchlevel.h 2009-02-22 16:11:31.000000000 -0500
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 11
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 12
-
- #endif /* _PATCHLEVEL_H_ */
--- a/usr/src/cmd/bash/Patches-4.0/bash40-013 Sat Oct 30 12:35:08 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,153 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.0
-Patch-ID: bash40-013
-
-Bug-Reported-by: [email protected]
-Bug-Reference-ID:
-Bug-Reference-URL: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=519165
-
-Bug-Description:
-
-Though references to $@ when there are no positional parameters will now
-cause the shell to exit if the `errexit' option has been enabled, constructs
-such as ${@:-foo} should not cause an exit.
-
-Patch:
-
-*** ../bash-4.0-patched/subst.c 2009-03-08 21:24:39.000000000 -0400
---- subst.c 2009-03-14 19:04:10.000000000 -0400
-***************
-*** 86,89 ****
---- 86,90 ----
- /* Flags for the `pflags' argument to param_expand() */
- #define PF_NOCOMSUB 0x01 /* Do not perform command substitution */
-+ #define PF_IGNUNBOUND 0x02 /* ignore unbound vars even if -u set */
-
- /* These defs make it easier to use the editor. */
-***************
-*** 264,268 ****
- static int chk_arithsub __P((const char *, int));
-
-! static WORD_DESC *parameter_brace_expand_word __P((char *, int, int));
- static WORD_DESC *parameter_brace_expand_indir __P((char *, int, int, int *, int *));
- static WORD_DESC *parameter_brace_expand_rhs __P((char *, char *, int, int, int *, int *));
---- 265,269 ----
- static int chk_arithsub __P((const char *, int));
-
-! static WORD_DESC *parameter_brace_expand_word __P((char *, int, int, int));
- static WORD_DESC *parameter_brace_expand_indir __P((char *, int, int, int *, int *));
- static WORD_DESC *parameter_brace_expand_rhs __P((char *, char *, int, int, int *, int *));
-***************
-*** 5196,5202 ****
- NAME was found inside of a double-quoted expression. */
- static WORD_DESC *
-! parameter_brace_expand_word (name, var_is_special, quoted)
- char *name;
-! int var_is_special, quoted;
- {
- WORD_DESC *ret;
---- 5197,5203 ----
- NAME was found inside of a double-quoted expression. */
- static WORD_DESC *
-! parameter_brace_expand_word (name, var_is_special, quoted, pflags)
- char *name;
-! int var_is_special, quoted, pflags;
- {
- WORD_DESC *ret;
-***************
-*** 5230,5234 ****
-
- ret = param_expand (tt, &sindex, quoted, (int *)NULL, (int *)NULL,
-! (int *)NULL, (int *)NULL, 0);
- free (tt);
- }
---- 5231,5235 ----
-
- ret = param_expand (tt, &sindex, quoted, (int *)NULL, (int *)NULL,
-! (int *)NULL, (int *)NULL, pflags);
- free (tt);
- }
-***************
-*** 5291,5295 ****
- WORD_DESC *w;
-
-! w = parameter_brace_expand_word (name, var_is_special, quoted);
- t = w->word;
- /* Have to dequote here if necessary */
---- 5292,5296 ----
- WORD_DESC *w;
-
-! w = parameter_brace_expand_word (name, var_is_special, quoted, PF_IGNUNBOUND);
- t = w->word;
- /* Have to dequote here if necessary */
-***************
-*** 5308,5312 ****
- return (WORD_DESC *)NULL;
-
-! w = parameter_brace_expand_word (t, SPECIAL_VAR(t, 0), quoted);
- free (t);
-
---- 5309,5313 ----
- return (WORD_DESC *)NULL;
-
-! w = parameter_brace_expand_word (t, SPECIAL_VAR(t, 0), quoted, 0);
- free (t);
-
-***************
-*** 6659,6663 ****
- tdesc = parameter_brace_expand_indir (name + 1, var_is_special, quoted, quoted_dollar_atp, contains_dollar_at);
- else
-! tdesc = parameter_brace_expand_word (name, var_is_special, quoted);
-
- if (tdesc)
---- 6660,6664 ----
- tdesc = parameter_brace_expand_indir (name + 1, var_is_special, quoted, quoted_dollar_atp, contains_dollar_at);
- else
-! tdesc = parameter_brace_expand_word (name, var_is_special, quoted, PF_IGNUNBOUND);
-
- if (tdesc)
-***************
-*** 6990,6994 ****
- list = list_rest_of_args ();
-
-! if (list == 0 && unbound_vars_is_error)
- {
- uerror[0] = '$';
---- 6991,6995 ----
- list = list_rest_of_args ();
-
-! if (list == 0 && unbound_vars_is_error && (pflags & PF_IGNUNBOUND) == 0)
- {
- uerror[0] = '$';
-***************
-*** 7052,7056 ****
- list = list_rest_of_args ();
-
-! if (list == 0 && unbound_vars_is_error)
- {
- uerror[0] = '$';
---- 7053,7057 ----
- list = list_rest_of_args ();
-
-! if (list == 0 && unbound_vars_is_error && (pflags & PF_IGNUNBOUND) == 0)
- {
- uerror[0] = '$';
-
-
-*** ../bash-4.0/patchlevel.h 2009-01-04 14:32:40.000000000 -0500
---- patchlevel.h 2009-02-22 16:11:31.000000000 -0500
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 12
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 13
-
- #endif /* _PATCHLEVEL_H_ */
--- a/usr/src/cmd/bash/Patches-4.0/bash40-014 Sat Oct 30 12:35:08 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,113 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.0
-Patch-ID: bash40-014
-
-Bug-Reported-by: [email protected]
-Bug-Reference-ID: <[email protected]>
-Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2009-03/msg00166.html
-
-Bug-Description:
-
-When the fc builtin is run in a command substitution from a shell with history
-enabled, it does not correctly calculate the command on which to operate.
-
-Patch:
-
-*** ../bash-4.0-patched/builtins/fc.def 2009-01-04 14:32:22.000000000 -0500
---- builtins/fc.def 2009-03-21 14:03:43.000000000 -0400
-***************
-*** 89,92 ****
---- 89,93 ----
- extern int literal_history;
- extern int posixly_correct;
-+ extern int subshell_environment, interactive_shell;
-
- extern int unlink __P((const char *));
-***************
-*** 173,177 ****
- register char *sep;
- int numbering, reverse, listing, execute;
-! int histbeg, histend, last_hist, retval, opt;
- FILE *stream;
- REPL *rlist, *rl;
---- 174,178 ----
- register char *sep;
- int numbering, reverse, listing, execute;
-! int histbeg, histend, last_hist, retval, opt, rh;
- FILE *stream;
- REPL *rlist, *rl;
-***************
-*** 276,279 ****
---- 277,282 ----
- fprintf (stderr, "%s\n", command);
- fc_replhist (command); /* replace `fc -s' with command */
-+ /* Posix says that the re-executed commands should be entered into the
-+ history. */
- return (parse_and_execute (command, "fc", SEVAL_NOHIST));
- }
-***************
-*** 294,298 ****
- so we check hist_last_line_added. */
-
-! last_hist = i - remember_on_history - hist_last_line_added;
-
- if (list)
---- 297,306 ----
- so we check hist_last_line_added. */
-
-! /* Even though command substitution through parse_and_execute turns off
-! remember_on_history, command substitution in a shell when set -o history
-! has been enabled (interactive or not) should use it in the last_hist
-! calculation as if it were on. */
-! rh = remember_on_history || ((subshell_environment & SUBSHELL_COMSUB) && enable_history_list);
-! last_hist = i - rh - hist_last_line_added;
-
- if (list)
-***************
-*** 457,461 ****
- HIST_ENTRY **hlist;
- {
-! int sign, n, clen;
- register int i, j;
- register char *s;
---- 465,469 ----
- HIST_ENTRY **hlist;
- {
-! int sign, n, clen, rh;
- register int i, j;
- register char *s;
-***************
-*** 473,477 ****
- so we check hist_last_line_added. This needs to agree with the
- calculation of last_hist in fc_builtin above. */
-! i -= remember_on_history + hist_last_line_added;
-
- /* No specification defaults to most recent command. */
---- 481,490 ----
- so we check hist_last_line_added. This needs to agree with the
- calculation of last_hist in fc_builtin above. */
-! /* Even though command substitution through parse_and_execute turns off
-! remember_on_history, command substitution in a shell when set -o history
-! has been enabled (interactive or not) should use it in the last_hist
-! calculation as if it were on. */
-! rh = remember_on_history || ((subshell_environment & SUBSHELL_COMSUB) && enable_history_list);
-! i -= rh + hist_last_line_added;
-
- /* No specification defaults to most recent command. */
-*** ../bash-4.0/patchlevel.h 2009-01-04 14:32:40.000000000 -0500
---- patchlevel.h 2009-02-22 16:11:31.000000000 -0500
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 13
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 14
-
- #endif /* _PATCHLEVEL_H_ */
--- a/usr/src/cmd/bash/Patches-4.0/bash40-015 Sat Oct 30 12:35:08 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,84 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.0
-Patch-ID: bash40-015
-
-Bug-Reported-by: Lubomir Rintel <[email protected]>
-Bug-Reference-ID: <[email protected]>
-Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2009-03/msg00174.html
-
-Bug-Description:
-
-Deferring handling of signals which should cause the shell to terminate until
-it is "safe" to run the handler functions does not work for some terminating
-signals.
-
-Patch:
-
-*** ../bash-4.0-patched/sig.c 2009-01-04 14:32:41.000000000 -0500
---- sig.c 2009-03-22 14:47:56.000000000 -0400
-***************
-*** 449,452 ****
---- 449,494 ----
- int sig;
- {
-+ /* If we get called twice with the same signal before handling it,
-+ terminate right away. */
-+ if (
-+ #ifdef SIGHUP
-+ sig != SIGHUP &&
-+ #endif
-+ #ifdef SIGINT
-+ sig != SIGINT &&
-+ #endif
-+ #ifdef SIGDANGER
-+ sig != SIGDANGER &&
-+ #endif
-+ #ifdef SIGPIPE
-+ sig != SIGPIPE &&
-+ #endif
-+ #ifdef SIGALRM
-+ sig != SIGALRM &&
-+ #endif
-+ #ifdef SIGTERM
-+ sig != SIGTERM &&
-+ #endif
-+ #ifdef SIGXCPU
-+ sig != SIGXCPU &&
-+ #endif
-+ #ifdef SIGXFSZ
-+ sig != SIGXFSZ &&
-+ #endif
-+ #ifdef SIGVTALRM
-+ sig != SIGVTALRM &&
-+ #endif
-+ #ifdef SIGLOST
-+ sig != SIGLOST &&
-+ #endif
-+ #ifdef SIGUSR1
-+ sig != SIGUSR1 &&
-+ #endif
-+ #ifdef SIGUSR2
-+ sig != SIGUSR2 &&
-+ #endif
-+ sig == terminating_signal)
-+ terminate_immediately = 1;
-+
- terminating_signal = sig;
-
-*** ../bash-4.0/patchlevel.h 2009-01-04 14:32:40.000000000 -0500
---- patchlevel.h 2009-02-22 16:11:31.000000000 -0500
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 14
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 15
-
- #endif /* _PATCHLEVEL_H_ */
--- a/usr/src/cmd/bash/Patches-4.0/bash40-016 Sat Oct 30 12:35:08 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,104 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.0
-Patch-ID: bash40-016
-
-Bug-Reported-by: Brian J. Murrell" <[email protected]>
-Bug-Reference-ID: <[email protected]>
-Bug-Reference-URL:http://lists.gnu.org/archive/html/bug-bash/2009-03/msg00160.html
-
-Bug-Description:
-
-There are several problems with the handling of $LINENO in an ERR trap.
-
-Patch:
-
-*** ../bash-4.0-patched/trap.c 2009-01-16 17:07:53.000000000 -0500
---- trap.c 2009-03-20 21:37:00.000000000 -0400
-***************
-*** 756,760 ****
-
- flags = SEVAL_NONINT|SEVAL_NOHIST;
-! if (sig != DEBUG_TRAP && sig != RETURN_TRAP)
- flags |= SEVAL_RESETLINE;
- if (function_code == 0)
---- 756,760 ----
-
- flags = SEVAL_NONINT|SEVAL_NOHIST;
-! if (sig != DEBUG_TRAP && sig != RETURN_TRAP && sig != ERROR_TRAP)
- flags |= SEVAL_RESETLINE;
- if (function_code == 0)
-*** ../bash-4.0-patched/execute_cmd.c 2009-02-13 16:41:41.000000000 -0500
---- execute_cmd.c 2009-03-21 14:16:11.000000000 -0400
-***************
-*** 569,572 ****
---- 569,573 ----
- /* Fork a subshell, turn off the subshell bit, turn off job
- control and call execute_command () on the command again. */
-+ line_number_for_err_trap = line_number;
- paren_pid = make_child (savestring (make_command_string (command)),
- asynchronous);
-***************
-*** 611,615 ****
---- 612,619 ----
- {
- last_command_exit_value = exec_result;
-+ save_line_number = line_number;
-+ line_number = line_number_for_err_trap;
- run_error_trap ();
-+ line_number = save_line_number;
- }
-
-***************
-*** 767,771 ****
---- 771,777 ----
- {
- last_command_exit_value = exec_result;
-+ line_number = line_number_for_err_trap;
- run_error_trap ();
-+ line_number = save_line_number;
- }
-
-***************
-*** 2106,2109 ****
---- 2112,2116 ----
- COMMAND *tc, *second;
- int ignore_return, exec_result, was_error_trap, invert;
-+ volatile int save_line_number;
-
- ignore_return = (command->flags & CMD_IGNORE_RETURN) != 0;
-***************
-*** 2175,2178 ****
---- 2182,2186 ----
- ignore_return = (command->flags & CMD_IGNORE_RETURN) != 0;
-
-+ line_number_for_err_trap = line_number;
- exec_result = execute_pipeline (command, asynchronous, pipe_in, pipe_out, fds_to_close);
-
-***************
-*** 2180,2184 ****
---- 2188,2195 ----
- {
- last_command_exit_value = exec_result;
-+ save_line_number = line_number;
-+ line_number = line_number_for_err_trap;
- run_error_trap ();
-+ line_number = save_line_number;
- }
-
-*** ../bash-4.0/patchlevel.h 2009-01-04 14:32:40.000000000 -0500
---- patchlevel.h 2009-02-22 16:11:31.000000000 -0500
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 15
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 16
-
- #endif /* _PATCHLEVEL_H_ */
--- a/usr/src/cmd/bash/Patches-4.0/bash40-017 Sat Oct 30 12:35:08 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.0
-Patch-ID: bash40-017
-
-Bug-Reported-by: Lubomir Rintel <[email protected]>
-Bug-Reference-ID: <[email protected]>
-Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2009-03/msg00174.html
-
-Bug-Description:
-
-Adding a null line to a here-document (e.g., by hitting EOF) causes the
-shell to dump core attempting to dereference the NULL pointer.
-
-Patch:
-
-*** ../bash-4.0-patched/parse.y 2009-03-08 21:24:47.000000000 -0400
---- parse.y 2009-03-21 14:38:42.000000000 -0400
-***************
-*** 1880,1884 ****
- ret = read_a_line (remove_quoted_newline);
- #if defined (HISTORY)
-! if (remember_on_history && (parser_state & PST_HEREDOC))
- {
- /* To make adding the the here-document body right, we need to rely
---- 1880,1884 ----
- ret = read_a_line (remove_quoted_newline);
- #if defined (HISTORY)
-! if (ret && remember_on_history && (parser_state & PST_HEREDOC))
- {
- /* To make adding the the here-document body right, we need to rely
-*** ../bash-4.0/patchlevel.h 2009-01-04 14:32:40.000000000 -0500
---- patchlevel.h 2009-02-22 16:11:31.000000000 -0500
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 16
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 17
-
- #endif /* _PATCHLEVEL_H_ */
--- a/usr/src/cmd/bash/Patches-4.0/bash40-018 Sat Oct 30 12:35:08 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,78 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.0
-Patch-ID: bash40-018
-
-Bug-Reported-by: Dan Price <[email protected]>
-Bug-Reference-ID: <[email protected]>
-Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2009-03/msg00184.html
-
-Bug-Description:
-
-A missing include file results in an empty function definition and a no-op
-when checking whether or not the window size has changed.
-
-Patch:
-
-*** ../bash-4.0-patched/lib/sh/winsize.c 2008-08-12 13:53:51.000000000 -0400
---- lib/sh/winsize.c 2009-04-06 10:44:20.000000000 -0400
-***************
-*** 31,44 ****
- #include <sys/ioctl.h>
-
-! #if !defined (STRUCT_WINSIZE_IN_SYS_IOCTL)
-! /* For struct winsize on SCO */
-! /* sys/ptem.h has winsize but needs mblk_t from sys/stream.h */
-! # if defined (HAVE_SYS_PTEM_H) && defined (TIOCGWINSZ) && defined (SIGWINCH)
-! # if defined (HAVE_SYS_STREAM_H)
-! # include <sys/stream.h>
-! # endif
- # include <sys/ptem.h>
-! # endif /* HAVE_SYS_PTEM_H && TIOCGWINSZ && SIGWINCH */
-! #endif /* !STRUCT_WINSIZE_IN_SYS_IOCTL */
-
- #include <stdio.h>
---- 31,57 ----
- #include <sys/ioctl.h>
-
-! /* Try to find the definitions of `struct winsize' and TIOGCWINSZ */
-!
-! #if defined (GWINSZ_IN_SYS_IOCTL) && !defined (TIOCGWINSZ)
-! # include <sys/ioctl.h>
-! #endif /* GWINSZ_IN_SYS_IOCTL && !TIOCGWINSZ */
-!
-! #if defined (STRUCT_WINSIZE_IN_TERMIOS) && !defined (STRUCT_WINSIZE_IN_SYS_IOCTL)
-! # include <termios.h>
-! #endif /* STRUCT_WINSIZE_IN_TERMIOS && !STRUCT_WINSIZE_IN_SYS_IOCTL */
-!
-! /* Not in either of the standard places, look around. */
-! #if !defined (STRUCT_WINSIZE_IN_TERMIOS) && !defined (STRUCT_WINSIZE_IN_SYS_IOCTL)
-! # if defined (HAVE_SYS_STREAM_H)
-! # include <sys/stream.h>
-! # endif /* HAVE_SYS_STREAM_H */
-! # if defined (HAVE_SYS_PTEM_H) /* SVR4.2, at least, has it here */
- # include <sys/ptem.h>
-! # define _IO_PTEM_H /* work around SVR4.2 1.1.4 bug */
-! # endif /* HAVE_SYS_PTEM_H */
-! # if defined (HAVE_SYS_PTE_H) /* ??? */
-! # include <sys/pte.h>
-! # endif /* HAVE_SYS_PTE_H */
-! #endif /* !STRUCT_WINSIZE_IN_TERMIOS && !STRUCT_WINSIZE_IN_SYS_IOCTL */
-
- #include <stdio.h>
-*** ../bash-4.0/patchlevel.h 2009-01-04 14:32:40.000000000 -0500
---- patchlevel.h 2009-02-22 16:11:31.000000000 -0500
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 17
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 18
-
- #endif /* _PATCHLEVEL_H_ */
--- a/usr/src/cmd/bash/Patches-4.0/bash40-019 Sat Oct 30 12:35:08 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,125 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.0
-Patch-ID: bash40-019
-
-Bug-Reported-by: Oleksiy Melnyk <[email protected]>
-Bug-Reference-ID: <[email protected]>
-Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2009-02/msg00200.html
-
-Bug-Description:
-
-Using an external command as part of the DEBUG trap when job control is
-enabled causes pipelines to misbehave. The problem has to do with process
-groups assigned to the pipeline and terminal.
-
-Patch:
-
-*** ../bash-4.0-patched/jobs.c 2009-01-29 17:09:49.000000000 -0500
---- jobs.c 2009-04-17 21:08:20.000000000 -0400
-***************
-*** 443,447 ****
- the_pipeline = saved_pipeline;
- already_making_children = saved_already_making_children;
-! if (discard)
- discard_pipeline (old_pipeline);
- }
---- 443,447 ----
- the_pipeline = saved_pipeline;
- already_making_children = saved_already_making_children;
-! if (discard && old_pipeline)
- discard_pipeline (old_pipeline);
- }
-***************
-*** 4203,4205 ****
---- 4204,4225 ----
- }
-
-+ void
-+ save_pgrp_pipe (p, clear)
-+ int *p;
-+ int clear;
-+ {
-+ p[0] = pgrp_pipe[0];
-+ p[1] = pgrp_pipe[1];
-+ if (clear)
-+ pgrp_pipe[0] = pgrp_pipe[1] = -1;
-+ }
-+
-+ void
-+ restore_pgrp_pipe (p)
-+ int *p;
-+ {
-+ pgrp_pipe[0] = p[0];
-+ pgrp_pipe[1] = p[1];
-+ }
-+
- #endif /* PGRP_PIPE */
-*** ../bash-4.0-patched/jobs.h 2009-01-04 14:32:29.000000000 -0500
---- jobs.h 2009-04-17 15:07:51.000000000 -0400
-***************
-*** 236,239 ****
---- 236,241 ----
-
- extern void close_pgrp_pipe __P((void));
-+ extern void save_pgrp_pipe __P((int *, int));
-+ extern void restore_pgrp_pipe __P((int *));
-
- #if defined (JOB_CONTROL)
-*** ../bash-4.0-patched/trap.c 2009-01-16 17:07:53.000000000 -0500
---- trap.c 2009-04-17 22:22:36.000000000 -0400
-***************
-*** 799,802 ****
---- 799,804 ----
- {
- int trap_exit_value;
-+ pid_t save_pgrp;
-+ int save_pipe[2];
-
- /* XXX - question: should the DEBUG trap inherit the RETURN trap? */
-***************
-*** 804,808 ****
---- 806,832 ----
- if ((sigmodes[DEBUG_TRAP] & SIG_TRAPPED) && ((sigmodes[DEBUG_TRAP] & SIG_IGNORED) == 0) && ((sigmodes[DEBUG_TRAP] & SIG_INPROGRESS) == 0))
- {
-+ #if defined (JOB_CONTROL)
-+ save_pgrp = pipeline_pgrp;
-+ pipeline_pgrp = 0;
-+ save_pipeline (1);
-+ # if defined (PGRP_PIPE)
-+ save_pgrp_pipe (save_pipe, 1);
-+ # endif
-+ stop_making_children ();
-+ #endif
-+
- trap_exit_value = _run_trap_internal (DEBUG_TRAP, "debug trap");
-+
-+ #if defined (JOB_CONTROL)
-+ pipeline_pgrp = save_pgrp;
-+ restore_pipeline (1);
-+ # if defined (PGRP_PIPE)
-+ close_pgrp_pipe ();
-+ restore_pgrp_pipe (save_pipe);
-+ # endif
-+ if (pipeline_pgrp > 0)
-+ give_terminal_to (pipeline_pgrp, 1);
-+ notify_and_cleanup ();
-+ #endif
-
- #if defined (DEBUGGER)
-*** ../bash-4.0/patchlevel.h 2009-01-04 14:32:40.000000000 -0500
---- patchlevel.h 2009-02-22 16:11:31.000000000 -0500
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 18
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 19
-
- #endif /* _PATCHLEVEL_H_ */
--- a/usr/src/cmd/bash/Patches-4.0/bash40-020 Sat Oct 30 12:35:08 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,83 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.0
-Patch-ID: bash40-020
-
-Bug-Reported-by: Nicolai Lissner <[email protected]>
-Bug-Reference-ID: <20090412020510.GA29658@lilith>
-Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2009-04/msg00104.html
-
-Bug-Description:
-
-If a SIGWINCH arrives while bash is performing redisplay, multi-line prompts
-are displayed incorrectly due to the display code being called recursively.
-
-Patch:
-
-*** ../bash-4.0-patched/lib/readline/readline.h 2009-01-04 14:32:33.000000000 -0500
---- lib/readline/readline.h 2009-04-13 08:47:00.000000000 -0400
-***************
-*** 815,820 ****
- #define RL_STATE_MULTIKEY 0x200000 /* reading multiple-key command */
- #define RL_STATE_VICMDONCE 0x400000 /* entered vi command mode at least once */
-
-! #define RL_STATE_DONE 0x800000 /* done; accepted line */
-
- #define RL_SETSTATE(x) (rl_readline_state |= (x))
---- 815,821 ----
- #define RL_STATE_MULTIKEY 0x200000 /* reading multiple-key command */
- #define RL_STATE_VICMDONCE 0x400000 /* entered vi command mode at least once */
-+ #define RL_STATE_REDISPLAYING 0x800000 /* updating terminal display */
-
-! #define RL_STATE_DONE 0x1000000 /* done; accepted line */
-
- #define RL_SETSTATE(x) (rl_readline_state |= (x))
-*** ../bash-4.0-patched/lib/readline/display.c 2009-01-04 14:32:32.000000000 -0500
---- lib/readline/display.c 2009-04-13 08:29:54.000000000 -0400
-***************
-*** 513,516 ****
---- 513,517 ----
- data structures. */
- _rl_block_sigint ();
-+ RL_SETSTATE (RL_STATE_REDISPLAYING);
-
- if (!rl_display_prompt)
-***************
-*** 1237,1240 ****
---- 1238,1242 ----
- }
-
-+ RL_UNSETSTATE (RL_STATE_REDISPLAYING);
- _rl_release_sigint ();
- }
-*** ../bash-4.0-patched/lib/readline/terminal.c 2009-01-04 14:32:34.000000000 -0500
---- lib/readline/terminal.c 2009-04-13 08:43:00.000000000 -0400
-***************
-*** 356,360 ****
- if (CUSTOM_REDISPLAY_FUNC ())
- rl_forced_update_display ();
-! else
- _rl_redisplay_after_sigwinch ();
- }
---- 356,360 ----
- if (CUSTOM_REDISPLAY_FUNC ())
- rl_forced_update_display ();
-! else if (RL_ISSTATE(RL_STATE_REDISPLAYING) == 0)
- _rl_redisplay_after_sigwinch ();
- }
-*** ../bash-4.0/patchlevel.h 2009-01-04 14:32:40.000000000 -0500
---- patchlevel.h 2009-02-22 16:11:31.000000000 -0500
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 19
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 20
-
- #endif /* _PATCHLEVEL_H_ */
--- a/usr/src/cmd/bash/Patches-4.0/bash40-021 Sat Oct 30 12:35:08 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.0
-Patch-ID: bash40-021
-
-Bug-Reported-by: Matt Zyzik <[email protected]>
-Bug-Reference-ID: <[email protected]>
-Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2009-03/msg00149.html
-
-Bug-Description:
-
-When not in a locale supporting multibyte characters, readline will occasionally
-not erase characters between the cursor position and the end of the line
-when killing text backwards.
-
-Patch:
-
-*** ../bash-4.0-patched/lib/readline/display.c 2009-01-04 14:32:32.000000000 -0500
---- lib/readline/display.c 2009-04-14 14:00:18.000000000 -0400
-***************
-*** 1775,1779 ****
- adjust col_lendiff based on the difference between _rl_last_c_pos
- and _rl_screenwidth */
-! if (col_lendiff && (_rl_last_c_pos < _rl_screenwidth))
- #endif
- {
---- 1775,1779 ----
- adjust col_lendiff based on the difference between _rl_last_c_pos
- and _rl_screenwidth */
-! if (col_lendiff && ((MB_CUR_MAX == 1 || rl_byte_oriented) || (_rl_last_c_pos < _rl_screenwidth)))
- #endif
- {
-*** ../bash-4.0/patchlevel.h 2009-01-04 14:32:40.000000000 -0500
---- patchlevel.h 2009-02-22 16:11:31.000000000 -0500
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 20
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 21
-
- #endif /* _PATCHLEVEL_H_ */
--- a/usr/src/cmd/bash/Patches-4.0/bash40-022 Sat Oct 30 12:35:08 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.0
-Patch-ID: bash40-022
-
-Bug-Reported-by: Bernd Eggink <[email protected]>
-Bug-Reference-ID: <[email protected]>
-Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2009-04/msg00118.html
-
-Bug-Description:
-
-When parsing case statements in command substitutions, the shell did not
-note that a newline is a shell metacharacter and can legally be followed
-by a reserved word (e.g., `esac').
-
-Patch:
-
-*** ../bash-4.0-patched/parse.y 2009-03-08 21:24:47.000000000 -0400
---- parse.y 2009-04-15 22:27:56.000000000 -0400
-***************
-*** 3355,3359 ****
-
- /* Meta-characters that can introduce a reserved word. Not perfect yet. */
-! if MBTEST((tflags & LEX_RESWDOK) == 0 && (tflags & LEX_CKCASE) && (tflags & LEX_INCOMMENT) == 0 && shellmeta(ch))
- {
- /* Add this character. */
---- 3375,3379 ----
-
- /* Meta-characters that can introduce a reserved word. Not perfect yet. */
-! if MBTEST((tflags & LEX_RESWDOK) == 0 && (tflags & LEX_CKCASE) && (tflags & LEX_INCOMMENT) == 0 && (shellmeta(ch) || ch == '\n'))
- {
- /* Add this character. */
-*** ../bash-4.0/patchlevel.h 2009-01-04 14:32:40.000000000 -0500
---- patchlevel.h 2009-02-22 16:11:31.000000000 -0500
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 21
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 22
-
- #endif /* _PATCHLEVEL_H_ */
--- a/usr/src/cmd/bash/Patches-4.0/bash40-023 Sat Oct 30 12:35:08 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.0
-Patch-ID: bash40-023
-
-Bug-Reported-by: Andreas Schwab <[email protected]>
-Bug-Reference-ID: <[email protected]>
-Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2009-04/msg00160.html
-
-Bug-Description:
-
-If the prompt length exactly matches the screen width, and the prompt ends
-with invisible characters, readline positions the cursor incorrectly.
-
-Patch:
-
-*** ../bash-4.0-patched/lib/readline/display.c 2009-01-04 14:32:32.000000000 -0500
---- lib/readline/display.c 2009-04-25 21:42:18.000000000 -0400
-***************
-*** 1895,1898 ****
---- 1897,1904 ----
- woff = WRAP_OFFSET (_rl_last_v_pos, wrap_offset);
- cpos = _rl_last_c_pos;
-+
-+ if (cpos == 0 && cpos == new)
-+ return;
-+
- #if defined (HANDLE_MULTIBYTE)
- /* If we have multibyte characters, NEW is indexed by the buffer point in
-***************
-*** 1908,1914 ****
- desired display position. */
- if ((new > prompt_last_invisible) || /* XXX - don't use woff here */
-! (prompt_physical_chars > _rl_screenwidth &&
- _rl_last_v_pos == prompt_last_screen_line &&
-! wrap_offset >= woff &&
- new > (prompt_last_invisible-(_rl_screenwidth*_rl_last_v_pos)-wrap_offset)))
- /* XXX last comparison might need to be >= */
---- 1914,1920 ----
- desired display position. */
- if ((new > prompt_last_invisible) || /* XXX - don't use woff here */
-! (prompt_physical_chars >= _rl_screenwidth &&
- _rl_last_v_pos == prompt_last_screen_line &&
-! wrap_offset >= woff && dpos >= woff &&
- new > (prompt_last_invisible-(_rl_screenwidth*_rl_last_v_pos)-wrap_offset)))
- /* XXX last comparison might need to be >= */
-*** ../bash-4.0/patchlevel.h 2009-01-04 14:32:40.000000000 -0500
---- patchlevel.h 2009-02-22 16:11:31.000000000 -0500
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 22
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 23
-
- #endif /* _PATCHLEVEL_H_ */
--- a/usr/src/cmd/bash/Patches-4.0/bash40-024 Sat Oct 30 12:35:08 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,112 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.0
-Patch-ID: bash40-024
-
-Bug-Reported-by: Matt Zyzik <[email protected]>
-Bug-Reference-ID: <[email protected]>
-Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2009-04/msg00021.html
-
-Bug-Description:
-
-When using the ** globbing operator, bash will incorrectly add an extra
-directory name when the preceding directory name ends with `*' or an empty
-string when there is no preceding directory name.
-
-Patch:
-
-*** ../bash-4.0-patched/lib/glob/glob.c 2009-01-04 14:32:30.000000000 -0500
---- lib/glob/glob.c 2009-04-28 10:22:29.000000000 -0400
-***************
-*** 357,361 ****
- if (ep)
- *ep = 0;
-! if (r)
- free (r);
- return (struct globval *)0;
---- 357,361 ----
- if (ep)
- *ep = 0;
-! if (r && r != &glob_error_return)
- free (r);
- return (struct globval *)0;
-***************
-*** 666,671 ****
- }
-
-! /* compat: if GX_ALLDIRS, add the passed directory also */
-! if (add_current)
- {
- sdlen = strlen (dir);
---- 666,672 ----
- }
-
-! /* compat: if GX_ALLDIRS, add the passed directory also, but don't add an
-! empty directory name. */
-! if (add_current && (flags & GX_NULLDIR) == 0)
- {
- sdlen = strlen (dir);
-***************
-*** 679,686 ****
- nextlink->next = lastlink;
- lastlink = nextlink;
-! if (flags & GX_NULLDIR)
-! nextname[0] = '\0';
-! else
-! bcopy (dir, nextname, sdlen + 1);
- ++count;
- }
---- 680,684 ----
- nextlink->next = lastlink;
- lastlink = nextlink;
-! bcopy (dir, nextname, sdlen + 1);
- ++count;
- }
-***************
-*** 943,947 ****
- register unsigned int l;
-
-! array = glob_dir_to_array (directories[i], temp_results, flags);
- l = 0;
- while (array[l] != NULL)
---- 941,950 ----
- register unsigned int l;
-
-! /* If we're expanding **, we don't need to glue the directory
-! name to the results; we've already done it in glob_vector */
-! if ((dflags & GX_ALLDIRS) && filename[0] == '*' && filename[1] == '*' && filename[2] == '\0')
-! array = temp_results;
-! else
-! array = glob_dir_to_array (directories[i], temp_results, flags);
- l = 0;
- while (array[l] != NULL)
-***************
-*** 960,964 ****
-
- /* Note that the elements of ARRAY are not freed. */
-! free ((char *) array);
- }
- }
---- 963,968 ----
-
- /* Note that the elements of ARRAY are not freed. */
-! if (array != temp_results)
-! free ((char *) array);
- }
- }
-*** ../bash-4.0/patchlevel.h 2009-01-04 14:32:40.000000000 -0500
---- patchlevel.h 2009-02-22 16:11:31.000000000 -0500
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 23
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 24
-
- #endif /* _PATCHLEVEL_H_ */
--- a/usr/src/cmd/bash/Patches-4.0/bash40-025 Sat Oct 30 12:35:08 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,104 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.0
-Patch-ID: bash40-025
-
-Bug-Reported-by: Matt Zyzik <[email protected]>
-Bug-Reference-ID: <[email protected]>
-Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2009-05/msg00044.html
-
-Bug-Description:
-
-bash40-024 introduced a regression for constructs like **/*.cs; that
-expansion would no longer include matching files in the current directory.
-This patch undoes portions of bash40-024 and fixes the original problem
-in a different way.
-
-Patch:
-
-*** ../bash-4.0-patched/lib/glob/glob.c 2009-05-22 12:32:26.000000000 -0400
---- lib/glob/glob.c 2009-05-22 12:35:55.000000000 -0400
-***************
-*** 666,672 ****
- }
-
-! /* compat: if GX_ALLDIRS, add the passed directory also, but don't add an
-! empty directory name. */
-! if (add_current && (flags & GX_NULLDIR) == 0)
- {
- sdlen = strlen (dir);
---- 666,673 ----
- }
-
-! /* compat: if GX_ADDCURDIR, add the passed directory also. Add an empty
-! directory name as a placeholder if GX_NULLDIR (in which case the passed
-! directory name is "."). */
-! if (add_current)
- {
- sdlen = strlen (dir);
-***************
-*** 680,684 ****
- nextlink->next = lastlink;
- lastlink = nextlink;
-! bcopy (dir, nextname, sdlen + 1);
- ++count;
- }
---- 681,688 ----
- nextlink->next = lastlink;
- lastlink = nextlink;
-! if (flags & GX_NULLDIR)
-! nextname[0] = '\0';
-! else
-! bcopy (dir, nextname, sdlen + 1);
- ++count;
- }
-***************
-*** 1008,1016 ****
- /* Just return what glob_vector () returns appended to the
- directory name. */
- dflags = flags & ~GX_MARKDIRS;
- if (directory_len == 0)
- dflags |= GX_NULLDIR;
- if ((flags & GX_GLOBSTAR) && filename[0] == '*' && filename[1] == '*' && filename[2] == '\0')
-! dflags |= GX_ALLDIRS|GX_ADDCURDIR;
- temp_results = glob_vector (filename,
- (directory_len == 0 ? "." : directory_name),
---- 1012,1033 ----
- /* Just return what glob_vector () returns appended to the
- directory name. */
-+ /* If flags & GX_ALLDIRS, we're called recursively */
- dflags = flags & ~GX_MARKDIRS;
- if (directory_len == 0)
- dflags |= GX_NULLDIR;
- if ((flags & GX_GLOBSTAR) && filename[0] == '*' && filename[1] == '*' && filename[2] == '\0')
-! {
-! dflags |= GX_ALLDIRS|GX_ADDCURDIR;
-! #if 0
-! /* If we want all directories (dflags & GX_ALLDIRS) and we're not
-! being called recursively as something like `echo **/*.o'
-! ((flags & GX_ALLDIRS) == 0), we want to prevent glob_vector from
-! adding a null directory name to the front of the temp_results
-! array. We turn off ADDCURDIR if not called recursively and
-! dlen == 0 */
-! #endif
-! if (directory_len == 0 && (flags & GX_ALLDIRS) == 0)
-! dflags &= ~GX_ADDCURDIR;
-! }
- temp_results = glob_vector (filename,
- (directory_len == 0 ? "." : directory_name),
-*** ../bash-4.0/patchlevel.h 2009-01-04 14:32:40.000000000 -0500
---- patchlevel.h 2009-02-22 16:11:31.000000000 -0500
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 24
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 25
-
- #endif /* _PATCHLEVEL_H_ */
--- a/usr/src/cmd/bash/Patches-4.0/bash40-026 Sat Oct 30 12:35:08 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.0
-Patch-ID: bash40-026
-
-Bug-Reported-by: Sergei Steshenko <[email protected]>
-Bug-Reference-ID: <[email protected]>
-Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2009-05/msg00059.html
-
-Bug-Description:
-
-A forgotten line in externs.h caused compilation errors to occur on some
-systems (e.g., Cygwin).
-
-Patch:
-
-*** ../bash-4.0-patched/externs.h 2009-01-18 18:29:29.000000000 -0500
---- externs.h 2009-06-02 09:05:40.000000000 -0400
-***************
-*** 193,196 ****
---- 193,198 ----
-
- /* Declarations for functions defined in lib/sh/fpurge.c */
-+
-+ #if defined NEED_FPURGE_DECL
- #if !HAVE_DECL_FPURGE
-
-***************
-*** 201,205 ****
-
- #endif /* HAVE_DECL_FPURGE */
-!
-
- /* Declarations for functions defined in lib/sh/getcwd.c */
---- 203,207 ----
-
- #endif /* HAVE_DECL_FPURGE */
-! #endif /* NEED_FPURGE_DECL */
-
- /* Declarations for functions defined in lib/sh/getcwd.c */
-*** ../bash-4.0/patchlevel.h 2009-01-04 14:32:40.000000000 -0500
---- patchlevel.h 2009-02-22 16:11:31.000000000 -0500
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 25
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 26
-
- #endif /* _PATCHLEVEL_H_ */
--- a/usr/src/cmd/bash/Patches-4.0/bash40-027 Sat Oct 30 12:35:08 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,67 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.0
-Patch-ID: bash40-027
-
-Bug-Reported-by: [email protected]
-Bug-Reference-ID: <[email protected]>
-Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2009-05/msg00074.html
-
-Bug-Description:
-
-There are occasional cursor positioning errors when using readline's
-horizontal scroll mode.
-
-Patch:
-
-*** ../bash-4.0-patched/lib/readline/display.c 2009-05-22 12:32:25.000000000 -0400
---- lib/readline/display.c 2009-05-29 23:32:20.000000000 -0400
-***************
-*** 1190,1196 ****
- line[t - 1] = '>';
-
-! if (!rl_display_fixed || forced_display || lmargin != last_lmargin)
- {
- forced_display = 0;
- update_line (&visible_line[last_lmargin],
- &invisible_line[lmargin],
---- 1192,1200 ----
- line[t - 1] = '>';
-
-! if (rl_display_fixed == 0 || forced_display || lmargin != last_lmargin)
- {
- forced_display = 0;
-+ o_cpos = _rl_last_c_pos;
-+ cpos_adjusted = 0;
- update_line (&visible_line[last_lmargin],
- &invisible_line[lmargin],
-***************
-*** 1200,1203 ****
---- 1204,1214 ----
- 0);
-
-+ if ((MB_CUR_MAX > 1 && rl_byte_oriented == 0) &&
-+ cpos_adjusted == 0 &&
-+ _rl_last_c_pos != o_cpos &&
-+ _rl_last_c_pos > wrap_offset &&
-+ o_cpos < prompt_last_invisible)
-+ _rl_last_c_pos -= prompt_invis_chars_first_line; /* XXX - was wrap_offset */
-+
- /* If the visible new line is shorter than the old, but the number
- of invisible characters is greater, and we are at the end of
-*** ../bash-4.0/patchlevel.h 2009-01-04 14:32:40.000000000 -0500
---- patchlevel.h 2009-02-22 16:11:31.000000000 -0500
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 26
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 27
-
- #endif /* _PATCHLEVEL_H_ */
--- a/usr/src/cmd/bash/Patches-4.0/bash40-028 Sat Oct 30 12:35:08 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,172 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.0
-Patch-ID: bash40-028
-
-Bug-Reported-by: martin f krafft <[email protected]>
-Bug-Reference-ID: <[email protected]>
-Bug-Reference-URL: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=519165
- http://lists.gnu.org/archive/html/bug-bash/2009-07/msg00011.html
-
-Bug-Description:
-
-bash-4.0 reverted to the historical shell behavior of raising an error
-when $@ or $* was expanded after `set -u' had been executed and there
-were no positional parameters. The Posix working group has since
-clarified the standard's position on the issue, and $@ and $* are now the
-only variables, parameters, or special parameters that do not raise an
-error when unset if set -u is enabled.
-
-Patch:
-
-*** ../bash-4.0-patched/subst.c Mon Mar 23 11:34:55 2009
---- subst.c Wed Jun 17 18:12:18 2009
-***************
-*** 6768,6778 ****
-
- case RBRACE:
-! if (var_is_set == 0 && unbound_vars_is_error)
- {
- err_unboundvar (name);
- FREE (value);
- FREE (temp);
- free (name);
-- last_command_exit_value = EXECUTION_FAILURE;
- return (interactive_shell ? &expand_wdesc_error : &expand_wdesc_fatal);
- }
---- 6794,6804 ----
-
- case RBRACE:
-! if (var_is_set == 0 && unbound_vars_is_error && ((name[0] != '@' && name[0] != '*') || name[1]))
- {
-+ last_command_exit_value = EXECUTION_FAILURE;
- err_unboundvar (name);
- FREE (value);
- FREE (temp);
- free (name);
- return (interactive_shell ? &expand_wdesc_error : &expand_wdesc_fatal);
- }
-***************
-*** 6991,6994 ****
---- 7017,7029 ----
- list = list_rest_of_args ();
-
-+ #if 0
-+ /* According to austin-group posix proposal by Geoff Clare in
-+ <[email protected]> of 5 May 2009:
-+
-+ "The shell shall write a message to standard error and
-+ immediately exit when it tries to expand an unset parameter
-+ other than the '@' and '*' special parameters."
-+ */
-+
- if (list == 0 && unbound_vars_is_error && (pflags & PF_IGNUNBOUND) == 0)
- {
-***************
-*** 6996,7003 ****
- uerror[1] = '*';
- uerror[2] = '\0';
-- err_unboundvar (uerror);
- last_command_exit_value = EXECUTION_FAILURE;
- return (interactive_shell ? &expand_wdesc_error : &expand_wdesc_fatal);
- }
-
- /* If there are no command-line arguments, this should just
---- 7031,7039 ----
- uerror[1] = '*';
- uerror[2] = '\0';
- last_command_exit_value = EXECUTION_FAILURE;
-+ err_unboundvar (uerror);
- return (interactive_shell ? &expand_wdesc_error : &expand_wdesc_fatal);
- }
-+ #endif
-
- /* If there are no command-line arguments, this should just
-***************
-*** 7053,7056 ****
---- 7089,7101 ----
- list = list_rest_of_args ();
-
-+ #if 0
-+ /* According to austin-group posix proposal by Geoff Clare in
-+ <[email protected]> of 5 May 2009:
-+
-+ "The shell shall write a message to standard error and
-+ immediately exit when it tries to expand an unset parameter
-+ other than the '@' and '*' special parameters."
-+ */
-+
- if (list == 0 && unbound_vars_is_error && (pflags & PF_IGNUNBOUND) == 0)
- {
-***************
-*** 7058,7065 ****
- uerror[1] = '@';
- uerror[2] = '\0';
-- err_unboundvar (uerror);
- last_command_exit_value = EXECUTION_FAILURE;
- return (interactive_shell ? &expand_wdesc_error : &expand_wdesc_fatal);
- }
-
- /* We want to flag the fact that we saw this. We can't turn
---- 7103,7111 ----
- uerror[1] = '@';
- uerror[2] = '\0';
- last_command_exit_value = EXECUTION_FAILURE;
-+ err_unboundvar (uerror);
- return (interactive_shell ? &expand_wdesc_error : &expand_wdesc_fatal);
- }
-+ #endif
-
- /* We want to flag the fact that we saw this. We can't turn
-*** ../bash-4.0-patched/doc/bash.1 Wed Feb 18 15:13:56 2009
---- doc/bash.1 Wed Jun 17 08:51:19 2009
-***************
-*** 8258,8264 ****
- .TP 8
- .B \-u
-! Treat unset variables as an error when performing
- parameter expansion. If expansion is attempted on an
-! unset variable, the shell prints an error message, and,
- if not interactive, exits with a non-zero status.
- .TP 8
---- 8274,8281 ----
- .TP 8
- .B \-u
-! Treat unset variables and parameters other than the special
-! parameters "@" and "*" as an error when performing
- parameter expansion. If expansion is attempted on an
-! unset variable or parameter, the shell prints an error message, and,
- if not interactive, exits with a non-zero status.
- .TP 8
-*** ../bash-4.0-patched/doc/bashref.texi Wed Feb 18 15:14:43 2009
---- doc/bashref.texi Wed Jun 17 08:50:46 2009
-***************
-*** 4139,4143 ****
-
- @item -u
-! Treat unset variables as an error when performing parameter expansion.
- An error message will be written to the standard error, and a non-interactive
- shell will exit.
---- 4151,4156 ----
-
- @item -u
-! Treat unset variables and parameters other than the special parameters
-! @samp{@@} or @samp{*} as an error when performing parameter expansion.
- An error message will be written to the standard error, and a non-interactive
- shell will exit.
-*** ../bash-4.0/patchlevel.h 2009-01-04 14:32:40.000000000 -0500
---- patchlevel.h 2009-02-22 16:11:31.000000000 -0500
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 27
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 28
-
- #endif /* _PATCHLEVEL_H_ */
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/bash/Patches-4.1/bash41-001 Tue Nov 16 22:41:08 2010 -0800
@@ -0,0 +1,48 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.1
+Patch-ID: bash41-001
+
+Bug-Reported-by: Yann Rouillard <[email protected]>
+Bug-Reference-ID: <[email protected]>
+Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2010-01/msg00018.html
+
+Bug-Description:
+
+A prototype for vsnprintf was incorrect, and caused compilation failures
+on systems that did not have a suitable vsnprintf, but had a declaration in
+one of the system header files.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.1-patched/builtins/printf.def 2009-11-20 15:31:23.000000000 -0500
+--- builtins/printf.def 2010-01-07 08:50:06.000000000 -0500
+***************
+*** 173,177 ****
+
+ #if !HAVE_VSNPRINTF
+! extern int vsnprintf __P((char *, size_t, const char *, ...)) __attribute__((__format__ (printf, 3, 4)));
+ #endif
+
+--- 173,177 ----
+
+ #if !HAVE_VSNPRINTF
+! extern int vsnprintf __P((char *, size_t, const char *, va_list)) __attribute__((__format__ (printf, 3, 0)));
+ #endif
+
+*** ../bash-4.1-patched/patchlevel.h 2009-10-01 16:39:22.000000000 -0400
+--- patchlevel.h 2010-01-14 09:38:08.000000000 -0500
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 0
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 1
+
+ #endif /* _PATCHLEVEL_H_ */
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/bash/Patches-4.1/bash41-002 Tue Nov 16 22:41:08 2010 -0800
@@ -0,0 +1,65 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.1
+Patch-ID: bash41-002
+
+Bug-Reported-by: [email protected]
+Bug-Reference-ID: <[email protected]>
+Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2010-01/msg00017.html
+
+Bug-Description:
+
+Bash-4.1/Readline-6.1 introduced a hook function that allows applications
+to rewrite or modify filenames read from the file system before comparing
+them with a word to be completed. The converted filename, if it matches,
+needs to be inserted into the line buffer, replacing the original contents.
+
+This fixes a completion bug on Mac OS X involving filenames containing
+UTF-8 characters.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.1-patched/lib/readline/complete.c 2009-11-29 18:39:30.000000000 -0500
+--- lib/readline/complete.c 2010-01-06 08:30:23.000000000 -0500
+***************
+*** 2139,2143 ****
+ if (filename_len == 0)
+ {
+! if (_rl_match_hidden_files == 0 && HIDDEN_FILE (entry->d_name))
+ continue;
+
+--- 2139,2143 ----
+ if (filename_len == 0)
+ {
+! if (_rl_match_hidden_files == 0 && HIDDEN_FILE (convfn))
+ continue;
+
+***************
+*** 2220,2224 ****
+ }
+
+! strcpy (temp + dirlen, entry->d_name);
+ }
+ else
+--- 2220,2224 ----
+ }
+
+! strcpy (temp + dirlen, convfn);
+ }
+ else
+*** ../bash-4.1-patched/patchlevel.h 2009-10-01 16:39:22.000000000 -0400
+--- patchlevel.h 2010-01-14 09:38:08.000000000 -0500
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 1
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 2
+
+ #endif /* _PATCHLEVEL_H_ */
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/bash/Patches-4.1/bash41-003 Tue Nov 16 22:41:08 2010 -0800
@@ -0,0 +1,48 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.1
+Patch-ID: bash41-003
+
+Bug-Reported-by: [email protected]
+Bug-Reference-ID: <[email protected]>
+Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2010-01/msg00135.html
+
+Bug-Description:
+
+If command completion is attempted on a word with a quoted globbing
+character (e.g., `*' or `?'), bash can reference a NULL pointer and
+dump core.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.1-patched/bashline.c 2009-10-24 14:10:19.000000000 -0400
+--- bashline.c 2010-01-30 21:53:49.000000000 -0500
+***************
+*** 1681,1685 ****
+ characters in the common prefix are bad) will ever be returned on
+ regular completion. */
+! if (glob_pattern_p (hint))
+ {
+ if (state == 0)
+--- 1681,1685 ----
+ characters in the common prefix are bad) will ever be returned on
+ regular completion. */
+! if (globpat)
+ {
+ if (state == 0)
+*** ../bash-4.1-patched/patchlevel.h 2009-10-01 16:39:22.000000000 -0400
+--- patchlevel.h 2010-01-14 09:38:08.000000000 -0500
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 2
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 3
+
+ #endif /* _PATCHLEVEL_H_ */
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/bash/Patches-4.1/bash41-004 Tue Nov 16 22:41:08 2010 -0800
@@ -0,0 +1,47 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.1
+Patch-ID: bash41-004
+
+Bug-Reported-by: Crestez Dan Leonard <[email protected]>
+Bug-Reference-ID: <1265592839.30682.21.camel@deskbox>
+Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2010-02/msg00034.html
+
+Bug-Description:
+
+When running in Posix mode and executing a shell function without local
+variables, bash will not propagate a variable in a special builtin's temporary
+environment to have global scope.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.1-patched/variables.c 2009-11-03 14:13:58.000000000 -0500
+--- variables.c 2010-02-08 17:36:18.000000000 -0500
+***************
+*** 3809,3812 ****
+--- 3809,3817 ----
+ if (tempvar_p (var) && (posixly_correct || (var->attributes & att_propagate)))
+ {
++ /* Make sure we have a hash table to store the variable in while it is
++ being propagated down to the global variables table. Create one if
++ we have to */
++ if ((vc_isfuncenv (shell_variables) || vc_istempenv (shell_variables)) && shell_variables->table == 0)
++ shell_variables->table = hash_create (0);
+ /* XXX - should we set v->context here? */
+ v = bind_variable_internal (var->name, value_cell (var), shell_variables->table, 0, 0);
+*** ../bash-4.1-patched/patchlevel.h 2009-10-01 16:39:22.000000000 -0400
+--- patchlevel.h 2010-01-14 09:38:08.000000000 -0500
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 3
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 4
+
+ #endif /* _PATCHLEVEL_H_ */
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/bash/Patches-4.1/bash41-005 Tue Nov 16 22:41:08 2010 -0800
@@ -0,0 +1,56 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.1
+Patch-ID: bash41-005
+
+Bug-Reported-by: [email protected]
+Bug-Reference-ID: <[email protected]>
+Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2010-02/msg00132.html
+
+Bug-Description:
+
+When the `read' builtin times out after the timeout specified with -t is
+exceeded, it does not reset the flags that tell signal handlers to process
+signals immediately instead of deferring their handling. This can result
+in unsafe functions being called from signal handlers, which can cause bash
+to hang or dump core.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.1-patched/builtins/read.def 2009-10-08 11:35:46.000000000 -0400
+--- builtins/read.def 2010-03-17 17:35:39.000000000 -0400
+***************
+*** 616,621 ****
+ zsyncfd (fd);
+
+- interrupt_immediately--;
+- terminate_immediately--;
+ discard_unwind_frame ("read_builtin");
+
+--- 616,619 ----
+***************
+*** 624,627 ****
+--- 622,628 ----
+ assign_vars:
+
++ interrupt_immediately--;
++ terminate_immediately--;
++
+ #if defined (ARRAY_VARS)
+ /* If -a was given, take the string read, break it into a list of words,
+*** ../bash-4.1-patched/patchlevel.h 2009-10-01 16:39:22.000000000 -0400
+--- patchlevel.h 2010-01-14 09:38:08.000000000 -0500
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 4
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 5
+
+ #endif /* _PATCHLEVEL_H_ */
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/bash/Patches-4.1/bash41-006 Tue Nov 16 22:41:08 2010 -0800
@@ -0,0 +1,76 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.1
+Patch-ID: bash41-006
+
+Bug-Reported-by: Mike Frysinger <[email protected]>
+Bug-Reference-ID: <[email protected]>
+Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2010-03/msg00063.html
+
+Bug-Description:
+
+Bash did not correctly print/reproduce here documents attached to commands
+inside compound commands such as for and while. This affected the
+execution of such commands inside a shell function when the function
+definition is saved and later restored using `.' or `eval'.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.1-patched/print_cmd.c 2009-09-16 15:32:26.000000000 -0400
+--- print_cmd.c 2010-03-22 21:15:30.000000000 -0400
+***************
+*** 114,117 ****
+--- 114,123 ----
+ #define CHECK_XTRACE_FP xtrace_fp = (xtrace_fp ? xtrace_fp : stderr)
+
++ #define PRINT_DEFERRED_HEREDOCS(x) \
++ do { \
++ if (deferred_heredocs) \
++ print_deferred_heredocs (x); \
++ } while (0)
++
+ /* Non-zero means the stuff being printed is inside of a function def. */
+ static int inside_function_def;
+***************
+*** 561,571 ****
+ {
+ print_for_command_head (for_command);
+-
+ cprintf (";");
+ newline ("do\n");
+ indentation += indentation_amount;
+ make_command_string_internal (for_command->action);
+ semicolon ();
+ indentation -= indentation_amount;
+ newline ("done");
+ }
+--- 566,578 ----
+ {
+ print_for_command_head (for_command);
+ cprintf (";");
+ newline ("do\n");
++
+ indentation += indentation_amount;
+ make_command_string_internal (for_command->action);
++ PRINT_DEFERRED_HEREDOCS ("");
+ semicolon ();
+ indentation -= indentation_amount;
++
+ newline ("done");
+ }
+*** ../bash-4.1-patched/patchlevel.h 2009-10-01 16:39:22.000000000 -0400
+--- patchlevel.h 2010-01-14 09:38:08.000000000 -0500
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 5
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 6
+
+ #endif /* _PATCHLEVEL_H_ */
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/bash/Patches-4.1/bash41-007 Tue Nov 16 22:41:08 2010 -0800
@@ -0,0 +1,47 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.1
+Patch-ID: bash41-007
+
+Bug-Reported-by: Rob Robason <[email protected]>
+Bug-Reference-ID: <[email protected]>
+Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2010-03/msg00089.html
+
+Bug-Description:
+
+A typo caused bash to not honor a precision specification in a printf
+format.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.1-patched/builtins/printf.def 2010-01-18 10:50:22.000000000 -0500
+--- builtins/printf.def 2010-03-25 09:40:56.000000000 -0400
+***************
+*** 118,122 ****
+ nw = vflag ? vbprintf (f, fieldwidth, func) : printf (f, fieldwidth, func); \
+ else if (have_precision) \
+! nw = vflag ? vbprintf (f, precision, func) : printf (f, fieldwidth, func); \
+ else \
+ nw = vflag ? vbprintf (f, func) : printf (f, func); \
+--- 118,122 ----
+ nw = vflag ? vbprintf (f, fieldwidth, func) : printf (f, fieldwidth, func); \
+ else if (have_precision) \
+! nw = vflag ? vbprintf (f, precision, func) : printf (f, precision, func); \
+ else \
+ nw = vflag ? vbprintf (f, func) : printf (f, func); \
+*** ../bash-4.1-patched/patchlevel.h 2009-10-01 16:39:22.000000000 -0400
+--- patchlevel.h 2010-01-14 09:38:08.000000000 -0500
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 6
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 7
+
+ #endif /* _PATCHLEVEL_H_ */
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/bash/Patches-4.1/bash41-008 Tue Nov 16 22:41:08 2010 -0800
@@ -0,0 +1,49 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.1
+Patch-ID: bash41-008
+
+Bug-Reported-by: Dennis van Dok <[email protected]>
+Bug-Reference-ID: <[email protected]>
+Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2010-04/msg00038.html
+
+Bug-Description:
+
+When declaring an associative array and implicitly assigning a value
+to element "0", bash does not correctly allocate memory, leading to
+a segmentation violation when that element or the array itself is
+unset.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.1-patched/builtins/declare.def 2009-11-25 19:42:00.000000000 -0500
+--- builtins/declare.def 2010-05-30 18:25:21.000000000 -0400
+***************
+*** 513,517 ****
+ /* let bind_{array,assoc}_variable take care of this. */
+ if (assoc_p (var))
+! bind_assoc_variable (var, name, "0", value, aflags);
+ else
+ bind_array_variable (name, 0, value, aflags);
+--- 519,523 ----
+ /* let bind_{array,assoc}_variable take care of this. */
+ if (assoc_p (var))
+! bind_assoc_variable (var, name, savestring ("0"), value, aflags);
+ else
+ bind_array_variable (name, 0, value, aflags);
+*** ../bash-4.1-patched/patchlevel.h 2009-10-01 16:39:22.000000000 -0400
+--- patchlevel.h 2010-01-14 09:38:08.000000000 -0500
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 7
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 8
+
+ #endif /* _PATCHLEVEL_H_ */
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/bash/Patches-4.1/bash41-009 Tue Nov 16 22:41:08 2010 -0800
@@ -0,0 +1,48 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.1
+Patch-ID: bash41-009
+
+Bug-Reported-by: Tomas Trnka <[email protected]>
+Bug-Reference-ID: <[email protected]>
+Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2010-03/msg00090.html
+
+Bug-Description:
+
+An arriving SIGCHLD will interrupt `slow' system calls such as write(2) to
+or read(2) from a terminal. This results in an error message and truncated
+input or output.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.1-patched/sig.c Fri Aug 14 16:31:52 2009
+--- sig.c Fri Mar 26 22:34:11 2010
+***************
+*** 655,660 ****
+--- 655,663 ----
+ act.sa_flags |= SA_INTERRUPT; /* XXX */
+ else
+ act.sa_flags |= SA_RESTART; /* XXX */
++ #else
++ if (sig == SIGCHLD)
++ act.sa_flags |= SA_RESTART;
+ #endif
+ sigemptyset (&act.sa_mask);
+ sigemptyset (&oact.sa_mask);
+*** ../bash-4.1-patched/patchlevel.h 2009-10-01 16:39:22.000000000 -0400
+--- patchlevel.h 2010-01-14 09:38:08.000000000 -0500
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 8
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 9
+
+ #endif /* _PATCHLEVEL_H_ */
+
--- a/usr/src/cmd/bash/Solaris/apply_patches.sh Sat Oct 30 12:35:08 2010 -0700
+++ b/usr/src/cmd/bash/Solaris/apply_patches.sh Tue Nov 16 22:41:08 2010 -0800
@@ -20,47 +20,29 @@
# CDDL HEADER END
#
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright 2009, 2010, Oracle and/or its affiliates. All rights reserved.
#
-# ident "@(#)apply_patches.sh 1.1 09/10/05 SMI"
+# ident "@(#)apply_patches.sh 1.2 10/11/08 SMI"
+
PATCHDB="patches.applied"
mkdir -p ${PATCHDB}
for file in \
- bash40-001 \
- bash40-002 \
- bash40-003 \
- bash40-004 \
- bash40-005 \
- bash40-006 \
- bash40-007 \
- bash40-008 \
- bash40-009 \
- bash40-010 \
- bash40-011 \
- bash40-012 \
- bash40-013 \
- bash40-014 \
- bash40-015 \
- bash40-016 \
- bash40-017 \
- bash40-018 \
- bash40-019 \
- bash40-020 \
- bash40-021 \
- bash40-022 \
- bash40-023 \
- bash40-024 \
- bash40-025 \
- bash40-026 \
- bash40-027 \
- bash40-028
+ bash41-001 \
+ bash41-002 \
+ bash41-003 \
+ bash41-004 \
+ bash41-005 \
+ bash41-006 \
+ bash41-007 \
+ bash41-008 \
+ bash41-009
+
do
if [ ! -f ${PATCHDB}/${file}.applied ] ; then
- echo "Applying upstream bash 4.0 patch ${file}."
- gpatch -p0 < ../Patches-4.0/${file} || exit 1
+ echo "Applying upstream bash 4.1 patch ${file}."
+ gpatch -p0 < ../Patches-4.1/${file} || exit 1
touch ${PATCHDB}/${file}.applied
else
echo "Patch ${file} has already been applied."
--- a/usr/src/cmd/bash/Solaris/diffs/Makefile.in.3.diff Sat Oct 30 12:35:08 2010 -0700
+++ b/usr/src/cmd/bash/Solaris/diffs/Makefile.in.3.diff Tue Nov 16 22:41:08 2010 -0800
@@ -1,5 +1,5 @@
---- Makefile.in 2009-01-04 14:32:39.000000000 -0500
-+++ Makefile.in 2009-08-15 19:02:02.780921000 -0400
+--- Makefile.in 2009-12-30 10:05:40.000000000 -0800
++++ Makefile.in 2010-09-01 10:26:51.631353101 -0700
@@ -137,7 +137,7 @@
STATIC_LD = @STATIC_LD@
LOCAL_LDFLAGS = @LOCAL_LDFLAGS@
@@ -9,7 +9,7 @@
BASE_CCFLAGS = $(PROFILE_FLAGS) $(SYSTEM_FLAGS) $(LOCAL_DEFS) \
$(DEFS) $(LOCAL_CFLAGS) $(INCLUDES)
-@@ -545,10 +545,10 @@
+@@ -549,10 +549,10 @@
@echo
bashbug: $(SUPPORT_SRC)bashbug.sh config.h Makefile $(VERSPROG)
@@ -18,9 +18,9 @@
- -e "s%!RELEASE!%$(Version)%" -e "s%!PATCHLEVEL!%$(PatchLevel)%" \
- -e "s%!MACHTYPE!%$(MACHTYPE)%" -e "s%!RELSTATUS!%$(RELSTATUS)%" \
+ @sed -e "s^!MACHINE!^$(Machine)^" -e "s^!OS!^$(OS)^" \
-+ -e "s^!CFLAGS!^$(CCFLAGS)^" -e "s^!CC!^$(CC)^" \
-+ -e "s^!RELEASE!^$(Version)^" -e "s^!PATCHLEVEL!^$(PatchLevel)^" \
-+ -e "s^!MACHTYPE!^$(MACHTYPE)^" -e "s^!RELSTATUS!^$(RELSTATUS)^" \
++ -e "s^!CFLAGS!^$(CCFLAGS)^" -e "s^!CC!^$(CC)^" \
++ -e "s^!RELEASE!^$(Version)^" -e "s^!PATCHLEVEL!^$(PatchLevel)^" \
++ -e "s^!MACHTYPE!^$(MACHTYPE)^" -e "s^!RELSTATUS!^$(RELSTATUS)^" \
$(SUPPORT_SRC)bashbug.sh > $@
@chmod a+rx bashbug
--- a/usr/src/cmd/bash/Solaris/diffs/bash.man.15.diff Sat Oct 30 12:35:08 2010 -0700
+++ b/usr/src/cmd/bash/Solaris/diffs/bash.man.15.diff Tue Nov 16 22:41:08 2010 -0800
@@ -1,6 +1,6 @@
---- doc/bash.1 2009-08-31 17:12:22.118022000 -0700
-+++ doc/bash.1 2009-08-31 17:18:29.013049613 -0700
-@@ -5066,11 +5066,11 @@
+--- doc/bash.1 2009-12-30 10:01:31.000000000 -0800
++++ doc/bash.1 2010-09-01 10:50:49.912191287 -0700
+@@ -5235,11 +5235,11 @@
.IP \fB$include\fP
This directive takes a single filename as an argument and reads commands
and bindings from that file. For example, the following directive
--- a/usr/src/cmd/bash/Solaris/diffs/bashref.info.14.diff Sat Oct 30 12:35:08 2010 -0700
+++ b/usr/src/cmd/bash/Solaris/diffs/bashref.info.14.diff Tue Nov 16 22:41:08 2010 -0800
@@ -1,6 +1,6 @@
---- doc/bashref.info 2009-02-05 05:05:29.000000000 -0800
-+++ doc/bashref.info 2009-08-31 17:30:03.255235954 -0700
-@@ -6307,7 +6307,7 @@
+--- doc/bashref.info 2009-12-29 12:59:33.000000000 -0800
++++ doc/bashref.info 2010-09-01 10:49:49.070499702 -0700
+@@ -6387,7 +6387,7 @@
directory. The name of this file is taken from the value of the shell
variable `INPUTRC'. If that variable is unset, the default is
`~/.inputrc'. If that file does not exist or cannot be read, the
@@ -9,7 +9,7 @@
When a program which uses the Readline library starts up, the init
file is read, and the key bindings are set.
-@@ -6708,8 +6708,8 @@
+@@ -6812,8 +6812,8 @@
`$include'
This directive takes a single filename as an argument and reads
commands and bindings from that file. For example, the following
--- a/usr/src/cmd/bash/Solaris/diffs/config-top.h.1.diff Sat Oct 30 12:35:08 2010 -0700
+++ b/usr/src/cmd/bash/Solaris/diffs/config-top.h.1.diff Tue Nov 16 22:41:08 2010 -0800
@@ -1,5 +1,5 @@
---- config-top.h 2009-01-04 14:32:23.000000000 -0500
-+++ config-top.h 2009-08-15 18:46:25.685761000 -0400
+--- config-top.h 2009-12-22 12:29:39.000000000 -0800
++++ config-top.h 2010-09-01 10:24:03.070928602 -0700
@@ -54,14 +54,14 @@
/* The default value of the PATH variable. */
#ifndef DEFAULT_PATH_VALUE
@@ -35,8 +35,3 @@
/* Define this if you want bash to try to check whether it's being run by
sshd and source the .bashrc if so (like the rshd behavior). This checks
-@@ -98,3 +98,4 @@
- name is not found. If you want to name it something other than the
- default ("command_not_found_handle"), change it here. */
- /* #define NOTFOUND_HOOK "command_not_found_handle" */
-+
--- a/usr/src/cmd/bash/Solaris/diffs/config.h.in.0.diff Sat Oct 30 12:35:08 2010 -0700
+++ b/usr/src/cmd/bash/Solaris/diffs/config.h.in.0.diff Tue Nov 16 22:41:08 2010 -0800
@@ -1,5 +1,5 @@
---- config.h.in 2009-02-01 17:07:23.000000000 -0500
-+++ config.h.in 2009-08-16 11:35:15.293693000 -0400
+--- config.h.in 2009-08-18 20:34:36.000000000 -0700
++++ config.h.in 2010-09-01 10:21:00.756734104 -0700
@@ -21,6 +21,8 @@
#ifndef _CONFIG_H_
#define _CONFIG_H_
@@ -9,20 +9,3 @@
/* Configuration feature settings controllable by autoconf. */
/* Define JOB_CONTROL if your operating system supports
-@@ -168,11 +170,6 @@
-
- #undef ENABLE_NLS
-
--/* End of configuration settings controllable by autoconf. */
--/* Other settable options appear in config-top.h. */
--
--#include "config-top.h"
--
- /* Beginning of autoconf additions. */
-
- /* Characteristics of the C compiler */
-@@ -1081,3 +1078,4 @@
- #include "config-bot.h"
-
- #endif /* _CONFIG_H_ */
-+
--- a/usr/src/cmd/bash/Solaris/diffs/configure.10.diff Sat Oct 30 12:35:08 2010 -0700
+++ b/usr/src/cmd/bash/Solaris/diffs/configure.10.diff Tue Nov 16 22:41:08 2010 -0800
@@ -1,11 +1,11 @@
---- configure 2009-02-09 05:33:13.000000000 -0800
-+++ configure 2009-08-31 17:46:03.862852473 -0700
+--- configure 2009-12-29 05:34:51.000000000 -0800
++++ configure 2010-09-01 10:45:06.225859891 -0700
@@ -1,4 +1,4 @@
-#! /bin/sh
+#! /bin/bash
- # From configure.in for Bash 4.0, version 4.013.
+ # From configure.in for Bash 4.1, version 4.019.
# Guess values for system-dependent variables and create Makefiles.
- # Generated by GNU Autoconf 2.63 for bash 4.0-release.
+ # Generated by GNU Autoconf 2.63 for bash 4.1-release.
@@ -13,6 +13,8 @@
## M4sh Initialization. ##
## --------------------- ##
@@ -24,7 +24,7 @@
# Identity of this package.
PACKAGE_NAME='bash'
-@@ -3477,7 +3479,7 @@
+@@ -3500,7 +3502,7 @@
ac_save_c_werror_flag=$ac_c_werror_flag
ac_c_werror_flag=yes
ac_cv_prog_cc_g=no
@@ -33,7 +33,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -3556,7 +3558,7 @@
+@@ -3579,7 +3581,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_c_werror_flag=$ac_save_c_werror_flag
@@ -42,7 +42,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -3615,7 +3617,7 @@
+@@ -3638,7 +3640,7 @@
if test "$GCC" = yes; then
CFLAGS="-g -O2"
else
@@ -51,7 +51,7 @@
fi
else
if test "$GCC" = yes; then
-@@ -5069,7 +5071,7 @@
+@@ -5092,7 +5094,7 @@
if test -z "$CC_FOR_BUILD"; then
if test "x$cross_compiling" = "xno"; then
@@ -60,7 +60,7 @@
else
CC_FOR_BUILD=gcc
fi
-@@ -5077,7 +5079,7 @@
+@@ -5100,7 +5102,7 @@
@@ -69,7 +69,7 @@
test -n "$GCC" && test -n "$auto_cflags" && CFLAGS="$CFLAGS -O2"
-@@ -5109,7 +5111,7 @@
+@@ -5132,7 +5134,7 @@
LDFLAGS_FOR_BUILD=${LDFLAGS_FOR_BUILD-""}
fi
@@ -78,7 +78,7 @@
-@@ -5301,9 +5303,14 @@
+@@ -5257,9 +5259,14 @@
int
main ()
{
@@ -93,7 +93,7 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-@@ -6141,7 +6148,7 @@
+@@ -6164,7 +6171,7 @@
$as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
@@ -102,18 +102,16 @@
all:
@echo '@@@%%%=$(MAKE)=@@@%%%'
_ACEOF
-@@ -6166,8 +6173,8 @@
-
+@@ -6190,7 +6197,7 @@
case "$host_os" in
--opennt*|interix*) MAKE_SHELL="$INTERIX_ROOT/bin/sh" ;;
+ opennt*|interix*) MAKE_SHELL="$INTERIX_ROOT/bin/sh" ;;
-*) MAKE_SHELL=/bin/sh ;;
-+opennt*|interix*) MAKE_SHELL="$INTERIX_ROOT/bin/bash" ;;
+*) MAKE_SHELL=/bin/bash ;;
esac
-@@ -7154,7 +7161,7 @@
+@@ -7177,7 +7184,7 @@
# Prepare PATH_SEPARATOR.
# The user is always right.
if test "${PATH_SEPARATOR+set}" != set; then
@@ -122,7 +120,7 @@
echo "exit 0" >>conf$$.sh
chmod +x conf$$.sh
if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-@@ -7168,7 +7175,7 @@
+@@ -7191,7 +7198,7 @@
# Find out how to test for executable files. Don't use a zero-byte file,
# as systems may use methods other than mode bits to determine executability.
cat >conf$$.file <<_ASEOF
@@ -131,7 +129,7 @@
exit 0
_ASEOF
chmod +x conf$$.file
-@@ -7265,7 +7272,7 @@
+@@ -7288,7 +7295,7 @@
# Prepare PATH_SEPARATOR.
# The user is always right.
if test "${PATH_SEPARATOR+set}" != set; then
@@ -140,7 +138,7 @@
echo "exit 0" >>conf$$.sh
chmod +x conf$$.sh
if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-@@ -7279,7 +7286,7 @@
+@@ -7302,7 +7309,7 @@
# Find out how to test for executable files. Don't use a zero-byte file,
# as systems may use methods other than mode bits to determine executability.
cat >conf$$.file <<_ASEOF
@@ -149,7 +147,7 @@
exit 0
_ASEOF
chmod +x conf$$.file
-@@ -7336,7 +7343,7 @@
+@@ -7359,7 +7366,7 @@
# Prepare PATH_SEPARATOR.
# The user is always right.
if test "${PATH_SEPARATOR+set}" != set; then
@@ -158,7 +156,7 @@
echo "exit 0" >>conf$$.sh
chmod +x conf$$.sh
if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-@@ -7350,7 +7357,7 @@
+@@ -7373,7 +7380,7 @@
# Find out how to test for executable files. Don't use a zero-byte file,
# as systems may use methods other than mode bits to determine executability.
cat >conf$$.file <<_ASEOF
@@ -167,7 +165,7 @@
exit 0
_ASEOF
chmod +x conf$$.file
-@@ -8969,7 +8976,7 @@
+@@ -8992,7 +8999,7 @@
# Prepare PATH_SEPARATOR.
# The user is always right.
if test "${PATH_SEPARATOR+set}" != set; then
@@ -176,7 +174,7 @@
echo "exit 0" >>conf$$.sh
chmod +x conf$$.sh
if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-@@ -9079,7 +9086,7 @@
+@@ -9102,7 +9109,7 @@
else
CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
@@ -185,12 +183,12 @@
. ./conftest.sh
rm -f ./conftest.sh
acl_cv_rpath=done
-@@ -13017,39 +13024,20 @@
+@@ -13042,39 +13049,18 @@
/* end confdefs.h. */
/* Define isinf to an innocuous variant, in case <limits.h> declares isinf.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define isinf innocuous_isinf
-
+-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char isinf (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
@@ -203,8 +201,8 @@
-#endif
-
-#undef isinf
+-
+#include <math.h>
-
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
@@ -227,7 +225,7 @@
;
return 0;
}
-@@ -13109,39 +13097,26 @@
+@@ -13134,39 +13120,26 @@
/* end confdefs.h. */
/* Define isnan to an innocuous variant, in case <limits.h> declares isnan.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
@@ -270,7 +268,7 @@
;
return 0;
}
-@@ -25079,7 +25054,7 @@
+@@ -25521,7 +25494,7 @@
exit 69
' >conftest
chmod u+x conftest
@@ -279,7 +277,7 @@
if test $? -ne 69; then
ac_cv_sys_interpreter=yes
else
-@@ -29518,9 +29493,14 @@
+@@ -30117,9 +30090,14 @@
int
main ()
{
@@ -294,16 +292,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-@@ -29636,7 +29616,7 @@
+@@ -30302,7 +30280,7 @@
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lcurses $LIBS"
-+LIBS="/usr/lib/libcurses.so.1 $LIBS"
++LIBS="/usr/lib/libcurses.so.1 $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -29802,7 +29782,7 @@
+@@ -30468,7 +30446,7 @@
TERMCAP_LIB=
TERMCAP_DEP=
else
@@ -312,7 +310,7 @@
TERMCAP_DEP=
fi
-@@ -30010,7 +29990,7 @@
+@@ -30676,7 +30654,7 @@
then
{ $as_echo "$as_me:$LINENO: checking shared object configuration for loadable builtins" >&5
$as_echo_n "checking shared object configuration for loadable builtins... " >&6; }
--- a/usr/src/cmd/bash/Solaris/diffs/glob.c.4.diff Sat Oct 30 12:35:08 2010 -0700
+++ b/usr/src/cmd/bash/Solaris/diffs/glob.c.4.diff Tue Nov 16 22:41:08 2010 -0800
@@ -1,11 +1,11 @@
---- lib/glob/glob.c 2009-08-10 13:56:14.707063000 -0400
-+++ lib/glob/glob.c 2009-08-15 17:57:41.534566000 -0400
+--- lib/glob/glob.c 2009-11-14 15:39:30.000000000 -0800
++++ lib/glob/glob.c 2010-09-01 10:28:10.161379481 -0700
@@ -34,6 +34,10 @@
# include <unistd.h>
#endif
+#if defined (HAVE_ALLOCA) && defined (HAVE_ALLOCA_H)
-+#include <alloca.h>
++# include <alloca.h>
+#endif
+
#include "bashansi.h"
--- a/usr/src/cmd/bash/Solaris/diffs/input.c.11.diff Sat Oct 30 12:35:08 2010 -0700
+++ b/usr/src/cmd/bash/Solaris/diffs/input.c.11.diff Tue Nov 16 22:41:08 2010 -0800
@@ -1,10 +1,10 @@
---- lib/readline/input.c 2009-01-22 20:23:56.000000000 -0500
-+++ lib/readline/input.c 2009-08-16 13:19:40.421880000 -0400
-@@ -58,6 +58,10 @@
+--- lib/readline/input.c 2009-04-19 10:12:03.000000000 -0700
++++ lib/readline/input.c 2010-09-01 10:46:23.386144948 -0700
+@@ -51,6 +51,10 @@
# include <sys/ioctl.h>
#endif
-+#if defined (SOLARIS)
++#if defined(SOLARIS)
+# include <sys/filio.h>
+#endif
+
--- a/usr/src/cmd/bash/Solaris/diffs/input_avail.c.12.diff Sat Oct 30 12:35:08 2010 -0700
+++ b/usr/src/cmd/bash/Solaris/diffs/input_avail.c.12.diff Tue Nov 16 22:41:08 2010 -0800
@@ -1,10 +1,10 @@
---- lib/sh/input_avail.c 2009-01-04 14:32:34.000000000 -0500
-+++ lib/sh/input_avail.c 2009-08-16 13:18:22.863953000 -0400
-@@ -52,6 +52,10 @@
+--- lib/sh/input_avail.c 2009-04-19 10:01:14.000000000 -0700
++++ lib/sh/input_avail.c 2010-09-01 10:47:30.418016819 -0700
+@@ -45,6 +45,10 @@
# include <sys/ioctl.h>
#endif
-+#if defined (SOLARIS)
++#if defined(SOLARIS)
+# include <sys/filio.h> /* Solaris FIONREAD */
+#endif
+
--- a/usr/src/cmd/bash/Solaris/diffs/rbash.man.16.diff Sat Oct 30 12:35:08 2010 -0700
+++ b/usr/src/cmd/bash/Solaris/diffs/rbash.man.16.diff Tue Nov 16 22:41:08 2010 -0800
@@ -1,6 +1,9 @@
--- doc/rbash.1 2008-08-12 06:24:51.000000000 -0700
-+++ doc/rbash.1 2009-09-01 14:51:12.600445685 -0700
-@@ -3,6 +3,6 @@
++++ doc/rbash.1 2010-09-01 10:52:04.397206373 -0700
+@@ -1,8 +1,8 @@
+-.TH RBASH 1 "2004 Apr 20" "GNU Bash-4.0"
++.TH RBASH 1 "2004 Apr 20" "GNU Bash-4.1"
+ .SH NAME
rbash \- restricted bash, see \fBbash\fR(1)
.SH RESTRICTED SHELL
.nr zY 1
--- a/usr/src/cmd/bash/Solaris/diffs/rlconf.h.13.diff Sat Oct 30 12:35:08 2010 -0700
+++ b/usr/src/cmd/bash/Solaris/diffs/rlconf.h.13.diff Tue Nov 16 22:41:08 2010 -0800
@@ -1,16 +1,5 @@
-# WHy are we doing this:
-# bash is the default root shell in OpenSolaris.
-# the bash provided readline library is statically
-# linked into bash, because:
-# - we do not want any dynamic linking dependencies other
-# than libc and libm.
-# - we must avoid potential breakage with upgrades to the
-# shared readline library in /usr/lib
-# - /etc/inputrc affects the shared readline library in /usr/lib
-# - /etc/bash/inputrc only affects bash
-#
--- lib/readline/rlconf.h 2009-01-04 11:32:33.000000000 -0800
-+++ lib/readline/rlconf.h 2009-08-31 16:58:56.028292479 -0700
++++ lib/readline/rlconf.h 2010-09-01 10:48:13.018894232 -0700
@@ -39,7 +39,7 @@
#define DEFAULT_INPUTRC "~/.inputrc"
--- a/usr/src/cmd/bash/Solaris/rbash.1 Sat Oct 30 12:35:08 2010 -0700
+++ b/usr/src/cmd/bash/Solaris/rbash.1 Tue Nov 16 22:41:08 2010 -0800
@@ -15,7 +15,7 @@
.\" bash_builtins, strip all but Built-Ins section
.if \n(zZ=1 .ig zZ
.if \n(zY=1 .ig zY
-.TH RBASH 1 "2009 February 7" "GNU Bash-4.0"
+.TH RBASH 1 "2009 December 30" "GNU Bash-4.1"
.\"
.\" There's some problem with having a `@'
.\" in a tagged paragraph with the BSD man macros.
Binary file usr/src/cmd/bash/bash-4.0.tar.gz has changed
Binary file usr/src/cmd/bash/bash-4.1.tar.gz has changed
--- a/usr/src/cmd/bash/install-sfw Sat Oct 30 12:35:08 2010 -0700
+++ b/usr/src/cmd/bash/install-sfw Tue Nov 16 22:41:08 2010 -0800
@@ -20,14 +20,11 @@
# CDDL HEADER END
#
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
#
-#ident "@(#)install-sfw 1.2 09/10/26 SMI"
+#ident "@(#)install-sfw 1.3 10/11/08 SMI"
#
-VERS=bash-4.0
-
PREFIX=${ROOT}/usr
GNUPREFIX=${ROOT}/usr/gnu
BINDIR=${PREFIX}/bin
--- a/usr/src/cmd/bind/Makefile.sfw Sat Oct 30 12:35:08 2010 -0700
+++ b/usr/src/cmd/bind/Makefile.sfw Tue Nov 16 22:41:08 2010 -0800
@@ -23,7 +23,7 @@
# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
#
-#pragma ident "@(#)Makefile.sfw 1.24 10/08/04 SMI"
+#pragma ident "@(#)Makefile.sfw 1.25 10/09/14 SMI"
#
VER = $(COMPONENT_NAME:sh)-$(COMPONENT_VERSION:sh)
@@ -87,7 +87,7 @@
# To force a new test either use clean target first or specify FRC=FRC.
#
# Nawk script reads ISC output which is of the form:
-# /^T:/ = Start of a test,
+# /^T:/ = Start of a test,
# /^I:/ = info from a test; collect in case test did not PASS...
# /^R:/ = Result. If 'PASS' then continue, else print line and collected info.
# @ EOF = Display count of RESULTS: i.e. R:PASS=124 R:UNTESTED=26 Total=150
@@ -108,6 +108,17 @@
}' $@.$(MACH).results
@$(tail) -1 $@.$(MACH).results | $(GREP) '^$(cache_str)' || \
$(ECHO) '$(cache_str)' `$(date)` >> $@.$(MACH).results
+ @$(CCSMAKE) -f Makefile.sfw test_pkgver
+
+test_pkgver:
+ @for d in SUNWbind SUNWbindc; do \
+ f="pkgdefs/$$d/pkginfo.tmpl"; \
+ if [ ! -f $(SRC)/$$f ] || \
+ ! $(GREP) $(COMPONENT_VERSION:sh) $(SRC)/$$f >/dev/null; then \
+ $(ECHO) "Warning \$$SRC/$$f not updated with version" \
+ $(COMPONENT_VERSION:sh); \
+ fi; \
+ done
test.$(MACH).results fulltest.$(MACH).results: $(FRC)
-$(config_ip) up
--- a/usr/src/cmd/grails/Makefile.sfw Sat Oct 30 12:35:08 2010 -0700
+++ b/usr/src/cmd/grails/Makefile.sfw Tue Nov 16 22:41:08 2010 -0800
@@ -19,10 +19,9 @@
#
# CDDL HEADER END
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
#
-#ident "@(#)Makefile.sfw 1.3 09/05/12 SMI"
+#ident "@(#)Makefile.sfw 1.4 10/11/01 SMI"
include ../Makefile.cmd
@@ -37,6 +36,7 @@
(cd ${GRAILS_HOME}; env - \
PATH=${COMPONENT_TOP}/${GRAILS_HOME}/bin:${COMPONENT_TOP}/${GRAILS_HOME}/ant/bin:${PATH} \
JAVA_HOME=${JAVA_ROOT} \
+ PYTHON=${PYTHON26} \
ANT_OPTS="-Djava.io.tmpdir=${SRC}/cmd/grails/tmp" \
ant)
@@ -46,7 +46,9 @@
$(GPATCH) -p0 < javadoc.xml.patch
install: all
- ksh93 ./install-grails ${GRAILS_VER}
+ env \
+ PYTHON=${PYTHON26} \
+ $(KSH93) ./install-grails ${GRAILS_VER}
$(SRC)/tools/protofix --pkg SUNWgrails --perm
include ../Makefile.targ
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/net-snmp/Patches/015.6956251.vmstat_solaris2.patch Tue Nov 16 22:41:08 2010 -0800
@@ -0,0 +1,16 @@
+--- patch/net-snmp-5.4.1/agent/mibgroup/ucd-snmp/vmstat_solaris2.c Tue Aug 3 06:04:52 2010
++++ net-snmp-5.4.1/agent/mibgroup/ucd-snmp/vmstat_solaris2.c Wed Oct 6 01:27:48 2010
+@@ -589,6 +589,13 @@
+ cpu_sum += (css_new->css_cpu[i] - css_old->css_cpu[i]);
+ }
+
++ /*
++ * Assign a minimum value to get around divide by zero case
++ */
++ if (cpu_sum == 0) {
++ cpu_sum = 1;
++ }
++
+ /*
+ * Now calculate the absolute percentage values
+ * Looks somewhat complicated sometimes but tries to get around using floats to increase speed
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/net-snmp/Patches/016.6934478.vmstat_solaris2.patch Tue Nov 16 22:41:08 2010 -0800
@@ -0,0 +1,72 @@
+--- patch/net-snmp-5.4.1/agent/mibgroup/ucd-snmp/vmstat_solaris2.c Tue Oct 12 07:37:07 2010
++++ net-snmp-5.4.1/agent/mibgroup/ucd-snmp/vmstat_solaris2.c Tue Oct 12 07:34:41 2010
+@@ -709,7 +709,12 @@
+ case CPUIDLE:
+ return ((u_char *) (&cpu_perc[CPU_IDLE]));
+ case CPURAWUSER:
+- take_snapshot(&raw_values);
++ /* Take the current snapshot */
++ if ((take_snapshot(&raw_values) == -1) && (raw_values.css_cpus == 0)) {
++ snmp_log(LOG_WARNING,
++ "vmstat_solaris2 (var_extensible_vmstat): Something went wrong with take_snapshot.\n");
++ return (NULL);
++ }
+ /*
+ * LINTED has to be 'long'
+ */
+@@ -723,7 +728,12 @@
+ * (Has been changed to Counter32 in the latest MIB version!)
+ */
+ case CPURAWSYSTEM:
+- take_snapshot(&raw_values);
++ /* Take the current snapshot */
++ if ((take_snapshot(&raw_values) == -1) && (raw_values.css_cpus == 0)) {
++ snmp_log(LOG_WARNING,
++ "vmstat_solaris2 (var_extensible_vmstat): Something went wrong with take_snapshot.\n");
++ return (NULL);
++ }
+ /*
+ * LINTED has to be 'long'
+ */
+@@ -732,7 +742,12 @@
+ raw_values.css_cpu[CPU_WAIT]) / raw_values.css_cpus);
+ return ((u_char *) (&long_ret));
+ case CPURAWIDLE:
+- take_snapshot(&raw_values);
++ /* Take the current snapshot */
++ if ((take_snapshot(&raw_values) == -1) && (raw_values.css_cpus == 0)) {
++ snmp_log(LOG_WARNING,
++ "vmstat_solaris2 (var_extensible_vmstat): Something went wrong with take_snapshot.\n");
++ return (NULL);
++ }
+ /*
+ * LINTED has to be 'long'
+ */
+@@ -740,7 +755,12 @@
+ (long) (raw_values.css_cpu[CPU_IDLE] / raw_values.css_cpus);
+ return ((u_char *) (&long_ret));
+ case CPURAWWAIT:
+- take_snapshot(&raw_values);
++ /* Take the current snapshot */
++ if ((take_snapshot(&raw_values) == -1) && (raw_values.css_cpus == 0)) {
++ snmp_log(LOG_WARNING,
++ "vmstat_solaris2 (var_extensible_vmstat): Something went wrong with take_snapshot.\n");
++ return (NULL);
++ }
+ /*
+ * LINTED has to be 'long'
+ */
+@@ -748,7 +768,12 @@
+ (long) (raw_values.css_cpu[CPU_WAIT] / raw_values.css_cpus);
+ return ((u_char *) (&long_ret));
+ case CPURAWKERNEL:
+- take_snapshot(&raw_values);
++ /* Take the current snapshot */
++ if ((take_snapshot(&raw_values) == -1) && (raw_values.css_cpus == 0)) {
++ snmp_log(LOG_WARNING,
++ "vmstat_solaris2 (var_extensible_vmstat): Something went wrong with take_snapshot.\n");
++ return (NULL);
++ }
+ /*
+ * LINTED has to be 'long'
+ */
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/net-snmp/Patches/017.6984919.kernel_sunos5.patch Tue Nov 16 22:41:08 2010 -0800
@@ -0,0 +1,11 @@
+--- patch/net-snmp-5.4.1/agent/mibgroup/kernel_sunos5.c Tue Oct 12 06:55:48 2010
++++ net-snmp-5.4.1/agent/mibgroup/kernel_sunos5.c Tue Oct 12 07:03:49 2010
+@@ -82,7 +82,7 @@
+ static
+ mibcache Mibcache[MIBCACHE_SIZE+1] = {
+ {MIB_SYSTEM, 0, (void *) -1, 0, 0, 0, 0},
+- {MIB_INTERFACES, 10 * sizeof(mib2_ifEntry_t), (void *) -1, 0, 30, 0,
++ {MIB_INTERFACES, 50 * sizeof(mib2_ifEntry_t), (void *) -1, 0, 30, 0,
+ 0},
+ {MIB_AT, 0, (void *) -1, 0, 0, 0, 0},
+ {MIB_IP, sizeof(mib2_ip_t), (void *) -1, 0, 60, 0, 0},
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/net-snmp/Patches/018.6932608.systemstats_common.patch Tue Nov 16 22:41:08 2010 -0800
@@ -0,0 +1,19 @@
+--- patch/net-snmp-5.4.1-64/agent/mibgroup/ip-mib/data_access/systemstats_common.c Tue Feb 8 13:58:36 2005
++++ net-snmp-5.4.1/agent/mibgroup/ip-mib/data_access/systemstats_common.c Mon Aug 2 05:21:15 2010
+@@ -339,7 +339,7 @@
+ */
+ if (0 == need_wrap_check) {
+ SNMP_FREE(prev_vals->old_stats);
+- }
++ } else {
+
+ /*
+ * update old stats from new stats.
+@@ -346,6 +346,7 @@
+ * careful - old_stats is a pointer to stats...
+ */
+ memcpy(prev_vals->old_stats, &new_vals->stats, sizeof(new_vals->stats));
++ }
+
+ return 0;
+ }
--- a/usr/src/cmd/net-snmp/svc-net-snmp Sat Oct 30 12:35:08 2010 -0700
+++ b/usr/src/cmd/net-snmp/svc-net-snmp Tue Nov 16 22:41:08 2010 -0800
@@ -1,4 +1,4 @@
-#!/sbin/sh
+#!/bin/ksh
#
#
# CDDL HEADER START
@@ -20,10 +20,9 @@
#
# CDDL HEADER END
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
#
-# ident "@(#)svc-net-snmp 1.1 09/07/08 SMI"
+# ident "@(#)svc-net-snmp 1.2 10/10/24 SMI"
#
# Start method script for the net-snmp SNMP daemon
#
@@ -40,14 +39,15 @@
export MIBDIRS
-if [ "$CPU_ARCH" -eq "i86pc" ]; then
+if [ "$CPU_ARCH" == "i86pc" ]; then
arch_type=`/bin/svcprop -p general/arch_type $SMF_FMRI`
- if [ "$arch_type" -eq "32" ]; then
+ if [ "$arch_type" == "32" ]; then
/usr/sbin/i86/snmpd
- elif [ "$arch_type" -eq "64" ]; then
+ elif [ "$arch_type" == "64" ]; then
/usr/sbin/amd64/snmpd
- else
- /usr/sbin/snmpd
- fi
+ elif [ "$arch_type" == "0" ]; then
+ /usr/sbin/snmpd
+ fi
+elif [ "$CPU_ARCH" == "sun4" ]; then
+ /usr/sbin/snmpd
fi
-
--- a/usr/src/cmd/pycups/Makefile.sfw Sat Oct 30 12:35:08 2010 -0700
+++ b/usr/src/cmd/pycups/Makefile.sfw Tue Nov 16 22:41:08 2010 -0800
@@ -20,10 +20,9 @@
#
#
-# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
#
-# ident "@(#)Makefile.sfw 1.4 10/01/08 SMI"
+# ident "@(#)Makefile.sfw 1.5 10/11/01 SMI"
#
include ../Makefile.cmd.64
@@ -53,7 +52,6 @@
CFLAGS += -DVERSION=\\\"$(COMPONENT_VERSION:sh)\\\" $(CPPFLAGS)
CFLAGS64 += -DVERSION=\\\"$(COMPONENT_VERSION:sh)\\\" $(CPPFLAGS)
-ROOTPYTHONMODS = $(ROOTLIB)/python2.4/vendor-packages
ROOTPYTHON26MODS = $(ROOTLIB)/python2.6/vendor-packages
TARGET_ENV += CC="$(CC)"
@@ -64,36 +62,25 @@
TARGET_ENV_64 += CFLAGS="$(CFLAGS64)"
TARGET_ENV_64 += LDFLAGS="$(LDFLAGS64) $(LDLIBS64)"
-all: $(VER)/setup.py $(VER)-2.6/setup.py
- (cd $(VER) ; env $(TARGET_ENV) PYTHON=$(PYTHON24) $(PYTHON24) setup.py build \
- --build-temp $(MACH) --build-lib .)
- (cd $(VER) ; env $(TARGET_ENV_64) PYTHON=$(PYTHON24_64) $(PYTHON24_64) setup.py build \
- --build-temp $(MACH64) --build-lib .)
- (cd $(VER)-2.6 ; env $(TARGET_ENV) PYTHON=$(PYTHON26) $(PYTHON26) setup.py build \
+all: $(VER)/setup.py
+ (cd $(VER); env $(TARGET_ENV) PYTHON=$(PYTHON26) $(PYTHON26) setup.py build \
--build-temp py26-$(MACH) --build-lib .)
- (cd $(VER)-2.6 ; env $(TARGET_ENV_64) PYTHON=$(PYTHON26_64) $(PYTHON26_64) setup.py build \
+ (cd $(VER); env $(TARGET_ENV_64) PYTHON=$(PYTHON26_64) $(PYTHON26_64) setup.py build \
--build-temp py26-$(MACH64) --build-lib .)
install: all
- $(INSTALL_PROTO) -c $(VER)/cups.so $(ROOTPYTHONMODS)
- $(INSTALL_PROTO) -c $(VER)/64/cups.so $(ROOTPYTHONMODS)/64
- $(INSTALL_PROTO) -c $(VER)-2.6/cups.so $(ROOTPYTHON26MODS)
- $(INSTALL_PROTO) -c $(VER)-2.6/64/cups.so $(ROOTPYTHON26MODS)/64
+ $(INSTALL_PROTO) -c $(VER)/cups.so $(ROOTPYTHON26MODS)
+ $(INSTALL_PROTO) -c $(VER)/64/cups.so $(ROOTPYTHON26MODS)/64
# apply the file attributes from the packaging
for pkg in $(COMPONENT_PACKAGES:sh) ; do \
$(SRC)/tools/protofix --pkg $$pkg --perm ; \
done
-$(VER)-2.6/setup.py: $(VER)/setup.py
- $(RM) -r $(@D) ; $(MKDIR) $(@D)
- (cd $(VER) ; find . | cpio -dump ../$(@D))
- $(TOUCH) $@
-
$(VER)/setup.py: $(VER)/.patched
$(TOUCH) $@
clean:
- -rm -rf $(VER) $(VER)-2.6
+ -rm -rf $(VER)
include ../Makefile.targ
--- a/usr/src/cmd/rdiff-backup/Makefile.sfw Sat Oct 30 12:35:08 2010 -0700
+++ b/usr/src/cmd/rdiff-backup/Makefile.sfw Tue Nov 16 22:41:08 2010 -0800
@@ -19,10 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
#
-# ident "@(#)Makefile.sfw 1.3 10/01/08 SMI"
+# ident "@(#)Makefile.sfw 1.4 10/11/01 SMI"
VER=rdiff-backup-1.2.1
@@ -32,11 +31,14 @@
$(VER)/build/proto: $(VER)/setup.py
cd $(VER); env \
CC=$(CC) \
- $(PYTHON24) setup.py install --home=build/proto \
+ PYTHON=$(PYTHON26) \
+ $(PYTHON26) setup.py install --home=build/proto \
--librsync-dir=$(ROOT)$(CFGPREFIX)
$(VER)/setup.py: $(VER).tar.gz
gzip -dc $(VER).tar.gz |$(GTAR) xpf - --no-same-owner
+ $(GPATCH) $(GPATCH_FLAGS) < deprecation.patch
+ touch $(VER)/setup.py
PROG = rdiff-backup rdiff-backup-statistics
@@ -114,7 +116,7 @@
PYSOFILES = rdiff_backup/C.so rdiff_backup/_librsync.so
-ROOTPYTHONLIB= $(ROOT)/usr/lib/python2.4/vendor-packages
+ROOTPYTHONLIB= $(ROOT)/usr/lib/python2.6/vendor-packages
ROOTPYFILES = $(RDIFFPYFILES:%=$(ROOTPYTHONLIB)/rdiff_backup/%)
ROOTPYSOFILES = $(PYSOFILES:%=$(ROOTPYTHONLIB)/%)
@@ -127,7 +129,10 @@
install: all \
$(ROOTPYFILES) $(ROOTPYCFILES) $(ROOTTEMPLATEFILES) $(ROOTPYSOFILES)
- env VER=$(VER) $(SHELL) ./install-sfw
+ env \
+ VER=$(VER) \
+ PYTHON=$(PYTHON26) \
+ $(SHELL) ./install-sfw
clean:
-rm -rf $(VER)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/rdiff-backup/deprecation.patch Tue Nov 16 22:41:08 2010 -0800
@@ -0,0 +1,26 @@
+*** rdiff-backup-1.2.1/rdiff-backup.orig Wed Oct 27 13:44:47 2010
+--- rdiff-backup-1.2.1/rdiff-backup Wed Oct 27 13:45:19 2010
+***************
+*** 1,4 ****
+! #!/usr/bin/env python
+ # rdiff-backup -- Mirror files while keeping incremental changes
+ # Version 1.2.1 released August 24, 2008
+ # Copyright (C) 2001-2005 Ben Escoto <[email protected]>
+--- 1,4 ----
+! #!/usr/bin/env python -Wignore::DeprecationWarning
+ # rdiff-backup -- Mirror files while keeping incremental changes
+ # Version 1.2.1 released August 24, 2008
+ # Copyright (C) 2001-2005 Ben Escoto <[email protected]>
+*** rdiff-backup-1.2.1/rdiff-backup-statistics.orig Wed Oct 27 13:44:58 2010
+--- rdiff-backup-1.2.1/rdiff-backup-statistics Wed Oct 27 13:45:25 2010
+***************
+*** 1,4 ****
+! #!/usr/bin/python
+ # rdiff-backup-statistics -- Summarize rdiff-backup statistics files
+ # Version 1.2.1 released August 24, 2008
+ # Copyright 2005 Dean Gaudet, Ben Escoto
+--- 1,4 ----
+! #!/usr/bin/python -Wignore::DeprecationWarning
+ # rdiff-backup-statistics -- Summarize rdiff-backup statistics files
+ # Version 1.2.1 released August 24, 2008
+ # Copyright 2005 Dean Gaudet, Ben Escoto
--- a/usr/src/cmd/tcpdump/METADATA Sat Oct 30 12:35:08 2010 -0700
+++ b/usr/src/cmd/tcpdump/METADATA Tue Nov 16 22:41:08 2010 -0800
@@ -1,10 +1,10 @@
NAME: tcpdump
-VERSION: 4.0.0
+VERSION: 4.1.1
DESCRIPTION: network traffic sniffer
PACKAGE: SUNWtcpdump
LICENSE: BSD
PROJECT_URL: http://www.tcpdump.org
-SOURCE_DOWNLOAD: http://www.tcpdump.org/release/tcpdump-4.0.0.tar.gz
+SOURCE_DOWNLOAD: http://www.tcpdump.org/release/tcpdump-4.1.1.tar.gz
SUPPORT: B
BUGTRAQ: solaris/utility/tcpdump
OSR: 10928
--- a/usr/src/cmd/tcpdump/Makefile.sfw Sat Oct 30 12:35:08 2010 -0700
+++ b/usr/src/cmd/tcpdump/Makefile.sfw Tue Nov 16 22:41:08 2010 -0800
@@ -20,10 +20,9 @@
#
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
#
-#ident "@(#)Makefile.sfw 1.3 09/12/09 SMI"
+#ident "@(#)Makefile.sfw 1.4 10/11/01 SMI"
VER = $(COMPONENT_NAME:sh)-$(COMPONENT_VERSION:sh)
TARBALL = $(VER).tar.gz
@@ -33,7 +32,6 @@
CONFIGURE_OPTIONS += --enable-ipv6=yes
CONFIGURE_OPTIONS += --with-user=nobody
CONFIGURE_OPTIONS += --without-crypto
-PATCHES:sh = echo Patches/*.patch
all: $(VER)/config.status $(ROOTLIB)/libpcap.so
(cd $(VER); env - \
--- a/usr/src/cmd/tcpdump/Patches/Makefile.in.patch Sat Oct 30 12:35:08 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- Makefile.in.dist Sun Aug 31 19:44:11 2008
-+++ Makefile.in Wed Sep 16 10:37:48 2009
-@@ -77,7 +77,7 @@
- print-eap.c print-eigrp.c\
- print-esp.c print-ether.c print-fddi.c print-fr.c \
- print-gre.c print-hsrp.c print-icmp.c print-igmp.c \
-- print-igrp.c print-ip.c print-ipcomp.c print-ipfc.c \
-+ print-igrp.c print-ip.c print-ipcomp.c print-ipfc.c print-ipnet.c \
- print-ipx.c print-isoclns.c print-juniper.c print-krb.c \
- print-l2tp.c print-lane.c print-ldp.c print-lldp.c print-llc.c \
- print-lmp.c print-lspping.c print-lwapp.c \
--- a/usr/src/cmd/tcpdump/Patches/interface.h.patch Sat Oct 30 12:35:08 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
---- interface.h.orig Sun Aug 31 19:44:14 2008
-+++ interface.h Fri Jul 31 18:37:02 2009
-@@ -332,7 +332,11 @@
- extern void sip_print(const u_char *, u_int);
- extern void syslog_print(const u_char *, u_int);
- extern u_int bt_if_print(const struct pcap_pkthdr *, const u_char *);
-+extern void ipnet_print(const u_char *, u_int, u_int);
-+extern u_int ipnet_if_print(const struct pcap_pkthdr *, const u_char *);
-+extern int ipnet_encap_print(u_short, const u_char *, u_int, u_int);
-
-+
- #ifdef INET6
- extern void ip6_print(const u_char *, u_int);
- extern void ip6_opt_print(const u_char *, int);
--- a/usr/src/cmd/tcpdump/Patches/ipnet.h.patch Sat Oct 30 12:35:08 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-diff -Nu ipnet.h ipnet.h
---- ipnet.h 1969-12-31 16:00:00.000000000 -0800
-+++ ipnet.h 2009-07-22 14:59:11.821073000 -0700
-@@ -0,0 +1,17 @@
-+typedef struct ipnet_hdr {
-+ uint8_t iph_version;
-+ uint8_t iph_family;
-+ uint16_t iph_htype;
-+ uint32_t iph_pktlen;
-+ uint32_t iph_ifindex;
-+ uint32_t iph_grifindex;
-+ uint32_t iph_zsrc;
-+ uint32_t iph_zdst;
-+} ipnet_hdr_t;
-+
-+#define IPH_AF_INET 2 /* Matches Solaris's AF_INET */
-+#define IPH_AF_INET6 26 /* Matches Solaris's AF_INET6 */
-+
-+#define IPOBS_H_INBOUND 0
-+#define IPOBS_H_OUTBOUND 1
-+#define IPOBS_H_LOCAL 2
--- a/usr/src/cmd/tcpdump/Patches/print-ipnet.c.patch Sat Oct 30 12:35:08 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,145 +0,0 @@
---- print-ipnet.c 2009-12-04 02:28:01.000000000 -0800
-+++ print-ipnet.c 2009-12-04 01:21:39.760749000 -0800
-@@ -0,0 +1,142 @@
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
-+#include <tcpdump-stdinc.h>
-+
-+#include <stdio.h>
-+#include <pcap.h>
-+
-+#include "interface.h"
-+#include "addrtoname.h"
-+#include "ipnet.h"
-+
-+#ifdef DLT_IPNET
-+
-+int ipnet_encap_print(u_short, const u_char *, u_int, u_int);
-+
-+const struct tok ipnet_families[] = {
-+ { IPH_AF_INET, "IPv4" },
-+ { IPH_AF_INET6, "IPv6" },
-+ { 0, NULL }
-+};
-+
-+const struct tok ipnet_hooks[] = {
-+ { IPOBS_H_INBOUND, "observe-in" },
-+ { IPOBS_H_OUTBOUND, "observe-out" },
-+ { IPOBS_H_LOCAL, "observe-local" },
-+ { 0, NULL }
-+};
-+
-+static inline void
-+ipnet_hdr_print(register const u_char *bp, u_int length)
-+{
-+ const ipnet_hdr_t *hdr;
-+ hdr = (const ipnet_hdr_t *)bp;
-+
-+ (void)printf("%d > %d", hdr->iph_zsrc, hdr->iph_zdst);
-+
-+ if (!qflag) {
-+ (void)printf(", hook %s (%d) family %s (%d)",
-+ tok2str(ipnet_hooks, "Unknown",
-+ ntohs(hdr->iph_htype)),
-+ ntohs(hdr->iph_htype),
-+ tok2str(ipnet_families, "Unknown",
-+ hdr->iph_family),
-+ hdr->iph_family);
-+ } else {
-+ (void)printf(", %s",
-+ tok2str(ipnet_families,
-+ "Unknown Ethertype (0x%04x)",
-+ hdr->iph_family));
-+ }
-+
-+ (void)printf(", length %u: ", length);
-+}
-+
-+void
-+ipnet_print(const u_char *p, u_int length, u_int caplen)
-+{
-+ ipnet_hdr_t *hdr;
-+
-+ if (caplen < sizeof(ipnet_hdr_t)) {
-+ printf("[|ipnet]");
-+ return;
-+ }
-+
-+ if (eflag)
-+ ipnet_hdr_print(p, length);
-+
-+ length -= sizeof(ipnet_hdr_t);
-+ caplen -= sizeof(ipnet_hdr_t);
-+ hdr = (ipnet_hdr_t *)p;
-+ p += sizeof(ipnet_hdr_t);
-+
-+ if (ipnet_encap_print(hdr->iph_family, p, length, caplen) == 0) {
-+ if (!eflag)
-+ ipnet_hdr_print((u_char *)hdr,
-+ length + sizeof(ipnet_hdr_t));
-+
-+ if (!suppress_default_print)
-+ default_print(p, caplen);
-+ }
-+}
-+
-+/*
-+ * This is the top level routine of the printer. 'p' points
-+ * to the ether header of the packet, 'h->ts' is the timestamp,
-+ * 'h->len' is the length of the packet off the wire, and 'h->caplen'
-+ * is the number of bytes actually captured.
-+ */
-+u_int
-+ipnet_if_print(const struct pcap_pkthdr *h, const u_char *p)
-+{
-+ ipnet_print(p, h->len, h->caplen);
-+
-+ return (sizeof(ipnet_hdr_t));
-+}
-+
-+/*
-+ * Prints the packet encapsulated in an Ethernet data segment
-+ * (or an equivalent encapsulation), given the Ethernet type code.
-+ *
-+ * Returns non-zero if it can do so, zero if the ethertype is unknown.
-+ *
-+ * The Ethernet type code is passed through a pointer; if it was
-+ * ETHERTYPE_8021Q, it gets updated to be the Ethernet type of
-+ * the 802.1Q payload, for the benefit of lower layers that might
-+ * want to know what it is.
-+ */
-+
-+int
-+ipnet_encap_print(u_short family, const u_char *p,
-+ u_int length, u_int caplen)
-+{
-+ recurse:
-+
-+ switch (family) {
-+
-+ case IPH_AF_INET:
-+ ip_print(gndo, p, length);
-+ return (1);
-+
-+#ifdef INET6
-+ case IPH_AF_INET6:
-+ ip6_print(p, length);
-+ return (1);
-+#endif /*INET6*/
-+
-+ default:
-+ return(0);
-+ }
-+}
-+
-+
-+/*
-+ * Local Variables:
-+ * c-style: whitesmith
-+ * c-basic-offset: 8
-+ * End:
-+ */
-+
-+#endif /* DLT_IPNET */
--- a/usr/src/cmd/tcpdump/Patches/tcpdump.c.patch Sat Oct 30 12:35:08 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-diff -Nu tcpdump.c tcpdump.c
---- tcpdump.c.dist 2009-07-17 22:51:51.964577000 -0700
-+++ tcpdump.c 2009-07-22 15:11:03.076784000 -0700
-@@ -282,6 +282,9 @@
- #if defined(HAVE_PCAP_USB_H) && defined(DLT_USB_LINUX_MMAPPED)
- { usb_linux_print, DLT_USB_LINUX_MMAPPED},
- #endif
-+#ifdef DLT_IPNET
-+ { ipnet_if_print, DLT_IPNET },
-+#endif
- { NULL, 0 },
- };
-
--- a/usr/src/cmd/tcpdump/install-sfw Sat Oct 30 12:35:08 2010 -0700
+++ b/usr/src/cmd/tcpdump/install-sfw Tue Nov 16 22:41:08 2010 -0800
@@ -21,15 +21,14 @@
#
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
#
-# ident "@(#)install-sfw 1.1 09/04/20 SMI"
+#ident "@(#)install-sfw 1.2 10/11/01 SMI"
# stop at first error
set -o errexit
-VERS=4.0.0
+VERS=4.1.1
PKGVERS=tcpdump-${VERS}
PREFIX=${ROOT}/usr
INFODIR=${PREFIX}/info
Binary file usr/src/cmd/tcpdump/tcpdump-4.0.0.tar.gz has changed
Binary file usr/src/cmd/tcpdump/tcpdump-4.1.1.tar.gz has changed
--- a/usr/src/cmd/vim/runtime.patch Sat Oct 30 12:35:08 2010 -0700
+++ b/usr/src/cmd/vim/runtime.patch Tue Nov 16 22:41:08 2010 -0800
@@ -3101,7 +3101,7 @@
+ \%f:%l:%c:\ %m,
\%f:%l:\ %m,
\\"%f\"\\,\ line\ %l%*\\D%c%*[^\ ]\ %m,
- \10/10/25*\\a[%*\\d]:\ Entering\ directory\ `%f',
+ \10/11/08*\\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 Sat Oct 30 12:35:08 2010 -0700
+++ b/usr/src/cmd/wireshark/METADATA Tue Nov 16 22:41:08 2010 -0800
@@ -1,10 +1,10 @@
NAME: wireshark
-VERSION: 1.2.10
+VERSION: 1.2.12
DESCRIPTION: Wireshark Network protocol analyzer
LICENSE: GPLv2, GPLv3, BSD
PACKAGE: SUNWwireshark SUNWwiresharkr
PROJECT_URL: http://www.wireshark.org/
-SOURCE_DOWNLOAD: http://media-2.cacetech.com/wireshark/src/wireshark-1.2.10.tar.bz2
+SOURCE_DOWNLOAD: http://media-2.cacetech.com/wireshark/src/wireshark-1.2.12.tar.bz2
SUPPORT: C
BUGTRAQ: solaris/network/wireshark
OSR: 12637
Binary file usr/src/cmd/wireshark/wireshark-1.2.10.tar.bz2 has changed
Binary file usr/src/cmd/wireshark/wireshark-1.2.12.tar.bz2 has changed
--- a/usr/src/lib/antlr2/Makefile.sfw Sat Oct 30 12:35:08 2010 -0700
+++ b/usr/src/lib/antlr2/Makefile.sfw Tue Nov 16 22:41:08 2010 -0800
@@ -20,10 +20,9 @@
#
#
-# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
#
-# ident "@(#)Makefile.sfw 1.4 10/01/08 SMI"
+# ident "@(#)Makefile.sfw 1.5 10/11/01 SMI"
#
include ../Makefile.lib
@@ -36,7 +35,8 @@
install: all
(cd $(VER); env - INSTALL="$(INSTALL_PROTO)" DESTDIR=$(ROOT) \
- MAKE=$(GMAKE) $(GMAKE) -e install)
+ PYTHON=$(PYTHON26) \
+ MAKE=$(GMAKE) $(GMAKE) -e install)
$(SHELL) ./install-sfw
$(VER)/config.status: $(VER)/configure
@@ -44,7 +44,7 @@
PATH=$(SFW_PATH) \
MAKE=$(GMAKE) \
CC="$(CC)" CXX="$(CCC)" \
- PYTHON=$(PYTHON24) \
+ PYTHON=$(PYTHON26) \
CXXLINK="$(CCC)" \
LDFLAGS="-lCstd -lCrun -lm -lc" \
./configure $(CONFIGURE_OPTIONS) )
--- a/usr/src/lib/curl/METADATA Sat Oct 30 12:35:08 2010 -0700
+++ b/usr/src/lib/curl/METADATA Tue Nov 16 22:41:08 2010 -0800
@@ -1,10 +1,10 @@
NAME: curl
-VERSION: 7.21.1
+VERSION: 7.21.2
DESCRIPTION: Command line URL transfer program
LICENSE: CURL
PACKAGE: SUNWcurl
PROJECT_URL: http://curl.haxx.se/
-SOURCE_DOWNLOAD: http://curl.haxx.se/download/curl-7.21.1.tar.gz
+SOURCE_DOWNLOAD: http://curl.haxx.se/download/curl-7.21.2.tar.gz
SUPPORT: B
BUGTRAQ: solaris/library/curl
OSR: 5739
--- a/usr/src/lib/curl/Makefile.sfw Sat Oct 30 12:35:08 2010 -0700
+++ b/usr/src/lib/curl/Makefile.sfw Tue Nov 16 22:41:08 2010 -0800
@@ -22,7 +22,7 @@
# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
#
-#ident "@(#)Makefile.sfw 1.14 10/08/18 SMI"
+#ident "@(#)Makefile.sfw 1.15 10/10/18 SMI"
#
# This makefile builds both 32 and 64 bit versions of the library.
# Builds occur in separate directories.
@@ -157,11 +157,13 @@
--libdir=$(PREFIX)/lib \
--libexecdir=$(PREFIX)/libexec \
$(CONFIGURE_OPTIONS) ; \
- rm -f curl-config; \
+ rm -f curl-config ; \
cp -p ../Solaris/curl-config .; \
- touch -acm curl-config; \
- rm -f libcurl.pc; \
+ chmod 0755 curl-config ; \
+ touch -acm curl-config ; \
+ rm -f libcurl.pc ; \
cp -p ../Solaris/libcurl.pc .; \
+ chmod 0644 libcurl.pc ; \
touch -acm libcurl.pc)
$(VER64)/config.status: $(VER64)/configure
@@ -190,12 +192,15 @@
--libexecdir=$(PREFIX)/libexec/$(MACH64) \
$(CONFIGURE_OPTIONS) ; \
rm -f curl-config; \
- cp -p ../Solaris/curl-config-64 curl-config; \
+ cp -f ../Solaris/curl-config-64 curl-config; \
+ chmod 0755 curl-config; \
/usr/gnu/bin/sed -e "s#MACH64#$(MACH64)#g" curl-config > curl-config.sed ; \
cp -fp curl-config.sed curl-config ; \
+ chmod 0755 curl-config; \
touch -acm curl-config ; \
rm -f libcurl.pc ; \
- cp -p ../Solaris/libcurl.pc .; \
+ cp -f ../Solaris/libcurl.pc .; \
+ chmod 0644 libcurl.pc ; \
/bin/ksh ../postprocess-pkgconfig-64 libcurl.pc )
$(VER)/configure: $(VER).tar.gz
--- a/usr/src/lib/curl/Solaris/curl-config Sat Oct 30 12:35:08 2010 -0700
+++ b/usr/src/lib/curl/Solaris/curl-config Tue Nov 16 22:41:08 2010 -0800
@@ -19,19 +19,15 @@
# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
# KIND, either express or implied.
#
-# $Id: curl-config.in,v 1.25 2006-05-02 22:48:22 bagder Exp $
-###########################################################################
+# Modified to conform to Solaris standards.
#
-# The idea to this kind of setup info script was stolen from numerous
-# other packages, such as neon, libxml and gnome.
+# ident "@(#)curl-config 1.8 10/10/18 SMI"
#
-# Modified to conform to Solaris installation paths conventions.
-#
-# ident "@(#)curl-config 1.7 10/08/18 SMI"
-#
+###########################################################################
+
prefix=/usr
exec_prefix=${prefix}
-includedir=${prefix}/include/curl
+includedir=${prefix}/include
usage()
{
@@ -40,15 +36,18 @@
Available values for OPTION include:
+ --built-shared says 'yes' if libcurl was built shared
--ca ca bundle install path
--cc compiler
--cflags pre-processor and compiler flags
--checkfor [version] check for (lib)curl of the specified version
+ --configure the arguments given to configure when building curl
--features newline separated list of enabled features
- --protocols newline separated list of enabled protocols
--help display this help and exit
--libs library linking information
--prefix curl install prefix
+ --protocols newline separated list of enabled protocols
+ --static-libs static libcurl library linking information
--version output version information
--vernum output the version information as a number (hexadecimal)
EOF
@@ -70,12 +69,16 @@
esac
case "$1" in
+ --built-shared)
+ echo yes
+ ;;
+
--ca)
echo ""/etc/curl/curlCA""
;;
--cc)
- echo "/ws/onnv-tools/SUNWspro/SS12/bin/cc"
+ echo "${CC}"
;;
--prefix)
@@ -83,18 +86,19 @@
;;
--feature|--features)
- for feature in SSL IPv6 libz IDN NTLM "" ; do
- test -n "$feature" && echo "$feature"
- done
+ for feature in SSL IPv6 libz IDN NTLM ""; do
+ test -n "$feature" && echo "$feature"
+ done
;;
--protocols)
- for protocol in DICT FILE FTP FTPS HTTP HTTPS IMAP IMAPS LDAP POP3 POP3S RTSP SMTP SMTPS TELNET TFTP ; do
- echo "$protocol"
- done
+ for protocol in DICT FILE FTP FTPS GOPHER HTTP HTTPS IMAP IMAPS LDAP POP3 POP3S RTSP SMTP SMTPS TELNET TFTP; do
+ echo "$protocol"
+ done
;;
+
--version)
- echo libcurl 7.21.1
+ echo libcurl 7.21.2
exit 0
;;
@@ -106,20 +110,20 @@
# dash as that's used for things like version 1.2.3-CVS
cpatch=`echo $checkfor | cut -d. -f3 | cut -d- -f1`
checknum=`echo "$cmajor*256*256 + $cminor*256 + ${cpatch:-0}" | bc`
- numuppercase=`echo 071401 | tr 'a-f' 'A-F'`
+ numuppercase=`echo 071502 | tr 'a-f' 'A-F'`
nownum=`echo "obase=10; ibase=16; $numuppercase" | bc`
if test "$nownum" -ge "$checknum"; then
# silent success
exit 0
else
- echo "requested version $checkfor is newer than existing 7.21.1"
+ echo "requested version $checkfor is newer than existing 7.21.2"
exit 1
fi
;;
--vernum)
- echo 071501
+ echo 071502
exit 0
;;
@@ -128,12 +132,25 @@
;;
--cflags)
- echo "-I${prefix}/include/curl"
+ if test "X${prefix}/include" = "X/usr/include"; then
+ echo ""
+ else
+ echo "-I${prefix}/include"
+ fi
;;
--libs)
- echo -L/usr/lib -lc -lcurl -lgss -lidn -lsldap -lldap -lsocket -lnsl -lz -lssl -lcrypto
- ;;
+ CURLLIBDIR="-L/usr/lib "
+ echo ${CURLLIBDIR} -R/usr/lib -lcurl -lgss -lidn -lssl -lcrypto -lsldap -lldap -lgss -lssl -lcrypto -lsocket -lnsl -lc -lz
+ ;;
+
+ --static-libs)
+ echo "Static libcurl 7.21.2 is not available."
+ ;;
+
+ --configure)
+ echo " '--prefix=/usr' '--bindir=/usr/bin' '--sbindir=/usr/sbin' '--libdir=/usr/lib' '--libexecdir=/usr/libexec' '--localstatedir=/var' '--enable-shared' '--disable-static' '--enable-http' '--enable-ftp' '--enable-file' '--enable-dict' '--enable-manual' '--disable-libgcc' '--enable-rtsp' '--enable-proxy' '--enable-telnet' '--enable-tftp' '--enable-pop3' '--enable-imap' '--enable-smtp' '--enable-ipv6' '--enable-nonblocking' '--enable-thread' '--enable-verbose' '--disable-sspi' '--enable-crypto-auth' '--enable-cookies' '--disable-hidden-symbols' '--disable-soname-bump' '--enable-ldap' '--with-random=/dev/urandom' '--with-ssl' '--with-ldap-lib=ldap' '--with-lber-lib=sldap' '--with-gssapi-includes=/usr/include/gssapi' '--with-gssapi-libs=/usr/lib' '--with-gssapi=/usr' '--with-ca-bundle=/etc/curl/curlCA' '--with-zlib=/usr' '--with-libidn=/usr' '--with-pic' 'curl_disallow_getifaddrs=yes'"
+ ;;
*)
echo "unknown option: $1"
@@ -144,4 +161,3 @@
done
exit 0
-
--- a/usr/src/lib/curl/Solaris/curl-config-64 Sat Oct 30 12:35:08 2010 -0700
+++ b/usr/src/lib/curl/Solaris/curl-config-64 Tue Nov 16 22:41:08 2010 -0800
@@ -19,19 +19,15 @@
# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
# KIND, either express or implied.
#
-# $Id: curl-config.in,v 1.25 2006-05-02 22:48:22 bagder Exp $
-###########################################################################
+# Modified to conform to Solaris standards.
#
-# The idea to this kind of setup info script was stolen from numerous
-# other packages, such as neon, libxml and gnome.
+# ident "@(#)curl-config-64 1.8 10/10/18 SMI"
#
-# Modified to conform to Solaris installation paths conventions.
-#
-# ident "@(#)curl-config-64 1.7 10/08/18 SMI"
-#
+###########################################################################
+
prefix=/usr
exec_prefix=${prefix}
-includedir=${prefix}/include/curl
+includedir=${prefix}/include
usage()
{
@@ -40,15 +36,18 @@
Available values for OPTION include:
+ --built-shared says 'yes' if libcurl was built shared
--ca ca bundle install path
--cc compiler
--cflags pre-processor and compiler flags
--checkfor [version] check for (lib)curl of the specified version
+ --configure the arguments given to configure when building curl
--features newline separated list of enabled features
- --protocols newline separated list of enabled protocols
--help display this help and exit
--libs library linking information
--prefix curl install prefix
+ --protocols newline separated list of enabled protocols
+ --static-libs static libcurl library linking information
--version output version information
--vernum output the version information as a number (hexadecimal)
EOF
@@ -70,12 +69,16 @@
esac
case "$1" in
+ --built-shared)
+ echo yes
+ ;;
+
--ca)
echo ""/etc/curl/curlCA""
;;
--cc)
- echo "/ws/onnv-tools/SUNWspro/SS12/bin/cc"
+ echo "${CC}"
;;
--prefix)
@@ -83,18 +86,19 @@
;;
--feature|--features)
- for feature in SSL IPv6 libz IDN NTLM "" ; do
- test -n "$feature" && echo "$feature"
- done
+ for feature in SSL IPv6 libz IDN NTLM ""; do
+ test -n "$feature" && echo "$feature"
+ done
;;
--protocols)
- for protocol in DICT FILE FTP FTPS HTTP HTTPS IMAP IMAPS LDAP POP3 POP3S RTSP SMTP SMTPS TELNET TFTP ; do
- echo "$protocol"
- done
+ for protocol in DICT FILE FTP FTPS GOPHER HTTP HTTPS IMAP IMAPS LDAP POP3 POP3S RTSP SMTP SMTPS TELNET TFTP; do
+ echo "$protocol"
+ done
;;
+
--version)
- echo libcurl 7.21.1
+ echo libcurl 7.21.2
exit 0
;;
@@ -106,20 +110,20 @@
# dash as that's used for things like version 1.2.3-CVS
cpatch=`echo $checkfor | cut -d. -f3 | cut -d- -f1`
checknum=`echo "$cmajor*256*256 + $cminor*256 + ${cpatch:-0}" | bc`
- numuppercase=`echo 071401 | tr 'a-f' 'A-F'`
+ numuppercase=`echo 071502 | tr 'a-f' 'A-F'`
nownum=`echo "obase=10; ibase=16; $numuppercase" | bc`
if test "$nownum" -ge "$checknum"; then
# silent success
exit 0
else
- echo "requested version $checkfor is newer than existing 7.21.1"
+ echo "requested version $checkfor is newer than existing 7.21.2"
exit 1
fi
;;
--vernum)
- echo 071501
+ echo 071502
exit 0
;;
@@ -128,12 +132,25 @@
;;
--cflags)
- echo "-I${prefix}/include/curl"
+ if test "X${prefix}/include" = "X/usr/include"; then
+ echo ""
+ else
+ echo "-I${prefix}/include"
+ fi
;;
--libs)
- echo -L/usr/lib/amd64 -lc -lcurl -lgss -lidn -lsldap -lldap -lsocket -lnsl -lz -lssl -lcrypto
- ;;
+ CURLLIBDIR="-L/usr/lib/MACH64 "
+ echo ${CURLLIBDIR} -R/usr/lib/MACH64 -lcurl -lgss -lidn -lssl -lcrypto -lsldap -lldap -lgss -lssl -lcrypto -lsocket -lnsl -lc -lz
+ ;;
+
+ --static-libs)
+ echo "Static libcurl 7.21.2 is not available."
+ ;;
+
+ --configure)
+ echo " '--prefix=/usr' '--bindir=/usr/bin/MACH64' '--sbindir=/usr/sbin/MACH64' '--libdir=/usr/lib/MACH64' '--libexecdir=/usr/libexec/MACH64' '--localstatedir=/var' '--enable-shared' '--disable-static' '--enable-http' '--enable-ftp' '--enable-file' '--enable-dict' '--enable-manual' '--disable-libgcc' '--enable-rtsp' '--enable-proxy' '--enable-telnet' '--enable-tftp' '--enable-pop3' '--enable-imap' '--enable-smtp' '--enable-ipv6' '--enable-nonblocking' '--enable-thread' '--enable-verbose' '--disable-sspi' '--enable-crypto-auth' '--enable-cookies' '--disable-hidden-symbols' '--disable-soname-bump' '--enable-ldap' '--with-random=/dev/urandom' '--with-ssl' '--with-ldap-lib=ldap' '--with-lber-lib=sldap' '--with-gssapi-includes=/usr/include/gssapi' '--with-gssapi-libs=/usr/lib' '--with-gssapi=/usr' '--with-ca-bundle=/etc/curl/curlCA' '--with-zlib=/usr' '--with-libidn=/usr' '--with-pic' 'curl_disallow_getifaddrs=yes'"
+ ;;
*)
echo "unknown option: $1"
@@ -144,4 +161,3 @@
done
exit 0
-
--- a/usr/src/lib/curl/Solaris/diffs/Makefile.in.1.diff Sat Oct 30 12:35:08 2010 -0700
+++ b/usr/src/lib/curl/Solaris/diffs/Makefile.in.1.diff Tue Nov 16 22:41:08 2010 -0800
@@ -1,6 +1,6 @@
---- lib/Makefile.in 2010-08-11 10:03:30.000000000 -0700
-+++ lib/Makefile.in 2010-08-18 12:22:21.428326613 -0700
-@@ -361,7 +361,7 @@
+--- lib/Makefile.in 2010-10-01 13:49:18.000000000 -0700
++++ lib/Makefile.in 2010-10-18 08:05:00.803406622 -0700
+@@ -364,7 +364,7 @@
@USE_EMBEDDED_ARES_TRUE@ -I$(top_builddir)/ares \
@USE_EMBEDDED_ARES_TRUE@ -I$(top_srcdir)/ares
@@ -9,7 +9,7 @@
#
# Bumping of SONAME conditionally may seem like a weird thing to do, and yeah
-@@ -372,7 +372,7 @@
+@@ -375,7 +375,7 @@
#
# This conditional soname bump SHOULD be removed at next "proper" bump.
#
--- a/usr/src/lib/curl/Solaris/diffs/Makefile.in.3.diff Sat Oct 30 12:35:08 2010 -0700
+++ b/usr/src/lib/curl/Solaris/diffs/Makefile.in.3.diff Tue Nov 16 22:41:08 2010 -0800
@@ -1,6 +1,6 @@
---- tests/server/Makefile.in 2010-08-11 10:03:32.000000000 -0700
-+++ tests/server/Makefile.in 2010-08-18 12:23:42.980815549 -0700
-@@ -208,7 +208,7 @@
+--- tests/server/Makefile.in 2010-10-01 13:49:21.000000000 -0700
++++ tests/server/Makefile.in 2010-10-18 08:05:49.792499927 -0700
+@@ -209,7 +209,7 @@
LDFLAGS = @LDFLAGS@
LIBCURL_LIBS = @LIBCURL_LIBS@
LIBOBJS = @LIBOBJS@
--- a/usr/src/lib/curl/Solaris/diffs/configure.0.diff Sat Oct 30 12:35:08 2010 -0700
+++ b/usr/src/lib/curl/Solaris/diffs/configure.0.diff Tue Nov 16 22:41:08 2010 -0800
@@ -1,12 +1,48 @@
---- configure 2010-03-31 23:56:23.000000000 -0700
-+++ configure 2010-04-23 11:03:16.259371217 -0700
+--- configure 2010-10-01 13:49:17.000000000 -0700
++++ configure 2010-10-18 08:18:56.838791104 -0700
@@ -1,4 +1,4 @@
-#! /bin/sh
-+#!/bin/ksh93
++#! /bin/ksh93
# Guess values for system-dependent variables and create Makefiles.
- # Generated by GNU Autoconf 2.65 for curl -.
+ # Generated by GNU Autoconf 2.67 for curl -.
#
-@@ -1969,6 +1969,13 @@
+@@ -274,7 +274,7 @@
+ fi
+ fi
+ fi
+-SHELL=${CONFIG_SHELL-/bin/sh}
++SHELL=${CONFIG_SHELL-/bin/ksh93}
+ export SHELL
+ # Unset more variables known to interfere with behavior of common tools.
+ CLICOLOR_FORCE= GREP_OPTIONS=
+@@ -565,7 +565,7 @@
+
+
+ # Check that we are running under the correct shell.
+-SHELL=${CONFIG_SHELL-/bin/sh}
++SHELL=${CONFIG_SHELL-/bin/ksh93}
+
+ case X$lt_ECHO in
+ X*--fallback-echo)
+@@ -649,7 +649,7 @@
+ elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
+ test "X$CONFIG_SHELL" != X/bin/ksh; then
+ # If we have ksh, try running configure again with it.
+- ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
++ ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/ksh93}
+ export ORIGINAL_CONFIG_SHELL
+ CONFIG_SHELL=/bin/ksh
+ export CONFIG_SHELL
+@@ -691,7 +691,7 @@
+ if test "$prev" != 'sed 50q "$0"'; then
+ echo_test_string=`eval $prev`
+ export echo_test_string
+- exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"}
++ exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/ksh93}} "$0" ${1+"$@"}
+ else
+ # Oops. We lost completely, so just stick with echo.
+ ECHO=echo
+@@ -2001,6 +2001,13 @@
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
$4
@@ -20,21 +56,7 @@
int main (void)
{
static int test_array [1 - 2 * !(($2) >= 0)];
-@@ -1984,6 +1991,13 @@
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
- $4
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <limits.h>
-+#include <sys/types.h>
-+#include <stdint.h>
-+#include <inttypes.h>
-+#include <sys/socket.h>
- int main (void)
- {
- static int test_array [1 - 2 * !(($2) <= $ac_mid)];
-@@ -2009,6 +2023,13 @@
+@@ -2041,6 +2048,13 @@
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
$4
@@ -48,7 +70,7 @@
int main (void)
{
static int test_array [1 - 2 * !(($2) < 0)];
-@@ -2024,6 +2045,13 @@
+@@ -2056,6 +2070,13 @@
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
$4
@@ -62,7 +84,7 @@
int main (void)
{
static int test_array [1 - 2 * !(($2) >= $ac_mid)];
-@@ -2057,6 +2085,13 @@
+@@ -2089,6 +2110,13 @@
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
$4
@@ -76,7 +98,7 @@
int main (void)
{
static int test_array [1 - 2 * !(($2) <= $ac_mid)];
-@@ -2081,10 +2116,15 @@
+@@ -2113,10 +2141,15 @@
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
$4
@@ -94,7 +116,7 @@
int main (void)
{
-@@ -2766,7 +2806,7 @@
+@@ -2797,7 +2830,7 @@
@@ -103,10 +125,12 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
-@@ -3197,10 +3237,6 @@
+@@ -3263,12 +3296,6 @@
+ fi
-
+-
+-
-if test -f ${srcdir}/include/curl/curlbuild.h; then
- rm -f ${srcdir}/include/curl/curlbuild.h
-fi
@@ -114,7 +138,7 @@
VERSION=`$SED -ne 's/^#define LIBCURL_VERSION "\(.*\)"/\1/p' ${srcdir}/include/curl/curlver.h`
am__api_version="1.9"
ac_aux_dir=
-@@ -3464,7 +3500,7 @@
+@@ -3538,7 +3565,7 @@
$as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
@@ -123,7 +147,25 @@
all:
@echo '@@@%%%=$(MAKE)=@@@%%%'
_ACEOF
-@@ -9191,8 +9227,8 @@
+@@ -4734,7 +4761,7 @@
+ for i in 1 2 3 4 5 6; do
+ echo '#include "conftst'$i'.h"' >> sub/conftest.c
+ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+- # Solaris 8's {/usr,}/bin/sh.
++ # Solaris 8's {/usr,}/bin/ksh93.
+ touch sub/conftst$i.h
+ done
+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+@@ -8029,7 +8056,7 @@
+ for i in 1 2 3 4 5 6 7 8 ; do
+ teststring=$teststring$teststring
+ done
+- SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
++ SHELL=${SHELL-${CONFIG_SHELL-/bin/ksh93}}
+ # If test is not a shell built-in, we'll probably end up computing a
+ # maximum length that is only half of the actual maximum length, but
+ # we can't tell.
+@@ -9261,8 +9288,8 @@
case $lt_cv_prog_gnu_ld in
yes*) LD="${LD-ld} -m elf64_sparc" ;;
*)
@@ -134,7 +176,7 @@
fi
;;
esac
-@@ -13582,7 +13618,7 @@
+@@ -13653,7 +13680,7 @@
$as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
@@ -143,7 +185,7 @@
all:
@echo '@@@%%%=$(MAKE)=@@@%%%'
_ACEOF
-@@ -19072,15 +19108,15 @@
+@@ -19176,15 +19203,15 @@
LIBS="$LIBS $gss_libs"
elif test "$GSSAPI_ROOT" != "yes"; then
LDFLAGS="$LDFLAGS -L$GSSAPI_ROOT/lib$libsuff"
@@ -162,7 +204,7 @@
fi
else
CPPFLAGS="$save_CPPFLAGS"
-@@ -19106,7 +19142,7 @@
+@@ -19210,7 +19237,7 @@
if test x$cross_compiling != xyes; then
PKGTEST="yes"
fi
@@ -171,7 +213,7 @@
LIB_OPENSSL="$PREFIX_OPENSSL/lib$libsuff"
;;
off)
-@@ -22210,20 +22246,12 @@
+@@ -22731,20 +22758,13 @@
@@ -183,9 +225,9 @@
-# define FUNCALLCONV
-#endif
-/* preprocess end */"
--
+curl_preprocess_callconv=""
+
#
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for curl_socklen_t data type" >&5
$as_echo_n "checking for curl_socklen_t data type... " >&6; }
@@ -194,7 +236,7 @@
for arg1 in int SOCKET; do
for arg2 in 'struct sockaddr' void; do
for t in socklen_t int size_t 'unsigned int' long 'unsigned long' void; do
-@@ -35126,7 +35154,6 @@
+@@ -35751,7 +35771,6 @@
case $ac_config_target in
"lib/curl_config.h") CONFIG_HEADERS="$CONFIG_HEADERS lib/curl_config.h" ;;
"src/curl_config.h") CONFIG_HEADERS="$CONFIG_HEADERS src/curl_config.h" ;;
--- a/usr/src/lib/curl/Solaris/libcurl.pc Sat Oct 30 12:35:08 2010 -0700
+++ b/usr/src/lib/curl/Solaris/libcurl.pc Tue Nov 16 22:41:08 2010 -0800
@@ -20,19 +20,19 @@
#
# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
#
-# ident "@(#)libcurl.pc 1.7 10/08/18 SMI"
+# ident "@(#)libcurl.pc 1.8 10/10/18 SMI"
#
prefix=/usr
exec_prefix=${prefix}
libdir=${exec_prefix}/lib
includedir=${prefix}/include/curl
-supported_protocols=" DICT FILE FTP FTPS HTTP HTTPS IMAP IMAPS LDAP POP3 POP3S RTSP SMTP SMTPS TELNET TFTP"
+supported_protocols=" DICT FILE FTP FTPS GOPHER HTTP HTTPS IMAP IMAPS LDAP POP3 POP3S RTSP SMTP SMTPS TELNET TFTP"
supported_features=" SSL IPv6 libz IDN NTLM"
Name: libcurl
URL: http://curl.haxx.se/
Description: Library to transfer files with ftp, http, etc.
-Version: 7.21.1
+Version: 7.21.2
Libs: -L${libdir} -lc -lcurl -lgss -lidn -lsocket -lnsl -lz -lssl -lcrypto
Libs.private: -lidn -lssl -lcrypto -lsldap -lldap -lgss -lssl -lcrypto -lsocket -lnsl -lc -lz
Cflags: -I${includedir}
Binary file usr/src/lib/curl/curl-7.21.1.tar.gz has changed
Binary file usr/src/lib/curl/curl-7.21.2.tar.gz has changed
--- a/usr/src/lib/libpcap/METADATA Sat Oct 30 12:35:08 2010 -0700
+++ b/usr/src/lib/libpcap/METADATA Tue Nov 16 22:41:08 2010 -0800
@@ -1,10 +1,10 @@
NAME: libpcap
-VERSION: 1.0.0
+VERSION: 1.1.1
DESCRIPTION: packet capture library
LICENSE: BSD
PACKAGE: SUNWlibpcap
PROJECT_URL: http://www.tcpdump.org
-SOURCE_DOWNLOAD: http://www.tcpdump.org/release/libpcap-1.0.0.tar.gz
+SOURCE_DOWNLOAD: http://www.tcpdump.org/release/libpcap-1.1.1.tar.gz
SUPPORT: C
BUGTRAQ: solaris/library/libpcap
OSR: 9013
--- a/usr/src/lib/libpcap/Makefile.sfw Sat Oct 30 12:35:08 2010 -0700
+++ b/usr/src/lib/libpcap/Makefile.sfw Tue Nov 16 22:41:08 2010 -0800
@@ -21,11 +21,11 @@
# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
#
-#ident "@(#)Makefile.sfw 1.4 10/04/15 SMI"
+#ident "@(#)Makefile.sfw 1.5 10/11/01 SMI"
include ../Makefile.lib
-VER=libpcap-1.0.0
+VER=libpcap-1.1.1
VER64=$(VER)-64
TARBALL = $(VER).tar.gz
@@ -36,8 +36,6 @@
TARGET_COMENV += MAKE="$(GMAKE)"
TARGET_COMENV += LIBS="$(LIBS)"
TARGET_COMENV += "ac_cv_func_getifaddrs=no"
-PATCHES:sh = echo Patches/*.patch
-
# environment variables for 32-bit
TARGET_ENV += CC="$(CC)"
@@ -46,7 +44,7 @@
TARGET_ENV64 += CFLAGS="$(CFLAGS64) -I. -xstrconst $($(MACH64)_C_PICFLAGS) \
-DHAVE_CONFIG_H -D_U_="""
-TARGET_ENV64 += CC="$(CC64)"
+TARGET_ENV64 += CC="$(CC64) -m64"
TARGET_ENV64 += $(TARGET_COMENV)
CONFIGURE_OPTIONS += --enable-ipv6
--- a/usr/src/lib/libpcap/Patches/Makefile.in.patch Sat Oct 30 12:35:08 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
---- Makefile.in.dist Mon Oct 27 18:26:13 2008
-+++ Makefile.in Wed Oct 21 21:36:27 2009
-@@ -44,6 +44,7 @@
- # You shouldn't need to edit anything below.
- #
-
-+LD = /usr/bin/ld
- CC = @CC@
- CCOPT = @V_CCOPT@
- INCLS = -I. @V_INCLS@
-@@ -326,7 +327,7 @@
- #
- libpcap.so: $(OBJ)
- @rm -f $@
-- $(CC) -shared -Wl,-soname,[email protected] -o $@.`cat $(srcdir)/VERSION` $(OBJ) $(DAGLIBS)
-+ $(LD) -shared -Wl,-soname,[email protected] -o $@.`cat $(srcdir)/VERSION` $(OBJ) $(DAGLIBS)
-
- #
- # The following rule succeeds, but the result is untested.
--- a/usr/src/lib/libpcap/Patches/bpf.h.patch Sat Oct 30 12:35:08 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
---- pcap/bpf.h Fri Oct 10 19:42:44 2008
-+++ pcap/bpf.h.new Tue Sep 15 21:06:40 2009
-@@ -821,8 +821,17 @@
- */
- #define DLT_IEEE802_15_4_NONASK_PHY 215
-
-+#define DLT_IPNET 226 /* Assigned by tcpdump.org */
-+#define DLT_IPOIB 162 /* Private until we know what it is */
-
- /*
-+ * IPNET
-+ */
-+#define IPNET_OUTBOUND 1
-+#define IPNET_INBOUND 2
-+
-+
-+/*
- * DLT and savefile link type values are split into a class and
- * a member of that class. A class value of 0 indicates a regular
- * DLT_/LINKTYPE_ value.
--- a/usr/src/lib/libpcap/Patches/configure.in.patch Sat Oct 30 12:35:08 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- configure.in.dist Tue Sep 25 19:09:46 2007
-+++ configure.in Fri Jul 17 13:08:17 2009
-@@ -187,7 +187,7 @@
- AC_MSG_CHECKING(packet capture type)
- if test ! -z "$with_pcap" ; then
- V_PCAP="$withval"
--elif test -r /dev/bpf ; then
-+elif test -r /dev/bpf -o -h /dev/bpf ; then
- #
- # Cloning BPF device.
- #
--- a/usr/src/lib/libpcap/Patches/gencode.c.patch Sat Oct 30 12:35:08 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,97 +0,0 @@
-*** gencode.c.dist Fri Oct 10 19:42:44 2008
---- gencode.c Tue Sep 15 20:59:00 2009
-***************
-*** 200,205 ****
---- 200,206 ----
- static inline struct block *gen_true(void);
- static inline struct block *gen_false(void);
- static struct block *gen_ether_linktype(int);
-+ static struct block *gen_ipnet_linktype(int);
- static struct block *gen_linux_sll_linktype(int);
- static struct slist *gen_load_prism_llprefixlen(void);
- static struct slist *gen_load_avs_llprefixlen(void);
-***************
-*** 1497,1502 ****
---- 1498,1510 ----
- off_nl = -1;
- off_nl_nosnap = -1;
- return;
-+
-+ case DLT_IPNET:
-+ off_linktype = 1;
-+ off_macpl = 24; /* ipnet header length */
-+ off_nl = 0;
-+ off_nl_nosnap = -1;
-+ return;
- }
- bpf_error("unknown data link type %d", linktype);
- /* NOTREACHED */
-***************
-*** 1931,1936 ****
---- 1939,1971 ----
- }
-
- /*
-+ * "proto" is an Ethernet type value and for IPNET, if it is not IPv4
-+ * or IPv6 then we have an error.
-+ */
-+ static struct block *
-+ gen_ipnet_linktype(proto)
-+ register int proto;
-+ {
-+ struct block *b0, *b1;
-+
-+ switch (proto) {
-+ case ETHERTYPE_IP:
-+ return gen_cmp(OR_LINK, off_linktype, BPF_B,
-+ (bpf_int32)AF_INET);
-+ /* NOTREACHED */
-+
-+ case ETHERTYPE_IPV6:
-+ return gen_cmp(OR_LINK, off_linktype, BPF_B,
-+ (bpf_int32)AF_INET6);
-+ /* NOTREACHED */
-+ default :
-+ break;
-+ }
-+
-+ return gen_false();
-+ }
-+
-+ /*
- * Generate code to match a particular packet type.
- *
- * "proto" is an Ethernet type value, if > ETHERMTU, or an LLC SAP
-***************
-*** 3327,3332 ****
---- 3362,3370 ----
- */
- return gen_mcmp(OR_LINK, 0, BPF_W, 0x4d474300, 0xffffff00); /* compare the magic number */
-
-+ case DLT_IPNET:
-+ return gen_ipnet_linktype(proto);
-+
- case DLT_LINUX_IRDA:
- bpf_error("IrDA link-layer type filtering not implemented");
-
-***************
-*** 7250,7255 ****
---- 7288,7305 ----
- dir);
- break;
-
-+ #ifdef DL_IPNET
-+ case DLT_IPNET:
-+ if (dir) {
-+ /* match outgoing packets */
-+ b0 = gen_cmp(OR_LINK, 2, BPF_H, IPNET_OUTBOUND);
-+ } else {
-+ /* match incoming packets */
-+ b0 = gen_cmp(OR_LINK, 2, BPF_H, IPNET_INBOUND);
-+ }
-+ break;
-+ #endif
-+
- case DLT_LINUX_SLL:
- if (dir) {
- /*
--- a/usr/src/lib/libpcap/Patches/pcap-bpf.c.patch Sat Oct 30 12:35:08 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
---- pcap-bpf.c.dist Fri Oct 10 19:42:44 2008
-+++ pcap-bpf.c Tue Sep 15 21:02:08 2009
-@@ -37,6 +37,7 @@
- #include <sys/file.h>
- #include <sys/ioctl.h>
- #include <sys/utsname.h>
-+#include <fcntl.h>
-
- #ifdef HAVE_ZEROCOPY_BPF
- #include <machine/atomic.h>
-@@ -510,7 +511,8 @@
- if (v == DLT_EN10MB) {
- is_ethernet = 1;
- for (i = 0; i < bdlp->bfl_len; i++) {
-- if (bdlp->bfl_list[i] != DLT_EN10MB) {
-+ if (bdlp->bfl_list[i] != DLT_EN10MB &&
-+ bdlp->bfl_list[i] != DLT_IPNET) {
- is_ethernet = 0;
- break;
- }
--- a/usr/src/lib/libpcap/Patches/pcap.c.patch Sat Oct 30 12:35:08 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
---- pcap.c.dist Fri Oct 10 19:42:44 2008
-+++ pcap.c Tue Sep 15 21:09:24 2009
-@@ -623,6 +623,7 @@
- DLT_CHOICE(DLT_BLUETOOTH_HCI_H4_WITH_PHDR, "Bluetooth HCI UART transport layer plus pseudo-header"),
- DLT_CHOICE(DLT_AX25_KISS, "AX.25 with KISS header"),
- DLT_CHOICE(DLT_IEEE802_15_4_NONASK_PHY, "IEEE 802.15.4 with non-ASK PHY data"),
-+ DLT_CHOICE(DLT_IPNET, "Solaris IPNET"),
- DLT_CHOICE_SENTINEL
- };
-
--- a/usr/src/lib/libpcap/Patches/savefile.c.patch Sat Oct 30 12:35:08 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
---- savefile.c.dist Fri Oct 10 19:42:44 2008
-+++ savefile.c Tue Sep 15 21:10:11 2009
-@@ -647,7 +647,9 @@
- */
- #define LINKTYPE_IEEE802_15_4_NONASK_PHY 215
-
-+#define LINKTYPE_IPNET 226
-
-+
- static struct linktype_map {
- int dlt;
- int linktype;
-@@ -952,6 +954,9 @@
- /* IEEE 802.15.4 with PHY data for non-ASK PHYs */
- { DLT_IEEE802_15_4_NONASK_PHY, LINKTYPE_IEEE802_15_4_NONASK_PHY },
-
-+ /* Solaris IPNET */
-+ { DLT_IPNET, LINKTYPE_IPNET },
-+
- { -1, -1 }
- };
-
--- a/usr/src/lib/libpcap/install-sfw Sat Oct 30 12:35:08 2010 -0700
+++ b/usr/src/lib/libpcap/install-sfw Tue Nov 16 22:41:08 2010 -0800
@@ -20,12 +20,11 @@
# CDDL HEADER END
#
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
#
-#ident "@(#)install-sfw 1.3 09/12/07 SMI"
+#ident "@(#)install-sfw 1.4 10/11/01 SMI"
-VERSION=1.0.0
+VERSION=1.1.1
VERS=libpcap-${VERSION}
MANPAGES="pcap.3pcap pcap_activate.3pcap pcap_breakloop.3pcap \
--- a/usr/src/lib/libpcap/install-sfw-64 Sat Oct 30 12:35:08 2010 -0700
+++ b/usr/src/lib/libpcap/install-sfw-64 Tue Nov 16 22:41:08 2010 -0800
@@ -20,12 +20,11 @@
# CDDL HEADER END
#
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
#
-#ident "@(#)install-sfw-64 1.2 09/11/10 SMI"
+#ident "@(#)install-sfw-64 1.3 10/11/01 SMI"
-VERSION=1.0.0
+VERSION=1.1.1
VERS=libpcap-${VERSION}-64
. ${SRC}/tools/install.subr
Binary file usr/src/lib/libpcap/libpcap-1.0.0.tar.gz has changed
Binary file usr/src/lib/libpcap/libpcap-1.1.1.tar.gz has changed
--- a/usr/src/lib/trousers/Patches/tcsd.8.in.patch Sat Oct 30 12:35:08 2010 -0700
+++ b/usr/src/lib/trousers/Patches/tcsd.8.in.patch Tue Nov 16 22:41:08 2010 -0800
@@ -1,104 +1,76 @@
-*** man/man8/tcsd.8.in.old Thu Dec 18 07:09:04 2008
---- man/man8/tcsd.8.in Thu Dec 18 07:37:35 2008
-***************
-*** 74,85 ****
- the TCS and stays valid across application lifetimes, \fBtcsd\fR restarts and
- system resets. Data registered in system PS stays valid until an application
- requests that it be removed. User PS files are by default stored as
-! /var/tpm/user.{pid} and the system PS file by default is /var/tpm/system.data.
- The system PS file is initially created when ownership of the TPM is first
- taken.
-
- .SH "CONFIGURATION"
-! \fBtcsd\fR configuration is stored by default in /etc/tcsd.conf
-
- .SH "DEBUG OUTPUT"
- If TrouSerS has been compiled with debugging enabled, the debugging output
---- 74,105 ----
- the TCS and stays valid across application lifetimes, \fBtcsd\fR restarts and
- system resets. Data registered in system PS stays valid until an application
- requests that it be removed. User PS files are by default stored as
-! $HOME/.trousers/user.data and the system PS file by default is /var/tpm/system/system.data.
- The system PS file is initially created when ownership of the TPM is first
- taken.
-+ .PP
-+ \fB/var/tpm/system/system.data\fR
-+ .ad
-+ .RS 4n
-+ Contains the system PS (persistent storage) data controlled by the TCS. By default,
-+ the SRK key is installed in PS and does not require owner authorization to use. If the
-+ TPM has previously been provisioned and owner-auth is required to load the SRK,
-+ then the /var/tpm/system/system.data.auth file should be moved to
-+ /var/tpm/system/system.data before starting the TCS (See NOTES).
-+ .RE
-+ .sp
-+ .PP
-+ \fB/var/tpm/system/system.data.auth\fR
-+ .ad
-+ .RS 4n
-+ This is the default PS data file to use if the TPM has been previously
-+ configured to require owner-auth to access the SRK. Copy this file
-+ to /var/tpm/system/system.data prior to starting the TCS if owner-auth is
-+ needed, otherwise this file can be ignored.
-+ .RE
-
- .SH "CONFIGURATION"
-! \fBtcsd\fR configuration is stored by default in /etc/security/tcsd.conf
-
- .SH "DEBUG OUTPUT"
- If TrouSerS has been compiled with debugging enabled, the debugging output
-***************
-*** 88,95 ****
- .SH "DEVICE DRIVERS"
- .PP
- \fBtcsd\fR is compatible with the IBM Research TPM device driver available
-! from http://www.research.ibm.com/gsal/tcpa and the TPM device driver available
-! from http://sf.net/projects/tmpdd
-
- .SH "CONFORMING TO"
- .PP
---- 108,116 ----
- .SH "DEVICE DRIVERS"
- .PP
- \fBtcsd\fR is compatible with the IBM Research TPM device driver available
-! from http://www.research.ibm.com/gsal/tcpa and the TPM device driver for
-! Linux available from http://sf.net/projects/tmpdd. It is also compatible
-! with the TPM device driver for Solaris which is available in the driver/crypto/tpm package.
-
- .SH "CONFORMING TO"
- .PP
-***************
-*** 98,105 ****
-
- .SH "SEE ALSO"
- .PP
-! \fBtcsd.conf\fR(5)
-
- .SH "AUTHOR"
- Kent Yoder
-
---- 119,142 ----
-
- .SH "SEE ALSO"
- .PP
-! \fBtcsd.conf\fR(5), \fBsvcadm\fR(1M), \fBsmf\fR(5)
-
-+ .SH "NOTES"
-+ .sp
-+ .LP
-+ The \fBtcsd\fR service is managed by the service management facility, \fBsmf\fR(5), under
-+ the service identifier:
-+ .sp
-+ .in +2
-+ .nf
-+ svc:/application/security/tcsd:default
-+ .fi
-+ .in -2
-+ .sp
-+ .LP
-+ Administrative actions on this service, such as enabling, disabling, or requesting restart, can be
-+ performed using \fBsvcadm\fR(1M). The service's status can be queried using the \fBsvcs\fR(1) command.
-+
- .SH "AUTHOR"
- Kent Yoder
-
+--- man/man8/tcsd.8.in 2009-09-08 07:39:30.000000000 -0700
++++ man/man8/tcsd.8.in.new 2010-09-16 08:13:25.613336616 -0700
+@@ -74,12 +74,32 @@
+ the TCS and stays valid across application lifetimes, \fBtcsd\fR restarts and
+ system resets. Data registered in system PS stays valid until an application
+ requests that it be removed. User PS files are by default stored as
+-/var/tpm/user.{pid} and the system PS file by default is /var/tpm/system.data.
+-The system PS file is initially created when ownership of the TPM is first
+-taken.
++/var/user/$USERNAME/tpm/userps/user.data and the system PS file by default is
++/var/tpm/system/system.data. The system PS file is initially created when
++ownership of the TPM is first taken.
++.PP
++\fB/var/tpm/system/system.data\fR
++.ad
++.RS 4n
++Contains the system PS (persistent storage) data controlled by the TCS. By default,
++the SRK key is installed in PS and does not require owner authorization to use. If the
++TPM has previously been provisioned and owner-auth is required to load the SRK,
++then the /var/tpm/system/system.data.auth file should be moved to
++/var/tpm/system/system.data before starting the TCS (See NOTES).
++.RE
++.sp
++.PP
++\fB/var/tpm/system/system.data.auth\fR
++.ad
++.RS 4n
++This is the default PS data file to use if the TPM has been previously
++configured to require owner-auth to access the SRK. Copy this file
++to /var/tpm/system/system.data prior to starting the TCS if owner-auth is
++needed, otherwise this file can be ignored.
++.RE
+
+ .SH "CONFIGURATION"
+-\fBtcsd\fR configuration is stored by default in /etc/tcsd.conf
++\fBtcsd\fR configuration is stored by default in /etc/security/tcsd.conf
+
+ .SH "DEBUG OUTPUT"
+ If TrouSerS has been compiled with debugging enabled, the debugging output
+@@ -88,8 +108,9 @@
+ .SH "DEVICE DRIVERS"
+ .PP
+ \fBtcsd\fR is compatible with the IBM Research TPM device driver available
+-from http://www.research.ibm.com/gsal/tcpa and the TPM device driver available
+-from http://sf.net/projects/tmpdd
++from http://www.research.ibm.com/gsal/tcpa and the TPM device driver for
++Linux available from http://sf.net/projects/tmpdd. It is also compatible
++with the TPM device driver for Solaris which is available in the driver/crypto/tpm package.
+
+ .SH "CONFORMING TO"
+ .PP
+@@ -98,7 +119,23 @@
+
+ .SH "SEE ALSO"
+ .PP
+-\fBtcsd.conf\fR(5)
++\fBtcsd.conf\fR(5), \fBsvcadm\fR(1M), \fBsmf\fR(5)
++
++.SH "NOTES"
++.sp
++.LP
++The \fBtcsd\fR service is managed by the service management facility, \fBsmf\fR(5), under
++the service identifier:
++.sp
++.in +2
++.nf
++svc:/application/security/tcsd:default
++.fi
++.in -2
++.sp
++.LP
++Administrative actions on this service, such as enabling, disabling, or requesting restart, can be
++performed using \fBsvcadm\fR(1M). The service's status can be queried using the \fBsvcs\fR(1) command.
+
+ .SH "AUTHOR"
+ Kent Yoder
--- a/usr/src/lib/trousers/Patches/tspps.c.patch Sat Oct 30 12:35:08 2010 -0700
+++ b/usr/src/lib/trousers/Patches/tspps.c.patch Tue Nov 16 22:41:08 2010 -0800
@@ -1,5 +1,5 @@
---- src/tspi/ps/tspps.c.orig Fri Jan 29 11:54:49 2010
-+++ src/tspi/ps/tspps.c Fri Jan 29 11:54:15 2010
+--- src/tspi/ps/tspps.c 2010-01-15 03:48:29.000000000 -0800
++++ src/tspi/ps/tspps.c.new 2010-09-16 08:36:51.294495115 -0700
@@ -19,6 +19,21 @@
#include <sys/file.h>
#include <sys/stat.h>
@@ -40,7 +40,21 @@
/*
-@@ -62,6 +88,16 @@
+@@ -44,11 +70,12 @@
+ TSS_RESULT result;
+ char *file_name = NULL, *home_dir = NULL;
+ struct passwd *pwp;
+-#if (defined (__linux) || defined (linux))
++#if (defined (__linux) || defined (linux) || defined (SOLARIS))
+ struct passwd pw;
+ #endif
+ struct stat stat_buf;
+ char buf[PASSWD_BUFSIZE];
++ char pwbuf[PASSWD_BUFSIZE];
+ uid_t euid;
+ int rc;
+
+@@ -62,6 +89,23 @@
euid = geteuid();
@@ -50,14 +64,21 @@
+ * in the user's home directory, which may be shared
+ * by multiple systems.
+ *
-+ * The directory path on Solaris is /var/tpm/userps/[EUID]/
++ * The directory path on Solaris is /var/user/[USERNAME]/tpm/userps
+ */
-+ rc = snprintf(buf, sizeof (buf), "%s/%d", TSS_USER_PS_DIR, euid);
++ pwp = NULL;
++ (void) getpwuid_r(euid, &pw, pwbuf, sizeof (pwbuf), &pwp);
++ if (pwp != NULL) {
++ rc = snprintf(buf, sizeof (buf), "/var/user/%s/tpm/userps",
++ pwp->pw_name);
++ } else {
++ return TSPERR(TSS_E_INTERNAL_ERROR);
++ }
+#else
setpwent();
while (1) {
#if (defined (__linux) || defined (linux))
-@@ -93,8 +129,9 @@
+@@ -93,8 +137,9 @@
return TSPERR(TSS_E_OUTOFMEMORY);
/* Tack on TSS_USER_PS_DIR and see if it exists */
@@ -69,7 +90,7 @@
LogDebugFn("USER PS: Path to file too long! (> %d bytes)", PASSWD_BUFSIZE);
result = TSPERR(TSS_E_INTERNAL_ERROR);
goto done;
-@@ -104,7 +141,7 @@
+@@ -104,7 +149,7 @@
if ((rc = stat(buf, &stat_buf)) == -1) {
if (errno == ENOENT) {
errno = 0;
@@ -78,26 +99,26 @@
if ((rc = mkdir(buf, 0700)) == -1) {
LogDebugFn("USER PS: Error creating dir: %s: %s", buf,
strerror(errno));
-@@ -119,10 +156,15 @@
+@@ -119,10 +164,15 @@
}
/* Directory exists or has been created, return the path to the file */
- rc = snprintf(buf, PASSWD_BUFSIZE, "%s/%s/%s", home_dir, TSS_USER_PS_DIR,
+#if defined (SOLARIS)
-+ rc = snprintf(buf, sizeof (buf), "%s/%d/%s", TSS_USER_PS_DIR, euid,
++ rc = snprintf(buf, sizeof (buf), "/var/user/%s/tpm/userps/%s",
++ pwp->pw_name, TSS_USER_PS_FILE);
++#else
++ rc = snprintf(buf, sizeof (buf), "%s/%s/%s", home_dir, TSS_USER_PS_DIR,
TSS_USER_PS_FILE);
- if (rc == PASSWD_BUFSIZE) {
- LogDebugFn("USER PS: Path to file too long! (> %d bytes)", PASSWD_BUFSIZE);
-+#else
-+ rc = snprintf(buf, sizeof (buf), "%s/%s/%s", home_dir, TSS_USER_PS_DIR,
-+ TSS_USER_PS_FILE);
+#endif
+ if (rc == sizeof (buf)) {
+ LogDebugFn("USER PS: Path to file too long! (> %d bytes)", sizeof (buf));
} else
*file = strdup(buf);
-@@ -143,12 +185,16 @@
+@@ -143,12 +193,16 @@
/* check the global file handle first. If it exists, lock it and return */
if (user_ps_fd != -1) {
@@ -115,7 +136,7 @@
*fd = user_ps_fd;
return TSS_SUCCESS;
}
-@@ -167,8 +213,12 @@
+@@ -167,8 +221,12 @@
MUTEX_UNLOCK(user_ps_lock);
return TSPERR(TSS_E_INTERNAL_ERROR);
}
@@ -129,7 +150,7 @@
LogDebug("USER PS: failed to get lock of %s: %s", file_name, strerror(errno));
free(file_name);
close(user_ps_fd);
-@@ -190,7 +240,12 @@
+@@ -190,7 +248,12 @@
fsync(fd);
/* release the file lock */
@@ -142,7 +163,7 @@
LogDebug("USER PS: failed to unlock file: %s", strerror(errno));
rc = -1;
}
-@@ -365,6 +420,7 @@
+@@ -365,6 +428,7 @@
LogDebug("read of %zd bytes: %s", sizeof(UINT32), strerror(errno));
return TSPERR(TSS_E_INTERNAL_ERROR);
}
@@ -150,7 +171,7 @@
if (increment)
num_keys++;
-@@ -377,6 +433,7 @@
+@@ -377,6 +441,7 @@
return TSPERR(TSS_E_INTERNAL_ERROR);
}
@@ -158,7 +179,7 @@
if ((result = write_data(fd, (void *)&num_keys, sizeof(UINT32)))) {
LogDebug("%s", __FUNCTION__);
return result;
-@@ -498,16 +555,20 @@
+@@ -498,16 +563,20 @@
}
/* [UINT16 pub_data_size0 ] yes */
@@ -179,7 +200,7 @@
/* [UINT32 vendor_data_size0 ] yes */
if ((result = write_data(fd, &zero, sizeof(UINT32)))) {
-@@ -516,10 +577,12 @@
+@@ -516,10 +585,12 @@
}
/* [UINT16 cache_flags0 ] yes */
@@ -192,7 +213,7 @@
/* [BYTE[] pub_data0 ] no */
if ((result = write_data(fd, (void *)key.pubKey.key, pub_key_size))) {
-@@ -685,6 +748,7 @@
+@@ -685,6 +756,7 @@
LogDebug("%s", __FUNCTION__);
goto err_exit;
}
@@ -200,7 +221,7 @@
DBG_ASSERT(tmp[i].pub_data_size <= 2048);
-@@ -693,6 +757,7 @@
+@@ -693,6 +765,7 @@
LogDebug("%s", __FUNCTION__);
goto err_exit;
}
@@ -208,7 +229,7 @@
DBG_ASSERT(tmp[i].blob_size <= 4096);
-@@ -701,6 +766,7 @@
+@@ -701,12 +774,14 @@
LogDebug("%s", __FUNCTION__);
goto err_exit;
}
@@ -216,7 +237,6 @@
/* cache flags */
if ((result = read_data(fd, &tmp[i].flags, sizeof(UINT16)))) {
-@@ -707,6 +773,7 @@
LogDebug("%s", __FUNCTION__);
goto err_exit;
}
@@ -224,7 +244,7 @@
/* fast forward over the pub key */
offset = lseek(fd, tmp[i].pub_data_size, SEEK_CUR);
-@@ -1031,6 +1098,8 @@
+@@ -1031,6 +1106,8 @@
num_keys = 0;
}
@@ -233,7 +253,7 @@
return num_keys;
}
-@@ -1109,7 +1178,7 @@
+@@ -1109,7 +1186,7 @@
LogDebug("%s", __FUNCTION__);
return result;
}
@@ -242,7 +262,7 @@
DBG_ASSERT(c->pub_data_size <= 2048 && c->pub_data_size > 0);
/* blob size */
-@@ -1117,7 +1186,7 @@
+@@ -1117,7 +1194,7 @@
LogDebug("%s", __FUNCTION__);
return result;
}
@@ -251,7 +271,7 @@
DBG_ASSERT(c->blob_size <= 4096 && c->blob_size > 0);
/* vendor data size */
-@@ -1125,6 +1194,7 @@
+@@ -1125,12 +1202,14 @@
LogDebug("%s", __FUNCTION__);
return result;
}
@@ -259,7 +279,6 @@
/* cache flags */
if ((result = read_data(fd, &c->flags, sizeof(UINT16)))) {
-@@ -1131,6 +1201,7 @@
LogDebug("%s", __FUNCTION__);
return result;
}
@@ -267,7 +286,7 @@
/* fast forward over the pub key */
offset = lseek(fd, c->pub_data_size, SEEK_CUR);
-@@ -1198,6 +1269,7 @@
+@@ -1198,6 +1277,7 @@
return result;
}
@@ -275,7 +294,7 @@
DBG_ASSERT(c->pub_data_size <= 2048 && c->pub_data_size > 0);
/* blob size */
-@@ -1206,6 +1278,7 @@
+@@ -1206,6 +1286,7 @@
return result;
}
@@ -283,7 +302,7 @@
DBG_ASSERT(c->blob_size <= 4096 && c->blob_size > 0);
/* vendor data size */
-@@ -1213,6 +1286,7 @@
+@@ -1213,12 +1294,14 @@
LogDebug("%s", __FUNCTION__);
return result;
}
@@ -291,7 +310,6 @@
/* cache flags */
if ((result = read_data(fd, &c->flags, sizeof(UINT16)))) {
-@@ -1219,6 +1293,7 @@
LogDebug("%s", __FUNCTION__);
return result;
}
--- a/usr/src/lib/trousers/Patches/tspps.h.patch Sat Oct 30 12:35:08 2010 -0700
+++ b/usr/src/lib/trousers/Patches/tspps.h.patch Tue Nov 16 22:41:08 2010 -0800
@@ -1,35 +1,22 @@
-*** src/include/tspps.h.old Thu Dec 18 08:40:21 2008
---- src/include/tspps.h Thu Dec 18 08:41:51 2008
-***************
-*** 13,25 ****
-
- #define PASSWD_BUFSIZE 4096
-
- #define TSS_USER_PS_DIR ".trousers"
- #define TSS_USER_PS_FILE "user.data"
-
- TSS_RESULT get_file(int *);
- int put_file(int);
-! inline TSS_RESULT read_data(int, void *, UINT32);
-! inline TSS_RESULT write_data(int, void *, UINT32);
- UINT32 psfile_get_num_keys(int);
- TSS_RESULT psfile_get_parent_uuid_by_uuid(int, TSS_UUID *, TSS_UUID *);
- TSS_RESULT psfile_remove_key_by_uuid(int, TSS_UUID *);
---- 13,29 ----
-
- #define PASSWD_BUFSIZE 4096
-
-+ #ifdef SOLARIS
-+ #define TSS_USER_PS_DIR "/var/tpm/userps"
-+ #else
- #define TSS_USER_PS_DIR ".trousers"
-+ #endif
- #define TSS_USER_PS_FILE "user.data"
-
- TSS_RESULT get_file(int *);
- int put_file(int);
-! TSS_RESULT read_data(int, void *, UINT32);
-! TSS_RESULT write_data(int, void *, UINT32);
- UINT32 psfile_get_num_keys(int);
- TSS_RESULT psfile_get_parent_uuid_by_uuid(int, TSS_UUID *, TSS_UUID *);
- TSS_RESULT psfile_remove_key_by_uuid(int, TSS_UUID *);
+--- src/include/tspps.h.old 2009-09-08 07:39:30.000000000 -0700
++++ src/include/tspps.h 2010-09-16 08:09:37.980051068 -0700
+@@ -13,13 +13,17 @@
+
+ #define PASSWD_BUFSIZE 4096
+
++#ifdef SOLARIS
++#define TSS_USER_PS_DIR "/var/user/"
++#else
+ #define TSS_USER_PS_DIR ".trousers"
++#endif
+ #define TSS_USER_PS_FILE "user.data"
+
+ TSS_RESULT get_file(int *);
+ int put_file(int);
+-inline TSS_RESULT read_data(int, void *, UINT32);
+-inline TSS_RESULT write_data(int, void *, UINT32);
++TSS_RESULT read_data(int, void *, UINT32);
++TSS_RESULT write_data(int, void *, UINT32);
+ UINT32 psfile_get_num_keys(int);
+ TSS_RESULT psfile_get_parent_uuid_by_uuid(int, TSS_UUID *, TSS_UUID *);
+ TSS_RESULT psfile_remove_key_by_uuid(int, TSS_UUID *);
--- a/usr/src/pkgdefs/Makefile Sat Oct 30 12:35:08 2010 -0700
+++ b/usr/src/pkgdefs/Makefile Tue Nov 16 22:41:08 2010 -0800
@@ -22,7 +22,7 @@
#
# Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
#
-# ident "@(#)Makefile 1.285 10/10/07 SMI"
+# ident "@(#)Makefile 1.286 10/10/27 SMI"
#
#
@@ -44,9 +44,6 @@
SUNWactivation \
SUNWaget \
SUNWantlr2 \
- SUNWapchd \
- SUNWapchr \
- SUNWapchu \
SUNWapr13lib \
SUNWapr13dev \
SUNWapr13doc \
--- a/usr/src/pkgdefs/SUNWantlr2/depend Sat Oct 30 12:35:08 2010 -0700
+++ b/usr/src/pkgdefs/SUNWantlr2/depend Tue Nov 16 22:41:08 2010 -0800
@@ -1,6 +1,3 @@
-#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
#
# CDDL HEADER START
#
@@ -21,7 +18,9 @@
#
# CDDL HEADER END
#
-#ident "@(#)depend 1.1 09/06/15 SMI"
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+#
+#ident "@(#)depend 1.2 10/11/01 SMI"
#
# This package information file defines software dependencies associated
# with the pkg. You can define three types of pkg dependencies with this file:
@@ -49,4 +48,4 @@
P SUNWcsu Core Solaris, (Usr)
P SUNWcsd Core Solaris Devices
P SUNWcsl Core Solaris Libraries
-P SUNWPython The Python interpreter, libraries and utilities
+P SUNWPython26 The Python interpreter, libraries and utilities
--- a/usr/src/pkgdefs/SUNWapchd/Makefile Sat Oct 30 12:35:08 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-#
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#ident "@(#)Makefile 1.3 06/03/18 SMI"
-#
-# Copyright (c) 2001 by Sun Microsystems, Inc.
-# All rights reserved.
-
-include ../Makefile.com
-
-DATAFILES =
-
-.KEEP_STATE:
-
-all: $(FILES)
-install: all pkg
-
-include ../Makefile.targ
--- a/usr/src/pkgdefs/SUNWapchd/copyright Sat Oct 30 12:35:08 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,535 +0,0 @@
-Note about the expat-lite library:
-
-Sun elects to have this sub-component available under and governed by the
-Mozilla Public License v.1.1 (see below for full license text).
-
-The following notice accompanied the original software distribution:
-=============================================================================
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
-
-APACHE HTTP SERVER SUBCOMPONENTS:
-
-The Apache HTTP Server includes a number of subcomponents with
-separate copyright notices and license terms. Your use of the source
-code for the these subcomponents is subject to the terms and
-conditions of the following licenses.
-
-
-For the MD5 Message-Digest library component:
-
- Copyright (C) 1995, Board of Trustees of the University of Illinois
-
- *********************************************************************
-
- (C) Copyright 1993,1994 by Carnegie Mellon University
- All Rights Reserved.
-
- Permission to use, copy, modify, distribute, and sell this software
- and its documentation for any purpose is hereby granted without
- fee, provided that the above copyright notice appear in all copies
- and that both that copyright notice and this permission notice
- appear in supporting documentation, and that the name of Carnegie
- Mellon University not be used in advertising or publicity
- pertaining to distribution of the software without specific,
- written prior permission. Carnegie Mellon University makes no
- representations about the suitability of this software for any
- purpose. It is provided "as is" without express or implied
- warranty.
-
- CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
- THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
- FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
- AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- SOFTWARE.
-
- *********************************************************************
-
- Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
-
- Permission to use, copy, modify, and distribute this material
- for any purpose and without fee is hereby granted, provided
- that the above copyright notice and this permission notice
- appear in all copies, and that the name of Bellcore not be
- used in advertising or publicity pertaining to this
- material without the specific, prior written permission
- of an authorized representative of Bellcore. BELLCORE
- MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY
- OF THIS MATERIAL FOR ANY PURPOSE. IT IS PROVIDED "AS IS",
- WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
-
- *********************************************************************
-
- Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
- rights reserved.
-
- License to copy and use this software is granted provided that it
- is identified as the "RSA Data Security, Inc. MD5 Message-Digest
- Algorithm" in all material mentioning or referencing this software
- or this function.
-
- License is also granted to make and use derivative works provided
- that such works are identified as "derived from the RSA Data
- Security, Inc. MD5 Message-Digest Algorithm" in all material
- mentioning or referencing the derived work.
-
- RSA Data Security, Inc. makes no representations concerning either
- the merchantability of this software or the suitability of this
- software for any particular purpose. It is provided "as is"
- without express or implied warranty of any kind.
-
- These notices must be retained in any copies of any part of this
- documentation and/or software.
-
- ----------------------------------------------------------------------------
- "THE BEER-WARE LICENSE" (Revision 42):
- <[email protected]> wrote this file. As long as you retain this notice you
- can do whatever you want with this stuff. If we meet some day, and you think
- this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp
- ----------------------------------------------------------------------------
-
-
-For the expat-lite library component:
-
- Copyright (c) 1998, 1999 James Clark. Expat is subject to the Mozilla Public
- License Version 1.1. Alternatively you may use expat under the GNU General
- Public License instead.
-
-
-For the regex library component:
-
- Copyright 1992, 1993, 1994 Henry Spencer. All rights reserved.
- This software is not subject to any license of the American Telephone
- and Telegraph Company or of the Regents of the University of California.
-
- Permission is granted to anyone to use this software for any purpose on
- any computer system, and to alter it and redistribute it, subject
- to the following restrictions:
-
- 1. The author is not responsible for the consequences of use of this
- software, no matter how awful, even if they arise from flaws in it.
-
- 2. The origin of this software must not be misrepresented, either by
- explicit claim or by omission. Since few users ever read sources,
- credits must appear in the documentation.
-
- 3. Altered versions must be plainly marked as such, and must not be
- misrepresented as being the original software. Since few users
- ever read sources, credits must appear in the documentation.
-
- 4. This notice may not be removed or altered.
-
-
-For the expat xml parser library component:
-
- Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd
- and Clark Cooper
-
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the
- "Software"), to deal in the Software without restriction, including
- without limitation the rights to use, copy, modify, merge, publish,
- distribute, sublicense, and/or sell copies of the Software, and to
- permit persons to whom the Software is furnished to do so, subject to
- the following conditions:
-
- The above copyright notice and this permission notice shall be included
- in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-For the mod_mime_magic component:
-
- Copyright (c) 1996-1997 Cisco Systems, Inc.
-
- This software was submitted by Cisco Systems to the Apache Group in July
- 1997. Future revisions and derivatives of this source code must
- acknowledge Cisco Systems as the original contributor of this module.
- All other licensing and usage conditions are those of the Apache Group.
-
- Some of this code is derived from the free version of the file command
- originally posted to comp.sources.unix. Copyright info for that program
- is included below as required.
- -------------------------------------------------------------------------
- Copyright (c) Ian F. Darwin, 1987. Written by Ian F. Darwin.
-
- This software is not subject to any license of the American Telephone and
- Telegraph Company or of the Regents of the University of California.
-
- Permission is granted to anyone to use this software for any purpose on any
- computer system, and to alter it and redistribute it freely, subject to
- the following restrictions:
-
- 1. The author is not responsible for the consequences of use of this
- software, no matter how awful, even if they arise from flaws in it.
-
- 2. The origin of this software must not be misrepresented, either by
- explicit claim or by omission. Since few users ever read sources, credits
- must appear in the documentation.
-
- 3. Altered versions must be plainly marked as such, and must not be
- misrepresented as being the original software. Since few users ever read
- sources, credits must appear in the documentation.
-
- 4. This notice may not be removed or altered.
- -------------------------------------------------------------------------
-
-
-For the mod_imap component:
-
- "macmartinized" polygon code copyright 1992 by Eric Haines, [email protected]
-
-
-For the zb test and ab support components:
-
- This program is Copyright (C) Zeus Technology Limited 1996.
-
- This program may be used and copied freely providing this copyright notice
- is not removed.
-
- This software is provided "as is" and any express or implied waranties,
- including but not limited to, the implied warranties of merchantability and
- fitness for a particular purpose are disclaimed. In no event shall
- Zeus Technology Ltd. be liable for any direct, indirect, incidental, special,
- exemplary, or consequential damaged (including, but not limited to,
- procurement of substitute good or services; loss of use, data, or profits;
- or business interruption) however caused and on 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.
-
-
-
-For the mod_perl and mod_auth_gss components:
-
-/* ====================================================================
-
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 1996-2000 The Apache Software Foundation. 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. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
- * "This product includes software developed by the
- * Apache Software Foundation (http://www.apache.org/)."
- * Alternately, this acknowledgment may appear in the software itself,
- * if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Apache" and "Apache Software Foundation" must
- * not be used to endorse or promote products derived from this
- * software without prior written permission. For written
- * permission, please contact [email protected].
- *
- * 5. Products derived from this software may not be called "Apache",
- * nor may "Apache" appear in their name, without prior written
- * permission of the Apache Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED ``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 APACHE SOFTWARE FOUNDATION 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.
- * ====================================================================
- */
-
-
- _ _
- _ __ ___ ___ __| | ___ ___| | mod_ssl
- | '_ ` _ \ / _ \ / _` | / __/ __| | Apache Interface to OpenSSL
- | | | | | | (_) | (_| | \__ \__ \ | www.modssl.org
- |_| |_| |_|\___/ \__,_|___|___/___/_| ftp.modssl.org
- |_____|
- _____________________________________________________________________________
-
- ``Ian Fleming was a UNIX fan!
- How do I know? Well, James Bond
- had the (license to kill) number 007,
- i.e. he could execute anyone.''
- -- Unknown
- LICENSE
-
- The mod_ssl package falls under the Open-Source Software label
- because it's distributed under a BSD-style license. The
- detailed license information follows.
-
- ====================================================================
- Copyright (c) 1998-2007 Ralf S. Engelschall. 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
- Ralf S. Engelschall <[email protected]> for use in the
- mod_ssl project (http://www.modssl.org/)."
-
- 4. The names "mod_ssl" must not be used to endorse or promote
- products derived from this software without prior written
- permission. For written permission, please contact
- [email protected].
-
- 5. Products derived from this software may not be called "mod_ssl"
- nor may "mod_ssl" appear in their names without prior
- written permission of Ralf S. Engelschall.
-
- 6. Redistributions of any form whatsoever must retain the following
- acknowledgment:
- "This product includes software developed by
- Ralf S. Engelschall <[email protected]> for use in the
- mod_ssl project (http://www.modssl.org/)."
-
- THIS SOFTWARE IS PROVIDED BY RALF S. ENGELSCHALL ``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 RALF S. ENGELSCHALL OR
- HIS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- OF THE POSSIBILITY OF SUCH DAMAGE.
- ====================================================================
-
--- a/usr/src/pkgdefs/SUNWapchd/depend Sat Oct 30 12:35:08 2010 -0700
+++ /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.4 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 SUNWapchr Apache Web Server, (root)
-P SUNWapchu Apache Web Server, (usr)
--- a/usr/src/pkgdefs/SUNWapchd/pkginfo.tmpl Sat Oct 30 12:35:08 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-#
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-#ident "@(#)pkginfo.tmpl 1.10 10/07/22 SMI"
-#
-# This required package information file describes characteristics of the
-# package, such as package abbreviation, full package name, package version,
-# and package architecture.
-#
-PKG="SUNWapchd"
-NAME="Apache Web Server Documentation"
-ARCH="ISA"
-VERSION="SFWVERS,REV=0.0.0"
-SUNW_PRODNAME="SunOS"
-SUNW_PRODVERS="RELEASE/VERSION"
-SUNW_PKGTYPE="usr"
-MAXINST="1000"
-CATEGORY="system"
-DESC="The Apache HTTP server (1.3.x) (documentation)"
-VENDOR="COMPANY"
-HOTLINE="Please contact your local service provider"
-EMAIL=""
-CLASSES="none"
-BASEDIR=/
-SUNW_PKGVERS="1.0"
-SUNW_PKG_ALLZONES="false"
-SUNW_PKG_HOLLOW="false"
-SUNW_PKG_THISZONE="false"
-#VSTOCK="<reserved by Release Engineering for package part #>"
-#ISTATES="<developer defined>"
-#RSTATES='<developer defined>'
-#ULIMIT="<developer defined>"
-#ORDER="<developer defined>"
-#PSTAMP="<developer defined>"
-#INTONLY="<developer defined>"
--- a/usr/src/pkgdefs/SUNWapchd/prototype_com Sat Oct 30 12:35:08 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,446 +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 2010 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#ident "@(#)prototype_com 1.14 10/01/14 SMI"
-#
-# SUNWapchd
-#
-# packaging files
-i pkginfo
-i depend
-i copyright
-#
-d none usr 755 root sys
-d none usr/apache 755 root bin
-d none usr/apache/htdocs 0755 root bin
-d none usr/apache/htdocs/manual 0755 root bin
-f none usr/apache/htdocs/manual/LICENSE 0555 root bin
-f none usr/apache/htdocs/manual/bind.html.en 0555 root bin
-f none usr/apache/htdocs/manual/bind.html.fr 0555 root bin
-f none usr/apache/htdocs/manual/bind.html.html 0555 root bin
-f none usr/apache/htdocs/manual/bind.html.ja.jis 0555 root bin
-f none usr/apache/htdocs/manual/configuring.html.en 0555 root bin
-f none usr/apache/htdocs/manual/configuring.html.fr 0555 root bin
-f none usr/apache/htdocs/manual/configuring.html.html 0555 root bin
-f none usr/apache/htdocs/manual/configuring.html.ja.jis 0555 root bin
-f none usr/apache/htdocs/manual/content-negotiation.html.en 0555 root bin
-f none usr/apache/htdocs/manual/content-negotiation.html.html 0555 root bin
-f none usr/apache/htdocs/manual/content-negotiation.html.ja.jis 0555 root bin
-f none usr/apache/htdocs/manual/cygwin.html 0555 root bin
-f none usr/apache/htdocs/manual/custom-error.html.en 0555 root bin
-f none usr/apache/htdocs/manual/custom-error.html.fr 0555 root bin
-f none usr/apache/htdocs/manual/custom-error.html.html 0555 root bin
-f none usr/apache/htdocs/manual/custom-error.html.ja.jis 0555 root bin
-f none usr/apache/htdocs/manual/dns-caveats.html.en 0555 root bin
-f none usr/apache/htdocs/manual/dns-caveats.html.fr 0555 root bin
-f none usr/apache/htdocs/manual/dns-caveats.html.ja.jis 0555 root bin
-f none usr/apache/htdocs/manual/dns-caveats.html.html 0555 root bin
-f none usr/apache/htdocs/manual/dso.html 0555 root bin
-f none usr/apache/htdocs/manual/ebcdic.html 0555 root bin
-f none usr/apache/htdocs/manual/env.html.en 0555 root bin
-f none usr/apache/htdocs/manual/env.html.html 0555 root bin
-f none usr/apache/htdocs/manual/env.html.ja.jis 0555 root bin
-f none usr/apache/htdocs/manual/footer.html 0555 root bin
-f none usr/apache/htdocs/manual/handler.html.en 0555 root bin
-f none usr/apache/htdocs/manual/handler.html.html 0555 root bin
-f none usr/apache/htdocs/manual/handler.html.ja.jis 0555 root bin
-f none usr/apache/htdocs/manual/header.html 0555 root bin
-d none usr/apache/htdocs/manual/howto 0755 root bin
-f none usr/apache/htdocs/manual/howto/auth.html 0555 root bin
-f none usr/apache/htdocs/manual/howto/cgi.html.en 0555 root bin
-f none usr/apache/htdocs/manual/howto/cgi.html.html 0555 root bin
-f none usr/apache/htdocs/manual/howto/cgi.html.ja.jis 0555 root bin
-f none usr/apache/htdocs/manual/howto/footer.html 0555 root bin
-f none usr/apache/htdocs/manual/howto/header.html 0555 root bin
-f none usr/apache/htdocs/manual/howto/htaccess.html 0555 root bin
-f none usr/apache/htdocs/manual/howto/ssi.html.en 0555 root bin
-f none usr/apache/htdocs/manual/howto/ssi.html.html 0555 root bin
-f none usr/apache/htdocs/manual/howto/ssi.html.ja.jis 0555 root bin
-d none usr/apache/htdocs/manual/images 0755 root bin
-f none usr/apache/htdocs/manual/images/apache_header.gif 0555 root bin
-f none usr/apache/htdocs/manual/images/custom_errordocs.gif 0555 root bin
-f none usr/apache/htdocs/manual/images/home.gif 0555 root bin
-f none usr/apache/htdocs/manual/images/index.gif 0555 root bin
-f none usr/apache/htdocs/manual/images/mod_rewrite_fig1.fig 0555 root bin
-f none usr/apache/htdocs/manual/images/mod_rewrite_fig1.gif 0555 root bin
-f none usr/apache/htdocs/manual/images/mod_rewrite_fig2.fig 0555 root bin
-f none usr/apache/htdocs/manual/images/mod_rewrite_fig2.gif 0555 root bin
-f none usr/apache/htdocs/manual/images/pixel.gif 0555 root bin
-f none usr/apache/htdocs/manual/images/sub.gif 0555 root bin
-f none usr/apache/htdocs/manual/images/apache_pb.gif 0555 root bin
-f none usr/apache/htdocs/manual/images/feather.jpg 0555 root bin
-f none usr/apache/htdocs/manual/images/mod_ssl_sb.gif 0555 root bin
-f none usr/apache/htdocs/manual/images/openssl_ics.gif 0555 root bin
-f none usr/apache/htdocs/manual/index.html.en 0555 root bin
-f none usr/apache/htdocs/manual/index.html.fr 0555 root bin
-f none usr/apache/htdocs/manual/index.html.html 0555 root bin
-f none usr/apache/htdocs/manual/index.html.ja.jis 0555 root bin
-f none usr/apache/htdocs/manual/install-tpf.html 0555 root bin
-f none usr/apache/htdocs/manual/install-ztpf.html 0555 root bin
-f none usr/apache/htdocs/manual/install.html.en 0555 root bin
-f none usr/apache/htdocs/manual/install.html.es 0555 root bin
-f none usr/apache/htdocs/manual/install.html.fr 0555 root bin
-f none usr/apache/htdocs/manual/install.html.html 0555 root bin
-f none usr/apache/htdocs/manual/install.html.ja.jis 0555 root bin
-f none usr/apache/htdocs/manual/invoking.html.en 0555 root bin
-f none usr/apache/htdocs/manual/invoking.html.fr 0555 root bin
-f none usr/apache/htdocs/manual/invoking.html.ja.jis 0555 root bin
-f none usr/apache/htdocs/manual/invoking.html.html 0555 root bin
-f none usr/apache/htdocs/manual/keepalive.html.en 0555 root bin
-f none usr/apache/htdocs/manual/keepalive.html.html 0555 root bin
-f none usr/apache/htdocs/manual/keepalive.html.ja.jis 0555 root bin
-f none usr/apache/htdocs/manual/location.html.en 0555 root bin
-f none usr/apache/htdocs/manual/location.html.html 0555 root bin
-f none usr/apache/htdocs/manual/location.html.ja.jis 0555 root bin
-f none usr/apache/htdocs/manual/logs.html 0555 root bin
-f none usr/apache/htdocs/manual/man-template.html 0555 root bin
-d none usr/apache/htdocs/manual/misc 0755 root bin
-f none usr/apache/htdocs/manual/misc/API.html 0555 root bin
-f none usr/apache/htdocs/manual/misc/client_block_api.html 0555 root bin
-f none usr/apache/htdocs/manual/misc/compat_notes.html 0555 root bin
-f none usr/apache/htdocs/manual/misc/custom_errordocs.html 0555 root bin
-f none usr/apache/htdocs/manual/misc/descriptors.html 0555 root bin
-f none usr/apache/htdocs/manual/misc/FAQ.html 0555 root bin
-f none usr/apache/htdocs/manual/misc/fin_wait_2.html 0555 root bin
-f none usr/apache/htdocs/manual/misc/footer.html 0555 root bin
-f none usr/apache/htdocs/manual/misc/header.html 0555 root bin
-f none usr/apache/htdocs/manual/misc/howto.html 0555 root bin
-f none usr/apache/htdocs/manual/misc/HTTP_Features.tsv 0555 root bin
-f none usr/apache/htdocs/manual/misc/index.html 0555 root bin
-f none usr/apache/htdocs/manual/misc/known_client_problems.html 0555 root bin
-f none usr/apache/htdocs/manual/misc/nopgp.html 0555 root bin
-f none usr/apache/htdocs/manual/misc/perf-bsd44.html 0555 root bin
-f none usr/apache/htdocs/manual/misc/perf-dec.html 0555 root bin
-f none usr/apache/htdocs/manual/misc/perf-hp.html 0555 root bin
-f none usr/apache/htdocs/manual/misc/perf-tuning.html 0555 root bin
-f none usr/apache/htdocs/manual/misc/perf.html 0555 root bin
-f none usr/apache/htdocs/manual/misc/rewriteguide.html 0555 root bin
-f none usr/apache/htdocs/manual/misc/security_tips.html 0555 root bin
-f none usr/apache/htdocs/manual/misc/tutorials.html 0555 root bin
-f none usr/apache/htdocs/manual/misc/vif-info.html 0555 root bin
-f none usr/apache/htdocs/manual/misc/windoz_keepalive.html 0555 root bin
-d none usr/apache/htdocs/manual/mod 0755 root bin
-f none usr/apache/htdocs/manual/mod/core.html.en 0555 root bin
-f none usr/apache/htdocs/manual/mod/core.html.fr 0555 root bin
-f none usr/apache/htdocs/manual/mod/core.html.html 0555 root bin
-f none usr/apache/htdocs/manual/mod/core.html.ja.jis 0555 root bin
-f none usr/apache/htdocs/manual/mod/directive-dict.html.en 0555 root bin
-f none usr/apache/htdocs/manual/mod/directive-dict.html.fr 0555 root bin
-f none usr/apache/htdocs/manual/mod/directive-dict.html.html 0555 root bin
-f none usr/apache/htdocs/manual/mod/directive-dict.html.ja.jis 0555 root bin
-f none usr/apache/htdocs/manual/mod/directives.html.de 0555 root bin
-f none usr/apache/htdocs/manual/mod/directives.html.en 0555 root bin
-f none usr/apache/htdocs/manual/mod/directives.html.fr 0555 root bin
-f none usr/apache/htdocs/manual/mod/directives.html.html 0555 root bin
-f none usr/apache/htdocs/manual/mod/directives.html.ja.jis 0555 root bin
-f none usr/apache/htdocs/manual/mod/footer.html 0555 root bin
-f none usr/apache/htdocs/manual/mod/header.html 0555 root bin
-f none usr/apache/htdocs/manual/mod/index-bytype.html.en 0555 root bin
-f none usr/apache/htdocs/manual/mod/index-bytype.html.fr 0555 root bin
-f none usr/apache/htdocs/manual/mod/index-bytype.html.html 0555 root bin
-f none usr/apache/htdocs/manual/mod/index-bytype.html.ja.jis 0555 root bin
-f none usr/apache/htdocs/manual/mod/index.html.en 0555 root bin
-f none usr/apache/htdocs/manual/mod/index.html.fr 0555 root bin
-f none usr/apache/htdocs/manual/mod/index.html.html 0555 root bin
-f none usr/apache/htdocs/manual/mod/index.html.ja.jis 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_access.html.en 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_access.html.html 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_access.html.ja.jis 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_actions.html.en 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_actions.html.html 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_actions.html.ja.jis 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_alias.html.en 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_alias.html.html 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_alias.html.ja.jis 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_asis.html.en 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_asis.html.html 0555 root bin
-d none usr/apache/htdocs/manual/mod/mod_ssl 0755 root bin
-f none usr/apache/htdocs/manual/mod/mod_ssl/index.html 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_ssl/ssl_compat.gfont000.gif 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_ssl/ssl_compat.html 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_ssl/ssl_compat.wml 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_ssl/ssl_cover.wml 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_ssl/ssl_cover_logo.jpg 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_ssl/ssl_cover_title.jpg 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_ssl/ssl_faq.gfont000.gif 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_ssl/ssl_faq.html 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_ssl/ssl_faq.wml 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_ssl/ssl_glossary.html 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_ssl/ssl_glossary.wml 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_ssl/ssl_howto.gfont000.gif 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_ssl/ssl_howto.html 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_ssl/ssl_howto.wml 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_ssl/ssl_intro.gfont000.gif 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_ssl/ssl_intro.html 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_ssl/ssl_intro.wml 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_ssl/ssl_intro_fig1.gif 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_ssl/ssl_intro_fig2.gif 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_ssl/ssl_intro_fig3.gif 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_ssl/ssl_overview.gfont000.gif 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_ssl/ssl_overview.html 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_ssl/ssl_overview.wml 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_ssl/ssl_overview_fig1.gif 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_ssl/ssl_reference.gfont000.gif 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_ssl/ssl_reference.html 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_ssl/ssl_reference.wml 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_ssl/ssl_template.head-chapter.gif 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_ssl/ssl_template.head-num-1.gif 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_ssl/ssl_template.head-num-2.gif 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_ssl/ssl_template.head-num-3.gif 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_ssl/ssl_template.head-num-4.gif 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_ssl/ssl_template.inc 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_ssl/ssl_template.head-num-5.gif 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_ssl/ssl_template.head-num-6.gif 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_ssl/ssl_template.head-num-7.gif 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_ssl/ssl_template.imgdot-1x1-000000.gif 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_ssl/ssl_template.imgdot-1x1-transp.gif 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_ssl/ssl_template.navbut-next-n.gif 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_ssl/ssl_template.navbut-next-s.gif 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_ssl/ssl_template.navbut-prev-n.gif 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_ssl/ssl_template.navbut-prev-s.gif 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_ssl/ssl_template.title-abstract.gif 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_ssl/ssl_template.title-compat.gif 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_ssl/ssl_template.title-faq.gif 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_ssl/ssl_template.title-gloss.gif 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_ssl/ssl_template.title-howto.gif 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_ssl/ssl_template.title-intro.gif 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_ssl/ssl_template.title-over.gif 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_ssl/ssl_template.title-preface.gif 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_ssl/ssl_template.title-ref.gif 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_ssl/ssl_template.title-toc.gif 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_ssl/ssl_template.title-tutor.gif 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_asis.html.ja.jis 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_auth.html.en 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_auth.html.html 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_auth.html.ja.jis 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_auth_anon.html 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_auth_db.html 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_auth_dbm.html 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_auth_digest.html 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_autoindex.html.en 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_autoindex.html.html 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_autoindex.html.ja.jis 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_browser.html 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_cern_meta.html 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_cgi.html.en 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_cgi.html.html 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_cgi.html.ja.jis 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_cookies.html 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_digest.html 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_dir.html.en 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_dir.html.html 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_dir.html.ja.jis 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_dld.html 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_env.html.en 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_env.html.html 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_env.html.ja.jis 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_example.html 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_expires.html 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_headers.html 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_imap.html 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_include.html 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_info.html.en 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_info.html.html 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_info.html.ja.jis 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_isapi.html 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_log_agent.html 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_log_common.html 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_log_config.html.en 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_log_config.html.html 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_log_config.html.ja.jis 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_log_forensic.html.en 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_log_forensic.html.html 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_log_referer.html 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_mime.html.en 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_mime.html.html 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_mime.html.ja.jis 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_mime_magic.html 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_mmap_static.html 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_negotiation.html.en 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_negotiation.html.html 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_negotiation.html.ja.jis 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_proxy.html 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_rewrite.html.en 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_rewrite.html.html 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_rewrite.html.ja.jis 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_setenvif.html.en 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_setenvif.html.html 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_setenvif.html.ja.jis 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_so.html.en 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_so.html.html 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_so.html.ja.jis 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_speling.html.en 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_speling.html.html 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_speling.html.ja.jis 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_status.html 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_unique_id.html.en 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_unique_id.html.html 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_unique_id.html.ja.jis 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_userdir.html.en 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_define.html 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_userdir.html.html 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_userdir.html.ja.jis 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_usertrack.html 0555 root bin
-f none usr/apache/htdocs/manual/mod/mod_vhost_alias.html 0555 root bin
-f none usr/apache/htdocs/manual/mod/module-dict.html.en 0555 root bin
-f none usr/apache/htdocs/manual/mod/module-dict.html.html 0555 root bin
-f none usr/apache/htdocs/manual/mod/module-dict.html.ja.jis 0555 root bin
-f none usr/apache/htdocs/manual/mpeix.html 0555 root bin
-f none usr/apache/htdocs/manual/multilogs.html 0555 root bin
-f none usr/apache/htdocs/manual/netware.html 0555 root bin
-f none usr/apache/htdocs/manual/new_features_1_0.html 0555 root bin
-f none usr/apache/htdocs/manual/new_features_1_1.html 0555 root bin
-f none usr/apache/htdocs/manual/new_features_1_2.html 0555 root bin
-f none usr/apache/htdocs/manual/new_features_1_3.html.en 0555 root bin
-f none usr/apache/htdocs/manual/new_features_1_3.html.html 0555 root bin
-f none usr/apache/htdocs/manual/new_features_1_3.html.ja.jis 0555 root bin
-f none usr/apache/htdocs/manual/process-model.html.en 0555 root bin
-f none usr/apache/htdocs/manual/process-model.html.html 0555 root bin
-f none usr/apache/htdocs/manual/process-model.html.ja.jis 0555 root bin
-d none usr/apache/htdocs/manual/programs 0755 root bin
-f none usr/apache/htdocs/manual/programs/ab.html 0555 root bin
-f none usr/apache/htdocs/manual/programs/apachectl.html.en 0555 root bin
-f none usr/apache/htdocs/manual/programs/apachectl.html.html 0555 root bin
-f none usr/apache/htdocs/manual/programs/apachectl.html.ja.jis 0555 root bin
-f none usr/apache/htdocs/manual/programs/apxs.html 0555 root bin
-f none usr/apache/htdocs/manual/programs/dbmmanage.html 0555 root bin
-f none usr/apache/htdocs/manual/programs/footer.html 0555 root bin
-f none usr/apache/htdocs/manual/programs/header.html 0555 root bin
-f none usr/apache/htdocs/manual/programs/htdigest.html 0555 root bin
-f none usr/apache/htdocs/manual/programs/htpasswd.html.en 0555 root bin
-f none usr/apache/htdocs/manual/programs/htpasswd.html.html 0555 root bin
-f none usr/apache/htdocs/manual/programs/htpasswd.html.ja.jis 0555 root bin
-f none usr/apache/htdocs/manual/programs/httpd.html.en 0555 root bin
-f none usr/apache/htdocs/manual/programs/httpd.html.html 0555 root bin
-f none usr/apache/htdocs/manual/programs/httpd.html.ja.jis 0555 root bin
-f none usr/apache/htdocs/manual/programs/index.html.en 0555 root bin
-f none usr/apache/htdocs/manual/programs/index.html.html 0555 root bin
-f none usr/apache/htdocs/manual/programs/index.html.ja.jis 0555 root bin
-f none usr/apache/htdocs/manual/programs/logresolve.html 0555 root bin
-f none usr/apache/htdocs/manual/programs/other.html 0555 root bin
-f none usr/apache/htdocs/manual/programs/rotatelogs.html 0555 root bin
-f none usr/apache/htdocs/manual/programs/suexec.html.en 0555 root bin
-f none usr/apache/htdocs/manual/programs/suexec.html.html 0555 root bin
-f none usr/apache/htdocs/manual/programs/suexec.html.ja.jis 0555 root bin
-f none usr/apache/htdocs/manual/readme-tpf.html 0555 root bin
-f none usr/apache/htdocs/manual/sections.html.en 0555 root bin
-f none usr/apache/htdocs/manual/sections.html.html 0555 root bin
-f none usr/apache/htdocs/manual/sections.html.ja.jis 0555 root bin
-f none usr/apache/htdocs/manual/server-wide.html.en 0555 root bin
-f none usr/apache/htdocs/manual/server-wide.html.fr 0555 root bin
-f none usr/apache/htdocs/manual/server-wide.html.html 0555 root bin
-f none usr/apache/htdocs/manual/server-wide.html.ja.jis 0555 root bin
-f none usr/apache/htdocs/manual/sitemap.html 0555 root bin
-f none usr/apache/htdocs/manual/sourcereorg.html 0555 root bin
-f none usr/apache/htdocs/manual/stopping.html.en 0555 root bin
-f none usr/apache/htdocs/manual/stopping.html.fr 0555 root bin
-f none usr/apache/htdocs/manual/stopping.html.html 0555 root bin
-f none usr/apache/htdocs/manual/suexec.html.en 0555 root bin
-f none usr/apache/htdocs/manual/suexec.html.html 0555 root bin
-f none usr/apache/htdocs/manual/suexec.html.ja.jis 0555 root bin
-f none usr/apache/htdocs/manual/suexec_1_2.html 0555 root bin
-f none usr/apache/htdocs/manual/unixware.html 0555 root bin
-f none usr/apache/htdocs/manual/upgrading_to_1_3.html 0555 root bin
-f none usr/apache/htdocs/manual/urlmapping.html 0555 root bin
-d none usr/apache/htdocs/manual/vhosts 0755 root bin
-f none usr/apache/htdocs/manual/vhosts/details.html 0555 root bin
-f none usr/apache/htdocs/manual/vhosts/details_1_2.html 0555 root bin
-f none usr/apache/htdocs/manual/vhosts/examples.html 0555 root bin
-f none usr/apache/htdocs/manual/vhosts/fd-limits.html.en 0555 root bin
-f none usr/apache/htdocs/manual/vhosts/fd-limits.html.html 0555 root bin
-f none usr/apache/htdocs/manual/vhosts/fd-limits.html.ja.jis 0555 root bin
-f none usr/apache/htdocs/manual/vhosts/footer.html 0555 root bin
-f none usr/apache/htdocs/manual/vhosts/header.html 0555 root bin
-f none usr/apache/htdocs/manual/vhosts/host.html 0555 root bin
-f none usr/apache/htdocs/manual/vhosts/index.html.en 0555 root bin
-f none usr/apache/htdocs/manual/vhosts/index.html.html 0555 root bin
-f none usr/apache/htdocs/manual/vhosts/index.html.ja.jis 0555 root bin
-f none usr/apache/htdocs/manual/vhosts/ip-based.html 0555 root bin
-f none usr/apache/htdocs/manual/vhosts/mass.html 0555 root bin
-f none usr/apache/htdocs/manual/vhosts/name-based.html.en 0555 root bin
-f none usr/apache/htdocs/manual/vhosts/name-based.html.html 0555 root bin
-f none usr/apache/htdocs/manual/vhosts/name-based.html.ja.jis 0555 root bin
-f none usr/apache/htdocs/manual/vhosts/vhosts-in-depth.html 0555 root bin
-f none usr/apache/htdocs/manual/vhosts/virtual-host.html 0555 root bin
-f none usr/apache/htdocs/manual/win_compiling.html.en 0555 root bin
-f none usr/apache/htdocs/manual/win_compiling.html.html 0555 root bin
-f none usr/apache/htdocs/manual/win_compiling.html.ja.jis 0555 root bin
-f none usr/apache/htdocs/manual/win_service.html.en 0555 root bin
-f none usr/apache/htdocs/manual/win_service.html.html 0555 root bin
-f none usr/apache/htdocs/manual/win_service.html.ja.jis 0555 root bin
-f none usr/apache/htdocs/manual/windows.html.en 0555 root bin
-f none usr/apache/htdocs/manual/windows.html.html 0555 root bin
-f none usr/apache/htdocs/manual/windows.html.ja.jis 0555 root bin
-d none usr/apache/man 755 root bin
-d none usr/apache/man/man1 755 root bin
-d none usr/apache/man/man3 755 root bin
-d none usr/apache/man/man8 755 root bin
-f none usr/apache/man/man1/dbmmanage.1 444 root bin
-f none usr/apache/man/man1/htdigest.1 444 root bin
-f none usr/apache/man/man1/htpasswd.1 444 root bin
-f none usr/apache/man/man3/Apache.3 444 root bin
-f none usr/apache/man/man3/Apache::fork.3 444 root bin
-f none usr/apache/man/man3/Apache::testold.3 444 root bin
-f none usr/apache/man/man3/Apache::Constants.3 444 root bin
-f none usr/apache/man/man3/Apache::Debug.3 444 root bin
-f none usr/apache/man/man3/Apache::ExtUtils.3 444 root bin
-f none usr/apache/man/man3/Apache::FakeRequest.3 444 root bin
-f none usr/apache/man/man3/Apache::File.3 444 root bin
-f none usr/apache/man/man3/Apache::Include.3 444 root bin
-f none usr/apache/man/man3/Apache::Leak.3 444 root bin
-f none usr/apache/man/man3/Apache::Log.3 444 root bin
-f none usr/apache/man/man3/Apache::MyConfig.3 444 root bin
-f none usr/apache/man/man3/Apache::Options.3 444 root bin
-f none usr/apache/man/man3/Apache::PerlRun.3 444 root bin
-f none usr/apache/man/man3/Apache::PerlRunXS.3 444 root bin
-f none usr/apache/man/man3/Apache::PerlSections.3 444 root bin
-f none usr/apache/man/man3/Apache::RedirectLogFix.3 444 root bin
-f none usr/apache/man/man3/Apache::Registry.3 444 root bin
-f none usr/apache/man/man3/Apache::RegistryLoader.3 444 root bin
-f none usr/apache/man/man3/Apache::Resource.3 444 root bin
-f none usr/apache/man/man3/Apache::SIG.3 444 root bin
-f none usr/apache/man/man3/Apache::SizeLimit.3 444 root bin
-f none usr/apache/man/man3/Apache::StatINC.3 444 root bin
-f none usr/apache/man/man3/Apache::Status.3 444 root bin
-f none usr/apache/man/man3/Apache::Symbol.3 444 root bin
-f none usr/apache/man/man3/Apache::Symdump.3 444 root bin
-f none usr/apache/man/man3/Apache::Table.3 444 root bin
-f none usr/apache/man/man3/Apache::URI.3 444 root bin
-f none usr/apache/man/man3/Apache::Util.3 444 root bin
-f none usr/apache/man/man3/Apache::httpd_conf.3 444 root bin
-f none usr/apache/man/man3/Apache::src.3 444 root bin
-f none usr/apache/man/man3/Bundle::Apache.3 444 root bin
-f none usr/apache/man/man3/cgi_to_mod_perl.3 444 root bin
-f none usr/apache/man/man3/mod_perl.3 444 root bin
-f none usr/apache/man/man3/mod_perl_cvs.3 444 root bin
-f none usr/apache/man/man3/mod_perl_method_handlers.3 444 root bin
-f none usr/apache/man/man3/mod_perl_traps.3 444 root bin
-f none usr/apache/man/man3/mod_perl_tuning.3 444 root bin
-f none usr/apache/man/man8/ab.8 444 root bin
-f none usr/apache/man/man8/apachectl.8 444 root bin
-f none usr/apache/man/man8/apxs.8 444 root bin
-f none usr/apache/man/man8/httpd.8 444 root bin
-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
--- a/usr/src/pkgdefs/SUNWapchd/prototype_i386 Sat Oct 30 12:35:08 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-#
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright (c) 2001 by Sun Microsystems, Inc.
-# All rights reserved.
-#
-#ident "@(#)prototype_i386 1.3 06/03/18 SMI"
-#
-# This required package information file contains a list of package contents.
-# The 'pkgmk' command uses this file to identify the contents of a package
-# and their location on the development machine when building the package.
-# Can be created via a text editor or through use of the 'pkgproto' command.
-
-#!search <pathname pathname ...> # where to find pkg objects
-#!include <filename> # include another 'prototype' file
-#!default <mode> <owner> <group> # default used if not specified on entry
-#!<param>=<value> # puts parameter in pkg environment
-
-#
-# Include ISA independent files (prototype_com)
-#
-!include prototype_com
-#
-# List files which are i386 specific here
-#
-# source locations relative to the prototype file
-#
-# SUNWapchd
-#
--- a/usr/src/pkgdefs/SUNWapchd/prototype_sparc Sat Oct 30 12:35:08 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-#
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright (c) 2001 by Sun Microsystems, Inc.
-# All rights reserved.
-#
-#ident "@(#)prototype_sparc 1.3 06/03/18 SMI"
-#
-# This required package information file contains a list of package contents.
-# The 'pkgmk' command uses this file to identify the contents of a package
-# and their location on the development machine when building the package.
-# Can be created via a text editor or through use of the 'pkgproto' command.
-
-#!search <pathname pathname ...> # where to find pkg objects
-#!include <filename> # include another 'prototype' file
-#!default <mode> <owner> <group> # default used if not specified on entry
-#!<param>=<value> # puts parameter in pkg environment
-
-#
-# Include ISA independent files (prototype_com)
-#
-!include prototype_com
-#
-# List files which are i386 specific here
-#
-# source locations relative to the prototype file
-#
-# SUNWapchd
-#
--- a/usr/src/pkgdefs/SUNWapchr/Makefile Sat Oct 30 12:35:08 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-#
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#ident "@(#)Makefile 1.5 08/03/21 SMI"
-#
-include ../Makefile.com
-
-DATAFILES = i.preserve i.renamenew i.initd
-CHKINSTALLSRC=checkinstall.initd
-
-.KEEP_STATE:
-
-all: $(FILES)
-install: all pkg
-
-include ../Makefile.targ
--- a/usr/src/pkgdefs/SUNWapchr/copyright Sat Oct 30 12:35:08 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,535 +0,0 @@
-Note about the expat-lite library:
-
-Sun elects to have this sub-component available under and governed by the
-Mozilla Public License v.1.1 (see below for full license text).
-
-The following notice accompanied the original software distribution:
-=============================================================================
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
-
-APACHE HTTP SERVER SUBCOMPONENTS:
-
-The Apache HTTP Server includes a number of subcomponents with
-separate copyright notices and license terms. Your use of the source
-code for the these subcomponents is subject to the terms and
-conditions of the following licenses.
-
-
-For the MD5 Message-Digest library component:
-
- Copyright (C) 1995, Board of Trustees of the University of Illinois
-
- *********************************************************************
-
- (C) Copyright 1993,1994 by Carnegie Mellon University
- All Rights Reserved.
-
- Permission to use, copy, modify, distribute, and sell this software
- and its documentation for any purpose is hereby granted without
- fee, provided that the above copyright notice appear in all copies
- and that both that copyright notice and this permission notice
- appear in supporting documentation, and that the name of Carnegie
- Mellon University not be used in advertising or publicity
- pertaining to distribution of the software without specific,
- written prior permission. Carnegie Mellon University makes no
- representations about the suitability of this software for any
- purpose. It is provided "as is" without express or implied
- warranty.
-
- CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
- THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
- FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
- AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- SOFTWARE.
-
- *********************************************************************
-
- Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
-
- Permission to use, copy, modify, and distribute this material
- for any purpose and without fee is hereby granted, provided
- that the above copyright notice and this permission notice
- appear in all copies, and that the name of Bellcore not be
- used in advertising or publicity pertaining to this
- material without the specific, prior written permission
- of an authorized representative of Bellcore. BELLCORE
- MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY
- OF THIS MATERIAL FOR ANY PURPOSE. IT IS PROVIDED "AS IS",
- WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
-
- *********************************************************************
-
- Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
- rights reserved.
-
- License to copy and use this software is granted provided that it
- is identified as the "RSA Data Security, Inc. MD5 Message-Digest
- Algorithm" in all material mentioning or referencing this software
- or this function.
-
- License is also granted to make and use derivative works provided
- that such works are identified as "derived from the RSA Data
- Security, Inc. MD5 Message-Digest Algorithm" in all material
- mentioning or referencing the derived work.
-
- RSA Data Security, Inc. makes no representations concerning either
- the merchantability of this software or the suitability of this
- software for any particular purpose. It is provided "as is"
- without express or implied warranty of any kind.
-
- These notices must be retained in any copies of any part of this
- documentation and/or software.
-
- ----------------------------------------------------------------------------
- "THE BEER-WARE LICENSE" (Revision 42):
- <[email protected]> wrote this file. As long as you retain this notice you
- can do whatever you want with this stuff. If we meet some day, and you think
- this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp
- ----------------------------------------------------------------------------
-
-
-For the expat-lite library component:
-
- Copyright (c) 1998, 1999 James Clark. Expat is subject to the Mozilla Public
- License Version 1.1. Alternatively you may use expat under the GNU General
- Public License instead.
-
-
-For the regex library component:
-
- Copyright 1992, 1993, 1994 Henry Spencer. All rights reserved.
- This software is not subject to any license of the American Telephone
- and Telegraph Company or of the Regents of the University of California.
-
- Permission is granted to anyone to use this software for any purpose on
- any computer system, and to alter it and redistribute it, subject
- to the following restrictions:
-
- 1. The author is not responsible for the consequences of use of this
- software, no matter how awful, even if they arise from flaws in it.
-
- 2. The origin of this software must not be misrepresented, either by
- explicit claim or by omission. Since few users ever read sources,
- credits must appear in the documentation.
-
- 3. Altered versions must be plainly marked as such, and must not be
- misrepresented as being the original software. Since few users
- ever read sources, credits must appear in the documentation.
-
- 4. This notice may not be removed or altered.
-
-
-For the expat xml parser library component:
-
- Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd
- and Clark Cooper
-
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the
- "Software"), to deal in the Software without restriction, including
- without limitation the rights to use, copy, modify, merge, publish,
- distribute, sublicense, and/or sell copies of the Software, and to
- permit persons to whom the Software is furnished to do so, subject to
- the following conditions:
-
- The above copyright notice and this permission notice shall be included
- in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-For the mod_mime_magic component:
-
- Copyright (c) 1996-1997 Cisco Systems, Inc.
-
- This software was submitted by Cisco Systems to the Apache Group in July
- 1997. Future revisions and derivatives of this source code must
- acknowledge Cisco Systems as the original contributor of this module.
- All other licensing and usage conditions are those of the Apache Group.
-
- Some of this code is derived from the free version of the file command
- originally posted to comp.sources.unix. Copyright info for that program
- is included below as required.
- -------------------------------------------------------------------------
- Copyright (c) Ian F. Darwin, 1987. Written by Ian F. Darwin.
-
- This software is not subject to any license of the American Telephone and
- Telegraph Company or of the Regents of the University of California.
-
- Permission is granted to anyone to use this software for any purpose on any
- computer system, and to alter it and redistribute it freely, subject to
- the following restrictions:
-
- 1. The author is not responsible for the consequences of use of this
- software, no matter how awful, even if they arise from flaws in it.
-
- 2. The origin of this software must not be misrepresented, either by
- explicit claim or by omission. Since few users ever read sources, credits
- must appear in the documentation.
-
- 3. Altered versions must be plainly marked as such, and must not be
- misrepresented as being the original software. Since few users ever read
- sources, credits must appear in the documentation.
-
- 4. This notice may not be removed or altered.
- -------------------------------------------------------------------------
-
-
-For the mod_imap component:
-
- "macmartinized" polygon code copyright 1992 by Eric Haines, [email protected]
-
-
-For the zb test and ab support components:
-
- This program is Copyright (C) Zeus Technology Limited 1996.
-
- This program may be used and copied freely providing this copyright notice
- is not removed.
-
- This software is provided "as is" and any express or implied waranties,
- including but not limited to, the implied warranties of merchantability and
- fitness for a particular purpose are disclaimed. In no event shall
- Zeus Technology Ltd. be liable for any direct, indirect, incidental, special,
- exemplary, or consequential damaged (including, but not limited to,
- procurement of substitute good or services; loss of use, data, or profits;
- or business interruption) however caused and on 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.
-
-
-
-For the mod_perl and mod_auth_gss components:
-
-/* ====================================================================
-
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 1996-2000 The Apache Software Foundation. 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. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
- * "This product includes software developed by the
- * Apache Software Foundation (http://www.apache.org/)."
- * Alternately, this acknowledgment may appear in the software itself,
- * if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Apache" and "Apache Software Foundation" must
- * not be used to endorse or promote products derived from this
- * software without prior written permission. For written
- * permission, please contact [email protected].
- *
- * 5. Products derived from this software may not be called "Apache",
- * nor may "Apache" appear in their name, without prior written
- * permission of the Apache Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED ``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 APACHE SOFTWARE FOUNDATION 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.
- * ====================================================================
- */
-
-
- _ _
- _ __ ___ ___ __| | ___ ___| | mod_ssl
- | '_ ` _ \ / _ \ / _` | / __/ __| | Apache Interface to OpenSSL
- | | | | | | (_) | (_| | \__ \__ \ | www.modssl.org
- |_| |_| |_|\___/ \__,_|___|___/___/_| ftp.modssl.org
- |_____|
- _____________________________________________________________________________
-
- ``Ian Fleming was a UNIX fan!
- How do I know? Well, James Bond
- had the (license to kill) number 007,
- i.e. he could execute anyone.''
- -- Unknown
- LICENSE
-
- The mod_ssl package falls under the Open-Source Software label
- because it's distributed under a BSD-style license. The
- detailed license information follows.
-
- ====================================================================
- Copyright (c) 1998-2007 Ralf S. Engelschall. 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
- Ralf S. Engelschall <[email protected]> for use in the
- mod_ssl project (http://www.modssl.org/)."
-
- 4. The names "mod_ssl" must not be used to endorse or promote
- products derived from this software without prior written
- permission. For written permission, please contact
- [email protected].
-
- 5. Products derived from this software may not be called "mod_ssl"
- nor may "mod_ssl" appear in their names without prior
- written permission of Ralf S. Engelschall.
-
- 6. Redistributions of any form whatsoever must retain the following
- acknowledgment:
- "This product includes software developed by
- Ralf S. Engelschall <[email protected]> for use in the
- mod_ssl project (http://www.modssl.org/)."
-
- THIS SOFTWARE IS PROVIDED BY RALF S. ENGELSCHALL ``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 RALF S. ENGELSCHALL OR
- HIS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- OF THE POSSIBILITY OF SUCH DAMAGE.
- ====================================================================
-
--- a/usr/src/pkgdefs/SUNWapchr/depend Sat Oct 30 12:35:08 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# ident "@(#)depend 1.1 08/03/21 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 SUNWperl584core SUNWperl584core Perl 5.8.4 (core)
--- a/usr/src/pkgdefs/SUNWapchr/pkginfo.tmpl Sat Oct 30 12:35:08 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-#
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-#ident "@(#)pkginfo.tmpl 1.10 10/07/22 SMI"
-#
-# This required package information file describes characteristics of the
-# package, such as package abbreviation, full package name, package version,
-# and package architecture.
-#
-PKG="SUNWapchr"
-NAME="Apache Web Server (root)"
-ARCH="ISA"
-VERSION="SFWVERS,REV=0.0.0"
-SUNW_PRODNAME="SunOS"
-SUNW_PRODVERS="RELEASE/VERSION"
-SUNW_PKGTYPE="root"
-MAXINST="1000"
-CATEGORY="system"
-DESC="The Apache HTTP server program (1.3.x) (root components)"
-VENDOR="COMPANY"
-HOTLINE="Please contact your local service provider"
-EMAIL=""
-CLASSES="none renamenew preserve initd"
-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/SUNWapchr/prototype_com Sat Oct 30 12:35:08 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,361 +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 2010 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#ident "@(#)prototype_com 1.12 10/01/14 SMI"
-#
-# SUNWapchr
-#
-# packaging files
-i pkginfo
-i i.renamenew
-i i.preserve
-i i.initd
-i depend
-i checkinstall
-i copyright
-#
-d none etc 755 root sys
-d none var 755 root sys
-d none var/run 755 root sys
-d none var/apache 755 root bin
-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
-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
-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
-f none var/apache/htdocs/apache_pb.gif 644 root bin
-f none var/apache/htdocs/index.html.ca 644 root bin
-f none var/apache/htdocs/index.html.cz 644 root bin
-f none var/apache/htdocs/index.html.de 644 root bin
-f none var/apache/htdocs/index.html.dk 644 root bin
-f none var/apache/htdocs/index.html.ee 644 root bin
-f none var/apache/htdocs/index.html.el 644 root bin
-f none var/apache/htdocs/index.html.en 644 root bin
-f none var/apache/htdocs/index.html.es 644 root bin
-f none var/apache/htdocs/index.html.fr 644 root bin
-f none var/apache/htdocs/index.html.he.iso8859-8 644 root bin
-f none var/apache/htdocs/index.html.hu 644 root bin
-f none var/apache/htdocs/index.html.it 644 root bin
-f none var/apache/htdocs/index.html.ja.jis 644 root bin
-f none var/apache/htdocs/index.html.kr.iso-kr 644 root bin
-f none var/apache/htdocs/index.html.lb.utf8 644 root bin
-f none var/apache/htdocs/index.html.nl 644 root bin
-f none var/apache/htdocs/index.html.nn 644 root bin
-f none var/apache/htdocs/index.html.no 644 root bin
-f none var/apache/htdocs/index.html.po.iso-pl 644 root bin
-f none var/apache/htdocs/index.html.pt 644 root bin
-f none var/apache/htdocs/index.html.pt-br 644 root bin
-f none var/apache/htdocs/index.html.ru.cp-1251 644 root bin
-f none var/apache/htdocs/index.html.ru.cp866 644 root bin
-f none var/apache/htdocs/index.html.ru.iso-ru 644 root bin
-f none var/apache/htdocs/index.html.ru.koi8-r 644 root bin
-f none var/apache/htdocs/index.html.ru.ucs2 644 root bin
-f none var/apache/htdocs/index.html.ru.ucs4 644 root bin
-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
-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
-f none var/apache/icons/a.gif 0644 root bin
-f none var/apache/icons/a.png 0644 root bin
-f none var/apache/icons/alert.black.gif 0644 root bin
-f none var/apache/icons/alert.black.png 0644 root bin
-f none var/apache/icons/alert.red.gif 0644 root bin
-f none var/apache/icons/alert.red.png 0644 root bin
-f none var/apache/icons/apache_pb.gif 0644 root bin
-f none var/apache/icons/apache_pb.png 0644 root bin
-f none var/apache/icons/back.gif 0644 root bin
-f none var/apache/icons/back.png 0644 root bin
-f none var/apache/icons/ball.gray.gif 0644 root bin
-f none var/apache/icons/ball.gray.png 0644 root bin
-f none var/apache/icons/ball.red.gif 0644 root bin
-f none var/apache/icons/ball.red.png 0644 root bin
-f none var/apache/icons/binary.gif 0644 root bin
-f none var/apache/icons/binary.png 0644 root bin
-f none var/apache/icons/binhex.gif 0644 root bin
-f none var/apache/icons/binhex.png 0644 root bin
-f none var/apache/icons/blank.gif 0644 root bin
-f none var/apache/icons/blank.png 0644 root bin
-f none var/apache/icons/bomb.gif 0644 root bin
-f none var/apache/icons/bomb.png 0644 root bin
-f none var/apache/icons/box1.gif 0644 root bin
-f none var/apache/icons/box1.png 0644 root bin
-f none var/apache/icons/box2.gif 0644 root bin
-f none var/apache/icons/box2.png 0644 root bin
-f none var/apache/icons/broken.gif 0644 root bin
-f none var/apache/icons/broken.png 0644 root bin
-f none var/apache/icons/burst.gif 0644 root bin
-f none var/apache/icons/burst.png 0644 root bin
-f none var/apache/icons/c.gif 0644 root bin
-f none var/apache/icons/c.png 0644 root bin
-f none var/apache/icons/comp.blue.gif 0644 root bin
-f none var/apache/icons/comp.blue.png 0644 root bin
-f none var/apache/icons/comp.gray.gif 0644 root bin
-f none var/apache/icons/comp.gray.png 0644 root bin
-f none var/apache/icons/compressed.gif 0644 root bin
-f none var/apache/icons/compressed.png 0644 root bin
-f none var/apache/icons/continued.gif 0644 root bin
-f none var/apache/icons/continued.png 0644 root bin
-f none var/apache/icons/dir.gif 0644 root bin
-f none var/apache/icons/dir.png 0644 root bin
-f none var/apache/icons/diskimg.gif 0644 root bin
-f none var/apache/icons/diskimg.png 0644 root bin
-f none var/apache/icons/down.gif 0644 root bin
-f none var/apache/icons/down.png 0644 root bin
-f none var/apache/icons/dvi.gif 0644 root bin
-f none var/apache/icons/dvi.png 0644 root bin
-f none var/apache/icons/f.gif 0644 root bin
-f none var/apache/icons/f.png 0644 root bin
-f none var/apache/icons/folder.gif 0644 root bin
-f none var/apache/icons/folder.open.gif 0644 root bin
-f none var/apache/icons/folder.open.png 0644 root bin
-f none var/apache/icons/folder.png 0644 root bin
-f none var/apache/icons/folder.sec.gif 0644 root bin
-f none var/apache/icons/folder.sec.png 0644 root bin
-f none var/apache/icons/forward.gif 0644 root bin
-f none var/apache/icons/forward.png 0644 root bin
-f none var/apache/icons/generic.gif 0644 root bin
-f none var/apache/icons/generic.png 0644 root bin
-f none var/apache/icons/generic.red.gif 0644 root bin
-f none var/apache/icons/generic.red.png 0644 root bin
-f none var/apache/icons/generic.sec.gif 0644 root bin
-f none var/apache/icons/generic.sec.png 0644 root bin
-f none var/apache/icons/hand.right.gif 0644 root bin
-f none var/apache/icons/hand.right.png 0644 root bin
-f none var/apache/icons/hand.up.gif 0644 root bin
-f none var/apache/icons/hand.up.png 0644 root bin
-f none var/apache/icons/icon.sheet.gif 0644 root bin
-f none var/apache/icons/icon.sheet.png 0644 root bin
-f none var/apache/icons/image1.gif 0644 root bin
-f none var/apache/icons/image1.png 0644 root bin
-f none var/apache/icons/image2.gif 0644 root bin
-f none var/apache/icons/image2.png 0644 root bin
-f none var/apache/icons/image3.gif 0644 root bin
-f none var/apache/icons/image3.png 0644 root bin
-f none var/apache/icons/index.gif 0644 root bin
-f none var/apache/icons/index.png 0644 root bin
-f none var/apache/icons/layout.gif 0644 root bin
-f none var/apache/icons/layout.png 0644 root bin
-f none var/apache/icons/left.gif 0644 root bin
-f none var/apache/icons/left.png 0644 root bin
-f none var/apache/icons/link.gif 0644 root bin
-f none var/apache/icons/link.png 0644 root bin
-f none var/apache/icons/movie.gif 0644 root bin
-f none var/apache/icons/movie.png 0644 root bin
-f none var/apache/icons/p.gif 0644 root bin
-f none var/apache/icons/p.png 0644 root bin
-f none var/apache/icons/patch.gif 0644 root bin
-f none var/apache/icons/patch.png 0644 root bin
-f none var/apache/icons/pdf.gif 0644 root bin
-f none var/apache/icons/pdf.png 0644 root bin
-f none var/apache/icons/pie0.gif 0644 root bin
-f none var/apache/icons/pie0.png 0644 root bin
-f none var/apache/icons/pie1.gif 0644 root bin
-f none var/apache/icons/pie1.png 0644 root bin
-f none var/apache/icons/pie2.gif 0644 root bin
-f none var/apache/icons/pie2.png 0644 root bin
-f none var/apache/icons/pie3.gif 0644 root bin
-f none var/apache/icons/pie3.png 0644 root bin
-f none var/apache/icons/pie4.gif 0644 root bin
-f none var/apache/icons/pie4.png 0644 root bin
-f none var/apache/icons/pie5.gif 0644 root bin
-f none var/apache/icons/pie5.png 0644 root bin
-f none var/apache/icons/pie6.gif 0644 root bin
-f none var/apache/icons/pie6.png 0644 root bin
-f none var/apache/icons/pie7.gif 0644 root bin
-f none var/apache/icons/pie7.png 0644 root bin
-f none var/apache/icons/pie8.gif 0644 root bin
-f none var/apache/icons/pie8.png 0644 root bin
-f none var/apache/icons/portal.gif 0644 root bin
-f none var/apache/icons/portal.png 0644 root bin
-f none var/apache/icons/ps.gif 0644 root bin
-f none var/apache/icons/ps.png 0644 root bin
-f none var/apache/icons/quill.gif 0644 root bin
-f none var/apache/icons/quill.png 0644 root bin
-f none var/apache/icons/right.gif 0644 root bin
-f none var/apache/icons/right.png 0644 root bin
-f none var/apache/icons/screw1.gif 0644 root bin
-f none var/apache/icons/screw1.png 0644 root bin
-f none var/apache/icons/screw2.gif 0644 root bin
-f none var/apache/icons/screw2.png 0644 root bin
-f none var/apache/icons/script.gif 0644 root bin
-f none var/apache/icons/script.png 0644 root bin
-d none var/apache/icons/small 0755 root bin
-f none var/apache/icons/small/back.gif 0644 root bin
-f none var/apache/icons/small/back.png 0644 root bin
-f none var/apache/icons/small/binary.gif 0644 root bin
-f none var/apache/icons/small/binary.png 0644 root bin
-f none var/apache/icons/small/binhex.gif 0644 root bin
-f none var/apache/icons/small/binhex.png 0644 root bin
-f none var/apache/icons/small/blank.gif 0644 root bin
-f none var/apache/icons/small/blank.png 0644 root bin
-f none var/apache/icons/small/broken.gif 0644 root bin
-f none var/apache/icons/small/broken.png 0644 root bin
-f none var/apache/icons/small/burst.gif 0644 root bin
-f none var/apache/icons/small/burst.png 0644 root bin
-f none var/apache/icons/small/comp1.gif 0644 root bin
-f none var/apache/icons/small/comp1.png 0644 root bin
-f none var/apache/icons/small/comp2.gif 0644 root bin
-f none var/apache/icons/small/comp2.png 0644 root bin
-f none var/apache/icons/small/compressed.gif 0644 root bin
-f none var/apache/icons/small/compressed.png 0644 root bin
-f none var/apache/icons/small/continued.gif 0644 root bin
-f none var/apache/icons/small/continued.png 0644 root bin
-f none var/apache/icons/small/dir.gif 0644 root bin
-f none var/apache/icons/small/dir.png 0644 root bin
-f none var/apache/icons/small/dir2.gif 0644 root bin
-f none var/apache/icons/small/dir2.png 0644 root bin
-f none var/apache/icons/small/doc.gif 0644 root bin
-f none var/apache/icons/small/doc.png 0644 root bin
-f none var/apache/icons/small/forward.gif 0644 root bin
-f none var/apache/icons/small/forward.png 0644 root bin
-f none var/apache/icons/small/generic.gif 0644 root bin
-f none var/apache/icons/small/generic.png 0644 root bin
-f none var/apache/icons/small/generic2.gif 0644 root bin
-f none var/apache/icons/small/generic2.png 0644 root bin
-f none var/apache/icons/small/generic3.gif 0644 root bin
-f none var/apache/icons/small/generic3.png 0644 root bin
-f none var/apache/icons/small/image.gif 0644 root bin
-f none var/apache/icons/small/image.png 0644 root bin
-f none var/apache/icons/small/image2.gif 0644 root bin
-f none var/apache/icons/small/image2.png 0644 root bin
-f none var/apache/icons/small/index.gif 0644 root bin
-f none var/apache/icons/small/index.png 0644 root bin
-f none var/apache/icons/small/key.gif 0644 root bin
-f none var/apache/icons/small/key.png 0644 root bin
-f none var/apache/icons/small/movie.gif 0644 root bin
-f none var/apache/icons/small/movie.png 0644 root bin
-f none var/apache/icons/small/patch.gif 0644 root bin
-f none var/apache/icons/small/patch.png 0644 root bin
-f none var/apache/icons/small/ps.gif 0644 root bin
-f none var/apache/icons/small/ps.png 0644 root bin
-f none var/apache/icons/small/rainbow.gif 0644 root bin
-f none var/apache/icons/small/rainbow.png 0644 root bin
-f none var/apache/icons/small/sound.gif 0644 root bin
-f none var/apache/icons/small/sound.png 0644 root bin
-f none var/apache/icons/small/sound2.gif 0644 root bin
-f none var/apache/icons/small/sound2.png 0644 root bin
-f none var/apache/icons/small/tar.gif 0644 root bin
-f none var/apache/icons/small/tar.png 0644 root bin
-f none var/apache/icons/small/text.gif 0644 root bin
-f none var/apache/icons/small/text.png 0644 root bin
-f none var/apache/icons/small/transfer.gif 0644 root bin
-f none var/apache/icons/small/transfer.png 0644 root bin
-f none var/apache/icons/small/unknown.gif 0644 root bin
-f none var/apache/icons/small/unknown.png 0644 root bin
-f none var/apache/icons/small/uu.gif 0644 root bin
-f none var/apache/icons/small/uu.png 0644 root bin
-f none var/apache/icons/sound1.gif 0644 root bin
-f none var/apache/icons/sound1.png 0644 root bin
-f none var/apache/icons/sound2.gif 0644 root bin
-f none var/apache/icons/sound2.png 0644 root bin
-f none var/apache/icons/sphere1.gif 0644 root bin
-f none var/apache/icons/sphere1.png 0644 root bin
-f none var/apache/icons/sphere2.gif 0644 root bin
-f none var/apache/icons/sphere2.png 0644 root bin
-f none var/apache/icons/tar.gif 0644 root bin
-f none var/apache/icons/tar.png 0644 root bin
-f none var/apache/icons/tex.gif 0644 root bin
-f none var/apache/icons/tex.png 0644 root bin
-f none var/apache/icons/text.gif 0644 root bin
-f none var/apache/icons/text.png 0644 root bin
-f none var/apache/icons/transfer.gif 0644 root bin
-f none var/apache/icons/transfer.png 0644 root bin
-f none var/apache/icons/unknown.gif 0644 root bin
-f none var/apache/icons/unknown.png 0644 root bin
-f none var/apache/icons/up.gif 0644 root bin
-f none var/apache/icons/up.png 0644 root bin
-f none var/apache/icons/uu.gif 0644 root bin
-f none var/apache/icons/uu.png 0644 root bin
-f none var/apache/icons/uuencoded.gif 0644 root bin
-f none var/apache/icons/uuencoded.png 0644 root bin
-f none var/apache/icons/world1.gif 0644 root bin
-f none var/apache/icons/world1.png 0644 root bin
-f none var/apache/icons/world2.gif 0644 root bin
-f none var/apache/icons/world2.png 0644 root bin
-d none etc/init.d 755 root sys
-d none etc/apache 755 root bin
-d none etc/rc3.d 755 root sys
-d none etc/rc2.d 755 root sys
-d none etc/rc1.d 755 root sys
-d none etc/rc0.d 755 root sys
-d none etc/rcS.d 755 root sys
-e initd etc/init.d/apache 744 root sys
-l initd etc/rc3.d/S50apache=../../etc/init.d/apache
-l initd etc/rc2.d/K16apache=../../etc/init.d/apache
-l initd etc/rc1.d/K16apache=../../etc/init.d/apache
-l initd etc/rc0.d/K16apache=../../etc/init.d/apache
-l initd etc/rcS.d/K16apache=../../etc/init.d/apache
-f none etc/apache/httpd.conf-example 644 root bin
-f none etc/apache/README.Solaris 644 root bin
-e renamenew etc/apache/access.conf 644 root bin
-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/jk.conf 644 root bin
-e renamenew etc/apache/workers.properties 644 root bin
-d none etc/apache/ssl.crl 755 root bin
-f none etc/apache/ssl.crl/README.CRL 644 root bin
-f none etc/apache/ssl.crl/Makefile 644 root bin
-d none etc/apache/ssl.csr 755 root bin
-f none etc/apache/ssl.csr/README.CSR 644 root bin
-d none etc/apache/ssl.crt 755 root bin
-f none etc/apache/ssl.crt/README.CRT 644 root bin
-f none etc/apache/ssl.crt/Makefile 644 root bin
-d none etc/apache/ssl.key 700 root bin
-f none etc/apache/ssl.key/README.KEY 644 root bin
-d none etc/apache/ssl.prm 755 root bin
-f none etc/apache/ssl.prm/README.PRM 644 root bin
-#
-# all entries below are for mod_ssl testing only. These
-# files should never be shipped in a release package. The
-# lines are here, and commented, so that it is reasonably
-# simple to generate internal test packages when updating
-# apache. To use these, you must uncomment them here, and
-# comment the appropriate section of usr/src/cmd/apache/install-apache
-#
-# f none etc/apache/ssl.csr/server.csr 644 root bin
-# f none etc/apache/ssl.crt/server.crt 644 root bin
-# s none etc/apache/ssl.crt/82ab5372.0=server.crt
-# f none etc/apache/ssl.crt/ca-bundle.crt 644 root bin
-# f none etc/apache/ssl.crt/snakeoil-dsa.crt 644 root bin
-# s none etc/apache/ssl.crt/5d8360e1.0=snakeoil-dsa.crt
-# f none etc/apache/ssl.crt/snakeoil-rsa.crt 644 root bin
-# s none etc/apache/ssl.crt/82ab5372.1=snakeoil-rsa.crt
-# f none etc/apache/ssl.crt/snakeoil-ca-dsa.crt 644 root bin
-# s none etc/apache/ssl.crt/0cf14d7d.0=snakeoil-ca-dsa.crt
-# f none etc/apache/ssl.crt/snakeoil-ca-rsa.crt 644 root bin
-# s none etc/apache/ssl.crt/e52d41d0.0=snakeoil-ca-rsa.crt
-# f none etc/apache/ssl.key/server.key 644 root bin
-# f none etc/apache/ssl.key/snakeoil-dsa.key 644 root bin
-# f none etc/apache/ssl.key/snakeoil-ca-dsa.key 644 root bin
-# f none etc/apache/ssl.key/snakeoil-rsa.key 644 root bin
-# f none etc/apache/ssl.key/snakeoil-ca-rsa.key 644 root bin
-# f none etc/apache/ssl.prm/snakeoil-dsa.prm 644 root bin
-# f none etc/apache/ssl.prm/snakeoil-ca-dsa.prm 644 root bin
--- a/usr/src/pkgdefs/SUNWapchr/prototype_i386 Sat Oct 30 12:35:08 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-#
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright (c) 2001 by Sun Microsystems, Inc.
-# All rights reserved.
-#
-#ident "@(#)prototype_i386 1.3 06/03/18 SMI"
-#
-# This required package information file contains a list of package contents.
-# The 'pkgmk' command uses this file to identify the contents of a package
-# and their location on the development machine when building the package.
-# Can be created via a text editor or through use of the 'pkgproto' command.
-
-#!search <pathname pathname ...> # where to find pkg objects
-#!include <filename> # include another 'prototype' file
-#!default <mode> <owner> <group> # default used if not specified on entry
-#!<param>=<value> # puts parameter in pkg environment
-
-#
-# Include ISA independent files (prototype_com)
-#
-!include prototype_com
-#
-# List files which are i386 specific here
-#
-# source locations relative to the prototype file
-#
-# SUNWapchr
-#
--- a/usr/src/pkgdefs/SUNWapchr/prototype_sparc Sat Oct 30 12:35:08 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-#
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright (c) 2001 by Sun Microsystems, Inc.
-# All rights reserved.
-#
-#ident "@(#)prototype_sparc 1.3 06/03/18 SMI"
-#
-# This required package information file contains a list of package contents.
-# The 'pkgmk' command uses this file to identify the contents of a package
-# and their location on the development machine when building the package.
-# Can be created via a text editor or through use of the 'pkgproto' command.
-
-#!search <pathname pathname ...> # where to find pkg objects
-#!include <filename> # include another 'prototype' file
-#!default <mode> <owner> <group> # default used if not specified on entry
-#!<param>=<value> # puts parameter in pkg environment
-
-#
-# Include ISA independent files (prototype_com)
-#
-!include prototype_com
-#
-# List files which are SPARC specific here
-#
-# source locations relative to the prototype file
-#
-# SUNWapchr
-#
--- a/usr/src/pkgdefs/SUNWapchu/Makefile Sat Oct 30 12:35:08 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-#
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#ident "@(#)Makefile 1.3 06/03/18 SMI"
-#
-# Copyright (c) 2001 by Sun Microsystems, Inc.
-# All rights reserved.
-#
-include ../Makefile.com
-
-DATAFILES=
-
-.KEEP_STATE:
-
-all: $(FILES)
-install: all pkg
-
-include ../Makefile.targ
--- a/usr/src/pkgdefs/SUNWapchu/copyright Sat Oct 30 12:35:08 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,535 +0,0 @@
-Note about the expat-lite library:
-
-Sun elects to have this sub-component available under and governed by the
-Mozilla Public License v.1.1 (see below for full license text).
-
-The following notice accompanied the original software distribution:
-=============================================================================
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
-
-APACHE HTTP SERVER SUBCOMPONENTS:
-
-The Apache HTTP Server includes a number of subcomponents with
-separate copyright notices and license terms. Your use of the source
-code for the these subcomponents is subject to the terms and
-conditions of the following licenses.
-
-
-For the MD5 Message-Digest library component:
-
- Copyright (C) 1995, Board of Trustees of the University of Illinois
-
- *********************************************************************
-
- (C) Copyright 1993,1994 by Carnegie Mellon University
- All Rights Reserved.
-
- Permission to use, copy, modify, distribute, and sell this software
- and its documentation for any purpose is hereby granted without
- fee, provided that the above copyright notice appear in all copies
- and that both that copyright notice and this permission notice
- appear in supporting documentation, and that the name of Carnegie
- Mellon University not be used in advertising or publicity
- pertaining to distribution of the software without specific,
- written prior permission. Carnegie Mellon University makes no
- representations about the suitability of this software for any
- purpose. It is provided "as is" without express or implied
- warranty.
-
- CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
- THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
- FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
- AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- SOFTWARE.
-
- *********************************************************************
-
- Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
-
- Permission to use, copy, modify, and distribute this material
- for any purpose and without fee is hereby granted, provided
- that the above copyright notice and this permission notice
- appear in all copies, and that the name of Bellcore not be
- used in advertising or publicity pertaining to this
- material without the specific, prior written permission
- of an authorized representative of Bellcore. BELLCORE
- MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY
- OF THIS MATERIAL FOR ANY PURPOSE. IT IS PROVIDED "AS IS",
- WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
-
- *********************************************************************
-
- Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
- rights reserved.
-
- License to copy and use this software is granted provided that it
- is identified as the "RSA Data Security, Inc. MD5 Message-Digest
- Algorithm" in all material mentioning or referencing this software
- or this function.
-
- License is also granted to make and use derivative works provided
- that such works are identified as "derived from the RSA Data
- Security, Inc. MD5 Message-Digest Algorithm" in all material
- mentioning or referencing the derived work.
-
- RSA Data Security, Inc. makes no representations concerning either
- the merchantability of this software or the suitability of this
- software for any particular purpose. It is provided "as is"
- without express or implied warranty of any kind.
-
- These notices must be retained in any copies of any part of this
- documentation and/or software.
-
- ----------------------------------------------------------------------------
- "THE BEER-WARE LICENSE" (Revision 42):
- <[email protected]> wrote this file. As long as you retain this notice you
- can do whatever you want with this stuff. If we meet some day, and you think
- this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp
- ----------------------------------------------------------------------------
-
-
-For the expat-lite library component:
-
- Copyright (c) 1998, 1999 James Clark. Expat is subject to the Mozilla Public
- License Version 1.1. Alternatively you may use expat under the GNU General
- Public License instead.
-
-
-For the regex library component:
-
- Copyright 1992, 1993, 1994 Henry Spencer. All rights reserved.
- This software is not subject to any license of the American Telephone
- and Telegraph Company or of the Regents of the University of California.
-
- Permission is granted to anyone to use this software for any purpose on
- any computer system, and to alter it and redistribute it, subject
- to the following restrictions:
-
- 1. The author is not responsible for the consequences of use of this
- software, no matter how awful, even if they arise from flaws in it.
-
- 2. The origin of this software must not be misrepresented, either by
- explicit claim or by omission. Since few users ever read sources,
- credits must appear in the documentation.
-
- 3. Altered versions must be plainly marked as such, and must not be
- misrepresented as being the original software. Since few users
- ever read sources, credits must appear in the documentation.
-
- 4. This notice may not be removed or altered.
-
-
-For the expat xml parser library component:
-
- Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd
- and Clark Cooper
-
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the
- "Software"), to deal in the Software without restriction, including
- without limitation the rights to use, copy, modify, merge, publish,
- distribute, sublicense, and/or sell copies of the Software, and to
- permit persons to whom the Software is furnished to do so, subject to
- the following conditions:
-
- The above copyright notice and this permission notice shall be included
- in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-For the mod_mime_magic component:
-
- Copyright (c) 1996-1997 Cisco Systems, Inc.
-
- This software was submitted by Cisco Systems to the Apache Group in July
- 1997. Future revisions and derivatives of this source code must
- acknowledge Cisco Systems as the original contributor of this module.
- All other licensing and usage conditions are those of the Apache Group.
-
- Some of this code is derived from the free version of the file command
- originally posted to comp.sources.unix. Copyright info for that program
- is included below as required.
- -------------------------------------------------------------------------
- Copyright (c) Ian F. Darwin, 1987. Written by Ian F. Darwin.
-
- This software is not subject to any license of the American Telephone and
- Telegraph Company or of the Regents of the University of California.
-
- Permission is granted to anyone to use this software for any purpose on any
- computer system, and to alter it and redistribute it freely, subject to
- the following restrictions:
-
- 1. The author is not responsible for the consequences of use of this
- software, no matter how awful, even if they arise from flaws in it.
-
- 2. The origin of this software must not be misrepresented, either by
- explicit claim or by omission. Since few users ever read sources, credits
- must appear in the documentation.
-
- 3. Altered versions must be plainly marked as such, and must not be
- misrepresented as being the original software. Since few users ever read
- sources, credits must appear in the documentation.
-
- 4. This notice may not be removed or altered.
- -------------------------------------------------------------------------
-
-
-For the mod_imap component:
-
- "macmartinized" polygon code copyright 1992 by Eric Haines, [email protected]
-
-
-For the zb test and ab support components:
-
- This program is Copyright (C) Zeus Technology Limited 1996.
-
- This program may be used and copied freely providing this copyright notice
- is not removed.
-
- This software is provided "as is" and any express or implied waranties,
- including but not limited to, the implied warranties of merchantability and
- fitness for a particular purpose are disclaimed. In no event shall
- Zeus Technology Ltd. be liable for any direct, indirect, incidental, special,
- exemplary, or consequential damaged (including, but not limited to,
- procurement of substitute good or services; loss of use, data, or profits;
- or business interruption) however caused and on 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.
-
-
-
-For the mod_perl and mod_auth_gss components:
-
-/* ====================================================================
-
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 1996-2000 The Apache Software Foundation. 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. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
- * "This product includes software developed by the
- * Apache Software Foundation (http://www.apache.org/)."
- * Alternately, this acknowledgment may appear in the software itself,
- * if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Apache" and "Apache Software Foundation" must
- * not be used to endorse or promote products derived from this
- * software without prior written permission. For written
- * permission, please contact [email protected].
- *
- * 5. Products derived from this software may not be called "Apache",
- * nor may "Apache" appear in their name, without prior written
- * permission of the Apache Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED ``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 APACHE SOFTWARE FOUNDATION 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.
- * ====================================================================
- */
-
-
- _ _
- _ __ ___ ___ __| | ___ ___| | mod_ssl
- | '_ ` _ \ / _ \ / _` | / __/ __| | Apache Interface to OpenSSL
- | | | | | | (_) | (_| | \__ \__ \ | www.modssl.org
- |_| |_| |_|\___/ \__,_|___|___/___/_| ftp.modssl.org
- |_____|
- _____________________________________________________________________________
-
- ``Ian Fleming was a UNIX fan!
- How do I know? Well, James Bond
- had the (license to kill) number 007,
- i.e. he could execute anyone.''
- -- Unknown
- LICENSE
-
- The mod_ssl package falls under the Open-Source Software label
- because it's distributed under a BSD-style license. The
- detailed license information follows.
-
- ====================================================================
- Copyright (c) 1998-2007 Ralf S. Engelschall. 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
- Ralf S. Engelschall <[email protected]> for use in the
- mod_ssl project (http://www.modssl.org/)."
-
- 4. The names "mod_ssl" must not be used to endorse or promote
- products derived from this software without prior written
- permission. For written permission, please contact
- [email protected].
-
- 5. Products derived from this software may not be called "mod_ssl"
- nor may "mod_ssl" appear in their names without prior
- written permission of Ralf S. Engelschall.
-
- 6. Redistributions of any form whatsoever must retain the following
- acknowledgment:
- "This product includes software developed by
- Ralf S. Engelschall <[email protected]> for use in the
- mod_ssl project (http://www.modssl.org/)."
-
- THIS SOFTWARE IS PROVIDED BY RALF S. ENGELSCHALL ``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 RALF S. ENGELSCHALL OR
- HIS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- OF THE POSSIBILITY OF SUCH DAMAGE.
- ====================================================================
-
--- a/usr/src/pkgdefs/SUNWapchu/depend Sat Oct 30 12:35:08 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#ident "@(#)depend 1.9 08/12/04 SMI"
-#
-# This package information file defines software dependencies associated
-# with the pkg. You can define three types of pkg dependencies with this file:
-# P indicates a prerequisite for installation
-# I indicates an incompatible package
-# R indicates a reverse dependency
-# <pkg.abbr> see pkginfo(4), PKG parameter
-# <name> see pkginfo(4), NAME parameter
-# <version> see pkginfo(4), VERSION parameter
-# <arch> see pkginfo(4), ARCH parameter
-# <type> <pkg.abbr> <name>
-# (<arch>)<version>
-# (<arch>)<version>
-# ...
-# <type> <pkg.abbr> <name>
-# ...
-#
-
-P SUNWcar Core Architecture, (Root)
-P SUNWcakr Core Solaris Kernel Architecture (Root)
-P SUNWkvm Core Architecture, (Kvm)
-P SUNWcsr Core Solaris, (Root)
-P SUNWckr Core Solaris Kernel (Root)
-P SUNWcnetr Core Solaris Network Infrastructure (Root)
-P SUNWcsu Core Solaris, (Usr)
-P SUNWcsd Core Solaris Devices
-P SUNWcsl Core Solaris Libraries
-P SUNWapchr Apache Web Server, (root)
-P SUNWperl584core Perl 5.8.4 (core)
-P SUNWlibms Math & Microtasking Libraries (Usr)
-P SUNWlibmsr Math & Microtasking Libraries (Root)
-P SUNWopensslr OpenSSL (Root)
-P SUNWopenssl-libraries OpenSSL Libraries (Usr)
-P SUNWgss GSSAPI V2
-P SUNWlexpt libexpat - XML parser library
--- a/usr/src/pkgdefs/SUNWapchu/pkginfo.tmpl Sat Oct 30 12:35:08 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-#
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-#ident "@(#)pkginfo.tmpl 1.10 10/07/22 SMI"
-#
-# This required package information file describes characteristics of the
-# package, such as package abbreviation, full package name, package version,
-# and package architecture.
-#
-PKG="SUNWapchu"
-NAME="Apache Web Server (usr)"
-ARCH="ISA"
-VERSION="SFWVERS,REV=0.0.0"
-SUNW_PRODNAME="SunOS"
-SUNW_PRODVERS="RELEASE/VERSION"
-SUNW_PKGTYPE="usr"
-MAXINST="1000"
-CATEGORY="system"
-DESC="The Apache HTTP server program (1.3.x) (usr components)"
-VENDOR="COMPANY"
-HOTLINE="Please contact your local service provider"
-EMAIL=""
-CLASSES="none"
-BASEDIR=/
-SUNW_PKGVERS="1.0"
-SUNW_PKG_ALLZONES="false"
-SUNW_PKG_HOLLOW="false"
-SUNW_PKG_THISZONE="false"
-#VSTOCK="<reserved by Release Engineering for package part #>"
-#ISTATES="<developer defined>"
-#RSTATES='<developer defined>'
-#ULIMIT="<developer defined>"
-#ORDER="<developer defined>"
-#PSTAMP="<developer defined>"
-#INTONLY="<developer defined>"
--- a/usr/src/pkgdefs/SUNWapchu/prototype_com Sat Oct 30 12:35:08 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,143 +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 2010 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#ident "@(#)prototype_com 1.12 10/01/14 SMI"
-#
-# SUNWapchu
-#
-# packaging files
-i pkginfo
-i depend
-i copyright
-#
-d none usr 755 root sys
-d none usr/sbin 755 root bin
-d none usr/bin 755 root bin
-d none usr/apache 755 root bin
-d none usr/apache/bin 755 root bin
-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/httpd.exp 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
-f none usr/apache/libexec/mod_access.so 555 root bin
-f none usr/apache/libexec/mod_actions.so 555 root bin
-f none usr/apache/libexec/mod_alias.so 555 root bin
-f none usr/apache/libexec/mod_asis.so 555 root bin
-f none usr/apache/libexec/mod_auth.so 555 root bin
-f none usr/apache/libexec/mod_auth_gss.so 555 root bin
-f none usr/apache/libexec/mod_auth_anon.so 555 root bin
-f none usr/apache/libexec/mod_auth_dbm.so 555 root bin
-f none usr/apache/libexec/mod_autoindex.so 555 root bin
-f none usr/apache/libexec/mod_cern_meta.so 555 root bin
-f none usr/apache/libexec/mod_cgi.so 555 root bin
-f none usr/apache/libexec/mod_define.so 555 root bin
-f none usr/apache/libexec/mod_digest.so 555 root bin
-f none usr/apache/libexec/mod_dir.so 555 root bin
-f none usr/apache/libexec/mod_env.so 555 root bin
-f none usr/apache/libexec/mod_example.so 555 root bin
-f none usr/apache/libexec/mod_expires.so 555 root bin
-f none usr/apache/libexec/mod_headers.so 555 root bin
-f none usr/apache/libexec/mod_imap.so 555 root bin
-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_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
-f none usr/apache/libexec/mod_log_referer.so 555 root bin
-f none usr/apache/libexec/mod_mmap_static.so 555 root bin
-f none usr/apache/libexec/mod_mime.so 555 root bin
-f none usr/apache/libexec/mod_mime_magic.so 555 root bin
-f none usr/apache/libexec/mod_negotiation.so 555 root bin
-f none usr/apache/libexec/mod_rewrite.so 555 root bin
-f none usr/apache/libexec/mod_setenvif.so 555 root bin
-f none usr/apache/libexec/mod_speling.so 555 root bin
-f none usr/apache/libexec/mod_status.so 555 root bin
-f none usr/apache/libexec/mod_unique_id.so 555 root bin
-f none usr/apache/libexec/mod_userdir.so 555 root bin
-f none usr/apache/libexec/mod_usertrack.so 555 root bin
-f none usr/apache/libexec/mod_vhost_alias.so 555 root bin
-f none usr/apache/bin/ab 555 root bin
-f none usr/apache/bin/apachectl 555 root bin
-f none usr/apache/bin/apxs 555 root bin
-f none usr/apache/bin/checkgid 555 root bin
-f none usr/apache/bin/dbmmanage 555 root bin
-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/logresolve 555 root bin
-f none usr/apache/bin/rotatelogs 555 root bin
-f none usr/apache/bin/suexec.disabled 700 root bin
-f none usr/apache/include/ap.h 644 root bin
-f none usr/apache/include/ap_alloc.h 644 root bin
-f none usr/apache/include/ap_compat.h 644 root bin
-f none usr/apache/include/ap_config.h 644 root bin
-f none usr/apache/include/ap_config_auto.h 644 root bin
-f none usr/apache/include/ap_ctype.h 644 root bin
-f none usr/apache/include/ap_ebcdic.h 644 root bin
-f none usr/apache/include/ap_md5.h 644 root bin
-f none usr/apache/include/ap_mmn.h 644 root bin
-f none usr/apache/include/ap_sha1.h 644 root bin
-f none usr/apache/include/ap_ctx.h 644 root bin
-f none usr/apache/include/ap_hook.h 644 root bin
-f none usr/apache/include/ap_mm.h 644 root bin
-f none usr/apache/include/buff.h 644 root bin
-f none usr/apache/include/compat.h 644 root bin
-f none usr/apache/include/conf.h 644 root bin
-f none usr/apache/include/explain.h 644 root bin
-f none usr/apache/include/fnmatch.h 644 root bin
-f none usr/apache/include/hsregex.h 644 root bin
-f none usr/apache/include/http_conf_globals.h 644 root bin
-f none usr/apache/include/http_config.h 644 root bin
-f none usr/apache/include/http_core.h 644 root bin
-f none usr/apache/include/http_log.h 644 root bin
-f none usr/apache/include/http_main.h 644 root bin
-f none usr/apache/include/http_protocol.h 644 root bin
-f none usr/apache/include/http_request.h 644 root bin
-f none usr/apache/include/http_vhost.h 644 root bin
-f none usr/apache/include/httpd.h 644 root bin
-f none usr/apache/include/multithread.h 644 root bin
-f none usr/apache/include/os-inline.c 644 root bin
-f none usr/apache/include/os.h 644 root bin
-f none usr/apache/include/rfc1413.h 644 root bin
-f none usr/apache/include/scoreboard.h 644 root bin
-f none usr/apache/include/util_date.h 644 root bin
-f none usr/apache/include/util_md5.h 644 root bin
-f none usr/apache/include/util_script.h 644 root bin
-f none usr/apache/include/util_uri.h 644 root bin
-d none usr/apache/include/xml 755 root bin
-f none usr/apache/include/xml/asciitab.h 644 root bin
-f none usr/apache/include/xml/hashtable.h 644 root bin
-f none usr/apache/include/xml/iasciitab.h 644 root bin
-f none usr/apache/include/xml/latin1tab.h 644 root bin
-f none usr/apache/include/xml/nametab.h 644 root bin
-f none usr/apache/include/xml/utf8tab.h 644 root bin
-f none usr/apache/include/xml/xmldef.h 644 root bin
-f none usr/apache/include/xml/xmlparse.h 644 root bin
-f none usr/apache/include/xml/xmlrole.h 644 root bin
-f none usr/apache/include/xml/xmltok.h 644 root bin
-f none usr/apache/include/xml/xmltok_impl.h 644 root bin
--- a/usr/src/pkgdefs/SUNWapchu/prototype_i386 Sat Oct 30 12:35:08 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,231 +0,0 @@
-#
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#ident "@(#)prototype_i386 1.9 08/09/24 SMI"
-#
-# This required package information file contains a list of package contents.
-# The 'pkgmk' command uses this file to identify the contents of a package
-# and their location on the development machine when building the package.
-# Can be created via a text editor or through use of the 'pkgproto' command.
-
-#!search <pathname pathname ...> # where to find pkg objects
-#!include <filename> # include another 'prototype' file
-#!default <mode> <owner> <group> # default used if not specified on entry
-#!<param>=<value> # puts parameter in pkg environment
-
-#
-# Include ISA independent files (prototype_com)
-#
-!include prototype_com
-#
-# List files which are i86pc specific here
-#
-# source locations relative to the prototype file
-#
-# SUNWapchu
-#
-d none usr/apache/perl5/5.8.4 755 root bin
-d none usr/apache/perl5/5.8.4/i86pc-solaris 0755 root bin
-d none usr/apache/perl5/5.8.4/i86pc-solaris/auto 0755 root bin
-d none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache 0755 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/typemap 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/mod_perl.exp 0555 root bin
-d none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include 0755 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/ap_config_auto.h 0555 root bin
-d none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/os 0755 root bin
-d none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/os/cygwin 0755 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/os/cygwin/os.h 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/os/cygwin/os-inline.c 0555 root bin
-d none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/os/os390 0755 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/os/os390/os-inline.c 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/os/os390/ebcdic.h 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/os/os390/os.h 0555 root bin
-d none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/os/netware 0755 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/os/netware/test_char.h 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/os/netware/precomp.h 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/os/netware/getopt.h 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/os/netware/uri_delims.h 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/os/netware/os.h 0555 root bin
-d none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/os/bs2000 0755 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/os/bs2000/os-inline.c 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/os/bs2000/ebcdic.h 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/os/bs2000/os.h 0555 root bin
-d none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/os/win32 0755 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/os/win32/readdir.h 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/os/win32/Win9xConHook.h 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/os/win32/registry.h 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/os/win32/passwd.h 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/os/win32/resource.h 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/os/win32/os.h 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/os/win32/service.h 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/os/win32/getopt.h 0555 root bin
-d none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/os/tpf 0755 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/os/tpf/os.h 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/os/tpf/ebcdic.h 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/os/tpf/os-inline.c 0555 root bin
-d none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/os/mpeix 0755 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/os/mpeix/os.h 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/os/mpeix/os-inline.c 0555 root bin
-d none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/os/unix 0755 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/os/unix/os-inline.c 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/os/unix/os.h 0555 root bin
-d none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/os/os2 0755 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/os/os2/os-inline.c 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/os/os2/os.h 0555 root bin
-d none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/include 0755 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/include/hsregex.h 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/include/util_uri.h 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/include/http_request.h 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/include/httpd.h 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/include/http_conf_globals.h 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/include/fnmatch.h 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/include/rfc1413.h 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/include/util_md5.h 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/include/ap_hook.h 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/include/ap_md5.h 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/include/http_main.h 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/include/http_protocol.h 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/include/compat.h 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/include/http_vhost.h 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/include/ap_ctype.h 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/include/scoreboard.h 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/include/ap_config.h 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/include/ap_ebcdic.h 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/include/http_core.h 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/include/ap_ctx.h 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/include/ap_compat.h 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/include/multithread.h 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/include/conf.h 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/include/util_date.h 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/include/ap_alloc.h 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/include/ap_mm.h 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/include/explain.h 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/include/http_log.h 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/include/buff.h 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/include/ap.h 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/include/ap_mmn.h 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/include/http_config.h 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/include/util_script.h 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/include/ap_sha1.h 0555 root bin
-d none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/lib 0755 root bin
-d none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/lib/expat-lite 0755 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/lib/expat-lite/latin1tab.h 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/lib/expat-lite/xmltok_impl.h 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/lib/expat-lite/iasciitab.h 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/lib/expat-lite/xmlrole.h 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/lib/expat-lite/asciitab.h 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/lib/expat-lite/xmltok.h 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/lib/expat-lite/xmldef.h 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/lib/expat-lite/nametab.h 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/lib/expat-lite/utf8tab.h 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/lib/expat-lite/xmlparse.h 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/lib/expat-lite/hashtable.h 0555 root bin
-d none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/lib/sdbm 0755 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/lib/sdbm/sdbm_pair.h 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/lib/sdbm/sdbm_tune.h 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/lib/sdbm/sdbm.h 0555 root bin
-d none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/modules 0755 root bin
-d none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/modules/perl 0755 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/modules/perl/perl_PL.h 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/modules/perl/apache_inc.h 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/modules/perl/mod_perl_version.h 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/modules/perl/mod_perl.h 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/modules/perl/mod_perl_xs.h 0555 root bin
-d none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/modules/ssl 0755 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/modules/ssl/ssl_expr_parse.h 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/modules/ssl/ssl_expr.h 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/modules/ssl/ssl_util_sdbm.h 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/modules/ssl/ssl_util_table.h 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/modules/ssl/ssl_util_ssl.h 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/modules/ssl/mod_ssl.h 0555 root bin
-d none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/modules/standard 0755 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/modules/standard/mod_rewrite.h 0555 root bin
-d none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/modules/proxy 0755 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/modules/proxy/mod_proxy.h 0555 root bin
-d none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/regex 0755 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/regex/regex2.h 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/regex/utils.h 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/regex/cclass.h 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/regex/cname.h 0555 root bin
-d none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/support 0755 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/include/support/suexec.h 0555 root bin
-d none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/Leak 0755 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/Leak/Leak.so 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/Leak/Leak.bs 0555 root bin
-d none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/Symbol 0755 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/Symbol/Symbol.so 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/Apache/Symbol/Symbol.bs 0555 root bin
-d none usr/apache/perl5/5.8.4/i86pc-solaris/auto/mod_perl 0755 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/auto/mod_perl/.packlist 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/mod_perl.pm 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/mod_perl_tuning.pod 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/mod_perl_hooks.pm 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/mod_perl_traps.pod 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/mod_perl_method_handlers.pod 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/cgi_to_mod_perl.pod 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/mod_perl_cvs.pod 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/mod_perl_hooks.pm.PL 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/mod_perl.pod 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/Apache.pm 0555 root bin
-d none usr/apache/perl5/5.8.4/i86pc-solaris/Apache 0755 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/Apache/httpd_conf.pm 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/Apache/Debug.pm 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/Apache/PerlRun.pm 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/Apache/RegistryBB.pm 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/Apache/ExtUtils.pm 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/Apache/Symdump.pm 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/Apache/MyConfig.pm 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/Apache/Registry.pm 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/Apache/FakeRequest.pm 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/Apache/RegistryNG.pm 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/Apache/PerlSections.pm 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/Apache/RedirectLogFix.pm 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/Apache/StatINC.pm 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/Apache/RegistryLoader.pm 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/Apache/Options.pm 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/Apache/src.pm 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/Apache/SizeLimit.pm 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/Apache/Include.pm 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/Apache/Resource.pm 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/Apache/Opcode.pm 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/Apache/SIG.pm 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/Apache/testold.pm 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/Apache/File.pm 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/Apache/Status.pm 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/Apache/Connection.pm 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/Apache/Constants.pm 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/Apache/Leak.pm 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/Apache/Log.pm 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/Apache/ModuleConfig.pm 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/Apache/PerlRunXS.pm 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/Apache/Server.pm 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/Apache/Symbol.pm 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/Apache/Table.pm 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/Apache/URI.pm 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/Apache/Util.pm 0555 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/Apache/fork.pm 0555 root bin
-d none usr/apache/perl5/5.8.4/i86pc-solaris/Apache/Constants 0755 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/Apache/Constants/Exports.pm 0555 root bin
-d none usr/apache/perl5/5.8.4/i86pc-solaris/Bundle 0755 root bin
-f none usr/apache/perl5/5.8.4/i86pc-solaris/Bundle/Apache.pm 0555 root bin
--- a/usr/src/pkgdefs/SUNWapchu/prototype_sparc Sat Oct 30 12:35:08 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,231 +0,0 @@
-#
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#ident "@(#)prototype_sparc 1.9 08/09/24 SMI"
-#
-# This required package information file contains a list of package contents.
-# The 'pkgmk' command uses this file to identify the contents of a package
-# and their location on the development machine when building the package.
-# Can be created via a text editor or through use of the 'pkgproto' command.
-
-#!search <pathname pathname ...> # where to find pkg objects
-#!include <filename> # include another 'prototype' file
-#!default <mode> <owner> <group> # default used if not specified on entry
-#!<param>=<value> # puts parameter in pkg environment
-
-#
-# Include ISA independent files (prototype_com)
-#
-!include prototype_com
-#
-# List files which are SPARC specific here
-#
-# source locations relative to the prototype file
-#
-# SUNWapchu
-#
-d none usr/apache/perl5/5.8.4 755 root bin
-d none usr/apache/perl5/5.8.4/sun4-solaris 0755 root bin
-d none usr/apache/perl5/5.8.4/sun4-solaris/auto 0755 root bin
-d none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache 0755 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/typemap 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/mod_perl.exp 0555 root bin
-d none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include 0755 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/ap_config_auto.h 0555 root bin
-d none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/os 0755 root bin
-d none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/os/cygwin 0755 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/os/cygwin/os.h 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/os/cygwin/os-inline.c 0555 root bin
-d none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/os/os390 0755 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/os/os390/os-inline.c 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/os/os390/ebcdic.h 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/os/os390/os.h 0555 root bin
-d none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/os/netware 0755 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/os/netware/test_char.h 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/os/netware/precomp.h 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/os/netware/getopt.h 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/os/netware/uri_delims.h 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/os/netware/os.h 0555 root bin
-d none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/os/bs2000 0755 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/os/bs2000/os-inline.c 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/os/bs2000/ebcdic.h 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/os/bs2000/os.h 0555 root bin
-d none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/os/win32 0755 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/os/win32/readdir.h 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/os/win32/Win9xConHook.h 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/os/win32/registry.h 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/os/win32/passwd.h 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/os/win32/resource.h 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/os/win32/os.h 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/os/win32/service.h 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/os/win32/getopt.h 0555 root bin
-d none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/os/tpf 0755 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/os/tpf/os.h 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/os/tpf/ebcdic.h 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/os/tpf/os-inline.c 0555 root bin
-d none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/os/mpeix 0755 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/os/mpeix/os.h 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/os/mpeix/os-inline.c 0555 root bin
-d none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/os/unix 0755 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/os/unix/os-inline.c 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/os/unix/os.h 0555 root bin
-d none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/os/os2 0755 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/os/os2/os-inline.c 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/os/os2/os.h 0555 root bin
-d none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/include 0755 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/include/hsregex.h 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/include/util_uri.h 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/include/http_request.h 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/include/httpd.h 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/include/http_conf_globals.h 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/include/fnmatch.h 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/include/rfc1413.h 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/include/util_md5.h 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/include/ap_hook.h 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/include/ap_md5.h 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/include/http_main.h 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/include/http_protocol.h 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/include/compat.h 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/include/http_vhost.h 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/include/ap_ctype.h 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/include/scoreboard.h 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/include/ap_config.h 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/include/ap_ebcdic.h 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/include/http_core.h 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/include/ap_ctx.h 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/include/ap_compat.h 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/include/multithread.h 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/include/conf.h 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/include/util_date.h 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/include/ap_alloc.h 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/include/ap_mm.h 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/include/explain.h 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/include/http_log.h 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/include/buff.h 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/include/ap.h 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/include/ap_mmn.h 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/include/http_config.h 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/include/util_script.h 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/include/ap_sha1.h 0555 root bin
-d none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/lib 0755 root bin
-d none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/lib/expat-lite 0755 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/lib/expat-lite/latin1tab.h 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/lib/expat-lite/xmltok_impl.h 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/lib/expat-lite/iasciitab.h 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/lib/expat-lite/xmlrole.h 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/lib/expat-lite/asciitab.h 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/lib/expat-lite/xmltok.h 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/lib/expat-lite/xmldef.h 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/lib/expat-lite/nametab.h 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/lib/expat-lite/utf8tab.h 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/lib/expat-lite/xmlparse.h 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/lib/expat-lite/hashtable.h 0555 root bin
-d none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/lib/sdbm 0755 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/lib/sdbm/sdbm_pair.h 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/lib/sdbm/sdbm_tune.h 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/lib/sdbm/sdbm.h 0555 root bin
-d none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/modules 0755 root bin
-d none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/modules/perl 0755 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/modules/perl/perl_PL.h 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/modules/perl/apache_inc.h 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/modules/perl/mod_perl_version.h 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/modules/perl/mod_perl.h 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/modules/perl/mod_perl_xs.h 0555 root bin
-d none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/modules/ssl 0755 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/modules/ssl/ssl_expr_parse.h 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/modules/ssl/ssl_expr.h 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/modules/ssl/ssl_util_sdbm.h 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/modules/ssl/ssl_util_table.h 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/modules/ssl/ssl_util_ssl.h 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/modules/ssl/mod_ssl.h 0555 root bin
-d none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/modules/standard 0755 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/modules/standard/mod_rewrite.h 0555 root bin
-d none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/modules/proxy 0755 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/modules/proxy/mod_proxy.h 0555 root bin
-d none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/regex 0755 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/regex/regex2.h 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/regex/utils.h 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/regex/cclass.h 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/regex/cname.h 0555 root bin
-d none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/support 0755 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/include/support/suexec.h 0555 root bin
-d none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/Leak 0755 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/Leak/Leak.so 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/Leak/Leak.bs 0555 root bin
-d none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/Symbol 0755 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/Symbol/Symbol.so 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/Apache/Symbol/Symbol.bs 0555 root bin
-d none usr/apache/perl5/5.8.4/sun4-solaris/auto/mod_perl 0755 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/auto/mod_perl/.packlist 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/mod_perl.pm 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/mod_perl_tuning.pod 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/mod_perl_hooks.pm 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/mod_perl_traps.pod 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/mod_perl_method_handlers.pod 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/cgi_to_mod_perl.pod 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/mod_perl_cvs.pod 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/mod_perl_hooks.pm.PL 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/mod_perl.pod 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/Apache.pm 0555 root bin
-d none usr/apache/perl5/5.8.4/sun4-solaris/Apache 0755 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/Apache/httpd_conf.pm 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/Apache/Debug.pm 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/Apache/PerlRun.pm 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/Apache/RegistryBB.pm 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/Apache/ExtUtils.pm 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/Apache/Symdump.pm 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/Apache/MyConfig.pm 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/Apache/Registry.pm 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/Apache/FakeRequest.pm 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/Apache/RegistryNG.pm 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/Apache/PerlSections.pm 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/Apache/RedirectLogFix.pm 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/Apache/StatINC.pm 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/Apache/RegistryLoader.pm 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/Apache/Options.pm 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/Apache/src.pm 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/Apache/SizeLimit.pm 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/Apache/Include.pm 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/Apache/Resource.pm 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/Apache/Opcode.pm 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/Apache/SIG.pm 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/Apache/testold.pm 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/Apache/File.pm 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/Apache/Status.pm 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/Apache/Connection.pm 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/Apache/Constants.pm 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/Apache/Leak.pm 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/Apache/Log.pm 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/Apache/ModuleConfig.pm 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/Apache/PerlRunXS.pm 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/Apache/Server.pm 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/Apache/Symbol.pm 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/Apache/Table.pm 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/Apache/URI.pm 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/Apache/Util.pm 0555 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/Apache/fork.pm 0555 root bin
-d none usr/apache/perl5/5.8.4/sun4-solaris/Apache/Constants 0755 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/Apache/Constants/Exports.pm 0555 root bin
-d none usr/apache/perl5/5.8.4/sun4-solaris/Bundle 0755 root bin
-f none usr/apache/perl5/5.8.4/sun4-solaris/Bundle/Apache.pm 0555 root bin
--- a/usr/src/pkgdefs/SUNWbash/pkginfo.tmpl Sat Oct 30 12:35:08 2010 -0700
+++ b/usr/src/pkgdefs/SUNWbash/pkginfo.tmpl Tue Nov 16 22:41:08 2010 -0800
@@ -21,7 +21,7 @@
#
# Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
#
-# ident "@(#)pkginfo.tmpl 1.9 10/07/22 SMI"
+# ident "@(#)pkginfo.tmpl 1.10 10/11/08 SMI"
#
#
# This required package information file describes characteristics of the
@@ -37,7 +37,7 @@
SUNW_PKGTYPE="usr"
MAXINST="1000"
CATEGORY="system"
-DESC="GNU Bourne-Again shell (bash) version 4.0"
+DESC="GNU Bourne-Again shell (bash) version 4.1"
VENDOR="COMPANY"
HOTLINE="Please contact your local service provider"
EMAIL=""
--- a/usr/src/pkgdefs/SUNWbashr/pkginfo.tmpl Sat Oct 30 12:35:08 2010 -0700
+++ b/usr/src/pkgdefs/SUNWbashr/pkginfo.tmpl Tue Nov 16 22:41:08 2010 -0800
@@ -21,7 +21,7 @@
#
# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
#
-# ident "@(#)pkginfo.tmpl 1.2 10/07/22 SMI"
+# ident "@(#)pkginfo.tmpl 1.3 10/11/08 SMI"
#
#
# This required package information file describes characteristics of the
@@ -37,7 +37,7 @@
SUNW_PKGTYPE="root"
MAXINST="1000"
CATEGORY="system"
-DESC="GNU Bourne-Again shell (bash) version 4.0 (root package)"
+DESC="GNU Bourne-Again shell (bash) version 4.1 (root package)"
VENDOR="COMPANY"
HOTLINE="Please contact your local service provider"
EMAIL=""
--- a/usr/src/pkgdefs/SUNWbind/pkginfo.tmpl Sat Oct 30 12:35:08 2010 -0700
+++ b/usr/src/pkgdefs/SUNWbind/pkginfo.tmpl Tue Nov 16 22:41:08 2010 -0800
@@ -23,7 +23,7 @@
# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
#
-#ident "@(#)pkginfo.tmpl 1.10 10/07/22 SMI"
+#ident "@(#)pkginfo.tmpl 1.11 10/09/14 SMI"
#
# This required package information file describes characteristics of the
@@ -39,7 +39,7 @@
SUNW_PKGTYPE="usr"
MAXINST="1000"
CATEGORY="system"
-DESC="BIND DNS Name server (9.6.1-P3)"
+DESC="BIND DNS Name server (9.6.2-P2)"
VENDOR="COMPANY"
HOTLINE="Please contact your local service provider"
EMAIL=""
--- a/usr/src/pkgdefs/SUNWbindc/pkginfo.tmpl Sat Oct 30 12:35:08 2010 -0700
+++ b/usr/src/pkgdefs/SUNWbindc/pkginfo.tmpl Tue Nov 16 22:41:08 2010 -0800
@@ -23,7 +23,7 @@
# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
#
-#ident "@(#)pkginfo.tmpl 1.4 10/07/22 SMI"
+#ident "@(#)pkginfo.tmpl 1.5 10/09/14 SMI"
#
# This required package information file describes characteristics of the
@@ -39,7 +39,7 @@
SUNW_PKGTYPE="usr"
MAXINST="1000"
CATEGORY="system"
-DESC="BIND DNS tools (9.6.1-P3)"
+DESC="BIND DNS tools (9.6.2-P2)"
VENDOR="COMPANY"
HOTLINE="Please contact your local service provider"
EMAIL=""
--- a/usr/src/pkgdefs/SUNWcupsr/prototype_com Sat Oct 30 12:35:08 2010 -0700
+++ b/usr/src/pkgdefs/SUNWcupsr/prototype_com Tue Nov 16 22:41:08 2010 -0800
@@ -22,7 +22,7 @@
#
# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
#
-#ident "@(#)prototype_com 1.8 10/04/22 SMI"
+#ident "@(#)prototype_com 1.9 10/10/27 SMI"
i pkginfo
i copyright
@@ -60,6 +60,7 @@
d none var/cache/cups/rss 0755 root lp
d none var/log 0755 root sys
d none var/log/cups 0755 root lp
+d none var/run 755 root sys
d none var/spool 0755 root bin
d none var/spool/cups 0710 root lp
d none var/spool/cups/tmp 1770 root lp
--- a/usr/src/pkgdefs/SUNWcurl/pkginfo.tmpl Sat Oct 30 12:35:08 2010 -0700
+++ b/usr/src/pkgdefs/SUNWcurl/pkginfo.tmpl Tue Nov 16 22:41:08 2010 -0800
@@ -20,7 +20,7 @@
#
# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
#
-# ident "@(#)pkginfo.tmpl 1.7 10/08/18 SMI"
+# ident "@(#)pkginfo.tmpl 1.8 10/10/18 SMI"
#
# This required package information file describes characteristics of the
# package, such as package abbreviation, full package name, package version,
@@ -35,7 +35,7 @@
SUNW_PKGTYPE="usr"
MAXINST="1000"
CATEGORY="system"
-DESC="CURL - The C-URL Wrappers Library (7.21.1)"
+DESC="CURL - The C-URL Wrappers Library (7.21.2)"
VENDOR="COMPANY"
HOTLINE="Please contact your local service provider"
EMAIL=""
--- a/usr/src/pkgdefs/SUNWgrails/depend Sat Oct 30 12:35:08 2010 -0700
+++ b/usr/src/pkgdefs/SUNWgrails/depend Tue Nov 16 22:41:08 2010 -0800
@@ -20,10 +20,9 @@
# CDDL HEADER END
#
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
#
-#ident "@(#)depend 1.3 09/05/12 SMI"
+#ident "@(#)depend 1.4 10/11/01 SMI"
#
# This package information file defines software dependencies associated
# with the pkg. You can define three types of pkg dependencies with this file:
@@ -54,4 +53,4 @@
P SUNWj6rt JDK 1.6 run time environment
P SUNWj6dev JDK 1.6 development tools
P SUNWperl584core Perl 5.8.4 (core)
-P SUNWPython The Python interpreter, libraries and utilities
+P SUNWPython26 The Python interpreter, libraries and utilities
--- a/usr/src/pkgdefs/SUNWlibpcap/pkginfo.tmpl Sat Oct 30 12:35:08 2010 -0700
+++ b/usr/src/pkgdefs/SUNWlibpcap/pkginfo.tmpl Tue Nov 16 22:41:08 2010 -0800
@@ -21,7 +21,7 @@
#
# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
#
-#ident "@(#)pkginfo.tmpl 1.4 10/07/22 SMI"
+#ident "@(#)pkginfo.tmpl 1.5 10/11/01 SMI"
#
# This required package information file describes characteristics of the
@@ -38,7 +38,7 @@
SUNW_PKGTYPE="usr"
MAXINST="1000"
CATEGORY="system"
-DESC="libpcap - a packet capture library (1.0.0)"
+DESC="libpcap - a packet capture library (1.1.1)"
VENDOR="COMPANY"
HOTLINE="Please contact your local service provider"
EMAIL=""
--- a/usr/src/pkgdefs/SUNWlibpcap/prototype_com Sat Oct 30 12:35:08 2010 -0700
+++ b/usr/src/pkgdefs/SUNWlibpcap/prototype_com Tue Nov 16 22:41:08 2010 -0800
@@ -19,10 +19,9 @@
#
# CDDL HEADER END
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
#
-#pragma ident "@(#)prototype_com 1.3 09/12/07 SMI"
+#pragma ident "@(#)prototype_com 1.4 10/11/01 SMI"
#
#
@@ -46,9 +45,9 @@
#
d none usr 755 root sys
d none usr/lib 755 root bin
-f none usr/lib/libpcap.so.1.0.0 555 root bin
-s none usr/lib/libpcap.so.1=libpcap.so.1.0.0
-s none usr/lib/libpcap.so=libpcap.so.1.0.0
+f none usr/lib/libpcap.so.1.1.1 555 root bin
+s none usr/lib/libpcap.so.1=libpcap.so.1.1.1
+s none usr/lib/libpcap.so=libpcap.so.1.1.1
d none usr/include 755 root bin
f none usr/include/pcap.h 444 root bin
--- a/usr/src/pkgdefs/SUNWlibpcap/prototype_i386 Sat Oct 30 12:35:08 2010 -0700
+++ b/usr/src/pkgdefs/SUNWlibpcap/prototype_i386 Tue Nov 16 22:41:08 2010 -0800
@@ -19,11 +19,9 @@
#
# CDDL HEADER END
#
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#pragma ident "@(#)prototype_i386 1.2 09/11/10 SMI"
+#pragma ident "@(#)prototype_i386 1.3 10/11/01 SMI"
#
#
@@ -53,5 +51,5 @@
#
#
d none usr/lib/amd64 0755 root bin
-f none usr/lib/amd64/libpcap.so.1.0.0 555 root bin
-s none usr/lib/amd64/libpcap.so=libpcap.so.1.0.0
+f none usr/lib/amd64/libpcap.so.1.1.1 555 root bin
+s none usr/lib/amd64/libpcap.so=libpcap.so.1.1.1
--- a/usr/src/pkgdefs/SUNWlibpcap/prototype_sparc Sat Oct 30 12:35:08 2010 -0700
+++ b/usr/src/pkgdefs/SUNWlibpcap/prototype_sparc Tue Nov 16 22:41:08 2010 -0800
@@ -19,10 +19,9 @@
#
# CDDL HEADER END
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
#
-#pragma ident "@(#)prototype_sparc 1.2 09/11/10 SMI"
+#pragma ident "@(#)prototype_sparc 1.3 10/11/01 SMI"
#
#
@@ -52,5 +51,5 @@
#
#
d none usr/lib/sparcv9 755 root bin
-f none usr/lib/sparcv9/libpcap.so.1.0.0 555 root bin
-s none usr/lib/sparcv9/libpcap.so=libpcap.so.1.0.0
+f none usr/lib/sparcv9/libpcap.so.1.1.1 555 root bin
+s none usr/lib/sparcv9/libpcap.so=libpcap.so.1.1.1
--- a/usr/src/pkgdefs/SUNWpycups/depend Sat Oct 30 12:35:08 2010 -0700
+++ b/usr/src/pkgdefs/SUNWpycups/depend Tue Nov 16 22:41:08 2010 -0800
@@ -20,10 +20,9 @@
#
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
#
-# ident "@(#)depend 1.2 09/10/06 SMI"
+# ident "@(#)depend 1.3 10/11/01 SMI"
#
#
# This package information file defines software dependencies associated
@@ -53,5 +52,4 @@
P SUNWcsd Core Solaris Devices
P SUNWcsl Core Solaris Libraries
P SUNWcupsu Common Unix Print System v1.3.6 (usr)
-P SUNWPython The Python interpreter, libraries and utilities
P SUNWPython26 The Python interpreter, libraries and utilities
--- a/usr/src/pkgdefs/SUNWpycups/prototype_com Sat Oct 30 12:35:08 2010 -0700
+++ b/usr/src/pkgdefs/SUNWpycups/prototype_com Tue Nov 16 22:41:08 2010 -0800
@@ -20,10 +20,9 @@
#
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
#
-# ident "@(#)prototype_com 1.2 09/10/06 SMI"
+# ident "@(#)prototype_com 1.3 10/11/01 SMI"
#
i pkginfo
@@ -32,11 +31,6 @@
d none usr 0755 root sys
d none usr/lib 0755 root bin
-d none usr/lib/python2.4 0755 root bin
-d none usr/lib/python2.4/vendor-packages 0755 root bin
-d none usr/lib/python2.4/vendor-packages/64 0755 root bin
-f none usr/lib/python2.4/vendor-packages/64/cups.so 0555 root bin
-f none usr/lib/python2.4/vendor-packages/cups.so 0555 root bin
d none usr/lib/python2.6 0755 root bin
d none usr/lib/python2.6/vendor-packages 0755 root bin
d none usr/lib/python2.6/vendor-packages/64 0755 root bin
--- a/usr/src/pkgdefs/SUNWpywbem/depend Sat Oct 30 12:35:08 2010 -0700
+++ b/usr/src/pkgdefs/SUNWpywbem/depend Tue Nov 16 22:41:08 2010 -0800
@@ -20,10 +20,9 @@
#
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
#
-#ident "@(#)depend 1.2 09/07/17 SMI"
+#ident "@(#)depend 1.3 10/10/25 SMI"
#
#
@@ -54,4 +53,3 @@
P SUNWcsd Core Solaris Devices
P SUNWcsl Core Solaris Libraries
P SUNWPython26 The Python interpreter, libraries and utilities
-P SUNWPython The Python interpreter, libraries and utilities
--- a/usr/src/pkgdefs/SUNWrdiff-backup/depend Sat Oct 30 12:35:08 2010 -0700
+++ b/usr/src/pkgdefs/SUNWrdiff-backup/depend Tue Nov 16 22:41:08 2010 -0800
@@ -19,10 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
#
-# ident "@(#)depend 1.1 08/08/10 SMI"
+# ident "@(#)depend 1.2 10/11/01 SMI"
#
# This package information file defines software dependencies associated
# with the pkg. You can define three types of pkg dependencies with this file:
@@ -51,4 +50,4 @@
P SUNWcsd Core Solaris Devices
P SUNWcsl Core Solaris Libraries
P SUNWlibrsync Librsync libraries
-P SUNWPython The Python interpreter, libraries and utilities
+P SUNWPython26 The Python interpreter, libraries and utilities
--- a/usr/src/pkgdefs/SUNWrdiff-backup/prototype_com Sat Oct 30 12:35:08 2010 -0700
+++ b/usr/src/pkgdefs/SUNWrdiff-backup/prototype_com Tue Nov 16 22:41:08 2010 -0800
@@ -20,10 +20,9 @@
# CDDL HEADER END
#
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
#
-# ident "@(#)prototype_com 1.1 08/09/09 SMI"
+# ident "@(#)prototype_com 1.2 10/11/01 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
@@ -49,79 +48,79 @@
f none usr/bin/rdiff-backup 555 root bin
f none usr/bin/rdiff-backup-statistics 555 root bin
d none usr/lib 0755 root bin
-d none usr/lib/python2.4 0755 root bin
-d none usr/lib/python2.4/vendor-packages 0755 root bin
-d none usr/lib/python2.4/vendor-packages/rdiff_backup 0755 root bin
-f none usr/lib/python2.4/vendor-packages/rdiff_backup/C.so 0555 root bin
-f none usr/lib/python2.4/vendor-packages/rdiff_backup/_librsync.so 0555 root bin
-f none usr/lib/python2.4/vendor-packages/rdiff_backup/FilenameMapping.py 0444 root bin
-f none usr/lib/python2.4/vendor-packages/rdiff_backup/FilenameMapping.pyc 0444 root bin
-f none usr/lib/python2.4/vendor-packages/rdiff_backup/Globals.py 0444 root bin
-f none usr/lib/python2.4/vendor-packages/rdiff_backup/Globals.pyc 0444 root bin
-f none usr/lib/python2.4/vendor-packages/rdiff_backup/Hardlink.py 0444 root bin
-f none usr/lib/python2.4/vendor-packages/rdiff_backup/Hardlink.pyc 0444 root bin
-f none usr/lib/python2.4/vendor-packages/rdiff_backup/Main.py 0444 root bin
-f none usr/lib/python2.4/vendor-packages/rdiff_backup/Main.pyc 0444 root bin
-f none usr/lib/python2.4/vendor-packages/rdiff_backup/Rdiff.py 0444 root bin
-f none usr/lib/python2.4/vendor-packages/rdiff_backup/Rdiff.pyc 0444 root bin
-f none usr/lib/python2.4/vendor-packages/rdiff_backup/Security.py 0444 root bin
-f none usr/lib/python2.4/vendor-packages/rdiff_backup/Security.pyc 0444 root bin
-f none usr/lib/python2.4/vendor-packages/rdiff_backup/SetConnections.py 0444 root bin
-f none usr/lib/python2.4/vendor-packages/rdiff_backup/SetConnections.pyc 0444 root bin
-f none usr/lib/python2.4/vendor-packages/rdiff_backup/TempFile.py 0444 root bin
-f none usr/lib/python2.4/vendor-packages/rdiff_backup/TempFile.pyc 0444 root bin
-f none usr/lib/python2.4/vendor-packages/rdiff_backup/Time.py 0444 root bin
-f none usr/lib/python2.4/vendor-packages/rdiff_backup/Time.pyc 0444 root bin
-f none usr/lib/python2.4/vendor-packages/rdiff_backup/__init__.py 0444 root bin
-f none usr/lib/python2.4/vendor-packages/rdiff_backup/__init__.pyc 0444 root bin
-f none usr/lib/python2.4/vendor-packages/rdiff_backup/backup.py 0444 root bin
-f none usr/lib/python2.4/vendor-packages/rdiff_backup/backup.pyc 0444 root bin
-f none usr/lib/python2.4/vendor-packages/rdiff_backup/connection.py 0444 root bin
-f none usr/lib/python2.4/vendor-packages/rdiff_backup/connection.pyc 0444 root bin
-f none usr/lib/python2.4/vendor-packages/rdiff_backup/eas_acls.py 0444 root bin
-f none usr/lib/python2.4/vendor-packages/rdiff_backup/eas_acls.pyc 0444 root bin
-f none usr/lib/python2.4/vendor-packages/rdiff_backup/fs_abilities.py 0444 root bin
-f none usr/lib/python2.4/vendor-packages/rdiff_backup/fs_abilities.pyc 0444 root bin
-f none usr/lib/python2.4/vendor-packages/rdiff_backup/increment.py 0444 root bin
-f none usr/lib/python2.4/vendor-packages/rdiff_backup/increment.pyc 0444 root bin
-f none usr/lib/python2.4/vendor-packages/rdiff_backup/iterfile.py 0444 root bin
-f none usr/lib/python2.4/vendor-packages/rdiff_backup/iterfile.pyc 0444 root bin
-f none usr/lib/python2.4/vendor-packages/rdiff_backup/lazy.py 0444 root bin
-f none usr/lib/python2.4/vendor-packages/rdiff_backup/lazy.pyc 0444 root bin
-f none usr/lib/python2.4/vendor-packages/rdiff_backup/librsync.py 0444 root bin
-f none usr/lib/python2.4/vendor-packages/rdiff_backup/librsync.pyc 0444 root bin
-f none usr/lib/python2.4/vendor-packages/rdiff_backup/log.py 0444 root bin
-f none usr/lib/python2.4/vendor-packages/rdiff_backup/log.pyc 0444 root bin
-f none usr/lib/python2.4/vendor-packages/rdiff_backup/manage.py 0444 root bin
-f none usr/lib/python2.4/vendor-packages/rdiff_backup/manage.pyc 0444 root bin
-f none usr/lib/python2.4/vendor-packages/rdiff_backup/metadata.py 0444 root bin
-f none usr/lib/python2.4/vendor-packages/rdiff_backup/metadata.pyc 0444 root bin
-f none usr/lib/python2.4/vendor-packages/rdiff_backup/regress.py 0444 root bin
-f none usr/lib/python2.4/vendor-packages/rdiff_backup/regress.pyc 0444 root bin
-f none usr/lib/python2.4/vendor-packages/rdiff_backup/restore.py 0444 root bin
-f none usr/lib/python2.4/vendor-packages/rdiff_backup/restore.pyc 0444 root bin
-f none usr/lib/python2.4/vendor-packages/rdiff_backup/robust.py 0444 root bin
-f none usr/lib/python2.4/vendor-packages/rdiff_backup/robust.pyc 0444 root bin
-f none usr/lib/python2.4/vendor-packages/rdiff_backup/rorpiter.py 0444 root bin
-f none usr/lib/python2.4/vendor-packages/rdiff_backup/rorpiter.pyc 0444 root bin
-f none usr/lib/python2.4/vendor-packages/rdiff_backup/rpath.py 0444 root bin
-f none usr/lib/python2.4/vendor-packages/rdiff_backup/rpath.pyc 0444 root bin
-f none usr/lib/python2.4/vendor-packages/rdiff_backup/selection.py 0444 root bin
-f none usr/lib/python2.4/vendor-packages/rdiff_backup/selection.pyc 0444 root bin
-f none usr/lib/python2.4/vendor-packages/rdiff_backup/static.py 0444 root bin
-f none usr/lib/python2.4/vendor-packages/rdiff_backup/static.pyc 0444 root bin
-f none usr/lib/python2.4/vendor-packages/rdiff_backup/statistics.py 0444 root bin
-f none usr/lib/python2.4/vendor-packages/rdiff_backup/statistics.pyc 0444 root bin
-f none usr/lib/python2.4/vendor-packages/rdiff_backup/user_group.py 0444 root bin
-f none usr/lib/python2.4/vendor-packages/rdiff_backup/user_group.pyc 0444 root bin
-f none usr/lib/python2.4/vendor-packages/rdiff_backup/compare.pyc 0444 root bin
-f none usr/lib/python2.4/vendor-packages/rdiff_backup/compare.py 0444 root bin
-f none usr/lib/python2.4/vendor-packages/rdiff_backup/hash.py 0444 root bin
-f none usr/lib/python2.4/vendor-packages/rdiff_backup/hash.pyc 0444 root bin
-f none usr/lib/python2.4/vendor-packages/rdiff_backup/longname.py 0444 root bin
-f none usr/lib/python2.4/vendor-packages/rdiff_backup/longname.pyc 0444 root bin
-f none usr/lib/python2.4/vendor-packages/rdiff_backup/win_acls.py 0444 root bin
-f none usr/lib/python2.4/vendor-packages/rdiff_backup/win_acls.pyc 0444 root bin
+d none usr/lib/python2.6 0755 root bin
+d none usr/lib/python2.6/vendor-packages 0755 root bin
+d none usr/lib/python2.6/vendor-packages/rdiff_backup 0755 root bin
+f none usr/lib/python2.6/vendor-packages/rdiff_backup/C.so 0555 root bin
+f none usr/lib/python2.6/vendor-packages/rdiff_backup/_librsync.so 0555 root bin
+f none usr/lib/python2.6/vendor-packages/rdiff_backup/FilenameMapping.py 0444 root bin
+f none usr/lib/python2.6/vendor-packages/rdiff_backup/FilenameMapping.pyc 0444 root bin
+f none usr/lib/python2.6/vendor-packages/rdiff_backup/Globals.py 0444 root bin
+f none usr/lib/python2.6/vendor-packages/rdiff_backup/Globals.pyc 0444 root bin
+f none usr/lib/python2.6/vendor-packages/rdiff_backup/Hardlink.py 0444 root bin
+f none usr/lib/python2.6/vendor-packages/rdiff_backup/Hardlink.pyc 0444 root bin
+f none usr/lib/python2.6/vendor-packages/rdiff_backup/Main.py 0444 root bin
+f none usr/lib/python2.6/vendor-packages/rdiff_backup/Main.pyc 0444 root bin
+f none usr/lib/python2.6/vendor-packages/rdiff_backup/Rdiff.py 0444 root bin
+f none usr/lib/python2.6/vendor-packages/rdiff_backup/Rdiff.pyc 0444 root bin
+f none usr/lib/python2.6/vendor-packages/rdiff_backup/Security.py 0444 root bin
+f none usr/lib/python2.6/vendor-packages/rdiff_backup/Security.pyc 0444 root bin
+f none usr/lib/python2.6/vendor-packages/rdiff_backup/SetConnections.py 0444 root bin
+f none usr/lib/python2.6/vendor-packages/rdiff_backup/SetConnections.pyc 0444 root bin
+f none usr/lib/python2.6/vendor-packages/rdiff_backup/TempFile.py 0444 root bin
+f none usr/lib/python2.6/vendor-packages/rdiff_backup/TempFile.pyc 0444 root bin
+f none usr/lib/python2.6/vendor-packages/rdiff_backup/Time.py 0444 root bin
+f none usr/lib/python2.6/vendor-packages/rdiff_backup/Time.pyc 0444 root bin
+f none usr/lib/python2.6/vendor-packages/rdiff_backup/__init__.py 0444 root bin
+f none usr/lib/python2.6/vendor-packages/rdiff_backup/__init__.pyc 0444 root bin
+f none usr/lib/python2.6/vendor-packages/rdiff_backup/backup.py 0444 root bin
+f none usr/lib/python2.6/vendor-packages/rdiff_backup/backup.pyc 0444 root bin
+f none usr/lib/python2.6/vendor-packages/rdiff_backup/connection.py 0444 root bin
+f none usr/lib/python2.6/vendor-packages/rdiff_backup/connection.pyc 0444 root bin
+f none usr/lib/python2.6/vendor-packages/rdiff_backup/eas_acls.py 0444 root bin
+f none usr/lib/python2.6/vendor-packages/rdiff_backup/eas_acls.pyc 0444 root bin
+f none usr/lib/python2.6/vendor-packages/rdiff_backup/fs_abilities.py 0444 root bin
+f none usr/lib/python2.6/vendor-packages/rdiff_backup/fs_abilities.pyc 0444 root bin
+f none usr/lib/python2.6/vendor-packages/rdiff_backup/increment.py 0444 root bin
+f none usr/lib/python2.6/vendor-packages/rdiff_backup/increment.pyc 0444 root bin
+f none usr/lib/python2.6/vendor-packages/rdiff_backup/iterfile.py 0444 root bin
+f none usr/lib/python2.6/vendor-packages/rdiff_backup/iterfile.pyc 0444 root bin
+f none usr/lib/python2.6/vendor-packages/rdiff_backup/lazy.py 0444 root bin
+f none usr/lib/python2.6/vendor-packages/rdiff_backup/lazy.pyc 0444 root bin
+f none usr/lib/python2.6/vendor-packages/rdiff_backup/librsync.py 0444 root bin
+f none usr/lib/python2.6/vendor-packages/rdiff_backup/librsync.pyc 0444 root bin
+f none usr/lib/python2.6/vendor-packages/rdiff_backup/log.py 0444 root bin
+f none usr/lib/python2.6/vendor-packages/rdiff_backup/log.pyc 0444 root bin
+f none usr/lib/python2.6/vendor-packages/rdiff_backup/manage.py 0444 root bin
+f none usr/lib/python2.6/vendor-packages/rdiff_backup/manage.pyc 0444 root bin
+f none usr/lib/python2.6/vendor-packages/rdiff_backup/metadata.py 0444 root bin
+f none usr/lib/python2.6/vendor-packages/rdiff_backup/metadata.pyc 0444 root bin
+f none usr/lib/python2.6/vendor-packages/rdiff_backup/regress.py 0444 root bin
+f none usr/lib/python2.6/vendor-packages/rdiff_backup/regress.pyc 0444 root bin
+f none usr/lib/python2.6/vendor-packages/rdiff_backup/restore.py 0444 root bin
+f none usr/lib/python2.6/vendor-packages/rdiff_backup/restore.pyc 0444 root bin
+f none usr/lib/python2.6/vendor-packages/rdiff_backup/robust.py 0444 root bin
+f none usr/lib/python2.6/vendor-packages/rdiff_backup/robust.pyc 0444 root bin
+f none usr/lib/python2.6/vendor-packages/rdiff_backup/rorpiter.py 0444 root bin
+f none usr/lib/python2.6/vendor-packages/rdiff_backup/rorpiter.pyc 0444 root bin
+f none usr/lib/python2.6/vendor-packages/rdiff_backup/rpath.py 0444 root bin
+f none usr/lib/python2.6/vendor-packages/rdiff_backup/rpath.pyc 0444 root bin
+f none usr/lib/python2.6/vendor-packages/rdiff_backup/selection.py 0444 root bin
+f none usr/lib/python2.6/vendor-packages/rdiff_backup/selection.pyc 0444 root bin
+f none usr/lib/python2.6/vendor-packages/rdiff_backup/static.py 0444 root bin
+f none usr/lib/python2.6/vendor-packages/rdiff_backup/static.pyc 0444 root bin
+f none usr/lib/python2.6/vendor-packages/rdiff_backup/statistics.py 0444 root bin
+f none usr/lib/python2.6/vendor-packages/rdiff_backup/statistics.pyc 0444 root bin
+f none usr/lib/python2.6/vendor-packages/rdiff_backup/user_group.py 0444 root bin
+f none usr/lib/python2.6/vendor-packages/rdiff_backup/user_group.pyc 0444 root bin
+f none usr/lib/python2.6/vendor-packages/rdiff_backup/compare.pyc 0444 root bin
+f none usr/lib/python2.6/vendor-packages/rdiff_backup/compare.py 0444 root bin
+f none usr/lib/python2.6/vendor-packages/rdiff_backup/hash.py 0444 root bin
+f none usr/lib/python2.6/vendor-packages/rdiff_backup/hash.pyc 0444 root bin
+f none usr/lib/python2.6/vendor-packages/rdiff_backup/longname.py 0444 root bin
+f none usr/lib/python2.6/vendor-packages/rdiff_backup/longname.pyc 0444 root bin
+f none usr/lib/python2.6/vendor-packages/rdiff_backup/win_acls.py 0444 root bin
+f none usr/lib/python2.6/vendor-packages/rdiff_backup/win_acls.pyc 0444 root bin
d none usr/share 0755 root sys
d none usr/share/doc 0755 root other
d none usr/share/doc/rdiff-backup-1.2.1 0755 root bin
--- a/usr/src/pkgdefs/SUNWtcpdump/pkginfo.tmpl Sat Oct 30 12:35:08 2010 -0700
+++ b/usr/src/pkgdefs/SUNWtcpdump/pkginfo.tmpl Tue Nov 16 22:41:08 2010 -0800
@@ -22,7 +22,7 @@
#
# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
#
-# ident "@(#)pkginfo.tmpl 1.2 10/07/22 SMI"
+# ident "@(#)pkginfo.tmpl 1.3 10/11/01 SMI"
#
#
@@ -39,7 +39,7 @@
SUNW_PKGTYPE="usr"
MAXINST="1000"
CATEGORY="system"
-DESC="tcpdump - A tool for network monitoring and data acquisition (v4.0.0)"
+DESC="tcpdump - A tool for network monitoring and data acquisition (v4.1.1)"
VENDOR="COMPANY"
HOTLINE="Please contact your local service provider"
EMAIL=""
--- a/usr/src/pkgdefs/SUNWwireshark/pkginfo.tmpl Sat Oct 30 12:35:08 2010 -0700
+++ b/usr/src/pkgdefs/SUNWwireshark/pkginfo.tmpl Tue Nov 16 22:41:08 2010 -0800
@@ -23,7 +23,7 @@
# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
#
-#ident "@(#)pkginfo.tmpl 1.14 10/08/09 SMI"
+#ident "@(#)pkginfo.tmpl 1.15 10/10/26 SMI"
#
#
# This required package information file describes characteristics of the
@@ -39,7 +39,7 @@
SUNW_PKGTYPE="usr"
MAXINST="1000"
CATEGORY="system"
-DESC="Wireshark - Network protocol analyzer (1.2.10)"
+DESC="Wireshark - Network protocol analyzer (1.2.12)"
VENDOR="COMPANY"
HOTLINE="Please contact your local service provider"
EMAIL=""
--- a/usr/src/pkgdefs/SUNWwireshark/prototype_com Sat Oct 30 12:35:08 2010 -0700
+++ b/usr/src/pkgdefs/SUNWwireshark/prototype_com Tue Nov 16 22:41:08 2010 -0800
@@ -22,7 +22,7 @@
#
# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
#
-#ident "@(#)prototype_com 1.13 10/08/09 SMI"
+#ident "@(#)prototype_com 1.14 10/10/26 SMI"
#
# This required package information file contains a list of package contents.
@@ -57,25 +57,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.10 0755 root bin
-f none usr/lib/wireshark/plugins/1.2.10/asn1.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.10/coseventcomm.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.10/cosnaming.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.10/docsis.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.10/ethercat.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.10/gryphon.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.10/irda.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.10/m2m.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.10/mate.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.10/opcua.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.10/parlay.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.10/profinet.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.10/sercosiii.so 0755 root bin
-f none usr/lib/wireshark/plugins/1.2.10/stats_tree.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.10/tango.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.10/unistim.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.10/wimax.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.10/wimaxasncp.so 0555 root bin
+d none usr/lib/wireshark/plugins/1.2.12 0755 root bin
+f none usr/lib/wireshark/plugins/1.2.12/asn1.so 0555 root bin
+f none usr/lib/wireshark/plugins/1.2.12/coseventcomm.so 0555 root bin
+f none usr/lib/wireshark/plugins/1.2.12/cosnaming.so 0555 root bin
+f none usr/lib/wireshark/plugins/1.2.12/docsis.so 0555 root bin
+f none usr/lib/wireshark/plugins/1.2.12/ethercat.so 0555 root bin
+f none usr/lib/wireshark/plugins/1.2.12/gryphon.so 0555 root bin
+f none usr/lib/wireshark/plugins/1.2.12/irda.so 0555 root bin
+f none usr/lib/wireshark/plugins/1.2.12/m2m.so 0555 root bin
+f none usr/lib/wireshark/plugins/1.2.12/mate.so 0555 root bin
+f none usr/lib/wireshark/plugins/1.2.12/opcua.so 0555 root bin
+f none usr/lib/wireshark/plugins/1.2.12/parlay.so 0555 root bin
+f none usr/lib/wireshark/plugins/1.2.12/profinet.so 0555 root bin
+f none usr/lib/wireshark/plugins/1.2.12/sercosiii.so 0755 root bin
+f none usr/lib/wireshark/plugins/1.2.12/stats_tree.so 0555 root bin
+f none usr/lib/wireshark/plugins/1.2.12/tango.so 0555 root bin
+f none usr/lib/wireshark/plugins/1.2.12/unistim.so 0555 root bin
+f none usr/lib/wireshark/plugins/1.2.12/wimax.so 0555 root bin
+f none usr/lib/wireshark/plugins/1.2.12/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