PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
authorPetr Sumbera <petr.sumbera@oracle.com>
Fri, 21 Mar 2014 07:47:48 -0700
changeset 1782 5aa8051aaa4b
parent 1781 d7603a31fdd3
child 1783 d716b9b5961b
PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3 18397386 APR 1.5.0
components/apr-1_5/Makefile
components/apr-1_5/apr-15.p5m
components/apr-1_5/apr.license
components/apr-1_5/patches/apr_common.m4.patch
components/apr-1_5/patches/config.layout.patch
components/apr-1_5/patches/doxygen.conf.patch
components/apr-1_5/patches/extended_file.patch
components/apr-1_5/patches/libtool.m4.patch
components/apr-1_5/patches/makefile-out.patch
components/apr-1_5/patches/makefile.patch
components/apr-1_5/resolve.deps
components/apr/apr-13.p5m
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/apr-1_5/Makefile	Fri Mar 21 07:47:48 2014 -0700
@@ -0,0 +1,81 @@
+#
+# 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) 2014, Oracle and/or its affiliates. All rights reserved.
+#
+include ../../make-rules/shared-macros.mk
+
+COMPONENT_NAME=		apr
+COMPONENT_VERSION=	1.5.0
+COMPONENT_PROJECT_URL=	http://apr.apache.org/
+COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
+COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
+COMPONENT_ARCHIVE_HASH=	\
+    sha256:9879f02054cb22e99f605f6fdbf47f4c028af4cd4f351cf64186a7ee447f35d7
+COMPONENT_ARCHIVE_URL=	http://archive.apache.org/dist/apr/$(COMPONENT_ARCHIVE)
+COMPONENT_BUGDB=	utility/apache
+
+CONFIGURE_DEFAULT_DIRS=no
+
+include ../../make-rules/prep.mk
+include ../../make-rules/configure.mk
+include ../../make-rules/ips.mk
+
+PATCH_LEVEL=0
+
+CONFIGURE_PREFIX=/usr/apr/1.5
+
+CONFIGURE_OPTIONS +=	--enable-threads
+CONFIGURE_OPTIONS +=	--enable-other-child
+CONFIGURE_OPTIONS +=	--enable-nonportable-atomics
+CONFIGURE_OPTIONS +=	--enable-shared
+CONFIGURE_OPTIONS +=	--disable-static
+CONFIGURE_OPTIONS +=	CFLAGS="$(CFLAGS) $(CPP_LARGEFILES)"
+CONFIGURE_OPTIONS +=	LTFLAGS="--tag=CC --silent"
+CONFIGURE_OPTIONS.32 +=	--enable-layout=Solaris
+CONFIGURE_OPTIONS.64 +=	--enable-layout=Solaris-$(MACH64)
+
+COMPONENT_TEST_TARGETS=	test
+
+# Some patches need configure script recreation.
+COMPONENT_PREP_ACTION += (cd $(@D); autoconf);
+
+# 32 and 64 bits apr.h headers need to be merged to the final one.
+APRH=include/apr.h
+$(INSTALL_64): COMPONENT_POST_INSTALL_ACTION += \
+	diff -D __$(MACH64) $(BUILD_DIR_32)/$(APRH) \
+	  $(BUILD_DIR_64)/$(APRH) > $(PROTO_DIR)$(CONFIGURE_PREFIX)/$(APRH);
+
+$(INSTALL_64): COMPONENT_POST_INSTALL_ACTION += \
+	cd $(SOURCE_DIR); \
+	sed 's;OUTPUT_DIRECTORY=.*;OUTPUT_DIRECTORY=$(PROTO_DIR)$(CONFIGURE_PREFIX);' \
+          docs/doxygen.conf | doxygen - ;
+
+ASLR_MODE = $(ASLR_NOT_APPLICABLE)
+
+build: $(BUILD_32_and_64)
+
+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-1_5/apr-15.p5m	Fri Mar 21 07:47:48 2014 -0700
@@ -0,0 +1,298 @@
+#
+# 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) 2014, Oracle and/or its affiliates. All rights reserved.
+#
+<transform file link hardlink path=usr/apr/1.5/.* -> \
+    default facet.devel all>
+<transform file path=usr/apr/1.5/manual/.* -> default facet.doc.html all>
+
+set name=pkg.fmri \
+    value=pkg:/library/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary \
+    value="Apache Portable Runtime (APR) 1.5 Shared Libraries"
+set name=pkg.description \
+    value="The shared libraries for any component using Apache Portable Runtime (APR) Version 1.5"
+set name=com.oracle.info.description value="the Apache Portable Runtime (APR) 1.5 Shared Libraries"
+set name=com.oracle.info.tpno value=16531
+set name=info.classification \
+    value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2014/099
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+
+file path=usr/apr/1.5/bin/$(MACH64)/apr-1-config
+file path=usr/apr/1.5/bin/apr-1-config
+file path=usr/apr/1.5/build/$(MACH64)/apr_rules.mk
+file path=usr/apr/1.5/build/$(MACH64)/libtool mode=0555
+file path=usr/apr/1.5/build/$(MACH64)/make_exports.awk
+file path=usr/apr/1.5/build/$(MACH64)/make_var_export.awk
+file path=usr/apr/1.5/build/$(MACH64)/mkdir.sh mode=0555
+file path=usr/apr/1.5/build/apr_rules.mk
+file path=usr/apr/1.5/build/libtool mode=0555
+file path=usr/apr/1.5/build/make_exports.awk
+file path=usr/apr/1.5/build/make_var_export.awk
+file path=usr/apr/1.5/build/mkdir.sh mode=0555
+file path=usr/apr/1.5/include/apr.h
+file path=usr/apr/1.5/include/apr_allocator.h
+file path=usr/apr/1.5/include/apr_atomic.h
+file path=usr/apr/1.5/include/apr_dso.h
+file path=usr/apr/1.5/include/apr_env.h
+file path=usr/apr/1.5/include/apr_errno.h
+file path=usr/apr/1.5/include/apr_escape.h
+file path=usr/apr/1.5/include/apr_file_info.h
+file path=usr/apr/1.5/include/apr_file_io.h
+file path=usr/apr/1.5/include/apr_fnmatch.h
+file path=usr/apr/1.5/include/apr_general.h
+file path=usr/apr/1.5/include/apr_getopt.h
+file path=usr/apr/1.5/include/apr_global_mutex.h
+file path=usr/apr/1.5/include/apr_hash.h
+file path=usr/apr/1.5/include/apr_inherit.h
+file path=usr/apr/1.5/include/apr_lib.h
+file path=usr/apr/1.5/include/apr_mmap.h
+file path=usr/apr/1.5/include/apr_network_io.h
+file path=usr/apr/1.5/include/apr_poll.h
+file path=usr/apr/1.5/include/apr_pools.h
+file path=usr/apr/1.5/include/apr_portable.h
+file path=usr/apr/1.5/include/apr_proc_mutex.h
+file path=usr/apr/1.5/include/apr_random.h
+file path=usr/apr/1.5/include/apr_ring.h
+file path=usr/apr/1.5/include/apr_shm.h
+file path=usr/apr/1.5/include/apr_signal.h
+file path=usr/apr/1.5/include/apr_skiplist.h
+file path=usr/apr/1.5/include/apr_strings.h
+file path=usr/apr/1.5/include/apr_support.h
+file path=usr/apr/1.5/include/apr_tables.h
+file path=usr/apr/1.5/include/apr_thread_cond.h
+file path=usr/apr/1.5/include/apr_thread_mutex.h
+file path=usr/apr/1.5/include/apr_thread_proc.h
+file path=usr/apr/1.5/include/apr_thread_rwlock.h
+file path=usr/apr/1.5/include/apr_time.h
+file path=usr/apr/1.5/include/apr_user.h
+file path=usr/apr/1.5/include/apr_version.h
+file path=usr/apr/1.5/include/apr_want.h
+file path=usr/apr/1.5/lib/$(MACH64)/libapr-1.so.0.5.0 facet.devel=false
+file path=usr/apr/1.5/lib/$(MACH64)/pkgconfig/apr-1.pc
+file path=usr/apr/1.5/lib/libapr-1.so.0.5.0 facet.devel=false
+file path=usr/apr/1.5/lib/pkgconfig/apr-1.pc
+file path=usr/apr/1.5/manual/annotated.html
+file path=usr/apr/1.5/manual/apr__allocator_8h.html
+file path=usr/apr/1.5/manual/apr__allocator_8h_source.html
+file path=usr/apr/1.5/manual/apr__atomic_8h.html
+file path=usr/apr/1.5/manual/apr__atomic_8h_source.html
+file path=usr/apr/1.5/manual/apr__dso_8h.html
+file path=usr/apr/1.5/manual/apr__dso_8h_source.html
+file path=usr/apr/1.5/manual/apr__env_8h.html
+file path=usr/apr/1.5/manual/apr__env_8h_source.html
+file path=usr/apr/1.5/manual/apr__errno_8h.html
+file path=usr/apr/1.5/manual/apr__errno_8h_source.html
+file path=usr/apr/1.5/manual/apr__escape_8h.html
+file path=usr/apr/1.5/manual/apr__escape_8h_source.html
+file path=usr/apr/1.5/manual/apr__file__info_8h.html
+file path=usr/apr/1.5/manual/apr__file__info_8h_source.html
+file path=usr/apr/1.5/manual/apr__file__io_8h.html
+file path=usr/apr/1.5/manual/apr__file__io_8h_source.html
+file path=usr/apr/1.5/manual/apr__fnmatch_8h.html
+file path=usr/apr/1.5/manual/apr__fnmatch_8h_source.html
+file path=usr/apr/1.5/manual/apr__general_8h.html
+file path=usr/apr/1.5/manual/apr__general_8h_source.html
+file path=usr/apr/1.5/manual/apr__getopt_8h.html
+file path=usr/apr/1.5/manual/apr__getopt_8h_source.html
+file path=usr/apr/1.5/manual/apr__global__mutex_8h.html
+file path=usr/apr/1.5/manual/apr__global__mutex_8h_source.html
+file path=usr/apr/1.5/manual/apr__hash_8h.html
+file path=usr/apr/1.5/manual/apr__hash_8h_source.html
+file path=usr/apr/1.5/manual/apr__inherit_8h.html
+file path=usr/apr/1.5/manual/apr__inherit_8h_source.html
+file path=usr/apr/1.5/manual/apr__lib_8h.html
+file path=usr/apr/1.5/manual/apr__lib_8h_source.html
+file path=usr/apr/1.5/manual/apr__mmap_8h.html
+file path=usr/apr/1.5/manual/apr__mmap_8h_source.html
+file path=usr/apr/1.5/manual/apr__network__io_8h.html
+file path=usr/apr/1.5/manual/apr__network__io_8h_source.html
+file path=usr/apr/1.5/manual/apr__poll_8h.html
+file path=usr/apr/1.5/manual/apr__poll_8h_source.html
+file path=usr/apr/1.5/manual/apr__pools_8h.html
+file path=usr/apr/1.5/manual/apr__pools_8h_source.html
+file path=usr/apr/1.5/manual/apr__portable_8h.html
+file path=usr/apr/1.5/manual/apr__portable_8h_source.html
+file path=usr/apr/1.5/manual/apr__proc__mutex_8h.html
+file path=usr/apr/1.5/manual/apr__proc__mutex_8h_source.html
+file path=usr/apr/1.5/manual/apr__random_8h.html
+file path=usr/apr/1.5/manual/apr__random_8h_source.html
+file path=usr/apr/1.5/manual/apr__ring_8h.html
+file path=usr/apr/1.5/manual/apr__ring_8h_source.html
+file path=usr/apr/1.5/manual/apr__shm_8h.html
+file path=usr/apr/1.5/manual/apr__shm_8h_source.html
+file path=usr/apr/1.5/manual/apr__signal_8h.html
+file path=usr/apr/1.5/manual/apr__signal_8h_source.html
+file path=usr/apr/1.5/manual/apr__skiplist_8h_source.html
+file path=usr/apr/1.5/manual/apr__strings_8h.html
+file path=usr/apr/1.5/manual/apr__strings_8h_source.html
+file path=usr/apr/1.5/manual/apr__support_8h.html
+file path=usr/apr/1.5/manual/apr__support_8h_source.html
+file path=usr/apr/1.5/manual/apr__tables_8h.html
+file path=usr/apr/1.5/manual/apr__tables_8h_source.html
+file path=usr/apr/1.5/manual/apr__thread__cond_8h.html
+file path=usr/apr/1.5/manual/apr__thread__cond_8h_source.html
+file path=usr/apr/1.5/manual/apr__thread__mutex_8h.html
+file path=usr/apr/1.5/manual/apr__thread__mutex_8h_source.html
+file path=usr/apr/1.5/manual/apr__thread__proc_8h.html
+file path=usr/apr/1.5/manual/apr__thread__proc_8h_source.html
+file path=usr/apr/1.5/manual/apr__thread__rwlock_8h.html
+file path=usr/apr/1.5/manual/apr__thread__rwlock_8h_source.html
+file path=usr/apr/1.5/manual/apr__time_8h.html
+file path=usr/apr/1.5/manual/apr__time_8h_source.html
+file path=usr/apr/1.5/manual/apr__user_8h.html
+file path=usr/apr/1.5/manual/apr__user_8h_source.html
+file path=usr/apr/1.5/manual/apr__version_8h.html
+file path=usr/apr/1.5/manual/apr__version_8h_source.html
+file path=usr/apr/1.5/manual/apr__want_8h.html
+file path=usr/apr/1.5/manual/apr__want_8h_source.html
+file path=usr/apr/1.5/manual/bc_s.png
+file path=usr/apr/1.5/manual/bug.html
+file path=usr/apr/1.5/manual/classes.html
+file path=usr/apr/1.5/manual/closed.png
+file path=usr/apr/1.5/manual/deprecated.html
+file path=usr/apr/1.5/manual/doxygen.css
+file path=usr/apr/1.5/manual/doxygen.png
+file path=usr/apr/1.5/manual/files.html
+file path=usr/apr/1.5/manual/functions.html
+file path=usr/apr/1.5/manual/functions_func.html
+file path=usr/apr/1.5/manual/functions_vars.html
+file path=usr/apr/1.5/manual/globals.html
+file path=usr/apr/1.5/manual/globals_0x68.html
+file path=usr/apr/1.5/manual/globals_0x6d.html
+file path=usr/apr/1.5/manual/globals_defs.html
+file path=usr/apr/1.5/manual/globals_defs_0x68.html
+file path=usr/apr/1.5/manual/globals_defs_0x6d.html
+file path=usr/apr/1.5/manual/globals_enum.html
+file path=usr/apr/1.5/manual/globals_eval.html
+file path=usr/apr/1.5/manual/globals_func.html
+file path=usr/apr/1.5/manual/globals_type.html
+file path=usr/apr/1.5/manual/globals_vars.html
+file path=usr/apr/1.5/manual/group___a_p_r___e_r_r_o_r__map.html
+file path=usr/apr/1.5/manual/group___a_p_r___error.html
+file path=usr/apr/1.5/manual/group___a_p_r___global_mutex.html
+file path=usr/apr/1.5/manual/group___a_p_r___o_c.html
+file path=usr/apr/1.5/manual/group___a_p_r___s_t_a_t_u_s___i_s.html
+file path=usr/apr/1.5/manual/group___a_p_r___strings___snprintf.html
+file path=usr/apr/1.5/manual/group___a_p_r___util___escaping.html
+file path=usr/apr/1.5/manual/group___i_p___proto.html
+file path=usr/apr/1.5/manual/group___pool_cleanup.html
+file path=usr/apr/1.5/manual/group___pool_debug.html
+file path=usr/apr/1.5/manual/group__apr__allocator.html
+file path=usr/apr/1.5/manual/group__apr__atomic.html
+file path=usr/apr/1.5/manual/group__apr__ctype.html
+file path=usr/apr/1.5/manual/group__apr__dir.html
+file path=usr/apr/1.5/manual/group__apr__dso.html
+file path=usr/apr/1.5/manual/group__apr__env.html
+file path=usr/apr/1.5/manual/group__apr__errno.html
+file path=usr/apr/1.5/manual/group__apr__file__attrs__set__flags.html
+file path=usr/apr/1.5/manual/group__apr__file__info.html
+file path=usr/apr/1.5/manual/group__apr__file__io.html
+file path=usr/apr/1.5/manual/group__apr__file__lock__types.html
+file path=usr/apr/1.5/manual/group__apr__file__open__flags.html
+file path=usr/apr/1.5/manual/group__apr__file__permissions.html
+file path=usr/apr/1.5/manual/group__apr__file__seek__flags.html
+file path=usr/apr/1.5/manual/group__apr__file__stat.html
+file path=usr/apr/1.5/manual/group__apr__file__writev.html
+file path=usr/apr/1.5/manual/group__apr__filepath.html
+file path=usr/apr/1.5/manual/group__apr__fnmatch.html
+file path=usr/apr/1.5/manual/group__apr__general.html
+file path=usr/apr/1.5/manual/group__apr__getopt.html
+file path=usr/apr/1.5/manual/group__apr__hash.html
+file path=usr/apr/1.5/manual/group__apr__lib.html
+file path=usr/apr/1.5/manual/group__apr__library.html
+file path=usr/apr/1.5/manual/group__apr__mcast.html
+file path=usr/apr/1.5/manual/group__apr__mmap.html
+file path=usr/apr/1.5/manual/group__apr__network__io.html
+file path=usr/apr/1.5/manual/group__apr__os__dso.html
+file path=usr/apr/1.5/manual/group__apr__os__thread.html
+file path=usr/apr/1.5/manual/group__apr__poll.html
+file path=usr/apr/1.5/manual/group__apr__pools.html
+file path=usr/apr/1.5/manual/group__apr__portabile.html
+file path=usr/apr/1.5/manual/group__apr__proc__mutex.html
+file path=usr/apr/1.5/manual/group__apr__random.html
+file path=usr/apr/1.5/manual/group__apr__ring.html
+file path=usr/apr/1.5/manual/group__apr__shm.html
+file path=usr/apr/1.5/manual/group__apr__signal.html
+file path=usr/apr/1.5/manual/group__apr__sockopt.html
+file path=usr/apr/1.5/manual/group__apr__strings.html
+file path=usr/apr/1.5/manual/group__apr__support.html
+file path=usr/apr/1.5/manual/group__apr__tables.html
+file path=usr/apr/1.5/manual/group__apr__thread__cond.html
+file path=usr/apr/1.5/manual/group__apr__thread__mutex.html
+file path=usr/apr/1.5/manual/group__apr__thread__proc.html
+file path=usr/apr/1.5/manual/group__apr__thread__rwlock.html
+file path=usr/apr/1.5/manual/group__apr__time.html
+file path=usr/apr/1.5/manual/group__apr__user.html
+file path=usr/apr/1.5/manual/index.html
+file path=usr/apr/1.5/manual/jquery.js
+file path=usr/apr/1.5/manual/modules.html
+file path=usr/apr/1.5/manual/nav_f.png
+file path=usr/apr/1.5/manual/nav_h.png
+file path=usr/apr/1.5/manual/open.png
+file path=usr/apr/1.5/manual/pages.html
+file path=usr/apr/1.5/manual/sha2_8h_source.html
+file path=usr/apr/1.5/manual/struct___s_h_a256___c_t_x.html
+file path=usr/apr/1.5/manual/structapr__array__header__t.html
+file path=usr/apr/1.5/manual/structapr__crypto__hash__t.html
+file path=usr/apr/1.5/manual/structapr__finfo__t.html
+file path=usr/apr/1.5/manual/structapr__getopt__option__t.html
+file path=usr/apr/1.5/manual/structapr__getopt__t.html
+file path=usr/apr/1.5/manual/structapr__hdtr__t.html
+file path=usr/apr/1.5/manual/structapr__memnode__t.html
+file path=usr/apr/1.5/manual/structapr__mmap__t.html
+file path=usr/apr/1.5/manual/structapr__os__proc__mutex__t.html
+file path=usr/apr/1.5/manual/structapr__os__sock__info__t.html
+file path=usr/apr/1.5/manual/structapr__pollfd__t.html
+file path=usr/apr/1.5/manual/structapr__proc__t.html
+file path=usr/apr/1.5/manual/structapr__sockaddr__t.html
+file path=usr/apr/1.5/manual/structapr__table__entry__t.html
+file path=usr/apr/1.5/manual/structapr__time__exp__t.html
+file path=usr/apr/1.5/manual/structapr__version__t.html
+file path=usr/apr/1.5/manual/structapr__vformatter__buff__t.html
+file path=usr/apr/1.5/manual/structin__addr.html
+file path=usr/apr/1.5/manual/tab_a.png
+file path=usr/apr/1.5/manual/tab_b.png
+file path=usr/apr/1.5/manual/tab_h.png
+file path=usr/apr/1.5/manual/tab_s.png
+file path=usr/apr/1.5/manual/tabs.css
+file path=usr/apr/1.5/manual/unionapr__descriptor.html
+link path=usr/apr/1.5/bin/64 target=$(MACH64)
+link path=usr/apr/1.5/build/64 target=$(MACH64)
+link path=usr/apr/1.5/lib/$(MACH64)/libapr-1.so target=libapr-1.so.0.5.0 \
+     facet.devel=false
+link path=usr/apr/1.5/lib/$(MACH64)/libapr-1.so.0 target=libapr-1.so.0.5.0 \
+     facet.devel=false
+link path=usr/apr/1.5/lib/64 target=$(MACH64)
+link path=usr/apr/1.5/lib/libapr-1.so target=libapr-1.so.0.5.0 \
+     facet.devel=false
+link path=usr/apr/1.5/lib/libapr-1.so.0 target=libapr-1.so.0.5.0 \
+     facet.devel=false
+link path=usr/bin/$(MACH64)/apr-1-config target=../../apr/1.5/bin/$(MACH64)/apr-1-config \
+     mediator=apr-1-config mediator-version=1.5 pkg.linted.pkglint.dupaction010.2=true
+link path=usr/bin/apr-1-config target=../apr/1.5/bin/apr-1-config \
+     mediator=apr-1-config mediator-version=1.5 pkg.linted.pkglint.dupaction010.2=true
+
+license apr.license license="Apache v2.0"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/apr-1_5/apr.license	Fri Mar 21 07:47:48 2014 -0700
@@ -0,0 +1,369 @@
+Apache Portable Runtime
+Copyright (c) 2009 The Apache Software Foundation.
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
+Portions of this software were developed at the National Center
+for Supercomputing Applications (NCSA) at the University of
+Illinois at Urbana-Champaign.
+
+This software contains code derived from the RSA Data Security
+Inc. MD5 Message-Digest Algorithm.
+
+This software contains code derived from UNIX V7, Copyright(C)
+Caldera International Inc.
+
+
+The following applies to all products licensed under the Apache 2.0 License:
+
+You may not use the identified files except in compliance with the Apache License, Version 2.0 (the "License.")
+ 
+You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0.  A copy of the license is also reproduced below.
+
+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 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-1_5/patches/apr_common.m4.patch	Fri Mar 21 07:47:48 2014 -0700
@@ -0,0 +1,16 @@
+Patch origin: in-house
+Patch status: Solaris-specific; not suitable for upstream
+
+This is added to fix the MKDEP value for Solaris 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
[email protected]@ -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-1_5/patches/config.layout.patch	Fri Mar 21 07:47:48 2014 -0700
@@ -0,0 +1,93 @@
+Patch origin: in-house
+Patch status: Part 1: Solaris-specific; not suitable for upstream
+Patch status: Part 2: https://issues.apache.org/bugzilla/show_bug.cgi?id=56090
+
+--- config.layout	2004-11-24 14:51:51.000000000 -0800
++++ config.layout	2014-01-27 06:21:54.767926309 -0800
[email protected]@ -179,21 +179,56 @@
+     runtimedir:    ${localstatedir}/run
+ </Layout>
+ 
+-#   Solaris 8 Layout
++#   Solaris Layout
+ <Layout Solaris>
+-    prefix:        /usr/apr
++    prefix:        /usr/apr/1.5
+     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
+-    datadir:       /var/apr
+-    installbuilddir: ${datadir}/build
++    sysconfdir:    /etc/apr/1.5
++    datadir:       /var/apr/1.5
++    installbuilddir: ${prefix}/build
+     includedir:    ${exec_prefix}/include
+     localstatedir: ${prefix}
+-    runtimedir:    /var/run
++    runtimedir:    /var/run/apr/1.5
++    libsuffix:     -${APR_MAJOR_VERSION}
++</Layout>
++
++<Layout Solaris-amd64>
++    prefix:        /usr/apr/1.5
++    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.5
++    datadir:       /var/apr/1.5
++    installbuilddir: ${prefix}/build/amd64
++    includedir:    ${exec_prefix}/include
++    localstatedir: ${prefix}
++    runtimedir:    /var/run/apr/1.5
++    libsuffix:     -${APR_MAJOR_VERSION}
++</Layout>
++
++<Layout Solaris-sparcv9>
++    prefix:        /usr/apr/1.5
++    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.5
++    datadir:       /var/apr/1.5
++    installbuilddir: ${prefix}/build/sparcv9
++    includedir:    ${exec_prefix}/include
++    localstatedir: ${prefix}
++    runtimedir:    /var/run/apr/1.5
++    libsuffix:     -${APR_MAJOR_VERSION}
+ </Layout>
+ 
+ #   OpenBSD Layout
+--- configure.in	2013-11-13 04:15:56.000000000 -0800
++++ configure.in	2014-01-30 04:26:55.991256430 -0800
[email protected]@ -167,6 +167,10 @@
+ 
+ echo "APR Version: ${APR_DOTTED_VERSION}"
+ 
++AC_ARG_WITH(installbuilddir, [  --with-installbuilddir=DIR location to store APR build files (defaults to '${datadir}/build')],
++  [ installbuilddir=$withval ], [ installbuilddir="${datadir}/build-${APR_MAJOR_VERSION}" ] )
++AC_SUBST(installbuilddir)
++
+ dnl Enable the layout handling code, then reparse the prefix-style
+ dnl arguments due to autoconf being a PITA.
+ APR_ENABLE_LAYOUT(apr)
[email protected]@ -272,10 +276,6 @@
+     ;;
+ esac
+ 
+-AC_ARG_WITH(installbuilddir, [  --with-installbuilddir=DIR location to store APR build files (defaults to '${datadir}/build')],
+-  [ installbuilddir=$withval ], [ installbuilddir="${datadir}/build-${APR_MAJOR_VERSION}" ] )
+-AC_SUBST(installbuilddir)
+-
+ AC_ARG_WITH(libtool, [  --without-libtool       avoid using libtool to link the library],
+   [ use_libtool=$withval ], [ use_libtool="yes" ] )
+ 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/apr-1_5/patches/doxygen.conf.patch	Fri Mar 21 07:47:48 2014 -0700
@@ -0,0 +1,15 @@
+Patch origin: in-house
+Patch status: Solaris-specific; not suitable for upstream
+
+--- docs/doxygen.conf	2005-02-07 15:12:15.000000000 -0800
++++ docs/doxygen.conf	2014-01-28 01:32:48.342337115 -0800
[email protected]@ -34,5 +34,8 @@
+                  "*/test/*" \
+                  "*/arch/*"
+ 
+-GENERATE_TAGFILE=docs/dox/apr.tag
++GENERATE_LATEX=NO
++HTML_TIMESTAMP=NO
++HTML_OUTPUT=manual
++SEARCHENGINE=NO
+ 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/apr-1_5/patches/extended_file.patch	Fri Mar 21 07:47:48 2014 -0700
@@ -0,0 +1,33 @@
+Patch origin: in-house
+Patch status: Solaris-specific; not suitable for upstream
+
+--- misc/unix/start.c.orig	Fri Sep 19 11:41:54 2008
++++ misc/unix/start.c	Fri Sep 19 11:44:38 2008
[email protected]@ -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, 
[email protected]@ -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-1_5/patches/libtool.m4.patch	Fri Mar 21 07:47:48 2014 -0700
@@ -0,0 +1,25 @@
+Patch origin: in-house
+Patch status: Solaris-specific; not suitable for upstream
+
+--- build/libtool.m4.orig	Fri Aug  8 23:08:06 2008
++++ build/libtool.m4	Mon Feb  2 23:27:08 2009
[email protected]@ -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-1_5/patches/makefile-out.patch	Fri Mar 21 07:47:48 2014 -0700
@@ -0,0 +1,42 @@
+Patch origin: in-house
+Patch status: Solaris-specific; not suitable for upstream
+
+--- Makefile.in.orig	Fri Apr 15 07:23:41 2011
++++ Makefile.in	Fri Apr 15 07:23:53 2011
[email protected]@ -62,11 +62,19 @@
+ 
+ # Create apr-config script suitable for the install tree
+ apr-config.out: $(APR_CONFIG)
+-	sed 's,^\(location=\).*$$,\1installed,' < $(APR_CONFIG) > [email protected]
++	sed -e 's,^\(location=\).*$$,\1installed,' \
++	    -e '/^CC=/s,/.*/,,' \
++	    -e '/^CPP=/s,/.*/,,' \
++	    -e '/^APR_SOURCE_DIR=/s,/.*",/usr/apr/1.5",' \
++	    -e '/^APR_BUILD_DIR=/s,/.*",/usr/apr/1.5",' \
++	    < $(APR_CONFIG) > [email protected]
+ 
+ # Create apr_rules.mk suitable for the install tree
+ build/apr_rules.out: build/apr_rules.mk
+-	sed -e 's,^\(apr_build.*=\).*$$,\1$(installbuilddir),' -e 's,^\(top_build.*=\).*$$,\1$(installbuilddir),' < build/apr_rules.mk > [email protected]
++	sed -e 's,^\(apr_build.*=\).*$$,\1$(installbuilddir),' -e 's,^\(top_build.*=\).*$$,\1$(installbuilddir),' \
++	    -e '/^CC=/s,/.*/,,' \
++	    -e '/^MKDEP            = /s,/.*/,,' \
++	     < build/apr_rules.mk > [email protected]
+ 
+ install: $(TARGETS)
+ 	$(APR_MKDIR) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) $(DESTDIR)$(installbuilddir) \
[email protected]@ -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-1_5/patches/makefile.patch	Fri Mar 21 07:47:48 2014 -0700
@@ -0,0 +1,25 @@
+Patch origin: upstream
+Patch status: will be part of next version
+
+http://svn.apache.org/viewvc?view=revision&revision=1541744
+http://svn.apache.org/viewvc?view=revision&revision=757740
+
+--- Makefile.in	2013-10-29 11:37:29.000000000 -0700
++++ Makefile.in	2014-01-27 07:24:52.564639849 -0800
[email protected]@ -18,7 +18,7 @@
+ INCDIR=./include
+ OSDIR=$(top_srcdir)/include/arch/@[email protected]
+ DEFOSDIR=$(INCDIR)/arch/@[email protected]
+-INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR) -I$(top_srcdir)/include/arch/@[email protected] -I$(top_srcdir)/include -I$(top_srcdir)/include/private
++INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR) -I$(top_srcdir)/include/arch/@[email protected] -I$(top_srcdir)/include -I$(top_srcdir)/include/private -I$(top_builddir)/include/private
+ 
+ #
+ # Macros for target determination
[email protected]@ -134,6 +134,7 @@
+ 	$(LINK_PROG) $(OBJECTS_gen_test_char) $(ALL_LIBS)
+ 
+ include/private/apr_escape_test_char.h: tools/[email protected]@
++	mkdir -p include/private
+ 	tools/[email protected]@ > [email protected]
+ 
+ LINK_PROG = $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) $(LT_LDFLAGS) \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/apr-1_5/resolve.deps	Fri Mar 21 07:47:48 2014 -0700
@@ -0,0 +1,3 @@
+shell/bash
+shell/ksh93
+system/library
--- a/components/apr/apr-13.p5m	Fri Mar 21 01:03:40 2014 -0700
+++ b/components/apr/apr-13.p5m	Fri Mar 21 07:47:48 2014 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 <transform file link hardlink path=usr/apr/1.3/.* -> \
     default facet.devel all>
@@ -106,7 +106,9 @@
      facet.devel=false
 link path=usr/apr/1.3/lib/libapr-1.so.0 target=libapr-1.so.0.3.9 \
      facet.devel=false
-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
+link path=usr/bin/$(MACH64)/apr-1-config target=../../apr/1.3/bin/$(MACH64)/apr-1-config \
+     mediator=apr-1-config mediator-version=1.3
+link path=usr/bin/apr-1-config target=../apr/1.3/bin/apr-1-config \
+     mediator=apr-1-config mediator-version=1.3
 
 license apr.license license="Apache v2.0"