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

2 files changed, 11 insertions, 7 deletions

diff --git a/usr.bin/svn/lib/libapr_util/apu.h b/usr.bin/svn/lib/libapr_util/apu.h
index 575d633162d7..875e28c05e74 100644
--- a/usr.bin/svn/lib/libapr_util/apu.h
+++ b/usr.bin/svn/lib/libapr_util/apu.h
@@ -114,12 +114,12 @@
 #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        1
 #define APU_HAVE_OPENSSL       1
 #define APU_HAVE_NSS           0
+#define APU_HAVE_COMMONCRYPTO  0
 
 #define APU_HAVE_APR_ICONV     0
 #ifndef APU_HAVE_ICONV
diff --git a/usr.bin/svn/lib/libapr_util/apu_config.h b/usr.bin/svn/lib/libapr_util/apu_config.h
index ac247d06b132..1e709f71da7e 100644
--- a/usr.bin/svn/lib/libapr_util/apu_config.h
+++ b/usr.bin/svn/lib/libapr_util/apu_config.h
@@ -27,6 +27,10 @@
 /* Define if CODESET is defined in langinfo.h */
 #define HAVE_CODESET 1
 
+/* Define to 1 if you have the <CommonCrypto/CommonKeyDerivation.h> header
+   file. */
+/* #undef HAVE_COMMONCRYPTO_COMMONKEYDERIVATION_H */
+
 /* Define to 1 if you have the `crypt_r' function. */
 /* #undef HAVE_CRYPT_R */
 
@@ -37,9 +41,6 @@
 /* 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 */
 
@@ -64,6 +65,9 @@
 /* Define to 1 if you have the <memory.h> header file. */
 #define HAVE_MEMORY_H 1
 
+/* Define if memset_s function is supported */
+#define HAVE_MEMSET_S 1
+
 /* Define to 1 if you have the <mysql.h> header file. */
 /* #undef HAVE_MYSQL_H */
 
@@ -133,9 +137,6 @@
 /* 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
 
@@ -145,6 +146,9 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #define HAVE_UNISTD_H 1
 
+/* Define if compiler handles weak symbols */
+#define HAVE_WEAK_SYMBOLS 1
+
 /* Define if xmlparse/xmlparse.h is available */
 /* #undef HAVE_XMLPARSE_XMLPARSE_H */