Update databases/sqlrelay to 1.0.0.

sqlrelay 1.0.0
- updated md5 pwdenc to use rudiments md5 class
- solved a long-standing hang that could occur if the database password
  expired while sqlrelay was running, and the sqlr-scaler attempted to
  start new connections
- added convertcase, convertcasedoublequotes, and removedoublequotes
  parameters to normalize translation module
- added ColumnCaseName parameter to ODBC driver
- fixed a subtle bug in the ODBC driver that caused the first row to be
  skipped if columns were not bound
- added -backtrace option for debugging
- fixed mysql connection module so it can use the statement API on
  Windows
- fixed semaphore reference-before-init bug in sqlrservercontroller
- added support for db, debug, columnnamecase, dontgetcolumninfo,
  nullsasnulls, and lazyconnect connect-string options to all drivers
  (though in some they are camel-case and others lower-case)
- in DB-abstraction-layer drivers, the debug, dontgetcolumninfo,
  nullsasnulls, lazyconnect, krb, and tls connect-string options now
  support any yes/no equivalent such as yes, Yes, y, Y, true, True, 1,
  (and similar for no)
- fixed a regression that could cause crashes in the C#/ADO driver when
  binding null or date values
- added all parameters to ODBC config screen
- removed calls to mysql_stmt_store_result/mysql_stmt_num_rows from
  mysql connection to improve performance. mysql connection doesn't know
  the total number of rows prior to full fetch now (which is consistent
  with most other databases).
- updated postgresql connection to use an unnamed cursor instead of
  naming it and having to deallocate it over an over
- tweaked skipWhitespaceAndComments and related methods to use
  charstring::isNullOrEmpty and character::isWhitespace
- replaced regular expression comparisons in sap/freetds connections
  with simpler charstring comparisons
- updated db2 connection to reuse the statement instead of recreating it
  with each prepare
- made column-lookup by name case sensitive to improve performance
- fixed nagle-disable and sizing of socket read/write buffers
- changed default maxcursors to 5
- fixed an uninitialized variable in the firebird connection
- python api's are installed in dist-packages subdirectory on systems
  that have that instead of site-packages
- added route-entire-session option to router modules

sqlrelay 0.67.0
- general documenation clean-up
- added missing all: target to man/Makefile
- mysql_info in drop-in library for mysql returns NULL instead of "" now
- mysql_errno in the drop-in library now returns the error number from
  the DB, instead of CR_UNKNOWN_ERROR, if no error map is provided, and
  the backend database is known to be mysql
- mysql_refresh in the drop-in library works with options other than
  REFRESH_GRANT now
- mysql_shutdown/kill in the drop-in library return 1 on failure now
  rather than 2000
- date/time and timestamp types are recognized as binary types now
- year/timestamp types are recognized as unsigned types now
- TINY/MEDIUM/LONG_TEXT types are recognized as blobs now
- mapping date/time to MYSQL_TYPE_DATE/TIME, rather than
  MYSQL_TYPE_DATETIME is the default in the drop-in library now and
  SQLR_MAP_DATETIME_TO_DATE has been removed
- mysql drop-in library sets column flags correctly now
- mysql drop-in library runs appropriate kill/shutdown queries now
- mysql connection uses non-stmt api for "show *" queries now
- mysql drop-in library runs "show processlist" for mysql_list_processes
- mysql drop-in library supports date/time/datetime input binds now
  instead of just treating them all as datetimes
- connection modules differentiate between date/time/datetime binds now
  instead of just treating them all as datetimes
- added result set row translation module framework
- updated firebird connection module to the fieldstruct.textbuffer
  instead of fieldbuffer for non-text to text translations
- added support for negative times in mysql connection module and
  drop-in library
- added translation-failure event
- general refactoring of server module API
- consolidated sqlr-scaler code
- fixed a 1-byte empty-blob memory leak in the client
- /etc/alternatives/java_sdk is preferred, if found, now

8 files changed, 92 insertions, 59 deletions

diff --git a/databases/sqlrelay/Makefile b/databases/sqlrelay/Makefile
index 8e3099a0a63..ec13f09b6a0 100644
--- a/databases/sqlrelay/Makefile
+++ b/databases/sqlrelay/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.51 2017/01/01 16:05:57 adam Exp $
+# $NetBSD: Makefile,v 1.52 2017/01/16 13:13:13 fhajny Exp $
 
 COMMENT=		Database connection pooling middleware and API
-PKGREVISION=		1
 
 .include "../../databases/sqlrelay/Makefile.common"
 
diff --git a/databases/sqlrelay/Makefile.common b/databases/sqlrelay/Makefile.common
index 0b2e7d3308e..4e9be17258e 100644
--- a/databases/sqlrelay/Makefile.common
+++ b/databases/sqlrelay/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.13 2016/10/21 14:16:34 fhajny Exp $
+# $NetBSD: Makefile.common,v 1.14 2017/01/16 13:13:13 fhajny Exp $
 # used by databases/p5-sqlrelay/Makefile
 # used by databases/php-sqlrelay/Makefile
 # used by databases/py-sqlrelay/Makefile
@@ -11,7 +11,7 @@
 # used by databases/sqlrelay-sqlite/Makefile
 # used by databases/sqlrelay/Makefile
 
-DISTNAME=		sqlrelay-0.66.0
+DISTNAME=		sqlrelay-1.0.0
 CATEGORIES=		databases
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=sqlrelay/}
 
diff --git a/databases/sqlrelay/PLIST b/databases/sqlrelay/PLIST
index 0fd4436cb34..358d8ef1c1c 100644
--- a/databases/sqlrelay/PLIST
+++ b/databases/sqlrelay/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2016/10/21 14:16:34 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.19 2017/01/16 13:13:13 fhajny Exp $
 bin/sqlr-cachemanager
 bin/sqlr-connection
 bin/sqlr-export
@@ -13,40 +13,72 @@ bin/sqlrclient-config
 bin/sqlrclientwrapper-config
 bin/sqlrserver-config
 bin/sqlrsh
+include/sqlrelay/private/sqlrauth.h
+include/sqlrelay/private/sqlrauths.h
 include/sqlrelay/private/sqlrclientincludes.h
 include/sqlrelay/private/sqlrclientwrapper.h
 include/sqlrelay/private/sqlrclientwrapperincludes.h
 include/sqlrelay/private/sqlrconnection.h
 include/sqlrelay/private/sqlrcursor.h
+include/sqlrelay/private/sqlrfilter.h
+include/sqlrelay/private/sqlrfilters.h
+include/sqlrelay/private/sqlrgsscredentials.h
 include/sqlrelay/private/sqlrlistener.h
+include/sqlrelay/private/sqlrlogger.h
+include/sqlrelay/private/sqlrloggers.h
+include/sqlrelay/private/sqlrnotification.h
+include/sqlrelay/private/sqlrnotifications.h
+include/sqlrelay/private/sqlrparser.h
+include/sqlrelay/private/sqlrprotocol.h
+include/sqlrelay/private/sqlrprotocols.h
+include/sqlrelay/private/sqlrpwdenc.h
+include/sqlrelay/private/sqlrpwdencs.h
+include/sqlrelay/private/sqlrqueries.h
+include/sqlrelay/private/sqlrquery.h
+include/sqlrelay/private/sqlrquerycursor.h
+include/sqlrelay/private/sqlrresultsetrowtranslation.h
+include/sqlrelay/private/sqlrresultsetrowtranslations.h
+include/sqlrelay/private/sqlrresultsettranslation.h
+include/sqlrelay/private/sqlrresultsettranslations.h
+include/sqlrelay/private/sqlrrouter.h
+include/sqlrelay/private/sqlrrouters.h
+include/sqlrelay/private/sqlrschedule.h
+include/sqlrelay/private/sqlrschedulerule.h
+include/sqlrelay/private/sqlrschedules.h
 include/sqlrelay/private/sqlrserverconnection.h
 include/sqlrelay/private/sqlrservercontroller.h
 include/sqlrelay/private/sqlrservercursor.h
 include/sqlrelay/private/sqlrserverincludes.h
-include/sqlrelay/private/sqlrshmdata.h
+include/sqlrelay/private/sqlrshm.h
+include/sqlrelay/private/sqlrtlscredentials.h
+include/sqlrelay/private/sqlrtranslation.h
+include/sqlrelay/private/sqlrtranslations.h
+include/sqlrelay/private/sqlrtrigger.h
+include/sqlrelay/private/sqlrtriggers.h
+include/sqlrelay/private/sqlruserpasswordcredentials.h
 include/sqlrelay/private/sqlrutilincludes.h
 include/sqlrelay/sqlrclient.h
 include/sqlrelay/sqlrclientwrapper.h
 include/sqlrelay/sqlrserver.h
 include/sqlrelay/sqlrutil.h
 lib/libmysql3sqlrelay.so
-lib/libmysql3sqlrelay.so.2
-lib/libmysql3sqlrelay.so.2.0.0
+lib/libmysql3sqlrelay.so.4
+lib/libmysql3sqlrelay.so.4.0.0
 lib/libmysql40sqlrelay.so
-lib/libmysql40sqlrelay.so.2
-lib/libmysql40sqlrelay.so.2.0.0
+lib/libmysql40sqlrelay.so.4
+lib/libmysql40sqlrelay.so.4.0.0
 lib/libmysql41sqlrelay.so
-lib/libmysql41sqlrelay.so.2
-lib/libmysql41sqlrelay.so.2.0.0
+lib/libmysql41sqlrelay.so.4
+lib/libmysql41sqlrelay.so.4.0.0
 lib/libmysql50sqlrelay.so
-lib/libmysql50sqlrelay.so.2
-lib/libmysql50sqlrelay.so.2.0.0
+lib/libmysql50sqlrelay.so.4
+lib/libmysql50sqlrelay.so.4.0.0
 lib/libmysql51sqlrelay.so
-lib/libmysql51sqlrelay.so.2
-lib/libmysql51sqlrelay.so.2.0.0
+lib/libmysql51sqlrelay.so.4
+lib/libmysql51sqlrelay.so.4.0.0
 lib/libpqsqlrelay.so
-lib/libpqsqlrelay.so.2
-lib/libpqsqlrelay.so.2.0.0
+lib/libpqsqlrelay.so.4
+lib/libpqsqlrelay.so.4.0.0
 lib/libsqlrclient.la
 lib/libsqlrclientwrapper.la
 lib/libsqlrserver.la
@@ -75,6 +107,7 @@ libexec/sqlrelay/sqlrpwdenc_rot.${SOEXT}
 libexec/sqlrelay/sqlrquery_sqlrcmdcstat.${SOEXT}
 libexec/sqlrelay/sqlrquery_sqlrcmdgstat.${SOEXT}
 libexec/sqlrelay/sqlrresultsettranslation_reformatdatetime.${SOEXT}
+libexec/sqlrelay/sqlrresultsettranslation_test.${SOEXT}
 libexec/sqlrelay/sqlrrouter_clientiplist.${SOEXT}
 libexec/sqlrelay/sqlrrouter_regex.${SOEXT}
 libexec/sqlrelay/sqlrrouter_userlist.${SOEXT}
@@ -96,8 +129,11 @@ share/doc/sqlrelay/admin/configreference.html
 share/doc/sqlrelay/admin/installing.html
 share/doc/sqlrelay/admin/oraclentier.html
 share/doc/sqlrelay/admin/prerequisites.html
-share/doc/sqlrelay/admin/router.html
 share/doc/sqlrelay/admin/running.html
+share/doc/sqlrelay/admin/sqlr-connection-oracletest-querylog.2899.html
+share/doc/sqlrelay/admin/sqlr-connection.1871.html
+share/doc/sqlrelay/admin/sqlr-listener.1869.html
+share/doc/sqlrelay/admin/sqlr-listener.1886.html
 share/doc/sqlrelay/admin/tuning.html
 share/doc/sqlrelay/api/ado.net/html/annotated.html
 share/doc/sqlrelay/api/ado.net/html/arrowdown.png
@@ -681,19 +717,6 @@ share/doc/sqlrelay/images/toomanyconnections.png
 share/doc/sqlrelay/images/unixodbc.png
 share/doc/sqlrelay/index.html
 share/doc/sqlrelay/js/rotate.js
-share/doc/sqlrelay/modules/auths.html
-share/doc/sqlrelay/modules/filters.html
-share/doc/sqlrelay/modules/loggers.html
-share/doc/sqlrelay/modules/notifications.html
-share/doc/sqlrelay/modules/pwdencs.html
-share/doc/sqlrelay/modules/resultsettranslations.html
-share/doc/sqlrelay/modules/routers.html
-share/doc/sqlrelay/modules/schedules.html
-share/doc/sqlrelay/modules/sqlr-connection-oracletest-querylog.2899.html
-share/doc/sqlrelay/modules/sqlr-connection.1871.html
-share/doc/sqlrelay/modules/sqlr-listener.1869.html
-share/doc/sqlrelay/modules/sqlr-listener.1886.html
-share/doc/sqlrelay/modules/translations.html
 share/doc/sqlrelay/programming/ado.net.html
 share/doc/sqlrelay/programming/binds.html
 share/doc/sqlrelay/programming/c++.html
diff --git a/databases/sqlrelay/buildlink3.mk b/databases/sqlrelay/buildlink3.mk
index 0f4b88c2af1..57cb90441b1 100644
--- a/databases/sqlrelay/buildlink3.mk
+++ b/databases/sqlrelay/buildlink3.mk
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.7 2017/01/01 16:05:57 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2017/01/16 13:13:13 fhajny Exp $
 
 BUILDLINK_TREE+=	sqlrelay
 
 .if !defined(SQLRELAY_BUILDLINK3_MK)
 SQLRELAY_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.sqlrelay+=	sqlrelay>=0.43
-BUILDLINK_ABI_DEPENDS.sqlrelay+=	sqlrelay>=0.66.0nb1
+BUILDLINK_API_DEPENDS.sqlrelay+=	sqlrelay>=1.0.0
+BUILDLINK_ABI_DEPENDS.sqlrelay+=	sqlrelay>=1.0.0
 BUILDLINK_PKGSRCDIR.sqlrelay?=		../../databases/sqlrelay
 
 .include "../../devel/rudiments/buildlink3.mk"
diff --git a/databases/sqlrelay/distinfo b/databases/sqlrelay/distinfo
index b9c8c3561c1..7cd8d67c12d 100644
--- a/databases/sqlrelay/distinfo
+++ b/databases/sqlrelay/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.21 2016/10/21 14:16:34 fhajny Exp $
+$NetBSD: distinfo,v 1.22 2017/01/16 13:13:13 fhajny Exp $
 
-SHA1 (sqlrelay-0.66.0.tar.gz) = 08bb3cd32ce0d7d36783f3e43fa4f0035b6dd6d1
-RMD160 (sqlrelay-0.66.0.tar.gz) = 21971765d9a9d6e71c0bcb8c85f2af0e746ebc7c
-SHA512 (sqlrelay-0.66.0.tar.gz) = df56609816c88b5a041752e6460ecd35dba4a27823c2740693c45d2727a89dbce6b0f88af746cb4b74c7d36ef619bc4fd2c9991507d18b6bf6d351f36b294293
-Size (sqlrelay-0.66.0.tar.gz) = 4249607 bytes
+SHA1 (sqlrelay-1.0.0.tar.gz) = 3f350a71fea8177a8e003524b6833347f741153b
+RMD160 (sqlrelay-1.0.0.tar.gz) = 1bc6c1ac02eb8a58c1aa8e2bacd0c8662a283aad
+SHA512 (sqlrelay-1.0.0.tar.gz) = 2722cd179dfcd6bbc4c78ea9149d00ec70ccd11d44cdcabe7ad48e8cddf07588477ca9edf74660d498b2a6ae9e70a9e68733090c0a2122310995f566b0807349
+Size (sqlrelay-1.0.0.tar.gz) = 4194484 bytes
 SHA1 (patch-ad) = cc4a94941ec737abede98bdd7b19bc902f755609
 SHA1 (patch-config.mk.in) = 22e8459f49e20529289e1a99b10cebaa449af0c0
-SHA1 (patch-configure) = 04affebca0556849cfbc3eb17f5b9481eb00631b
+SHA1 (patch-configure) = 689820a84f671923b96f64a62de08ce266f55501
 SHA1 (patch-etc_Makefile) = 28e9cac18314f1fc725603d47cb92ec6e54d7c63
+SHA1 (patch-src_api_nodejs_package__in.json) = 76e2ebc4e47d5ef38d0c96059b62460fef687d1e
 SHA1 (patch-src_api_php_sql__relay.cpp) = 9e33260f4e4331874187e5b30db17d4478710385
 SHA1 (patch-src_api_ruby_getcflags.rb) = 033e26ef03db4851f493d831c37ec947662d47ee
 SHA1 (patch-src_api_ruby_getsitearchdir.rb) = 603c66ed45f854b833eefbcdbd58e41465fb8120
-SHA1 (patch-src_loggers_custom__sc.cpp) = 79e2b0a54b151e76175f549747e3392accd0b4d9
diff --git a/databases/sqlrelay/patches/patch-configure b/databases/sqlrelay/patches/patch-configure
index 448fce341dd..77da3268acb 100644
--- a/databases/sqlrelay/patches/patch-configure
+++ b/databases/sqlrelay/patches/patch-configure
@@ -1,11 +1,21 @@
-$NetBSD: patch-configure,v 1.5 2016/10/21 14:16:34 fhajny Exp $
+$NetBSD: patch-configure,v 1.6 2017/01/16 13:13:13 fhajny Exp $
 
+Cripple iODBC check, we're using UnixODBC and it was getting in the way.
 Fix Python 3 lookup.
 Fix Ruby support.
 
---- configure.orig	2016-07-26 07:55:32.000000000 +0000
+--- configure.orig	2016-12-20 08:40:38.000000000 +0000
 +++ configure
-@@ -32419,12 +32419,12 @@ then
+@@ -26775,7 +26775,7 @@ fi
+ 
+ 
+ 
+-SEARCHPATH=$ODBCPATH
++SEARCHPATH=OFF_$ODBCPATH
+ NAME=iodbc
+ HEADER=sql.h
+ LIBNAME=iodbc
+@@ -32426,12 +32426,12 @@ then
  
  			for i in "3.9" "3.8" "3.7" "3.6" "3.5" "3.4" "3.3" "3.2" "3.1" "3.0"
  			do
@@ -20,7 +30,7 @@ Fix Ruby support.
  					then
  						PYTHON3INCLUDES="-I$PYTHON3PATH/include/python$i"
  						PYTHON3DIR="$PYTHON3PATH/lib/python$i"
-@@ -32914,7 +32914,7 @@ print CONFIG["arch"]
+@@ -32938,7 +32938,7 @@ print CONFIG["arch"]
  print "\n"
  print "ruby_version = "
  begin
diff --git a/databases/sqlrelay/patches/patch-src_api_nodejs_package__in.json b/databases/sqlrelay/patches/patch-src_api_nodejs_package__in.json
new file mode 100644
index 00000000000..32ec522ecb5
--- /dev/null
+++ b/databases/sqlrelay/patches/patch-src_api_nodejs_package__in.json
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_api_nodejs_package__in.json,v 1.1 2017/01/16 13:13:13 fhajny Exp $
+
+npm hates version schemes longer than semver.
+
+--- src/api/nodejs/package_in.json.orig	2016-12-20 08:40:41.000000000 +0000
++++ src/api/nodejs/package_in.json
+@@ -1,6 +1,6 @@
+ {
+ 	"name" : "sqlrelay",
+-	"version" : "@SQLR_VERSION@.0",
++	"version" : "@SQLR_VERSION@",
+ 	"main" : "build/Release/sqlrelay.node",
+ 	"description" : "SQL Relay module for node.js",
+ 	"homepage" : "http://sqlrelay.sourceforge.net",
diff --git a/databases/sqlrelay/patches/patch-src_loggers_custom__sc.cpp b/databases/sqlrelay/patches/patch-src_loggers_custom__sc.cpp
deleted file mode 100644
index ed60a08e065..00000000000
--- a/databases/sqlrelay/patches/patch-src_loggers_custom__sc.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-src_loggers_custom__sc.cpp,v 1.1 2014/05/27 09:55:04 joerg Exp $
-
---- src/loggers/custom_sc.cpp.orig	2014-05-23 17:02:08.000000000 +0000
-+++ src/loggers/custom_sc.cpp
-@@ -131,7 +131,7 @@ bool custom_sc::run(sqlrlistener *sqlrl,
- 
- 	// get the client IP, it's needed for some events
- 	const char	*clientaddr="unknown";
--	if (sqlrcon && sqlrcon->cont->connstats->clientaddr) {
-+	if (sqlrcon && sqlrcon->cont->connstats->clientaddr[0]) {
- 		clientaddr=sqlrcon->cont->connstats->clientaddr;
- 	}
-