Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 20 Feb 2014 20:34:02 +0000 (UTC)
From:      Peter Wemm <peter@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject:   svn commit: r262253 - in stable/10: contrib/apr-util contrib/apr-util/crypto contrib/apr-util/dbd contrib/apr-util/dbm contrib/apr-util/include contrib/apr-util/memcache contrib/apr-util/misc contr...
Message-ID:  <201402202034.s1KKY2dZ041374@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: peter
Date: Thu Feb 20 20:34:01 2014
New Revision: 262253
URL: http://svnweb.freebsd.org/changeset/base/262253

Log:
  MFC r257129,257936,258084,258569,258602,262250,262251
    svn-1.8.4, 1.8.5, 1.8.8 and self-contained private support libraries

Deleted:
  stable/10/contrib/apr-util/test/testssl.c
Modified:
  stable/10/contrib/apr-util/CHANGES
  stable/10/contrib/apr-util/apr-util.spec
  stable/10/contrib/apr-util/configure
  stable/10/contrib/apr-util/crypto/apr_crypto.c
  stable/10/contrib/apr-util/dbd/apr_dbd.c
  stable/10/contrib/apr-util/dbd/apr_dbd_odbc.c
  stable/10/contrib/apr-util/dbm/apr_dbm.c
  stable/10/contrib/apr-util/include/apr_buckets.h
  stable/10/contrib/apr-util/include/apr_dbd.h
  stable/10/contrib/apr-util/include/apr_hooks.h
  stable/10/contrib/apr-util/include/apr_optional_hooks.h
  stable/10/contrib/apr-util/include/apr_queue.h
  stable/10/contrib/apr-util/include/apr_reslist.h
  stable/10/contrib/apr-util/include/apu.hw
  stable/10/contrib/apr-util/include/apu_version.h
  stable/10/contrib/apr-util/libaprutil.rc
  stable/10/contrib/apr-util/memcache/apr_memcache.c
  stable/10/contrib/apr-util/misc/apu_dso.c
  stable/10/contrib/apr-util/test/abts.c
  stable/10/contrib/apr-util/test/testpass.c
  stable/10/contrib/subversion/CHANGES
  stable/10/contrib/subversion/INSTALL
  stable/10/contrib/subversion/Makefile.in
  stable/10/contrib/subversion/NOTICE
  stable/10/contrib/subversion/build-outputs.mk
  stable/10/contrib/subversion/build.conf
  stable/10/contrib/subversion/configure
  stable/10/contrib/subversion/configure.ac
  stable/10/contrib/subversion/subversion/include/private/svn_auth_private.h
  stable/10/contrib/subversion/subversion/include/private/svn_client_private.h
  stable/10/contrib/subversion/subversion/include/private/svn_diff_tree.h
  stable/10/contrib/subversion/subversion/include/private/svn_mutex.h
  stable/10/contrib/subversion/subversion/include/private/svn_subr_private.h
  stable/10/contrib/subversion/subversion/include/svn_auth.h
  stable/10/contrib/subversion/subversion/include/svn_client.h
  stable/10/contrib/subversion/subversion/include/svn_config.h
  stable/10/contrib/subversion/subversion/include/svn_diff.h
  stable/10/contrib/subversion/subversion/include/svn_dirent_uri.h
  stable/10/contrib/subversion/subversion/include/svn_io.h
  stable/10/contrib/subversion/subversion/include/svn_repos.h
  stable/10/contrib/subversion/subversion/include/svn_types.h
  stable/10/contrib/subversion/subversion/include/svn_version.h
  stable/10/contrib/subversion/subversion/include/svn_wc.h
  stable/10/contrib/subversion/subversion/libsvn_client/commit.c
  stable/10/contrib/subversion/subversion/libsvn_client/copy.c
  stable/10/contrib/subversion/subversion/libsvn_client/externals.c
  stable/10/contrib/subversion/subversion/libsvn_client/log.c
  stable/10/contrib/subversion/subversion/libsvn_client/merge.c
  stable/10/contrib/subversion/subversion/libsvn_client/mergeinfo.c
  stable/10/contrib/subversion/subversion/libsvn_client/prop_commands.c
  stable/10/contrib/subversion/subversion/libsvn_client/update.c
  stable/10/contrib/subversion/subversion/libsvn_client/util.c
  stable/10/contrib/subversion/subversion/libsvn_diff/diff_file.c
  stable/10/contrib/subversion/subversion/libsvn_fs/fs-loader.c
  stable/10/contrib/subversion/subversion/libsvn_fs_base/fs.c
  stable/10/contrib/subversion/subversion/libsvn_fs_fs/fs.c
  stable/10/contrib/subversion/subversion/libsvn_fs_fs/fs_fs.c
  stable/10/contrib/subversion/subversion/libsvn_fs_fs/rep-cache-db.h
  stable/10/contrib/subversion/subversion/libsvn_fs_fs/rep-cache.c
  stable/10/contrib/subversion/subversion/libsvn_ra/ra_loader.c
  stable/10/contrib/subversion/subversion/libsvn_ra/ra_loader.h
  stable/10/contrib/subversion/subversion/libsvn_ra_local/ra_plugin.c
  stable/10/contrib/subversion/subversion/libsvn_ra_local/split_url.c
  stable/10/contrib/subversion/subversion/libsvn_ra_serf/commit.c
  stable/10/contrib/subversion/subversion/libsvn_ra_serf/ra_serf.h
  stable/10/contrib/subversion/subversion/libsvn_ra_serf/replay.c
  stable/10/contrib/subversion/subversion/libsvn_ra_serf/serf.c
  stable/10/contrib/subversion/subversion/libsvn_ra_serf/util.c
  stable/10/contrib/subversion/subversion/libsvn_ra_svn/client.c
  stable/10/contrib/subversion/subversion/libsvn_repos/commit.c
  stable/10/contrib/subversion/subversion/libsvn_repos/reporter.c
  stable/10/contrib/subversion/subversion/libsvn_subr/auth.c
  stable/10/contrib/subversion/subversion/libsvn_subr/cache-membuffer.c
  stable/10/contrib/subversion/subversion/libsvn_subr/cache_config.c
  stable/10/contrib/subversion/subversion/libsvn_subr/cmdline.c
  stable/10/contrib/subversion/subversion/libsvn_subr/config_auth.c
  stable/10/contrib/subversion/subversion/libsvn_subr/deprecated.c
  stable/10/contrib/subversion/subversion/libsvn_subr/dirent_uri.c
  stable/10/contrib/subversion/subversion/libsvn_subr/internal_statements.h
  stable/10/contrib/subversion/subversion/libsvn_subr/io.c
  stable/10/contrib/subversion/subversion/libsvn_subr/sqlite.c
  stable/10/contrib/subversion/subversion/libsvn_subr/sqlite3wrapper.c
  stable/10/contrib/subversion/subversion/libsvn_subr/subst.c
  stable/10/contrib/subversion/subversion/libsvn_subr/sysinfo.c
  stable/10/contrib/subversion/subversion/libsvn_subr/utf.c
  stable/10/contrib/subversion/subversion/libsvn_subr/version.c
  stable/10/contrib/subversion/subversion/libsvn_subr/win32_crashrpt.c
  stable/10/contrib/subversion/subversion/libsvn_subr/win32_crypto.c
  stable/10/contrib/subversion/subversion/libsvn_wc/conflicts.h
  stable/10/contrib/subversion/subversion/libsvn_wc/diff.h
  stable/10/contrib/subversion/subversion/libsvn_wc/diff_editor.c
  stable/10/contrib/subversion/subversion/libsvn_wc/diff_local.c
  stable/10/contrib/subversion/subversion/libsvn_wc/info.c
  stable/10/contrib/subversion/subversion/libsvn_wc/old-and-busted.c
  stable/10/contrib/subversion/subversion/libsvn_wc/update_editor.c
  stable/10/contrib/subversion/subversion/libsvn_wc/upgrade.c
  stable/10/contrib/subversion/subversion/libsvn_wc/wc-checks.h
  stable/10/contrib/subversion/subversion/libsvn_wc/wc-metadata.h
  stable/10/contrib/subversion/subversion/libsvn_wc/wc-metadata.sql
  stable/10/contrib/subversion/subversion/libsvn_wc/wc-queries.h
  stable/10/contrib/subversion/subversion/libsvn_wc/wc-queries.sql
  stable/10/contrib/subversion/subversion/libsvn_wc/wc.h
  stable/10/contrib/subversion/subversion/libsvn_wc/wc_db.c
  stable/10/contrib/subversion/subversion/libsvn_wc/wc_db.h
  stable/10/contrib/subversion/subversion/libsvn_wc/wc_db_private.h
  stable/10/contrib/subversion/subversion/libsvn_wc/wc_db_update_move.c
  stable/10/contrib/subversion/subversion/libsvn_wc/wc_db_util.c
  stable/10/contrib/subversion/subversion/svn/cl.h
  stable/10/contrib/subversion/subversion/svn/conflict-callbacks.c
  stable/10/contrib/subversion/subversion/svn/status-cmd.c
  stable/10/contrib/subversion/subversion/svn/status.c
  stable/10/contrib/subversion/subversion/svn/svn.c
  stable/10/contrib/subversion/subversion/svnadmin/svnadmin.c
  stable/10/contrib/subversion/subversion/svndumpfilter/svndumpfilter.c
  stable/10/contrib/subversion/subversion/svnlook/svnlook.c
  stable/10/contrib/subversion/subversion/svnmucc/svnmucc.c
  stable/10/contrib/subversion/subversion/svnserve/svnserve.c
  stable/10/contrib/subversion/subversion/svnsync/svnsync.c
  stable/10/contrib/subversion/subversion/svnversion/svnversion.c
  stable/10/usr.bin/svn/lib/libapr_util/apu_config.h
  stable/10/usr.bin/svn/svn/Makefile
  stable/10/usr.bin/svn/svn_private_config.h
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/contrib/apr-util/CHANGES
==============================================================================
--- stable/10/contrib/apr-util/CHANGES	Thu Feb 20 20:14:43 2014	(r262252)
+++ stable/10/contrib/apr-util/CHANGES	Thu Feb 20 20:34:01 2014	(r262253)
@@ -1,4 +1,23 @@
                                                      -*- coding: utf-8 -*-
+Changes with APR-util 1.5.3
+
+  *) Cygwin: Use correct file extension when loading APR DSOs.  PR 55587.
+     [Carlo Bramini <carlo.bramix libero.it>]
+
+  *) Add experimental cmake-based build system for Windows.  Refer to
+     README.cmake for more information.  [Jeff Trawick, Tom Donovan]
+
+  *) Fix warnings in odbc driver on 64bit systems.
+     PR 55197  [Tom Donovan]
+
+  *) Add support to apr_memcache for unix domain sockets. PR 54573 [Remi
+     Gacogne <rgacogne+asf aquaray.com>]
+
+  *) Add support for Berkeley DB 6.0. [Rainer Jung]
+
+  *) Improve platform detection for bundled expat by updating
+     config.guess and config.sub. [Rainer Jung]
+
 Changes with APR-util 1.5.2
 
   *) Windows: Add command line makefiles. [Gregg Smith]

Modified: stable/10/contrib/apr-util/apr-util.spec
==============================================================================
--- stable/10/contrib/apr-util/apr-util.spec	Thu Feb 20 20:14:43 2014	(r262252)
+++ stable/10/contrib/apr-util/apr-util.spec	Thu Feb 20 20:34:01 2014	(r262253)
@@ -3,7 +3,7 @@
 
 Summary: Apache Portable Runtime Utility library
 Name: apr-util
-Version: 1.5.2
+Version: 1.5.3
 Release: 1
 License: Apache Software License
 Group: System Environment/Libraries

Modified: stable/10/contrib/apr-util/configure
==============================================================================
--- stable/10/contrib/apr-util/configure	Thu Feb 20 20:14:43 2014	(r262252)
+++ stable/10/contrib/apr-util/configure	Thu Feb 20 20:34:01 2014	(r262253)
@@ -1440,7 +1440,7 @@ Optional Packages:
   --with-ldap-lib=path    path to ldap lib file
   --with-ldap=library     ldap library to use
   --with-dbm=DBM          choose the DBM type to use.
-                          DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db4X,db5X}
+                          DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db4X,db5X,db6X}
                           for some X=0,...,9
   --with-gdbm=DIR         enable GDBM support
   --with-ndbm=PATH        Find the NDBM header and library in `PATH/include'
@@ -11218,8 +11218,10 @@ fi
 
       fi
 
-      test ${apu_has_ldap} != "1" && as_fn_error $? "could not find an LDAP library" "$LINENO" 5
-      test ${apu_has_ldap} == "1" &&
+      if test ${apu_has_ldap} != "1"; then
+        as_fn_error $? "could not find an LDAP library" "$LINENO" 5
+      else
+
   if test "x$LDADD_ldap" = "x"; then
     test "x$silent" != "xyes" && echo "  setting LDADD_ldap to \"$LDADD_ldap_found\""
     LDADD_ldap="$LDADD_ldap_found"
@@ -11240,6 +11242,7 @@ fi
     done
   fi
 
+      fi
       as_ac_Lib=`$as_echo "ac_cv_lib_$apu_liblber_name''_ber_init" | $as_tr_sh`
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ber_init in -l$apu_liblber_name" >&5
 $as_echo_n "checking for ber_init in -l$apu_liblber_name... " >&6; }
@@ -11617,6 +11620,7 @@ fi
     dbm_list="$dbm_list, db$db_version"
     db_version=`expr $db_version + 1`
   done
+  dbm_list="$dbm_list, db60"
 
 
 # Check whether --with-dbm was given.
@@ -15708,7 +15712,7 @@ fi
       as_fn_error $? "Berkeley db3 not found" "$LINENO" 5
     fi
     ;;
-  db[45][0-9])
+  db[456][0-9])
     db_major=`echo "$requested" | sed -e 's/db//' -e 's/.$//'`
     db_minor=`echo "$requested" | sed -e 's/db//' -e 's/.//'`
 
@@ -16113,7 +16117,7 @@ fi
       as_fn_error $? "Berkeley db$db_major not found" "$LINENO" 5
     fi
     ;;
-  db[45])
+  db[456])
     db_major=`echo "$requested" | sed -e 's/db//'`
     # Start version search at version x.9
     db_minor=9
@@ -18561,11 +18565,11 @@ fi
       eval "apu_use_$requested=1"
       apu_default_dbm=$requested
       ;;
-    db185 | db[12345])
+    db185 | db[123456])
       apu_use_db=1
       apu_default_dbm=$requested
       ;;
-    db[45][0-9])
+    db[456][0-9])
       apu_use_db=1
       apu_default_dbm=`echo $requested | sed -e 's/.$//'`
       ;;

Modified: stable/10/contrib/apr-util/crypto/apr_crypto.c
==============================================================================
--- stable/10/contrib/apr-util/crypto/apr_crypto.c	Thu Feb 20 20:14:43 2014	(r262252)
+++ stable/10/contrib/apr-util/crypto/apr_crypto.c	Thu Feb 20 20:34:01 2014	(r262253)
@@ -100,7 +100,9 @@ APU_DECLARE(apr_status_t) apr_crypto_ini
     }
 
     /* Top level pool scope, need process-scope lifetime */
-    for (parent = pool; parent; parent = apr_pool_parent_get(pool))
+    for (parent = apr_pool_parent_get(pool);
+         parent && parent != pool;
+         parent = apr_pool_parent_get(pool))
         pool = parent;
 #if APU_DSO_BUILD
     /* deprecate in 2.0 - permit implicit initialization */
@@ -176,7 +178,7 @@ APU_DECLARE(apr_status_t) apr_crypto_get
 
 #if defined(NETWARE)
     apr_snprintf(modname, sizeof(modname), "crypto%s.nlm", name);
-#elif defined(WIN32)
+#elif defined(WIN32) || defined(__CYGWIN__)
     apr_snprintf(modname, sizeof(modname),
             "apr_crypto_%s-" APU_STRINGIFY(APU_MAJOR_VERSION) ".dll", name);
 #else

Modified: stable/10/contrib/apr-util/dbd/apr_dbd.c
==============================================================================
--- stable/10/contrib/apr-util/dbd/apr_dbd.c	Thu Feb 20 20:14:43 2014	(r262252)
+++ stable/10/contrib/apr-util/dbd/apr_dbd.c	Thu Feb 20 20:34:01 2014	(r262253)
@@ -102,8 +102,10 @@ APU_DECLARE(apr_status_t) apr_dbd_init(a
     }
 
     /* Top level pool scope, need process-scope lifetime */
-    for (parent = pool;  parent; parent = apr_pool_parent_get(pool))
-         pool = parent;
+    for (parent = apr_pool_parent_get(pool);
+        parent && parent != pool;
+        parent = apr_pool_parent_get(pool))
+       pool = parent;
 #if APU_DSO_BUILD
     /* deprecate in 2.0 - permit implicit initialization */
     apu_dso_init(pool);
@@ -184,7 +186,7 @@ APU_DECLARE(apr_status_t) apr_dbd_get_dr
 
 #if defined(NETWARE)
     apr_snprintf(modname, sizeof(modname), "dbd%s.nlm", name);
-#elif defined(WIN32)
+#elif defined(WIN32) || defined(__CYGWIN__)
     apr_snprintf(modname, sizeof(modname),
                  "apr_dbd_%s-" APU_STRINGIFY(APU_MAJOR_VERSION) ".dll", name);
 #else
@@ -204,7 +206,7 @@ APU_DECLARE(apr_status_t) apr_dbd_get_dr
     }
     apu_dso_mutex_unlock();
 
-#else /* not builtin and !APR_HAS_DSO => not implemented */
+#else /* not builtin and !APU_DSO_BUILD => not implemented */
     rv = APR_ENOTIMPL;
 #endif
 

Modified: stable/10/contrib/apr-util/dbd/apr_dbd_odbc.c
==============================================================================
--- stable/10/contrib/apr-util/dbd/apr_dbd_odbc.c	Thu Feb 20 20:14:43 2014	(r262252)
+++ stable/10/contrib/apr-util/dbd/apr_dbd_odbc.c	Thu Feb 20 20:34:01 2014	(r262253)
@@ -114,9 +114,9 @@ struct apr_dbd_t
     char lastError[MAX_ERROR_STRING];
     int defaultBufferSize;      /* used for CLOBs in text mode, 
                                  * and when fld size is indeterminate */
-    int transaction_mode;
-    int dboptions;              /* driver options re SQLGetData */
-    int default_transaction_mode;
+    intptr_t transaction_mode;
+    intptr_t dboptions;         /* driver options re SQLGetData */
+    intptr_t default_transaction_mode;
     int can_commit;             /* controls end_trans behavior */
 };
 
@@ -359,7 +359,7 @@ static SQLRETURN odbc_set_result_column(
                                         SQLHANDLE stmt)
 {
     SQLRETURN rc;
-    int maxsize, textsize, realsize, type, isunsigned = 1;
+    intptr_t maxsize, textsize, realsize, type, isunsigned = 1;
 
     /* discover the sql type */
     rc = SQLColAttribute(stmt, icol + 1, SQL_DESC_UNSIGNED, NULL, 0, NULL,
@@ -409,7 +409,7 @@ static SQLRETURN odbc_set_result_column(
       type = SQL_C_CHAR;
     }
 
-    res->coltypes[icol] = type;
+    res->coltypes[icol] = (SQLSMALLINT)type;
 
     /* size if retrieved as text */
     rc = SQLColAttribute(stmt, icol + 1, SQL_DESC_DISPLAY_SIZE, NULL, 0,
@@ -441,12 +441,12 @@ static SQLRETURN odbc_set_result_column(
 
         res->colptrs[icol] =  NULL;
         res->colstate[icol] = COL_AVAIL;
-        res->colsizes[icol] = maxsize;
+        res->colsizes[icol] = (SQLINTEGER)maxsize;
         rc = SQL_SUCCESS;
     }
     else {
         res->colptrs[icol] = apr_pcalloc(res->pool, maxsize);
-        res->colsizes[icol] = maxsize;
+        res->colsizes[icol] = (SQLINTEGER)maxsize;
         if (res->apr_dbd->dboptions & SQL_GD_BOUND) {
             /* we are allowed to call SQLGetData if we need to */
             rc = SQLBindCol(stmt, icol + 1, res->coltypes[icol], 
@@ -747,7 +747,7 @@ static void *odbc_get(const apr_dbd_row_
     SQLRETURN rc;
     SQLLEN indicator;
     int state = row->res->colstate[col];
-    int options = row->res->apr_dbd->dboptions;
+    intptr_t options = row->res->apr_dbd->dboptions;
 
     switch (state) {
     case (COL_UNAVAIL):
@@ -817,13 +817,13 @@ static apr_status_t odbc_parse_params(ap
                                int *connect, SQLCHAR **datasource, 
                                SQLCHAR **user, SQLCHAR **password, 
                                int *defaultBufferSize, int *nattrs,
-                               int **attrs, int **attrvals)
+                               int **attrs, intptr_t **attrvals)
 {
     char *seps, *last, *next, *name[MAX_PARAMS], *val[MAX_PARAMS];
     int nparams = 0, i, j;
 
     *attrs = apr_pcalloc(pool, MAX_PARAMS * sizeof(char *));
-    *attrvals = apr_pcalloc(pool, MAX_PARAMS * sizeof(int));
+    *attrvals = apr_pcalloc(pool, MAX_PARAMS * sizeof(intptr_t));
     *nattrs = 0;
     seps = DEFAULTSEPS;
     name[nparams] = apr_strtok(apr_pstrdup(pool, params), seps, &last);
@@ -1062,7 +1062,8 @@ static apr_dbd_t *odbc_open(apr_pool_t *
     SQLHANDLE err_h = NULL;
     SQLCHAR  *datasource = (SQLCHAR *)"", *user = (SQLCHAR *)"",
              *password = (SQLCHAR *)"";
-    int nattrs = 0, *attrs = NULL, *attrvals = NULL, connect = 0;
+    int nattrs = 0, *attrs = NULL,  connect = 0;
+    intptr_t *attrvals = NULL;
 
     err_step = "SQLAllocHandle (SQL_HANDLE_DBC)";
     err_htype = SQL_HANDLE_ENV;
@@ -1116,10 +1117,10 @@ static apr_dbd_t *odbc_open(apr_pool_t *
         handle->default_transaction_mode = 0;
         handle->can_commit = APR_DBD_TRANSACTION_IGNORE_ERRORS;
         SQLGetInfo(hdbc, SQL_DEFAULT_TXN_ISOLATION,
-                   &(handle->default_transaction_mode), sizeof(int), NULL);
+                   &(handle->default_transaction_mode), sizeof(intptr_t), NULL);
         handle->transaction_mode = handle->default_transaction_mode;
         SQLGetInfo(hdbc, SQL_GETDATA_EXTENSIONS ,&(handle->dboptions),
-                   sizeof(int), NULL);
+                   sizeof(intptr_t), NULL);
         apr_pool_cleanup_register(pool, handle, odbc_close_cleanup, apr_pool_cleanup_null);
         return handle;
     }

Modified: stable/10/contrib/apr-util/dbm/apr_dbm.c
==============================================================================
--- stable/10/contrib/apr-util/dbm/apr_dbm.c	Thu Feb 20 20:14:43 2014	(r262252)
+++ stable/10/contrib/apr-util/dbm/apr_dbm.c	Thu Feb 20 20:34:01 2014	(r262253)
@@ -129,8 +129,10 @@ static apr_status_t dbm_open_type(apr_db
         apr_pool_t *parent;
 
         /* Top level pool scope, need process-scope lifetime */
-        for (parent = pool;  parent; parent = apr_pool_parent_get(pool))
-             pool = parent;
+        for (parent = apr_pool_parent_get(pool);
+             parent && parent != pool;
+             parent = apr_pool_parent_get(pool))
+            pool = parent;
 
         /* deprecate in 2.0 - permit implicit initialization */
         apu_dso_init(pool);
@@ -162,7 +164,7 @@ static apr_status_t dbm_open_type(apr_db
 
 #if defined(NETWARE)
     apr_snprintf(modname, sizeof(modname), "dbm%s.nlm", type);
-#elif defined(WIN32)
+#elif defined(WIN32) || defined (__CYGWIN__)
     apr_snprintf(modname, sizeof(modname),
                  "apr_dbm_%s-" APU_STRINGIFY(APU_MAJOR_VERSION) ".dll", type);
 #else

Modified: stable/10/contrib/apr-util/include/apr_buckets.h
==============================================================================
--- stable/10/contrib/apr-util/include/apr_buckets.h	Thu Feb 20 20:14:43 2014	(r262252)
+++ stable/10/contrib/apr-util/include/apr_buckets.h	Thu Feb 20 20:34:01 2014	(r262253)
@@ -351,9 +351,9 @@ typedef apr_status_t (*apr_brigade_flush
 #define APR_BRIGADE_LAST(b)	APR_RING_LAST(&(b)->list)
 
 /**
- * Insert a list of buckets at the front of a brigade
+ * Insert a single bucket at the front of a brigade
  * @param b The brigade to add to
- * @param e The first bucket in a list of buckets to insert
+ * @param e The bucket to insert
  */
 #define APR_BRIGADE_INSERT_HEAD(b, e) do {				\
 	apr_bucket *ap__b = (e);                                        \
@@ -362,9 +362,9 @@ typedef apr_status_t (*apr_brigade_flush
     } while (0)
 
 /**
- * Insert a list of buckets at the end of a brigade
+ * Insert a single bucket at the end of a brigade
  * @param b The brigade to add to
- * @param e The first bucket in a list of buckets to insert
+ * @param e The bucket to insert
  */
 #define APR_BRIGADE_INSERT_TAIL(b, e) do {				\
 	apr_bucket *ap__b = (e);					\
@@ -393,9 +393,9 @@ typedef apr_status_t (*apr_brigade_flush
     } while (0)
 
 /**
- * Insert a list of buckets before a specified bucket
+ * Insert a single bucket before a specified bucket
  * @param a The bucket to insert before
- * @param b The buckets to insert
+ * @param b The bucket to insert
  */
 #define APR_BUCKET_INSERT_BEFORE(a, b) do {				\
 	apr_bucket *ap__a = (a), *ap__b = (b);				\
@@ -404,9 +404,9 @@ typedef apr_status_t (*apr_brigade_flush
     } while (0)
 
 /**
- * Insert a list of buckets after a specified bucket
+ * Insert a single bucket after a specified bucket
  * @param a The bucket to insert after
- * @param b The buckets to insert
+ * @param b The bucket to insert
  */
 #define APR_BUCKET_INSERT_AFTER(a, b) do {				\
 	apr_bucket *ap__a = (a), *ap__b = (b);				\

Modified: stable/10/contrib/apr-util/include/apr_dbd.h
==============================================================================
--- stable/10/contrib/apr-util/include/apr_dbd.h	Thu Feb 20 20:14:43 2014	(r262252)
+++ stable/10/contrib/apr-util/include/apr_dbd.h	Thu Feb 20 20:34:01 2014	(r262253)
@@ -107,10 +107,10 @@ APU_DECLARE(apr_status_t) apr_dbd_get_dr
 
 /** apr_dbd_open_ex: open a connection to a backend
  *
+ *  @param driver - driver struct.
  *  @param pool - working pool
  *  @param params - arguments to driver (implementation-dependent)
  *  @param handle - pointer to handle to return
- *  @param driver - driver struct.
  *  @param error - descriptive error.
  *  @return APR_SUCCESS for success
  *  @return APR_EGENERAL if driver exists but connection failed
@@ -147,10 +147,10 @@ APU_DECLARE(apr_status_t) apr_dbd_open_e
 
 /** apr_dbd_open: open a connection to a backend
  *
+ *  @param driver - driver struct.
  *  @param pool - working pool
  *  @param params - arguments to driver (implementation-dependent)
  *  @param handle - pointer to handle to return
- *  @param driver - driver struct.
  *  @return APR_SUCCESS for success
  *  @return APR_EGENERAL if driver exists but connection failed
  *  @see apr_dbd_open_ex
@@ -161,8 +161,8 @@ APU_DECLARE(apr_status_t) apr_dbd_open(c
 
 /** apr_dbd_close: close a connection to a backend
  *
- *  @param handle - handle to close
  *  @param driver - driver struct.
+ *  @param handle - handle to close
  *  @return APR_SUCCESS for success or error status
  */
 APU_DECLARE(apr_status_t) apr_dbd_close(const apr_dbd_driver_t *driver,

Modified: stable/10/contrib/apr-util/include/apr_hooks.h
==============================================================================
--- stable/10/contrib/apr-util/include/apr_hooks.h	Thu Feb 20 20:14:43 2014	(r262252)
+++ stable/10/contrib/apr-util/include/apr_hooks.h	Thu Feb 20 20:34:01 2014	(r262253)
@@ -313,24 +313,24 @@ APU_DECLARE_DATA extern apr_pool_t *apr_
 
 /**
  * A global variable to determine if debugging information about the
- * hooks functions should be printed
+ * hooks functions should be printed.
  */ 
 APU_DECLARE_DATA extern int apr_hook_debug_enabled;
 
 /**
- * The name of the module that is currently registering a function
+ * The name of the module that is currently registering a function.
  */ 
 APU_DECLARE_DATA extern const char *apr_hook_debug_current;
 
 /**
- * Register a hook function to be sorted
+ * Register a hook function to be sorted.
  * @param szHookName The name of the Hook the function is registered for
  * @param aHooks The array which stores all of the functions for this hook
  */
 APU_DECLARE(void) apr_hook_sort_register(const char *szHookName, 
                                         apr_array_header_t **aHooks);
 /**
- * Sort all of the registerd functions for a given hook
+ * Sort all of the registered functions for a given hook.
  */
 APU_DECLARE(void) apr_hook_sort_all(void);
 

Modified: stable/10/contrib/apr-util/include/apr_optional_hooks.h
==============================================================================
--- stable/10/contrib/apr-util/include/apr_optional_hooks.h	Thu Feb 20 20:14:43 2014	(r262252)
+++ stable/10/contrib/apr-util/include/apr_optional_hooks.h	Thu Feb 20 20:34:01 2014	(r262253)
@@ -33,11 +33,11 @@ extern "C" {
  * @{
  */
 /**
- * Function to implemnt the APR_OPTIONAL_HOOK Macro
+ * Function to implement the APR_OPTIONAL_HOOK Macro
  * @internal
  * @see APR_OPTIONAL_HOOK
  *
- * @param name The name of the hook
+ * @param szName The name of the hook
  * @param pfn A pointer to a function that will be called
  * @param aszPre a NULL-terminated array of strings that name modules whose hooks should precede this one
  * @param aszSucc a NULL-terminated array of strings that name modules whose hooks should succeed this one

Modified: stable/10/contrib/apr-util/include/apr_queue.h
==============================================================================
--- stable/10/contrib/apr-util/include/apr_queue.h	Thu Feb 20 20:14:43 2014	(r262252)
+++ stable/10/contrib/apr-util/include/apr_queue.h	Thu Feb 20 20:34:01 2014	(r262253)
@@ -22,7 +22,7 @@
  * @brief Thread Safe FIFO bounded queue
  * @note Since most implementations of the queue are backed by a condition
  * variable implementation, it isn't available on systems without threads.
- * Although condition variables are some times available without threads.
+ * Although condition variables are sometimes available without threads.
  */
 
 #include "apu.h"

Modified: stable/10/contrib/apr-util/include/apr_reslist.h
==============================================================================
--- stable/10/contrib/apr-util/include/apr_reslist.h	Thu Feb 20 20:14:43 2014	(r262252)
+++ stable/10/contrib/apr-util/include/apr_reslist.h	Thu Feb 20 20:34:01 2014	(r262253)
@@ -44,7 +44,7 @@ typedef struct apr_reslist_t apr_reslist
 /* Generic constructor called by resource list when it needs to create a
  * resource.
  * @param resource opaque resource
- * @param param flags
+ * @param params flags
  * @param pool  Pool
  */
 typedef apr_status_t (*apr_reslist_constructor)(void **resource, void *params,
@@ -53,7 +53,7 @@ typedef apr_status_t (*apr_reslist_const
 /* Generic destructor called by resource list when it needs to destroy a
  * resource.
  * @param resource opaque resource
- * @param param flags
+ * @param params flags
  * @param pool  Pool
  */
 typedef apr_status_t (*apr_reslist_destructor)(void *resource, void *params,
@@ -111,12 +111,17 @@ APU_DECLARE(apr_status_t) apr_reslist_de
  * Retrieve a resource from the list, creating a new one if necessary.
  * If we have met our maximum number of resources, we will block
  * until one becomes available.
+ * @param reslist The resource list.
+ * @param resource An address where the pointer to the resource
+ *                will be stored.
  */
 APU_DECLARE(apr_status_t) apr_reslist_acquire(apr_reslist_t *reslist,
                                               void **resource);
 
 /**
  * Return a resource back to the list of available resources.
+ * @param reslist The resource list.
+ * @param resource The resource to return to the list.
  */
 APU_DECLARE(apr_status_t) apr_reslist_release(apr_reslist_t *reslist,
                                               void *resource);
@@ -140,6 +145,8 @@ APU_DECLARE(apr_uint32_t) apr_reslist_ac
  * Invalidate a resource in the pool - e.g. a database connection
  * that returns a "lost connection" error and can't be restored.
  * Use this instead of apr_reslist_release if the resource is bad.
+ * @param reslist The resource list.
+ * @param resource The resource to invalidate.
  */
 APU_DECLARE(apr_status_t) apr_reslist_invalidate(apr_reslist_t *reslist,
                                                  void *resource);

Modified: stable/10/contrib/apr-util/include/apu.hw
==============================================================================
--- stable/10/contrib/apr-util/include/apu.hw	Thu Feb 20 20:14:43 2014	(r262252)
+++ stable/10/contrib/apr-util/include/apu.hw	Thu Feb 20 20:34:01 2014	(r262253)
@@ -42,6 +42,12 @@
  * conventions at compile time.
  */
 
+/* Make sure we have our platform identifier macro defined we ask for later.
+ */
+#if defined(_WIN32) && !defined(WIN32)
+#define WIN32 1
+#endif
+
 #if defined(DOXYGEN) || !defined(WIN32)
 /**
  * The public APR-UTIL functions are declared with APU_DECLARE(), so they may

Modified: stable/10/contrib/apr-util/include/apu_version.h
==============================================================================
--- stable/10/contrib/apr-util/include/apu_version.h	Thu Feb 20 20:14:43 2014	(r262252)
+++ stable/10/contrib/apr-util/include/apu_version.h	Thu Feb 20 20:34:01 2014	(r262253)
@@ -38,6 +38,9 @@
  */
 
 
+#define APU_COPYRIGHT "Copyright (c) 2013 The Apache Software " \
+                      "Foundation or its licensors, as applicable."
+
 /* The numeric compile-time version constants. These constants are the
  * authoritative version numbers for APU. 
  */
@@ -59,7 +62,7 @@
  * The Patch Level never includes API changes, simply bug fixes.
  * Reset to 0 when upgrading APR_MINOR_VERSION
  */
-#define APU_PATCH_VERSION       2
+#define APU_PATCH_VERSION       3
 
 /** 
  * The symbol APU_IS_DEV_VERSION is only defined for internal,
@@ -71,7 +74,9 @@
 
 #if defined(APU_IS_DEV_VERSION) || defined(DOXYGEN)
 /** Internal: string form of the "is dev" flag */
+#ifndef APU_IS_DEV_STRING
 #define APU_IS_DEV_STRING "-dev"
+#endif
 #else
 #define APU_IS_DEV_STRING ""
 #endif

Modified: stable/10/contrib/apr-util/libaprutil.rc
==============================================================================
--- stable/10/contrib/apr-util/libaprutil.rc	Thu Feb 20 20:14:43 2014	(r262252)
+++ stable/10/contrib/apr-util/libaprutil.rc	Thu Feb 20 20:34:01 2014	(r262253)
@@ -1,8 +1,5 @@
 #include "apu_version.h"
 
-#define APU_COPYRIGHT "Copyright (c) 2011 The Apache Software " \
-                      "Foundation or its licensors, as applicable."
-
 #define APU_LICENSE \
   "Licensed to the Apache Software Foundation (ASF) under one or more " \
   "contributor license agreements.  See the NOTICE file distributed with " \

Modified: stable/10/contrib/apr-util/memcache/apr_memcache.c
==============================================================================
--- stable/10/contrib/apr-util/memcache/apr_memcache.c	Thu Feb 20 20:14:43 2014	(r262252)
+++ stable/10/contrib/apr-util/memcache/apr_memcache.c	Thu Feb 20 20:34:01 2014	(r262253)
@@ -181,7 +181,7 @@ apr_memcache_find_server_hash_default(vo
 #if APR_HAS_THREADS
             apr_thread_mutex_lock(ms->lock);
 #endif
-            /* Try the the dead server, every 5 seconds */
+            /* Try the dead server, every 5 seconds */
             if (curtime - ms->btime >  apr_time_from_sec(5)) {
                 ms->btime = curtime;
                 if (mc_version_ping(ms) == APR_SUCCESS) {
@@ -289,8 +289,13 @@ static apr_status_t conn_connect(apr_mem
 {
     apr_status_t rv = APR_SUCCESS;
     apr_sockaddr_t *sa;
+#if APR_HAVE_SOCKADDR_UN
+    apr_int32_t family = conn->ms->host[0] != '/' ? APR_INET : APR_UNIX;
+#else
+    apr_int32_t family = APR_INET;
+#endif
 
-    rv = apr_sockaddr_info_get(&sa, conn->ms->host, APR_INET, conn->ms->port, 0, conn->p);
+    rv = apr_sockaddr_info_get(&sa, conn->ms->host, family, conn->ms->port, 0, conn->p);
     if (rv != APR_SUCCESS) {
         return rv;
     }
@@ -322,6 +327,11 @@ mc_conn_construct(void **conn_, void *pa
     apr_pool_t *np;
     apr_pool_t *tp;
     apr_memcache_server_t *ms = params;
+#if APR_HAVE_SOCKADDR_UN
+    apr_int32_t family = ms->host[0] != '/' ? APR_INET : APR_UNIX;
+#else
+    apr_int32_t family = APR_INET;
+#endif
 
     rv = apr_pool_create(&np, pool);
     if (rv != APR_SUCCESS) {
@@ -339,7 +349,7 @@ mc_conn_construct(void **conn_, void *pa
     conn->p = np;
     conn->tp = tp;
 
-    rv = apr_socket_create(&conn->sock, APR_INET, SOCK_STREAM, 0, np);
+    rv = apr_socket_create(&conn->sock, family, SOCK_STREAM, 0, np);
 
     if (rv != APR_SUCCESS) {
         apr_pool_destroy(np);

Modified: stable/10/contrib/apr-util/misc/apu_dso.c
==============================================================================
--- stable/10/contrib/apr-util/misc/apu_dso.c	Thu Feb 20 20:14:43 2014	(r262252)
+++ stable/10/contrib/apr-util/misc/apu_dso.c	Thu Feb 20 20:34:01 2014	(r262253)
@@ -75,7 +75,6 @@ static apr_status_t apu_dso_term(void *p
 apr_status_t apu_dso_init(apr_pool_t *pool)
 {
     apr_status_t ret = APR_SUCCESS;
-    apr_pool_t *global;
     apr_pool_t *parent;
 
     if (apr_atomic_inc32(&initialised)) {
@@ -88,17 +87,19 @@ apr_status_t apu_dso_init(apr_pool_t *po
     }
 
     /* Top level pool scope, need process-scope lifetime */
-    for (parent = global = pool; parent; parent = apr_pool_parent_get(global))
-        global = parent;
+    for (parent = apr_pool_parent_get(pool);
+         parent && parent != pool;
+         parent = apr_pool_parent_get(pool))
+        pool = parent;
 
-    dsos = apr_hash_make(global);
+    dsos = apr_hash_make(pool);
 
 #if APR_HAS_THREADS
-    ret = apr_thread_mutex_create(&mutex, APR_THREAD_MUTEX_DEFAULT, global);
+    ret = apr_thread_mutex_create(&mutex, APR_THREAD_MUTEX_DEFAULT, pool);
     /* This already registers a pool cleanup */
 #endif
 
-    apr_pool_cleanup_register(global, NULL, apu_dso_term,
+    apr_pool_cleanup_register(pool, NULL, apu_dso_term,
                               apr_pool_cleanup_null);
 
     apr_atomic_dec32(&in_init);

Modified: stable/10/contrib/apr-util/test/abts.c
==============================================================================
--- stable/10/contrib/apr-util/test/abts.c	Thu Feb 20 20:14:43 2014	(r262252)
+++ stable/10/contrib/apr-util/test/abts.c	Thu Feb 20 20:34:01 2014	(r262253)
@@ -106,6 +106,9 @@ abts_suite *abts_add_suite(abts_suite *s
     /* suite_name_full may be an absolute path depending on __FILE__ 
      * expansion */
     suite_name = strrchr(suite_name_full, '/');
+    if (!suite_name) {
+        suite_name = strrchr(suite_name_full, '\\');
+    }
     if (suite_name) {
         suite_name++;
     } else {
@@ -247,7 +250,8 @@ void abts_int_nequal(abts_case *tc, cons
 
     tc->failed = TRUE;
     if (verbose) {
-        fprintf(stderr, "Line %d: expected <%d>, but saw <%d>\n", lineno, expected, actual);
+        fprintf(stderr, "Line %d: expected something other than <%d>, but saw <%d>\n",
+                lineno, expected, actual);
         fflush(stderr);
     }
 }
@@ -279,7 +283,8 @@ void abts_str_nequal(abts_case *tc, cons
 
     tc->failed = TRUE;
     if (verbose) {
-        fprintf(stderr, "Line %d: expected <%s>, but saw <%s>\n", lineno, expected, actual);
+        fprintf(stderr, "Line %d: expected something other than <%s>, but saw <%s>\n",
+                lineno, expected, actual);
         fflush(stderr);
     }
 }

Modified: stable/10/contrib/apr-util/test/testpass.c
==============================================================================
--- stable/10/contrib/apr-util/test/testpass.c	Thu Feb 20 20:14:43 2014	(r262252)
+++ stable/10/contrib/apr-util/test/testpass.c	Thu Feb 20 20:34:01 2014	(r262253)
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-#include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
 

Modified: stable/10/contrib/subversion/CHANGES
==============================================================================
--- stable/10/contrib/subversion/CHANGES	Thu Feb 20 20:14:43 2014	(r262252)
+++ stable/10/contrib/subversion/CHANGES	Thu Feb 20 20:34:01 2014	(r262253)
@@ -1,3 +1,195 @@
+Version 1.8.8
+(19 Feb 2014, from /branches/1.8.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.8.8
+
+ User-visible changes:
+  - Client-side bugfixes:
+    * use CryptoAPI to validate intermediary certificates on Windows (r1564623)
+    * fix automatic relocate for wcs not at repository root (r1541638 et al)
+    * diff: fix when target is a drive root on Windows (r1541635)
+    * wc: improve performance when used with SQLite 3.8 (r1542765)
+    * copy: fix some scenarios that broke the working copy (r1560690)
+    * move: fix errors when moving files between an external and the parent
+      working copy (r1551524, r1551579)
+    * log: resolve performance regression in certain scenarios (r1553101 et al)
+    * merge: decrease work to detect differences between 3 files (r1548486)
+    * checkout: don't require flush support for symlinks on Windows (r1547774)
+    * commit: don't change file permissions inappropriately (issue #4440)
+    * commit: fix assertion due to invalid pool lifetime (r1553376 et al)
+    * version: don't cut off the distribution version on Linux (r1544878 et al)
+    * flush stdout before exiting to avoid information being lost (r1499470)
+    * status: fix missing sentinel value on warning codes (r1543145)
+    * update/switch: improve some WC db queries that may return incorrect
+      results depending on how SQLite is built (r1567109)
+
+  - Server-side bugfixes:
+    * reduce memory usage during checkout and export (r1564215)
+    * fsfs: create rep-cache.db with proper permissions (issue #3437)
+    * mod_dav_svn: prevent crashes with SVNListParentPath on (CVE-2014-0032)
+    * mod_dav_svn: fix SVNAllowBulkUpdates directive merging (r1548105)
+    * mod_dav_svn: include requested property changes in reports (r1557522)
+    * svnserve: correct default cache size in help text (r1563110)
+    * svnadmin dump: reduce size of dump files with '--deltas' (r1554978)
+    * resolve integer underflow that resulted in infinite loops (r1567985)
+
+ Developer-visible changes:
+  - General:
+    * fix ocassional failure of check_tests.py 12 (r1496127 et al)
+    * fix failure with SQLite 3.8.1-3.8.3 when built with
+      SQLITE_ENABLE_STAT3/4 due to bug in SQLite (r1567286, r1567392)
+    * specify SQLite defaults that can be changed when SQLite is built
+      to avoid unexpected behavior with Subversion (r1567064)
+
+  - API changes:
+    * numerous documentation fixes
+    * svn_client_commit_item3_dup() fix pool lifetime issues (r1550803)
+    * ra_serf: properly ask multiple certificate validation providers for
+      acceptance of certificate failures (r1535532)
+    * release internal fs objects when closing commit editor (r1555499)
+    * svn_client_proplist4() don't call the callback multiple times for
+      the same path in order to deliver inherited properties (r1549858 et al)
+
+  - Bindings:
+    * javahl: make test suite run without installing on OS X (r1535115)
+    * swig: fix building out of tarball on OS X (r1555654)
+    * swig-pl: fix with --enable-sqlite-compatibility-version (r1559009)
+    * swig: fix building bindings on OS X when APR has the -no-cpp-precomp
+      flag in the apr-config --cppflags output. (r1535610)
+    * swig: fix building from tarball with an out-of-tree build (r1543187)
+
+
+Version 1.8.7
+(Not released, see changes for 1.8.8.)
+
+Version 1.8.6
+(Not released, see changes for 1.8.8.)
+
+
+Version 1.8.5
+(25 November 2013, from /branches/1.8.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.8.5
+
+ User-visible changes:
+  - Client-side bugfixes:
+    * fix externals that point at redirected locations (issues #4428, #4429)
+    * diff: fix assertion with move inside a copy (issue #4444)
+
+  - Server-side bugfixes:
+    * mod_dav_svn: Prevent crashes with some 3rd party modules (r1537360 et al)
+    * mod_dav_svn: canonicalize paths properly (r1542071)
+    * mod_authz_svn: fix crash of mod_authz_svn with invalid config (r1541432)
+    * hotcopy: fix hotcopy losing revprop files in packed repos (issue #4448)
+ 
+  - Other tool improvements and bugfixes:
+    * mod_dontdothat: Fix the uri parser (r1542069 et al)
+
+ Developer-visible changes:
+  - General:
+    * fix compilation with '--enable-optimize' with clang (r1534860)
+    * fix compilation with debug build of BDB on Windows (r1501656, r1501702)
+    * fix '--with-openssl' option when building on Windows (r1535139) 
+    * add test to fail when built against broken ZLib (r1537193 et al)
+
+  - Bindings:
+    * swig-rb: fix tests to run without installing on OS X (r1535161)
+    * ctypes-python: build with compiler selected via configure (r1536537)
+
+
+Version 1.8.4
+(29 October 2013, from /branches/1.8.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.8.4
+
+ User-visible changes:
+  - Client- and server-side bugfixes:
+    * fix assertion on urls of the form 'file://./' (r1516806)
+    * stop linking against psapi.dll on Windows (r1534102)
+    * translation updates for Swedish
+
+  - Client-side bugfixes:
+    * revert: fix problems reverting moves (issue #4436)
+    * update: fix assertion when file external access is denied (issue #4422)
+    * merge: reduce network connections for automatic merge (r1468980 et al)
+    * merge: fix path corruption during reintegration (r1523666)
+    * mergeinfo: fix crash (r1519955)
+    * ra_serf: verify the result of xml parsing (r1501199 et al)
+    * ra_serf: improve error messages during commit (r1526439)
+    * ra_local: fix error with repository in Windows drive root (r1518184)
+    * fix crash on windows when piped command is interrupted (r1522892)
+    * fix crash in the crash handler on windows (r1532023)
+    * fix assertion when upgrading old working copies (r1520529)
+
+  - Server-side bugfixes:
+    * hotcopy: cleanup unpacked revprops with '--incremental' (r1512300 et al)
+    * fix OOM on concurrent requests at threaded server start (r1527103 et al)
+    * fsfs: improve error message when unsupported fsfs format found (r1534158)
+    * fix memory problem in 3rd party FS module loader (r1519615 et al)
+
+ Developer-visible changes:
+  - General:
+    * allow compiling against serf 1.3 and later on Windows (r1517123)
+
+  - Bindings:
+    * javahl: canonicalize path for streamFileContent method (r1524869)
+
+
+Version 1.8.3
+(29 August 2013, from /branches/1.8.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.8.3
+
+ User-visible changes:
+  - Client- and server-side bugfixes:
+    * translation updates for Swedish
+    * enforce strict version equality between tools and libraries (r1502267)
+    * consistently output revisions as "r%ld" in error messags (r1499044 et al)
+
+  - Client-side bugfixes:
+    * status: always use absolute paths in XML output (issue #4398)
+    * ra_serf: 'svn log -v' fails with a 1.2.x server (issue #4044)
+    * ra_serf: fix crash when committing cp with deep deletion (issue #4400)
+    * diff: issue an error for files that can't fit in memory (r1513119 et al)
+    * svnmucc: generate proper error for mismatched URLs (r1511353)
+    * update: fix a crash when a temp file doesn't exist (r1513156)
+    * commit & update: improve sleep for timestamps performance (r1508438)
+    * diff: continue on missing or obstructing files (issue #4396)
+    * ra_serf: use runtime serf version for User-Agent (r1514315, r1514628)
+    * ra_serf: ignore case when checking certificate common names (r1514763)
+    * ra_serf: format distinguished names properly (r1514804)
+    * ra_serf: do not retry HTTP requests if we started to parse them (r1503318)
+    * ra_serf: output ssl cert verification failure reason (r1514785 et al)
+    * ra_serf: allow session reuse after SVN_ERR_CEASE_INVOCATION (r1502901)
+    * ra_serf: include library version in '--version' output (r1514295 et al)
+    * info: fix spurious error on wc root with child in conflict (r1515366)
+
+  - Server-side bugfixes:
+    * svnserve: fix creation of pid files (r1516556)
+    * svnadmin: fix output encoding in non-UTF8 environments (r1506966)
+    * svnsync: fix high memory usage when running over ra_serf (r1515249 et al)
+    * mod_dav_svn: do not map requests to filesystem (r1512432 et al)
+    * svnauthz: improve help strings (r1511272) 
+    * fsfs: fixed manifest file growth with revprop changes (r1513874)
+    * fsfs: fix packed revprops causing loss of revprops (r1513879 et al)
+  
+  - Other tool improvements and bugfixes:
+    * svnwcsub/irkerbridge: fix symlink attack via pid file (r175 from upstream)
+
+ Developer-visible changes:
+  - General:
+    * describe APR unimplemented errors as coming from APR (r1503010 et al)
+    * mod_dav_svn: update INSTALL to reflect configure defaults (r1515141)
+    * davautocheck: use the correct apxs binary by default (r1507889, r1507891)
+
+  - API changes:
+    * svn_config_walk_auth_data() config_dir arg: permit NULL (r1507382 et al)
+
+  - Bindings:
+    * swig-pl: fix SVN::Client not honoring config file settings (r150744)
+    * swig-pl & swig-py: disable unusable svn_fs_set_warning_func (r1515119)
+
+
+Version 1.8.2
+(Not released, see changes for 1.8.3.)
+ 
+ 
 Version 1.8.1
 (23 July 2013, from /branches/1.8.x)
 http://svn.apache.org/repos/asf/subversion/tags/1.8.1
@@ -54,6 +246,8 @@ http://svn.apache.org/repos/asf/subversi
     * svnadmin create: deny '--fs-type=fsfs --compatible-version=1.0' (r1494223)
     * svnadmin upgrade: fix data loss when cancelling in last stage (r1494298)
     * mod_dav_svn: fix incorrect path canonicalization (r1503528)
+            See CVE-2013-4131, and descriptive advisory at
+            http://subversion.apache.org/security/CVE-2013-4131-advisory.txt
 
   - Other tool improvements and bugfixes:
     * fsfs-stats (tool): resolve segfault when passing invalid path (r1492164)
@@ -178,7 +372,7 @@ http://svn.apache.org/repos/asf/subversi
     * decreased default http timeout for ra_serf (issue #3968)
     * prevent ra_serf from corrupting the working copy (issue #3993)
     * ra_serf transmits property changes inline to reduce requests (r1378927)
-    * allow client to avoid SSL certificate prompts (issue #2410)
+    * by default avoid SSL certificate prompts in client (issue #2410)
     * improve interactive resolution of property conflicts (r1387678 et al)
     * make ra_serf raise an error upon delta-base mismatch (issue #4235)
     * tune ra_svn transmit buffer handling (r1391788)
@@ -361,7 +555,7 @@ http://svn.apache.org/repos/asf/subversi
     * support for Serf 2 (r1147538)
     * introduction of editor v2 (via private APIs only) (r1166332 et al)
     * improve SQLite setup for compatibility with OS X 10.7. (r1181666)
-    * rework switch statement to accomodate OWC compiler limitations (r1204407)
+    * rework switch statement to accommodate OWC compiler limitations (r1204407)
     * new --enable-sqlite-compatibility-version configure option (r1201421)
     * make test suite LD_LIBRARY_PATH include just-built auth plugins (r1200474)
     * packages/ directory removed, contents were outdated and unused (r1442167)
@@ -388,7 +582,7 @@ http://svn.apache.org/repos/asf/subversi
     * configure now script auto-detects GNOME keyring (r1387230)
     * allow configure to detect BDB on Debian-based Linux distros (r1390633)
     * auto-detect serf via pkg-config (r1391662)
-    * improve queries for compatability with SQLite 3.7.16 (r1455239)
+    * improve queries for compatibility with SQLite 3.7.16 (r1455239)
     * remove support for in-tree apr, apr-util and apr-memcache (r1456924)
     * FSFS caching supports prefixes now (r1462436)
     * maintainer mode now prints symbolic error codes (r1465157)
@@ -426,6 +620,84 @@ http://svn.apache.org/repos/asf/subversi
     * fix some reference counting bugs in swig-py bindings (r1464899, r1466524)
 
 
+Version 1.7.15
+(12 Feb 2014, from /branches/1.7.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.7.15
+
+ User-visible changes:
+  - Client-side bugfixes:
+    * copy: fix some scenarios that broke the working copy (r1560690)
+    * diff: fix regressions due to fixes in 1.7.14 (issue #4460)
+
+  - Server-side bugfixes:
+    * mod_dav_svn: prevent crashes with SVNListParentPath on (CVE-2014-0032)
+    * reduce memory usage during checkout and export (r1564215)
+
+ Developer-visible changes:
+  - General:
+    * fix failure in checkout_tests.py
+    * support compiling against Cyrus sasl 2.1.25 (r1404912, r1413402)
+
+
+Version 1.7.14
+(25 Nov 2013, from /branches/1.7.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.7.14
+
+ User-visible changes:
+  - Client- and server-side bugfixes:
+    * fix assertion on urls of the form 'file://./' (r1516806)
+
+  - Client-side bugfixes:
+    * upgrade: fix an assertion when used with pre-1.3 wcs (r1530849)
+    * ra_local: fix error with repository in Windows drive root (r1518184)
+    * fix crash on windows when piped command is interrupted (r1522892)
+    * fix externals that point at redirected locations (issues #4428, #4429)
+    * diff: fix incorrect calculation of changes in some cases (issue #4283)
+    * diff: fix errors with added/deleted targets (issues #4153, #4421)
+
+  - Server-side bugfixes:
+    * mod_dav_svn: Prevent crashes with some 3rd party modules (r1537360 et al)
+    * fix OOM on concurrent requests at threaded server start (r1527103 et al)
+    * fsfs: limit commit time of files with deep change histories (r1536790)
+    * mod_dav_svn: canonicalize paths properly (r1542071)
+
+  - Other tool improvements and bugfixes:
+    * mod_dontdothat: Fix the uri parser (r1542069 et al)
+
+ Developer-visible changes:
+  - Bindings:
+    * javahl: canonicalize path for streamFileContent method (r1524869)
+
+
+Version 1.7.13
+(29 Aug 2013, from /branches/1.7.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.7.13
+
+ User-visible changes:
+  - General
+    * merge: fix bogus mergeinfo with conflicting file merges (issue #4306)
+    * diff: fix duplicated path component in '--summarize' output (issue #4408)
+    * ra_serf: ignore case when checking certificate common names (r1514763)
+
+  - Server-side bugfixes:
+    * svnserve: fix creation of pid files (r1516556)
+    * mod_dav_svn: better status codes for commit failures (r1490684)
+    * mod_dav_svn: do not map requests to filesystem (r1512432 et al)
+
+ Developer-visible changes:
+  - General:
+    * support linking against gssapi on Solaris 10 (r1515068)
+    * don't use uninitialized variable to produce an error code (r1482282)
+
+  - Bindings:
+    * swig-pl: fix SVN::Client not honoring config file settings (r150744)
+    * swig-pl & swig-py: disable unusable svn_fs_set_warning_func (r1515119)
+
+
+Version 1.7.12
+(Not released, see changes for 1.7.13.)
+ 
+ 
 Version 1.7.11
 (23 Jul 2013, from /branches/1.7.x)
 http://svn.apache.org/repos/asf/subversion/tags/1.7.11
@@ -436,9 +708,13 @@ http://svn.apache.org/repos/asf/subversi
 
   - Server-side bugfixes:
     * mod_dav_svn: fix incorrect path canonicalization (r1503528)
+            See CVE-2013-4131, and descriptive advisory at
+            http://subversion.apache.org/security/CVE-2013-4131-advisory.txt
 
   - Other tool improvements and bugfixes:
     * fix argument processing in contrib hook scripts (r1485350)
+            See CVE-2013-2088, and descriptive advisory at
+            http://subversion.apache.org/security/CVE-2013-2088-advisory.txt
 
  Developer-visible changes:
   - Bindings:
@@ -464,7 +740,11 @@ http://svn.apache.org/repos/asf/subversi
 
   - Server-side bugfixes:
     * fix FSFS repository corruption due to newline in filename (issue #4340)
+            See CVE-2013-1968, and descriptive advisory at
+            http://subversion.apache.org/security/CVE-2013-1968-advisory.txt
     * fix svnserve exiting when a client connection is aborted (r1482759)
+            See CVE-2013-2112, and descriptive advisory at
+            http://subversion.apache.org/security/CVE-2013-2112-advisory.txt
     * fix svnserve memory use after clear (issue #4365)
     * fix repository corruption on power/disk failure on Windows (r1483781)

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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402202034.s1KKY2dZ041374>