From 6a8fa4cab570f77af8326e0339fdf0b4c09756c6 Mon Sep 17 00:00:00 2001 From: peter Date: Mon, 12 Oct 2015 04:57:36 +0000 Subject: MFC: r269851,r272076,r274884,r282328,r285644,r286503,r286504,r286505, r286506,r286510,r286561,r286562,r287034 Update svnlite from 1.8.10 to 1.8.14, and the support components: serf->1.3.8, apr->1.5.2, apr-util->1.5.4, sqlite3->3.8.11.1 This includes syncing the developer templates with head. --- usr.bin/svn/lib/libapr/apr.h | 4 ++-- usr.bin/svn/lib/libapr/apr_private.h | 4 ++-- usr.bin/svn/lib/libapr_util/apu.h | 6 ++---- usr.bin/svn/lib/libapr_util/apu_config.h | 2 +- usr.bin/svn/lib/libsqlite3/Makefile | 34 +++++++++++++++++++++++--------- usr.bin/svn/svn_private_config.h | 13 +++++++----- usr.bin/svn/svnadmin/Makefile | 4 ++-- usr.bin/svn/svndumpfilter/Makefile | 4 ++-- usr.bin/svn/svnlook/Makefile | 4 ++-- usr.bin/svn/svnversion/Makefile | 4 ++-- 10 files changed, 48 insertions(+), 31 deletions(-) (limited to 'usr.bin') 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 diff --git a/usr.bin/svn/svn_private_config.h b/usr.bin/svn/svn_private_config.h index 3583d6e..40da1cb 100644 --- a/usr.bin/svn/svn_private_config.h +++ b/usr.bin/svn/svn_private_config.h @@ -105,7 +105,7 @@ #define PACKAGE_NAME "subversion" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "subversion 1.8.10" +#define PACKAGE_STRING "subversion 1.8.14" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "subversion" @@ -114,11 +114,14 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.8.10" +#define PACKAGE_VERSION "1.8.14" /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 +/* Defined to allow building against httpd 2.4 with broken auth */ +/* #undef SVN_ALLOW_BROKEN_HTTPD_AUTH */ + /* Define to the Python/C API format character suitable for apr_int64_t */ #define SVN_APR_INT64_T_PYCFMT "l" @@ -129,10 +132,10 @@ #define SVN_BINDIR "/usr/bin" /* Defined to the config.guess name of the build system */ -#define SVN_BUILD_HOST "bikeshed-malachite-topaz-amber-freebsd" +#define SVN_BUILD_HOST "bikeshed-rgb-freebsd" /* Defined to the config.guess name of the build target */ -#define SVN_BUILD_TARGET "bikeshed-malachite-topaz-amber-freebsd" +#define SVN_BUILD_TARGET "bikeshed-rgb-freebsd" /* The path of a default editor for the client. */ /* #undef SVN_CLIENT_EDITOR */ @@ -153,7 +156,7 @@ #define SVN_FS_WANT_DB_PATCH 14 /* Define if compiler provides atomic builtins */ -#define SVN_HAS_ATOMIC_BUILTINS 0 +/* #undef SVN_HAS_ATOMIC_BUILTINS */ /* Is GNOME Keyring support enabled? */ /* #undef SVN_HAVE_GNOME_KEYRING */ diff --git a/usr.bin/svn/svnadmin/Makefile b/usr.bin/svn/svnadmin/Makefile index 3220cde..1dd5853 100644 --- a/usr.bin/svn/svnadmin/Makefile +++ b/usr.bin/svn/svnadmin/Makefile @@ -28,10 +28,10 @@ LDADD= -L${LIBSVN_REPOSDIR} -lsvn_repos \ -lbsdxml \ -L${LIBAPRDIR} -lapr \ -L${LIBSQLITEDIR} -lsqlite3 \ - -lz -lcrypt + -lz -lcrypt -lpthread DPADD= ${LIBSVN_REPOS} ${LIBSVN_FS} ${LIBSVN_FS_FS} ${LIBSVN_FS_UTIL} \ ${LIBSVN_DELTA} ${LIBSVN_SUBR} ${LIBAPR_UTIL} \ - ${LIBBSDXML} ${LIBAPR} ${LIBSQLITE} ${LIBZ} ${LIBCRYPT} + ${LIBBSDXML} ${LIBAPR} ${LIBSQLITE} ${LIBZ} ${LIBCRYPT} ${LIBPTHREAD} .include diff --git a/usr.bin/svn/svndumpfilter/Makefile b/usr.bin/svn/svndumpfilter/Makefile index 864f376..80d2584 100644 --- a/usr.bin/svn/svndumpfilter/Makefile +++ b/usr.bin/svn/svndumpfilter/Makefile @@ -28,10 +28,10 @@ LDADD= -L${LIBSVN_REPOSDIR} -lsvn_repos \ -lbsdxml \ -L${LIBAPRDIR} -lapr \ -L${LIBSQLITEDIR} -lsqlite3 \ - -lz -lcrypt + -lz -lcrypt -lpthread DPADD= ${LIBSVN_REPOS} ${LIBSVN_FS} ${LIBSVN_FS_FS} ${LIBSVN_FS_UTIL} \ ${LIBSVN_DELTA} ${LIBSVN_SUBR} ${LIBAPR_UTIL} \ - ${LIBBSDXML} ${LIBAPR} ${LIBSQLITE} ${LIBZ} ${LIBCRYPT} + ${LIBBSDXML} ${LIBAPR} ${LIBSQLITE} ${LIBZ} ${LIBCRYPT} ${LIBPTHREAD} .include diff --git a/usr.bin/svn/svnlook/Makefile b/usr.bin/svn/svnlook/Makefile index 3d8b1a0..5307e37 100644 --- a/usr.bin/svn/svnlook/Makefile +++ b/usr.bin/svn/svnlook/Makefile @@ -29,10 +29,10 @@ LDADD= -L${LIBSVN_REPOSDIR} -lsvn_repos \ -lbsdxml \ -L${LIBAPRDIR} -lapr \ -L${LIBSQLITEDIR} -lsqlite3 \ - -lz -lcrypt + -lz -lcrypt -lpthread DPADD= ${LIBSVN_REPOS} ${LIBSVN_FS} ${LIBSVN_FS_FS} ${LIBSVN_FS_UTIL} \ ${LIBSVN_DELTA} ${LIBSVN_DIFF} ${LIBSVN_SUBR} ${LIBAPR_UTIL} \ - ${LIBBSDXML} ${LIBAPR} ${LIBSQLITE} ${LIBZ} ${LIBCRYPT} + ${LIBBSDXML} ${LIBAPR} ${LIBSQLITE} ${LIBZ} ${LIBCRYPT} ${LIBPTHREAD} .include diff --git a/usr.bin/svn/svnversion/Makefile b/usr.bin/svn/svnversion/Makefile index ca28ec3..b6ca826 100644 --- a/usr.bin/svn/svnversion/Makefile +++ b/usr.bin/svn/svnversion/Makefile @@ -26,10 +26,10 @@ LDADD= -L${LIBSVN_WCDIR} -lsvn_wc \ -lbsdxml \ -L${LIBAPRDIR} -lapr \ -L${LIBSQLITEDIR} -lsqlite3 \ - -lz -lcrypt + -lz -lcrypt -lpthread DPADD= ${LIBSVN_WC} ${LIBSVN_DELTA} ${LIBSVN_DIFF} ${LIBSVN_SUBR} \ ${LIBSERF} ${LIBAPR_UTIL} ${LIBBSDXML} ${LIBAPR} ${LIBSQLITE} \ - ${LIBZ} ${LIBCRYPT} + ${LIBZ} ${LIBCRYPT} ${LIBPTHREAD} .include -- cgit v1.1 From 8096b85f202b18e1be6a5dd5251a10fcdb255a78 Mon Sep 17 00:00:00 2001 From: hselasky Date: Tue, 13 Oct 2015 08:21:15 +0000 Subject: MFC r288335: Store PID after becoming a daemon() and not before to ensure the correct PID gets written to the PID file. PR: 203252 --- usr.bin/usbhidaction/usbhidaction.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'usr.bin') diff --git a/usr.bin/usbhidaction/usbhidaction.c b/usr.bin/usbhidaction/usbhidaction.c index 876dbca..49cf0af 100644 --- a/usr.bin/usbhidaction/usbhidaction.c +++ b/usr.bin/usbhidaction/usbhidaction.c @@ -166,17 +166,15 @@ main(int argc, char **argv) if (demon) { fp = open(pidfile, O_WRONLY|O_CREAT, S_IRUSR|S_IRGRP|S_IROTH); - if (fp >= 0) { - sz1 = snprintf(buf, sizeof buf, "%ld\n", - (long)getpid()); - if (sz1 > sizeof buf) - sz1 = sizeof buf; - write(fp, buf, sz1); - close(fp); - } else + if (fp < 0) err(1, "%s", pidfile); if (daemon(0, 0) < 0) err(1, "daemon()"); + snprintf(buf, sizeof(buf), "%ld\n", (long)getpid()); + sz1 = strlen(buf); + if (write(fp, buf, sz1) < 0) + err(1, "%s", pidfile); + close(fp); isdemon = 1; } -- cgit v1.1