[apr-util] 02/04: Merge branch 'upstream'

[Stefan Fritsch]

This is an automated email from the git hooks/post-receive script.

sf pushed a commit to branch master
in repository apr-util.

commit 4d3b53a25d7eb14a5c6644e530c3c025258cd186
Merge: 9adff16 66c2042
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Mon Nov 6 19:53:43 2017 +0100

    Merge branch 'upstream'

 CHANGES                             |   21 +
 CMakeLists.txt                      |   33 +-
 Makefile.win                        |   33 +-
 README                              |    2 +-
 apr-util.spec                       |    2 +-
 aprutil.dep                         |  863 +++++-----
 aprutil.dsw                         |   36 -
 aprutil.mak                         | 2986 +++++++++++++++++-----------------
 build/config.guess                  |   70 +-
 build/config.sub                    |   32 +-
 crypto/apr_crypto.c                 |    6 +-
 crypto/apr_crypto_nss.dep           |   30 +-
 crypto/apr_crypto_nss.mak           | 1188 +++++++-------
 crypto/apr_crypto_openssl.c         |   25 +-
 crypto/apr_crypto_openssl.dep       |   28 +-
 crypto/apr_crypto_openssl.mak       | 1212 +++++++-------
 crypto/apr_siphash.c                |   12 +-
 dbd/apr_dbd_mysql.dep               |   30 +-
 dbd/apr_dbd_mysql.mak               | 1188 +++++++-------
 dbd/apr_dbd_odbc.dep                |   22 +-
 dbd/apr_dbd_odbc.mak                | 1100 ++++++-------
 dbd/apr_dbd_oracle.dep              |   26 +-
 dbd/apr_dbd_oracle.mak              | 1188 +++++++-------
 dbd/apr_dbd_pgsql.dep               |   28 +-
 dbd/apr_dbd_pgsql.mak               | 1188 +++++++-------
 dbd/apr_dbd_sqlite2.dep             |   26 +-
 dbd/apr_dbd_sqlite2.mak             | 1188 +++++++-------
 dbd/apr_dbd_sqlite3.dep             |   26 +-
 dbd/apr_dbd_sqlite3.mak             | 1188 +++++++-------
 dbd/unsupported/apr_dbd_freetds.dep |   26 +-
 dbd/unsupported/apr_dbd_freetds.mak | 1188 +++++++-------
 dbm/apr_dbm_db.dep                  |   30 +-
 dbm/apr_dbm_db.mak                  | 1188 +++++++-------
 dbm/apr_dbm_gdbm.dep                |   28 +-
 dbm/apr_dbm_gdbm.mak                | 1188 +++++++-------
 dbm/sdbm/sdbm.c                     |   78 +-
 dbm/sdbm/sdbm_pair.c                |    3 +-
 include/apr_crypto.h                |    6 +-
 include/apr_siphash.h               |   13 +-
 include/apu_version.h               |    4 +-
 ldap/apr_ldap.dep                   |   74 +-
 ldap/apr_ldap.mak                   | 1240 +++++++--------
 libaprutil.dep                      |  679 ++++----
 libaprutil.dsp                      |   16 +-
 libaprutil.mak                      | 2998 +++++++++++++++++------------------
 test/Makefile.win                   |    3 +-
 xml/xml.dep                         |    2 -
 xml/xml.dsp                         |  210 ---
 xml/xml.mak                         |  353 -----
 49 files changed, 11210 insertions(+), 11894 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-apache/apr-util.git