# HG changeset patch # User Petr Sumbera # Date 1397228998 25200 # Node ID aa5916252876212d077772f0cfdded82fa7212cf # Parent b9fc8aa825e4a3de16f8457601ff5ce2e0572369 PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3 18503507 APR-util 1.5.3 diff -r b9fc8aa825e4 -r aa5916252876 components/apr-1_5/patches/ltmain.sh.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/apr-1_5/patches/ltmain.sh.patch Fri Apr 11 08:09:58 2014 -0700 @@ -0,0 +1,18 @@ +Patch origin: in-house +Patch status: Solaris-specific; not suitable for upstream + +Fixes problem where APR-util Parfait build wouldn't analyze mysql and +sqlite3 modules as apr_dbd_sqlite3.o.bc and apr_dbd_mysql.o.bc were +removed here. + +--- build/ltmain.sh 2013-11-13 08:14:27.000000000 -0800 ++++ build/ltmain.sh 2014-04-09 02:30:03.737786743 -0700 +@@ -7548,7 +7548,7 @@ + tempremovelist=`$ECHO "$output_objdir/*"` + for p in $tempremovelist; do + case $p in +- *.$objext | *.gcno) ++ *.$objext | *.$objext.bc | *.gcno) + ;; + $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*) + if test "X$precious_files_regex" != "X"; then diff -r b9fc8aa825e4 -r aa5916252876 components/apr-util-1_5/Makefile --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/apr-util-1_5/Makefile Fri Apr 11 08:09:58 2014 -0700 @@ -0,0 +1,83 @@ +# +# 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-util +COMPONENT_VERSION= 1.5.3 +COMPONENT_PROJECT_URL= http://apr.apache.org/ +COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION) +COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz +COMPONENT_ARCHIVE_HASH= \ + sha256:76db34cb508e346e3bf69347c29ed1500bf0b71bcc48d54271ad9d1c25703743 +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-util/1.5 + +CONFIGURE_OPTIONS += --with-mysql=/usr/mysql/5.5 +CONFIGURE_OPTIONS += --with-expat=/usr +CONFIGURE_OPTIONS += --with-sqlite3=/usr +CONFIGURE_OPTIONS += --with-ldap=ldap_r-2.4 +CONFIGURE_OPTIONS += --with-ldap-include=/usr/include/openldap +CONFIGURE_OPTIONS += --without-odbc +CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS)" +CONFIGURE_OPTIONS.32 += --enable-layout=Solaris +CONFIGURE_OPTIONS.64 += --enable-layout=Solaris-$(MACH64) +CONFIGURE_OPTIONS.32 += --with-apr=/usr/apr/1.5/bin/apr-1-config +CONFIGURE_OPTIONS.64 += --with-apr=/usr/apr/1.5/bin/$(MACH64)/apr-1-config +CONFIGURE_OPTIONS.32 += MYSQL_CONFIG=/usr/mysql/5.5/bin/$(MACH32)/mysql_config + +PATH=$(SPRO_VROOT)/bin:/usr/bin:/usr/gnu/bin +ifeq ($(strip $(PARFAIT_BUILD)),yes) +PATH=$(PARFAIT_TOOLS):$(SPRO_VROOT)/bin:/usr/bin:/usr/gnu/bin +endif + +COMPONENT_TEST_TARGETS= test + +$(INSTALL_64): COMPONENT_POST_INSTALL_ACTION += \ + cd $(SOURCE_DIR); \ + sed 's;OUTPUT_DIRECTORY=.*;OUTPUT_DIRECTORY=$(PROTO_DIR)$(CONFIGURE_PREFIX);' \ + docs/doxygen.conf | doxygen - ; + +# Some patches need configure script recreation. +COMPONENT_PREP_ACTION += (cd $(@D); autoconf); + +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 diff -r b9fc8aa825e4 -r aa5916252876 components/apr-util-1_5/apr-util-15-apr-ldap.p5m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/apr-util-1_5/apr-util-15-apr-ldap.p5m Fri Apr 11 08:09:58 2014 -0700 @@ -0,0 +1,41 @@ +# +# 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. +# +set name=pkg.fmri \ + value=pkg:/library/apr-util-15/apr-ldap@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) +set name=pkg.summary \ + value="Apache Portable Runtime Utility (APR-util) 1.5 LDAP's stub" +set name=com.oracle.info.description \ + value="the Apache Portable Runtime Utility (APR-util) 1.5 LDAP's stub" +set name=com.oracle.info.tpno value=6137 +set name=info.classification \ + value="org.opensolaris.category.2008:Web Services/Application and Web Servers" +set name=info.source-url value=$(COMPONENT_ARCHIVE_URL) +set name=info.upstream-url value=$(COMPONENT_PROJECT_URL) +set name=org.opensolaris.arc-caseid value=PSARC/2014/099 +set name=org.opensolaris.consolidation value=$(CONSOLIDATION) +file path=usr/apr-util/1.5/lib/$(MACH64)/apr-util-1/apr_ldap-1.so +link path=usr/apr-util/1.5/lib/$(MACH64)/apr-util-1/apr_ldap.so \ + target=apr_ldap-1.so +file path=usr/apr-util/1.5/lib/apr-util-1/apr_ldap-1.so +link path=usr/apr-util/1.5/lib/apr-util-1/apr_ldap.so target=apr_ldap-1.so +license apr-util.license license="Apache v2.0" diff -r b9fc8aa825e4 -r aa5916252876 components/apr-util-1_5/apr-util-15-dbd-mysql.p5m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/apr-util-1_5/apr-util-15-dbd-mysql.p5m Fri Apr 11 08:09:58 2014 -0700 @@ -0,0 +1,42 @@ +# +# 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. +# +set name=pkg.fmri \ + value=pkg:/library/apr-util-15/dbd-mysql@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) +set name=pkg.summary \ + value="Apache Portable Runtime Utility (APR-util) 1.5 DBD Driver for MySQL" +set name=com.oracle.info.description \ + value="the Apache Portable Runtime Utility (APR-util) 1.5 DBD Driver for MySQL" +set name=com.oracle.info.tpno value=6137 +set name=info.classification \ + value="org.opensolaris.category.2008:Web Services/Application and Web Servers" +set name=info.source-url value=$(COMPONENT_ARCHIVE_URL) +set name=info.upstream-url value=$(COMPONENT_PROJECT_URL) +set name=org.opensolaris.arc-caseid value=PSARC/2014/099 +set name=org.opensolaris.consolidation value=$(CONSOLIDATION) +file path=usr/apr-util/1.5/lib/$(MACH64)/apr-util-1/apr_dbd_mysql-1.so +link path=usr/apr-util/1.5/lib/$(MACH64)/apr-util-1/apr_dbd_mysql.so \ + target=apr_dbd_mysql-1.so +file path=usr/apr-util/1.5/lib/apr-util-1/apr_dbd_mysql-1.so +link path=usr/apr-util/1.5/lib/apr-util-1/apr_dbd_mysql.so \ + target=apr_dbd_mysql-1.so +license apr-util.license license="Apache v2.0" diff -r b9fc8aa825e4 -r aa5916252876 components/apr-util-1_5/apr-util-15-dbd-sqlite.p5m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/apr-util-1_5/apr-util-15-dbd-sqlite.p5m Fri Apr 11 08:09:58 2014 -0700 @@ -0,0 +1,42 @@ +# +# 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. +# +set name=pkg.fmri \ + value=pkg:/library/apr-util-15/dbd-sqlite@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) +set name=pkg.summary \ + value="Apache Portable Runtime Utility (APR-util) 1.5 DBD Driver for SQLite" +set name=com.oracle.info.description \ + value="the Apache Portable Runtime Utility (APR-util) 1.5 DBD Driver for SQLite" +set name=com.oracle.info.tpno value=6137 +set name=info.classification \ + value="org.opensolaris.category.2008:Web Services/Application and Web Servers" +set name=info.source-url value=$(COMPONENT_ARCHIVE_URL) +set name=info.upstream-url value=$(COMPONENT_PROJECT_URL) +set name=org.opensolaris.arc-caseid value=PSARC/2014/099 +set name=org.opensolaris.consolidation value=$(CONSOLIDATION) +file path=usr/apr-util/1.5/lib/$(MACH64)/apr-util-1/apr_dbd_sqlite3-1.so +link path=usr/apr-util/1.5/lib/$(MACH64)/apr-util-1/apr_dbd_sqlite3.so \ + target=apr_dbd_sqlite3-1.so +file path=usr/apr-util/1.5/lib/apr-util-1/apr_dbd_sqlite3-1.so +link path=usr/apr-util/1.5/lib/apr-util-1/apr_dbd_sqlite3.so \ + target=apr_dbd_sqlite3-1.so +license apr-util.license license="Apache v2.0" diff -r b9fc8aa825e4 -r aa5916252876 components/apr-util-1_5/apr-util-15.p5m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/apr-util-1_5/apr-util-15.p5m Fri Apr 11 08:09:58 2014 -0700 @@ -0,0 +1,288 @@ +# +# 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. +# + \ + default facet.devel all> + default facet.doc.html all> +set name=pkg.fmri \ + value=pkg:/library/apr-util-15@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) +set name=pkg.summary \ + value="Apache Portable Runtime Utility (APR-util) 1.5 development header files and libraries" +set name=com.oracle.info.description \ + value="the Apache Portable Runtime Utility (APR-util) 1.5 development header files and libraries" +set name=com.oracle.info.tpno value=6137 +set name=info.classification \ + value="org.opensolaris.category.2008:Web Services/Application and Web Servers" +set name=info.source-url value=$(COMPONENT_ARCHIVE_URL) +set name=info.upstream-url value=$(COMPONENT_PROJECT_URL) +set name=org.opensolaris.arc-caseid value=PSARC/2014/099 +set name=org.opensolaris.consolidation value=$(CONSOLIDATION) +file path=usr/apr-util/1.5/bin/$(MACH64)/apu-1-config +link path=usr/apr-util/1.5/bin/64 target=$(MACH64) +file path=usr/apr-util/1.5/bin/apu-1-config +file path=usr/apr-util/1.5/include/apr_anylock.h +file path=usr/apr-util/1.5/include/apr_base64.h +file path=usr/apr-util/1.5/include/apr_buckets.h +file path=usr/apr-util/1.5/include/apr_date.h +file path=usr/apr-util/1.5/include/apr_dbd.h +file path=usr/apr-util/1.5/include/apr_dbm.h +file path=usr/apr-util/1.5/include/apr_hooks.h +file path=usr/apr-util/1.5/include/apr_ldap.h +file path=usr/apr-util/1.5/include/apr_ldap_init.h +file path=usr/apr-util/1.5/include/apr_ldap_option.h +file path=usr/apr-util/1.5/include/apr_ldap_rebind.h +file path=usr/apr-util/1.5/include/apr_ldap_url.h +file path=usr/apr-util/1.5/include/apr_md4.h +file path=usr/apr-util/1.5/include/apr_md5.h +file path=usr/apr-util/1.5/include/apr_memcache.h +file path=usr/apr-util/1.5/include/apr_optional.h +file path=usr/apr-util/1.5/include/apr_optional_hooks.h +file path=usr/apr-util/1.5/include/apr_queue.h +file path=usr/apr-util/1.5/include/apr_reslist.h +file path=usr/apr-util/1.5/include/apr_rmm.h +file path=usr/apr-util/1.5/include/apr_sdbm.h +file path=usr/apr-util/1.5/include/apr_sha1.h +file path=usr/apr-util/1.5/include/apr_strmatch.h +file path=usr/apr-util/1.5/include/apr_thread_pool.h +file path=usr/apr-util/1.5/include/apr_uri.h +file path=usr/apr-util/1.5/include/apr_uuid.h +file path=usr/apr-util/1.5/include/apr_xlate.h +file path=usr/apr-util/1.5/include/apr_xml.h +file path=usr/apr-util/1.5/include/apu.h +file path=usr/apr-util/1.5/include/apu_version.h +file path=usr/apr-util/1.5/include/apu_want.h +link path=usr/apr-util/1.5/lib/$(MACH64)/libaprutil-1.so \ + target=libaprutil-1.so.0.5.3 facet.devel=false +link path=usr/apr-util/1.5/lib/$(MACH64)/libaprutil-1.so.0 \ + target=libaprutil-1.so.0.5.3 facet.devel=false +file path=usr/apr-util/1.5/lib/$(MACH64)/libaprutil-1.so.0.5.3 facet.devel=false +file path=usr/apr-util/1.5/lib/$(MACH64)/pkgconfig/apr-util-1.pc +link path=usr/apr-util/1.5/lib/64 target=$(MACH64) +link path=usr/apr-util/1.5/lib/libaprutil-1.so target=libaprutil-1.so.0.5.3 \ + facet.devel=false +link path=usr/apr-util/1.5/lib/libaprutil-1.so.0 target=libaprutil-1.so.0.5.3 \ + facet.devel=false +file path=usr/apr-util/1.5/lib/libaprutil-1.so.0.5.3 facet.devel=false +file path=usr/apr-util/1.5/lib/pkgconfig/apr-util-1.pc +file path=usr/apr-util/1.5/manual/abts_8h_source.html +file path=usr/apr-util/1.5/manual/abts__tests_8h_source.html +file path=usr/apr-util/1.5/manual/annotated.html +file path=usr/apr-util/1.5/manual/apr__anylock_8h.html +file path=usr/apr-util/1.5/manual/apr__anylock_8h_source.html +file path=usr/apr-util/1.5/manual/apr__base64_8h.html +file path=usr/apr-util/1.5/manual/apr__base64_8h_source.html +file path=usr/apr-util/1.5/manual/apr__buckets_8h.html +file path=usr/apr-util/1.5/manual/apr__buckets_8h_source.html +file path=usr/apr-util/1.5/manual/apr__crypto_8h.html +file path=usr/apr-util/1.5/manual/apr__crypto_8h_source.html +file path=usr/apr-util/1.5/manual/apr__crypto__internal_8h_source.html +file path=usr/apr-util/1.5/manual/apr__date_8h.html +file path=usr/apr-util/1.5/manual/apr__date_8h_source.html +file path=usr/apr-util/1.5/manual/apr__dbd_8h.html +file path=usr/apr-util/1.5/manual/apr__dbd_8h_source.html +file path=usr/apr-util/1.5/manual/apr__dbd__internal_8h_source.html +file path=usr/apr-util/1.5/manual/apr__dbd__odbc__v2_8h_source.html +file path=usr/apr-util/1.5/manual/apr__dbm_8h.html +file path=usr/apr-util/1.5/manual/apr__dbm_8h_source.html +file path=usr/apr-util/1.5/manual/apr__dbm__private_8h_source.html +file path=usr/apr-util/1.5/manual/apr__hooks_8h.html +file path=usr/apr-util/1.5/manual/apr__hooks_8h_source.html +file path=usr/apr-util/1.5/manual/apr__ldap__init_8h.html +file path=usr/apr-util/1.5/manual/apr__ldap__init_8h_source.html +file path=usr/apr-util/1.5/manual/apr__ldap__option_8h.html +file path=usr/apr-util/1.5/manual/apr__ldap__option_8h_source.html +file path=usr/apr-util/1.5/manual/apr__ldap__rebind_8h.html +file path=usr/apr-util/1.5/manual/apr__ldap__rebind_8h_source.html +file path=usr/apr-util/1.5/manual/apr__ldap__url_8h.html +file path=usr/apr-util/1.5/manual/apr__ldap__url_8h_source.html +file path=usr/apr-util/1.5/manual/apr__md4_8h.html +file path=usr/apr-util/1.5/manual/apr__md4_8h_source.html +file path=usr/apr-util/1.5/manual/apr__md5_8h.html +file path=usr/apr-util/1.5/manual/apr__md5_8h_source.html +file path=usr/apr-util/1.5/manual/apr__memcache_8h.html +file path=usr/apr-util/1.5/manual/apr__memcache_8h_source.html +file path=usr/apr-util/1.5/manual/apr__optional_8h.html +file path=usr/apr-util/1.5/manual/apr__optional_8h_source.html +file path=usr/apr-util/1.5/manual/apr__optional__hooks_8h.html +file path=usr/apr-util/1.5/manual/apr__optional__hooks_8h_source.html +file path=usr/apr-util/1.5/manual/apr__queue_8h.html +file path=usr/apr-util/1.5/manual/apr__queue_8h_source.html +file path=usr/apr-util/1.5/manual/apr__reslist_8h.html +file path=usr/apr-util/1.5/manual/apr__reslist_8h_source.html +file path=usr/apr-util/1.5/manual/apr__rmm_8h.html +file path=usr/apr-util/1.5/manual/apr__rmm_8h_source.html +file path=usr/apr-util/1.5/manual/apr__sdbm_8h.html +file path=usr/apr-util/1.5/manual/apr__sdbm_8h_source.html +file path=usr/apr-util/1.5/manual/apr__sha1_8h.html +file path=usr/apr-util/1.5/manual/apr__sha1_8h_source.html +file path=usr/apr-util/1.5/manual/apr__strmatch_8h.html +file path=usr/apr-util/1.5/manual/apr__strmatch_8h_source.html +file path=usr/apr-util/1.5/manual/apr__thread__pool_8h.html +file path=usr/apr-util/1.5/manual/apr__thread__pool_8h_source.html +file path=usr/apr-util/1.5/manual/apr__uri_8h.html +file path=usr/apr-util/1.5/manual/apr__uri_8h_source.html +file path=usr/apr-util/1.5/manual/apr__uuid_8h.html +file path=usr/apr-util/1.5/manual/apr__uuid_8h_source.html +file path=usr/apr-util/1.5/manual/apr__xlate_8h.html +file path=usr/apr-util/1.5/manual/apr__xlate_8h_source.html +file path=usr/apr-util/1.5/manual/apr__xml_8h.html +file path=usr/apr-util/1.5/manual/apr__xml_8h_source.html +file path=usr/apr-util/1.5/manual/apu__errno_8h.html +file path=usr/apr-util/1.5/manual/apu__errno_8h_source.html +file path=usr/apr-util/1.5/manual/apu__internal_8h_source.html +file path=usr/apr-util/1.5/manual/apu__version_8h.html +file path=usr/apr-util/1.5/manual/apu__version_8h_source.html +file path=usr/apr-util/1.5/manual/ascii_8h_source.html +file path=usr/apr-util/1.5/manual/asciitab_8h_source.html +file path=usr/apr-util/1.5/manual/bc_s.png +file path=usr/apr-util/1.5/manual/bug.html +file path=usr/apr-util/1.5/manual/classes.html +file path=usr/apr-util/1.5/manual/closed.png +file path=usr/apr-util/1.5/manual/crypt__blowfish_8h_source.html +file path=usr/apr-util/1.5/manual/doxygen.css +file path=usr/apr-util/1.5/manual/doxygen.png +file path=usr/apr-util/1.5/manual/expat_8h_source.html +file path=usr/apr-util/1.5/manual/files.html +file path=usr/apr-util/1.5/manual/functions.html +file path=usr/apr-util/1.5/manual/functions_enum.html +file path=usr/apr-util/1.5/manual/functions_eval.html +file path=usr/apr-util/1.5/manual/functions_func.html +file path=usr/apr-util/1.5/manual/functions_vars.html +file path=usr/apr-util/1.5/manual/globals.html +file path=usr/apr-util/1.5/manual/globals_defs.html +file path=usr/apr-util/1.5/manual/globals_enum.html +file path=usr/apr-util/1.5/manual/globals_eval.html +file path=usr/apr-util/1.5/manual/globals_func.html +file path=usr/apr-util/1.5/manual/globals_type.html +file path=usr/apr-util/1.5/manual/globals_vars.html +file path=usr/apr-util/1.5/manual/group___a_p_r___m_d5.html +file path=usr/apr-util/1.5/manual/group___a_p_r___u_u_i_d.html +file path=usr/apr-util/1.5/manual/group___a_p_r___util___base64.html +file path=usr/apr-util/1.5/manual/group___a_p_r___util___bucket___brigades.html +file path=usr/apr-util/1.5/manual/group___a_p_r___util___crypto.html +file path=usr/apr-util/1.5/manual/group___a_p_r___util___d_b_d.html +file path=usr/apr-util/1.5/manual/group___a_p_r___util___d_b_m.html +file path=usr/apr-util/1.5/manual/group___a_p_r___util___d_b_m___s_d_b_m.html +file path=usr/apr-util/1.5/manual/group___a_p_r___util___date.html +file path=usr/apr-util/1.5/manual/group___a_p_r___util___error.html +file path=usr/apr-util/1.5/manual/group___a_p_r___util___f_i_f_o.html +file path=usr/apr-util/1.5/manual/group___a_p_r___util___hook.html +file path=usr/apr-util/1.5/manual/group___a_p_r___util___l_d_a_p.html +file path=usr/apr-util/1.5/manual/group___a_p_r___util___m_c.html +file path=usr/apr-util/1.5/manual/group___a_p_r___util___m_d4.html +file path=usr/apr-util/1.5/manual/group___a_p_r___util___o_p_t___h_o_o_k.html +file path=usr/apr-util/1.5/manual/group___a_p_r___util___opt.html +file path=usr/apr-util/1.5/manual/group___a_p_r___util___r_l.html +file path=usr/apr-util/1.5/manual/group___a_p_r___util___r_m_m.html +file path=usr/apr-util/1.5/manual/group___a_p_r___util___str_match.html +file path=usr/apr-util/1.5/manual/group___a_p_r___util___t_p.html +file path=usr/apr-util/1.5/manual/group___a_p_r___util___u_r_i.html +file path=usr/apr-util/1.5/manual/group___a_p_r___util___x_m_l.html +file path=usr/apr-util/1.5/manual/group___a_p_r___x_l_a_t_e.html +file path=usr/apr-util/1.5/manual/group___a_p_u___s_t_a_t_u_s___i_s.html +file path=usr/apr-util/1.5/manual/group__apr__hook__probes.html +file path=usr/apr-util/1.5/manual/group__apu__errno.html +file path=usr/apr-util/1.5/manual/iasciitab_8h_source.html +file path=usr/apr-util/1.5/manual/index.html +file path=usr/apr-util/1.5/manual/internal_8h_source.html +file path=usr/apr-util/1.5/manual/jquery.js +file path=usr/apr-util/1.5/manual/latin1tab_8h_source.html +file path=usr/apr-util/1.5/manual/map__osd__ebcdic__df04__1_8h_source.html +file path=usr/apr-util/1.5/manual/modules.html +file path=usr/apr-util/1.5/manual/namespace_apache.html +file path=usr/apr-util/1.5/manual/namespaces.html +file path=usr/apr-util/1.5/manual/nametab_8h_source.html +file path=usr/apr-util/1.5/manual/nav_f.png +file path=usr/apr-util/1.5/manual/nav_h.png +file path=usr/apr-util/1.5/manual/open.png +file path=usr/apr-util/1.5/manual/osd__ebcdic__df04__1_8h_source.html +file path=usr/apr-util/1.5/manual/pages.html +file path=usr/apr-util/1.5/manual/sdbm__pair_8h_source.html +file path=usr/apr-util/1.5/manual/sdbm__private_8h_source.html +file path=usr/apr-util/1.5/manual/sdbm__tune_8h_source.html +file path=usr/apr-util/1.5/manual/struct_a_t_t_r_i_b_u_t_e.html +file path=usr/apr-util/1.5/manual/struct_i_n_i_t___e_n_c_o_d_i_n_g.html +file path=usr/apr-util/1.5/manual/struct_x_m_l___encoding.html +file path=usr/apr-util/1.5/manual/struct_x_m_l___expat___version.html +file path=usr/apr-util/1.5/manual/struct_x_m_l___feature.html +file path=usr/apr-util/1.5/manual/struct_x_m_l___memory___handling___suite.html +file path=usr/apr-util/1.5/manual/struct_x_m_l__cp.html +file path=usr/apr-util/1.5/manual/structabts__case.html +file path=usr/apr-util/1.5/manual/structabts__suite.html +file path=usr/apr-util/1.5/manual/structapr__anylock__t.html +file path=usr/apr-util/1.5/manual/structapr__bucket.html +file path=usr/apr-util/1.5/manual/structapr__bucket__brigade.html +file path=usr/apr-util/1.5/manual/structapr__bucket__file.html +file path=usr/apr-util/1.5/manual/structapr__bucket__heap.html +file path=usr/apr-util/1.5/manual/structapr__bucket__mmap.html +file path=usr/apr-util/1.5/manual/structapr__bucket__pool.html +file path=usr/apr-util/1.5/manual/structapr__bucket__refcount.html +file path=usr/apr-util/1.5/manual/structapr__bucket__type__t.html +file path=usr/apr-util/1.5/manual/structapr__datum__t.html +file path=usr/apr-util/1.5/manual/structapr__dbd__driver__t.html +file path=usr/apr-util/1.5/manual/structapr__dbm__t.html +file path=usr/apr-util/1.5/manual/structapr__dbm__type__t.html +file path=usr/apr-util/1.5/manual/structapr__md4__ctx__t.html +file path=usr/apr-util/1.5/manual/structapr__md5__ctx__t.html +file path=usr/apr-util/1.5/manual/structapr__memcache__server__t.html +file path=usr/apr-util/1.5/manual/structapr__memcache__stats__t.html +file path=usr/apr-util/1.5/manual/structapr__memcache__t.html +file path=usr/apr-util/1.5/manual/structapr__memcache__value__t.html +file path=usr/apr-util/1.5/manual/structapr__sdbm__datum__t.html +file path=usr/apr-util/1.5/manual/structapr__sdbm__t.html +file path=usr/apr-util/1.5/manual/structapr__sha1__ctx__t.html +file path=usr/apr-util/1.5/manual/structapr__strmatch__pattern.html +file path=usr/apr-util/1.5/manual/structapr__text.html +file path=usr/apr-util/1.5/manual/structapr__text__header.html +file path=usr/apr-util/1.5/manual/structapr__uri__t.html +file path=usr/apr-util/1.5/manual/structapr__uuid__t.html +file path=usr/apr-util/1.5/manual/structapr__xml__attr.html +file path=usr/apr-util/1.5/manual/structapr__xml__doc.html +file path=usr/apr-util/1.5/manual/structapr__xml__elem.html +file path=usr/apr-util/1.5/manual/structapu__err__t.html +file path=usr/apr-util/1.5/manual/structencoding.html +file path=usr/apr-util/1.5/manual/structposition.html +file path=usr/apr-util/1.5/manual/structprolog__state.html +file path=usr/apr-util/1.5/manual/structsub__suite.html +file path=usr/apr-util/1.5/manual/structtestlist.html +file path=usr/apr-util/1.5/manual/tab_a.png +file path=usr/apr-util/1.5/manual/tab_b.png +file path=usr/apr-util/1.5/manual/tab_h.png +file path=usr/apr-util/1.5/manual/tab_s.png +file path=usr/apr-util/1.5/manual/tabs.css +file path=usr/apr-util/1.5/manual/test__apu_8h_source.html +file path=usr/apr-util/1.5/manual/testutil_8h_source.html +file path=usr/apr-util/1.5/manual/unionapr__anylock__t_1_1apr__anylock__u__t.html +file path=usr/apr-util/1.5/manual/unionapr__bucket__structs.html +file path=usr/apr-util/1.5/manual/utf8tab_8h_source.html +file path=usr/apr-util/1.5/manual/winconfig_8h_source.html +file path=usr/apr-util/1.5/manual/xmlrole_8h_source.html +file path=usr/apr-util/1.5/manual/xmltok_8h_source.html +file path=usr/apr-util/1.5/manual/xmltok__impl_8h_source.html +link path=usr/bin/$(MACH64)/apu-1-config \ + target=../../apr-util/1.5/bin/$(MACH64)/apu-1-config \ + mediator=apu-1-config mediator-version=1.5 \ + pkg.linted.pkglint.dupaction010.2=true +link path=usr/bin/apu-1-config target=../apr-util/1.5/bin/apu-1-config \ + mediator=apu-1-config mediator-version=1.5 \ + pkg.linted.pkglint.dupaction010.2=true +license apr-util.license license="Apache v2.0" diff -r b9fc8aa825e4 -r aa5916252876 components/apr-util-1_5/apr-util.license --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/apr-util-1_5/apr-util.license Fri Apr 11 08:09:58 2014 -0700 @@ -0,0 +1,458 @@ +Apache Portable Runtime Utility Library +Copyright (c) 2011 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, including various +modifications by Spyglass Inc., Carnegie Mellon University, and +Bell Communications Research, Inc (Bellcore). + + 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): + * 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. + */ + diff -r b9fc8aa825e4 -r aa5916252876 components/apr-util-1_5/patches/apr_common.m4.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/apr-util-1_5/patches/apr_common.m4.patch Fri Apr 11 08:09:58 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 +@@ -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 diff -r b9fc8aa825e4 -r aa5916252876 components/apr-util-1_5/patches/config.layout.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/apr-util-1_5/patches/config.layout.patch Fri Apr 11 08:09:58 2014 -0700 @@ -0,0 +1,71 @@ +Patch origin: in-house +Patch status: Solaris-specific; not suitable for upstream + +--- config.layout 2005-02-09 04:18:43.000000000 -0800 ++++ config.layout 2014-04-01 06:11:52.176952015 -0700 +@@ -179,21 +179,59 @@ + runtimedir: ${localstatedir}/run + + +-# Solaris 8 Layout ++# Solaris Layout + +- prefix: /usr/apr ++ prefix: /usr/apr-util/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-util/1.5 ++ datadir: /var/apr-util/1.5 + includedir: ${exec_prefix}/include + localstatedir: ${prefix} +- runtimedir: /var/run ++ installbuilddir: ${prefix}/build ++ manualdir: ${prefix}/manual ++ runtimedir: /var/run/apr-util/1.5 ++ libsuffix: -${APRUTIL_MAJOR_VERSION} ++ ++ ++ ++ prefix: /usr/apr-util/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-util/1.5 ++ datadir: /var/apr-util/1.5 ++ includedir: ${exec_prefix}/include ++ localstatedir: ${prefix} ++ installbuilddir: ${prefix}/build/amd64 ++ manualdir: ${prefix}/manual ++ runtimedir: /var/run/apr-util/1.5 ++ libsuffix: -${APRUTIL_MAJOR_VERSION} ++ ++ ++ ++ prefix: /usr/apr-util/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-util/1.5 ++ datadir: /var/apr-util/1.5 ++ includedir: ${exec_prefix}/include ++ localstatedir: ${prefix} ++ installbuilddir: ${prefix}/build/sparcv9 ++ manualdir: ${prefix}/manual ++ runtimedir: /var/run/apr-util/1.5 ++ libsuffix: -${APRUTIL_MAJOR_VERSION} + + + # OpenBSD Layout diff -r b9fc8aa825e4 -r aa5916252876 components/apr-util-1_5/patches/doxygen.conf.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/apr-util-1_5/patches/doxygen.conf.patch Fri Apr 11 08:09:58 2014 -0700 @@ -0,0 +1,14 @@ +Patch origin: in-house +Patch status: Solaris-specific; not suitable for upstream + +--- docs/doxygen.conf 2008-05-30 07:29:57.000000000 -0700 ++++ docs/doxygen.conf 2014-01-28 04:32:14.629148739 -0800 +@@ -29,4 +29,7 @@ + # some autoconf guru needs to make configure set this correctly... + #STRIP_FROM_PATH=/root/apache/httpd-2.0-8/srclib/apr-util + +-GENERATE_TAGFILE=docs/dox/apu.tag ++GENERATE_LATEX=NO ++HTML_TIMESTAMP=NO ++HTML_OUTPUT=manual ++SEARCHENGINE=NO diff -r b9fc8aa825e4 -r aa5916252876 components/apr-util-1_5/patches/makefile-out.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/apr-util-1_5/patches/makefile-out.patch Fri Apr 11 08:09:58 2014 -0700 @@ -0,0 +1,26 @@ +Patch origin: in-house +Patch status: Solaris-specific; not suitable for upstream + +--- Makefile.in Thu Nov 20 22:32:58 2008 ++++ Makefile.in Thu Nov 10 05:02:25 2011 +@@ -10,7 +10,7 @@ + srcdir = @srcdir@ + VPATH = @srcdir@ + +-INCLUDES = @APRUTIL_PRIV_INCLUDES@ @APR_INCLUDES@ @APRUTIL_INCLUDES@ ++INCLUDES = -I/usr/include/openldap @APRUTIL_PRIV_INCLUDES@ @APR_INCLUDES@ @APRUTIL_INCLUDES@ + APRUTIL_LDFLAGS = @APRUTIL_LDFLAGS@ + APRUTIL_LIBS = @APRUTIL_LIBS@ + +@@ -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.5",' \ ++ -e '/^APU_BUILD_DIR=/s,/.*",/usr/apr-util/1.5",' \ ++ < $(APU_CONFIG) > $@ + + install: $(TARGETS) install-modules + $(APR_MKDIR) $(DESTDIR)$(includedir) $(DESTDIR)$(libdir)/pkgconfig \ diff -r b9fc8aa825e4 -r aa5916252876 components/apr-util-1_5/resolve.deps --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/apr-util-1_5/resolve.deps Fri Apr 11 08:09:58 2014 -0700 @@ -0,0 +1,8 @@ +database/mysql-55/library +database/sqlite-3 +library/apr-15 +library/expat +library/openldap +shell/ksh93 +system/library +system/library/math diff -r b9fc8aa825e4 -r aa5916252876 components/apr-util/Makefile --- a/components/apr-util/Makefile Fri Apr 11 05:53:44 2014 -0700 +++ b/components/apr-util/Makefile Fri Apr 11 08:09:58 2014 -0700 @@ -78,11 +78,6 @@ build: $(BUILD_32_and_64) docs install: $(INSTALL_32_and_64) - # workaround for 18195512 - elfedit -e "dyn:runpath /usr/mysql/5.5/lib/" \ - $(PROTO_DIR)/usr/apr-util/1.3/lib/apr-util-1/apr_dbd_mysql-1.so - elfedit -e "dyn:runpath /usr/mysql/5.5/lib/$(MACH64)" \ - $(PROTO_DIR)/usr/apr-util/1.3/lib/$(MACH64)/apr-util-1/apr_dbd_mysql-1.so test: $(TEST_32_and_64) diff -r b9fc8aa825e4 -r aa5916252876 components/apr-util/apr-util-13.p5m --- a/components/apr-util/apr-util-13.p5m Fri Apr 11 05:53:44 2014 -0700 +++ b/components/apr-util/apr-util-13.p5m Fri Apr 11 08:09:58 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. # \ default facet.devel all> @@ -84,9 +84,11 @@ 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 facet.devel=false 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/bin/$(MACH64)/apu-1-config target=../../apr-util/1.3/bin/$(MACH64)/apu-1-config \ + mediator=apu-1-config mediator-version=1.3 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/bin/apu-1-config target=../apr-util/1.3/bin/apu-1-config \ + mediator=apu-1-config mediator-version=1.3 link path=usr/apr-util/1.3/lib/libaprutil-1.so.0 target=libaprutil-1.so.0.3.9 \ facet.devel=false link path=usr/apr-util/1.3/lib/libaprutil-1.so target=libaprutil-1.so.0.3.9 \