Author: peter Date: Mon Jul 1 07:00:12 2013 New Revision: 252454 URL: http://svnweb.freebsd.org/changeset/base/252454
Log: Update to current configuration. Modified: head/usr.bin/svn/lib/libapr_util/apr_ldap.h head/usr.bin/svn/lib/libapr_util/apu.h head/usr.bin/svn/lib/libapr_util/apu_config.h Modified: head/usr.bin/svn/lib/libapr_util/apr_ldap.h ============================================================================== --- head/usr.bin/svn/lib/libapr_util/apr_ldap.h Mon Jul 1 06:58:35 2013 (r252453) +++ head/usr.bin/svn/lib/libapr_util/apr_ldap.h Mon Jul 1 07:00:12 2013 (r252454) @@ -41,6 +41,7 @@ #define APR_HAS_MOZILLA_LDAPSDK 0 #define APR_HAS_OPENLDAP_LDAPSDK 0 #define APR_HAS_MICROSOFT_LDAPSDK 0 +#define APR_HAS_TIVOLI_LDAPSDK 0 #define APR_HAS_ZOS_LDAPSDK 0 #define APR_HAS_OTHER_LDAPSDK 0 @@ -58,7 +59,11 @@ * apr_ldap_url_parse*() functions have been rewritten specifically for * APR, so the APR_HAS_LDAP_URL_PARSE macro is forced to zero. */ +#if APR_HAS_TIVOLI_LDAPSDK +#define APR_HAS_LDAP_SSL 0 +#else #define APR_HAS_LDAP_SSL 1 +#endif #define APR_HAS_LDAP_URL_PARSE 0 #if APR_HAS_OPENLDAP_LDAPSDK && !defined(LDAP_DEPRECATED) @@ -98,15 +103,19 @@ /* * For ldap function calls that input a size limit on the number of returned elements * Some SDKs do not have the define for LDAP_DEFAULT_LIMIT (-1) or LDAP_NO_LIMIT (0) + * LDAP_DEFAULT_LIMIT is preferred as it allows inheritance from whatever the SDK + * or process is configured for. */ -#if APR_HAS_ZOS_LDAPSDK -#define APR_LDAP_SIZELIMIT LDAP_NO_LIMIT -#else #ifdef LDAP_DEFAULT_LIMIT #define APR_LDAP_SIZELIMIT LDAP_DEFAULT_LIMIT #else -#define APR_LDAP_SIZELIMIT -1 /* equivalent to LDAP_DEFAULT_LIMIT */ +#ifdef LDAP_NO_LIMIT +#define APR_LDAP_SIZELIMIT LDAP_NO_LIMIT +#endif #endif + +#ifndef APR_LDAP_SIZELIMIT +#define APR_LDAP_SIZELIMIT 0 /* equivalent to LDAP_NO_LIMIT, and what goes on the wire */ #endif /* @@ -147,10 +156,43 @@ typedef struct apr_ldap_err_t { } #endif +/* The MS SDK returns LDAP_UNAVAILABLE when the backend has closed the connection + * between LDAP calls. Protect with APR_HAS_MICROSOFT_LDAPSDK in case someone + * manually chooses another SDK on Windows + */ +#if APR_HAS_MICROSOFT_LDAPSDK +#define APR_LDAP_IS_SERVER_DOWN(s) ((s) == LDAP_SERVER_DOWN \ + || (s) == LDAP_UNAVAILABLE) +#else +#define APR_LDAP_IS_SERVER_DOWN(s) ((s) == LDAP_SERVER_DOWN) +#endif + +/* These symbols are not actually exported in a DSO build, but mapped into + * a private exported function array for apr_ldap_stub to bind dynamically. + * Rename them appropriately to protect the global namespace. + */ +#ifdef APU_DSO_LDAP_BUILD + +#define apr_ldap_info apr__ldap_info +#define apr_ldap_init apr__ldap_init +#define apr_ldap_ssl_init apr__ldap_ssl_init +#define apr_ldap_ssl_deinit apr__ldap_ssl_deinit +#define apr_ldap_get_option apr__ldap_get_option +#define apr_ldap_set_option apr__ldap_set_option +#define apr_ldap_rebind_init apr__ldap_rebind_init +#define apr_ldap_rebind_add apr__ldap_rebind_add +#define apr_ldap_rebind_remove apr__ldap_rebind_remove + +#define APU_DECLARE_LDAP(type) type +#else +#define APU_DECLARE_LDAP(type) APU_DECLARE(type) +#endif + #include "apr_ldap_url.h" #include "apr_ldap_init.h" #include "apr_ldap_option.h" +#include "apr_ldap_rebind.h" -/** @} */ #endif /* APR_HAS_LDAP */ +/** @} */ #endif /* APU_LDAP_H */ Modified: head/usr.bin/svn/lib/libapr_util/apu.h ============================================================================== --- head/usr.bin/svn/lib/libapr_util/apu.h Mon Jul 1 06:58:35 2013 (r252453) +++ head/usr.bin/svn/lib/libapr_util/apu.h Mon Jul 1 07:00:12 2013 (r252454) @@ -48,25 +48,41 @@ * use the most appropriate calling convention. Public APR functions with * variable arguments must use APU_DECLARE_NONSTD(). * - * @deffunc APU_DECLARE(rettype) apr_func(args); + * @fn APU_DECLARE(rettype) apr_func(args); */ #define APU_DECLARE(type) type /** * The public APR-UTIL functions using variable arguments are declared with * APU_DECLARE_NONSTD(), as they must use the C language calling convention. * - * @deffunc APU_DECLARE_NONSTD(rettype) apr_func(args, ...); + * @fn APU_DECLARE_NONSTD(rettype) apr_func(args, ...); */ #define APU_DECLARE_NONSTD(type) type /** * The public APR-UTIL variables are declared with APU_DECLARE_DATA. * This assures the appropriate indirection is invoked at compile time. * - * @deffunc APU_DECLARE_DATA type apr_variable; - * @tip APU_DECLARE_DATA extern type apr_variable; syntax is required for + * @fn APU_DECLARE_DATA type apr_variable; + * @note APU_DECLARE_DATA extern type apr_variable; syntax is required for * declarations within headers to properly import the variable. */ #define APU_DECLARE_DATA + +#if !defined(WIN32) || defined(APU_MODULE_DECLARE_STATIC) +/** + * Declare a dso module's exported module structure as APU_MODULE_DECLARE_DATA. + * + * Unless APU_MODULE_DECLARE_STATIC is defined at compile time, symbols + * declared with APU_MODULE_DECLARE_DATA are always exported. + * @code + * module APU_MODULE_DECLARE_DATA mod_tag + * @endcode + */ +#define APU_MODULE_DECLARE_DATA +#else +#define APU_MODULE_DECLARE_DATA __declspec(dllexport) +#endif + /* * we always have SDBM (it's in our codebase) */ @@ -77,12 +93,19 @@ #if APU_HAVE_DB #define APU_HAVE_DB_VERSION 0 -#endif /* APU_HAVE_DB */ +#endif #define APU_HAVE_PGSQL 0 #define APU_HAVE_MYSQL 0 #define APU_HAVE_SQLITE3 0 #define APU_HAVE_SQLITE2 0 +#define APU_HAVE_ORACLE 0 +#define APU_HAVE_FREETDS 0 +#define APU_HAVE_ODBC 0 + +#define APU_HAVE_CRYPTO 0 +#define APU_HAVE_OPENSSL 0 +#define APU_HAVE_NSS 0 #define APU_HAVE_APR_ICONV 0 #define APU_HAVE_ICONV 0 Modified: head/usr.bin/svn/lib/libapr_util/apu_config.h ============================================================================== --- head/usr.bin/svn/lib/libapr_util/apu_config.h Mon Jul 1 06:58:35 2013 (r252453) +++ head/usr.bin/svn/lib/libapr_util/apu_config.h Mon Jul 1 07:00:12 2013 (r252454) @@ -6,9 +6,18 @@ /* Define if the system crypt() function is threadsafe */ /* #undef APU_CRYPT_THREADSAFE */ +/* Define to 1 if modular components are built as DSOs */ +/* #undef APU_DSO_BUILD */ + +/* Define to be absolute path to DSO directory */ +/* #undef APU_DSO_LIBDIR */ + /* Define if the inbuf parm to iconv() is const char ** */ /* #undef APU_ICONV_INBUF_CONST */ +/* Define that OpenSSL uses const buffers */ +#define CRYPTO_OPENSSL_CONST_BUFFERS 1 + /* Define if crypt_r has uses CRYPTD */ /* #undef CRYPT_R_CRYPTD */ @@ -21,9 +30,16 @@ /* Define to 1 if you have the `crypt_r' function. */ /* #undef HAVE_CRYPT_R */ +/* Define to 1 if you have the declaration of `EVP_PKEY_CTX_new', and to 0 if + you don't. */ +#define HAVE_DECL_EVP_PKEY_CTX_NEW 1 + /* Define if expat.h is available */ #define HAVE_EXPAT_H 1 +/* Define to 1 if you have the <freetds/sybdb.h> header file. */ +/* #undef HAVE_FREETDS_SYBDB_H */ + /* Define to 1 if you have the <iconv.h> header file. */ /* #undef HAVE_ICONV_H */ @@ -42,9 +58,6 @@ /* Define to 1 if you have the <ldap_ssl.h> header file. */ /* #undef HAVE_LDAP_SSL_H */ -/* Define to 1 if you have the `lber' library (-llber). */ -/* #undef HAVE_LIBLBER */ - /* Define to 1 if you have the <libpq-fe.h> header file. */ /* #undef HAVE_LIBPQ_FE_H */ @@ -57,18 +70,57 @@ /* Define to 1 if you have the <mysql/mysql.h> header file. */ /* #undef HAVE_MYSQL_MYSQL_H */ +/* Define to 1 if you have the <mysql/my_global.h> header file. */ +/* #undef HAVE_MYSQL_MY_GLOBAL_H */ + +/* Define to 1 if you have the <mysql/my_sys.h> header file. */ +/* #undef HAVE_MYSQL_MY_SYS_H */ + +/* Define to 1 if you have the <my_global.h> header file. */ +/* #undef HAVE_MY_GLOBAL_H */ + +/* Define to 1 if you have the <my_sys.h> header file. */ +/* #undef HAVE_MY_SYS_H */ + /* Define to 1 if you have the `nl_langinfo' function. */ #define HAVE_NL_LANGINFO 1 +/* Define to 1 if you have the <nss.h> header file. */ +/* #undef HAVE_NSS_H */ + +/* Define to 1 if you have the <nss/nss.h> header file. */ +/* #undef HAVE_NSS_NSS_H */ + +/* Define to 1 if you have the <nss/pk11pub.h> header file. */ +/* #undef HAVE_NSS_PK11PUB_H */ + +/* Define to 1 if you have the <oci.h> header file. */ +/* #undef HAVE_OCI_H */ + +/* Define to 1 if you have the <odbc/sql.h> header file. */ +/* #undef HAVE_ODBC_SQL_H */ + +/* Define to 1 if you have the <openssl/x509.h> header file. */ +#define HAVE_OPENSSL_X509_H 1 + +/* Define to 1 if you have the <pk11pub.h> header file. */ +/* #undef HAVE_PK11PUB_H */ + /* Define to 1 if you have the <postgresql/libpq-fe.h> header file. */ /* #undef HAVE_POSTGRESQL_LIBPQ_FE_H */ +/* Define to 1 if you have the <prerror.h> header file. */ +/* #undef HAVE_PRERROR_H */ + /* Define to 1 if you have the <sqlite3.h> header file. */ /* #undef HAVE_SQLITE3_H */ /* Define to 1 if you have the <sqlite.h> header file. */ /* #undef HAVE_SQLITE_H */ +/* Define to 1 if you have the <sql.h> header file. */ +/* #undef HAVE_SQL_H */ + /* Define to 1 if you have the <stdint.h> header file. */ #define HAVE_STDINT_H 1 @@ -81,6 +133,9 @@ /* Define to 1 if you have the <string.h> header file. */ #define HAVE_STRING_H 1 +/* Define to 1 if you have the <sybdb.h> header file. */ +/* #undef HAVE_SYBDB_H */ + /* Define to 1 if you have the <sys/stat.h> header file. */ #define HAVE_SYS_STAT_H 1 @@ -99,6 +154,9 @@ /* Define if xml/xmlparse.h is available */ /* #undef HAVE_XML_XMLPARSE_H */ +/* Define if ldap_set_rebind_proc takes three arguments */ +/* #undef LDAP_SET_REBIND_PROC_THREE */ + /* Define to the address where bug reports for this package should be sent. */ #define PACKAGE_BUGREPORT "" @@ -111,6 +169,9 @@ /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "" +/* Define to the home page for this package. */ +#define PACKAGE_URL "" + /* Define to the version of this package. */ #define PACKAGE_VERSION "" _______________________________________________ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"