Update sysutils/syslog-ng and modules to 3.8.1.

3.8.1

Library updates
- Kafka-client updated to version to 0.9.0.0
- Minimal required version of hiredis is set to 0.11.0 to avoid
  possible deadlocks
- Minimal version of libdbi is set to 0.9.0

Improvements and features
- Added the long-waited disk-buffer.
- date-parser ported from incubator to upstream
- New template functions: min, max, sum, average
- Added Apache-accesslog-parser
- Added loggly destination
- Added logmatic destination
- Added template function for supporting CEF.
- cURL-based HTTP destination driver added (implemented in C
  programming language)
- SELinux policy installer script now has support for Red Hat
  Enterprise Linux/CentOS/ Oracle Linux 5, 6 and 7.
- Implemented add-contextual-data: With add-context-data syslog-ng
  can use an external database file to append custom name-value
  pairs on incoming logs (to enrich messages).

Program destination/source drivers
- Added inherit-environment configuration option to program source
  and destination.
- Added keep-alive option to program destination (afprog).

Java drivers
- HTTP destination: Added the ability to use templates in both url
  and message.
- ElasticSearch Destination driver: Support 2.2.x series of
  ElasticSearch (transport and node mode).

MongoDB destination driver
- Replaced submodule limongo-client with mongo-c-driver.
- Additional support for previous syntax used by libmongo-client
  before we started using mongo-c-driver and its URI syntax
  exclusively.

Riemann destination driver
- Use cert-file() and key-file() options to match afsocket
  keywords as the same way as afsocket drivers use these options.

Rewrite rules
- Introduced template options in rewrite rules.
- Added unset operation to make it possible to unset a specific
  name-value pair for a logmessage.

Parsers
- kvformat: make it possible to specify name-value separator
- linux-audit-scanner: recognize a0-a9* as fields to be decoded
- csv-parser has been refactored, extended with new dialect and
  prefix options.

PatternDB
- added groupingby() parser that can perform simple correlation on
  log messages
- added create-context action
- Added NLSTRING parser that captures a string until the following
  end-of-line

Miscellaneous features
- syslog-debun (debug bundle script for syslog-ng) has been
  improved

Bugfixes
- geoip-parser: When default database if not specified, syslog-ng
  crashed.
- Added support for multiple drivers with the same name in
  syslog-ng config.
- Fixed aack counting logic for junctions that have branches that
  modify the LogMessage.
- Fixed a potential crash for code that uses log_msg_clear() in
  production (e.g. syslog-parser()).
- Fixed potential crash in reload logic
- system(): use string comparison instead of numeric in PID
  rewrite
- Support encoding on glib compiled with libiconv
- pdbtool: Fix the ordering of the debug-info list in PatternDB
- afprog: Don't kill our own process group
- Handle option names with hyphen (-) characters in java scls
- dnscache performance improved
- Fixed IPv6 parser in patterndb.
- Fixed journald program name flapping
- Fixed create-dirs() inheritance in file destinations
- Fixed pass-unix-credentials() global inheritance in afunix
- Fixed create-dirs() global inheritance in afunix
- Fixed byteorder handling on bigendian systems in netmask6 filter
- Fixed flow-control issue when overflow queue is full (suspending
  source by setting the window size to 0).
- Log HTTP response error codes in HTTPDestination (Java).
- Fixed potential leaks related $(sanitize) argument parsing in
  basicfuncs.
- Fixed a memory leak in python debugger
- Fixed a use-after-free bug in templates.
- Fixed a memory leak around reload in netmask6 filter.
- Fixed a memory leak in LogProtoBufferedServer in case the
  encoding() option is used.
- configure: don't override $enable_python while executing
  pkg-config
- Fixed BSD timestamp parsing in syslog-format.
- Fixed a SIGPIPE bug in program destination.
- Error handling has been improved in AMQP destination.
- value-pairs performance improvements, memleak fixes
- Various issues around UTF-8 support fixed.
- Fixed integer overflow in numerical operations template function
- Fixed an integer underflow in afsocket.
- Fixed numerical comperisons issues around filters.
- Fixed kernel log message time drift on Linux.
- Take CRLF sequences equivalent to an LF in patterndb.
- When syslog-ng failed to insert data into Redis, it has crashed.
- When device file is set as a file destination then syslog-ng
  will not try to change the permission of the device file.
- Various fixes around config file parsing:


3.7.3

Improvements
- Updated Python package requirements.
- Can now compile without MongoDB.
- Added eventlog to the list of required pkg-config packages.
- Basic FreeBSD and HP-UX support of syslog debug bundle generator
  by improving POSIX shell compatibility.
- Keep the program destination open between configuration reloads.
- system-source now uses keep-timestamp(no) for Linux kernel log.
  The time source used by /dev/kmsg is not updated after system
  SUSPEND/RESUME.

Fixes
- Fix a SIGSEGV when a Redis command returns an error.
- Resolve deadlock in logwriter triggered by suppress()
- Mitigate possible deadlock in patterndb
- Fixed global inheritance of pass-unix-credentials() and
  create-dirs().
- Certain compilers complained about an undefined symbol when
  setting keep-alive(yes).
- For certain use cases, afsocket would not handle procfs read
  errors due to an integer underflow.
- Enhanced Java version check and the handling of
  SyslogNgInternalLogger (used by Kafka), the FATAL loglevel and
  getLocationInformation().
- When a big amount of kernel log was produced in a very short
  time, the syslog-ng process sometimes entered into a spin and
  stop processing messages.

6 files changed, 181 insertions, 61 deletions

diff --git a/sysutils/syslog-ng/Makefile b/sysutils/syslog-ng/Makefile
index b1d4258e521..7a6f55bbdef 100644
--- a/sysutils/syslog-ng/Makefile
+++ b/sysutils/syslog-ng/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2016/03/09 10:49:00 tnn Exp $
-
+# $NetBSD: Makefile,v 1.27 2016/08/21 20:18:30 fhajny Exp $
 PKGREVISION= 1
 .include "../../sysutils/syslog-ng/Makefile.common"
 
diff --git a/sysutils/syslog-ng/Makefile.common b/sysutils/syslog-ng/Makefile.common
index df609887f5d..d4b5d0e0cfb 100644
--- a/sysutils/syslog-ng/Makefile.common
+++ b/sysutils/syslog-ng/Makefile.common
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.2 2016/02/26 10:24:13 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.3 2016/08/21 20:18:30 fhajny Exp $
 # used by sysutils/syslog-ng/Makefile
 # used by sysutils/syslog-ng/Makefile.module
 
-DISTNAME=	syslog-ng-3.7.2
+DISTNAME=	syslog-ng-3.8.1
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_GITHUB:=balabit/}
 
@@ -25,6 +25,7 @@ CHECK_PORTABILITY_SKIP+=	debian/syslog-ng.init
 
 CONFIGURE_ARGS+=	--disable-amqp
 CONFIGURE_ARGS+=	--disable-geoip
+CONFIGURE_ARGS+=	--disable-http
 CONFIGURE_ARGS+=	--disable-ipv6
 CONFIGURE_ARGS+=	--disable-java
 CONFIGURE_ARGS+=	--disable-json
@@ -41,7 +42,7 @@ CONFIGURE_ARGS+=	--localstatedir=${VARBASE}/db/syslog-ng
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--with-ivykis=${BUILDLINK_PREFIX.ivykis}
 CONFIGURE_ARGS+=	--with-jsonc=no
-CONFIGURE_ARGS+=	--with-libmongo-client=no
+CONFIGURE_ARGS+=	--with-mongoc=no
 CONFIGURE_ARGS+=	--with-librabbitmq-client=no
 CONFIGURE_ARGS+=	--with-pidfile-dir=${VARBASE}/run
 
diff --git a/sysutils/syslog-ng/Makefile.module b/sysutils/syslog-ng/Makefile.module
index cd2cb0dc830..5df5861edc3 100644
--- a/sysutils/syslog-ng/Makefile.module
+++ b/sysutils/syslog-ng/Makefile.module
@@ -1,5 +1,7 @@
-# $NetBSD: Makefile.module,v 1.1 2015/10/29 16:34:13 fhajny Exp $
+# $NetBSD: Makefile.module,v 1.2 2016/08/21 20:18:30 fhajny Exp $
 # used by sysutils/py-syslog-ng/Makefile
+# used by sysutils/syslog-ng-amqp/Makefile
+# used by sysutils/syslog-ng-curl/Makefile
 # used by sysutils/syslog-ng-geoip/Makefile
 # used by sysutils/syslog-ng-json/Makefile
 # used by sysutils/syslog-ng-mongodb/Makefile
diff --git a/sysutils/syslog-ng/PLIST b/sysutils/syslog-ng/PLIST
index d4943a88be0..a30e8c67a5e 100644
--- a/sysutils/syslog-ng/PLIST
+++ b/sysutils/syslog-ng/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.8 2016/03/09 10:49:00 tnn Exp $
+@comment $NetBSD: PLIST,v 1.9 2016/08/21 20:18:30 fhajny Exp $
+bin/dqtool
 bin/loggen
 bin/pdbtool
 bin/syslog2ng
@@ -35,6 +36,7 @@ include/syslog-ng/debugger/debugger.h
 include/syslog-ng/debugger/tracer.h
 include/syslog-ng/dnscache.h
 include/syslog-ng/driver.h
+include/syslog-ng/fdhelpers.h
 include/syslog-ng/file-perms.h
 include/syslog-ng/filter/filter-call.h
 include/syslog-ng/filter/filter-cmp.h
@@ -48,6 +50,7 @@ include/syslog-ng/filter/filter-pipe.h
 include/syslog-ng/filter/filter-pri.h
 include/syslog-ng/filter/filter-re.h
 include/syslog-ng/filter/filter-tags.h
+include/syslog-ng/find-crlf.h
 include/syslog-ng/gprocess.h
 include/syslog-ng/gsockaddr.h
 include/syslog-ng/gsocket.h
@@ -62,7 +65,17 @@ include/syslog-ng/libtest/template_lib.h
 include/syslog-ng/libtest/testutils.h
 include/syslog-ng/logmatcher.h
 include/syslog-ng/logmpx.h
-include/syslog-ng/logmsg.h
+include/syslog-ng/logmsg/gsockaddr-serialize.h
+include/syslog-ng/logmsg/logmsg-serialize-fixup.h
+include/syslog-ng/logmsg/logmsg-serialize.h
+include/syslog-ng/logmsg/logmsg.h
+include/syslog-ng/logmsg/nvtable-serialize-endianutils.h
+include/syslog-ng/logmsg/nvtable-serialize.h
+include/syslog-ng/logmsg/nvtable.h
+include/syslog-ng/logmsg/serialization.h
+include/syslog-ng/logmsg/tags-serialize.h
+include/syslog-ng/logmsg/tags.h
+include/syslog-ng/logmsg/timestamp-serialize.h
 include/syslog-ng/logpipe.h
 include/syslog-ng/logproto/logproto-buffered-server.h
 include/syslog-ng/logproto/logproto-builtins.h
@@ -90,11 +103,9 @@ include/syslog-ng/mainloop-worker.h
 include/syslog-ng/mainloop.h
 include/syslog-ng/memtrace.h
 include/syslog-ng/messages.h
-include/syslog-ng/misc.h
 include/syslog-ng/ml-batched-timer.h
 include/syslog-ng/module-config.h
 include/syslog-ng/msg-format.h
-include/syslog-ng/nvtable.h
 include/syslog-ng/parse-number.h
 include/syslog-ng/parser/parser-expr-parser.h
 include/syslog-ng/parser/parser-expr.h
@@ -110,15 +121,19 @@ include/syslog-ng/pragma-parser.h
 include/syslog-ng/presented-persistable-state.h
 include/syslog-ng/rcptid.h
 include/syslog-ng/reloc.h
+include/syslog-ng/resolved-configurable-paths.h
 include/syslog-ng/rewrite/rewrite-expr-parser.h
 include/syslog-ng/rewrite/rewrite-expr.h
 include/syslog-ng/rewrite/rewrite-groupset.h
 include/syslog-ng/rewrite/rewrite-set-tag.h
 include/syslog-ng/rewrite/rewrite-set.h
 include/syslog-ng/rewrite/rewrite-subst.h
+include/syslog-ng/rewrite/rewrite-unset.h
 include/syslog-ng/ringbuffer.h
 include/syslog-ng/run-id.h
+include/syslog-ng/scanner/csv-scanner/csv-scanner.h
 include/syslog-ng/scratch-buffers.h
+include/syslog-ng/seqnum.h
 include/syslog-ng/serialize.h
 include/syslog-ng/service-management.h
 include/syslog-ng/stats/stats-cluster.h
@@ -129,10 +144,11 @@ include/syslog-ng/stats/stats-registry.h
 include/syslog-ng/stats/stats-syslog.h
 include/syslog-ng/stats/stats.h
 include/syslog-ng/str-format.h
-include/syslog-ng/stringutils.h
+include/syslog-ng/str-utils.h
+include/syslog-ng/string-list.h
 include/syslog-ng/syslog-names.h
+include/syslog-ng/syslog-ng-config.h
 include/syslog-ng/syslog-ng.h
-include/syslog-ng/tags.h
 include/syslog-ng/template/common-template-typedefs.h
 include/syslog-ng/template/compiler.h
 include/syslog-ng/template/escaping.h
@@ -154,24 +170,33 @@ include/syslog-ng/transport/transport-pipe.h
 include/syslog-ng/transport/transport-socket.h
 include/syslog-ng/transport/transport-tls.h
 include/syslog-ng/type-hinting.h
+include/syslog-ng/userdb.h
 include/syslog-ng/utf8utils.h
 include/syslog-ng/uuid.h
-include/syslog-ng/value-pairs.h
+include/syslog-ng/value-pairs/cmdline.h
+include/syslog-ng/value-pairs/evttag.h
+include/syslog-ng/value-pairs/transforms.h
+include/syslog-ng/value-pairs/value-pairs.h
 include/syslog-ng/versioning.h
-include/syslog-ng/vptransform.h
+lib/libsyslog-ng-native-connector.a
 lib/libsyslog-ng.la
+lib/pkgconfig/syslog-ng-native-connector.pc
 lib/pkgconfig/syslog-ng-test.pc
 lib/pkgconfig/syslog-ng.pc
+lib/syslog-ng/libadd-contextual-data.la
 lib/syslog-ng/libaffile.la
 lib/syslog-ng/libafprog.la
 lib/syslog-ng/libafsocket.la
 lib/syslog-ng/libafstomp.la
 lib/syslog-ng/libafuser.la
 lib/syslog-ng/libbasicfuncs.la
+lib/syslog-ng/libcef.la
 lib/syslog-ng/libconfgen.la
 lib/syslog-ng/libcryptofuncs.la
 lib/syslog-ng/libcsvparser.la
+lib/syslog-ng/libdate.la
 lib/syslog-ng/libdbparser.la
+lib/syslog-ng/libdisk-buffer.la
 lib/syslog-ng/libgraphite.la
 lib/syslog-ng/libkvformat.la
 lib/syslog-ng/liblinux-kmsg-format.la
@@ -188,26 +213,31 @@ share/examples/syslog-ng/scl.conf
 share/examples/syslog-ng/syslog-ng.conf
 share/examples/syslog-ng/syslog-ng.conf.RedHat
 share/examples/syslog-ng/syslog-ng.conf.SunOS
-share/include/scl/cim/template.conf
-share/include/scl/elasticsearch/plugin.conf
-share/include/scl/graphite/README
-share/include/scl/graphite/plugin.conf
-share/include/scl/hdfs/plugin.conf
-share/include/scl/kafka/plugin.conf
-share/include/scl/mbox/mbox.conf
-share/include/scl/nodejs/plugin.conf
-share/include/scl/pacct/plugin.conf
-share/include/scl/rewrite/cc-mask.conf
-share/include/scl/solaris/plugin.conf
-share/include/scl/syslogconf/README
-share/include/scl/syslogconf/convert-syslogconf.awk
-share/include/scl/syslogconf/plugin.conf
-share/include/scl/system/plugin.conf
-share/tools/cfg-grammar.y
-share/tools/lex-rules.am
-share/tools/merge-grammar.pl
-share/tools/system-expand
-share/xsd/patterndb-1.xsd
-share/xsd/patterndb-2.xsd
-share/xsd/patterndb-3.xsd
-share/xsd/patterndb-4.xsd
+share/syslog-ng/include/scl/apache/apache.conf
+share/syslog-ng/include/scl/cim/template.conf
+share/syslog-ng/include/scl/elasticsearch/plugin.conf
+share/syslog-ng/include/scl/graphite/README
+share/syslog-ng/include/scl/graphite/plugin.conf
+share/syslog-ng/include/scl/hdfs/plugin.conf
+share/syslog-ng/include/scl/kafka/plugin.conf
+share/syslog-ng/include/scl/loggly/loggly.conf
+share/syslog-ng/include/scl/logmatic/logmatic.conf
+share/syslog-ng/include/scl/mbox/mbox.conf
+share/syslog-ng/include/scl/nodejs/plugin.conf
+share/syslog-ng/include/scl/pacct/plugin.conf
+share/syslog-ng/include/scl/rewrite/cc-mask.conf
+share/syslog-ng/include/scl/solaris/plugin.conf
+share/syslog-ng/include/scl/syslogconf/README
+share/syslog-ng/include/scl/syslogconf/convert-syslogconf.awk
+share/syslog-ng/include/scl/syslogconf/plugin.conf
+share/syslog-ng/include/scl/system/plugin.conf
+share/syslog-ng/tools/cfg-grammar.y
+share/syslog-ng/tools/lex-rules.am
+share/syslog-ng/tools/merge-grammar.pl
+share/syslog-ng/tools/system-expand.sh
+share/syslog-ng/xsd/patterndb-1.xsd
+share/syslog-ng/xsd/patterndb-2.xsd
+share/syslog-ng/xsd/patterndb-3.xsd
+share/syslog-ng/xsd/patterndb-4.xsd
+share/syslog-ng/xsd/patterndb-5.xsd
+@pkgdir share/examples/syslog-ng/patterndb.d
diff --git a/sysutils/syslog-ng/distinfo b/sysutils/syslog-ng/distinfo
index 00ba802005b..3dd47035459 100644
--- a/sysutils/syslog-ng/distinfo
+++ b/sysutils/syslog-ng/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.6 2015/10/29 16:34:13 fhajny Exp $
+$NetBSD: distinfo,v 1.7 2016/08/21 20:18:30 fhajny Exp $
 
-SHA1 (syslog-ng-3.7.2.tar.gz) = d80f787b46533613ba0da854b543a108c4cc3c38
-RMD160 (syslog-ng-3.7.2.tar.gz) = 6302b00ff77b72220d84fa768fc63e511a511aef
-SHA512 (syslog-ng-3.7.2.tar.gz) = dbf58b51b68bc6616a136df5eb67a120718d8c83f785218d40f62e5f7b3691a3ad4d21db617551e4192e053dc9340440424e3d3b072b47ca590d4eac0dbf0e6f
-Size (syslog-ng-3.7.2.tar.gz) = 3558377 bytes
+SHA1 (syslog-ng-3.8.1.tar.gz) = e66cc7538eec245b80dda4624671a61932c856c3
+RMD160 (syslog-ng-3.8.1.tar.gz) = 67357d1eeef54be78ceac16ae4eff0ce66ef65a6
+SHA512 (syslog-ng-3.8.1.tar.gz) = cdd07427e7ddf4aebc1e4ed9512a1d7718d49d5c0deadccdeb0b1d7762eae178c3018b2b48b475ff8c7aec999b75d1f1cc424fca823b543f607f4fc8872070a5
+Size (syslog-ng-3.8.1.tar.gz) = 8328391 bytes
 SHA1 (patch-ac) = 7d48f689b6ff69c68697baf729fba8be9aec5ce8
-SHA1 (patch-configure) = 344d9c0fabc7e9656b5576b0fe63e20801587975
+SHA1 (patch-configure) = b68b36f8f443149f97c538571d95e894da7deb80
 SHA1 (patch-lib_ivykis_src_iv__fd__port.c) = a6b1feafd7c8031a1ed7d2cb0abc57ca3633fb5a
 SHA1 (patch-modules_afsocket_socket-options-inet.c) = a23103caea1c46dd2e405bd1a668fde0d3ceeeae
 SHA1 (patch-modules_system-source_system-source.c) = f51ed8d2e6d603744b3e6636eeb9c68382e5cda6
diff --git a/sysutils/syslog-ng/patches/patch-configure b/sysutils/syslog-ng/patches/patch-configure
index 44efede9023..0e06b9ac12d 100644
--- a/sysutils/syslog-ng/patches/patch-configure
+++ b/sysutils/syslog-ng/patches/patch-configure
@@ -1,24 +1,112 @@
-$NetBSD: patch-configure,v 1.1 2015/10/29 16:34:13 fhajny Exp $
+$NetBSD: patch-configure,v 1.2 2016/08/21 20:18:30 fhajny Exp $
 
 Portability.
 
---- configure.orig	2015-08-17 08:56:19.000000000 +0000
+--- configure.orig	2016-08-19 11:18:46.000000000 +0000
 +++ configure
-@@ -16011,7 +16011,7 @@ $as_echo "$as_me: Too old java version r
-       fi
-     fi
+@@ -15496,12 +15496,12 @@ if test -n "$LIBMONGO_CFLAGS"; then
+     pkg_cv_LIBMONGO_CFLAGS="$LIBMONGO_CFLAGS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmongoc >= \$LMC_MIN_VERSION\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "libmongoc >= $LMC_MIN_VERSION") 2>&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmongoc-1.0 >= \$LMC_MIN_VERSION\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "libmongoc-1.0 >= $LMC_MIN_VERSION") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+-  pkg_cv_LIBMONGO_CFLAGS=`$PKG_CONFIG --cflags "libmongoc >= $LMC_MIN_VERSION" 2>/dev/null`
++  pkg_cv_LIBMONGO_CFLAGS=`$PKG_CONFIG --cflags "libmongoc-1.0 >= $LMC_MIN_VERSION" 2>/dev/null`
+ 		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+@@ -15513,12 +15513,12 @@ if test -n "$LIBMONGO_LIBS"; then
+     pkg_cv_LIBMONGO_LIBS="$LIBMONGO_LIBS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmongoc >= \$LMC_MIN_VERSION\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "libmongoc >= $LMC_MIN_VERSION") 2>&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmongoc-1.0 >= \$LMC_MIN_VERSION\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "libmongoc-1.0 >= $LMC_MIN_VERSION") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+-  pkg_cv_LIBMONGO_LIBS=`$PKG_CONFIG --libs "libmongoc >= $LMC_MIN_VERSION" 2>/dev/null`
++  pkg_cv_LIBMONGO_LIBS=`$PKG_CONFIG --libs "libmongoc-1.0 >= $LMC_MIN_VERSION" 2>/dev/null`
+ 		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+@@ -15539,9 +15539,9 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        LIBMONGO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libmongoc >= $LMC_MIN_VERSION" 2>&1`
++	        LIBMONGO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libmongoc-1.0 >= $LMC_MIN_VERSION" 2>&1`
+         else
+-	        LIBMONGO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libmongoc >= $LMC_MIN_VERSION" 2>&1`
++	        LIBMONGO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libmongoc-1.0 >= $LMC_MIN_VERSION" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$LIBMONGO_PKG_ERRORS" >&5
+@@ -15568,12 +15568,12 @@ if test -n "$LIBMONGO_CFLAGS"; then
+     pkg_cv_LIBMONGO_CFLAGS="$LIBMONGO_CFLAGS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmongoc >= \$LMC_MIN_VERSION\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "libmongoc >= $LMC_MIN_VERSION") 2>&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmongoc-1.0 >= \$LMC_MIN_VERSION\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "libmongoc-1.0 >= $LMC_MIN_VERSION") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+-  pkg_cv_LIBMONGO_CFLAGS=`$PKG_CONFIG --cflags "libmongoc >= $LMC_MIN_VERSION" 2>/dev/null`
++  pkg_cv_LIBMONGO_CFLAGS=`$PKG_CONFIG --cflags "libmongoc-1.0 >= $LMC_MIN_VERSION" 2>/dev/null`
+ 		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+@@ -15585,12 +15585,12 @@ if test -n "$LIBMONGO_LIBS"; then
+     pkg_cv_LIBMONGO_LIBS="$LIBMONGO_LIBS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmongoc >= \$LMC_MIN_VERSION\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "libmongoc >= $LMC_MIN_VERSION") 2>&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmongoc-1.0 >= \$LMC_MIN_VERSION\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "libmongoc-1.0 >= $LMC_MIN_VERSION") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+-  pkg_cv_LIBMONGO_LIBS=`$PKG_CONFIG --libs "libmongoc >= $LMC_MIN_VERSION" 2>/dev/null`
++  pkg_cv_LIBMONGO_LIBS=`$PKG_CONFIG --libs "libmongoc-1.0 >= $LMC_MIN_VERSION" 2>/dev/null`
+ 		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+@@ -15611,9 +15611,9 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        LIBMONGO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libmongoc >= $LMC_MIN_VERSION" 2>&1`
++	        LIBMONGO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libmongoc-1.0 >= $LMC_MIN_VERSION" 2>&1`
+         else
+-	        LIBMONGO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libmongoc >= $LMC_MIN_VERSION" 2>&1`
++	        LIBMONGO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libmongoc-1.0 >= $LMC_MIN_VERSION" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$LIBMONGO_PKG_ERRORS" >&5
+@@ -16367,7 +16367,7 @@ $as_echo_n "checking for JAVA_VERSION...
+   JAVA_HOME_CHECKER="/usr/libexec/java_home"
  
--    if test "$VERSION_OK" == "1";
-+    if test "$VERSION_OK" = "1";
-     then
-       JNI_HOME=`echo $JAVAC_BIN | sed "s/\(.*\)[/]bin[/]java.*/\1/"`
-       JNI_LIBDIR=`find $JNI_HOME -name "libjvm.so" | sed "s/\(.*\)libjvm.so/\1/" | head -n 1`
-@@ -16112,7 +16112,7 @@ $as_echo "$as_me: Too old java version r
-       fi
-     fi
+   if test "x$JAVAC_BIN" != "x"; then
+-    if test "x$DONT_RESOLVE_JAVA_BIN_LINKS" == "x"; then
++    if test "x$DONT_RESOLVE_JAVA_BIN_LINKS" = "x"; then
+       JAVAC_BIN=`
+   READLINK_TARGET=$JAVAC_BIN
+   cd $(dirname "$READLINK_TARGET")
+@@ -16474,7 +16474,7 @@ $as_echo_n "checking for JAVA_VERSION...
+   JAVA_HOME_CHECKER="/usr/libexec/java_home"
  
--    if test "$VERSION_OK" == "1";
-+    if test "$VERSION_OK" = "1";
-     then
-       JNI_HOME=`echo $JAVAC_BIN | sed "s/\(.*\)[/]bin[/]java.*/\1/"`
-       JNI_LIBDIR=`find $JNI_HOME -name "libjvm.so" | sed "s/\(.*\)libjvm.so/\1/" | head -n 1`
+   if test "x$JAVAC_BIN" != "x"; then
+-    if test "x$DONT_RESOLVE_JAVA_BIN_LINKS" == "x"; then
++    if test "x$DONT_RESOLVE_JAVA_BIN_LINKS" = "x"; then
+       JAVAC_BIN=`
+   READLINK_TARGET=$JAVAC_BIN
+   cd $(dirname "$READLINK_TARGET")