svn commit: r361678 - in head: contrib/apr contrib/apr/atomic/unix contrib/apr/docs contrib/apr/encoding contrib/apr/file_io/unix contrib/apr/include contrib/apr/include/arch/unix contrib/apr/inclu...

Dimitry Andric dim at FreeBSD.org
Sun May 31 22:12:59 UTC 2020 

Author: dim
Date: Sun May 31 22:12:56 2020
New Revision: 361678
URL: https://svnweb.freebsd.org/changeset/base/361678

Log:
  Update apr to 1.7.0. See contrib/apr/CHANGES for a summary of changes.
  
  MFC after:	2 weeks
  X-MFC-With:	r361677

Added:
  head/contrib/apr/atomic/unix/builtins64.c
     - copied unchanged from r361671, vendor/apr/dist/atomic/unix/builtins64.c
  head/contrib/apr/atomic/unix/mutex64.c
     - copied unchanged from r361671, vendor/apr/dist/atomic/unix/mutex64.c
  head/contrib/apr/encoding/apr_encode.c
     - copied unchanged from r361671, vendor/apr/dist/encoding/apr_encode.c
  head/contrib/apr/include/apr_cstr.h
     - copied unchanged from r361671, vendor/apr/dist/include/apr_cstr.h
  head/contrib/apr/include/apr_encode.h
     - copied unchanged from r361671, vendor/apr/dist/include/apr_encode.h
  head/contrib/apr/include/apr_perms_set.h
     - copied unchanged from r361671, vendor/apr/dist/include/apr_perms_set.h
  head/contrib/apr/include/private/
     - copied from r361671, vendor/apr/dist/include/private/
  head/contrib/apr/poll/unix/wakeup.c
     - copied unchanged from r361671, vendor/apr/dist/poll/unix/wakeup.c
  head/contrib/apr/strings/apr_cstr.c
     - copied unchanged from r361671, vendor/apr/dist/strings/apr_cstr.c
  head/usr.bin/svn/lib/libapr/apr_escape_test_char.h   (contents, props changed)
Modified:
  head/contrib/apr/CHANGES
  head/contrib/apr/CMakeLists.txt
  head/contrib/apr/Makefile.in
  head/contrib/apr/Makefile.win
  head/contrib/apr/NOTICE
  head/contrib/apr/NWGNUmakefile
  head/contrib/apr/apr.dsp
  head/contrib/apr/apr.mak
  head/contrib/apr/apr.spec
  head/contrib/apr/atomic/unix/ia32.c
  head/contrib/apr/atomic/unix/mutex.c
  head/contrib/apr/atomic/unix/ppc.c
  head/contrib/apr/atomic/unix/s390.c
  head/contrib/apr/atomic/unix/solaris.c
  head/contrib/apr/build-outputs.mk
  head/contrib/apr/buildconf
  head/contrib/apr/config.layout
  head/contrib/apr/configure
  head/contrib/apr/configure.in
  head/contrib/apr/docs/APRDesign.html
  head/contrib/apr/docs/canonical_filenames.html
  head/contrib/apr/docs/incomplete_types
  head/contrib/apr/docs/pool-design.html
  head/contrib/apr/encoding/apr_escape.c
  head/contrib/apr/file_io/unix/copy.c
  head/contrib/apr/file_io/unix/dir.c
  head/contrib/apr/file_io/unix/flock.c
  head/contrib/apr/file_io/unix/pipe.c
  head/contrib/apr/file_io/unix/readwrite.c
  head/contrib/apr/file_io/unix/seek.c
  head/contrib/apr/include/apr.h.in
  head/contrib/apr/include/apr.hnw
  head/contrib/apr/include/apr.hw
  head/contrib/apr/include/apr.hwc
  head/contrib/apr/include/apr_allocator.h
  head/contrib/apr/include/apr_atomic.h
  head/contrib/apr/include/apr_errno.h
  head/contrib/apr/include/apr_escape.h
  head/contrib/apr/include/apr_file_info.h
  head/contrib/apr/include/apr_file_io.h
  head/contrib/apr/include/apr_general.h
  head/contrib/apr/include/apr_global_mutex.h
  head/contrib/apr/include/apr_hash.h
  head/contrib/apr/include/apr_network_io.h
  head/contrib/apr/include/apr_poll.h
  head/contrib/apr/include/apr_portable.h
  head/contrib/apr/include/apr_proc_mutex.h
  head/contrib/apr/include/apr_shm.h
  head/contrib/apr/include/apr_skiplist.h
  head/contrib/apr/include/apr_strings.h
  head/contrib/apr/include/apr_tables.h
  head/contrib/apr/include/apr_thread_mutex.h
  head/contrib/apr/include/apr_thread_proc.h
  head/contrib/apr/include/apr_time.h
  head/contrib/apr/include/apr_version.h
  head/contrib/apr/include/arch/unix/apr_arch_atomic.h
  head/contrib/apr/include/arch/unix/apr_arch_networkio.h
  head/contrib/apr/include/arch/unix/apr_arch_poll_private.h
  head/contrib/apr/include/arch/unix/apr_arch_proc_mutex.h
  head/contrib/apr/include/arch/unix/apr_arch_shm.h
  head/contrib/apr/include/arch/unix/apr_arch_thread_mutex.h
  head/contrib/apr/include/arch/unix/apr_arch_threadproc.h
  head/contrib/apr/include/arch/unix/apr_private.h.in
  head/contrib/apr/libapr.dsp
  head/contrib/apr/libapr.mak
  head/contrib/apr/locks/unix/global_mutex.c
  head/contrib/apr/locks/unix/proc_mutex.c
  head/contrib/apr/locks/unix/thread_cond.c
  head/contrib/apr/locks/unix/thread_mutex.c
  head/contrib/apr/memory/unix/apr_pools.c
  head/contrib/apr/misc/unix/errorcodes.c
  head/contrib/apr/misc/unix/rand.c
  head/contrib/apr/network_io/unix/multicast.c
  head/contrib/apr/network_io/unix/sockaddr.c
  head/contrib/apr/network_io/unix/sockets.c
  head/contrib/apr/network_io/unix/sockopt.c
  head/contrib/apr/poll/unix/epoll.c
  head/contrib/apr/poll/unix/kqueue.c
  head/contrib/apr/poll/unix/poll.c
  head/contrib/apr/poll/unix/pollcb.c
  head/contrib/apr/poll/unix/pollset.c
  head/contrib/apr/poll/unix/port.c
  head/contrib/apr/poll/unix/select.c
  head/contrib/apr/poll/unix/z_asio.c
  head/contrib/apr/shmem/unix/shm.c
  head/contrib/apr/strings/apr_cpystrn.c
  head/contrib/apr/strings/apr_fnmatch.c
  head/contrib/apr/strings/apr_snprintf.c
  head/contrib/apr/tables/apr_skiplist.c
  head/contrib/apr/tables/apr_tables.c
  head/contrib/apr/threadproc/unix/proc.c
  head/contrib/apr/threadproc/unix/signals.c
  head/contrib/apr/tools/gen_test_char.c
  head/usr.bin/svn/lib/libapr/Makefile
Directory Properties:
  head/contrib/apr/   (props changed)

Modified: head/contrib/apr/CHANGES
==============================================================================
--- head/contrib/apr/CHANGES	Sun May 31 22:04:51 2020	(r361677)
+++ head/contrib/apr/CHANGES	Sun May 31 22:12:56 2020	(r361678)
@@ -1,179 +1,61 @@
                                                      -*- coding: utf-8 -*-
-Changes for APR 1.5.2
+Changes for APR 1.7.0
 
-  *) SECURITY: CVE-2015-1829 (cve.mitre.org)
-     APR applications using APR named pipe support on Windows can be 
-     vulnerable to a pipe squatting attack from a local process; the extent
-     of the vulnerability, when present, depends on the application.
-     Initial analysis and report was provided by John Hernandez of Casaba 
-     Security via HP SSRT Security Alert.  [Yann Ylavic]
+  *) apr_dir_read: [Unix] Dropped the preference of the dirread_r() flavor
+     for dirread(), because the former is both deprecated and unneeded.
+     [Yann Ylavic, William Rowe]
 
-  *) apr_atomic: Fix errors when building on Visual Studio 2013 while
-     maintaining the ability to build on Visual Studio 6 with Windows
-     Server 2003 R2 SDK. PR 57191. [Gregg Smith]
+  *) apr_file_info: [Win32 only] Treat only "name surrogate" reparse points
+     as symlinks, and not other reparse tag types. PR47630
+     [Oleg Liatte <olegliatte gmail.com>]
 
-  *) Switch to generic atomics for early/unpatched Solaris 10 not exporting
-     some atomic functions.  PR 55418.  [Yann Ylavic]
+  *) Test %ld vs. %lld to avoid compiler emits using APR_OFF_T_FMT, in the
+     case of apparently equivilant long and long long types. [William Rowe] 
 
-  *) apr_file_mktemp() on HP-UX: Remove limitation of 26 temporary files
-     per process.  PR 57677.  [Jeff Trawick]
+  *) Recognize APPLE predefined macros as equivilant to DARWIN. [Jim Jagielski]
 
-  *) apr_escape: Correctly calculate the size of the returned string in
-     apr_escape_path and set the correct return value in case we actually
-     escape the string. [<aduryagin gmail.com>] PR 57230.
+  *) Signals: Allow handling of SIGUSR2 in apr_signal_thread. [Yann Ylavic]
 
-  *) pollcb on Windows: Handle calls with no file/socket descriptors.
-     Follow up to PR 49882. [Jeff Trawick, Yann Ylavic]
+  *) Atomics: Support for 64bit ints. [Jim Jagielski]
 
-  *) apr_poll(cb): fix error paths returned values and leaks.  [Yann Ylavic]
+  *) Add the apr_encode_* API that implements RFC4648 and RFC7515
+     compliant BASE64, BASE64URL, BASE32, BASE32HEX and BASE16
+     encode/decode functions. [Graham Leggett]
 
-  *) apr_thread_cond_*wait() on BeOS: Fix broken logic.  PR 45800.
-     [Jochen Voss (no e-mail)]
+  *) rand: Use arc4random_buf() on BSD platforms and getrandom() on Linux,
+     when available. [Christian Weisgerber <naddy openbsd.org, Yann Ylavic]
 
-  *) apr_skiplist: Optimize the number of allocations by reusing pooled or
-     malloc()ed nodes for the lifetime of the skiplist.  [Yann Ylavic]
+  *) Add apr_sockaddr_zone_set, apr_sockaddr_zone_set to set and retrieve
+     the zone for link-local IPv6 addresses.  [Joe Orton]
 
-  *) apr_skiplist: Fix possible multiple-free() on the same value in
-     apr_skiplist_remove_all().  [Yann Ylavic]
+  *) apr_sockaddr_equal: Compare link-local IPv6 addresses with different
+     zones as not equal.  [Joe Orton]
 
-  *) apr_pollset: On z/OS, threadsafe apr_pollset_poll() may return
-     "EDC8102I Operation would block" under load.
-     [Pat Odonnell <patod us.ibm.com>]
+  *) apr_sockaddr_ip_getbuf, apr_sockaddr_ip_get: Append "%zone" for
+     IPv6 link-local addresses.  [Joe Orton]
 
-  *) On z/OS, apr_sockaddr_info_get() with family == APR_UNSPEC was not 
-     returning IPv4 addresses if any IPv6 addresses were returned. 
-     [Eric Covener]
+  *) Locks: add a --disable-timedlocks config option in case users
+     encounter more platforms where it fails [Nick Kew].
 
-  *) Windows cmake build: Fix an incompatibility with cmake 2.8.12 and
-     later.  [Jeff Trawick]
+  *) apr_allocator, apr_pools: Add apr_allocator_page_size() and
+     apr_allocator_min_order_set() to respectively get the (system's) page size
+     in use and set the minimum allocation size for an allocator (expressed in
+     2^order pages).  [Yann Ylavic]
 
-  *) apr_global_mutex/apr_proc_mutex: Resolve failures with the 
-     POSIX sem implementation in environments which receive signals.
-     [Jeff Trawick]
+  *) locks: provide portable implementations of timedlock()s for
+     posix-sems, sysv-sems and pthreads for those platforms that
+     lack native versions (eg: OSX/macOS). [Jim Jagielski]
 
-  *) apr_skiplist: Fix potential corruption of skiplists leading to 
-     results or crashes. [Takashi Sato <takashi tks st>, Eric Covener]
-     PR 56654.
+  *) locks: Introduce apr_{thread,proc,global}_mutex_timedlock().
+     [Yann Ylavic]
 
-  *) Improve platform detection by updating config.guess and config.sub.
-     [Rainer Jung]
+Changes for APR 1.6.x and later:
 
-Changes for APR 1.5.1
+  *) http://svn.apache.org/viewvc/apr/apr/branches/1.6.x/CHANGES?view=markup
 
-  *) apr_os_proc_mutex_get() on Unix:  Avoid segfault for cross-
-     process pthread mutexes.  [Yann Ylavic <ylavic.dev gmail.com>]
+Changes for APR 1.5.x and later:
 
-  *) When using shmget-based shared memory, the ID used for ftok is
-     now an APR hash of the filename instead of the constant '1'.
-     We do this to help avoid collisions. PR 53996 [Jim Jagielski]
-
-  *) apr_socket_atreadeof(): Fix breakage on OS X. [Jim Jagielski]
-
-  *) Fix POSIX shared memory (shm_open) use for named shared memory.
-     Includes adding '--enable-posix-shm' to force POSIX shm if
-     available, and OS X compatibility. PR 55928.
-     [Jozef Hatala <jh-asf skrt org>, Jim Jagielski]
-
-  *) Fix race condition when calling apr_dir_make_recursive from
-     multiple threads on Windows.
-     [Bert Huijben]
-
-  *) Fix apr_escape.c compilation errors on EBCDIC platforms.
-     [Eric Covener]
-
-  *) FreeBSD 10: Correct a regression in 1.5.0 which affected non-
-     blocking sockets in some applications, including httpd.  [Jeff
-     Trawick]
-
-  *) Windows cmake build: Fix incorrect installation of some .pdb
-     files.  Fix incorrect use of some logic intended for Windows 9x,
-     including legacy filesystem interfaces and dynamic loading of
-     some Windows APIs.  [Jeff Trawick]
-
-  *) apr_skiplist: Add compatibility with C++ applications.
-     [Jeff Trawick]
-
-  *) Correct a regression in 1.5.0 which affected out-of-tree
-     builds on Unix.  [Rainer Jung]
-
-  *) Improve platform detection by updating config.guess and config.sub.
-     [Rainer Jung]
-
-Changes for APR 1.5.0
-
-  *) Fix Linux kernel version check to recognize more versions,
-     including versions 3.10 and later.  PR 55690.  [Joe Orton,
-     Arfrever Frehtes Taifersar Arahesis <arfrever.fta gmail.com>]
-
-  *) Add apr_sockaddr_is_wildcard() to check if a socket address
-     refers to the wildcard address for the protocol family (e.g.,
-     0.0.0.0/INADDR_ANY for IPv4).  [Jeff Trawick]
-
-  *) apr_file_dup2() on Windows: Fix debug RTL assertion when 
-     attempting to _commit(stdout) or _commit(stderr).  [Mike Rumph
-     <mike.rumph oracle.com>]
-
-  *) apr_socket_connect() on Windows: Handle WSAEISCONN.  PR 48736.
-     [<inoue ariel-networks.com>, Jeff Trawick]
-
-  *) z/OS: threadsafe apr_pollset_poll support for sockets [Greg Ames]
-
-  *) Windows:  Don't obtain a mutex for buffered file I/O unless the
-     file was opened with the APR_FOPEN_XTHREAD flag.  [Ivan Zhakov
-     <ivan visualsvn.com>]
-
-  *) Windows:  Create named shared memory segments under the "Local"
-     namespace if the caller is unprivileged, fixing an inability of
-     unprivileged callers to use apr_shm_create() with named shared
-     memory segments under recent Windows.  As before, shared memory
-     segments are created under the "Global" namespace for privileged
-     callers.  Add apr_shm_create_ex() and apr_shm_attach_ex(), which
-     provide the ability to override the normal namespace selection.
-     [Jeff Trawick]
-
-  *) Update compile settings for MINT OS.  PR 47181. [Alan Hourihane
-     <alanh fairlite.co.uk>]
-
-  *) Files and pipes on Windows:  Don't create an unused pollset when
-     files and pipes are opened.  [Mladen Turk]
-
-  *) apr_socket_timeout_set() on Windows: If the socket was in a non-
-     blocking state before, disable that setting so that timeouts work.
-     [Jeff Trawick]
-
-  *) File info APIs: Fix calculation of atime and mtime on AIX. PR 51146.
-     [Ruediger Pluem]
-
-  *) Add the apr_escape interface. [Graham Leggett]
-
-  *) Cygwin build fixes.  PRs 51016 and 55586.  [Carlo Bramini
-     <carlo.bramix libero.it>] 
-
-  *) Add apr_skiplist family. [Jim Jagielski]
-
-  *) Add experimental cmake-based build system for Windows.  Refer to 
-     README.cmake for more information.  [Jeff Trawick, Tom Donovan]
-
-  *) Add the apr_table_getm() call, which transparently handles the
-     merging of keys with multiple values. [Graham Leggett]
-
-  *) Add apr_hash_this_key(), apr_hash_this_key_len(), and 
-     apr_hash_this_val() for easier access to those attributes from
-     a hash iterator.  [Hyrum K. Wright <hyrum_wright mail.utexas.edu>]
-
-  *) MinGW/MSYS:  Support shared builds of APR, other general improvements
-     to support of this toolchain.  PR 46175.  [Carlo Bramini 
-     <carlo.bramix libero.it>]  
-
-  *) Improve platform detection by updating config.guess and config.sub.
-     [Rainer Jung]
-
-  *) apr_socket_opt_set: Add support for APR_SO_BROADCAST. PR 46389.
-     [Armin Müller <mueller itestra com>]
-
-  *) Enable platform specific support for the opening of a file or
-     pipe in non-blocking mode through the APR_FOPEN_NONBLOCK flag.
-     [Graham Leggett]
+  *) http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/CHANGES?view=markup
 
 Changes for APR 1.4.x and later:
 

Modified: head/contrib/apr/CMakeLists.txt
==============================================================================
--- head/contrib/apr/CMakeLists.txt	Sun May 31 22:04:51 2020	(r361677)
+++ head/contrib/apr/CMakeLists.txt	Sun May 31 22:12:56 2020	(r361678)
@@ -87,6 +87,7 @@ INCLUDE_DIRECTORIES(${APR_INCLUDE_DIRECTORIES})
 SET(APR_PUBLIC_HEADERS_STATIC
   include/apr_allocator.h
   include/apr_atomic.h
+  include/apr_cstr.h
   include/apr_dso.h
   include/apr_env.h
   include/apr_errno.h
@@ -102,6 +103,7 @@ SET(APR_PUBLIC_HEADERS_STATIC
   include/apr_lib.h
   include/apr_mmap.h
   include/apr_network_io.h
+  include/apr_perms_set.h
   include/apr_poll.h
   include/apr_pools.h
   include/apr_portable.h
@@ -179,11 +181,13 @@ SET(APR_SOURCES
   poll/unix/pollcb.c
   poll/unix/pollset.c
   poll/unix/select.c
+  poll/unix/wakeup.c
   random/unix/apr_random.c
   random/unix/sha2.c
   random/unix/sha2_glue.c
   shmem/win32/shm.c
   strings/apr_cpystrn.c
+  strings/apr_cstr.c
   strings/apr_fnmatch.c
   strings/apr_snprintf.c
   strings/apr_strings.c

Modified: head/contrib/apr/Makefile.in
==============================================================================
--- head/contrib/apr/Makefile.in	Sun May 31 22:04:51 2020	(r361677)
+++ head/contrib/apr/Makefile.in	Sun May 31 22:12:56 2020	(r361678)
@@ -63,6 +63,8 @@ exec_prefix=@exec_prefix@
 bindir=@bindir@
 libdir=@libdir@
 includedir=@includedir@
+datarootdir=@datarootdir@
+datadir=@datadir@
 installbuilddir=@installbuilddir@
 
 # Create apr-config script suitable for the install tree

Modified: head/contrib/apr/Makefile.win
==============================================================================
--- head/contrib/apr/Makefile.win	Sun May 31 22:04:51 2020	(r361677)
+++ head/contrib/apr/Makefile.win	Sun May 31 22:12:56 2020	(r361678)
@@ -18,8 +18,6 @@
 #
 #     ARCH="Win32 Release"
 #     ARCH="Win32 Debug"
-#     ARCH="Win32 Release9x"
-#     ARCH="Win32 Debug9x"
 #     ARCH="x64 Release"
 #     ARCH="x64 Debug"
 #
@@ -66,14 +64,6 @@ LIBSOSPATH=LibR
 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

Modified: head/contrib/apr/NOTICE
==============================================================================
--- head/contrib/apr/NOTICE	Sun May 31 22:04:51 2020	(r361677)
+++ head/contrib/apr/NOTICE	Sun May 31 22:12:56 2020	(r361678)
@@ -1,5 +1,5 @@
 Apache Portable Runtime
-Copyright (c) 2000-2015 The Apache Software Foundation.
+Copyright (c) 2000-2019 The Apache Software Foundation.
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).

Modified: head/contrib/apr/NWGNUmakefile
==============================================================================
--- head/contrib/apr/NWGNUmakefile	Sun May 31 22:04:51 2020	(r361677)
+++ head/contrib/apr/NWGNUmakefile	Sun May 31 22:12:56 2020	(r361678)
@@ -362,6 +362,7 @@ FILES_lib_objs = \
 	$(OBJDIR)/userinfo.o \
 	$(OBJDIR)/version.o \
 	$(OBJDIR)/waitio.o \
+	$(OBJDIR)/wakeup.o \
 	$(EOLIST)
 
 

Modified: head/contrib/apr/apr.dsp
==============================================================================
--- head/contrib/apr/apr.dsp	Sun May 31 22:04:51 2020	(r361677)
+++ head/contrib/apr/apr.dsp	Sun May 31 22:12:56 2020	(r361678)
@@ -19,8 +19,6 @@ CFG=apr - Win32 Release
 !MESSAGE 
 !MESSAGE "apr - Win32 Release" (based on "Win32 (x86) Static Library")
 !MESSAGE "apr - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "apr - Win32 Release9x" (based on "Win32 (x86) Static Library")
-!MESSAGE "apr - Win32 Debug9x" (based on "Win32 (x86) Static Library")
 !MESSAGE "apr - x64 Release" (based on "Win32 (x86) Static Library")
 !MESSAGE "apr - x64 Debug" (based on "Win32 (x86) Static Library")
 !MESSAGE 
@@ -45,7 +43,7 @@ RSC=rc.exe
 # PROP Intermediate_Dir "LibR"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
-# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /D "NDEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "WINNT" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\apr-1" /FD /c
+# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /I "./include/private" /D "NDEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "WINNT" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\apr-1" /FD /c
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
@@ -69,7 +67,7 @@ LIB32=link.exe -lib
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MDd /W3 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /EHsc /c
-# ADD CPP /nologo /MDd /W3 /Zi /Od /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /D "_DEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "WINNT" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\apr-1" /FD /EHsc /c
+# ADD CPP /nologo /MDd /W3 /Zi /Od /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /I "./include/private" /D "_DEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "WINNT" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\apr-1" /FD /EHsc /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
@@ -79,53 +77,6 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo /out:"LibD\apr-1.lib"
 
-!ELSEIF  "$(CFG)" == "apr - Win32 Release9x"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "9x\LibR"
-# PROP BASE Intermediate_Dir "9x\LibR"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "9x\LibR"
-# PROP Intermediate_Dir "9x\LibR"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
-# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /D "NDEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\apr-1" /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"9x\LibR\apr-1.lib"
-
-!ELSEIF  "$(CFG)" == "apr - Win32 Debug9x"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "9x\LibD"
-# PROP BASE Intermediate_Dir "9x\LibD"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "9x\LibD"
-# PROP Intermediate_Dir "9x\LibD"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /EHsc /c
-# ADD CPP /nologo /MDd /W3 /Zi /Od /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /D "_DEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\apr-1" /FD /EHsc /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"9x\LibD\apr-1.lib"
-
 !ELSEIF  "$(CFG)" == "apr - x64 Release"
 
 # PROP BASE Use_MFC 0
@@ -139,7 +90,7 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir "x64\LibR"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
-# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /D "NDEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "WINNT" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\apr-1" /FD /c
+# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /I "./include/private" /D "NDEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "WINNT" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\apr-1" /FD /c
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
@@ -163,7 +114,7 @@ LIB32=link.exe -lib
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MDd /W3 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /EHsc /c
-# ADD CPP /nologo /MDd /W3 /Zi /Od /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /D "_DEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "WINNT" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\apr-1" /FD /EHsc /c
+# ADD CPP /nologo /MDd /W3 /Zi /Od /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /I "./include/private" /D "_DEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "WINNT" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\apr-1" /FD /EHsc /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
@@ -179,8 +130,6 @@ LIB32=link.exe -lib
 
 # Name "apr - Win32 Release"
 # Name "apr - Win32 Debug"
-# Name "apr - Win32 Release9x"
-# Name "apr - Win32 Debug9x"
 # Name "apr - x64 Release"
 # Name "apr - x64 Debug"
 # Begin Group "Source Files"
@@ -193,6 +142,10 @@ LIB32=link.exe -lib
 
 SOURCE=.\atomic\win32\apr_atomic.c
 # End Source File
+# Begin Source File
+
+SOURCE=.\atomic\win32\apr_atomic64.c
+# End Source File
 # End Group
 # Begin Group "dso"
 
@@ -207,6 +160,11 @@ SOURCE=.\dso\win32\dso.c
 # PROP Default_Filter ""
 # Begin Source File
 
+SOURCE=.\encoding\apr_encode.c
+
+# End Source File
+# Begin Source File
+
 SOURCE=.\encoding\apr_escape.c
 
 # End Source File
@@ -439,6 +397,10 @@ SOURCE=.\poll\unix\pollset.c
 
 SOURCE=.\poll\unix\select.c
 # End Source File
+# Begin Source File
+
+SOURCE=.\poll\unix\wakeup.c
+# End Source File
 # End Group
 # Begin Group "random"
 
@@ -473,6 +435,10 @@ SOURCE=.\strings\apr_cpystrn.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\strings\apr_cstr.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\strings\apr_fnmatch.c
 # End Source File
 # Begin Source File
@@ -642,26 +608,6 @@ InputPath=.\include\apr.hw
 
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "apr - Win32 Release9x"
-
-# Begin Custom Build - Creating apr.h from apr.hw
-InputPath=.\include\apr.hw
-
-".\include\apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	type .\include\apr.hw > .\include\apr.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "apr - Win32 Debug9x"
-
-# Begin Custom Build - Creating apr.h from apr.hw
-InputPath=.\include\apr.hw
-
-".\include\apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	type .\include\apr.hw > .\include\apr.h
-
-# End Custom Build
-
 !ELSEIF  "$(CFG)" == "apr - x64 Release"
 
 # Begin Custom Build - Creating apr.h from apr.hw
@@ -708,76 +654,48 @@ SOURCE=.\include\apr_errno.h
 # Begin Source File
 
 SOURCE=.\include\apr_escape.h
-# End Source File
-# Begin Source File
 
-SOURCE=.\include\apr_escape.h
+!IF  "$(CFG)" == "libapr - Win32 Release"
 
-!IF  "$(CFG)" == "apr - Win32 Release"
-
 # Begin Custom Build - Creating gen_test_char.exe and apr_escape_test_char.h
 InputPath=.\include\apr_escape.h
 
 ".\include\apr_escape_test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl.exe /nologo /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /I ".\include" /Fo.\LibR\gen_test_char /Fe.\LibR\gen_test_char.exe .\tools\gen_test_char.c 
-	.\LibR\gen_test_char.exe > .\include\apr_escape_test_char.h
+	cl.exe /nologo /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /I ".\include" /Fo.\Release\gen_test_char /Fe.\Release\gen_test_char.exe .\tools\gen_test_char.c 
+	.\Release\gen_test_char.exe > .\include\apr_escape_test_char.h
 
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "apr - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libapr - Win32 Debug"
 
 # Begin Custom Build - Creating gen_test_char.exe and apr_escape_test_char.h
 InputPath=.\include\apr_escape.h
 
 ".\include\apr_escape_test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl.exe /nologo /W3 /EHsc /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /I ".\include" /Fo.\LibD\gen_test_char /Fe.\LibD\gen_test_char.exe .\tools\gen_test_char.c  
-	.\LibD\gen_test_char.exe > .\include\apr_escape_test_char.h
+	cl.exe /nologo /W3 /EHsc /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /I ".\include" /Fo.\Debug\gen_test_char /Fe.\Debug\gen_test_char.exe .\tools\gen_test_char.c  
+	.\Debug\gen_test_char.exe > .\include\apr_escape_test_char.h
 
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "apr - Win32 Release9x"
+!ELSEIF  "$(CFG)" == "libapr - x64 Release"
 
 # Begin Custom Build - Creating gen_test_char.exe and apr_escape_test_char.h
 InputPath=.\include\apr_escape.h
 
 ".\include\apr_escape_test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl.exe /nologo /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /I ".\include" /Fo.\9x\LibR\gen_test_char /Fe.\9x\LibR\gen_test_char.exe .\tools\gen_test_char.c 
-	.\9x\LibR\gen_test_char.exe > .\include\apr_escape_test_char.h
+	cl.exe /nologo /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /I ".\include" /Fo.\x64\Release\gen_test_char /Fe.\x64\Release\gen_test_char.exe .\tools\gen_test_char.c 
+	.\x64\Release\gen_test_char.exe > .\include\apr_escape_test_char.h
 
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "apr - Win32 Debug9x"
+!ELSEIF  "$(CFG)" == "libapr - x64 Debug"
 
 # Begin Custom Build - Creating gen_test_char.exe and apr_escape_test_char.h
 InputPath=.\include\apr_escape.h
 
-InputPath=.\include\apr_escape.h
 ".\include\apr_escape_test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl.exe /nologo /W3 /EHsc /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /I ".\include" /Fo.\9x\LibD\gen_test_char /Fe.\9x\LibD\gen_test_char.exe .\tools\gen_test_char.c  
-	.\9x\LibD\gen_test_char.exe > .\include\apr_escape_test_char.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "apr - x64 Release"
-
-# Begin Custom Build - Creating gen_test_char.exe and apr_escape_test_char.h
-InputPath=.\include\apr_escape.h
-
-InputPath=.\include\apr_escape.h
-".\include\apr_escape_test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl.exe /nologo /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /I ".\include" /Fo.\x64\LibR\gen_test_char /Fe.\x64\LibR\gen_test_char.exe .\tools\gen_test_char.c 
-	.\x64\LibR\gen_test_char.exe > .\include\apr_escape_test_char.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "apr - x64 Debug"
-
-# Begin Custom Build - Creating gen_test_char.exe and apr_escape_test_char.h
-InputPath=.\include\apr_escape.h
-
-".\include\apr_escape_test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl.exe /nologo /W3 /EHsc /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /I ".\include" /Fo.\x64\LibD\gen_test_char /Fe.\x64\LibD\gen_test_char.exe .\tools\gen_test_char.c 
-	.\x64\LibD\gen_test_char.exe > .\include\apr_escape_test_char.h
+	cl.exe /nologo /W3 /EHsc /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /I ".\include" /Fo.\x64\Debug\gen_test_char /Fe.\x64\Debug\gen_test_char.exe .\tools\gen_test_char.c 
+	.\x64\Debug\gen_test_char.exe > .\include\apr_escape_test_char.h
 
 # End Custom Build
 

Modified: head/contrib/apr/apr.mak
==============================================================================
--- head/contrib/apr/apr.mak	Sun May 31 22:04:51 2020	(r361677)
+++ head/contrib/apr/apr.mak	Sun May 31 22:12:56 2020	(r361678)
@@ -4,7 +4,7 @@ CFG=apr - Win32 Release
 !MESSAGE No configuration specified. Defaulting to apr - Win32 Release.
 !ENDIF 
 
-!IF "$(CFG)" != "apr - Win32 Release" && "$(CFG)" != "apr - Win32 Debug" && "$(CFG)" != "apr - Win32 Release9x" && "$(CFG)" != "apr - Win32 Debug9x" && "$(CFG)" != "apr - x64 Release" && "$(CFG)" != "apr - x64 Debug"
+!IF "$(CFG)" != "apr - Win32 Release" && "$(CFG)" != "apr - Win32 Debug" && "$(CFG)" != "apr - x64 Release" && "$(CFG)" != "apr - x64 Debug"
 !MESSAGE Invalid configuration "$(CFG)" specified.
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
@@ -15,8 +15,6 @@ CFG=apr - Win32 Release
 !MESSAGE 
 !MESSAGE "apr - Win32 Release" (based on "Win32 (x86) Static Library")
 !MESSAGE "apr - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "apr - Win32 Release9x" (based on "Win32 (x86) Static Library")
-!MESSAGE "apr - Win32 Debug9x" (based on "Win32 (x86) Static Library")
 !MESSAGE "apr - x64 Release" (based on "Win32 (x86) Static Library")
 !MESSAGE "apr - x64 Debug" (based on "Win32 (x86) Static Library")
 !MESSAGE 
@@ -29,6 +27,9 @@ NULL=
 NULL=nul
 !ENDIF 
 
+CPP=cl.exe
+RSC=rc.exe
+
 !IF  "$(CFG)" == "apr - Win32 Release"
 
 OUTDIR=.\LibR
@@ -37,14 +38,17 @@ INTDIR=.\LibR
 OutDir=.\LibR
 # End Custom Macros
 
-ALL : ".\LibR\gen_test_char.exe" "$(OUTDIR)\apr-1.lib"
+ALL : ".\include\apr.h" ".\include\apr_escape.h" "$(OUTDIR)\apr-1.lib"
 
 
 CLEAN :
 	- at erase "$(INTDIR)\apr-1.idb"
 	- at erase "$(INTDIR)\apr-1.pdb"
 	- at erase "$(INTDIR)\apr_atomic.obj"
+	- at erase "$(INTDIR)\apr_atomic64.obj"
 	- at erase "$(INTDIR)\apr_cpystrn.obj"
+	- at erase "$(INTDIR)\apr_cstr.obj"
+	- at erase "$(INTDIR)\apr_encode.obj"
 	- at erase "$(INTDIR)\apr_escape.obj"
 	- at erase "$(INTDIR)\apr_fnmatch.obj"
 	- at erase "$(INTDIR)\apr_getpass.obj"
@@ -115,49 +119,14 @@ CLEAN :
 	- at erase "$(INTDIR)\userinfo.obj"
 	- at erase "$(INTDIR)\utf8.obj"
 	- at erase "$(INTDIR)\version.obj"
+	- at erase "$(INTDIR)\wakeup.obj"
 	- at erase "$(OUTDIR)\apr-1.lib"
 	- at erase ".\include\apr.h"
-	- at erase ".\include\apr_gen_test_char.h"
-	- at erase "$(OUTDIR)\gen_test_char.exe"
-	- at erase "$(OUTDIR)\gen_test_char.obj"
 
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
-CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /D "NDEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "WINNT" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(OUTDIR)\apr-1" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
+CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /I "./include/private"  /D "NDEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "WINNT" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(OUTDIR)\apr-1" /FD /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr.bsc" 
 BSC32_SBRS= \
@@ -166,7 +135,9 @@ LIB32=link.exe -lib
 LIB32_FLAGS=/nologo /out:"$(OUTDIR)\apr-1.lib" 
 LIB32_OBJS= \
 	"$(INTDIR)\apr_atomic.obj" \
+	"$(INTDIR)\apr_atomic64.obj" \
 	"$(INTDIR)\dso.obj" \
+	"$(INTDIR)\apr_encode.obj" \
 	"$(INTDIR)\apr_escape.obj" \
 	"$(INTDIR)\buffer.obj" \
 	"$(INTDIR)\copy.obj" \
@@ -208,19 +179,21 @@ LIB32_OBJS= \
 	"$(INTDIR)\multicast.obj" \
 	"$(INTDIR)\sendrecv.obj" \
 	"$(INTDIR)\sockaddr.obj" \
-	"$(INTDIR)\sockets.obj" \
 	"$(INTDIR)\socket_util.obj" \
+	"$(INTDIR)\sockets.obj" \
 	"$(INTDIR)\sockopt.obj" \
 	"$(INTDIR)\apr_getpass.obj" \
 	"$(INTDIR)\poll.obj" \
 	"$(INTDIR)\pollcb.obj" \
 	"$(INTDIR)\pollset.obj" \
 	"$(INTDIR)\select.obj" \
+	"$(INTDIR)\wakeup.obj" \
 	"$(INTDIR)\apr_random.obj" \
 	"$(INTDIR)\sha2.obj" \
 	"$(INTDIR)\sha2_glue.obj" \
 	"$(INTDIR)\shm.obj" \
 	"$(INTDIR)\apr_cpystrn.obj" \
+	"$(INTDIR)\apr_cstr.obj" \
 	"$(INTDIR)\apr_fnmatch.obj" \
 	"$(INTDIR)\apr_snprintf.obj" \
 	"$(INTDIR)\apr_strings.obj" \
@@ -251,14 +224,17 @@ INTDIR=.\LibD
 OutDir=.\LibD
 # End Custom Macros
 
-ALL : ".\LibD\gen_test_char.exe" ".\include\apr_escape_test_char.h" ".\include\apr.h" "$(OUTDIR)\apr-1.lib"
+ALL : ".\include\apr.h" ".\include\apr_escape.h" "$(OUTDIR)\apr-1.lib"
 
 
 CLEAN :
 	- at erase "$(INTDIR)\apr-1.idb"
 	- at erase "$(INTDIR)\apr-1.pdb"
 	- at erase "$(INTDIR)\apr_atomic.obj"
+	- at erase "$(INTDIR)\apr_atomic64.obj"
 	- at erase "$(INTDIR)\apr_cpystrn.obj"
+	- at erase "$(INTDIR)\apr_cstr.obj"
+	- at erase "$(INTDIR)\apr_encode.obj"
 	- at erase "$(INTDIR)\apr_escape.obj"
 	- at erase "$(INTDIR)\apr_fnmatch.obj"
 	- at erase "$(INTDIR)\apr_getpass.obj"
@@ -329,49 +305,14 @@ CLEAN :
 	- at erase "$(INTDIR)\userinfo.obj"
 	- at erase "$(INTDIR)\utf8.obj"
 	- at erase "$(INTDIR)\version.obj"
+	- at erase "$(INTDIR)\wakeup.obj"
 	- at erase "$(OUTDIR)\apr-1.lib"
 	- at erase ".\include\apr.h"
-	- at erase ".\include\apr_gen_test_char.h"
-	- at erase "$(OUTDIR)\gen_test_char.exe"
-	- at erase "$(OUTDIR)\gen_test_char.obj"
 
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
-CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /D "_DEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "WINNT" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(OUTDIR)\apr-1" /FD /EHsc /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
+CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /I "./include/private" /D "_DEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "WINNT" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(OUTDIR)\apr-1" /FD /EHsc /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr.bsc" 
 BSC32_SBRS= \
@@ -380,7 +321,9 @@ LIB32=link.exe -lib
 LIB32_FLAGS=/nologo /out:"$(OUTDIR)\apr-1.lib" 
 LIB32_OBJS= \
 	"$(INTDIR)\apr_atomic.obj" \
+	"$(INTDIR)\apr_atomic64.obj" \
 	"$(INTDIR)\dso.obj" \
+	"$(INTDIR)\apr_encode.obj" \
 	"$(INTDIR)\apr_escape.obj" \
 	"$(INTDIR)\buffer.obj" \
 	"$(INTDIR)\copy.obj" \
@@ -422,233 +365,21 @@ LIB32_OBJS= \
 	"$(INTDIR)\multicast.obj" \
 	"$(INTDIR)\sendrecv.obj" \
 	"$(INTDIR)\sockaddr.obj" \
-	"$(INTDIR)\sockets.obj" \
 	"$(INTDIR)\socket_util.obj" \
-	"$(INTDIR)\sockopt.obj" \
-	"$(INTDIR)\apr_getpass.obj" \
-	"$(INTDIR)\poll.obj" \
-	"$(INTDIR)\pollcb.obj" \
-	"$(INTDIR)\pollset.obj" \
-	"$(INTDIR)\select.obj" \
-	"$(INTDIR)\apr_random.obj" \
-	"$(INTDIR)\sha2.obj" \
-	"$(INTDIR)\sha2_glue.obj" \
-	"$(INTDIR)\shm.obj" \
-	"$(INTDIR)\apr_cpystrn.obj" \
-	"$(INTDIR)\apr_fnmatch.obj" \
-	"$(INTDIR)\apr_snprintf.obj" \
-	"$(INTDIR)\apr_strings.obj" \
-	"$(INTDIR)\apr_strnatcmp.obj" \
-	"$(INTDIR)\apr_strtok.obj" \
-	"$(INTDIR)\apr_hash.obj" \
-	"$(INTDIR)\apr_skiplist.obj" \
-	"$(INTDIR)\apr_tables.obj" \
-	"$(INTDIR)\proc.obj" \
-	"$(INTDIR)\signals.obj" \
-	"$(INTDIR)\thread.obj" \
-	"$(INTDIR)\threadpriv.obj" \
-	"$(INTDIR)\time.obj" \
-	"$(INTDIR)\timestr.obj" \
-	"$(INTDIR)\groupinfo.obj" \
-	"$(INTDIR)\userinfo.obj"
-
-"$(OUTDIR)\apr-1.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
-    $(LIB32) @<<
-  $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS)
-<<
-
-!ELSEIF  "$(CFG)" == "apr - Win32 Release9x"
-
-OUTDIR=.\9x\LibR
-INTDIR=.\9x\LibR
-# Begin Custom Macros
-OutDir=.\9x\LibR
-# End Custom Macros
-
-ALL : ".\include\apr_escape_test_char.h" ".\include\apr.h" ".\9x\LibR\gen_test_char.exe" "$(OUTDIR)\apr-1.lib"
-
-
-CLEAN :
-	- at erase "$(INTDIR)\apr-1.idb"
-	- at erase "$(INTDIR)\apr-1.pdb"
-	- at erase "$(INTDIR)\apr_atomic.obj"
-	- at erase "$(INTDIR)\apr_cpystrn.obj"
-	- at erase "$(INTDIR)\apr_escape.obj"
-	- at erase "$(INTDIR)\apr_fnmatch.obj"
-	- at erase "$(INTDIR)\apr_getpass.obj"
-	- at erase "$(INTDIR)\apr_hash.obj"
-	- at erase "$(INTDIR)\apr_pools.obj"
-	- at erase "$(INTDIR)\apr_random.obj"
-	- at erase "$(INTDIR)\apr_skiplist.obj"
-	- at erase "$(INTDIR)\apr_snprintf.obj"
-	- at erase "$(INTDIR)\apr_strings.obj"
-	- at erase "$(INTDIR)\apr_strnatcmp.obj"
-	- at erase "$(INTDIR)\apr_strtok.obj"
-	- at erase "$(INTDIR)\apr_tables.obj"
-	- at erase "$(INTDIR)\buffer.obj"
-	- at erase "$(INTDIR)\charset.obj"
-	- at erase "$(INTDIR)\common.obj"
-	- at erase "$(INTDIR)\copy.obj"
-	- at erase "$(INTDIR)\dir.obj"
-	- at erase "$(INTDIR)\dso.obj"
-	- at erase "$(INTDIR)\env.obj"
-	- at erase "$(INTDIR)\errorcodes.obj"
-	- at erase "$(INTDIR)\fileacc.obj"
-	- at erase "$(INTDIR)\filedup.obj"
-	- at erase "$(INTDIR)\filepath.obj"
-	- at erase "$(INTDIR)\filepath_util.obj"
-	- at erase "$(INTDIR)\filestat.obj"
-	- at erase "$(INTDIR)\filesys.obj"
-	- at erase "$(INTDIR)\flock.obj"
-	- at erase "$(INTDIR)\fullrw.obj"
-	- at erase "$(INTDIR)\getopt.obj"
-	- at erase "$(INTDIR)\groupinfo.obj"
-	- at erase "$(INTDIR)\inet_ntop.obj"
-	- at erase "$(INTDIR)\inet_pton.obj"
-	- at erase "$(INTDIR)\internal.obj"
-	- at erase "$(INTDIR)\misc.obj"
-	- at erase "$(INTDIR)\mktemp.obj"
-	- at erase "$(INTDIR)\mmap.obj"
-	- at erase "$(INTDIR)\multicast.obj"
-	- at erase "$(INTDIR)\open.obj"
-	- at erase "$(INTDIR)\otherchild.obj"
-	- at erase "$(INTDIR)\pipe.obj"
-	- at erase "$(INTDIR)\poll.obj"
-	- at erase "$(INTDIR)\pollcb.obj"
-	- at erase "$(INTDIR)\pollset.obj"
-	- at erase "$(INTDIR)\proc.obj"
-	- at erase "$(INTDIR)\proc_mutex.obj"
-	- at erase "$(INTDIR)\rand.obj"
-	- at erase "$(INTDIR)\readwrite.obj"
-	- at erase "$(INTDIR)\seek.obj"
-	- at erase "$(INTDIR)\select.obj"
-	- at erase "$(INTDIR)\sendrecv.obj"
-	- at erase "$(INTDIR)\sha2.obj"
-	- at erase "$(INTDIR)\sha2_glue.obj"
-	- at erase "$(INTDIR)\shm.obj"
-	- at erase "$(INTDIR)\signals.obj"
-	- at erase "$(INTDIR)\sockaddr.obj"
-	- at erase "$(INTDIR)\socket_util.obj"
-	- at erase "$(INTDIR)\sockets.obj"
-	- at erase "$(INTDIR)\sockopt.obj"
-	- at erase "$(INTDIR)\start.obj"
-	- at erase "$(INTDIR)\tempdir.obj"
-	- at erase "$(INTDIR)\thread.obj"
-	- at erase "$(INTDIR)\thread_cond.obj"
-	- at erase "$(INTDIR)\thread_mutex.obj"
-	- at erase "$(INTDIR)\thread_rwlock.obj"
-	- at erase "$(INTDIR)\threadpriv.obj"
-	- at erase "$(INTDIR)\time.obj"
-	- at erase "$(INTDIR)\timestr.obj"
-	- at erase "$(INTDIR)\userinfo.obj"
-	- at erase "$(INTDIR)\utf8.obj"
-	- at erase "$(INTDIR)\version.obj"
-	- at erase "$(OUTDIR)\apr-1.lib"
-	- at erase ".\include\apr.h"
-	- at erase ".\include\apr_gen_test_char.h"
-	- at erase "$(OUTDIR)\gen_test_char.exe"
-	- at erase "$(OUTDIR)\gen_test_char.obj"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /D "NDEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(OUTDIR)\apr-1" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr.bsc" 
-BSC32_SBRS= \
-	
-LIB32=link.exe -lib
-LIB32_FLAGS=/nologo /out:"$(OUTDIR)\apr-1.lib" 
-LIB32_OBJS= \
-	"$(INTDIR)\apr_atomic.obj" \
-	"$(INTDIR)\dso.obj" \
-	"$(INTDIR)\apr_escape.obj" \
-	"$(INTDIR)\buffer.obj" \
-	"$(INTDIR)\copy.obj" \
-	"$(INTDIR)\dir.obj" \
-	"$(INTDIR)\fileacc.obj" \
-	"$(INTDIR)\filedup.obj" \
-	"$(INTDIR)\filepath.obj" \
-	"$(INTDIR)\filepath_util.obj" \
-	"$(INTDIR)\filestat.obj" \
-	"$(INTDIR)\filesys.obj" \
-	"$(INTDIR)\flock.obj" \
-	"$(INTDIR)\fullrw.obj" \
-	"$(INTDIR)\mktemp.obj" \
-	"$(INTDIR)\open.obj" \
-	"$(INTDIR)\pipe.obj" \
-	"$(INTDIR)\readwrite.obj" \
-	"$(INTDIR)\seek.obj" \
-	"$(INTDIR)\tempdir.obj" \
-	"$(INTDIR)\proc_mutex.obj" \
-	"$(INTDIR)\thread_cond.obj" \
-	"$(INTDIR)\thread_mutex.obj" \
-	"$(INTDIR)\thread_rwlock.obj" \
-	"$(INTDIR)\apr_pools.obj" \
-	"$(INTDIR)\charset.obj" \
-	"$(INTDIR)\env.obj" \
-	"$(INTDIR)\errorcodes.obj" \
-	"$(INTDIR)\getopt.obj" \
-	"$(INTDIR)\internal.obj" \
-	"$(INTDIR)\misc.obj" \

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

More information about the svn-src-all mailing list