svn commit: r361692 - in head: contrib/apr-util contrib/apr-util/buckets contrib/apr-util/crypto contrib/apr-util/dbd contrib/apr-util/dbd/unsupported contrib/apr-util/dbm/sdbm contrib/apr-util/inc...
Dimitry Andric
dim at FreeBSD.org
Mon Jun 1 10:14:48 UTC 2020
Author: dim
Date: Mon Jun 1 10:14:45 2020
New Revision: 361692
URL: https://svnweb.freebsd.org/changeset/base/361692
Log:
Update apr-util to 1.6.1. See contrib/apr-util/CHANGES for a summary of
changes.
MFC after: 2 weeks
X-MFC-With: r361677
Added:
head/contrib/apr-util/CMakeLists.txt
- copied unchanged from r361691, vendor/apr-util/dist/CMakeLists.txt
head/contrib/apr-util/README.FREETDS
- copied unchanged from r361691, vendor/apr-util/dist/README.FREETDS
head/contrib/apr-util/README.cmake
- copied unchanged from r361691, vendor/apr-util/dist/README.cmake
head/contrib/apr-util/crypto/apr_crypto_commoncrypto.c
- copied unchanged from r361691, vendor/apr-util/dist/crypto/apr_crypto_commoncrypto.c
head/contrib/apr-util/crypto/apr_siphash.c
- copied unchanged from r361691, vendor/apr-util/dist/crypto/apr_siphash.c
head/contrib/apr-util/dbd/unsupported/
- copied from r361691, vendor/apr-util/dist/dbd/unsupported/
head/contrib/apr-util/include/apr_ldap.hwc
- copied unchanged from r361691, vendor/apr-util/dist/include/apr_ldap.hwc
head/contrib/apr-util/include/apr_redis.h
- copied unchanged from r361691, vendor/apr-util/dist/include/apr_redis.h
head/contrib/apr-util/include/apr_siphash.h
- copied unchanged from r361691, vendor/apr-util/dist/include/apr_siphash.h
head/contrib/apr-util/include/apu.hwc
- copied unchanged from r361691, vendor/apr-util/dist/include/apu.hwc
head/contrib/apr-util/redis/
- copied from r361691, vendor/apr-util/dist/redis/
head/contrib/apr-util/test/testredis.c
- copied unchanged from r361691, vendor/apr-util/dist/test/testredis.c
head/contrib/apr-util/test/testsiphash.c
- copied unchanged from r361691, vendor/apr-util/dist/test/testsiphash.c
Deleted:
head/contrib/apr-util/dbd/NWGNUdbdfreetds
head/contrib/apr-util/dbd/apr_dbd_freetds.c
Modified:
head/contrib/apr-util/CHANGES
head/contrib/apr-util/LICENSE
head/contrib/apr-util/Makefile.in
head/contrib/apr-util/Makefile.win
head/contrib/apr-util/NOTICE
head/contrib/apr-util/NWGNUmakefile
head/contrib/apr-util/README
head/contrib/apr-util/apr-util.spec
head/contrib/apr-util/aprutil.dsw
head/contrib/apr-util/apu-config.in
head/contrib/apr-util/buckets/apr_buckets_alloc.c
head/contrib/apr-util/buckets/apr_buckets_file.c
head/contrib/apr-util/build-outputs.mk
head/contrib/apr-util/build.conf
head/contrib/apr-util/buildconf
head/contrib/apr-util/configure
head/contrib/apr-util/configure.in
head/contrib/apr-util/crypto/apr_crypto.c
head/contrib/apr-util/crypto/apr_crypto_nss.c
head/contrib/apr-util/crypto/apr_crypto_openssl.c
head/contrib/apr-util/crypto/crypt_blowfish.c
head/contrib/apr-util/dbd/NWGNUmakefile
head/contrib/apr-util/dbd/apr_dbd.c
head/contrib/apr-util/dbm/sdbm/sdbm.c
head/contrib/apr-util/dbm/sdbm/sdbm_pair.c
head/contrib/apr-util/include/apr_buckets.h
head/contrib/apr-util/include/apr_crypto.h
head/contrib/apr-util/include/apr_dbd.h
head/contrib/apr-util/include/apr_xml.h
head/contrib/apr-util/include/apu.h.in
head/contrib/apr-util/include/apu.hnw
head/contrib/apr-util/include/apu.hw
head/contrib/apr-util/include/apu_version.h
head/contrib/apr-util/include/private/apr_crypto_internal.h
head/contrib/apr-util/include/private/apu_config.h.in
head/contrib/apr-util/memcache/apr_memcache.c
head/contrib/apr-util/test/Makefile.in
head/contrib/apr-util/test/Makefile.win
head/contrib/apr-util/test/NWGNUaputest
head/contrib/apr-util/test/abts_tests.h
head/contrib/apr-util/test/testall.dsw
head/contrib/apr-util/test/testcrypto.c
head/contrib/apr-util/test/testutil.h
head/contrib/apr-util/xml/apr_xml.c
head/usr.bin/svn/lib/libapr_util/apu.h
head/usr.bin/svn/lib/libapr_util/apu_config.h
Directory Properties:
head/contrib/apr-util/ (props changed)
Modified: head/contrib/apr-util/CHANGES
==============================================================================
--- head/contrib/apr-util/CHANGES Mon Jun 1 10:08:18 2020 (r361691)
+++ head/contrib/apr-util/CHANGES Mon Jun 1 10:14:45 2020 (r361692)
@@ -1,141 +1,62 @@
-*- coding: utf-8 -*-
-Changes with APR-util 1.5.4
+Changes with APR-util 1.6.1
- *) 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>]
+ *) Win32: Add function exports from new apr_crypto API's missing in 1.6.0.
- *) apr_crypto_get_driver(): Fix invalid storage reference on error path.
- [Philip Martin <philip.martin wandisco.com>]
+ *) Win32: Introduce XML_PARSER build-time variable to select the expat
+ library name to be linked to libaprutil-1.dll. See Makefile.win
- *) Fix compile failure for Android. PR 56627. [Fredrik Fornwall
- <fredrik fornwall.net>, Jeff Trawick]
+ *) Win32: Removed lingering xml/xml.dsp project forked from the expat
+ Project in the 1.9x era. Use expat's maintained build schema instead,
+ prior to building apr-util.
- *) Fix to let ODBC driver build with MSVC6, which does not have intptr_t
- [Tom Donovan]
+ *) apr_crypto: Fix compatibility with LibreSSL. PR 61596.
+ [Bernard Spil <brnrd freebsd.org>, Yann Ylavic]
- *) 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]
+ *) sdbm: better database/page validation to fail cleanly when corrupted.
+ [Yann Ylavic]
- *) Fix detection of Berkeley DB 6.0. PR 55277.
- [Lars Wendler <polynomial-c gentoo.org>]
+Changes with APR-util 1.6.0
- *) Improve platform detection for bundled expat by updating
- config.guess and config.sub. [Rainer Jung]
+ *) The expat dependency of apr-util is no longer built with apr-util.
+ Install expat (including development headers and libraries) first
+ before building apr-util. [https://libexpat.github.io/]
-Changes with APR-util 1.5.3
+ *) Mark apr_dbd_freetds as unsupported, and remove it from all builds
+ [Nick Kew]
- *) Cygwin: Use correct file extension when loading APR DSOs. PR 55587.
- [Carlo Bramini <carlo.bramix libero.it>]
+ *) Update MySQL build to stop using libmysqlclient_r.
+ [Petr Sumbera <petr.sumbera oracle.com>]
- *) Add experimental cmake-based build system for Windows. Refer to
- README.cmake for more information. [Jeff Trawick, Tom Donovan]
+ *) apr_buckets: Add apr_bucket_file_set_buf_size() which allows to configure
+ the size of the buffer used to read files. [Yann Ylavic]
- *) Fix warnings in odbc driver on 64bit systems.
- PR 55197 [Tom Donovan]
+ *) apr_crypto: avoid excessive iteration in bcrypt hash.
+ [Hanno Böck <hanno hboeck.de>]
- *) Add support to apr_memcache for unix domain sockets. PR 54573 [Remi
- Gacogne <rgacogne+asf aquaray.com>]
+ *) apr_siphash: Implement keyed hash function SipHash. [Yann Ylavic]
- *) Add support for Berkeley DB 6.0. [Rainer Jung]
+ *) apr_crypto: Add apr_crypto_key() function which supports keys
+ generated from a passphrase or a raw secret provided by the caller.
+ Deprecate apr_crypto_passphrase(). [Graham Leggett]
- *) Improve platform detection for bundled expat by updating
- config.guess and config.sub. [Rainer Jung]
+ *) apr_crypto_nss: Ensure the SECItem returned by PK11_ParamFromIV
+ is properly freed. [Graham Leggett]
-Changes with APR-util 1.5.2
+ *) apr_crypto: Don't cache the driver if initialisation fails. This
+ stops the second and subsequent attempt to use the API from failing
+ claiming the library is not initialised. [Graham Leggett]
- *) Windows: Add command line makefiles. [Gregg Smith]
+ *) apr_crypto: Add a native CommonCrypto implementation for iOS and OSX
+ where OpenSSL has been deprecated. [Graham Leggett]
- *) apr_uri_parse(): Do not accept invalid characters in the scheme.
- Per RFC 3986 3.3, enforce that the first segment of a relative path does
- not contain a colon. PR 52479. [Stefan Fritsch]
+ *) apr_xml_to_text: Add style APR_XML_X2T_PARSED to maintain a
+ consistent namespace prefix. [Jari Urpalainen
+ <jari.urpalainen nokia.com>]
- *) Fix memory leak in hook sorting function. PR 51256.
- [<horowity checkpoint com>]
+Changes with APR-util 1.5.x and later:
- *) Speedup md5 calculation by avoiding some copying on little endian
- architectures. PR 49011. [Stefan Fritsch, Stefan Fuhrmann
- <stefanfuhrmann alice-dsl de>]
-
- *) Use heap memory for crypt in apr_password_validate(), to reduce stack
- usage. PR 54572. [Stefan Fritsch]
-
- *) Fix password validation failure for all crypt and crypt_r based
- algorithms. PR 54603. [Harvey Eneman <harvey.eneman oracle.com>]
-
- *) Fix syntax error in crypto/apr_passwd.c on non-glibc systems. PR 54275.
- [Stefan Fritsch]
-
- *) Fix potential data corruption in apr_brigade_write() and friends if
- the last bucket of the brigade is a heap bucket that has been split,
- and there are still references to the next part of the original bucket
- in use. [Stefan Fritsch]
-
- *) Remove duplicated logic in apr_brigade_puts(). PR 53740. [Christophe
- Jaillet <christophe jaillet wanadoo fr>]
-
- *) apr_crypto: If --with-crypto is passed to configure but no crypto
- libraries are enabled, autodetect available libraries. [Jeff Trawick]
-
- *) memcache: Fix dead server retry logic. [Gavin Shelley <columbusmonkey me.com>]
-
-Changes with APR-util 1.5.1
-
- *) testmemcache: Fix crash. PR 52705. [Peter Poeml <peter poeml de>]
-
- *) MinGW: Support shared builds of apr-util when apr is shared.
- PR 46175. [Carlo Bramini <carlo.bramix libero.it>, Jeff Trawick]
-
- *) Add support for Berkeley DB 5.2 and 5.3. Simplify detection script.
- PR 53684. [Rainer Jung]
-
- *) configure: Allow to specify library specific custom linker flags
- via the LDADD_XXX variables. [Rainer Jung]
-
- *) apr_password_validate(): Fix intermittent errors on systems
- such as FreeBSD where the crypt() function is used.
- (Broken only in 1.5.0) [Jeff Trawick]
-
- *) Improve platform detection for bundled expat by updating
- config.guess and config.sub. [Rainer Jung]
-
-Changes with APR-util 1.5.0
-
- *) dbd_pgsql_escape: Use PQescapeStringConn. [Nick Kew]
-
- *) apr_password_validate, apr_bcrypt_encode: Add support for bcrypt encoded
- passwords. The bcrypt implementation uses code from crypt_blowfish
- written by Solar Designer <solar openwall com>. apr_bcrypt_encode creates
- hashes with "$2y$" prefix, but apr_password_validate also accepts the old
- prefix "$2a$". PR 49288. [Stefan Fritsch]
-
- *) APR dbd: Allow to use apr_dbd_get_row() with a different pool than
- apr_dbd_select(). PR 53533. [<arthur echo gmail com>]
-
- *) APR dbd FreeTDS support: Fix spurious API errors caused by uninitialized
- fields. [TROY.LIU 劉春偉 <TROY.LIU deltaww.com.cn>]
-
- *) apr_password_validate: Increase maximum hash string length to allow
- more than 9999 rounds with sha512-crypt. PR 53410. [Stefan Fritsch]
-
- *) Fix segfaults in crypt() and crypt_r() failure modes.
- PR 47272. [Arkadiusz Miskiewicz <arekm pld-linux.org>]
-
- *) apr_crypto: Ensure that the if/else that governs the static
- initialisation of each crypto driver works when the first driver
- isn't in use. [Graham Leggett]
-
- *) apr_crypto: Ensure the *driver variable is initialised when a statically
- compiled library is initialised for the first time. [Graham Leggett]
-
- *) apr_crypto: Ensure the *driver variable is initialised when the library
- has already been loaded. Fix ported from apr_dbd. [Graham Leggett]
-
- *) apr_crypto: Move the static initialisation of DRIVER_LOAD from
- apr_crypto_init() to apr_crypto_get_driver(), so that we don't lose
- the parameters. [Graham Leggett]
+ *) http://svn.apache.org/viewvc/apr/apr-util/branches/1.5.x/CHANGES?view=markup
Changes with APR-util 1.4.x and later:
Copied: head/contrib/apr-util/CMakeLists.txt (from r361691, vendor/apr-util/dist/CMakeLists.txt)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/contrib/apr-util/CMakeLists.txt Mon Jun 1 10:14:45 2020 (r361692, copy of r361691, vendor/apr-util/dist/CMakeLists.txt)
@@ -0,0 +1,355 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# Read README.cmake before using this.
+
+PROJECT(APR-Util C)
+
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+
+FIND_PACKAGE(OpenSSL)
+
+FIND_PACKAGE(expat)
+
+OPTION(APU_HAVE_CRYPTO "Crypto support" OFF)
+OPTION(APU_HAVE_ODBC "Build ODBC DBD driver" ON)
+OPTION(APR_HAS_LDAP "LDAP support" ON)
+OPTION(INSTALL_PDB "Install .pdb files (if generated)" ON)
+OPTION(APR_BUILD_TESTAPR "Build the test suite" OFF)
+OPTION(TEST_STATIC_LIBS "Test programs use APR static libraries instead of shared libraries?" OFF)
+SET(APR_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE STRING "Directory with APR include files")
+SET(APR_LIBRARIES "${CMAKE_INSTALL_PREFIX}/lib/libapr-1.lib" CACHE STRING "APR library to link with")
+
+IF(NOT EXISTS "${APR_INCLUDE_DIR}/apr.h")
+ MESSAGE(FATAL_ERROR "APR include directory ${APR_INCLUDE_DIR} is not correct.")
+ENDIF()
+FOREACH(onelib ${APR_LIBRARIES})
+ IF(NOT EXISTS ${onelib})
+ MESSAGE(FATAL_ERROR "APR library ${onelib} was not found.")
+ ENDIF()
+ENDFOREACH()
+
+IF(APU_HAVE_CRYPTO)
+IF(NOT OPENSSL_FOUND)
+ MESSAGE(FATAL_ERROR "OpenSSL is the only supported crypto implementation, and it wasn't found!")
+ENDIF()
+ENDIF()
+
+# create 1-or-0 representation of feature tests for apu.h
+
+SET(apu_have_crypto_10 0)
+SET(apu_have_apr_iconv_10 0) # not yet implemented
+SET(apr_has_ldap_10 0)
+
+IF(APU_HAVE_CRYPTO)
+ SET(apu_have_crypto_10 1)
+ENDIF()
+
+IF(APR_HAS_LDAP)
+ SET(apr_has_ldap_10 1)
+ENDIF()
+
+IF(NOT EXPAT_FOUND)
+ MESSAGE(FATAL_ERROR "Expat is required, and it wasn't found!")
+ENDIF()
+
+SET(XMLLIB_INCLUDE_DIR ${EXPAT_INCLUDE_DIRS})
+SET(XMLLIB_LIBRARIES ${EXPAT_LIBRARIES})
+
+SET(LDAP_LIBRARIES)
+IF(APR_HAS_LDAP)
+ SET(LDAP_LIBRARIES wldap32)
+ENDIF()
+
+CONFIGURE_FILE(include/apu.hwc
+ ${PROJECT_BINARY_DIR}/apu.h)
+CONFIGURE_FILE(include/apr_ldap.hwc
+ ${PROJECT_BINARY_DIR}/apr_ldap.h)
+# "COPYONLY" just because anything else isn't implemented ;)
+CONFIGURE_FILE(include/private/apu_config.hw
+ ${PROJECT_BINARY_DIR}/apu_config.h
+ COPYONLY)
+CONFIGURE_FILE(include/private/apu_select_dbm.hw
+ ${PROJECT_BINARY_DIR}/apu_select_dbm.h
+ COPYONLY)
+CONFIGURE_FILE(include/apu_want.hw
+ ${PROJECT_BINARY_DIR}/apu_want.h
+ COPYONLY)
+
+# Generated .h files are stored in PROJECT_BINARY_DIR, not the
+# source tree.
+#
+# BROKEN: not searching PROJECT_BINARY_DIR first, so you have to
+# manually delete apu.h in PROJECT_SOURCE_DIR/include if
+# you've generated apu.h before using a different build
+
+SET(APR_INCLUDE_DIRECTORIES
+ ${PROJECT_BINARY_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}/include
+ ${CMAKE_CURRENT_SOURCE_DIR}/include/private
+ ${APR_INCLUDE_DIR}
+)
+
+INCLUDE_DIRECTORIES(${APR_INCLUDE_DIRECTORIES} ${XMLLIB_INCLUDE_DIR})
+
+SET(APR_PUBLIC_HEADERS_STATIC
+ include/apr_anylock.h
+ include/apr_base64.h
+ include/apr_buckets.h
+ include/apr_crypto.h
+ include/apr_date.h
+ include/apr_dbd.h
+ include/apr_dbm.h
+ include/apr_hooks.h
+ include/apr_ldap_init.h
+ include/apr_ldap_option.h
+ include/apr_ldap_rebind.h
+ include/apr_ldap_url.h
+ include/apr_md4.h
+ include/apr_md5.h
+ include/apr_memcache.h
+ include/apr_optional.h
+ include/apr_optional_hooks.h
+ include/apr_queue.h
+ include/apr_redis.h
+ include/apr_reslist.h
+ include/apr_rmm.h
+ include/apr_sdbm.h
+ include/apr_sha1.h
+ include/apr_siphash.h
+ include/apr_strmatch.h
+ include/apr_thread_pool.h
+ include/apr_uri.h
+ include/apr_uuid.h
+ include/apr_xlate.h
+ include/apr_xml.h
+ include/apu_errno.h
+ include/apu_version.h
+)
+
+# apu_config.h and apu_select_dbm.h are private
+SET(APR_PUBLIC_HEADERS_GENERATED
+ ${PROJECT_BINARY_DIR}/apu.h
+ ${PROJECT_BINARY_DIR}/apr_ldap.h
+ ${PROJECT_BINARY_DIR}/apu_want.h
+)
+
+SET(APR_SOURCES
+ buckets/apr_brigade.c
+ buckets/apr_buckets.c
+ buckets/apr_buckets_alloc.c
+ buckets/apr_buckets_eos.c
+ buckets/apr_buckets_file.c
+ buckets/apr_buckets_flush.c
+ buckets/apr_buckets_heap.c
+ buckets/apr_buckets_mmap.c
+ buckets/apr_buckets_pipe.c
+ buckets/apr_buckets_pool.c
+ buckets/apr_buckets_refcount.c
+ buckets/apr_buckets_simple.c
+ buckets/apr_buckets_socket.c
+ crypto/apr_crypto.c
+ crypto/apr_md4.c
+ crypto/apr_md5.c
+ crypto/apr_passwd.c
+ crypto/apr_sha1.c
+ crypto/apr_siphash.c
+ crypto/crypt_blowfish.c
+ crypto/getuuid.c
+ crypto/uuid.c
+ dbd/apr_dbd.c
+ dbm/apr_dbm.c
+ dbm/apr_dbm_sdbm.c
+ dbm/sdbm/sdbm.c
+ dbm/sdbm/sdbm_hash.c
+ dbm/sdbm/sdbm_lock.c
+ dbm/sdbm/sdbm_pair.c
+ encoding/apr_base64.c
+ hooks/apr_hooks.c
+ memcache/apr_memcache.c
+ misc/apr_date.c
+ misc/apr_queue.c
+ misc/apr_reslist.c
+ misc/apr_rmm.c
+ misc/apr_thread_pool.c
+ misc/apu_dso.c
+ misc/apu_version.c
+ redis/apr_redis.c
+ strmatch/apr_strmatch.c
+ uri/apr_uri.c
+ xlate/xlate.c
+ xml/apr_xml.c
+)
+
+IF(APR_HAS_LDAP)
+ SET(APR_SOURCES ${APR_SOURCES} ldap/apr_ldap_stub.c ldap/apr_ldap_url.c)
+ENDIF()
+
+SET(APR_TEST_SOURCES
+ test/abts.c
+ test/testbuckets.c
+ test/testcrypto.c
+ test/testdate.c
+ test/testdbd.c
+ test/testdbm.c
+ test/testldap.c
+ test/testmd4.c
+ test/testmd5.c
+ test/testmemcache.c
+ test/testpass.c
+ test/testqueue.c
+ test/testredis.c
+ test/testreslist.c
+ test/testrmm.c
+ test/testsiphash.c
+ test/teststrmatch.c
+ test/testuri.c
+ test/testutil.c
+ test/testuuid.c
+ test/testxlate.c
+ test/testxml.c
+)
+
+SET(install_targets)
+SET(install_bin_pdb)
+SET(dbd_drivers)
+
+# Note: The WINNT definition on some targets is used only by libaprutil.rc.
+
+# libaprutil-1 is shared, aprutil-1 is static
+ADD_LIBRARY(libaprutil-1 SHARED ${APR_SOURCES} ${APR_PUBLIC_HEADERS_GENERATED} libaprutil.rc)
+SET(install_targets ${install_targets} libaprutil-1)
+SET(install_bin_pdb ${install_bin_pdb} ${PROJECT_BINARY_DIR}/libaprutil-1.pdb)
+TARGET_LINK_LIBRARIES(libaprutil-1 ${APR_LIBRARIES} ${XMLLIB_LIBRARIES})
+SET_TARGET_PROPERTIES(libaprutil-1 PROPERTIES COMPILE_DEFINITIONS "APU_DECLARE_EXPORT;APR_DECLARE_EXPORT;XML_STATIC;WINNT")
+
+ADD_LIBRARY(aprutil-1 STATIC ${APR_SOURCES} ${APR_PUBLIC_HEADERS_GENERATED})
+SET(install_targets ${install_targets} aprutil-1)
+TARGET_LINK_LIBRARIES(aprutil-1 ${APR_LIBRARIES} ${XMLLIB_LIBRARIES})
+SET_TARGET_PROPERTIES(aprutil-1 PROPERTIES COMPILE_DEFINITIONS "APU_DECLARE_STATIC;APR_DECLARE_STATIC;APU_DSO_MODULE_BUILD;XML_STATIC")
+
+IF(APU_HAVE_CRYPTO)
+ IF(NOT OPENSSL_FOUND)
+ MESSAGE(FATAL_ERROR "Only OpenSSL-based crypto is currently implemented in the cmake build")
+ ENDIF()
+ ADD_LIBRARY(apr_crypto_openssl-1 SHARED crypto/apr_crypto_openssl.c libaprutil.rc)
+ SET(install_targets ${install_targets} apr_crypto_openssl-1)
+ SET(install_bin_pdb ${install_bin_pdb} ${PROJECT_BINARY_DIR}/apr_crypto_openssl-1.pdb)
+ SET_TARGET_PROPERTIES(apr_crypto_openssl-1 PROPERTIES INCLUDE_DIRECTORIES "${APR_INCLUDE_DIRECTORIES};${OPENSSL_INCLUDE_DIR}")
+ SET_TARGET_PROPERTIES(apr_crypto_openssl-1 PROPERTIES COMPILE_DEFINITIONS "WINNT")
+ SET_TARGET_PROPERTIES(apr_crypto_openssl-1 PROPERTIES COMPILE_FLAGS "-DAPR_DECLARE_EXPORT=1 -DAPU_DECLARE_EXPORT=1 -DDLL_NAME=apr_crypto_openssl")
+ TARGET_LINK_LIBRARIES(apr_crypto_openssl-1 libaprutil-1 ${APR_LIBRARIES} ${OPENSSL_LIBRARIES})
+ENDIF()
+
+IF(APU_HAVE_ODBC)
+ ADD_LIBRARY(apr_dbd_odbc-1 SHARED dbd/apr_dbd_odbc.c libaprutil.rc)
+ SET(install_targets ${install_targets} apr_dbd_odbc-1)
+ SET(install_bin_pdb ${install_bin_pdb} ${PROJECT_BINARY_DIR}/apr_dbd_odbc-1.pdb)
+ SET(dbd_drivers ${dbd_drivers} odbc)
+ TARGET_LINK_LIBRARIES(apr_dbd_odbc-1 libaprutil-1 ${APR_LIBRARIES} odbc32 odbccp32)
+ SET_PROPERTY(TARGET apr_dbd_odbc-1 APPEND PROPERTY LINK_FLAGS /export:apr_dbd_odbc_driver)
+ SET_TARGET_PROPERTIES(apr_dbd_odbc-1 PROPERTIES COMPILE_DEFINITIONS "APU_HAVE_ODBC;HAVE_SQL_H;APU_DECLARE_EXPORT;APR_DECLARE_EXPORT;APU_DSO_MODULE_BUILD;WINNT")
+ SET_TARGET_PROPERTIES(apr_dbd_odbc-1 PROPERTIES COMPILE_FLAGS "-DAPR_DECLARE_EXPORT=1 -DAPU_DECLARE_EXPORT=1 -DDLL_NAME=apr_dbd_odbc")
+ENDIF()
+
+IF(APR_HAS_LDAP)
+ ADD_LIBRARY(apr_ldap-1 SHARED ldap/apr_ldap_init.c ldap/apr_ldap_option.c
+ ldap/apr_ldap_rebind.c libaprutil.rc)
+ SET(install_targets ${install_targets} apr_ldap-1)
+ SET(install_bin_pdb ${install_bin_pdb} ${PROJECT_BINARY_DIR}/apr_ldap-1.pdb)
+ TARGET_LINK_LIBRARIES(apr_ldap-1 libaprutil-1 ${APR_LIBRARIES} ${LDAP_LIBRARIES})
+ SET_TARGET_PROPERTIES(apr_ldap-1 PROPERTIES COMPILE_DEFINITIONS "WINNT")
+ SET_TARGET_PROPERTIES(apr_ldap-1 PROPERTIES COMPILE_FLAGS "-DAPR_DECLARE_EXPORT=1 -DAPU_DECLARE_EXPORT=1 -DDLL_NAME=apr_ldap")
+ SET(apr_ldap_libraries apr_ldap-1)
+ELSE()
+ SET(apr_ldap_libraries)
+ENDIF()
+
+IF(APR_BUILD_TESTAPR)
+ ENABLE_TESTING()
+ # Create a "check" target that displays test program output to the console.
+ ADD_CUSTOM_TARGET(check COMMAND ${CMAKE_CTEST_COMMAND} --verbose)
+
+ # copy data files to build directory so that we can run programs from there
+ EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E make_directory
+ ${PROJECT_BINARY_DIR}/data)
+ EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E copy_if_different
+ ${PROJECT_SOURCE_DIR}/test/data/billion-laughs.xml
+ ${PROJECT_BINARY_DIR}/data/billion-laughs.xml)
+
+ IF(TEST_STATIC_LIBS)
+ SET(whichapr aprutil-1)
+ SET(apiflag "-DAPR_DECLARE_STATIC -DAPU_DECLARE_STATIC")
+ ELSE()
+ SET(whichapr libaprutil-1)
+ SET(apiflag)
+ ENDIF()
+
+ ADD_EXECUTABLE(testall ${APR_TEST_SOURCES})
+ TARGET_LINK_LIBRARIES(testall ${whichapr} ${apr_ldap_libraries} ${XMLLIB_LIBRARIES} ${LDAP_LIBRARIES})
+ IF(apiflag)
+ SET_TARGET_PROPERTIES(testall PROPERTIES COMPILE_FLAGS ${apiflag})
+ ENDIF()
+ ADD_TEST(NAME testall COMMAND testall)
+
+ ADD_EXECUTABLE(dbd test/dbd.c)
+ TARGET_LINK_LIBRARIES(dbd ${whichapr})
+ IF(apiflag)
+ SET_TARGET_PROPERTIES(dbd PROPERTIES COMPILE_FLAGS ${apiflag})
+ ENDIF()
+
+ # dbd is run multiple times with different parameters.
+ FOREACH(somedbd ${dbd_drivers})
+ ADD_TEST(NAME dbd-${somedbd} COMMAND dbd ${somedbd})
+ ENDFOREACH()
+
+ENDIF (APR_BUILD_TESTAPR)
+
+# Installation
+
+INSTALL(TARGETS ${install_targets}
+ RUNTIME DESTINATION bin
+ LIBRARY DESTINATION lib
+ ARCHIVE DESTINATION lib
+ )
+
+IF(INSTALL_PDB)
+ INSTALL(FILES ${install_bin_pdb}
+ DESTINATION bin
+ CONFIGURATIONS RelWithDebInfo Debug)
+ENDIF()
+
+INSTALL(FILES ${APR_PUBLIC_HEADERS_STATIC} ${APR_PUBLIC_HEADERS_GENERATED} DESTINATION include)
+
+STRING(TOUPPER "${CMAKE_BUILD_TYPE}" buildtype)
+MESSAGE(STATUS "")
+MESSAGE(STATUS "")
+MESSAGE(STATUS "APR-Util configuration summary:")
+MESSAGE(STATUS "")
+MESSAGE(STATUS " Build type ...................... : ${CMAKE_BUILD_TYPE}")
+MESSAGE(STATUS " Install .pdb (if available)...... : ${INSTALL_PDB}")
+MESSAGE(STATUS " Install prefix .................. : ${CMAKE_INSTALL_PREFIX}")
+MESSAGE(STATUS " C compiler ...................... : ${CMAKE_C_COMPILER}")
+MESSAGE(STATUS " APR include directory ........... : ${APR_INCLUDE_DIR}")
+MESSAGE(STATUS " APR libraries ................... : ${APR_LIBRARIES}")
+MESSAGE(STATUS " DBD ODBC driver ................. : ${APU_HAVE_ODBC}")
+MESSAGE(STATUS " APU_HAVE_CRYPTO ................. : ${APU_HAVE_CRYPTO}")
+MESSAGE(STATUS " APR_HAS_LDAP .................... : ${APR_HAS_LDAP}")
+MESSAGE(STATUS " Build test suite ................ : ${APR_BUILD_TESTAPR}")
+IF(TEST_STATIC_LIBS)
+MESSAGE(STATUS " (testing static libraries)")
+ELSE()
+MESSAGE(STATUS " (testing dynamic libraries)")
+ENDIF()
Modified: head/contrib/apr-util/LICENSE
==============================================================================
--- head/contrib/apr-util/LICENSE Mon Jun 1 10:08:18 2020 (r361691)
+++ head/contrib/apr-util/LICENSE Mon Jun 1 10:14:45 2020 (r361692)
@@ -312,6 +312,22 @@ For the crypto\apr_md4.c component:
* documentation and/or software.
*/
+For the crypto\crypt_blowfish.c(.h) component:
+
+ * Written by Solar Designer <solar at openwall.com> in 1998-2011.
+ * No copyright is claimed, and the software is hereby placed in the public
+ * domain. In case this attempt to disclaim copyright and place the software
+ * in the public domain is deemed null and void, then the software is
+ * Copyright (c) 1998-2011 Solar Designer and it is hereby released to the
+ * general public under the following terms:
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted.
+ *
+ * There's ABSOLUTELY NO WARRANTY, express or implied.
+
+ See crypto/crypt_blowfish.c for more information.
+
For the include\apr_md4.h component:
*
Modified: head/contrib/apr-util/Makefile.in
==============================================================================
--- head/contrib/apr-util/Makefile.in Mon Jun 1 10:08:18 2020 (r361691)
+++ head/contrib/apr-util/Makefile.in Mon Jun 1 10:14:45 2020 (r361692)
@@ -15,8 +15,8 @@ APRUTIL_LDFLAGS = @APRUTIL_LDFLAGS@
APRUTIL_LIBS = @APRUTIL_LIBS@
TARGET_LIB = lib at APRUTIL_LIBNAME@.la
-INSTALL_SUBDIRS = @APR_ICONV_DIR@ @APR_XML_DIR@
-EXTRA_SOURCE_DIRS = @APR_ICONV_DIR@ @APR_XML_DIR@
+INSTALL_SUBDIRS = @APR_ICONV_DIR@
+EXTRA_SOURCE_DIRS = @APR_ICONV_DIR@
APRUTIL_PCFILE = apr-util-$(APRUTIL_MAJOR_VERSION).pc
APU_CONFIG = apu-$(APRUTIL_MAJOR_VERSION)-config
INSTALL = @INSTALL@
@@ -35,7 +35,6 @@ LDADD_dbd_oracle = @LDADD_dbd_oracle@
LDADD_dbd_sqlite2 = @LDADD_dbd_sqlite2@
LDADD_dbd_sqlite3 = @LDADD_dbd_sqlite3@
LDADD_dbd_mysql = @LDADD_dbd_mysql@
-LDADD_dbd_freetds = @LDADD_dbd_freetds@
LDADD_dbd_odbc = @LDADD_dbd_odbc@
LDADD_dbm_db = @LDADD_dbm_db@
LDADD_dbm_gdbm = @LDADD_dbm_gdbm@
@@ -43,6 +42,7 @@ LDADD_dbm_ndbm = @LDADD_dbm_ndbm@
LDADD_ldap = @LDADD_ldap@
LDADD_crypto_openssl = @LDADD_crypto_openssl@
LDADD_crypto_nss = @LDADD_crypto_nss@
+LDADD_crypto_commoncrypto = @LDADD_crypto_commoncrypto@
TARGETS = $(TARGET_LIB) aprutil.exp apu-config.out $(APU_MODULES)
@@ -50,7 +50,7 @@ TARGETS = $(TARGET_LIB) aprutil.exp apu-config.out $(A
@INCLUDE_RULES@
@INCLUDE_OUTPUTS@
-CLEAN_SUBDIRS = test @APR_ICONV_DIR@ @APR_XML_DIR@
+CLEAN_SUBDIRS = test @APR_ICONV_DIR@
CLEAN_TARGETS = exports.c export_vars.c aprutil.exp .make.dirs apu-config.out
DISTCLEAN_TARGETS = config.cache config.log config.status libtool \
Modified: head/contrib/apr-util/Makefile.win
==============================================================================
--- head/contrib/apr-util/Makefile.win Mon Jun 1 10:08:18 2020 (r361691)
+++ head/contrib/apr-util/Makefile.win Mon Jun 1 10:14:45 2020 (r361692)
@@ -51,6 +51,13 @@
#
# CRYPTO_LIST="nss openssl"
#
+# Provide the XML_PARSER argument after configuring LIB and INCLUDE with
+# the expat path of the corresponding xml parser, e.g. libexpatMT to choose
+# static, or libexpat (default) to choose the dynamic library for aprutil-1.dll
+# (Static libaprutil-1.lib always presumes libexpatMT with XML_STATIC flag.)
+#
+# XML_PARSER="libexpat"
+#
# For example;
#
# nmake -f Makefile.win PREFIX=C:\APR buildall checkall installall clean
@@ -73,6 +80,20 @@ USEDSW=1
PREFIX=..\apr-dist
+!IF EXIST("..\openssl")
+!IF EXIST("..\openssl\libcrypto.lib")
+SSLOPT=_HAVE_OSSL110=1
+!ENDIF
+!ENDIF
+
+# Legacy default (and unwise alternative) for libapr-1.dll is libexpatMT
+XML_PARSER="libexpat"
+!IF "$(XML_PARSER)" == "libexpat"
+XMLOPT=XML_PARSER=$(XML_PARSER)
+!ELSE
+XMLOPT=XML_PARSER=$(XML_PARSER) XML_OPTIONS="/D XML_STATIC"
+!ENDIF
+
!IF [$(COMSPEC) /c cl /nologo /? \
| $(SystemRoot)\System32\find.exe "x64" >NUL ] == 0
ARCH=x64 Release
@@ -197,11 +218,9 @@ buildall:
BUILD_MODE="$(ARCH)" BIND_MODE=shared
cd ..
!ENDIF
- cd $(APU_PATH)\xml\expat\lib
- $(MAKE) $(MAKEOPT) -f xml.mak CFG="xml - $(ARCH)" RECURSE=0 $(CTARGET)
- cd ..\..\..
- $(MAKE) $(MAKEOPT) -f aprutil.mak CFG="aprutil - $(ARCH)" RECURSE=0 $(CTARGET)
- $(MAKE) $(MAKEOPT) -f libaprutil.mak CFG="libaprutil - $(ARCH)" RECURSE=0 $(CTARGET)
+ cd $(APU_PATH)
+ $(MAKE) $(MAKEOPT) $(SSLOPT) $(XMLOPT) -f aprutil.mak CFG="aprutil - $(ARCH)" RECURSE=0 $(CTARGET)
+ $(MAKE) $(MAKEOPT) $(SSLOPT) $(XMLOPT) -f libaprutil.mak CFG="libaprutil - $(ARCH)" RECURSE=0 $(CTARGET)
cd ldap
$(MAKE) $(MAKEOPT) -f apr_ldap.mak CFG="apr_ldap - $(ARCH)" RECURSE=0 $(CTARGET)
cd ..
@@ -215,7 +234,7 @@ buildall:
cd ..
cd crypto
for %d in ($(CRYPTO_LIST) x) do if not %d == x \
- $(MAKE) $(MAKEOPT) -f apr_crypto_%d.mak CFG="apr_crypto_%d - $(ARCH)" RECURSE=0 $(CTARGET)
+ $(MAKE) $(MAKEOPT) $(SSLOPT) -f apr_crypto_%d.mak CFG="apr_crypto_%d - $(ARCH)" RECURSE=0 $(CTARGET)
cd ..
!ELSEIF $(USESLN) == 1
@@ -306,7 +325,7 @@ checkapr:
checkapu:
cd $(APU_PATH)
cd test
- $(MAKE) $(MAKEOPT) -f Makefile.win MODEL=static \
+ $(MAKE) $(MAKEOPT) -f Makefile.win MODEL=static \
OUTDIR=$(LIBSPATH) APROUTDIR=$(LIBSOSPATH) \
APR_PATH=..\$(APR_PATH) API_PATH=..\$(API_PATH) check
$(MAKE) $(MAKEOPT) -f Makefile.win MODEL=dynamic \
Modified: head/contrib/apr-util/NOTICE
==============================================================================
--- head/contrib/apr-util/NOTICE Mon Jun 1 10:08:18 2020 (r361691)
+++ head/contrib/apr-util/NOTICE Mon Jun 1 10:14:45 2020 (r361692)
@@ -1,5 +1,5 @@
Apache Portable Runtime Utility Library
-Copyright (c) 2000-2014 The Apache Software Foundation.
+Copyright (c) 2000-2016 The Apache Software Foundation.
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
Modified: head/contrib/apr-util/NWGNUmakefile
==============================================================================
--- head/contrib/apr-util/NWGNUmakefile Mon Jun 1 10:08:18 2020 (r361691)
+++ head/contrib/apr-util/NWGNUmakefile Mon Jun 1 10:14:45 2020 (r361692)
@@ -261,9 +261,11 @@ FILES_lib_objs = \
$(OBJDIR)/apr_memcache.o \
$(OBJDIR)/apr_passwd.o \
$(OBJDIR)/apr_queue.o \
+ $(OBJDIR)/apr_redis.o \
$(OBJDIR)/apr_reslist.o \
$(OBJDIR)/apr_rmm.o \
$(OBJDIR)/apr_sha1.o \
+ $(OBJDIR)/apr_siphash.o \
$(OBJDIR)/apu_version.o \
$(OBJDIR)/getuuid.o \
$(OBJDIR)/uuid.o \
@@ -296,7 +298,7 @@ install :: nlms FORCE
# Any specialized rules here
#
-vpath %.c buckets:crypto:dbd:dbm:dbm/sdbm:encoding:hooks:ldap:memcache:misc:strmatch:uri:xlate:xml
+vpath %.c buckets:crypto:dbd:dbm:dbm/sdbm:encoding:hooks:ldap:memcache:redis:misc:strmatch:uri:xlate:xml
#
# Include the 'tail' makefile that has targets that depend on variables defined
Modified: head/contrib/apr-util/README
==============================================================================
--- head/contrib/apr-util/README Mon Jun 1 10:08:18 2020 (r361691)
+++ head/contrib/apr-util/README Mon Jun 1 10:14:45 2020 (r361692)
@@ -34,7 +34,7 @@ Apache Portable Runtime Utility Library README
String filename-style pattern matching
URI Parsing
Charset translation (iconv based)
- XML parsing (expat based)
+ XML parsing (expat)
For a more complete list, please refer to the following URLs:
@@ -66,7 +66,7 @@ for your compiled code. Similarly, the bindings for p
such as Oracle (--with-oracle option) must also be explicitly enabled.
On windows, selection of supported drivers is via the environment values
-DBD_LIST (for freetds, mysql, oracle, pgsql, sqlite2 and/or sqlite3)
+DBD_LIST (for mysql, oracle, pgsql, sqlite2 and/or sqlite3)
and DBM_LIST (db and/or gdbm). DBD odbc and DBM sdbm are unconditionally
compiled and installed, do not include these in the list.
Copied: head/contrib/apr-util/README.FREETDS (from r361691, vendor/apr-util/dist/README.FREETDS)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/contrib/apr-util/README.FREETDS Mon Jun 1 10:14:45 2020 (r361692, copy of r361691, vendor/apr-util/dist/README.FREETDS)
@@ -0,0 +1,11 @@
+The APR DBD Driver for FreeTDS has been removed from the build.
+It is known to have problems, and we are not able to maintain it.
+
+The source code is still available. If you want it and are able
+to manage maintenance for yourself, you can patch the build and
+work through issues that affect you, but you're on your own.
+
+We expect that for most users, the ODBC driver will serve as
+an alternative.
+
+Sorry.
Copied: head/contrib/apr-util/README.cmake (from r361691, vendor/apr-util/dist/README.cmake)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/contrib/apr-util/README.cmake Mon Jun 1 10:14:45 2020 (r361692, copy of r361691, vendor/apr-util/dist/README.cmake)
@@ -0,0 +1,139 @@
+Experimental cmake-based build support for APR-Util on Microsoft Windows
+
+Status
+------
+
+This build support is currently intended only for Microsoft Windows.
+Only Windows NT-based systems can be targeted. (The traditional
+Windows build support for APR can target Windows 9x as well.)
+
+This build support is experimental. Specifically,
+
+* It does not support all features of APR-Util.
+* Some components may not be built correctly and/or in a manner
+ compatible with the previous Windows build support.
+* Build interfaces, such as the mechanisms which are used to enable
+ optional functionality or specify prerequisites, may change from
+ release to release as feedback is received from users and bugs and
+ limitations are resolved.
+
+Important: Refer to the "Known Bugs and Limitations" section for further
+ information.
+
+ It is beyond the scope of this document to document or explain
+ how to utilize the various cmake features, such as different
+ build backends or provisions for finding support libraries.
+
+ Please refer to the cmake documentation for additional information
+ that applies to building any project with cmake.
+
+Prerequisites
+-------------
+
+The following tools must be in PATH:
+
+* cmake, version 2.8 or later
+ cmake version 3.1.3 or later is required to work with current OpenSSL
+ releases. (OpenSSL is an optional prerequisite of APR-Util.)
+* If using a command-line compiler: compiler and linker and related tools
+ (Refer to the cmake documentation for more information.)
+
+The following support libraries are mandatory:
+
+* APR 1.4.x or APR 1.5.x, built with cmake
+
+Optional support libraries allow optional features of APR to be enabled:
+
+* OpenSSL
+* many others potentially, though the build support isn't currently
+ implemented
+
+How to build
+------------
+
+1. cd to a clean directory for building (i.e., don't build in your
+ source tree)
+
+2. Some cmake backends may want your compile tools in PATH. (Hint: "Visual
+ Studio Command Prompt")
+
+3. set CMAKE_LIBRARY_PATH=d:\path\to\prereq1\lib;d:\path\to\prereq2\lib;...
+
+4. set CMAKE_INCLUDE_PATH=d:\path\to\prereq1\include;d:\path\to\prereq2\include;...
+
+5. cmake -G "some backend, like 'NMake Makefiles'"
+ -DCMAKE_INSTALL_PREFIX=d:/path/to/aprinst
+ -DAPR-Util-specific-flags
+ d:/path/to/aprutilsource
+
+ If APR 1.x was installed to a different directory than APR-Util,
+ also pass these additional arguments:
+
+ -DAPR_INCLUDE_DIR=d:/path/to/apr1inst/include
+ -DAPR_LIBRARIES=d:/path/to/apr1inst/lib/libapr-1.lib
+
+ Alternately, use cmake-gui and update settings in the GUI.
+
+ APR-Util feature flags:
+
+ APU_HAVE_CRYPTO Build crypt support (only the OpenSSL
+ implementation is currently supported)
+ Default: OFF
+ APU_HAVE_ODBC Build ODBC DBD driver
+ Default: ON
+ APR_BUILD_TESTAPR Build APR-Util test suite
+ Default: OFF
+ TEST_STATIC_LIBS Build the test suite to test the APR static
+ library instead of the APR dynamic library.
+ Default: OFF
+ In order to build the test suite against both
+ static and dynamic libraries, separate builds
+ will be required, one with TEST_STATIC_LIBS
+ set to ON.
+ INSTALL_PDB Install .pdb files if generated.
+ Default: ON
+
+ CMAKE_C_FLAGS_RELEASE, _DEBUG, _RELWITHDEBINFO, _MINSIZEREL
+
+ CMAKE_BUILD_TYPE
+
+ For NMake Makefiles the choices are at least DEBUG, RELEASE,
+ RELWITHDEBINFO, and MINSIZEREL
+ Other backends make have other selections.
+
+6. build using chosen backend (e.g., "nmake install")
+
+Known Bugs and Limitations
+--------------------------
+
+* If include/apu.h or other generated files have been created in the source
+ directory by another build system, they will be used unexpectedly and
+ cause the build to fail.
+* Options should be provided for remaining features, along with finding any
+ necessary libraries
+ + DBM:
+ . APU_HAVE_GDBM
+ . APU_HAVE_NDBM
+ . APU_HAVE_DB
+ + DBD:
+ . APU_HAVE_PGSQL
+ . APU_HAVE_MYSQL
+ . APU_HAVE_SQLITE3
+ . APU_HAVE_SQLITE2
+ . APU_HAVE_ORACLE
+ + CRYPTO:
+ . APU_HAVE_NSS
+ + XLATE, APU_HAVE_ICONV (no way to consume an apr-iconv build yet)
+* Static builds of APR modules are not supported.
+* CHANGES/LICENSE/NOTICE is not installed, unlike Makefile.win.
+ (But unlike Makefile.win we want to call them APR-Util-CHANGES.txt
+ and so on.) But perhaps that is a job for a higher-level script.
+
+Generally:
+
+* Many APR-Util features have not been tested with this build.
+* Developers need to examine the existing Windows build in great detail and see
+ what is missing from the cmake-based build, whether a feature or some build
+ nuance.
+* Any feedback you can provide on your experiences with this build will be
+ helpful.
Modified: head/contrib/apr-util/apr-util.spec
==============================================================================
--- head/contrib/apr-util/apr-util.spec Mon Jun 1 10:08:18 2020 (r361691)
+++ head/contrib/apr-util/apr-util.spec Mon Jun 1 10:14:45 2020 (r361692)
@@ -3,7 +3,7 @@
Summary: Apache Portable Runtime Utility library
Name: apr-util
-Version: 1.5.4
+Version: 1.6.1
Release: 1
License: Apache Software License
Group: System Environment/Libraries
@@ -70,16 +70,6 @@ Requires: apr-util = %{version}-%{release}
This package provides the SQLite driver for the apr-util DBD
(database abstraction) interface.
-%package freetds
-Group: Development/Libraries
-Summary: APR utility library FreeTDS DBD driver
-BuildRequires: freetds-devel
-Requires: apr-util = %{version}-%{release}
-
-%description freetds
-This package provides the FreeTDS driver for the apr-util DBD
-(database abstraction) interface.
-
%package odbc
Group: Development/Libraries
Summary: APR utility library ODBC DBD driver
@@ -124,7 +114,7 @@ This package provides crypto support for apr-util base
%configure --with-apr=%{_prefix} \
--includedir=%{_includedir}/apr-%{apuver} \
--with-ldap --without-gdbm \
- --with-sqlite3 --with-pgsql --with-mysql --with-freetds --with-odbc \
+ --with-sqlite3 --with-pgsql --with-mysql --with-odbc \
--with-berkeley-db \
--with-crypto --with-openssl --with-nss \
--without-sqlite2
@@ -176,10 +166,6 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root,-)
%{_libdir}/apr-util-%{apuver}/apr_dbd_sqlite*
-%files freetds
-%defattr(-,root,root,-)
-%{_libdir}/apr-util-%{apuver}/apr_dbd_freetds*
-
%files odbc
%defattr(-,root,root,-)
%{_libdir}/apr-util-%{apuver}/apr_dbd_odbc*
@@ -203,7 +189,7 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/libaprutil-%{apuver}.so
%{_libdir}/pkgconfig/apr-util-%{apuver}.pc
%{_includedir}/apr-%{apuver}/*.h
-%doc --parents html
+%doc html
%changelog
* Tue Jun 22 2004 Graham Leggett <minfrin at sharp.fm> 1.0.0-1
Modified: head/contrib/apr-util/aprutil.dsw
==============================================================================
--- head/contrib/apr-util/aprutil.dsw Mon Jun 1 10:08:18 2020 (r361691)
+++ head/contrib/apr-util/aprutil.dsw Mon Jun 1 10:14:45 2020 (r361692)
@@ -51,24 +51,6 @@ Package=<4>
###############################################################################
-Project: "apr_dbd_freetds"=".\dbd\apr_dbd_freetds.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name libapr
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libaprutil
- End Project Dependency
-}}}
-
-###############################################################################
-
Project: "apr_dbd_mysql"=".\dbd\apr_dbd_mysql.dsp" - Package Owner=<4>
Package=<5>
@@ -275,9 +257,6 @@ Package=<4>
Begin Project Dependency
Project_Dep_Name apriconv
End Project Dependency
- Begin Project Dependency
- Project_Dep_Name xml
- End Project Dependency
}}}
###############################################################################
@@ -383,9 +362,6 @@ Package=<4>
Begin Project Dependency
Project_Dep_Name libapriconv_ces_modules
End Project Dependency
- Begin Project Dependency
- Project_Dep_Name xml
- End Project Dependency
}}}
###############################################################################
@@ -449,18 +425,6 @@ Package=<4>
Begin Project Dependency
Project_Dep_Name libapr
End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "xml"=".\xml\expat\lib\xml.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-all
mailing list