7035055 move apr and apr-util to userland
authorPetr Sumbera <petr.sumbera@oracle.com>
Tue, 26 Apr 2011 13:46:50 -0700
changeset 203 887f23af6934
parent 202 272e371b3a44
child 204 78dfe4707c7c
7035055 move apr and apr-util to userland
components/apr-util/Makefile
components/apr-util/apr-util-13-apr-ldap.p5m
components/apr-util/apr-util-13-dbd-mysql.p5m
components/apr-util/apr-util-13-dbd-sqlite.p5m
components/apr-util/apr-util-13-doc.p5m
components/apr-util/apr-util-13.p5m
components/apr-util/apr-util.license
components/apr-util/doc-transform
components/apr-util/patches/CVE-2010-1623.patch
components/apr-util/patches/apr_common.m4.patch
components/apr-util/patches/config.layout.patch
components/apr-util/patches/makefile-out.patch
components/apr/Makefile
components/apr/apr-13-doc.p5m
components/apr/apr-13.p5m
components/apr/apr.license
components/apr/doc-transform
components/apr/patches/apr_common.m4.patch
components/apr/patches/apr_hash.patch
components/apr/patches/config.layout.patch
components/apr/patches/extended_file.patch
components/apr/patches/largefile.patch
components/apr/patches/libtool.m4.patch
components/apr/patches/makefile-out.patch
components/apr/patches/port_getn_rc.patch
components/meta-packages/history/SUNWapr13dev.p5m
components/meta-packages/history/SUNWapr13doc.p5m
components/meta-packages/history/SUNWapr13lib.p5m
components/meta-packages/history/SUNWapu13-ldap.p5m
components/meta-packages/history/SUNWapu13dbd-mysql.p5m
components/meta-packages/history/SUNWapu13dbd-sqlite.p5m
components/meta-packages/history/SUNWapu13dev.p5m
components/meta-packages/history/SUNWapu13doc.p5m
components/meta-packages/history/SUNWapu13lib.p5m
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/apr-util/Makefile	Tue Apr 26 13:46:50 2011 -0700
@@ -0,0 +1,86 @@
+#
+# 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) 2011, Oracle and/or its affiliates. All rights reserved.
+#
+include ../../make-rules/shared-macros.mk
+
+COMPONENT_NAME=		apr-util
+COMPONENT_VERSION=	1.3.9
+COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
+COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
+COMPONENT_ARCHIVE_HASH=	sha1:fd2a76352353e6bc2f7cc7da80e2ab3842795199
+COMPONENT_ARCHIVE_URL=	http://archive.apache.org/dist/apr/$(COMPONENT_ARCHIVE)
+
+include ../../make-rules/prep.mk
+include ../../make-rules/configure.mk
+include ../../make-rules/ips.mk
+
+PATCH_LEVEL=0
+
+APRUTIL_PREFIX=/usr/apr-util/1.3
+
+# CONFIGURE_OPTIONS need to be reset so that pre-defined layout can be
+# used without being overwritten with default configure paths.
+# CC and CFLAGS are here just for configure needs as during the build are
+# used those from apr-1-config. Therefore also PATH definition bellow
+# contains compiler path as the first item.
+CONFIGURE_OPTIONS  =	--prefix=$(APRUTIL_PREFIX)
+CONFIGURE_OPTIONS +=	--with-mysql=/usr/mysql/5.1
+CONFIGURE_OPTIONS +=	--with-expat=/usr
+CONFIGURE_OPTIONS +=	--with-sqlite3=/usr
+CONFIGURE_OPTIONS +=	--with-ldap=ldap
+CONFIGURE_OPTIONS +=	--without-odbc
+CONFIGURE_OPTIONS +=	CC="$(CC)"
+CONFIGURE_OPTIONS +=	CXX="$(CCC)"
+CONFIGURE_OPTIONS +=	CFLAGS="$(CFLAGS)"
+CONFIGURE_OPTIONS +=	$(CONFIGURE_OPTIONS.$(BITS))
+CONFIGURE_OPTIONS.32 +=	--enable-layout=OpenSolaris
+CONFIGURE_OPTIONS.64 +=	--enable-layout=OpenSolaris-$(MACH64)
+CONFIGURE_OPTIONS.32 +=	--with-apr=/usr/apr/1.3/bin/apr-1-config
+CONFIGURE_OPTIONS.64 +=	--with-apr=/usr/apr/1.3/bin/$(MACH64)/apr-1-config
+CONFIGURE_OPTIONS.64 +=	MYSQL_CONFIG=/usr/mysql/5.1/bin/$(MACH64)/mysql_config
+
+PATH=$(SPRO_VROOT)/bin:/usr/bin:/usr/gnu/bin
+
+COMPONENT_TEST_TARGETS= test
+
+# We need this to keep doxygen happy (for include/ and docs/ contents).
+COMPONENT_PRE_CONFIGURE_ACTION += ($(CLONEY) $(SOURCE_DIR) $(@D));
+
+# Some patches need configure script recreation.
+COMPONENT_PRE_CONFIGURE_ACTION += (cd $(@D); autoconf);
+
+# Documentation is generated in and directly packaged from 32 bit build
+# directory using doxygen.
+PKG_PROTO_DIRS += $(BUILD_DIR)/$(MACH32)/docs/dox/html
+PUBLISH_TRANSFORMS += doc-transform
+docs: $(BUILD_DIR)/$(MACH32)/.built
+	cd $(BUILD_DIR)/$(MACH32); doxygen docs/doxygen.conf
+
+build: $(BUILD_32_and_64) docs
+
+install: $(INSTALL_32_and_64)
+
+test: $(TEST_32_and_64)
+
+BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
+
+include ../../make-rules/depend.mk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/apr-util/apr-util-13-apr-ldap.p5m	Tue Apr 26 13:46:50 2011 -0700
@@ -0,0 +1,52 @@
+#
+# 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) 2011, Oracle and/or its affiliates. All rights reserved.
+#
+set name=pkg.fmri \
+    value=pkg:/library/apr-util-13/apr-ldap@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary \
+    value="Apache Portable Runtime Utility (APR-util) 1.3 LDAP's stub"
+set name=info.classification \
+    value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
+set name=info.upstream_url value="http://apr.apache.org"
+set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/LSARC/2008/541
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+
+dir path=usr
+dir path=usr/apr-util
+dir path=usr/apr-util/1.3
+dir path=usr/apr-util/1.3/lib
+dir path=usr/apr-util/1.3/lib/apr-util-1
+dir path=usr/apr-util/1.3/lib/$(MACH64)
+dir path=usr/apr-util/1.3/lib/$(MACH64)/apr-util-1
+file path=usr/apr-util/1.3/lib/apr-util-1/apr_ldap-1.so
+file path=usr/apr-util/1.3/lib/$(MACH64)/apr-util-1/apr_ldap-1.so
+link path=usr/apr-util/1.3/lib/apr-util-1/apr_ldap.so target=apr_ldap-1.so
+link path=usr/apr-util/1.3/lib/$(MACH64)/apr-util-1/apr_ldap.so target=apr_ldap-1.so
+
+
+license apr-util.license license="Apache v2.0"
+
+legacy	pkg=SUNWapu13-ldap \
+	name="Apache Portable Runtime Utility (APR-util) 1.3 LDAP's stub" \
+	desc="Apache Portable Runtime Utility (APR-util) 1.3 LDAP's stub"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/apr-util/apr-util-13-dbd-mysql.p5m	Tue Apr 26 13:46:50 2011 -0700
@@ -0,0 +1,52 @@
+#
+# 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) 2011, Oracle and/or its affiliates. All rights reserved.
+#
+set name=pkg.fmri \
+    value=pkg:/library/apr-util-13/dbd-mysql@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary \
+    value="Apache Portable Runtime Utility (APR-util) 1.3 DBD Driver for MySQL 5.0"
+set name=info.classification \
+    value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
+set name=info.upstream_url value="http://apr.apache.org"
+set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/LSARC/2008/541
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+
+dir path=usr
+dir path=usr/apr-util
+dir path=usr/apr-util/1.3
+dir path=usr/apr-util/1.3/lib
+dir path=usr/apr-util/1.3/lib/apr-util-1
+dir path=usr/apr-util/1.3/lib/$(MACH64)
+dir path=usr/apr-util/1.3/lib/$(MACH64)/apr-util-1
+file path=usr/apr-util/1.3/lib/apr-util-1/apr_dbd_mysql-1.so
+file path=usr/apr-util/1.3/lib/$(MACH64)/apr-util-1/apr_dbd_mysql-1.so
+link path=usr/apr-util/1.3/lib/apr-util-1/apr_dbd_mysql.so target=apr_dbd_mysql-1.so 
+link path=usr/apr-util/1.3/lib/$(MACH64)/apr-util-1/apr_dbd_mysql.so target=apr_dbd_mysql-1.so 
+
+
+license apr-util.license license="Apache v2.0"
+
+legacy	pkg=SUNWapu13dbd-mysql \
+	name="Apache Portable Runtime Utility (APR-util) 1.3 DBD Driver for MySQL 5.0" \
+	desc="Apache Portable Runtime Utility (APR-util) 1.3 DBD Driver for MySQL 5.0"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/apr-util/apr-util-13-dbd-sqlite.p5m	Tue Apr 26 13:46:50 2011 -0700
@@ -0,0 +1,52 @@
+#
+# 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) 2011, Oracle and/or its affiliates. All rights reserved.
+#
+set name=pkg.fmri \
+    value=pkg:/library/apr-util-13/dbd-sqlite@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary \
+    value="Apache Portable Runtime Utility (APR-util) 1.3 DBD Driver for SQLite 3.5"
+set name=info.classification \
+    value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
+set name=info.upstream_url value="http://apr.apache.org"
+set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/LSARC/2008/541
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+
+dir path=usr
+dir path=usr/apr-util
+dir path=usr/apr-util/1.3
+dir path=usr/apr-util/1.3/lib
+dir path=usr/apr-util/1.3/lib/apr-util-1
+dir path=usr/apr-util/1.3/lib/$(MACH64)
+dir path=usr/apr-util/1.3/lib/$(MACH64)/apr-util-1
+file path=usr/apr-util/1.3/lib/apr-util-1/apr_dbd_sqlite3-1.so
+file path=usr/apr-util/1.3/lib/$(MACH64)/apr-util-1/apr_dbd_sqlite3-1.so
+link path=usr/apr-util/1.3/lib/apr-util-1/apr_dbd_sqlite3.so target=apr_dbd_sqlite3-1.so
+link path=usr/apr-util/1.3/lib/$(MACH64)/apr-util-1/apr_dbd_sqlite3.so target=apr_dbd_sqlite3-1.so
+
+
+license apr-util.license license="Apache v2.0"
+
+legacy	pkg=SUNWapu13dbd-sqlite \
+	name="Apache Portable Runtime Utility (APR-util) 1.3 DBD Driver for SQLite 3.5" \
+	desc="Apache Portable Runtime Utility (APR-util) 1.3 DBD Driver for SQLite 3.5"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/apr-util/apr-util-13-doc.p5m	Tue Apr 26 13:46:50 2011 -0700
@@ -0,0 +1,213 @@
+#
+# 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) 2011, Oracle and/or its affiliates. All rights reserved.
+#
+set name=pkg.fmri \
+    value=pkg:/library/apr-util-13/documentation@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary \
+    value="Apache Portable Runtime Utility (APR-util) 1.3 documentation"
+set name=info.classification \
+    value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
+set name=info.upstream_url value="http://apr.apache.org"
+set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/LSARC/2008/541
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+
+dir path=usr
+dir path=usr/apr-util
+dir path=usr/apr-util/1.3
+dir path=usr/apr-util/1.3/manual
+file path=usr/apr-util/1.3/manual/abts_8h-source.html
+file path=usr/apr-util/1.3/manual/abts__tests_8h-source.html
+file path=usr/apr-util/1.3/manual/acconfig_8h-source.html
+file path=usr/apr-util/1.3/manual/annotated.html
+file path=usr/apr-util/1.3/manual/apr__anylock_8h-source.html
+file path=usr/apr-util/1.3/manual/apr__anylock_8h.html
+file path=usr/apr-util/1.3/manual/apr__base64_8h-source.html
+file path=usr/apr-util/1.3/manual/apr__base64_8h.html
+file path=usr/apr-util/1.3/manual/apr__buckets_8h-source.html
+file path=usr/apr-util/1.3/manual/apr__buckets_8h.html
+file path=usr/apr-util/1.3/manual/apr__date_8h-source.html
+file path=usr/apr-util/1.3/manual/apr__date_8h.html
+file path=usr/apr-util/1.3/manual/apr__dbd_8h-source.html
+file path=usr/apr-util/1.3/manual/apr__dbd_8h.html
+file path=usr/apr-util/1.3/manual/apr__dbd__internal_8h-source.html
+file path=usr/apr-util/1.3/manual/apr__dbd__odbc__v2_8h-source.html
+file path=usr/apr-util/1.3/manual/apr__dbm_8h-source.html
+file path=usr/apr-util/1.3/manual/apr__dbm_8h.html
+file path=usr/apr-util/1.3/manual/apr__dbm__private_8h-source.html
+file path=usr/apr-util/1.3/manual/apr__hooks_8h-source.html
+file path=usr/apr-util/1.3/manual/apr__hooks_8h.html
+file path=usr/apr-util/1.3/manual/apr__ldap_8h-source.html
+file path=usr/apr-util/1.3/manual/apr__ldap_8h.html
+file path=usr/apr-util/1.3/manual/apr__ldap__init_8h-source.html
+file path=usr/apr-util/1.3/manual/apr__ldap__init_8h.html
+file path=usr/apr-util/1.3/manual/apr__ldap__option_8h-source.html
+file path=usr/apr-util/1.3/manual/apr__ldap__option_8h.html
+file path=usr/apr-util/1.3/manual/apr__ldap__rebind_8h-source.html
+file path=usr/apr-util/1.3/manual/apr__ldap__rebind_8h.html
+file path=usr/apr-util/1.3/manual/apr__ldap__url_8h-source.html
+file path=usr/apr-util/1.3/manual/apr__ldap__url_8h.html
+file path=usr/apr-util/1.3/manual/apr__md4_8h-source.html
+file path=usr/apr-util/1.3/manual/apr__md4_8h.html
+file path=usr/apr-util/1.3/manual/apr__md5_8h-source.html
+file path=usr/apr-util/1.3/manual/apr__md5_8h.html
+file path=usr/apr-util/1.3/manual/apr__memcache_8h-source.html
+file path=usr/apr-util/1.3/manual/apr__memcache_8h.html
+file path=usr/apr-util/1.3/manual/apr__optional_8h-source.html
+file path=usr/apr-util/1.3/manual/apr__optional_8h.html
+file path=usr/apr-util/1.3/manual/apr__optional__hooks_8h-source.html
+file path=usr/apr-util/1.3/manual/apr__optional__hooks_8h.html
+file path=usr/apr-util/1.3/manual/apr__queue_8h-source.html
+file path=usr/apr-util/1.3/manual/apr__queue_8h.html
+file path=usr/apr-util/1.3/manual/apr__reslist_8h-source.html
+file path=usr/apr-util/1.3/manual/apr__reslist_8h.html
+file path=usr/apr-util/1.3/manual/apr__rmm_8h-source.html
+file path=usr/apr-util/1.3/manual/apr__rmm_8h.html
+file path=usr/apr-util/1.3/manual/apr__sdbm_8h-source.html
+file path=usr/apr-util/1.3/manual/apr__sdbm_8h.html
+file path=usr/apr-util/1.3/manual/apr__sha1_8h-source.html
+file path=usr/apr-util/1.3/manual/apr__sha1_8h.html
+file path=usr/apr-util/1.3/manual/apr__strmatch_8h-source.html
+file path=usr/apr-util/1.3/manual/apr__strmatch_8h.html
+file path=usr/apr-util/1.3/manual/apr__thread__pool_8h-source.html
+file path=usr/apr-util/1.3/manual/apr__thread__pool_8h.html
+file path=usr/apr-util/1.3/manual/apr__uri_8h-source.html
+file path=usr/apr-util/1.3/manual/apr__uri_8h.html
+file path=usr/apr-util/1.3/manual/apr__uuid_8h-source.html
+file path=usr/apr-util/1.3/manual/apr__uuid_8h.html
+file path=usr/apr-util/1.3/manual/apr__xlate_8h-source.html
+file path=usr/apr-util/1.3/manual/apr__xlate_8h.html
+file path=usr/apr-util/1.3/manual/apr__xml_8h-source.html
+file path=usr/apr-util/1.3/manual/apr__xml_8h.html
+file path=usr/apr-util/1.3/manual/apu_8h-source.html
+file path=usr/apr-util/1.3/manual/apu__config_8h-source.html
+file path=usr/apr-util/1.3/manual/apu__internal_8h-source.html
+file path=usr/apr-util/1.3/manual/apu__select__dbm_8h-source.html
+file path=usr/apr-util/1.3/manual/apu__version_8h-source.html
+file path=usr/apr-util/1.3/manual/apu__version_8h.html
+file path=usr/apr-util/1.3/manual/apu__want_8h-source.html
+file path=usr/apr-util/1.3/manual/apu__want_8h.html
+file path=usr/apr-util/1.3/manual/ascii_8h-source.html
+file path=usr/apr-util/1.3/manual/asciitab_8h-source.html
+file path=usr/apr-util/1.3/manual/bug.html
+file path=usr/apr-util/1.3/manual/classes.html
+file path=usr/apr-util/1.3/manual/doxygen.css
+file path=usr/apr-util/1.3/manual/doxygen.png
+file path=usr/apr-util/1.3/manual/files.html
+file path=usr/apr-util/1.3/manual/functions.html
+file path=usr/apr-util/1.3/manual/functions_enum.html
+file path=usr/apr-util/1.3/manual/functions_eval.html
+file path=usr/apr-util/1.3/manual/functions_func.html
+file path=usr/apr-util/1.3/manual/functions_vars.html
+file path=usr/apr-util/1.3/manual/globals.html
+file path=usr/apr-util/1.3/manual/globals_defs.html
+file path=usr/apr-util/1.3/manual/globals_enum.html
+file path=usr/apr-util/1.3/manual/globals_eval.html
+file path=usr/apr-util/1.3/manual/globals_func.html
+file path=usr/apr-util/1.3/manual/globals_type.html
+file path=usr/apr-util/1.3/manual/globals_vars.html
+file path=usr/apr-util/1.3/manual/group___a_p_r___m_d5.html
+file path=usr/apr-util/1.3/manual/group___a_p_r___u_u_i_d.html
+file path=usr/apr-util/1.3/manual/group___a_p_r___util.html
+file path=usr/apr-util/1.3/manual/group___a_p_r___util___base64.html
+file path=usr/apr-util/1.3/manual/group___a_p_r___util___bucket___brigades.html
+file path=usr/apr-util/1.3/manual/group___a_p_r___util___d_b_d.html
+file path=usr/apr-util/1.3/manual/group___a_p_r___util___d_b_m.html
+file path=usr/apr-util/1.3/manual/group___a_p_r___util___d_b_m___s_d_b_m.html
+file path=usr/apr-util/1.3/manual/group___a_p_r___util___date.html
+file path=usr/apr-util/1.3/manual/group___a_p_r___util___f_i_f_o.html
+file path=usr/apr-util/1.3/manual/group___a_p_r___util___hook.html
+file path=usr/apr-util/1.3/manual/group___a_p_r___util___l_d_a_p.html
+file path=usr/apr-util/1.3/manual/group___a_p_r___util___m_c.html
+file path=usr/apr-util/1.3/manual/group___a_p_r___util___m_d4.html
+file path=usr/apr-util/1.3/manual/group___a_p_r___util___o_p_t___h_o_o_k.html
+file path=usr/apr-util/1.3/manual/group___a_p_r___util___opt.html
+file path=usr/apr-util/1.3/manual/group___a_p_r___util___r_l.html
+file path=usr/apr-util/1.3/manual/group___a_p_r___util___r_m_m.html
+file path=usr/apr-util/1.3/manual/group___a_p_r___util___str_match.html
+file path=usr/apr-util/1.3/manual/group___a_p_r___util___t_p.html
+file path=usr/apr-util/1.3/manual/group___a_p_r___util___u_r_i.html
+file path=usr/apr-util/1.3/manual/group___a_p_r___util___x_m_l.html
+file path=usr/apr-util/1.3/manual/group___a_p_r___x_l_a_t_e.html
+file path=usr/apr-util/1.3/manual/iasciitab_8h-source.html
+file path=usr/apr-util/1.3/manual/index.html
+file path=usr/apr-util/1.3/manual/latin1tab_8h-source.html
+file path=usr/apr-util/1.3/manual/map__osd__ebcdic__df04__1_8h-source.html
+file path=usr/apr-util/1.3/manual/modules.html
+file path=usr/apr-util/1.3/manual/namespace_apache.html
+file path=usr/apr-util/1.3/manual/namespaces.html
+file path=usr/apr-util/1.3/manual/nametab_8h-source.html
+file path=usr/apr-util/1.3/manual/osd__ebcdic__df04__1_8h-source.html
+file path=usr/apr-util/1.3/manual/pages.html
+file path=usr/apr-util/1.3/manual/sdbm__pair_8h-source.html
+file path=usr/apr-util/1.3/manual/sdbm__private_8h-source.html
+file path=usr/apr-util/1.3/manual/sdbm__tune_8h-source.html
+file path=usr/apr-util/1.3/manual/structapr__anylock__t.html
+file path=usr/apr-util/1.3/manual/structapr__bucket.html
+file path=usr/apr-util/1.3/manual/structapr__bucket__brigade.html
+file path=usr/apr-util/1.3/manual/structapr__bucket__file.html
+file path=usr/apr-util/1.3/manual/structapr__bucket__heap.html
+file path=usr/apr-util/1.3/manual/structapr__bucket__mmap.html
+file path=usr/apr-util/1.3/manual/structapr__bucket__pool.html
+file path=usr/apr-util/1.3/manual/structapr__bucket__refcount.html
+file path=usr/apr-util/1.3/manual/structapr__bucket__type__t.html
+file path=usr/apr-util/1.3/manual/structapr__datum__t.html
+file path=usr/apr-util/1.3/manual/structapr__dbm__t.html
+file path=usr/apr-util/1.3/manual/structapr__dbm__type__t.html
+file path=usr/apr-util/1.3/manual/structapr__ldap__err__t.html
+file path=usr/apr-util/1.3/manual/structapr__ldap__url__desc__t.html
+file path=usr/apr-util/1.3/manual/structapr__md4__ctx__t.html
+file path=usr/apr-util/1.3/manual/structapr__md5__ctx__t.html
+file path=usr/apr-util/1.3/manual/structapr__memcache__t.html
+file path=usr/apr-util/1.3/manual/structapr__memcache__value__t.html
+file path=usr/apr-util/1.3/manual/structapr__sdbm__datum__t.html
+file path=usr/apr-util/1.3/manual/structapr__sha1__ctx__t.html
+file path=usr/apr-util/1.3/manual/structapr__strmatch__pattern.html
+file path=usr/apr-util/1.3/manual/structapr__text.html
+file path=usr/apr-util/1.3/manual/structapr__text__header.html
+file path=usr/apr-util/1.3/manual/structapr__uri__t.html
+file path=usr/apr-util/1.3/manual/structapr__uuid__t.html
+file path=usr/apr-util/1.3/manual/structapr__xml__attr.html
+file path=usr/apr-util/1.3/manual/structapr__xml__doc.html
+file path=usr/apr-util/1.3/manual/structapr__xml__elem.html
+file path=usr/apr-util/1.3/manual/tab_b.gif
+file path=usr/apr-util/1.3/manual/tab_l.gif
+file path=usr/apr-util/1.3/manual/tab_r.gif
+file path=usr/apr-util/1.3/manual/tabs.css
+file path=usr/apr-util/1.3/manual/test__apu_8h-source.html
+file path=usr/apr-util/1.3/manual/testutil_8h-source.html
+file path=usr/apr-util/1.3/manual/todo.html
+file path=usr/apr-util/1.3/manual/unionapr__anylock__t_1_1apr__anylock__u__t.html
+file path=usr/apr-util/1.3/manual/unionapr__bucket__structs.html
+file path=usr/apr-util/1.3/manual/utf8tab_8h-source.html
+file path=usr/apr-util/1.3/manual/winconfig_8h-source.html
+file path=usr/apr-util/1.3/manual/xmlrole_8h-source.html
+file path=usr/apr-util/1.3/manual/xmltok_8h-source.html
+file path=usr/apr-util/1.3/manual/xmltok__impl_8h-source.html
+
+
+license apr-util.license license="Apache v2.0"
+
+legacy	pkg=SUNWapu13doc \
+	name="Apache Portable Runtime Utility (APR-util) 1.3 documentation" \
+	desc="Apache Portable Runtime Utility (APR-util) 1.3 documentation"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/apr-util/apr-util-13.p5m	Tue Apr 26 13:46:50 2011 -0700
@@ -0,0 +1,114 @@
+#
+# 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) 2011, Oracle and/or its affiliates. All rights reserved.
+#
+set name=pkg.fmri \
+    value=pkg:/library/apr-util-13@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary \
+    value="Apache Portable Runtime Utility (APR-util) 1.3 development header files and libraries"
+set name=info.classification \
+    value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
+set name=info.upstream_url value="http://apr.apache.org"
+set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/LSARC/2008/541
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+
+dir path=usr
+dir path=usr/apr-util
+dir path=usr/apr-util/1.3
+dir path=usr/apr-util/1.3/bin
+dir path=usr/apr-util/1.3/bin/$(MACH64)
+dir path=usr/apr-util/1.3/include
+dir path=usr/apr-util/1.3/lib
+dir path=usr/apr-util/1.3/lib/apr-util-1
+dir path=usr/apr-util/1.3/lib/pkgconfig
+dir path=usr/apr-util/1.3/lib/$(MACH64)
+dir path=usr/apr-util/1.3/lib/$(MACH64)/apr-util-1
+dir path=usr/apr-util/1.3/lib/$(MACH64)/pkgconfig
+dir path=usr/bin
+dir path=usr/bin/$(MACH64)
+file path=usr/apr-util/1.3/bin/apu-1-config
+file path=usr/apr-util/1.3/bin/$(MACH64)/apu-1-config
+file path=usr/apr-util/1.3/include/apr_anylock.h
+file path=usr/apr-util/1.3/include/apr_base64.h
+file path=usr/apr-util/1.3/include/apr_buckets.h
+file path=usr/apr-util/1.3/include/apr_date.h
+file path=usr/apr-util/1.3/include/apr_dbd.h
+file path=usr/apr-util/1.3/include/apr_dbm.h
+file path=usr/apr-util/1.3/include/apr_hooks.h
+file path=usr/apr-util/1.3/include/apr_ldap.h
+file path=usr/apr-util/1.3/include/apr_ldap_init.h
+file path=usr/apr-util/1.3/include/apr_ldap_option.h
+file path=usr/apr-util/1.3/include/apr_ldap_rebind.h
+file path=usr/apr-util/1.3/include/apr_ldap_url.h
+file path=usr/apr-util/1.3/include/apr_md4.h
+file path=usr/apr-util/1.3/include/apr_md5.h
+file path=usr/apr-util/1.3/include/apr_memcache.h
+file path=usr/apr-util/1.3/include/apr_optional.h
+file path=usr/apr-util/1.3/include/apr_optional_hooks.h
+file path=usr/apr-util/1.3/include/apr_queue.h
+file path=usr/apr-util/1.3/include/apr_reslist.h
+file path=usr/apr-util/1.3/include/apr_rmm.h
+file path=usr/apr-util/1.3/include/apr_sdbm.h
+file path=usr/apr-util/1.3/include/apr_sha1.h
+file path=usr/apr-util/1.3/include/apr_strmatch.h
+file path=usr/apr-util/1.3/include/apr_thread_pool.h
+file path=usr/apr-util/1.3/include/apr_uri.h
+file path=usr/apr-util/1.3/include/apr_uuid.h
+file path=usr/apr-util/1.3/include/apr_xlate.h
+file path=usr/apr-util/1.3/include/apr_xml.h
+file path=usr/apr-util/1.3/include/apu.h
+file path=usr/apr-util/1.3/include/apu_version.h
+file path=usr/apr-util/1.3/include/apu_want.h
+file path=usr/apr-util/1.3/lib/apr-util-1/apr_dbd_mysql.a
+file path=usr/apr-util/1.3/lib/apr-util-1/apr_dbd_sqlite3.a
+file path=usr/apr-util/1.3/lib/apr-util-1/apr_ldap.a
+file path=usr/apr-util/1.3/lib/aprutil.exp
+file path=usr/apr-util/1.3/lib/libaprutil-1.a
+file path=usr/apr-util/1.3/lib/libaprutil-1.so.0.3.9
+file path=usr/apr-util/1.3/lib/pkgconfig/apr-util-1.pc
+file path=usr/apr-util/1.3/lib/$(MACH64)/apr-util-1/apr_dbd_mysql.a
+file path=usr/apr-util/1.3/lib/$(MACH64)/apr-util-1/apr_dbd_sqlite3.a
+file path=usr/apr-util/1.3/lib/$(MACH64)/apr-util-1/apr_ldap.a
+file path=usr/apr-util/1.3/lib/$(MACH64)/aprutil.exp
+file path=usr/apr-util/1.3/lib/$(MACH64)/libaprutil-1.a
+file path=usr/apr-util/1.3/lib/$(MACH64)/libaprutil-1.so.0.3.9
+file path=usr/apr-util/1.3/lib/$(MACH64)/pkgconfig/apr-util-1.pc
+link path=usr/bin/$(MACH64)/apu-1-config target=../../apr-util/1.3/bin/$(MACH64)/apu-1-config
+link path=usr/apr-util/1.3/bin/64 target=$(MACH64)
+link path=usr/bin/apu-1-config target=../apr-util/1.3/bin/apu-1-config
+link path=usr/apr-util/1.3/lib/libaprutil-1.so.0 target=libaprutil-1.so.0.3.9
+link path=usr/apr-util/1.3/lib/libaprutil-1.so target=libaprutil-1.so.0.3.9
+link path=usr/apr-util/1.3/lib/64 target=$(MACH64)
+link path=usr/apr-util/1.3/lib/$(MACH64)/libaprutil-1.so target=libaprutil-1.so.0.3.9
+link path=usr/apr-util/1.3/lib/$(MACH64)/libaprutil-1.so.0 target=libaprutil-1.so.0.3.9
+
+
+license apr-util.license license="Apache v2.0"
+
+legacy	pkg=SUNWapu13dev \
+	name="Apache Portable Runtime Utility (APR-util) 1.3 development header files and libraries" \
+	desc="Apache Portable Runtime Utility (APR-util) 1.3 development header files and libraries"
+
+legacy	pkg=SUNWapu13lib \
+	name="Apache Portable Runtime Utility (APR-util) 1.3 Shared Libraries" \
+	desc="Apache Portable Runtime Utility (APR-util) 1.3 Shared Libraries"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/apr-util/apr-util.license	Tue Apr 26 13:46:50 2011 -0700
@@ -0,0 +1,443 @@
+                                 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 PORTABLE RUNTIME SUBCOMPONENTS: 
+
+The Apache Portable Runtime 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 include\apr_md5.h component: 
+/*
+ * This is work is derived from material Copyright RSA Data Security, Inc.
+ *
+ * The RSA copyright statement and Licence for that original material is
+ * included below. This is followed by the Apache copyright statement and
+ * licence for the modifications made to that material.
+ */
+
+/* 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.
+ */
+
+For the passwd\apr_md5.c component:
+
+/*
+ * This is work is derived from material Copyright RSA Data Security, Inc.
+ *
+ * The RSA copyright statement and Licence for that original material is
+ * included below. This is followed by the Apache copyright statement and
+ * licence for the modifications made to that material.
+ */
+
+/* MD5C.C - RSA Data Security, Inc., MD5 message-digest algorithm
+ */
+
+/* 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 apr_md5_encode() routine uses much code obtained from the FreeBSD 3.0
+ * MD5 crypt() function, which is licenced as follows:
+ * ----------------------------------------------------------------------------
+ * "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 crypto\apr_md4.c component:
+
+ * This is derived from material copyright RSA Data Security, Inc.
+ * Their notice is reproduced below in its entirety.
+ *
+ * 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. MD4 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. MD4 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.
+ */
+
+For the include\apr_md4.h component:
+
+ *
+ * This is derived from material copyright RSA Data Security, Inc.
+ * Their notice is reproduced below in its entirety.
+ *
+ * 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. MD4 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. MD4 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.
+ */
+
+For the test\testmd4.c component:
+
+ *
+ * This is derived from material copyright RSA Data Security, Inc.
+ * Their notice is reproduced below in its entirety.
+ *
+ * Copyright (C) 1990-2, RSA Data Security, Inc. Created 1990. All
+ * rights reserved.
+ *
+ * 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.
+ */
+
+For the xml\expat\conftools\install-sh component:
+
+#
+# install - install a program, script, or datafile
+# This comes from X11R5 (mit/util/scripts/install.sh).
+#
+# Copyright 1991 by the Massachusetts Institute of Technology
+#
+# 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 M.I.T. not be used in advertising or
+# publicity pertaining to distribution of the software without specific,
+# written prior permission.  M.I.T. makes no representations about the
+# suitability of this software for any purpose.  It is provided "as is"
+# without express or implied warranty.
+#
+
+For the expat xml parser 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 ldap/apr_ldap_url.c component:
+
+/* Portions Copyright 1998-2002 The OpenLDAP Foundation
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.  A copy of this license is available at
+ * http://www.OpenLDAP.org/license.html or in file LICENSE in the
+ * top-level directory of the distribution.
+ *
+ * OpenLDAP is a registered trademark of the OpenLDAP Foundation.
+ *
+ * Individual files and/or contributed packages may be copyright by
+ * other parties and subject to additional restrictions.
+ *
+ * This work is derived from the University of Michigan LDAP v3.3
+ * distribution.  Information concerning this software is available
+ * at: http://www.umich.edu/~dirsvcs/ldap/
+ *
+ * This work also contains materials derived from public sources.
+ *
+ * Additional information about OpenLDAP can be obtained at:
+ *     http://www.openldap.org/
+ */
+
+/*
+ * Portions Copyright (c) 1992-1996 Regents of the University of Michigan.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of Michigan at Ann Arbor. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.
+ */
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/apr-util/doc-transform	Tue Apr 26 13:46:50 2011 -0700
@@ -0,0 +1,25 @@
+#
+# 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) 2011, Oracle and/or its affiliates. All rights reserved.
+#
+
+<transform file path=usr/apr-util/1.3/manual/(.+)$ -> \
+	set action.hash %<\1> >
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/apr-util/patches/CVE-2010-1623.patch	Tue Apr 26 13:46:50 2011 -0700
@@ -0,0 +1,22 @@
+--- buckets/apr_brigade.c	2010/10/01 11:42:57	1003493
++++ buckets/apr_brigade.c	2010/10/01 11:43:26	1003494
+@@ -331,7 +331,18 @@
+             return APR_SUCCESS;
+         }
+         APR_BUCKET_REMOVE(e);
+-        APR_BRIGADE_INSERT_TAIL(bbOut, e);
++        if (APR_BUCKET_IS_METADATA(e) || len > APR_BUCKET_BUFF_SIZE/4) {
++            APR_BRIGADE_INSERT_TAIL(bbOut, e);
++        }
++        else {
++            if (len > 0) {
++                rv = apr_brigade_write(bbOut, NULL, NULL, str, len);
++                if (rv != APR_SUCCESS) {
++                    return rv;
++                }
++            }
++            apr_bucket_destroy(e);
++        }
+         readbytes += len;
+         /* We didn't find an APR_ASCII_LF within the maximum line length. */
+         if (readbytes >= maxbytes) {
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/apr-util/patches/apr_common.m4.patch	Tue Apr 26 13:46:50 2011 -0700
@@ -0,0 +1,12 @@
+=== This is added to fix the MKDEP value for Sun Studio compiler
+--- build/apr_common.m4.orig	Mon Oct 29 04:47:32 2007
++++ build/apr_common.m4	Wed Aug 13 01:36:00 2008
+@@ -948,7 +948,7 @@
+   int main() { return 0; }
+ EOF
+   MKDEP="true"
+-  for i in "$CC -MM" "$CC -M" "$CPP -MM" "$CPP -M" "cpp -M"; do
++  for i in "$CC -MM" "$CC -M" "$CC -xM" "$CPP -MM" "$CPP -M" "$CPP -xM" "cpp -M"; do
+     AC_MSG_CHECKING([if $i can create proper make dependencies])
+     if $i conftest.c 2>/dev/null | grep 'conftest.o: conftest.c' >/dev/null; then
+       MKDEP=$i
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/apr-util/patches/config.layout.patch	Tue Apr 26 13:46:50 2011 -0700
@@ -0,0 +1,62 @@
+--- config.layout.orig	Mon Apr 18 01:37:11 2011
++++ config.layout	Mon Apr 18 01:44:22 2011
+@@ -230,3 +230,59 @@
+     libsuffix:     -${APRUTIL_MAJOR_VERSION}
+     installbuilddir: ${prefix}/usr/share/apache2/build
+ </Layout>
++
++# OpenSolaris Layout 
++<Layout OpenSolaris>
++    prefix:        /usr/apr-util/1.3
++    exec_prefix:   ${prefix}
++    bindir:        ${exec_prefix}/bin
++    sbindir:       ${exec_prefix}/bin
++    libdir:        ${exec_prefix}/lib
++    libexecdir:    ${exec_prefix}/libexec
++    mandir:        ${exec_prefix}/man
++    sysconfdir:    /etc/apr-util/1.3
++    datadir:       /var/apr-util/1.3
++    includedir:    ${exec_prefix}/include
++    localstatedir: ${prefix}
++    installbuilddir: ${prefix}/build
++    manualdir:     ${prefix}/manual
++    runtimedir:    /var/run/apr-util/1.3
++    libsuffix:    -${APRUTIL_MAJOR_VERSION}
++</Layout>
++
++<Layout OpenSolaris-amd64>
++    prefix:        /usr/apr-util/1.3
++    exec_prefix:   ${prefix}
++    bindir:        ${exec_prefix}/bin/amd64
++    sbindir:       ${exec_prefix}/bin/amd64
++    libdir:        ${exec_prefix}/lib/amd64
++    libexecdir:    ${exec_prefix}/libexec/amd64
++    mandir:        ${exec_prefix}/man
++    sysconfdir:    /etc/apr-util/1.3
++    datadir:       /var/apr-util/1.3
++    includedir:    ${exec_prefix}/include
++    localstatedir: ${prefix}
++    installbuilddir: ${prefix}/build/amd64
++    manualdir:     ${prefix}/manual
++    runtimedir:    /var/run/apr-util/1.3
++    libsuffix:    -${APRUTIL_MAJOR_VERSION}
++</Layout>
++
++<Layout OpenSolaris-sparcv9>
++    prefix:        /usr/apr-util/1.3
++    exec_prefix:   ${prefix}
++    bindir:        ${exec_prefix}/bin/sparcv9
++    sbindir:       ${exec_prefix}/bin/sparcv9
++    libdir:        ${exec_prefix}/lib/sparcv9
++    libexecdir:    ${exec_prefix}/libexec/sparcv9
++    mandir:        ${exec_prefix}/man
++    sysconfdir:    /etc/apr-util/1.3
++    datadir:       /var/apr-util/1.3
++    includedir:    ${exec_prefix}/include
++    localstatedir: ${prefix}
++    installbuilddir: ${prefix}/build/sparcv9
++    manualdir:     ${prefix}/manual
++    runtimedir:    /var/run/apr-util/1.3
++    libsuffix:    -${APRUTIL_MAJOR_VERSION}
++</Layout>
++
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/apr-util/patches/makefile-out.patch	Tue Apr 26 13:46:50 2011 -0700
@@ -0,0 +1,14 @@
+--- Makefile.in.orig	Mon Apr 18 02:03:58 2011
++++ Makefile.in	Mon Apr 18 02:09:09 2011
+@@ -71,7 +71,10 @@
+ 
+ # Create apu-config script suitable for the install tree
+ apu-config.out: $(APU_CONFIG)
+-	sed 's,^\(location=\).*$$,\1installed,' < $(APU_CONFIG) > $@
++	sed -e 's,^\(location=\).*$$,\1installed,' \
++	    -e '/^APU_SOURCE_DIR=/s,/.*",/usr/apr-util/1.3",' \
++	    -e '/^APU_BUILD_DIR=/s,/.*",/usr/apr-util/1.3",' \
++	     < $(APU_CONFIG) > $@
+ 
+ install: $(TARGETS) install-modules
+ 	$(APR_MKDIR) $(DESTDIR)$(includedir) $(DESTDIR)$(libdir)/pkgconfig \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/apr/Makefile	Tue Apr 26 13:46:50 2011 -0700
@@ -0,0 +1,86 @@
+#
+# 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) 2011, Oracle and/or its affiliates. All rights reserved.
+#
+include ../../make-rules/shared-macros.mk
+
+COMPONENT_NAME=		apr
+COMPONENT_VERSION=	1.3.9
+COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
+COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
+COMPONENT_ARCHIVE_HASH=	sha1:3ad0099ee9fb684e118590bf0acf937639e00611
+COMPONENT_ARCHIVE_URL=	http://archive.apache.org/dist/apr/$(COMPONENT_ARCHIVE)
+
+include ../../make-rules/prep.mk
+include ../../make-rules/configure.mk
+include ../../make-rules/ips.mk
+
+PATCH_LEVEL=0
+
+APR_PREFIX=/usr/apr/1.3
+
+# CONFIGURE_OPTIONS need to be reset so that pre-defined layout can be
+# used without being overwritten with default configure paths.
+CONFIGURE_OPTIONS  =	--prefix=$(APR_PREFIX)
+CONFIGURE_OPTIONS +=	--enable-threads
+CONFIGURE_OPTIONS +=	--enable-other-child
+CONFIGURE_OPTIONS +=	--enable-nonportable-atomics
+CONFIGURE_OPTIONS +=	--enable-shared
+CONFIGURE_OPTIONS +=	CC="$(CC)"
+CONFIGURE_OPTIONS +=	CXX="$(CCC)"
+CONFIGURE_OPTIONS +=	CFLAGS="$(CFLAGS) -DSSL_EXPERIMENTAL -DSSL_ENGINE"
+CONFIGURE_OPTIONS +=	LTFLAGS="--tag=CC --silent"
+CONFIGURE_OPTIONS +=	$(CONFIGURE_OPTIONS.$(BITS))
+CONFIGURE_OPTIONS.32 +=	--enable-layout=OpenSolaris
+CONFIGURE_OPTIONS.64 +=	--enable-layout=OpenSolaris-$(MACH64)
+CONFIGURE_OPTIONS.32 +=	--with-installbuilddir=$(APR_PREFIX)/build
+CONFIGURE_OPTIONS.64 +=	--with-installbuilddir=$(APR_PREFIX)/build/$(MACH64)
+
+COMPONENT_TEST_TARGETS=	test
+
+# We need this to keep doxygen happy (for include/ and docs/ contents).
+COMPONENT_PRE_CONFIGURE_ACTION += ($(CLONEY) $(SOURCE_DIR) $(@D));
+
+# Some patches need configure script recreation.
+COMPONENT_PRE_CONFIGURE_ACTION += (cd $(@D); autoconf);
+
+# 32 and 64 bits apr.h headers need to be merged to the final one.
+APRH=include/apr.h
+$(BUILD_DIR_64)/.installed: COMPONENT_POST_INSTALL_ACTION = \
+	/usr/bin/diff -D __$(MACH64) $(BUILD_DIR_32)/$(APRH) \
+	  $(BUILD_DIR_64)/$(APRH) > $(PROTO_DIR)/$(APR_PREFIX)/$(APRH); true
+
+# Documentation is generated in and directly packaged from 32 bit build
+# directory using doxygen.
+PKG_PROTO_DIRS += $(BUILD_DIR_32)/docs/dox/html
+PUBLISH_TRANSFORMS += doc-transform
+docs: $(BUILD_DIR_32)/.built
+	cd $(BUILD_DIR_32); doxygen docs/doxygen.conf
+
+build: $(BUILD_32_and_64) docs
+
+install: $(INSTALL_32_and_64)
+
+test: $(TEST_32_and_64)
+
+BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
+
+include ../../make-rules/depend.mk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/apr/apr-13-doc.p5m	Tue Apr 26 13:46:50 2011 -0700
@@ -0,0 +1,222 @@
+#
+# 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) 2011, Oracle and/or its affiliates. All rights reserved.
+#
+set name=pkg.fmri \
+    value=pkg:/library/apr-13/documentation@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary \
+    value="Apache Portable Runtime (APR) 1.3 documentation"
+set name=info.classification \
+    value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
+set name=info.upstream_url value="http://apr.apache.org"
+set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/LSARC/2008/541
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+
+dir path=usr
+dir path=usr/apr
+dir path=usr/apr/1.3
+dir path=usr/apr/1.3/manual
+file path=usr/apr/1.3/manual/annotated.html
+file path=usr/apr/1.3/manual/classes.html
+file path=usr/apr/1.3/manual/apr_8h-source.html
+file path=usr/apr/1.3/manual/apr_8h.html
+file path=usr/apr/1.3/manual/apr__allocator_8h-source.html
+file path=usr/apr/1.3/manual/apr__allocator_8h.html
+file path=usr/apr/1.3/manual/apr__atomic_8h-source.html
+file path=usr/apr/1.3/manual/apr__atomic_8h.html
+file path=usr/apr/1.3/manual/apr__dso_8h-source.html
+file path=usr/apr/1.3/manual/apr__dso_8h.html
+file path=usr/apr/1.3/manual/apr__env_8h-source.html
+file path=usr/apr/1.3/manual/apr__env_8h.html
+file path=usr/apr/1.3/manual/apr__errno_8h-source.html
+file path=usr/apr/1.3/manual/apr__errno_8h.html
+file path=usr/apr/1.3/manual/apr__file__info_8h-source.html
+file path=usr/apr/1.3/manual/apr__file__info_8h.html
+file path=usr/apr/1.3/manual/apr__file__io_8h-source.html
+file path=usr/apr/1.3/manual/apr__file__io_8h.html
+file path=usr/apr/1.3/manual/apr__fnmatch_8h-source.html
+file path=usr/apr/1.3/manual/apr__fnmatch_8h.html
+file path=usr/apr/1.3/manual/apr__general_8h-source.html
+file path=usr/apr/1.3/manual/apr__general_8h.html
+file path=usr/apr/1.3/manual/apr__getopt_8h-source.html
+file path=usr/apr/1.3/manual/apr__getopt_8h.html
+file path=usr/apr/1.3/manual/apr__global__mutex_8h-source.html
+file path=usr/apr/1.3/manual/apr__global__mutex_8h.html
+file path=usr/apr/1.3/manual/apr__hash_8h-source.html
+file path=usr/apr/1.3/manual/apr__hash_8h.html
+file path=usr/apr/1.3/manual/apr__inherit_8h-source.html
+file path=usr/apr/1.3/manual/apr__inherit_8h.html
+file path=usr/apr/1.3/manual/apr__lib_8h-source.html
+file path=usr/apr/1.3/manual/apr__lib_8h.html
+file path=usr/apr/1.3/manual/apr__mmap_8h-source.html
+file path=usr/apr/1.3/manual/apr__mmap_8h.html
+file path=usr/apr/1.3/manual/apr__network__io_8h-source.html
+file path=usr/apr/1.3/manual/apr__network__io_8h.html
+file path=usr/apr/1.3/manual/apr__poll_8h-source.html
+file path=usr/apr/1.3/manual/apr__poll_8h.html
+file path=usr/apr/1.3/manual/apr__pools_8h-source.html
+file path=usr/apr/1.3/manual/apr__pools_8h.html
+file path=usr/apr/1.3/manual/apr__portable_8h-source.html
+file path=usr/apr/1.3/manual/apr__portable_8h.html
+file path=usr/apr/1.3/manual/apr__proc__mutex_8h-source.html
+file path=usr/apr/1.3/manual/apr__proc__mutex_8h.html
+file path=usr/apr/1.3/manual/apr__random_8h-source.html
+file path=usr/apr/1.3/manual/apr__random_8h.html
+file path=usr/apr/1.3/manual/apr__ring_8h-source.html
+file path=usr/apr/1.3/manual/apr__ring_8h.html
+file path=usr/apr/1.3/manual/apr__shm_8h-source.html
+file path=usr/apr/1.3/manual/apr__shm_8h.html
+file path=usr/apr/1.3/manual/apr__signal_8h-source.html
+file path=usr/apr/1.3/manual/apr__signal_8h.html
+file path=usr/apr/1.3/manual/apr__strings_8h-source.html
+file path=usr/apr/1.3/manual/apr__strings_8h.html
+file path=usr/apr/1.3/manual/apr__support_8h-source.html
+file path=usr/apr/1.3/manual/apr__support_8h.html
+file path=usr/apr/1.3/manual/apr__tables_8h-source.html
+file path=usr/apr/1.3/manual/apr__tables_8h.html
+file path=usr/apr/1.3/manual/apr__thread__cond_8h-source.html
+file path=usr/apr/1.3/manual/apr__thread__cond_8h.html
+file path=usr/apr/1.3/manual/apr__thread__mutex_8h-source.html
+file path=usr/apr/1.3/manual/apr__thread__mutex_8h.html
+file path=usr/apr/1.3/manual/apr__thread__proc_8h-source.html
+file path=usr/apr/1.3/manual/apr__thread__proc_8h.html
+file path=usr/apr/1.3/manual/apr__thread__rwlock_8h-source.html
+file path=usr/apr/1.3/manual/apr__thread__rwlock_8h.html
+file path=usr/apr/1.3/manual/apr__time_8h-source.html
+file path=usr/apr/1.3/manual/apr__time_8h.html
+file path=usr/apr/1.3/manual/apr__user_8h-source.html
+file path=usr/apr/1.3/manual/apr__user_8h.html
+file path=usr/apr/1.3/manual/apr__version_8h-source.html
+file path=usr/apr/1.3/manual/apr__version_8h.html
+file path=usr/apr/1.3/manual/apr__want_8h-source.html
+file path=usr/apr/1.3/manual/apr__want_8h.html
+file path=usr/apr/1.3/manual/bug.html
+file path=usr/apr/1.3/manual/deprecated.html
+file path=usr/apr/1.3/manual/doxygen.css
+file path=usr/apr/1.3/manual/doxygen.png
+file path=usr/apr/1.3/manual/files.html
+file path=usr/apr/1.3/manual/functions.html
+file path=usr/apr/1.3/manual/functions_func.html
+file path=usr/apr/1.3/manual/functions_vars.html
+file path=usr/apr/1.3/manual/globals.html
+file path=usr/apr/1.3/manual/globals_0x66.html
+file path=usr/apr/1.3/manual/globals_0x68.html
+file path=usr/apr/1.3/manual/globals_0x74.html
+file path=usr/apr/1.3/manual/globals_defs.html
+file path=usr/apr/1.3/manual/globals_defs_0x66.html
+file path=usr/apr/1.3/manual/globals_defs_0x68.html
+file path=usr/apr/1.3/manual/globals_defs_0x74.html
+file path=usr/apr/1.3/manual/globals_enum.html
+file path=usr/apr/1.3/manual/globals_eval.html
+file path=usr/apr/1.3/manual/globals_func.html
+file path=usr/apr/1.3/manual/globals_type.html
+file path=usr/apr/1.3/manual/globals_vars.html
+file path=usr/apr/1.3/manual/group___a_p_r.html
+file path=usr/apr/1.3/manual/group___a_p_r___e_r_r_o_r__map.html
+file path=usr/apr/1.3/manual/group___a_p_r___error.html
+file path=usr/apr/1.3/manual/group___a_p_r___global_mutex.html
+file path=usr/apr/1.3/manual/group___a_p_r___o_c.html
+file path=usr/apr/1.3/manual/group___a_p_r___s_t_a_t_u_s___i_s.html
+file path=usr/apr/1.3/manual/group___a_p_r___strings___snprintf.html
+file path=usr/apr/1.3/manual/group___i_p___proto.html
+file path=usr/apr/1.3/manual/group___pool_cleanup.html
+file path=usr/apr/1.3/manual/group___pool_debug.html
+file path=usr/apr/1.3/manual/group__apr__allocator.html
+file path=usr/apr/1.3/manual/group__apr__atomic.html
+file path=usr/apr/1.3/manual/group__apr__ctype.html
+file path=usr/apr/1.3/manual/group__apr__dir.html
+file path=usr/apr/1.3/manual/group__apr__dso.html
+file path=usr/apr/1.3/manual/group__apr__env.html
+file path=usr/apr/1.3/manual/group__apr__errno.html
+file path=usr/apr/1.3/manual/group__apr__file__attrs__set__flags.html
+file path=usr/apr/1.3/manual/group__apr__file__info.html
+file path=usr/apr/1.3/manual/group__apr__file__io.html
+file path=usr/apr/1.3/manual/group__apr__file__lock__types.html
+file path=usr/apr/1.3/manual/group__apr__file__open__flags.html
+file path=usr/apr/1.3/manual/group__apr__file__permissions.html
+file path=usr/apr/1.3/manual/group__apr__file__seek__flags.html
+file path=usr/apr/1.3/manual/group__apr__file__stat.html
+file path=usr/apr/1.3/manual/group__apr__file__writev.html
+file path=usr/apr/1.3/manual/group__apr__filepath.html
+file path=usr/apr/1.3/manual/group__apr__fnmatch.html
+file path=usr/apr/1.3/manual/group__apr__general.html
+file path=usr/apr/1.3/manual/group__apr__getopt.html
+file path=usr/apr/1.3/manual/group__apr__hash.html
+file path=usr/apr/1.3/manual/group__apr__lib.html
+file path=usr/apr/1.3/manual/group__apr__library.html
+file path=usr/apr/1.3/manual/group__apr__mcast.html
+file path=usr/apr/1.3/manual/group__apr__mmap.html
+file path=usr/apr/1.3/manual/group__apr__network__io.html
+file path=usr/apr/1.3/manual/group__apr__os__dso.html
+file path=usr/apr/1.3/manual/group__apr__os__thread.html
+file path=usr/apr/1.3/manual/group__apr__platform.html
+file path=usr/apr/1.3/manual/group__apr__poll.html
+file path=usr/apr/1.3/manual/group__apr__pools.html
+file path=usr/apr/1.3/manual/group__apr__portabile.html
+file path=usr/apr/1.3/manual/group__apr__proc__mutex.html
+file path=usr/apr/1.3/manual/group__apr__random.html
+file path=usr/apr/1.3/manual/group__apr__ring.html
+file path=usr/apr/1.3/manual/group__apr__shm.html
+file path=usr/apr/1.3/manual/group__apr__signal.html
+file path=usr/apr/1.3/manual/group__apr__sockopt.html
+file path=usr/apr/1.3/manual/group__apr__strings.html
+file path=usr/apr/1.3/manual/group__apr__support.html
+file path=usr/apr/1.3/manual/group__apr__tables.html
+file path=usr/apr/1.3/manual/group__apr__thread__cond.html
+file path=usr/apr/1.3/manual/group__apr__thread__mutex.html
+file path=usr/apr/1.3/manual/group__apr__thread__proc.html
+file path=usr/apr/1.3/manual/group__apr__thread__rwlock.html
+file path=usr/apr/1.3/manual/group__apr__time.html
+file path=usr/apr/1.3/manual/group__apr__user.html
+file path=usr/apr/1.3/manual/index.html
+file path=usr/apr/1.3/manual/modules.html
+file path=usr/apr/1.3/manual/pages.html
+file path=usr/apr/1.3/manual/sha2_8h-source.html
+file path=usr/apr/1.3/manual/structapr__array__header__t.html
+file path=usr/apr/1.3/manual/structapr__finfo__t.html
+file path=usr/apr/1.3/manual/structapr__getopt__option__t.html
+file path=usr/apr/1.3/manual/structapr__getopt__t.html
+file path=usr/apr/1.3/manual/structapr__hdtr__t.html
+file path=usr/apr/1.3/manual/structapr__memnode__t.html
+file path=usr/apr/1.3/manual/structapr__mmap__t.html
+file path=usr/apr/1.3/manual/structapr__os__proc__mutex__t.html
+file path=usr/apr/1.3/manual/structapr__os__sock__info__t.html
+file path=usr/apr/1.3/manual/structapr__pollfd__t.html
+file path=usr/apr/1.3/manual/structapr__proc__t.html
+file path=usr/apr/1.3/manual/structapr__sockaddr__t.html
+file path=usr/apr/1.3/manual/structapr__table__entry__t.html
+file path=usr/apr/1.3/manual/structapr__time__exp__t.html
+file path=usr/apr/1.3/manual/structapr__version__t.html
+file path=usr/apr/1.3/manual/structapr__vformatter__buff__t.html
+file path=usr/apr/1.3/manual/tab_b.gif
+file path=usr/apr/1.3/manual/tab_l.gif
+file path=usr/apr/1.3/manual/tab_r.gif
+file path=usr/apr/1.3/manual/tabs.css
+file path=usr/apr/1.3/manual/unionapr__descriptor.html
+
+
+license apr.license license="Apache v2.0"
+
+legacy	pkg=SUNWapr13doc \
+	name="Apache Portable Runtime (APR) 1.3 documentation" \
+	desc="Apache Portable Runtime (APR) 1.3 documentation"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/apr/apr-13.p5m	Tue Apr 26 13:46:50 2011 -0700
@@ -0,0 +1,124 @@
+#
+# 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) 2011, Oracle and/or its affiliates. All rights reserved.
+#
+set name=pkg.fmri \
+    value=pkg:/library/apr-13@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary \
+    value="Apache Portable Runtime (APR) 1.3 Shared Libraries"
+set name=pkg.description \
+    value="The shared libraries for any component using Apache Portable Runtime (APR) Version 1.3"
+set name=info.classification \
+    value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
+set name=info.upstream_url value="http://apr.apache.org"
+set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/LSARC/2008/541
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+
+dir path=usr
+dir path=usr/apr
+dir path=usr/apr/1.3
+dir path=usr/apr/1.3/bin/$(MACH64)
+dir path=usr/apr/1.3/build
+dir path=usr/apr/1.3/build/$(MACH64)
+dir path=usr/apr/1.3/include
+dir path=usr/apr/1.3/lib
+dir path=usr/apr/1.3/lib/$(MACH64)
+dir path=usr/apr/1.3/lib/pkgconfig
+dir path=usr/bin
+dir path=usr/bin/$(MACH64)
+file path=usr/apr/1.3/bin/$(MACH64)/apr-1-config
+file path=usr/apr/1.3/bin/apr-1-config
+file path=usr/apr/1.3/build/$(MACH64)/apr_rules.mk
+file path=usr/apr/1.3/build/$(MACH64)/libtool mode=0555
+file path=usr/apr/1.3/build/$(MACH64)/make_exports.awk
+file path=usr/apr/1.3/build/$(MACH64)/make_var_export.awk
+file path=usr/apr/1.3/build/$(MACH64)/mkdir.sh mode=0555
+file path=usr/apr/1.3/build/apr_rules.mk
+file path=usr/apr/1.3/build/libtool mode=0555
+file path=usr/apr/1.3/build/make_exports.awk
+file path=usr/apr/1.3/build/make_var_export.awk
+file path=usr/apr/1.3/build/mkdir.sh mode=0555
+file path=usr/apr/1.3/include/apr.h
+file path=usr/apr/1.3/include/apr_allocator.h
+file path=usr/apr/1.3/include/apr_atomic.h
+file path=usr/apr/1.3/include/apr_dso.h
+file path=usr/apr/1.3/include/apr_env.h
+file path=usr/apr/1.3/include/apr_errno.h
+file path=usr/apr/1.3/include/apr_file_info.h
+file path=usr/apr/1.3/include/apr_file_io.h
+file path=usr/apr/1.3/include/apr_fnmatch.h
+file path=usr/apr/1.3/include/apr_general.h
+file path=usr/apr/1.3/include/apr_getopt.h
+file path=usr/apr/1.3/include/apr_global_mutex.h
+file path=usr/apr/1.3/include/apr_hash.h
+file path=usr/apr/1.3/include/apr_inherit.h
+file path=usr/apr/1.3/include/apr_lib.h
+file path=usr/apr/1.3/include/apr_mmap.h
+file path=usr/apr/1.3/include/apr_network_io.h
+file path=usr/apr/1.3/include/apr_poll.h
+file path=usr/apr/1.3/include/apr_pools.h
+file path=usr/apr/1.3/include/apr_portable.h
+file path=usr/apr/1.3/include/apr_proc_mutex.h
+file path=usr/apr/1.3/include/apr_random.h
+file path=usr/apr/1.3/include/apr_ring.h
+file path=usr/apr/1.3/include/apr_shm.h
+file path=usr/apr/1.3/include/apr_signal.h
+file path=usr/apr/1.3/include/apr_strings.h
+file path=usr/apr/1.3/include/apr_support.h
+file path=usr/apr/1.3/include/apr_tables.h
+file path=usr/apr/1.3/include/apr_thread_cond.h
+file path=usr/apr/1.3/include/apr_thread_mutex.h
+file path=usr/apr/1.3/include/apr_thread_proc.h
+file path=usr/apr/1.3/include/apr_thread_rwlock.h
+file path=usr/apr/1.3/include/apr_time.h
+file path=usr/apr/1.3/include/apr_user.h
+file path=usr/apr/1.3/include/apr_version.h
+file path=usr/apr/1.3/include/apr_want.h
+file path=usr/apr/1.3/lib/$(MACH64)/apr.exp
+file path=usr/apr/1.3/lib/$(MACH64)/libapr-1.a
+file path=usr/apr/1.3/lib/$(MACH64)/libapr-1.so.0.3.9
+file path=usr/apr/1.3/lib/$(MACH64)/pkgconfig/apr-1.pc
+file path=usr/apr/1.3/lib/apr.exp
+file path=usr/apr/1.3/lib/libapr-1.a
+file path=usr/apr/1.3/lib/libapr-1.so.0.3.9
+file path=usr/apr/1.3/lib/pkgconfig/apr-1.pc
+link path=usr/apr/1.3/bin/64 target=$(MACH64)
+link path=usr/apr/1.3/build/64 target=$(MACH64)
+link path=usr/apr/1.3/lib/$(MACH64)/libapr-1.so target=libapr-1.so.0.3.9
+link path=usr/apr/1.3/lib/$(MACH64)/libapr-1.so.0 target=libapr-1.so.0.3.9
+link path=usr/apr/1.3/lib/64 target=$(MACH64)
+link path=usr/apr/1.3/lib/libapr-1.so target=libapr-1.so.0.3.9
+link path=usr/apr/1.3/lib/libapr-1.so.0 target=libapr-1.so.0.3.9
+link path=usr/bin/$(MACH64)/apr-1-config target=../../apr/1.3/bin/$(MACH64)/apr-1-config
+link path=usr/bin/apr-1-config target=../apr/1.3/bin/apr-1-config
+
+
+license apr.license license="Apache v2.0"
+
+legacy	pkg=SUNWapr13dev \
+	name="Apache Portable Runtime (APR) 1.3 development header files and libraries" \
+	desc="Apache Portable Runtime (APR) 1.3 development header files and libraries"
+
+legacy	pkg=SUNWapr13lib \
+	name="Apache Portable Runtime (APR) 1.3 Shared Libraries" \
+	desc="The shared libraries for any component using Apache Portable Runtime (APR) Version 1.3"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/apr/apr.license	Tue Apr 26 13:46:50 2011 -0700
@@ -0,0 +1,341 @@
+                                 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 PORTABLE RUNTIME SUBCOMPONENTS: 
+
+The Apache Portable Runtime 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. 
+
+From strings/apr_fnmatch.c, include/apr_fnmatch.h, misc/unix/getopt.c,
+file_io/unix/mktemp.c, strings/apr_strings.c:
+
+/* 
+ * Copyright (c) 1987, 1993, 1994
+ *      The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *      This product includes software developed by the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+
+From network_io/unix/inet_ntop.c, network_io/unix/inet_pton.c:
+
+/* Copyright (c) 1996 by Internet Software Consortium.
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
+ * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
+ * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
+ * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
+ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+ * SOFTWARE.
+
+From dso/aix/dso.c:
+
+ *  Based on libdl (dlfcn.c/dlfcn.h) which is
+ *  Copyright (c) 1992,1993,1995,1996,1997,1988
+ *  Jens-Uwe Mager, Helios Software GmbH, Hannover, Germany.
+ *
+ *  Not derived from licensed software.
+ *
+ *  Permission is granted to freely use, copy, modify, and redistribute
+ *  this software, provided that the author is not construed to be liable
+ *  for any results of using the software, alterations are clearly marked
+ *  as such, and this notice is not modified.
+
+From strings/apr_strnatcmp.c, include/apr_strings.h:
+
+  strnatcmp.c -- Perform 'natural order' comparisons of strings in C.
+  Copyright (C) 2000 by Martin Pool <[email protected]>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+From strings/apr_snprintf.c:
+
+  *
+  * cvt - IEEE floating point formatting routines.
+  *       Derived from UNIX V7, Copyright(C) Caldera International Inc.
+  *
+
+  Copyright(C) Caldera International Inc.  2001-2002.  All rights reserved.
+  
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are
+  met:
+
+  Redistributions of source code and documentation must retain the above
+  copyright notice, this list of conditions and the following disclaimer.
+
+  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.
+
+  All advertising materials mentioning features or use of this software
+  must display the following acknowledgement:
+
+     This product includes software developed or owned by  Caldera
+     International, Inc.
+
+  Neither the name of Caldera International, Inc. nor the names of other
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
+
+  USE OF THE SOFTWARE PROVIDED FOR UNDER THIS LICENSE BY CALDERA
+  INTERNATIONAL, INC. AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED
+  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
+  NO EVENT SHALL CALDERA INTERNATIONAL, INC. 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.
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/apr/doc-transform	Tue Apr 26 13:46:50 2011 -0700
@@ -0,0 +1,25 @@
+#
+# 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) 2011, Oracle and/or its affiliates. All rights reserved.
+#
+
+<transform file path=usr/apr/1.3/manual/(.+)$ -> \
+	set action.hash %<\1> >
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/apr/patches/apr_common.m4.patch	Tue Apr 26 13:46:50 2011 -0700
@@ -0,0 +1,12 @@
+=== This is added to fix the MKDEP value for Sun Studio compiler
+--- build/apr_common.m4.orig	Mon Oct 29 04:47:32 2007
++++ build/apr_common.m4	Wed Aug 13 01:36:00 2008
+@@ -948,7 +948,7 @@
+   int main() { return 0; }
+ EOF
+   MKDEP="true"
+-  for i in "$CC -MM" "$CC -M" "$CPP -MM" "$CPP -M" "cpp -M"; do
++  for i in "$CC -MM" "$CC -M" "$CC -xM" "$CPP -MM" "$CPP -M" "$CPP -xM" "cpp -M"; do
+     AC_MSG_CHECKING([if $i can create proper make dependencies])
+     if $i conftest.c 2>/dev/null | grep 'conftest.o: conftest.c' >/dev/null; then
+       MKDEP=$i
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/apr/patches/apr_hash.patch	Tue Apr 26 13:46:50 2011 -0700
@@ -0,0 +1,38 @@
+Fix apr_hash_first() doxygen syntax.
+http://svn.apache.org/viewvc?view=revision&revision=829490
+
+Doxgen would generate html file with full Userland build path in name
+for this header.
+
+--- include/apr_hash.h	2009/10/25 03:52:40	829489
++++ include/apr_hash.h	2009/10/25 04:12:21	829490
+@@ -122,16 +122,15 @@
+  * @param p The pool to allocate the apr_hash_index_t iterator. If this
+  *          pool is NULL, then an internal, non-thread-safe iterator is used.
+  * @param ht The hash table
++ * @return The iteration state
+  * @remark  There is no restriction on adding or deleting hash entries during
+  * an iteration (although the results may be unpredictable unless all you do
+  * is delete the current entry) and multiple iterations can be in
+  * progress at the same time.
+- */
+-/**
+- * @example
+  *
+- * <PRE>
+- * 
++ * @par Example:
++ *
++ * @code
+  * int sum_values(apr_pool_t *p, apr_hash_t *ht)
+  * {
+  *     apr_hash_index_t *hi;
+@@ -143,7 +142,7 @@
+  *     }
+  *     return sum;
+  * }
+- * </PRE>
++ * @endcode
+  */
+ APR_DECLARE(apr_hash_index_t *) apr_hash_first(apr_pool_t *p, apr_hash_t *ht);
+ 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/apr/patches/config.layout.patch	Tue Apr 26 13:46:50 2011 -0700
@@ -0,0 +1,61 @@
+--- config.layout.orig	Fri Apr 15 03:45:55 2011
++++ config.layout	Fri Apr 15 03:52:31 2011
+@@ -229,3 +229,58 @@
+     infodir:       ${exec_prefix}/share/info
+     libsuffix:    -${APR_MAJOR_VERSION}
+ </Layout>
++ 
++# OpenSolaris Layout 
++<Layout OpenSolaris>
++    prefix:        /usr/apr/1.3
++    exec_prefix:   ${prefix}
++    bindir:        ${exec_prefix}/bin
++    sbindir:       ${exec_prefix}/bin
++    libdir:        ${exec_prefix}/lib
++    libexecdir:    ${exec_prefix}/libexec
++    mandir:        ${exec_prefix}/man
++    sysconfdir:    /etc/apr/1.3
++    datadir:       /var/apr/1.3
++    includedir:    ${exec_prefix}/include
++    localstatedir: ${prefix}
++    runtimedir:    /var/run/apr/1.3
++    libsuffix:    -${APR_MAJOR_VERSION}
++    installbuilddir: ${prefix}/build
++    manualdir:     ${prefix}/manual
++</Layout>
++
++<Layout OpenSolaris-amd64>
++    prefix:        /usr/apr/1.3
++    exec_prefix:   ${prefix}
++    bindir:        ${exec_prefix}/bin/amd64
++    sbindir:       ${exec_prefix}/bin/amd64
++    libdir:        ${exec_prefix}/lib/amd64
++    libexecdir:    ${exec_prefix}/libexec/amd64
++    mandir:        ${exec_prefix}/man
++    sysconfdir:    /etc/apr/1.3
++    datadir:       /var/apr/1.3
++    includedir:    ${exec_prefix}/include
++    localstatedir: ${prefix}
++    runtimedir:    /var/run/apr/1.3
++    libsuffix:    -${APR_MAJOR_VERSION}
++    installbuilddir: ${prefix}/build/amd64
++    manualdir:     ${prefix}/manual
++</Layout>
++
++<Layout OpenSolaris-sparcv9>
++    prefix:        /usr/apr/1.3
++    exec_prefix:   ${prefix}
++    bindir:        ${exec_prefix}/bin/sparcv9
++    sbindir:       ${exec_prefix}/bin/sparcv9
++    libdir:        ${exec_prefix}/lib/sparcv9
++    libexecdir:    ${exec_prefix}/libexec/sparcv9
++    mandir:        ${exec_prefix}/man
++    sysconfdir:    /etc/apr/1.3
++    datadir:       /var/apr/1.3
++    includedir:    ${exec_prefix}/include
++    localstatedir: ${prefix}
++    runtimedir:    /var/run/apr/1.3
++    libsuffix:    -${APR_MAJOR_VERSION}
++    installbuilddir: ${prefix}/build/sparcv9
++    manualdir:     ${prefix}/manual
++</Layout>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/apr/patches/extended_file.patch	Tue Apr 26 13:46:50 2011 -0700
@@ -0,0 +1,30 @@
+--- misc/unix/start.c.orig	Fri Sep 19 11:41:54 2008
++++ misc/unix/start.c	Fri Sep 19 11:44:38 2008
+@@ -23,6 +23,9 @@
+ #include "apr_arch_proc_mutex.h" /* for apr_proc_mutex_unix_setup_lock() */
+ #include "apr_arch_internal_time.h"
+ 
++#if defined(SOLARIS2) && !defined(_LP64)
++#include <stdio_ext.h>
++#endif
+ 
+ APR_DECLARE(apr_status_t) apr_app_initialize(int *argc, 
+                                              const char * const * *argv, 
+@@ -47,6 +50,17 @@
+         return APR_SUCCESS;
+     }
+ 
++#if defined(SOLARIS2) && !defined(_LP64)
++    if (enable_extended_FILE_stdio (-1, -1) < 0) {
++        /* if the process has already enabled the extended file stdio 
++         * then, the above call will return an error. It should be
++         * ignored. 
++         */
++        if ((errno != EAGAIN) && (errno != EEXIST))
++            return APR_FROM_OS_ERROR(errno);
++    }
++#endif
++
+ #if !defined(BEOS) && !defined(OS2)
+     apr_proc_mutex_unix_setup_lock();
+     apr_unix_setup_time();
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/apr/patches/largefile.patch	Tue Apr 26 13:46:50 2011 -0700
@@ -0,0 +1,47 @@
+--- build/apr_hints.m4.orig	Tue Jun 26 16:47:46 2007
++++ build/apr_hints.m4	Fri Feb  8 04:54:31 2008
+@@ -243,8 +243,19 @@
+ 	;;
+     *-solaris2*)
+     	PLATOSVERS=`echo $host | sed 's/^.*solaris2.//'`
+-	APR_ADDTO(CPPFLAGS, [-DSOLARIS2=$PLATOSVERS -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT])
+-        APR_SETIFNULL(apr_lock_method, [USE_FCNTL_SERIALIZE])
++        APR_SETVAR(THREADED_CPPFLAGS, [])
++        if test "$enable_threads" != "no"; then
++          APR_ADDTO(THREADED_CPPFLAGS, [-D_POSIX_PTHREAD_SEMANTICS])
++          dnl If using native compiler, use recommended -mt option to ensure
++          dnl proper preprocessor definitions and library link order.
++          if $CC -flags 2>&1 | grep '^-mt.*multi-threaded' > /dev/null 2>&1; then
++            APR_ADDTO(THREADED_CPPFLAGS, [-mt])
++          else
++            APR_ADDTO(THREADED_CPPFLAGS, [-D_REENTRANT])
++          fi
++        fi
++	APR_ADDTO(CPPFLAGS, [-DSOLARIS2=$PLATOSVERS $THREADED_CPPFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64])
++        APR_SETIFNULL(apr_lock_method, [USE_PROC_PTHREAD_SERIALIZE])
+         # readdir64_r error handling seems broken on Solaris (at least
+         # up till 2.8) -- it will return -1 at end-of-directory.
+         APR_SETIFNULL(ac_cv_func_readdir64_r, [no])
+--- configure.in.orig	Sat Nov  3 07:13:08 2007
++++ configure.in	Fri Feb  8 04:54:31 2008
+@@ -107,7 +107,7 @@
+ 
+ dnl Enable the layout handling code, then reparse the prefix-style
+ dnl arguments due to autoconf being a PITA.
+-APR_ENABLE_LAYOUT(apr)
++APR_ENABLE_LAYOUT(Solaris-Apache2)
+ APR_PARSE_ARGUMENTS
+ 
+ dnl Set optional CC hints here in case autoconf makes an inappropriate choice.
+@@ -1469,6 +1469,11 @@
+                 socklen_t_value="int"
+             fi
+             ;;
++        *-solaris2*)
++           # sendfile64 doesn't work correctly with Apache (CR 6452545)
++           # (when LARGEFILE_SOURCE && _FILE_OFFSET_BITS == 64 are used)
++           sendfile="0"
++           ;;
+     esac
+ else
+     socklen_t_value="int"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/apr/patches/libtool.m4.patch	Tue Apr 26 13:46:50 2011 -0700
@@ -0,0 +1,22 @@
+--- build/libtool.m4.orig	Fri Aug  8 23:08:06 2008
++++ build/libtool.m4	Mon Feb  2 23:27:08 2009
+@@ -1806,6 +1806,19 @@
+   shlibpath_var=LD_LIBRARY_PATH
+   shlibpath_overrides_runpath=yes
+   hardcode_into_libs=yes
++  sys_lib_search_path_spec="/lib /usr/lib"
++  # Find out which ABI we are using.
++  echo 'int i;' > conftest.$ac_ext
++  if AC_TRY_EVAL(ac_compile); then
++    case `/usr/bin/file conftest.o` in
++    *64-bit*)
++      MACH_TYPE=`/usr/bin/isainfo -n`
++      sys_lib_search_path_spec="/lib/${MACH_TYPE} /usr/lib/${MACH_TYPE}"
++      ;;
++    esac
++  fi
++  rm -rf conftest*
++  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+   # ldd complains unless libraries are executable
+   postinstall_cmds='chmod +x $lib'
+   ;;
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/apr/patches/makefile-out.patch	Tue Apr 26 13:46:50 2011 -0700
@@ -0,0 +1,39 @@
+--- Makefile.in.orig	Fri Apr 15 07:23:41 2011
++++ Makefile.in	Fri Apr 15 07:23:53 2011
+@@ -62,11 +62,19 @@
+ 
+ # Create apr-config script suitable for the install tree
+ apr-config.out: $(APR_CONFIG)
+-	sed 's,^\(location=\).*$$,\1installed,' < $(APR_CONFIG) > $@
++	sed -e 's,^\(location=\).*$$,\1installed,' \
++	    -e '/^CC=/s,/.*/,,' \
++	    -e '/^CPP=/s,/.*/,,' \
++	    -e '/^APR_SOURCE_DIR=/s,/.*",/usr/apr/1.3",' \
++	    -e '/^APR_BUILD_DIR=/s,/.*",/usr/apr/1.3",' \
++	    < $(APR_CONFIG) > $@
+ 
+ # Create apr_rules.mk suitable for the install tree
+ build/apr_rules.out: build/apr_rules.mk
+-	sed 's,^\(apr_build.*=\).*$$,\1$(installbuilddir),' < build/apr_rules.mk > $@
++	sed -e 's,^\(apr_build.*=\).*$$,\1$(installbuilddir),' \
++	    -e '/^CC=/s,/.*/,,' \
++	    -e '/^MKDEP            = /s,/.*/,,' \
++	     < build/apr_rules.mk > $@
+ 
+ install: $(TARGETS)
+ 	$(APR_MKDIR) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) $(DESTDIR)$(installbuilddir) \
+@@ -79,7 +87,13 @@
+ 	$(INSTALL_DATA) apr.exp $(DESTDIR)$(libdir)/apr.exp
+ 	$(INSTALL_DATA) apr.pc $(DESTDIR)$(libdir)/pkgconfig/$(APR_PCFILE)
+ 	for f in libtool shlibtool; do \
+-	    if test -f $${f}; then $(INSTALL) -m 755 $${f} $(DESTDIR)$(installbuilddir); fi; \
++	    if test -f $${f}; then \
++		sed -e '/^LTCC=/s,/.*/,,' \
++		    -e '/^CC=/s,/.*/,,' \
++		    < $${f} > $${f}.out; \
++		$(INSTALL) -m 755 $${f}.out $(DESTDIR)$(installbuilddir)/$${f}; \
++		rm $${f}.out; \
++	    fi; \
+ 	done
+ 	$(INSTALL) -m 755 $(top_srcdir)/build/mkdir.sh $(DESTDIR)$(installbuilddir)
+ 	for f in make_exports.awk make_var_export.awk; do \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/apr/patches/port_getn_rc.patch	Tue Apr 26 13:46:50 2011 -0700
@@ -0,0 +1,35 @@
+=== Patch is taken from
+=== http://svn.apache.org/viewvc?view=revision&revision=836111
+--- poll/unix/port.c.orig	2009-11-18 15:04:29.000000000 -0500
++++ poll/unix/port.c	2009-11-18 15:02:28.000000000 -0500
+@@ -100,18 +100,27 @@
+         tvptr = &tv;
+     }
+ 
++    list[0].portev_user = (void *)-1; /* so we can double check that an
++                                       * event was returned
++                                       */
++
+     ret = port_getn(port, list, max, nget, tvptr);
++    /* Note: 32-bit port_getn() on Solaris 10 x86 returns large negative 
++     * values instead of 0 when returning immediately.
++     */
+ 
+-    if (ret < 0) {
++    if (ret == -1) {
+         rv = apr_get_netos_error();
+ 
+         switch(rv) {
+         case EINTR:
+         case ETIME:
+-            if (*nget > 0) {
++            if (*nget > 0 && list[0].portev_user != (void *)-1) {
+                 /* This confusing API can return an event at the same time
+                  * that it reports EINTR or ETIME.  If that occurs, just
+-                 * report the event.
++                 * report the event.  With EINTR, nget can be > 0 without
++                 * any event, so check that portev_user was filled in.
++                 *
+                  * (Maybe it will be simplified; see thread
+                  *   http://mail.opensolaris.org
+                  *   /pipermail/networking-discuss/2009-August/011979.html
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/meta-packages/history/SUNWapr13dev.p5m	Tue Apr 26 13:46:50 2011 -0700
@@ -0,0 +1,33 @@
+#
+# 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) 2011, Oracle and/or its affiliates. All rights reserved.
+#
+
+#
+# Legacy package information for renamed SUNWapr13dev package
+#
+
+set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
+set name=pkg.renamed value=true
+
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+
+depend fmri=library/[email protected] type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/meta-packages/history/SUNWapr13doc.p5m	Tue Apr 26 13:46:50 2011 -0700
@@ -0,0 +1,33 @@
+#
+# 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) 2011, Oracle and/or its affiliates. All rights reserved.
+#
+
+#
+# Legacy package information for renamed SUNWapr13doc package
+#
+
+set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
+set name=pkg.renamed value=true
+
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+
+depend fmri=library/apr-13/[email protected] type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/meta-packages/history/SUNWapr13lib.p5m	Tue Apr 26 13:46:50 2011 -0700
@@ -0,0 +1,33 @@
+#
+# 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) 2011, Oracle and/or its affiliates. All rights reserved.
+#
+
+#
+# Legacy package information for renamed SUNWapr13lib package
+#
+
+set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
+set name=pkg.renamed value=true
+
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+
+depend fmri=library/[email protected] type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/meta-packages/history/SUNWapu13-ldap.p5m	Tue Apr 26 13:46:50 2011 -0700
@@ -0,0 +1,33 @@
+#
+# 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) 2011, Oracle and/or its affiliates. All rights reserved.
+#
+
+#
+# Legacy package information for renamed SUNWapu13-ldap package
+#
+
+set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
+set name=pkg.renamed value=true
+
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+
+depend fmri=web/library/apache/apr-util-13/[email protected] type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/meta-packages/history/SUNWapu13dbd-mysql.p5m	Tue Apr 26 13:46:50 2011 -0700
@@ -0,0 +1,33 @@
+#
+# 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) 2011, Oracle and/or its affiliates. All rights reserved.
+#
+
+#
+# Legacy package information for renamed SUNWapu13dbd-mysql package
+#
+
+set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
+set name=pkg.renamed value=true
+
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+
+depend fmri=web/library/apache/apr-util-13/[email protected] type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/meta-packages/history/SUNWapu13dbd-sqlite.p5m	Tue Apr 26 13:46:50 2011 -0700
@@ -0,0 +1,33 @@
+#
+# 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) 2011, Oracle and/or its affiliates. All rights reserved.
+#
+
+#
+# Legacy package information for renamed SUNWapu13dbd-sqlite package
+#
+
+set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
+set name=pkg.renamed value=true
+
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+
+depend fmri=web/library/apache/apr-util-13/[email protected] type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/meta-packages/history/SUNWapu13dev.p5m	Tue Apr 26 13:46:50 2011 -0700
@@ -0,0 +1,33 @@
+#
+# 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) 2011, Oracle and/or its affiliates. All rights reserved.
+#
+
+#
+# Legacy package information for renamed SUNWapu13dev package
+#
+
+set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
+set name=pkg.renamed value=true
+
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+
+depend fmri=library/[email protected] type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/meta-packages/history/SUNWapu13doc.p5m	Tue Apr 26 13:46:50 2011 -0700
@@ -0,0 +1,33 @@
+#
+# 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) 2011, Oracle and/or its affiliates. All rights reserved.
+#
+
+#
+# Legacy package information for renamed SUNWapu13doc package
+#
+
+set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
+set name=pkg.renamed value=true
+
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+
+depend fmri=library/apr-util-13/[email protected] type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/meta-packages/history/SUNWapu13lib.p5m	Tue Apr 26 13:46:50 2011 -0700
@@ -0,0 +1,33 @@
+#
+# 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) 2011, Oracle and/or its affiliates. All rights reserved.
+#
+
+#
+# Legacy package information for renamed SUNWapu13lib package
+#
+
+set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
+set name=pkg.renamed value=true
+
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+
+depend fmri=library/[email protected] type=require