svn commit: r251875 - in vendor/apr: . dist dist/atomic dist/atomic/unix dist/docs dist/dso dist/dso/unix dist/file_io dist/file_io/unix dist/helpers dist/include dist/include/arch dist/include/arc...
Peter Wemm
peter at FreeBSD.org
Tue Jun 18 01:59:20 UTC 2013
Author: peter
Date: Tue Jun 18 01:59:18 2013
New Revision: 251875
URL: http://svnweb.freebsd.org/changeset/base/251875
Log:
Import apache apr-1.4.6
Added:
vendor/apr/
vendor/apr/dist/
vendor/apr/dist/CHANGES
vendor/apr/dist/LICENSE
vendor/apr/dist/Makefile.in (contents, props changed)
vendor/apr/dist/Makefile.win (contents, props changed)
vendor/apr/dist/NOTICE
vendor/apr/dist/NWGNUmakefile
vendor/apr/dist/README
vendor/apr/dist/apr-config.in (contents, props changed)
vendor/apr/dist/apr.dep
vendor/apr/dist/apr.dsp
vendor/apr/dist/apr.dsw
vendor/apr/dist/apr.mak
vendor/apr/dist/apr.pc.in (contents, props changed)
vendor/apr/dist/apr.spec
vendor/apr/dist/atomic/
vendor/apr/dist/atomic/unix/
vendor/apr/dist/atomic/unix/builtins.c (contents, props changed)
vendor/apr/dist/atomic/unix/ia32.c (contents, props changed)
vendor/apr/dist/atomic/unix/mutex.c (contents, props changed)
vendor/apr/dist/atomic/unix/ppc.c (contents, props changed)
vendor/apr/dist/atomic/unix/s390.c (contents, props changed)
vendor/apr/dist/atomic/unix/solaris.c (contents, props changed)
vendor/apr/dist/build-outputs.mk
vendor/apr/dist/build.conf (contents, props changed)
vendor/apr/dist/buildconf (contents, props changed)
vendor/apr/dist/config.layout
vendor/apr/dist/configure (contents, props changed)
vendor/apr/dist/configure.in (contents, props changed)
vendor/apr/dist/docs/
vendor/apr/dist/docs/APRDesign.html (contents, props changed)
vendor/apr/dist/docs/canonical_filenames.html (contents, props changed)
vendor/apr/dist/docs/doxygen.conf (contents, props changed)
vendor/apr/dist/docs/incomplete_types
vendor/apr/dist/docs/non_apr_programs
vendor/apr/dist/docs/pool-design.html (contents, props changed)
vendor/apr/dist/docs/win32_builds.html (contents, props changed)
vendor/apr/dist/dso/
vendor/apr/dist/dso/unix/
vendor/apr/dist/dso/unix/dso.c (contents, props changed)
vendor/apr/dist/emacs-mode
vendor/apr/dist/file_io/
vendor/apr/dist/file_io/unix/
vendor/apr/dist/file_io/unix/buffer.c (contents, props changed)
vendor/apr/dist/file_io/unix/copy.c (contents, props changed)
vendor/apr/dist/file_io/unix/dir.c (contents, props changed)
vendor/apr/dist/file_io/unix/fileacc.c (contents, props changed)
vendor/apr/dist/file_io/unix/filedup.c (contents, props changed)
vendor/apr/dist/file_io/unix/filepath.c (contents, props changed)
vendor/apr/dist/file_io/unix/filepath_util.c (contents, props changed)
vendor/apr/dist/file_io/unix/filestat.c (contents, props changed)
vendor/apr/dist/file_io/unix/flock.c (contents, props changed)
vendor/apr/dist/file_io/unix/fullrw.c (contents, props changed)
vendor/apr/dist/file_io/unix/mktemp.c (contents, props changed)
vendor/apr/dist/file_io/unix/open.c (contents, props changed)
vendor/apr/dist/file_io/unix/pipe.c (contents, props changed)
vendor/apr/dist/file_io/unix/readwrite.c (contents, props changed)
vendor/apr/dist/file_io/unix/seek.c (contents, props changed)
vendor/apr/dist/file_io/unix/tempdir.c (contents, props changed)
vendor/apr/dist/helpers/
vendor/apr/dist/helpers/apr_rename.pl (contents, props changed)
vendor/apr/dist/include/
vendor/apr/dist/include/apr.h.in (contents, props changed)
vendor/apr/dist/include/apr.hnw
vendor/apr/dist/include/apr.hw
vendor/apr/dist/include/apr_allocator.h (contents, props changed)
vendor/apr/dist/include/apr_atomic.h (contents, props changed)
vendor/apr/dist/include/apr_dso.h (contents, props changed)
vendor/apr/dist/include/apr_env.h (contents, props changed)
vendor/apr/dist/include/apr_errno.h (contents, props changed)
vendor/apr/dist/include/apr_file_info.h (contents, props changed)
vendor/apr/dist/include/apr_file_io.h (contents, props changed)
vendor/apr/dist/include/apr_fnmatch.h (contents, props changed)
vendor/apr/dist/include/apr_general.h (contents, props changed)
vendor/apr/dist/include/apr_getopt.h (contents, props changed)
vendor/apr/dist/include/apr_global_mutex.h (contents, props changed)
vendor/apr/dist/include/apr_hash.h (contents, props changed)
vendor/apr/dist/include/apr_inherit.h (contents, props changed)
vendor/apr/dist/include/apr_lib.h (contents, props changed)
vendor/apr/dist/include/apr_mmap.h (contents, props changed)
vendor/apr/dist/include/apr_network_io.h (contents, props changed)
vendor/apr/dist/include/apr_poll.h (contents, props changed)
vendor/apr/dist/include/apr_pools.h (contents, props changed)
vendor/apr/dist/include/apr_portable.h (contents, props changed)
vendor/apr/dist/include/apr_proc_mutex.h (contents, props changed)
vendor/apr/dist/include/apr_random.h (contents, props changed)
vendor/apr/dist/include/apr_ring.h (contents, props changed)
vendor/apr/dist/include/apr_shm.h (contents, props changed)
vendor/apr/dist/include/apr_signal.h (contents, props changed)
vendor/apr/dist/include/apr_strings.h (contents, props changed)
vendor/apr/dist/include/apr_support.h (contents, props changed)
vendor/apr/dist/include/apr_tables.h (contents, props changed)
vendor/apr/dist/include/apr_thread_cond.h (contents, props changed)
vendor/apr/dist/include/apr_thread_mutex.h (contents, props changed)
vendor/apr/dist/include/apr_thread_proc.h (contents, props changed)
vendor/apr/dist/include/apr_thread_rwlock.h (contents, props changed)
vendor/apr/dist/include/apr_time.h (contents, props changed)
vendor/apr/dist/include/apr_user.h (contents, props changed)
vendor/apr/dist/include/apr_version.h (contents, props changed)
vendor/apr/dist/include/apr_want.h (contents, props changed)
vendor/apr/dist/include/arch/
vendor/apr/dist/include/arch/apr_private_common.h (contents, props changed)
vendor/apr/dist/include/arch/unix/
vendor/apr/dist/include/arch/unix/apr_arch_atomic.h (contents, props changed)
vendor/apr/dist/include/arch/unix/apr_arch_dso.h (contents, props changed)
vendor/apr/dist/include/arch/unix/apr_arch_file_io.h (contents, props changed)
vendor/apr/dist/include/arch/unix/apr_arch_global_mutex.h (contents, props changed)
vendor/apr/dist/include/arch/unix/apr_arch_inherit.h (contents, props changed)
vendor/apr/dist/include/arch/unix/apr_arch_internal_time.h (contents, props changed)
vendor/apr/dist/include/arch/unix/apr_arch_misc.h (contents, props changed)
vendor/apr/dist/include/arch/unix/apr_arch_networkio.h (contents, props changed)
vendor/apr/dist/include/arch/unix/apr_arch_poll_private.h (contents, props changed)
vendor/apr/dist/include/arch/unix/apr_arch_proc_mutex.h (contents, props changed)
vendor/apr/dist/include/arch/unix/apr_arch_shm.h (contents, props changed)
vendor/apr/dist/include/arch/unix/apr_arch_thread_cond.h (contents, props changed)
vendor/apr/dist/include/arch/unix/apr_arch_thread_mutex.h (contents, props changed)
vendor/apr/dist/include/arch/unix/apr_arch_thread_rwlock.h (contents, props changed)
vendor/apr/dist/include/arch/unix/apr_arch_threadproc.h (contents, props changed)
vendor/apr/dist/include/arch/unix/apr_private.h.in (contents, props changed)
vendor/apr/dist/libapr.dep
vendor/apr/dist/libapr.dsp
vendor/apr/dist/libapr.mak
vendor/apr/dist/libapr.rc
vendor/apr/dist/locks/
vendor/apr/dist/locks/unix/
vendor/apr/dist/locks/unix/global_mutex.c (contents, props changed)
vendor/apr/dist/locks/unix/proc_mutex.c (contents, props changed)
vendor/apr/dist/locks/unix/thread_cond.c (contents, props changed)
vendor/apr/dist/locks/unix/thread_mutex.c (contents, props changed)
vendor/apr/dist/locks/unix/thread_rwlock.c (contents, props changed)
vendor/apr/dist/memory/
vendor/apr/dist/memory/unix/
vendor/apr/dist/memory/unix/apr_pools.c (contents, props changed)
vendor/apr/dist/misc/
vendor/apr/dist/misc/unix/
vendor/apr/dist/misc/unix/charset.c (contents, props changed)
vendor/apr/dist/misc/unix/env.c (contents, props changed)
vendor/apr/dist/misc/unix/errorcodes.c (contents, props changed)
vendor/apr/dist/misc/unix/getopt.c (contents, props changed)
vendor/apr/dist/misc/unix/otherchild.c (contents, props changed)
vendor/apr/dist/misc/unix/rand.c (contents, props changed)
vendor/apr/dist/misc/unix/randbyte_os2.inc
vendor/apr/dist/misc/unix/start.c (contents, props changed)
vendor/apr/dist/misc/unix/version.c (contents, props changed)
vendor/apr/dist/mmap/
vendor/apr/dist/mmap/unix/
vendor/apr/dist/mmap/unix/common.c (contents, props changed)
vendor/apr/dist/mmap/unix/mmap.c (contents, props changed)
vendor/apr/dist/network_io/
vendor/apr/dist/network_io/unix/
vendor/apr/dist/network_io/unix/inet_ntop.c (contents, props changed)
vendor/apr/dist/network_io/unix/inet_pton.c (contents, props changed)
vendor/apr/dist/network_io/unix/multicast.c (contents, props changed)
vendor/apr/dist/network_io/unix/sendrecv.c (contents, props changed)
vendor/apr/dist/network_io/unix/sockaddr.c (contents, props changed)
vendor/apr/dist/network_io/unix/socket_util.c (contents, props changed)
vendor/apr/dist/network_io/unix/sockets.c (contents, props changed)
vendor/apr/dist/network_io/unix/sockopt.c (contents, props changed)
vendor/apr/dist/passwd/
vendor/apr/dist/passwd/apr_getpass.c (contents, props changed)
vendor/apr/dist/poll/
vendor/apr/dist/poll/unix/
vendor/apr/dist/poll/unix/epoll.c (contents, props changed)
vendor/apr/dist/poll/unix/kqueue.c (contents, props changed)
vendor/apr/dist/poll/unix/poll.c (contents, props changed)
vendor/apr/dist/poll/unix/pollcb.c (contents, props changed)
vendor/apr/dist/poll/unix/pollset.c (contents, props changed)
vendor/apr/dist/poll/unix/port.c (contents, props changed)
vendor/apr/dist/poll/unix/select.c (contents, props changed)
vendor/apr/dist/random/
vendor/apr/dist/random/unix/
vendor/apr/dist/random/unix/apr_random.c (contents, props changed)
vendor/apr/dist/random/unix/sha2.c (contents, props changed)
vendor/apr/dist/random/unix/sha2.h (contents, props changed)
vendor/apr/dist/random/unix/sha2_glue.c (contents, props changed)
vendor/apr/dist/shmem/
vendor/apr/dist/shmem/unix/
vendor/apr/dist/shmem/unix/shm.c (contents, props changed)
vendor/apr/dist/strings/
vendor/apr/dist/strings/apr_cpystrn.c (contents, props changed)
vendor/apr/dist/strings/apr_fnmatch.c (contents, props changed)
vendor/apr/dist/strings/apr_snprintf.c (contents, props changed)
vendor/apr/dist/strings/apr_strings.c (contents, props changed)
vendor/apr/dist/strings/apr_strnatcmp.c (contents, props changed)
vendor/apr/dist/strings/apr_strtok.c (contents, props changed)
vendor/apr/dist/support/
vendor/apr/dist/support/unix/
vendor/apr/dist/support/unix/waitio.c (contents, props changed)
vendor/apr/dist/tables/
vendor/apr/dist/tables/apr_hash.c (contents, props changed)
vendor/apr/dist/tables/apr_tables.c (contents, props changed)
vendor/apr/dist/threadproc/
vendor/apr/dist/threadproc/unix/
vendor/apr/dist/threadproc/unix/proc.c (contents, props changed)
vendor/apr/dist/threadproc/unix/procsup.c (contents, props changed)
vendor/apr/dist/threadproc/unix/signals.c (contents, props changed)
vendor/apr/dist/threadproc/unix/thread.c (contents, props changed)
vendor/apr/dist/threadproc/unix/threadpriv.c (contents, props changed)
vendor/apr/dist/time/
vendor/apr/dist/time/unix/
vendor/apr/dist/time/unix/time.c (contents, props changed)
vendor/apr/dist/time/unix/timestr.c (contents, props changed)
vendor/apr/dist/user/
vendor/apr/dist/user/unix/
vendor/apr/dist/user/unix/groupinfo.c (contents, props changed)
vendor/apr/dist/user/unix/userinfo.c (contents, props changed)
Added: vendor/apr/dist/CHANGES
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ vendor/apr/dist/CHANGES Tue Jun 18 01:59:18 2013 (r251875)
@@ -0,0 +1,190 @@
+ -*- coding: utf-8 -*-
+Changes for APR 1.4.6
+
+ *) Flush write buffer before truncate call on a file.
+ [Mladen Turk]
+
+ *) Security: oCERT-2011-003
+ Randomise hashes by providing a seed.
+ [Bojan Smojver, Branko Čibej, Ruediger Pluem et al.]
+
+ *) apr_random: Prevent segfault if pool used to initialize apr_random is
+ destroyed before forking. [Stefan Fritsch]
+
+ *) testrand: Improve child randomness test case. [Rainer Jung]
+
+ *) apr_proc_fork, apr_random_after_fork: disambiguate what happens to the
+ proc structure passed in, and ensure that the pid is set correctly in
+ a newly created child; note that merely mixing a PID into the random
+ seed of a new child doesn't markedly increase entropy. [Sander Temme]
+
+ *) apr_file_open: Avoid fcntl() calls if support for O_CLOEXEC works.
+ PR 48557. [Mike Frysinger <vapier gentoo org>]
+
+ *) apr_dir_make_recursive: Fix race condition that could lead to EEXIST
+ being returned. PR 51254. [William Lee <william lee rainstor com>,
+ Wim Lewis <wiml omnigroup com>]
+
+ *) configure: Fix APR_RESTORE_THE_ENVIRONMENT if the original variable was
+ a single space. PR 50334. [Nathan Phillip Brink <binki gentoo org>]
+
+ *) apr_proc_create: Don't close any of the new stdin/stdout/stderr in the
+ child if it already has the correct FD. PR 51995.
+ [Dan Ports <drkp csail mit edu>]
+
+ *) Fix flag character '#' in combination with format character 'x' in
+ apr snprintf implementations. [Rainer Jung]
+
+ *) Improve platform detection by updating config.guess and config.sub.
+ [Rainer Jung]
+
+ *) Add libtool2 files to extraclean make target. [Rainer Jung]
+
+ *) Don't overwrite our config.guess and config.sub
+ when running buildconf. [Rainer Jung]
+
+ *) Silence autoconf 2.68 warnings. [Rainer Jung]
+
+Changes for APR 1.4.5
+
+ *) Security: CVE-2011-1928
+ apr_fnmatch(): Fix high CPU loop. [William Rowe]
+
+ *) Fix top_builddir in installed apr_rules.mk. [Bojan Smojver]
+
+Changes for APR 1.4.4
+
+ *) Windows: Fix command-line builds. [William Rowe]
+
+Changes for APR 1.4.3
+
+ *) Security: CVE-2011-0419
+ Reimplement apr_fnmatch() from scratch using a non-recursive
+ algorithm; now has improved compliance with the fnmatch() spec.
+ [William Rowe]
+
+ *) Fix environment-related crash using some non-standard builds on
+ Windows 7/Server 2008. [Steve Hay <SteveHay planit.com>]
+
+ *) poll, pollset, pollcb on Windows: Handle calls with no file/socket
+ descriptors. PR 49882. [Stefan Ruppert <sr myarm.com>, Jeff Trawick]
+
+ *) Fix APR_IPV6_V6ONLY issues on Windows related to run-time behavior
+ on Windows older than Vista and SDK/MinGW levels without IPV6_V6ONLY.
+ PR 45321. [Sob <sob hisoftware.cz>]
+
+ *) Fix address handling when accepting an AF_INET socket from a socket
+ bound as AF_INET6. PR 49678. [Joe Orton]
+
+ *) Fix error return values from apr_sockaddr_info_get() on Windows for
+ IPv6 builds. [Ivan Zhakov <ivan visualsvn.com>]
+
+ *) Add new experimental configure option --enable-allocator-uses-mmap to
+ use mmap instead of malloc in apr_allocator_alloc(). This greatly reduces
+ memory fragmentation with malloc implementations (e.g. glibc) that
+ don't handle allocationss of a page-size-multiples in an efficient way.
+ It also makes apr_allocator_max_free_set() actually have some effect
+ on such platforms. [Stefan Fritsch]
+
+ *) configure: Support 64 and 32 bit universal builds for Darwin/
+ OS X 10.6+. [Jim Jagielski]
+
+ *) apr_sockaddr_info_get() on AIX: Fix a problem which could set
+ the port field in the native socket address to 1 when 0 was
+ specified. PR 46964. [Jeff Trawick]
+
+ *) configure: Make definition of apr_ino_t independent of
+ _FILE_OFFSET_BITS even on platforms where ino_t is 'unsigned int'.
+ [Stefan Fritsch]
+
+ *) apr_ring: Workaround for aliasing problem that causes gcc 4.5 to
+ miscompile some brigade related code. PR 50190. [Stefan Fritsch]
+
+ *) apr_file_flush_locked(): Handle short writes. [Stefan Fritsch]
+
+ *) apr_pollset_create_ex(): Trap errors from pollset providers.
+ PR 49094. [Sami Tolvanen <sami.tolvanen mywot.com>]
+
+ *) apr_pollset_create*(): Fix memory lifetime problem with the wakeup
+ pipe when the pollset was created with APR_POLLSET_NOCOPY.
+ [Neil Conway <nrc cs.berkeley.edu>]
+
+ *) Fix detection of some Linux variants when configure is built with
+ recent GNU tools. [Eric Covener]
+
+ *) Avoid a redundant fcntl() call in apr_file_open() where O_CLOEXEC
+ is supported. PR 46297. [Joe Orton]
+
+ *) Improve platform detection by updating config.guess and config.sub.
+ [Rainer Jung]
+
+Changes for APR 1.4.2
+
+ *) Undo a crash-bug introduced in 1.4.1 affecting some applications of
+ the apr hash and table structures, reported to affect Subversion
+ by Bert Huijben <bert qqmail.nl>. [Graham Leggett]
+
+Changes for APR 1.4.1
+
+ *) Win32: Properly handle the ERROR_DIRECTORY system error code.
+ [Brane Čibej]
+
+Changes for APR 1.4.0
+
+ *) Windows: Default build configurations assume NT or higher at run-time.
+
+ *) Add apr_global_mutex_lockfile() for retrieving the file, if any,
+ associated with the mutex. Add apr_global_mutex_name() for retrieving
+ the name of the lock mechanism used by the underlying proc mutex.
+ [Jeff Trawick]
+
+ *) Add apr_socket_atreadeof to determine whether the receive part of the
+ socket has been closed by the peer.
+ [Ruediger Pluem, Mladen Turk, Joe Orton]
+
+ *) Make apr_pollset and apr_pollcb implementations using providers.
+ Added apr_pollset_create_ex and apr_pollcb_create_ex that allows
+ choosing non-default providers.
+ [Mladen Turk]
+
+ *) Win32: Use WSAPoll as default pollset method if supported and found
+ inside winsock dll. [Mladen Turk]
+
+ *) apr_temp_dir_get() now checks the TMPDIR environment variable first,
+ instead of third. [Jim Jagielski]
+
+ *) Add apr_file_sync() and apr_file_datasync() calls. [Bojan Smojver]
+
+ *) apr_pollset_wakeup() on Windows: Fix core caused by closing the
+ file_socket_pipe with standard file_close.
+ [Arsen Chaloyan, Mladen Turk]
+
+ *) Introduce apr_hash_do() for iterating over a hash table. [Mladen Turk]
+
+ *) Make sure WIN32 behaves the same as posix for file-backed shared memory
+ by removing the file on cleanup/remove. [Mladen Turk]
+
+ *) Introduce apr_pollset_wakeup() for interrupting the blocking
+ apr_pollset_poll() call. [Mladen Turk]
+
+ *) Add apr_file_link() function. PR 44841. [Mark Heily <mark heily.com>]
+
+Changes for APR 1.3.x and later:
+
+ *) http://svn.apache.org/viewvc/apr/apr/branches/1.3.x/CHANGES?view=markup
+
+Changes for APR 1.2.x and later:
+
+ *) http://svn.apache.org/viewvc/apr/apr/branches/1.2.x/CHANGES?view=markup
+
+Changes for APR 1.1.x and later:
+
+ *) http://svn.apache.org/viewvc/apr/apr/branches/1.1.x/CHANGES?view=markup
+
+Changes for APR 1.0.x and later:
+
+ *) http://svn.apache.org/viewvc/apr/apr/branches/1.0.x/CHANGES?view=markup
+
+Changes for APR 0.9.x and later/earlier:
+
+ *) http://svn.apache.org/viewvc/apr/apr/branches/0.9.x/CHANGES?view=markup
Added: vendor/apr/dist/LICENSE
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ vendor/apr/dist/LICENSE Tue Jun 18 01:59:18 2013 (r251875)
@@ -0,0 +1,341 @@
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+
+
+APACHE PORTABLE RUNTIME SUBCOMPONENTS:
+
+The Apache Portable Runtime includes a number of subcomponents with
+separate copyright notices and license terms. Your use of the source
+code for the these subcomponents is subject to the terms and
+conditions of the following licenses.
+
+From strings/apr_fnmatch.c, include/apr_fnmatch.h, misc/unix/getopt.c,
+file_io/unix/mktemp.c, strings/apr_strings.c:
+
+/*
+ * Copyright (c) 1987, 1993, 1994
+ * The Regents of the University of California. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ * must display the following acknowledgement:
+ * This product includes software developed by the University of
+ * California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+
+From network_io/unix/inet_ntop.c, network_io/unix/inet_pton.c:
+
+/* Copyright (c) 1996 by Internet Software Consortium.
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
+ * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
+ * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
+ * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
+ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+ * SOFTWARE.
+
+From dso/aix/dso.c:
+
+ * Based on libdl (dlfcn.c/dlfcn.h) which is
+ * Copyright (c) 1992,1993,1995,1996,1997,1988
+ * Jens-Uwe Mager, Helios Software GmbH, Hannover, Germany.
+ *
+ * Not derived from licensed software.
+ *
+ * Permission is granted to freely use, copy, modify, and redistribute
+ * this software, provided that the author is not construed to be liable
+ * for any results of using the software, alterations are clearly marked
+ * as such, and this notice is not modified.
+
+From strings/apr_strnatcmp.c, include/apr_strings.h:
+
+ strnatcmp.c -- Perform 'natural order' comparisons of strings in C.
+ Copyright (C) 2000 by Martin Pool <mbp at humbug.org.au>
+
+ 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.
+
+
Added: vendor/apr/dist/Makefile.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ vendor/apr/dist/Makefile.in Tue Jun 18 01:59:18 2013 (r251875)
@@ -0,0 +1,129 @@
+
+srcdir=@srcdir@
+VPATH=@srcdir@
+top_srcdir=@apr_srcdir@
+top_blddir=@apr_builddir@
+
+#
+# APR (Apache Portable Runtime) library Makefile.
+#
+CPP = @CPP@
+
+# get substituted into some targets
+APR_MAJOR_VERSION=@APR_MAJOR_VERSION@
+
+#
+# Macros for supporting directories
+#
+INCDIR=./include
+OSDIR=$(top_srcdir)/include/arch/@OSDIR@
+DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
+INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR) -I$(top_srcdir)/include/arch/@DEFAULT_OSDIR@ -I$(top_srcdir)/include
+
+#
+# Macros for target determination
+#
+CLEAN_SUBDIRS= test
+INSTALL_SUBDIRS=@INSTALL_SUBDIRS@
+
+TARGET_LIB = lib at APR_LIBNAME@.la
+APR_PCFILE = apr-$(APR_MAJOR_VERSION).pc
+APR_CONFIG = apr-$(APR_MAJOR_VERSION)-config
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+
+#
+# Rules for building specific targets, starting with 'all' for
+# building the entire package.
+#
+TARGETS = $(TARGET_LIB) apr.exp apr-config.out build/apr_rules.out
+
+LT_VERSION = @LT_VERSION@
+
+# bring in rules.mk for standard functionality
+ at INCLUDE_RULES@
+ at INCLUDE_OUTPUTS@
+
+CLEAN_TARGETS = apr-config.out apr.exp exports.c export_vars.c .make.dirs \
+ build/apr_rules.out
+DISTCLEAN_TARGETS = config.cache config.log config.status \
+ include/apr.h include/arch/unix/apr_private.h \
+ libtool $(APR_CONFIG) build/apr_rules.mk apr.pc \
+ build/pkg/pkginfo
+EXTRACLEAN_TARGETS = configure aclocal.m4 include/arch/unix/apr_private.h.in \
+ build-outputs.mk build/ltcf-c.sh build/aclocal.m4 \
+ build/ltconfig build/ltmain.sh \
+ build/argz.m4 build/libtool.m4 build/ltoptions.m4 \
+ build/ltsugar.m4 build/ltversion.m4 build/lt~obsolete.m4
+
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+bindir=@bindir@
+libdir=@libdir@
+includedir=@includedir@
+installbuilddir=@installbuilddir@
+
+# Create apr-config script suitable for the install tree
+apr-config.out: $(APR_CONFIG)
+ sed 's,^\(location=\).*$$,\1installed,' < $(APR_CONFIG) > $@
+
+# 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 > $@
+
+install: $(TARGETS)
+ $(APR_MKDIR) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) $(DESTDIR)$(installbuilddir) \
+ $(DESTDIR)$(libdir)/pkgconfig $(DESTDIR)$(includedir)
+ $(INSTALL_DATA) $(top_blddir)/include/apr.h $(DESTDIR)$(includedir)
+ for f in $(top_srcdir)/include/apr_*.h; do \
+ $(INSTALL_DATA) $${f} $(DESTDIR)$(includedir); \
+ done
+ $(LIBTOOL) --mode=install $(INSTALL) -m 755 $(TARGET_LIB) $(DESTDIR)$(libdir)
+ $(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; \
+ done
+ $(INSTALL) -m 755 $(top_srcdir)/build/mkdir.sh $(DESTDIR)$(installbuilddir)
+ for f in make_exports.awk make_var_export.awk; do \
+ $(INSTALL_DATA) $(top_srcdir)/build/$${f} $(DESTDIR)$(installbuilddir); \
+ done
+ $(INSTALL_DATA) build/apr_rules.out $(DESTDIR)$(installbuilddir)/apr_rules.mk
+ $(INSTALL) -m 755 apr-config.out $(DESTDIR)$(bindir)/$(APR_CONFIG)
+ @if [ $(INSTALL_SUBDIRS) != "none" ]; then \
+ for i in $(INSTALL_SUBDIRS); do \
+ ( cd $$i ; $(MAKE) DESTDIR=$(DESTDIR) install ); \
+ done \
+ fi
+
+$(TARGET_LIB): $(OBJECTS)
+ $(LINK) @lib_target@ $(ALL_LIBS)
+
+exports.c: $(HEADERS)
+ $(APR_MKEXPORT) $(HEADERS) > $@
+
+export_vars.c: $(HEADERS)
+ $(APR_MKVAREXPORT) $(HEADERS) > $@
+
+apr.exp: exports.c export_vars.c
+ @echo "#! lib at APR_LIBNAME@.so" > $@
+ @echo "* This file was AUTOGENERATED at build time." >> $@
+ @echo "* Please do not edit by hand." >> $@
+ $(CPP) $(ALL_CPPFLAGS) $(ALL_INCLUDES) exports.c | grep "ap_hack_" | sed -e 's/^.*[)]\(.*\);$$/\1/' >> $@
+ $(CPP) $(ALL_CPPFLAGS) $(ALL_INCLUDES) export_vars.c | sed -e 's/^\#[^!]*//' | sed -e '/^$$/d' >> $@
+
+dox:
+ doxygen $(top_srcdir)/docs/doxygen.conf
+
+gcov:
+ @build/run-gcov.sh
+
+test: check
+check: $(TARGET_LIB)
+ cd test && $(MAKE) all check
+
+etags:
+ etags `find . -name '*.[ch]'`
+
+# DO NOT REMOVE
+docs: $(INCDIR)/*.h
Added: vendor/apr/dist/Makefile.win
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ vendor/apr/dist/Makefile.win Tue Jun 18 01:59:18 2013 (r251875)
@@ -0,0 +1,181 @@
+# Makefile.win for Win32 APR alone
+#
+# Targets are:
+#
+# buildall - compile everything
+# checkall - run APR regression tests
+# install - compile everything
+# clean - mop up everything
+#
+# You can override the build mechansim, choose only one;
+#
+# USEMAK=1 - compile from exported make files
+# USEDSW=1 - compile from .dsw / .dsp VC6 projects
+# USESLN=1 - compile from converted .sln / .vcproj VC7+ files
+#
+# Define ARCH to your desired preference (your PATH must point
+# to the correct compiler tools!) Choose only one;
+#
+# ARCH="Win32 Release"
+# ARCH="Win32 Debug"
+# ARCH="Win32 Release9x"
+# ARCH="Win32 Debug9x"
+# ARCH="x64 Release"
+# ARCH="x64 Debug"
+#
+# For example;
+#
+# nmake -f Makefile.win PREFIX=C:\APR buildall checkall installall clean
+#
+
+!IF EXIST("apr.sln") && ([devenv /help > NUL 2>&1] == 0) \
+ && !defined(USEMAK) && !defined(USEDSW)
+USESLN=1
+USEMAK=0
+USEDSW=0
+!ELSEIF EXIST("apr.mak") && !defined(USEDSW)
+USESLN=0
+USEMAK=1
+USEDSW=0
+!ELSE
+USESLN=0
+USEMAK=0
+USEDSW=1
+!ENDIF
+
+PREFIX=..\apr-dist
+
+!IF [$(COMSPEC) /c cl /nologo /? \
+ | $(SystemRoot)\System32\find.exe "x64" >NUL ] == 0
+ARCH=x64 Release
+!ELSE
+ARCH=Win32 Release
+!ENDIF
+
+!MESSAGE ARCH = $(ARCH)
+!MESSAGE PREFIX = $(PREFIX) (install path)
+
+
+# Utility and Translation things, nothing here for the user
+#
+!IF "$(ARCH)" == "Win32 Release"
+SLNARCH=Release|Win32
+ARCHOSPATH=Release
+LIBSOSPATH=LibR
+!ELSEIF "$(ARCH)" == "Win32 Debug"
+SLNARCH=Debug|Win32
+ARCHOSPATH=Debug
+LIBSOSPATH=LibD
+!ELSEIF "$(ARCH)" == "Win32 Release9x"
+SLNARCH=Release9x|Win32
+ARCHOSPATH=9x\Release
+LIBSOSPATH=9x\LibR
+!ELSEIF "$(ARCH)" == "Win32 Debug9x"
+SLNARCH=Debug9x|Win32
+ARCHOSPATH=9x\Debug
+LIBSOSPATH=9x\LibD
+!ELSEIF "$(ARCH)" == "x64 Release"
+SLNARCH=Release|x64
+ARCHOSPATH=x64\Release
+LIBSOSPATH=x64\LibR
+!ELSEIF "$(ARCH)" == "x64 Debug"
+SLNARCH=Debug|x64
+ARCHOSPATH=x64\Debug
+LIBSOSPATH=x64\LibD
+!ENDIF
+
+!IFNDEF MAKEOPT
+# Only default the behavior if MAKEOPT= is omitted
+!IFDEF _NMAKE_VER
+# Microsoft NMake options
+MAKEOPT=-nologo
+!ELSEIF "$(MAKE)" == "make"
+# Borland make options? Not really supported (yet)
+MAKEOPT=-s -N
+!ENDIF
+!ENDIF
+
+
+all: buildall checkall
+
+!IF $(USEMAK) == 1
+
+clean:
+ $(MAKE) $(MAKEOPT) -f Makefile.win ARCH="$(ARCH)" \
+ CTARGET=CLEAN buildall
+
+buildall:
+ $(MAKE) $(MAKEOPT) -f apr.mak CFG="apr - $(ARCH)" RECURSE=0 $(CTARGET)
+ $(MAKE) $(MAKEOPT) -f libapr.mak CFG="libapr - $(ARCH)" RECURSE=0 $(CTARGET)
+ cd build
+ $(MAKE) $(MAKEOPT) -f aprapp.mak CFG="aprapp - $(ARCH)" RECURSE=0 $(CTARGET)
+ $(MAKE) $(MAKEOPT) -f libaprapp.mak CFG="libaprapp - $(ARCH)" RECURSE=0 $(CTARGET)
+ cd ..
+
+!ELSEIF $(USESLN) == 1
+
+clean:
+ -devenv apr.sln /useenv /clean "$(SLNARCH)" /project libaprapp
+ -devenv apr.sln /useenv /clean "$(SLNARCH)" /project libapr
+ -devenv apr.sln /useenv /clean "$(SLNARCH)" /project aprapp
+ -devenv apr.sln /useenv /clean "$(SLNARCH)" /project apr
+
+buildall:
+ devenv apr.sln /useenv /build "$(SLNARCH)" /project apr
+ devenv apr.sln /useenv /build "$(SLNARCH)" /project aprapp
+ devenv apr.sln /useenv /build "$(SLNARCH)" /project libapr
+ devenv apr.sln /useenv /build "$(SLNARCH)" /project libaprapp
+
+!ELSE
+# $(USEDSP) == 1
+
+clean:
+ -msdev apr.dsw /USEENV /MAKE "libaprapp - $(ARCH)" /CLEAN
+ -msdev apr.dsw /USEENV /MAKE "libapr - $(ARCH)" /CLEAN
+ -msdev apr.dsw /USEENV /MAKE "aprapp - $(ARCH)" /CLEAN
+ -msdev apr.dsw /USEENV /MAKE "apr - $(ARCH)" /CLEAN
+
+buildall:
+ @msdev apr.dsw /USEENV /MAKE "apr - $(ARCH)"
+ @msdev apr.dsw /USEENV /MAKE "aprapp - $(ARCH)"
+ @msdev apr.dsw /USEENV /MAKE "libapr - $(ARCH)"
+ @msdev apr.dsw /USEENV /MAKE "libaprapp - $(ARCH)"
+
+!ENDIF
+
+
+checkapr:
+ cd test
+ $(MAKE) $(MAKEOPT) -f Makefile.win MODEL=static \
+ OUTDIR=$(LIBSOSPATH) check
+ $(MAKE) $(MAKEOPT) -f Makefile.win MODEL=dynamic \
+ OUTDIR=$(ARCHOSPATH) check
+ cd ..
+
+checkall: checkapr
+
+
+install:
+ echo Y >.y
+ echo A >.A
+ @if NOT EXIST "$(PREFIX)\." mkdir "$(PREFIX)"
+ @if NOT EXIST "$(PREFIX)\bin\." mkdir "$(PREFIX)\bin"
+ @if NOT EXIST "$(PREFIX)\include\." mkdir "$(PREFIX)\include"
+ @if NOT EXIST "$(PREFIX)\lib\." mkdir "$(PREFIX)\lib"
+ copy CHANGES "$(PREFIX)\APR-CHANGES.txt" <.y
+ copy LICENSE "$(PREFIX)\APR-LICENSE.txt" <.y
+ copy NOTICE "$(PREFIX)\APR-NOTICE.txt" <.y
+ xcopy include\*.h "$(PREFIX)\include\" /d < .a
+ copy $(LIBSOSPATH)\apr-1.lib "$(PREFIX)\lib\" <.y
+ copy $(LIBSOSPATH)\apr-1.pdb "$(PREFIX)\lib\" <.y
+ copy $(LIBSOSPATH)\aprapp-1.lib "$(PREFIX)\lib\" <.y
+ copy $(LIBSOSPATH)\aprapp-1.pdb "$(PREFIX)\lib\" <.y
+ copy $(ARCHOSPATH)\libaprapp-1.lib "$(PREFIX)\lib\" <.y
+ copy $(ARCHOSPATH)\libaprapp-1.pdb "$(PREFIX)\lib\" <.y
+ copy $(ARCHOSPATH)\libapr-1.lib "$(PREFIX)\lib\" <.y
+ copy $(ARCHOSPATH)\libapr-1.exp "$(PREFIX)\lib\" <.y
+ copy $(ARCHOSPATH)\libapr-1.dll "$(PREFIX)\bin\" <.y
+ copy $(ARCHOSPATH)\libapr-1.pdb "$(PREFIX)\bin\" <.y
+ del .y
+ del .a
+
Added: vendor/apr/dist/NOTICE
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ vendor/apr/dist/NOTICE Tue Jun 18 01:59:18 2013 (r251875)
@@ -0,0 +1,15 @@
+Apache Portable Runtime
+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.
+
+This software contains code derived from UNIX V7, Copyright(C)
+Caldera International Inc.
Added: vendor/apr/dist/NWGNUmakefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ vendor/apr/dist/NWGNUmakefile Tue Jun 18 01:59:18 2013 (r251875)
@@ -0,0 +1,430 @@
+#
+# Define our macros with defaults if we dont got them already.
+#
+ifndef APR_WORK
+export APR_WORK = $(CURDIR)
+endif
+ifneq "$(wildcard $(APR_WORK)/include/apr_version.h)" "$(APR_WORK)/include/apr_version.h"
+$(error APR_WORK does not point to a valid APR source tree)
+endif
+ifndef APU_WORK
+export APU_WORK = $(CURDIR)/../apr-util
+endif
+ifneq "$(wildcard $(APU_WORK)/include/apu_version.h)" "$(APU_WORK)/include/apu_version.h"
+$(error APU_WORK does not point to a valid APU source tree)
+endif
+
+#
+# Declare the sub-directories to be built here
+#
+
+SUBDIRS = \
+ build \
+ $(APU_WORK) \
+ $(EOLIST)
+
+ifeq "$(TEST)" "1"
+SUBDIRS += \
+ test \
+ $(APU_WORK)/test \
+ $(EOLIST)
+endif
+
+#
+# Get the 'head' of the build environment. This includes default targets and
+# paths to tools
+#
+
+include $(APR_WORK)/build/NWGNUhead.inc
+
+#
+# build this level's files
+
+#
+# Make sure all needed macro's are defined
+#
+
+#
+# These directories will be at the beginning of the include list, followed by
+# INCDIRS
+#
+XINCDIRS += \
+ $(APR)/include \
+ $(APR)/include/arch/NetWare \
+ $(APR)/include/arch/unix \
+ $(APR)/memory/unix \
+ $(APR)/random/unix \
+ $(APU)/include \
+ $(APU)/xml \
+ $(LDAPSDK)/inc \
+ $(EOLIST)
+
+#
+# These flags will come after CFLAGS
+#
+XCFLAGS += \
+ $(EOLIST)
+
+#
+# These defines will come after DEFINES
+#
+XDEFINES += \
+ $(EOLIST)
+
+#
+# These flags will be added to the link.opt file
+#
+XLFLAGS += \
+ $(EOLIST)
+
+#
+# These values will be appended to the correct variables based on the value of
+# RELEASE
+#
+ifeq "$(RELEASE)" "debug"
+XINCDIRS += \
+ $(EOLIST)
+
+XCFLAGS += \
+ $(EOLIST)
+
+XDEFINES += \
+ $(EOLIST)
+
+XLFLAGS += \
+ $(EOLIST)
+endif
+
+ifeq "$(RELEASE)" "noopt"
+XINCDIRS += \
+ $(EOLIST)
+
+XCFLAGS += \
+ $(EOLIST)
+
+XDEFINES += \
+ $(EOLIST)
+
+XLFLAGS += \
+ $(EOLIST)
+endif
+
+ifeq "$(RELEASE)" "release"
+XINCDIRS += \
+ $(EOLIST)
+
+XCFLAGS += \
+ $(EOLIST)
+
+XDEFINES += \
+ $(EOLIST)
+
+XLFLAGS += \
+ $(EOLIST)
+endif
+
+#
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-all
mailing list