svn commit: r289166 - in stable/10: contrib/apr contrib/apr-util contrib/apr-util/crypto contrib/apr-util/dbd contrib/apr-util/dbm contrib/apr-util/include contrib/apr-util/test contrib/apr/encodin...
Peter Wemm
peter at FreeBSD.org
Mon Oct 12 04:57:40 UTC 2015
Author: peter
Date: Mon Oct 12 04:57:36 2015
New Revision: 289166
URL: https://svnweb.freebsd.org/changeset/base/289166
Log:
MFC: r269851,r272076,r274884,r282328,r285644,r286503,r286504,r286505,
r286506,r286510,r286561,r286562,r287034
Update svnlite from 1.8.10 to 1.8.14, and the support components:
serf->1.3.8, apr->1.5.2, apr-util->1.5.4, sqlite3->3.8.11.1
This includes syncing the developer templates with head.
Modified:
stable/10/contrib/apr-util/CHANGES
stable/10/contrib/apr-util/NOTICE
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/crypto/apr_passwd.c
stable/10/contrib/apr-util/dbd/apr_dbd_mysql.c
stable/10/contrib/apr-util/dbd/apr_dbd_odbc.c
stable/10/contrib/apr-util/dbm/NWGNUmakefile
stable/10/contrib/apr-util/include/apu_version.h
stable/10/contrib/apr-util/test/Makefile.win
stable/10/contrib/apr/CHANGES
stable/10/contrib/apr/CMakeLists.txt
stable/10/contrib/apr/Makefile.in
stable/10/contrib/apr/NOTICE
stable/10/contrib/apr/NWGNUmakefile
stable/10/contrib/apr/apr.dsp
stable/10/contrib/apr/apr.spec
stable/10/contrib/apr/build-outputs.mk
stable/10/contrib/apr/configure
stable/10/contrib/apr/configure.in
stable/10/contrib/apr/encoding/apr_escape.c
stable/10/contrib/apr/include/apr_skiplist.h
stable/10/contrib/apr/include/apr_version.h
stable/10/contrib/apr/libapr.dsp
stable/10/contrib/apr/locks/unix/proc_mutex.c
stable/10/contrib/apr/memory/unix/apr_pools.c
stable/10/contrib/apr/misc/unix/errorcodes.c
stable/10/contrib/apr/network_io/unix/sockaddr.c
stable/10/contrib/apr/network_io/unix/sockets.c
stable/10/contrib/apr/poll/unix/epoll.c
stable/10/contrib/apr/poll/unix/kqueue.c
stable/10/contrib/apr/poll/unix/poll.c
stable/10/contrib/apr/poll/unix/pollcb.c
stable/10/contrib/apr/poll/unix/port.c
stable/10/contrib/apr/poll/unix/z_asio.c
stable/10/contrib/apr/tables/apr_skiplist.c
stable/10/contrib/serf/CHANGES
stable/10/contrib/serf/auth/auth_spnego_sspi.c
stable/10/contrib/serf/buckets/deflate_buckets.c
stable/10/contrib/serf/buckets/ssl_buckets.c
stable/10/contrib/serf/serf.h
stable/10/contrib/sqlite3/INSTALL
stable/10/contrib/sqlite3/Makefile.am
stable/10/contrib/sqlite3/Makefile.in
stable/10/contrib/sqlite3/aclocal.m4
stable/10/contrib/sqlite3/config.guess
stable/10/contrib/sqlite3/config.sub
stable/10/contrib/sqlite3/configure
stable/10/contrib/sqlite3/configure.ac
stable/10/contrib/sqlite3/depcomp
stable/10/contrib/sqlite3/install-sh
stable/10/contrib/sqlite3/ltmain.sh
stable/10/contrib/sqlite3/missing
stable/10/contrib/sqlite3/shell.c
stable/10/contrib/sqlite3/sqlite3.1
stable/10/contrib/sqlite3/sqlite3.c
stable/10/contrib/sqlite3/sqlite3.h
stable/10/contrib/sqlite3/sqlite3ext.h
stable/10/contrib/subversion/CHANGES
stable/10/contrib/subversion/Makefile.in
stable/10/contrib/subversion/NOTICE
stable/10/contrib/subversion/autogen.sh
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/get-deps.sh
stable/10/contrib/subversion/subversion/include/private/svn_diff_private.h
stable/10/contrib/subversion/subversion/include/private/svn_mergeinfo_private.h
stable/10/contrib/subversion/subversion/include/private/svn_repos_private.h
stable/10/contrib/subversion/subversion/include/private/svn_sqlite.h
stable/10/contrib/subversion/subversion/include/svn_io.h
stable/10/contrib/subversion/subversion/include/svn_version.h
stable/10/contrib/subversion/subversion/libsvn_auth_gnome_keyring/gnome_keyring.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/patch.c
stable/10/contrib/subversion/subversion/libsvn_client/upgrade.c
stable/10/contrib/subversion/subversion/libsvn_delta/svndiff.c
stable/10/contrib/subversion/subversion/libsvn_diff/parse-diff.c
stable/10/contrib/subversion/subversion/libsvn_diff/util.c
stable/10/contrib/subversion/subversion/libsvn_fs_fs/caching.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/tree.c
stable/10/contrib/subversion/subversion/libsvn_ra_serf/commit.c
stable/10/contrib/subversion/subversion/libsvn_ra_serf/options.c
stable/10/contrib/subversion/subversion/libsvn_repos/commit.c
stable/10/contrib/subversion/subversion/libsvn_repos/load-fs-vtable.c
stable/10/contrib/subversion/subversion/libsvn_repos/rev_hunt.c
stable/10/contrib/subversion/subversion/libsvn_subr/cache-membuffer.c
stable/10/contrib/subversion/subversion/libsvn_subr/config.c
stable/10/contrib/subversion/subversion/libsvn_subr/dso.c
stable/10/contrib/subversion/subversion/libsvn_subr/error.c
stable/10/contrib/subversion/subversion/libsvn_subr/gpg_agent.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/mergeinfo.c
stable/10/contrib/subversion/subversion/libsvn_subr/sqlite3wrapper.c
stable/10/contrib/subversion/subversion/libsvn_subr/string.c
stable/10/contrib/subversion/subversion/libsvn_subr/version.c
stable/10/contrib/subversion/subversion/libsvn_wc/adm_ops.c
stable/10/contrib/subversion/subversion/libsvn_wc/cleanup.c
stable/10/contrib/subversion/subversion/libsvn_wc/conflicts.c
stable/10/contrib/subversion/subversion/libsvn_wc/copy.c
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/entries.c
stable/10/contrib/subversion/subversion/libsvn_wc/externals.c
stable/10/contrib/subversion/subversion/libsvn_wc/update_editor.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_wcroot.c
stable/10/contrib/subversion/subversion/svn/conflict-callbacks.c
stable/10/contrib/subversion/subversion/svn/list-cmd.c
stable/10/contrib/subversion/subversion/svn/svn.c
stable/10/contrib/subversion/subversion/svn/util.c
stable/10/contrib/subversion/subversion/svn_private_config.h.in
stable/10/contrib/subversion/subversion/svnadmin/svnadmin.c
stable/10/contrib/subversion/subversion/svndumpfilter/svndumpfilter.c
stable/10/contrib/subversion/subversion/svnrdump/load_editor.c
stable/10/contrib/subversion/subversion/svnserve/serve.c
stable/10/contrib/subversion/subversion/svnsync/sync.c
stable/10/contrib/subversion/win-tests.py
stable/10/usr.bin/svn/lib/libapr/apr.h
stable/10/usr.bin/svn/lib/libapr/apr_private.h
stable/10/usr.bin/svn/lib/libapr_util/apu.h
stable/10/usr.bin/svn/lib/libapr_util/apu_config.h
stable/10/usr.bin/svn/lib/libsqlite3/Makefile
stable/10/usr.bin/svn/svn_private_config.h
stable/10/usr.bin/svn/svnadmin/Makefile
stable/10/usr.bin/svn/svndumpfilter/Makefile
stable/10/usr.bin/svn/svnlook/Makefile
stable/10/usr.bin/svn/svnversion/Makefile
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/contrib/apr-util/CHANGES
==============================================================================
--- stable/10/contrib/apr-util/CHANGES Mon Oct 12 04:55:20 2015 (r289165)
+++ stable/10/contrib/apr-util/CHANGES Mon Oct 12 04:57:36 2015 (r289166)
@@ -1,4 +1,30 @@
-*- coding: utf-8 -*-
+Changes with APR-util 1.5.4
+
+ *) MySQL driver: Fix incorrect handling of bad parameter in the
+ driver support for apr_dbd_transaction_end(). PR 56330.
+ [Weiqiang Li <weiqiang_li hotmail.com>]
+
+ *) apr_crypto_get_driver(): Fix invalid storage reference on error path.
+ [Philip Martin <philip.martin wandisco.com>]
+
+ *) Fix compile failure for Android. PR 56627. [Fredrik Fornwall
+ <fredrik fornwall.net>, Jeff Trawick]
+
+ *) Fix to let ODBC driver build with MSVC6, which does not have intptr_t
+ [Tom Donovan]
+
+ *) Windows cmake build: Fix incompatiblities with Visual Studio
+ generators with all cmake versions, and the NMake Makefile generator
+ with cmake 2.8.12 and later. PR 56616 and other bugs. [Jeff Trawick,
+ Bert Huijben]
+
+ *) Fix detection of Berkeley DB 6.0. PR 55277.
+ [Lars Wendler <polynomial-c gentoo.org>]
+
+ *) Improve platform detection for bundled expat by updating
+ config.guess and config.sub. [Rainer Jung]
+
Changes with APR-util 1.5.3
*) Cygwin: Use correct file extension when loading APR DSOs. PR 55587.
Modified: stable/10/contrib/apr-util/NOTICE
==============================================================================
--- stable/10/contrib/apr-util/NOTICE Mon Oct 12 04:55:20 2015 (r289165)
+++ stable/10/contrib/apr-util/NOTICE Mon Oct 12 04:57:36 2015 (r289166)
@@ -1,7 +1,7 @@
Apache Portable Runtime Utility Library
-Copyright (c) 2011 The Apache Software Foundation.
+Copyright (c) 2000-2014 The Apache Software Foundation.
-This product includes software developed by
+This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
Portions of this software were developed at the National Center
Modified: stable/10/contrib/apr-util/apr-util.spec
==============================================================================
--- stable/10/contrib/apr-util/apr-util.spec Mon Oct 12 04:55:20 2015 (r289165)
+++ stable/10/contrib/apr-util/apr-util.spec Mon Oct 12 04:57:36 2015 (r289166)
@@ -3,7 +3,7 @@
Summary: Apache Portable Runtime Utility library
Name: apr-util
-Version: 1.5.3
+Version: 1.5.4
Release: 1
License: Apache Software License
Group: System Environment/Libraries
Modified: stable/10/contrib/apr-util/configure
==============================================================================
--- stable/10/contrib/apr-util/configure Mon Oct 12 04:55:20 2015 (r289165)
+++ stable/10/contrib/apr-util/configure Mon Oct 12 04:57:36 2015 (r289166)
@@ -11608,19 +11608,34 @@ fi
apu_db_version=0
# Maximum supported version announced in help string.
- # Although we search for all versions up to 5.9,
+ # Although we search for all versions up to 6.9,
# we should only include existing versions in our
# help string.
- db_max_version=53
- db_min_version=41
dbm_list="sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4"
+ db_max_version=48
+ db_min_version=41
+ db_version="$db_min_version"
+ while [ $db_version -le $db_max_version ]
+ do
+ dbm_list="$dbm_list, db$db_version"
+ db_version=`expr $db_version + 1`
+ done
+ db_max_version=53
+ db_min_version=50
+ db_version="$db_min_version"
+ while [ $db_version -le $db_max_version ]
+ do
+ dbm_list="$dbm_list, db$db_version"
+ db_version=`expr $db_version + 1`
+ done
+ db_max_version=60
+ db_min_version=60
db_version="$db_min_version"
while [ $db_version -le $db_max_version ]
do
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.
@@ -12093,8 +12108,8 @@ if test "${with_berkeley_db+set}" = set;
all_places="$check_places"
- # Start version search at version 5.9
- db_version=59
+ # Start version search at version 6.9
+ db_version=69
while [ $db_version -ge 40 ]
do
db_major=`echo $db_version | sed -e 's/.$//'`
@@ -12178,7 +12193,7 @@ $as_echo "" >&6; }
ac_fn_c_check_header_mongrel "$LINENO" "$bdb_header" "$as_ac_Header" "$ac_includes_default"
if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
- if test ""${db_major}"" = "3" -o ""${db_major}"" = "4" -o ""${db_major}"" = "5"; then
+ if test ""${db_major}"" = "3" -o ""${db_major}"" = "4" -o ""${db_major}"" = "5" -o ""${db_major}"" = "6"; then
# We generate a separate cache variable for each prefix and libname
# we search under. That way, we avoid caching information that
# changes if the user runs `configure' with a different set of
@@ -12580,7 +12595,7 @@ $as_echo "" >&6; }
ac_fn_c_check_header_mongrel "$LINENO" "$bdb_header" "$as_ac_Header" "$ac_includes_default"
if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
- if test "3" = "3" -o "3" = "4" -o "3" = "5"; then
+ if test "3" = "3" -o "3" = "4" -o "3" = "5" -o "3" = "6"; then
# We generate a separate cache variable for each prefix and libname
# we search under. That way, we avoid caching information that
# changes if the user runs `configure' with a different set of
@@ -12978,7 +12993,7 @@ $as_echo "" >&6; }
ac_fn_c_check_header_mongrel "$LINENO" "$bdb_header" "$as_ac_Header" "$ac_includes_default"
if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
- if test "2" = "3" -o "2" = "4" -o "2" = "5"; then
+ if test "2" = "3" -o "2" = "4" -o "2" = "5" -o "2" = "6"; then
# We generate a separate cache variable for each prefix and libname
# we search under. That way, we avoid caching information that
# changes if the user runs `configure' with a different set of
@@ -13376,7 +13391,7 @@ $as_echo "" >&6; }
ac_fn_c_check_header_mongrel "$LINENO" "$bdb_header" "$as_ac_Header" "$ac_includes_default"
if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
- if test "1" = "3" -o "1" = "4" -o "1" = "5"; then
+ if test "1" = "3" -o "1" = "4" -o "1" = "5" -o "1" = "6"; then
# We generate a separate cache variable for each prefix and libname
# we search under. That way, we avoid caching information that
# changes if the user runs `configure' with a different set of
@@ -13774,7 +13789,7 @@ $as_echo "" >&6; }
ac_fn_c_check_header_mongrel "$LINENO" "$bdb_header" "$as_ac_Header" "$ac_includes_default"
if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
- if test "1" = "3" -o "1" = "4" -o "1" = "5"; then
+ if test "1" = "3" -o "1" = "4" -o "1" = "5" -o "1" = "6"; then
# We generate a separate cache variable for each prefix and libname
# we search under. That way, we avoid caching information that
# changes if the user runs `configure' with a different set of
@@ -14186,7 +14201,7 @@ $as_echo "" >&6; }
ac_fn_c_check_header_mongrel "$LINENO" "$bdb_header" "$as_ac_Header" "$ac_includes_default"
if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
- if test "1" = "3" -o "1" = "4" -o "1" = "5"; then
+ if test "1" = "3" -o "1" = "4" -o "1" = "5" -o "1" = "6"; then
# We generate a separate cache variable for each prefix and libname
# we search under. That way, we avoid caching information that
# changes if the user runs `configure' with a different set of
@@ -14587,7 +14602,7 @@ $as_echo "" >&6; }
ac_fn_c_check_header_mongrel "$LINENO" "$bdb_header" "$as_ac_Header" "$ac_includes_default"
if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
- if test "1" = "3" -o "1" = "4" -o "1" = "5"; then
+ if test "1" = "3" -o "1" = "4" -o "1" = "5" -o "1" = "6"; then
# We generate a separate cache variable for each prefix and libname
# we search under. That way, we avoid caching information that
# changes if the user runs `configure' with a different set of
@@ -14988,7 +15003,7 @@ $as_echo "" >&6; }
ac_fn_c_check_header_mongrel "$LINENO" "$bdb_header" "$as_ac_Header" "$ac_includes_default"
if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
- if test "2" = "3" -o "2" = "4" -o "2" = "5"; then
+ if test "2" = "3" -o "2" = "4" -o "2" = "5" -o "2" = "6"; then
# We generate a separate cache variable for each prefix and libname
# we search under. That way, we avoid caching information that
# changes if the user runs `configure' with a different set of
@@ -15389,7 +15404,7 @@ $as_echo "" >&6; }
ac_fn_c_check_header_mongrel "$LINENO" "$bdb_header" "$as_ac_Header" "$ac_includes_default"
if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
- if test "3" = "3" -o "3" = "4" -o "3" = "5"; then
+ if test "3" = "3" -o "3" = "4" -o "3" = "5" -o "3" = "6"; then
# We generate a separate cache variable for each prefix and libname
# we search under. That way, we avoid caching information that
# changes if the user runs `configure' with a different set of
@@ -15794,7 +15809,7 @@ $as_echo "" >&6; }
ac_fn_c_check_header_mongrel "$LINENO" "$bdb_header" "$as_ac_Header" "$ac_includes_default"
if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
- if test ""${db_major}"" = "3" -o ""${db_major}"" = "4" -o ""${db_major}"" = "5"; then
+ if test ""${db_major}"" = "3" -o ""${db_major}"" = "4" -o ""${db_major}"" = "5" -o ""${db_major}"" = "6"; then
# We generate a separate cache variable for each prefix and libname
# we search under. That way, we avoid caching information that
# changes if the user runs `configure' with a different set of
@@ -16202,7 +16217,7 @@ $as_echo "" >&6; }
ac_fn_c_check_header_mongrel "$LINENO" "$bdb_header" "$as_ac_Header" "$ac_includes_default"
if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
- if test ""${db_major}"" = "3" -o ""${db_major}"" = "4" -o ""${db_major}"" = "5"; then
+ if test ""${db_major}"" = "3" -o ""${db_major}"" = "4" -o ""${db_major}"" = "5" -o ""${db_major}"" = "6"; then
# We generate a separate cache variable for each prefix and libname
# we search under. That way, we avoid caching information that
# changes if the user runs `configure' with a different set of
@@ -16534,8 +16549,8 @@ fi
all_places="$check_places"
- # Start version search at version 5.9
- db_version=59
+ # Start version search at version 6.9
+ db_version=69
while [ $db_version -ge 40 ]
do
db_major=`echo $db_version | sed -e 's/.$//'`
@@ -16619,7 +16634,7 @@ $as_echo "" >&6; }
ac_fn_c_check_header_mongrel "$LINENO" "$bdb_header" "$as_ac_Header" "$ac_includes_default"
if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
- if test ""${db_major}"" = "3" -o ""${db_major}"" = "4" -o ""${db_major}"" = "5"; then
+ if test ""${db_major}"" = "3" -o ""${db_major}"" = "4" -o ""${db_major}"" = "5" -o ""${db_major}"" = "6"; then
# We generate a separate cache variable for each prefix and libname
# we search under. That way, we avoid caching information that
# changes if the user runs `configure' with a different set of
@@ -17021,7 +17036,7 @@ $as_echo "" >&6; }
ac_fn_c_check_header_mongrel "$LINENO" "$bdb_header" "$as_ac_Header" "$ac_includes_default"
if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
- if test "3" = "3" -o "3" = "4" -o "3" = "5"; then
+ if test "3" = "3" -o "3" = "4" -o "3" = "5" -o "3" = "6"; then
# We generate a separate cache variable for each prefix and libname
# we search under. That way, we avoid caching information that
# changes if the user runs `configure' with a different set of
@@ -17419,7 +17434,7 @@ $as_echo "" >&6; }
ac_fn_c_check_header_mongrel "$LINENO" "$bdb_header" "$as_ac_Header" "$ac_includes_default"
if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
- if test "2" = "3" -o "2" = "4" -o "2" = "5"; then
+ if test "2" = "3" -o "2" = "4" -o "2" = "5" -o "2" = "6"; then
# We generate a separate cache variable for each prefix and libname
# we search under. That way, we avoid caching information that
# changes if the user runs `configure' with a different set of
@@ -17817,7 +17832,7 @@ $as_echo "" >&6; }
ac_fn_c_check_header_mongrel "$LINENO" "$bdb_header" "$as_ac_Header" "$ac_includes_default"
if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
- if test "1" = "3" -o "1" = "4" -o "1" = "5"; then
+ if test "1" = "3" -o "1" = "4" -o "1" = "5" -o "1" = "6"; then
# We generate a separate cache variable for each prefix and libname
# we search under. That way, we avoid caching information that
# changes if the user runs `configure' with a different set of
@@ -18215,7 +18230,7 @@ $as_echo "" >&6; }
ac_fn_c_check_header_mongrel "$LINENO" "$bdb_header" "$as_ac_Header" "$ac_includes_default"
if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
- if test "1" = "3" -o "1" = "4" -o "1" = "5"; then
+ if test "1" = "3" -o "1" = "4" -o "1" = "5" -o "1" = "6"; then
# We generate a separate cache variable for each prefix and libname
# we search under. That way, we avoid caching information that
# changes if the user runs `configure' with a different set of
Modified: stable/10/contrib/apr-util/crypto/apr_crypto.c
==============================================================================
--- stable/10/contrib/apr-util/crypto/apr_crypto.c Mon Oct 12 04:55:20 2015 (r289165)
+++ stable/10/contrib/apr-util/crypto/apr_crypto.c Mon Oct 12 04:57:36 2015 (r289166)
@@ -204,7 +204,7 @@ APU_DECLARE(apr_status_t) apr_crypto_get
if (err && buffer) {
apr_dso_error(dso, buffer, ERROR_SIZE - 1);
err->msg = buffer;
- err->reason = modname;
+ err->reason = apr_pstrdup(pool, modname);
*result = err;
}
}
Modified: stable/10/contrib/apr-util/crypto/apr_passwd.c
==============================================================================
--- stable/10/contrib/apr-util/crypto/apr_passwd.c Mon Oct 12 04:55:20 2015 (r289165)
+++ stable/10/contrib/apr-util/crypto/apr_passwd.c Mon Oct 12 04:57:36 2015 (r289166)
@@ -66,6 +66,12 @@ static void crypt_mutex_unlock(void)
#endif
#endif
+#if defined(WIN32) || defined(BEOS) || defined(NETWARE) || defined(__ANDROID__)
+#define CRYPT_MISSING 1
+#else
+#define CRYPT_MISSING 0
+#endif
+
/*
* Validate a plaintext password against a smashed one. Uses either
* crypt() (if available) or apr_md5_encode() or apr_sha1_base64(), depending
@@ -77,7 +83,7 @@ APU_DECLARE(apr_status_t) apr_password_v
const char *hash)
{
char sample[200];
-#if !defined(WIN32) && !defined(BEOS) && !defined(NETWARE)
+#if !CRYPT_MISSING
char *crypt_pw;
#endif
if (hash[0] == '$'
@@ -100,7 +106,7 @@ APU_DECLARE(apr_status_t) apr_password_v
/*
* It's not our algorithm, so feed it to crypt() if possible.
*/
-#if defined(WIN32) || defined(BEOS) || defined(NETWARE)
+#if CRYPT_MISSING
return (strcmp(passwd, hash) == 0) ? APR_SUCCESS : APR_EMISMATCH;
#elif defined(CRYPT_R_CRYPTD)
apr_status_t rv;
Modified: stable/10/contrib/apr-util/dbd/apr_dbd_mysql.c
==============================================================================
--- stable/10/contrib/apr-util/dbd/apr_dbd_mysql.c Mon Oct 12 04:55:20 2015 (r289165)
+++ stable/10/contrib/apr-util/dbd/apr_dbd_mysql.c Mon Oct 12 04:57:36 2015 (r289166)
@@ -1050,9 +1050,9 @@ static int dbd_mysql_end_transaction(apr
else {
ret = mysql_commit(trans->handle->conn);
}
+ ret |= mysql_autocommit(trans->handle->conn, 1);
+ trans->handle->trans = NULL;
}
- ret |= mysql_autocommit(trans->handle->conn, 1);
- trans->handle->trans = NULL;
return ret;
}
/* Whether or not transactions work depends on whether the
Modified: stable/10/contrib/apr-util/dbd/apr_dbd_odbc.c
==============================================================================
--- stable/10/contrib/apr-util/dbd/apr_dbd_odbc.c Mon Oct 12 04:55:20 2015 (r289165)
+++ stable/10/contrib/apr-util/dbd/apr_dbd_odbc.c Mon Oct 12 04:57:36 2015 (r289166)
@@ -47,6 +47,21 @@
#include <odbc/sqlext.h>
#endif
+/*
+* MSVC6 does not support intptr_t (C99)
+* APR does not have a signed inptr type until 2.0 (r1557720)
+*/
+#if defined(_MSC_VER) && _MSC_VER < 1400
+#if APR_SIZEOF_VOIDP == 8
+#define ODBC_INTPTR_T apr_int64_t
+#else
+#define ODBC_INTPTR_T apr_int32_t
+#endif
+#else
+#define ODBC_INTPTR_T intptr_t
+#endif
+
+
/* Driver name is "odbc" and the entry point is 'apr_dbd_odbc_driver'
* unless ODBC_DRIVER_NAME is defined and it is linked with another db library which
* is ODBC source-compatible. e.g. DB2, Informix, TimesTen, mysql.
@@ -114,9 +129,9 @@ struct apr_dbd_t
char lastError[MAX_ERROR_STRING];
int defaultBufferSize; /* used for CLOBs in text mode,
* and when fld size is indeterminate */
- intptr_t transaction_mode;
- intptr_t dboptions; /* driver options re SQLGetData */
- intptr_t default_transaction_mode;
+ ODBC_INTPTR_T transaction_mode;
+ ODBC_INTPTR_T dboptions; /* driver options re SQLGetData */
+ ODBC_INTPTR_T default_transaction_mode;
int can_commit; /* controls end_trans behavior */
};
@@ -359,7 +374,7 @@ static SQLRETURN odbc_set_result_column(
SQLHANDLE stmt)
{
SQLRETURN rc;
- intptr_t maxsize, textsize, realsize, type, isunsigned = 1;
+ ODBC_INTPTR_T maxsize, textsize, realsize, type, isunsigned = 1;
/* discover the sql type */
rc = SQLColAttribute(stmt, icol + 1, SQL_DESC_UNSIGNED, NULL, 0, NULL,
@@ -747,7 +762,7 @@ static void *odbc_get(const apr_dbd_row_
SQLRETURN rc;
SQLLEN indicator;
int state = row->res->colstate[col];
- intptr_t options = row->res->apr_dbd->dboptions;
+ ODBC_INTPTR_T options = row->res->apr_dbd->dboptions;
switch (state) {
case (COL_UNAVAIL):
@@ -817,13 +832,13 @@ static apr_status_t odbc_parse_params(ap
int *connect, SQLCHAR **datasource,
SQLCHAR **user, SQLCHAR **password,
int *defaultBufferSize, int *nattrs,
- int **attrs, intptr_t **attrvals)
+ int **attrs, ODBC_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(intptr_t));
+ *attrvals = apr_pcalloc(pool, MAX_PARAMS * sizeof(ODBC_INTPTR_T));
*nattrs = 0;
seps = DEFAULTSEPS;
name[nparams] = apr_strtok(apr_pstrdup(pool, params), seps, &last);
@@ -1063,7 +1078,7 @@ static apr_dbd_t *odbc_open(apr_pool_t *
SQLCHAR *datasource = (SQLCHAR *)"", *user = (SQLCHAR *)"",
*password = (SQLCHAR *)"";
int nattrs = 0, *attrs = NULL, connect = 0;
- intptr_t *attrvals = NULL;
+ ODBC_INTPTR_T *attrvals = NULL;
err_step = "SQLAllocHandle (SQL_HANDLE_DBC)";
err_htype = SQL_HANDLE_ENV;
@@ -1117,10 +1132,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(intptr_t), NULL);
+ &(handle->default_transaction_mode), sizeof(ODBC_INTPTR_T), NULL);
handle->transaction_mode = handle->default_transaction_mode;
SQLGetInfo(hdbc, SQL_GETDATA_EXTENSIONS ,&(handle->dboptions),
- sizeof(intptr_t), NULL);
+ sizeof(ODBC_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/NWGNUmakefile
==============================================================================
--- stable/10/contrib/apr-util/dbm/NWGNUmakefile Mon Oct 12 04:55:20 2015 (r289165)
+++ stable/10/contrib/apr-util/dbm/NWGNUmakefile Mon Oct 12 04:57:36 2015 (r289166)
@@ -235,7 +235,7 @@ nlms :: libs $(TARGET_nlm)
# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples)
#
install :: nlms $(INSTDIRS) FORCE
- copy $(OBJDIR)\*.nlm $(INSTALLBASE)
+ $(call COPY,$(OBJDIR)/*.nlm,$(INSTALLBASE))
#
# Any specialized rules here
Modified: stable/10/contrib/apr-util/include/apu_version.h
==============================================================================
--- stable/10/contrib/apr-util/include/apu_version.h Mon Oct 12 04:55:20 2015 (r289165)
+++ stable/10/contrib/apr-util/include/apu_version.h Mon Oct 12 04:57:36 2015 (r289166)
@@ -38,7 +38,7 @@
*/
-#define APU_COPYRIGHT "Copyright (c) 2013 The Apache Software " \
+#define APU_COPYRIGHT "Copyright (c) 2000-2014 The Apache Software " \
"Foundation or its licensors, as applicable."
/* The numeric compile-time version constants. These constants are the
@@ -62,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 3
+#define APU_PATCH_VERSION 4
/**
* The symbol APU_IS_DEV_VERSION is only defined for internal,
Modified: stable/10/contrib/apr-util/test/Makefile.win
==============================================================================
--- stable/10/contrib/apr-util/test/Makefile.win Mon Oct 12 04:55:20 2015 (r289165)
+++ stable/10/contrib/apr-util/test/Makefile.win Mon Oct 12 04:57:36 2015 (r289166)
@@ -88,6 +88,8 @@ APROUTDIR=$(OUTDIR)
!IF "$(MODEL)" == "static"
PROGRAM_DEPENDENCIES = \
$(APR_PATH)\$(APROUTDIR)\apr-1.lib \
+ $(API_PATH)\$(OUTDIR)\apriconv-1.lib \
+ ..\xml\expat\lib\$(OUTDIR)\xml.lib \
..\$(OUTDIR)\aprutil-1.lib
STATIC_CFLAGS = /D APR_DECLARE_STATIC /D APU_DECLARE_STATIC
STATIC_LIBS = odbc32.lib odbccp32.lib wldap32.lib
Modified: stable/10/contrib/apr/CHANGES
==============================================================================
--- stable/10/contrib/apr/CHANGES Mon Oct 12 04:55:20 2015 (r289165)
+++ stable/10/contrib/apr/CHANGES Mon Oct 12 04:57:36 2015 (r289166)
@@ -1,4 +1,63 @@
-*- coding: utf-8 -*-
+Changes for APR 1.5.2
+
+ *) 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_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]
+
+ *) Switch to generic atomics for early/unpatched Solaris 10 not exporting
+ some atomic functions. PR 55418. [Yann Ylavic]
+
+ *) apr_file_mktemp() on HP-UX: Remove limitation of 26 temporary files
+ per process. PR 57677. [Jeff Trawick]
+
+ *) 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.
+
+ *) pollcb on Windows: Handle calls with no file/socket descriptors.
+ Follow up to PR 49882. [Jeff Trawick, Yann Ylavic]
+
+ *) apr_poll(cb): fix error paths returned values and leaks. [Yann Ylavic]
+
+ *) apr_thread_cond_*wait() on BeOS: Fix broken logic. PR 45800.
+ [Jochen Voss (no e-mail)]
+
+ *) apr_skiplist: Optimize the number of allocations by reusing pooled or
+ malloc()ed nodes for the lifetime of the skiplist. [Yann Ylavic]
+
+ *) apr_skiplist: Fix possible multiple-free() on the same value in
+ apr_skiplist_remove_all(). [Yann Ylavic]
+
+ *) apr_pollset: On z/OS, threadsafe apr_pollset_poll() may return
+ "EDC8102I Operation would block" under load.
+ [Pat Odonnell <patod us.ibm.com>]
+
+ *) On z/OS, apr_sockaddr_info_get() with family == APR_UNSPEC was not
+ returning IPv4 addresses if any IPv6 addresses were returned.
+ [Eric Covener]
+
+ *) Windows cmake build: Fix an incompatibility with cmake 2.8.12 and
+ later. [Jeff Trawick]
+
+ *) apr_global_mutex/apr_proc_mutex: Resolve failures with the
+ POSIX sem implementation in environments which receive signals.
+ [Jeff Trawick]
+
+ *) apr_skiplist: Fix potential corruption of skiplists leading to
+ results or crashes. [Takashi Sato <takashi tks st>, Eric Covener]
+ PR 56654.
+
+ *) Improve platform detection by updating config.guess and config.sub.
+ [Rainer Jung]
+
Changes for APR 1.5.1
*) apr_os_proc_mutex_get() on Unix: Avoid segfault for cross-
@@ -37,8 +96,8 @@ Changes for APR 1.5.1
*) Correct a regression in 1.5.0 which affected out-of-tree
builds on Unix. [Rainer Jung]
- *) Improve platform detection for bundled expat by updating
- config.guess and config.sub. [Rainer Jung]
+ *) Improve platform detection by updating config.guess and config.sub.
+ [Rainer Jung]
Changes for APR 1.5.0
Modified: stable/10/contrib/apr/CMakeLists.txt
==============================================================================
--- stable/10/contrib/apr/CMakeLists.txt Mon Oct 12 04:55:20 2015 (r289165)
+++ stable/10/contrib/apr/CMakeLists.txt Mon Oct 12 04:57:36 2015 (r289166)
@@ -234,6 +234,7 @@ SET(APR_TEST_SOURCES
test/testprocmutex.c
test/testrand.c
test/testshm.c
+ test/testskiplist.c
test/testsleep.c
test/testsock.c
test/testsockets.c
@@ -252,7 +253,6 @@ SET(APR_TEST_SOURCES
SET(install_targets)
SET(install_bin_pdb)
-SET(install_lib_pdb)
# libapr-1 is shared, apr-1 is static
ADD_LIBRARY(libapr-1 SHARED ${APR_SOURCES} ${APR_PUBLIC_HEADERS_GENERATED} libapr.rc)
@@ -264,7 +264,6 @@ ADD_DEPENDENCIES(libapr-1 test_char_head
ADD_LIBRARY(apr-1 STATIC ${APR_SOURCES} ${APR_PUBLIC_HEADERS_GENERATED})
SET(install_targets ${install_targets} apr-1)
-SET(install_lib_pdb ${install_lib_pdb} ${PROJECT_BINARY_DIR}/apr-1.pdb)
TARGET_LINK_LIBRARIES(apr-1 ${APR_SYSTEM_LIBS})
SET_TARGET_PROPERTIES(apr-1 PROPERTIES COMPILE_DEFINITIONS "APR_DECLARE_STATIC;WINNT")
ADD_DEPENDENCIES(apr-1 test_char_header)
@@ -272,12 +271,10 @@ ADD_DEPENDENCIES(apr-1 test_char_header)
# libaprapp-1 and aprapp-1 are static
ADD_LIBRARY(libaprapp-1 STATIC misc/win32/apr_app.c misc/win32/internal.c ${APR_PUBLIC_HEADERS_GENERATED})
SET(install_targets ${install_targets} libaprapp-1)
-SET(install_lib_pdb ${install_lib_pdb} ${PROJECT_BINARY_DIR}/libaprapp-1.pdb)
SET_TARGET_PROPERTIES(libaprapp-1 PROPERTIES COMPILE_DEFINITIONS "APR_APP;WINNT")
ADD_LIBRARY(aprapp-1 STATIC misc/win32/apr_app.c misc/win32/internal.c ${APR_PUBLIC_HEADERS_GENERATED})
SET(install_targets ${install_targets} aprapp-1)
-SET(install_lib_pdb ${install_lib_pdb} ${PROJECT_BINARY_DIR}/aprapp-1.pdb)
SET_TARGET_PROPERTIES(aprapp-1 PROPERTIES COMPILE_DEFINITIONS "APR_DECLARE_STATIC;APR_APP;WINNT")
IF(APR_BUILD_TESTAPR)
@@ -394,10 +391,6 @@ IF(INSTALL_PDB)
INSTALL(FILES ${install_bin_pdb}
DESTINATION bin
CONFIGURATIONS RelWithDebInfo Debug)
-
- INSTALL(FILES ${install_lib_pdb}
- DESTINATION lib
- CONFIGURATIONS RelWithDebInfo Debug)
ENDIF()
INSTALL(FILES ${APR_PUBLIC_HEADERS_STATIC} ${APR_PUBLIC_HEADERS_GENERATED} DESTINATION include)
Modified: stable/10/contrib/apr/Makefile.in
==============================================================================
--- stable/10/contrib/apr/Makefile.in Mon Oct 12 04:55:20 2015 (r289165)
+++ stable/10/contrib/apr/Makefile.in Mon Oct 12 04:57:36 2015 (r289166)
@@ -129,11 +129,11 @@ check: $(TARGET_LIB)
etags:
etags `find . -name '*.[ch]'`
-make_tools_dir:
+OBJECTS_gen_test_char = tools/gen_test_char.lo $(LOCAL_LIBS)
+tools/gen_test_char.lo: tools/gen_test_char.c
$(APR_MKDIR) tools
+ $(LT_COMPILE)
-OBJECTS_gen_test_char = tools/gen_test_char.lo $(LOCAL_LIBS)
-tools/gen_test_char.lo: make_tools_dir
tools/gen_test_char at EXEEXT@: $(OBJECTS_gen_test_char)
$(LINK_PROG) $(OBJECTS_gen_test_char) $(ALL_LIBS)
Modified: stable/10/contrib/apr/NOTICE
==============================================================================
--- stable/10/contrib/apr/NOTICE Mon Oct 12 04:55:20 2015 (r289165)
+++ stable/10/contrib/apr/NOTICE Mon Oct 12 04:57:36 2015 (r289166)
@@ -1,5 +1,5 @@
Apache Portable Runtime
-Copyright (c) 2000-2014 The Apache Software Foundation.
+Copyright (c) 2000-2015 The Apache Software Foundation.
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
Modified: stable/10/contrib/apr/NWGNUmakefile
==============================================================================
--- stable/10/contrib/apr/NWGNUmakefile Mon Oct 12 04:55:20 2015 (r289165)
+++ stable/10/contrib/apr/NWGNUmakefile Mon Oct 12 04:57:36 2015 (r289166)
@@ -50,6 +50,7 @@ include $(APR_WORK)/build/NWGNUhead.inc
#
XINCDIRS += \
$(APR)/include \
+ $(APR)/include/private \
$(APR)/include/arch/NetWare \
$(APR)/include/arch/unix \
$(APR)/memory/unix \
@@ -293,11 +294,13 @@ FILES_nlm_exports = \
FILES_lib_objs = \
$(OBJDIR)/apr_atomic.o \
$(OBJDIR)/apr_cpystrn.o \
+ $(OBJDIR)/apr_escape.o \
$(OBJDIR)/apr_fnmatch.o \
$(OBJDIR)/apr_getpass.o \
$(OBJDIR)/apr_hash.o \
$(OBJDIR)/apr_pools.o \
$(OBJDIR)/apr_random.o \
+ $(OBJDIR)/apr_skiplist.o \
$(OBJDIR)/apr_snprintf.o \
$(OBJDIR)/apr_strings.o \
$(OBJDIR)/apr_strnatcmp.o \
@@ -407,7 +410,7 @@ endif
vpath %.c atomic/netware:strings:tables:passwd:lib:time/unix
vpath %.c file_io/unix:locks/netware:misc/netware:misc/unix:threadproc/netware
vpath %.c poll/unix:shmem/unix:support/unix:random/unix
-vpath %.c dso/netware:memory/unix:mmap/unix:user/netware
+vpath %.c dso/netware:memory/unix:mmap/unix:user/netware:encoding
# Use the win32 network_io if Winsock is being used
ifndef USE_STDSOCKETS
Modified: stable/10/contrib/apr/apr.dsp
==============================================================================
--- stable/10/contrib/apr/apr.dsp Mon Oct 12 04:55:20 2015 (r289165)
+++ stable/10/contrib/apr/apr.dsp Mon Oct 12 04:57:36 2015 (r289166)
@@ -907,69 +907,6 @@ SOURCE=.\include\apr_version.h
# Begin Source File
SOURCE=.\include\apr_want.h
-
-!IF "$(CFG)" == "apr - Win32 Release"
-
-# Begin Custom Build
-InputPath=.\include\apr_want.h
-
-".\LibR\gen_test_char.exe" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- type .\include\apr.hw > .\include\apr.h
-
-# End Custom Build
-
-!ELSEIF "$(CFG)" == "apr - Win32 Debug"
-
-# Begin Custom Build
-InputPath=.\include\apr_want.h
-
-".\LibD\gen_test_char.exe" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- type .\include\apr.hw > .\include\apr.h
-
-# End Custom Build
-
-!ELSEIF "$(CFG)" == "apr - Win32 Release9x"
-
-# Begin Custom Build
-InputPath=.\include\apr_want.h
-
-".\9x\LibR\gen_test_char.exe" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- type .\include\apr.hw > .\include\apr.h
-
-# End Custom Build
-
-!ELSEIF "$(CFG)" == "apr - Win32 Debug9x"
-
-# Begin Custom Build
-InputPath=.\include\apr_want.h
-
-".\9x\LibD\gen_test_char.exe" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- type .\include\apr.hw > .\include\apr.h
-
-# End Custom Build
-
-!ELSEIF "$(CFG)" == "apr - x64 Release"
-
-# Begin Custom Build
-InputPath=.\include\apr_want.h
-
-".\x64\LibR\gen_test_char.exe" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- type .\include\apr.hw > .\include\apr.h
-
-# End Custom Build
-
-!ELSEIF "$(CFG)" == "apr - x64 Debug"
-
-# Begin Custom Build
-InputPath=.\include\apr_want.h
-
-".\x64\LibD\gen_test_char.exe" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- type .\include\apr.hw > .\include\apr.h
-
-# End Custom Build
-
-!ENDIF
-
# End Source File
# End Group
# End Target
Modified: stable/10/contrib/apr/apr.spec
==============================================================================
--- stable/10/contrib/apr/apr.spec Mon Oct 12 04:55:20 2015 (r289165)
+++ stable/10/contrib/apr/apr.spec Mon Oct 12 04:57:36 2015 (r289166)
@@ -3,7 +3,7 @@
Summary: Apache Portable Runtime library
Name: apr
-Version: 1.5.1
+Version: 1.5.2
Release: 1
License: Apache Software License
Group: System Environment/Libraries
@@ -76,7 +76,7 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root,-)
%doc docs/APRDesign.html docs/canonical_filenames.html
%doc docs/incomplete_types docs/non_apr_programs
-%doc --parents html
+%doc html
%{_bindir}/apr*config
%{_libdir}/libapr-%{aprver}.*a
%{_libdir}/libapr-%{aprver}.so
Modified: stable/10/contrib/apr/build-outputs.mk
==============================================================================
--- stable/10/contrib/apr/build-outputs.mk Mon Oct 12 04:55:20 2015 (r289165)
+++ stable/10/contrib/apr/build-outputs.mk Mon Oct 12 04:57:36 2015 (r289166)
@@ -251,7 +251,7 @@ file_io/win32/filestat.lo: file_io/win32
file_io/win32/filesys.lo: file_io/win32/filesys.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_general.h include/apr_pools.h include/apr_strings.h include/apr_thread_mutex.h include/apr_want.h
file_io/win32/flock.lo: file_io/win32/flock.c .make.dirs
file_io/win32/open.lo: file_io/win32/open.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
-file_io/win32/pipe.lo: file_io/win32/pipe.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_pools.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_time.h include/apr_user.h include/apr_want.h
+file_io/win32/pipe.lo: file_io/win32/pipe.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_escape.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_pools.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_time.h include/apr_user.h include/apr_want.h
file_io/win32/readwrite.lo: file_io/win32/readwrite.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_lib.h include/apr_pools.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_time.h include/apr_user.h include/apr_want.h
file_io/win32/seek.lo: file_io/win32/seek.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_pools.h include/apr_tables.h include/apr_thread_mutex.h include/apr_time.h include/apr_user.h include/apr_want.h
Modified: stable/10/contrib/apr/configure
==============================================================================
--- stable/10/contrib/apr/configure Mon Oct 12 04:55:20 2015 (r289165)
+++ stable/10/contrib/apr/configure Mon Oct 12 04:57:36 2015 (r289166)
@@ -6802,10 +6802,10 @@ if test "x$apr_preload_done" != "xyes" ;
*-apple-darwin*)
if test "x$CPPFLAGS" = "x"; then
- test "x$silent" != "xyes" && echo " setting CPPFLAGS to \"-DDARWIN -DSIGPROCMASK_SETS_THREAD_MASK -no-cpp-precomp\""
- CPPFLAGS="-DDARWIN -DSIGPROCMASK_SETS_THREAD_MASK -no-cpp-precomp"
+ test "x$silent" != "xyes" && echo " setting CPPFLAGS to \"-DDARWIN -DSIGPROCMASK_SETS_THREAD_MASK\""
+ CPPFLAGS="-DDARWIN -DSIGPROCMASK_SETS_THREAD_MASK"
else
- apr_addto_bugger="-DDARWIN -DSIGPROCMASK_SETS_THREAD_MASK -no-cpp-precomp"
+ apr_addto_bugger="-DDARWIN -DSIGPROCMASK_SETS_THREAD_MASK"
for i in $apr_addto_bugger; do
apr_addto_duplicate="0"
for j in $CPPFLAGS; do
@@ -18794,7 +18794,34 @@ if test "${enable_nonportable_atomics+se
else
case $host_cpu in
i[456]86) force_generic_atomics=yes ;;
- *) force_generic_atomics=no ;;
+ *) force_generic_atomics=no
+ case $host in
+ *solaris2.10*)
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <atomic.h>
+int
+main ()
+{
+void *ptr = NULL; atomic_cas_ptr(&ptr, NULL, NULL);
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+else
+ force_generic_atomics=yes
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ if test $force_generic_atomics = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: nonportable atomic support disabled, system needs Patch-ID 118884 or 118885" >&5
+$as_echo "$as_me: nonportable atomic support disabled, system needs Patch-ID 118884 or 118885" >&6;}
+ fi
+ ;;
+ esac
+ ;;
esac
fi
@@ -22292,7 +22319,7 @@ else
fi
done
-for ac_func in getpass getpassphrase gmtime_r localtime_r mkstemp
+for ac_func in getpass getpassphrase gmtime_r localtime_r
do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -22304,6 +22331,23 @@ _ACEOF
fi
done
+case $host in
+ *-hp-hpux*)
+ ;;
+ *)
+ for ac_func in mkstemp
+do :
+ ac_fn_c_check_func "$LINENO" "mkstemp" "ac_cv_func_mkstemp"
+if test "x$ac_cv_func_mkstemp" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_MKSTEMP 1
+_ACEOF
+
+fi
+done
+
+ ;;
+esac
@@ -23902,7 +23946,7 @@ _ACEOF
if test "${ac_cv_sizeof_off_t}${apr_cv_use_lfs64}" = "4yes"; then
# Enable LFS
aprlfs=1
- for ac_func in mmap64 sendfile64 sendfilev64 mkstemp64 readdir64_r
+ for ac_func in mmap64 sendfile64 sendfilev64 readdir64_r
do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -23914,6 +23958,23 @@ _ACEOF
fi
done
+ case $host in
+ *-hp-hpux*)
+ ;;
+ *)
+ for ac_func in mkstemp64
+do :
+ ac_fn_c_check_func "$LINENO" "mkstemp64" "ac_cv_func_mkstemp64"
+if test "x$ac_cv_func_mkstemp64" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_MKSTEMP64 1
+_ACEOF
+
+fi
+done
+
+ ;;
+ esac
elif test "${ac_cv_sizeof_off_t}" != "${ac_cv_sizeof_size_t}"; then
# unsure of using -gt above is as portable, can can't forsee where
# off_t can legitimately be smaller than size_t
Modified: stable/10/contrib/apr/configure.in
==============================================================================
--- stable/10/contrib/apr/configure.in Mon Oct 12 04:55:20 2015 (r289165)
+++ stable/10/contrib/apr/configure.in Mon Oct 12 04:57:36 2015 (r289166)
@@ -640,7 +640,20 @@ AC_ARG_ENABLE(nonportable-atomics,
],
[case $host_cpu in
i[[456]]86) force_generic_atomics=yes ;;
- *) force_generic_atomics=no ;;
+ *) force_generic_atomics=no
+ case $host in
+ *solaris2.10*)
+ AC_TRY_COMPILE(
+ [#include <atomic.h>],
+ [void *ptr = NULL; atomic_cas_ptr(&ptr, NULL, NULL);],,
+ [force_generic_atomics=yes]
+ )
+ if test $force_generic_atomics = yes; then
+ AC_MSG_NOTICE([nonportable atomic support disabled, system needs Patch-ID 118884 or 118885])
+ fi
+ ;;
+ esac
+ ;;
esac
])
@@ -1400,7 +1413,15 @@ if test "$native_mmap_emul" = "1"; then
mmap="1"
fi
AC_CHECK_FUNCS(memmove, [ have_memmove="1" ], [have_memmove="0" ])
-AC_CHECK_FUNCS([getpass getpassphrase gmtime_r localtime_r mkstemp])
+AC_CHECK_FUNCS([getpass getpassphrase gmtime_r localtime_r])
+case $host in
+ *-hp-hpux*)
+ dnl mkstemp is limited to 26 temporary files (a-z); use APR replacement
+ ;;
+ *)
+ AC_CHECK_FUNCS(mkstemp)
+ ;;
+esac
AC_SUBST(fork)
AC_SUBST(have_inet_addr)
@@ -1801,7 +1822,15 @@ APR_CHECK_SIZEOF_EXTENDED([#include <sys
if test "${ac_cv_sizeof_off_t}${apr_cv_use_lfs64}" = "4yes"; then
# Enable LFS
aprlfs=1
- AC_CHECK_FUNCS([mmap64 sendfile64 sendfilev64 mkstemp64 readdir64_r])
+ AC_CHECK_FUNCS([mmap64 sendfile64 sendfilev64 readdir64_r])
+ case $host in
+ *-hp-hpux*)
+ dnl mkstemp64 is limited to 26 temporary files (a-z); use APR replacement
+ ;;
+ *)
+ AC_CHECK_FUNCS(mkstemp64)
+ ;;
+ esac
elif test "${ac_cv_sizeof_off_t}" != "${ac_cv_sizeof_size_t}"; then
# unsure of using -gt above is as portable, can can't forsee where
# off_t can legitimately be smaller than size_t
Modified: stable/10/contrib/apr/encoding/apr_escape.c
==============================================================================
--- stable/10/contrib/apr/encoding/apr_escape.c Mon Oct 12 04:55:20 2015 (r289165)
+++ stable/10/contrib/apr/encoding/apr_escape.c Mon Oct 12 04:57:36 2015 (r289166)
@@ -436,6 +436,8 @@ APR_DECLARE(apr_status_t) apr_escape_pat
while ((c = *s) && slen) {
if (TEST_CHAR(c, T_OS_ESCAPE_PATH)) {
d = c2x(c, '%', d);
+ size += 2;
+ found = 1;
}
else {
*d++ = c;
Modified: stable/10/contrib/apr/include/apr_skiplist.h
==============================================================================
--- stable/10/contrib/apr/include/apr_skiplist.h Mon Oct 12 04:55:20 2015 (r289165)
+++ stable/10/contrib/apr/include/apr_skiplist.h Mon Oct 12 04:57:36 2015 (r289166)
@@ -40,7 +40,9 @@ extern "C" {
/**
* apr_skiplist_compare is the function type that must be implemented
* per object type that is used in a skip list for comparisons to maintain
- * order
+ * order. A value <0 indicates placement after this node; a value of 0
+ * indicates collision with this exact node; a value >0 indicates placement
+ * before this node.
* */
typedef int (*apr_skiplist_compare) (void *, void *);
@@ -171,7 +173,8 @@ APR_DECLARE(void *) apr_skiplist_next(ap
APR_DECLARE(void *) apr_skiplist_previous(apr_skiplist *sl, apr_skiplistnode **iter);
/**
- * Insert an element into the skip list using the specified comparison function.
+ * Insert an element into the skip list using the specified comparison function
+ * if it does not already exist.
* @param sl The skip list
* @param data The element to insert
* @param comp The comparison function to use for placement into the skip list
@@ -180,7 +183,8 @@ APR_DECLARE(apr_skiplistnode *) apr_skip
void *data, apr_skiplist_compare comp);
/**
- * Insert an element into the skip list using the existing comparison function.
+ * Insert an element into the skip list using the existing comparison function
+ * if it does not already exist (as determined by the comparison function)
* @param sl The skip list
* @param data The element to insert
* @remark If no comparison function has been set for the skip list, the element
@@ -190,7 +194,7 @@ APR_DECLARE(apr_skiplistnode *) apr_skip
/**
* Remove an element from the skip list using the specified comparison function for
- * locating the element.
+ * locating the element. In the case of duplicates, the 1st entry will be removed.
* @param sl The skip list
* @param data The element to remove
* @param myfree A function to be called for each removed element
@@ -203,7 +207,7 @@ APR_DECLARE(int) apr_skiplist_remove_com
/**
* Remove an element from the skip list using the existing comparison function for
- * locating the element.
+ * locating the element. In the case of duplicates, the 1st entry will be removed.
* @param sl The skip list
* @param data The element to remove
* @param myfree A function to be called for each removed element
@@ -229,7 +233,7 @@ APR_DECLARE(void) apr_skiplist_remove_al
APR_DECLARE(void) apr_skiplist_destroy(apr_skiplist *sl, apr_skiplist_freefunc myfree);
/**
- * Return the first element in the skip list, leaving the element in the skip list.
+ * Return the first element in the skip list, removing the element from the skip list.
* @param sl The skip list
* @param myfree A function to be called for the removed element
* @remark NULL will be returned if there are no elements
Modified: stable/10/contrib/apr/include/apr_version.h
==============================================================================
--- stable/10/contrib/apr/include/apr_version.h Mon Oct 12 04:55:20 2015 (r289165)
+++ stable/10/contrib/apr/include/apr_version.h Mon Oct 12 04:57:36 2015 (r289166)
@@ -38,7 +38,7 @@
*/
-#define APR_COPYRIGHT "Copyright (c) 2000-2014 The Apache Software " \
+#define APR_COPYRIGHT "Copyright (c) 2000-2015 The Apache Software " \
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-stable-10
mailing list