[apr-util] 02/06: Merge branch 'upstream'
Stefan Fritsch
sf at moszumanska.debian.org
Fri Aug 4 19:46:27 UTC 2017
This is an automated email from the git hooks/post-receive script.
sf pushed a commit to branch master
in repository apr-util.
commit 66615a71443d8ea772f0bec3829ebb6dd7f7d4ed
Merge: 752bed0 97b736e
Author: Stefan Fritsch <sf at sfritsch.de>
Date: Fri Aug 4 20:37:26 2017 +0200
Merge branch 'upstream'
CHANGES | 150 +-
CMakeLists.txt | 19 +-
LICENSE | 16 +
Makefile.in | 8 +-
Makefile.win | 28 +-
NOTICE | 2 +-
NWGNUmakefile | 4 +-
README | 2 +-
README.FREETDS | 11 +
README.cmake | 4 +-
apr-util.spec | 20 +-
aprutil.dep | 867 +-
aprutil.dsp | 20 +-
aprutil.dsw | 2 +-
aprutil.mak | 3020 ++--
apu-config.in | 4 -
buckets/apr_buckets_alloc.c | 32 +
buckets/apr_buckets_file.c | 20 +-
build-outputs.mk | 22 +-
build.conf | 14 +-
build/apu-conf.m4 | 23 +-
build/config.guess | 180 +-
build/config.sub | 89 +-
build/crypto.m4 | 77 +-
build/dbd.m4 | 68 +-
build/dso.m4 | 12 +-
build/nw_apu_export.inc | 1 +
build/rpm/apr-util.spec.in | 18 +-
buildconf | 18 +-
configure | 1516 +-
configure.in | 54 +-
crypto/apr_crypto.c | 95 +-
..._crypto_openssl.c => apr_crypto_commoncrypto.c} | 612 +-
crypto/apr_crypto_nss.c | 421 +-
crypto/apr_crypto_nss.dep | 30 +-
crypto/apr_crypto_nss.mak | 1188 +-
crypto/apr_crypto_openssl.c | 342 +-
crypto/apr_crypto_openssl.dep | 28 +-
crypto/apr_crypto_openssl.mak | 1200 +-
crypto/apr_siphash.c | 196 +
crypto/crypt_blowfish.c | 6 +-
dbd/NWGNUmakefile | 3 -
dbd/apr_dbd.c | 3 -
dbd/apr_dbd_mysql.dep | 30 +-
dbd/apr_dbd_mysql.dsp | 20 +-
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.dsp | 16 +-
dbd/apr_dbd_sqlite3.mak | 1188 +-
dbd/{ => unsupported}/NWGNUdbdfreetds | 0
dbd/{ => unsupported}/apr_dbd_freetds.c | 4 +
dbd/{ => unsupported}/apr_dbd_freetds.dep | 26 +-
dbd/{ => unsupported}/apr_dbd_freetds.dsp | 0
dbd/{ => unsupported}/apr_dbd_freetds.mak | 1188 +-
dbm/apr_dbm_db.dep | 30 +-
dbm/apr_dbm_db.dsp | 16 +-
dbm/apr_dbm_db.mak | 1188 +-
dbm/apr_dbm_gdbm.dep | 28 +-
dbm/apr_dbm_gdbm.mak | 1188 +-
include/apr_buckets.h | 27 +
include/apr_crypto.h | 116 +-
include/apr_dbd.h | 3 -
include/apr_redis.h | 459 +
include/apr_siphash.h | 147 +
include/apr_xml.h | 2 +
include/apu.h.in | 2 +-
include/apu.hnw | 2 +-
include/apu.hw | 2 +-
include/apu.hwc | 1 -
include/apu_version.h | 8 +-
include/private/apr_crypto_internal.h | 23 +-
include/private/apu_config.h.in | 17 +-
ldap/apr_ldap.dep | 74 +-
ldap/apr_ldap.mak | 1240 +-
libaprutil.dep | 676 +-
libaprutil.dsp | 29 +-
libaprutil.mak | 3019 ++--
memcache/apr_memcache.c | 151 +-
redis/apr_redis.c | 1548 ++
test/Makefile.in | 2 +-
test/Makefile.win | 3 +-
test/NWGNUaputest | 1 +
test/abts_tests.h | 4 +-
test/testall.dsw | 17 -
test/testcrypto.c | 909 +-
test/testredis.c | 552 +
test/testsiphash.c | 148 +
test/testutil.h | 2 +
xml/apr_xml.c | 91 +-
xml/expat/COPYING | 22 -
xml/expat/Makefile.in | 115 -
xml/expat/README | 119 -
xml/expat/buildconf.sh | 104 -
xml/expat/configure | 15953 -------------------
xml/expat/configure.in | 108 -
xml/expat/conftools/PrintPath | 130 -
xml/expat/conftools/ac_c_bigendian_cross.m4 | 81 -
xml/expat/conftools/config.guess | 1420 --
xml/expat/conftools/config.sub | 1793 ---
xml/expat/conftools/install-sh | 251 -
xml/expat/conftools/libtool.m4 | 7982 ----------
xml/expat/conftools/ltmain.sh | 9655 -----------
xml/expat/conftools/ltoptions.m4 | 384 -
xml/expat/conftools/ltsugar.m4 | 123 -
xml/expat/conftools/ltversion.m4 | 23 -
xml/expat/conftools/lt~obsolete.m4 | 98 -
xml/expat/conftools/mkinstalldirs | 40 -
xml/expat/expat_config.h.in | 99 -
xml/expat/lib/ascii.h | 85 -
xml/expat/lib/asciitab.h | 36 -
xml/expat/lib/expat.dsp | 239 -
xml/expat/lib/expat.h | 1001 --
xml/expat/lib/expat_config.hnw | 24 -
xml/expat/lib/iasciitab.h | 37 -
xml/expat/lib/internal.h | 73 -
xml/expat/lib/latin1tab.h | 36 -
xml/expat/lib/map_osd_ebcdic_df04_1.h | 18 -
xml/expat/lib/nametab.h | 150 -
xml/expat/lib/osd_ebcdic_df04_1.h | 81 -
xml/expat/lib/utf8tab.h | 37 -
xml/expat/lib/winconfig.h | 30 -
xml/expat/lib/xml.dep | 32 -
xml/expat/lib/xmlparse.c | 5817 -------
xml/expat/lib/xmlrole.c | 1323 --
xml/expat/lib/xmlrole.h | 114 -
xml/expat/lib/xmltok.c | 1634 --
xml/expat/lib/xmltok.h | 315 -
xml/expat/lib/xmltok_impl.c | 1779 ---
xml/expat/lib/xmltok_impl.h | 46 -
xml/expat/lib/xmltok_ns.c | 106 -
xml/expat/win32/MANIFEST.txt | 29 -
xml/expat/win32/expat.iss | 62 -
xml/xml.dep | 2 +
xml/{expat/lib => }/xml.dsp | 36 +-
xml/{expat/lib => }/xml.mak | 703 +-
143 files changed, 17838 insertions(+), 65129 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-apache/apr-util.git
More information about the Pkg-apache-commits
mailing list