Merge branch 'stable/10' into devel

5 files changed, 32 insertions, 18 deletions

diff --git a/usr.bin/svn/lib/libapr/apr.h b/usr.bin/svn/lib/libapr/apr.h
index 867a72e..5855147 100644
--- a/usr.bin/svn/lib/libapr/apr.h
+++ b/usr.bin/svn/lib/libapr/apr.h
@@ -219,10 +219,10 @@ extern "C" {
 #define APR_HAVE_SHMEM_BEOS         0
 
 #define APR_USE_SHMEM_MMAP_TMP     0
-#define APR_USE_SHMEM_MMAP_SHM     0
+#define APR_USE_SHMEM_MMAP_SHM     1
 #define APR_USE_SHMEM_MMAP_ZERO    0
 #define APR_USE_SHMEM_SHMGET_ANON  0
-#define APR_USE_SHMEM_SHMGET       1
+#define APR_USE_SHMEM_SHMGET       0
 #define APR_USE_SHMEM_MMAP_ANON    1
 #define APR_USE_SHMEM_BEOS         0
 
diff --git a/usr.bin/svn/lib/libapr/apr_private.h b/usr.bin/svn/lib/libapr/apr_private.h
index c5125a7..0ebe0a1 100644
--- a/usr.bin/svn/lib/libapr/apr_private.h
+++ b/usr.bin/svn/lib/libapr/apr_private.h
@@ -832,7 +832,7 @@
 #define USE_SHMEM_MMAP_ANON 1
 
 /* Define if mmap() via POSIX.1 shm_open() on temporary file will be used */
-/* #undef USE_SHMEM_MMAP_SHM */
+#define USE_SHMEM_MMAP_SHM 1
 
 /* Define if Classical mmap() on temporary file will be used */
 /* #undef USE_SHMEM_MMAP_TMP */
@@ -847,7 +847,7 @@
 /* #undef USE_SHMEM_OS2_ANON */
 
 /* Define if SysV IPC shmget() will be used */
-#define USE_SHMEM_SHMGET 1
+/* #undef USE_SHMEM_SHMGET */
 
 /* Define if SysV IPC shmget() will be used */
 /* #undef USE_SHMEM_SHMGET_ANON */
diff --git a/usr.bin/svn/lib/libapr_util/apu.h b/usr.bin/svn/lib/libapr_util/apu.h
index 639cec4..575d633 100644
--- a/usr.bin/svn/lib/libapr_util/apu.h
+++ b/usr.bin/svn/lib/libapr_util/apu.h
@@ -117,13 +117,11 @@
 #define APU_HAVE_FREETDS       0
 #define APU_HAVE_ODBC          0
 
-#define APU_HAVE_CRYPTO        0
-#define APU_HAVE_OPENSSL       0
+#define APU_HAVE_CRYPTO        1
+#define APU_HAVE_OPENSSL       1
 #define APU_HAVE_NSS           0
 
-#ifndef APU_HAVE_APR_ICONV
 #define APU_HAVE_APR_ICONV     0
-#endif
 #ifndef APU_HAVE_ICONV
 #define APU_HAVE_ICONV         0
 #endif
diff --git a/usr.bin/svn/lib/libapr_util/apu_config.h b/usr.bin/svn/lib/libapr_util/apu_config.h
index 78a7065..ac247d0 100644
--- a/usr.bin/svn/lib/libapr_util/apu_config.h
+++ b/usr.bin/svn/lib/libapr_util/apu_config.h
@@ -13,7 +13,7 @@
 /* #undef APU_DSO_LIBDIR */
 
 /* Define if the inbuf parm to iconv() is const char ** */
-#define APU_ICONV_INBUF_CONST 1
+/* #undef APU_ICONV_INBUF_CONST */
 
 /* Define that OpenSSL uses const buffers */
 #define CRYPTO_OPENSSL_CONST_BUFFERS 1
diff --git a/usr.bin/svn/lib/libsqlite3/Makefile b/usr.bin/svn/lib/libsqlite3/Makefile
index 49b6d1d..65d7a98 100644
--- a/usr.bin/svn/lib/libsqlite3/Makefile
+++ b/usr.bin/svn/lib/libsqlite3/Makefile
@@ -14,14 +14,30 @@ NOMAN=		internalonly
 CFLAGS+= 	-DHAVE_CONFIG_H -I${.CURDIR} \
 		-I${APR}/include/arch/unix -I${APR}/include
 
-CFLAGS+=	-DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 \
-		-DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 \
-		-DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 \
-		-DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DHAVE_USLEEP=1 \
-		-DHAVE_LOCALTIME_R=1 -DHAVE_GMTIME_R=1 \
-		-DHAVE_DECL_STRERROR_R=1 -DHAVE_STRERROR_R=1 \
-		-DHAVE_READLINE=1 -DHAVE_POSIX_FALLOCATE=1 \
-		-I${SQLITE} -D_REENTRANT=1 -DSQLITE_THREADSAFE=1 \
-		-DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_RTREE
+CFLAGS+=	-I${SQLITE} \
+		-DUSE_PREAD=1 \
+		-DSTDC_HEADERS=1 \
+		-DHAVE_SYS_TYPES_H=1 \
+		-DHAVE_SYS_STAT_H=1 \
+		-DHAVE_STDLIB_H=1 \
+		-DHAVE_STRING_H=1 \
+		-DHAVE_MEMORY_H=1 \
+		-DHAVE_STRINGS_H=1 \
+		-DHAVE_INTTYPES_H=1 \
+		-DHAVE_STDINT_H=1 \
+		-DHAVE_UNISTD_H=1 \
+		-DHAVE_DLFCN_H=1 \
+		-DHAVE_USLEEP=1 \
+		-DHAVE_LOCALTIME_R=1 \
+		-DHAVE_GMTIME_R=1 \
+		-DHAVE_DECL_STRERROR_R=1 \
+		-DHAVE_STRERROR_R=1 \
+		-DHAVE_READLINE=1 \
+		-DHAVE_POSIX_FALLOCATE=1 \
+		-D_REENTRANT=1 \
+		-DSQLITE_THREADSAFE=1 \
+		-DSQLITE_ENABLE_FTS3 \
+		-DSQLITE_ENABLE_FTS4 \
+		-DSQLITE_ENABLE_RTREE
 
 .include <bsd.lib.mk>