Update to 0.59

* Fix build with Ruby 2.2.

Changelog:
0.59 - updated docs, removed some Cygwin-specific info
	added support for login warnings
	made bind variable buffers dynamic on the client side
	added maxbindvars parameter on the server side
	binding a NULL to an integer works with db2 now
	moved getting started with DB docs into the cloud
	added a semaphore to ensure that the listener doesn't hand off the
		client to the connection until the connection is ready,
		elimiating a race condition on the handoff socket that could
		occur if the connection timed out waiting for the listener
		just after the listener had decided to use that connection
	oracle temp tables that need to be truncated at the end of the session
		are truncated with "truncate table xxx" now rather than
		"delete from xxx"
	oracle temp tables that need to be dropped at the end of the session
		are truncated first, rather than the connection re-logging in
	an ora-14452 error (basically indicating that a temp table can only be
		dropped after being truncated, or if the current session ends)
		does not automatically trigger a re-login any more
	updated cachemanager to use directory::read() directly instead of
		directory::getChildName(index)
	added cache and opencache commands to sqlrsh
	made cache ttl a 64-bit number
	added enabled="yes"/"no" parameter to logger modules
	updated odbc connection code to use new/delete and rudiments methods
		rather than malloc/free and native calls
	retired Ruby DBI driver
	fixed command line client crash when using -id "instance" with an
		instance that uses authtier="database"
	fixed bugs that could make reexecuted db2 selects fail and cause a
		database re-login loop
	tweaked spec file to remove empty directories on uninstall
	fixed typo that could sometimes cause a listener crash
	postgresql and mdbtools return error code of 1 rather than 0 for all
		errors now
	tweaked odbc driver to work with Oracle Heterogenous Agent (dblinks)
	fixed bugs related to autocommit with db's that support transaction
		blocks
	implemented the ODBC driver-manager dialog for windows
	updated windows installer to install ODBC registry settings
	ODBC driver copies references now
	fixed various bugs in sqlrconfigfile that caused sqlr-start with no
		-id to crash or behave strangely sometimes
	refactored build process to use nmake and be compatible with many
		different versions of MS Visual Studio
	updated the slow query logger to show the date/time that the query
		was executed
	consolidated c, c++ and server source/includes down a few levels
	implemented column-remapping for get db/table/column commands to
		enable different formats for mysql, odbc, etc.
	odbc connection correctly returns database/table lists now
	added support for maxselectlistsize/maxitembuffersize to MySQL
		connection
	updated mysql connection to fetch blob columns in chunks and not be
		bound by maxitembuffersize
	fixed a misspelling in sqlrelay.dtd
	swapped order of init directory detection, looking for /etc/init.d
		ahead of /etc/rc.d/init.d to resolve conflict with dkms on
		SuSE Enterprise
	C# api and tests compile and work under Mono on unix/linux now
	sqlr-start spawns a new window on Windows now
	added global temp table tracking for firebird
	added droptemptables parameter for firebird
	added globaltemptables parameter for oracle and firebird
	updated mysql connection to allow mysql_init to allocate a mysql
		struct on platforms that support mysql_init, rather than
		using a static struct
	fixed subtle noon/midnight-related bugs in date/time translation
	updated mysql connection to get affected rows when not using the
		statement api
	updated mysql connection not to use the statement API on windows,
		for now
	disabled mysql_change_user, for now
	fixed blob-input binds on firebird

0.58 - updated spawn() calls to detach on windows
	added support for sqlrelay.conf.d
	removed support for undocumented ~/.sqlrelay.conf
	fixed detection of oracle jdk 7 and 8 on debian and ubuntu systems
	added ini files for PHP and PDO modules
	added resultsetbuffersize, dontgetcolumninfo and nullsasnulls connect
		string variables to the PHP PDO driver
	refactored sqlr-status and removed dependency on libsqlrserver
	cleaned up and refactored server-side classes quite a bit
	fixed a bug where sqlrsh was losing the timezone when binding dates
	server-devel headers are now installed
	removed backupschema script
	moved triggers, translations, resultsettranslations and parser into
		separate project
	blobs work when using fake input binds now
	replaced sqlr-stop script with a binary (for Windows)
	preliminary support for server components on Windows
	sessionhandler="thread" is now forced on Windows
	added various compile flags for clang's aggressive -Wall
	added support for sybase 16.0
	removed unnecessary -lsybdb/-lsybdb64 for sybase 15+
	fixed PQreset, PQresetStart, PQresetPoll in postgresql drop-in
		replacement lib
	added debug-to-file support to PHP PDO driver
	fixed subtle row-fetch bug in sybase/freetds drivers that could cause
		the total row count to be set to garbage
	fixed support for older versions of perl (5.00x)
	fixed a bug in the DB2 connoutpection that caused blob input binds to be
		truncated at the first null
	added support for binding streams to output bind blobs in the PHP PDO
		driver
	updated PHP PDO guide with notes about bind variable formats
	integrated Samat Yusup's dbh driver methods for PHP PDO
	added stmt driver methods for suspending/resuming result sets to the
		PHP PDO driver
	added row cache to mysql drop-in replacement library to fix issues on
		systems with 32-bit pointers
	fixed subtle db2 output bind bfers the entire result set by default now
	implemented an ext_SQLR_Debug database handle attribute for perl DBI
	added support for type, length, precision, scale bind variable
		attributes in perl DBI
	output bind clobs and blobs work in perl DBI now
	addd support for perl DBI ParamValues, ParamTypes and ParamArrays
		attributes
	tweaked the odbc driver so it works with the jdbc-odbc bridge and
		jmeter
	added custom db/statement attributes to perl DBI for
		DontGetColumnInfo, GetNullsAsEmptyStrings and
		ResultSetBufferSize
	added note about JDBC-ODBC bridge removal in Oracle Java 8
	made threaded listener the default
	tweaks to sqlr-connection/sqlr-scaler processes to deal with lack of
		SIGCHLD/waitpid() on windows
	the signal on semaphore 2 is now undone manually when sqlr-connections
		shut down and doesn't rely on semaphore undo's for normal
		operation
	subtly tweaked freeing of Oracle column-info buffers to work around
		a crash that could occur after using a cursor bind

8 files changed, 120 insertions, 90 deletions

diff --git a/databases/sqlrelay/patches/patch-ad b/databases/sqlrelay/patches/patch-ad
index f2222dccc9f..319196367e9 100644
--- a/databases/sqlrelay/patches/patch-ad
+++ b/databases/sqlrelay/patches/patch-ad
@@ -1,13 +1,15 @@
-$NetBSD: patch-ad,v 1.3 2014/05/27 13:24:43 fhajny Exp $
+$NetBSD: patch-ad,v 1.4 2015/05/20 13:26:45 ryoon Exp $
 
 We install init scripts ourselves.
---- Makefile.orig	2013-10-19 12:27:13.000000000 +0000
+--- Makefile.orig	2015-03-31 20:50:58.000000000 +0000
 +++ Makefile
-@@ -17,7 +17,6 @@ install:
- 	$(MAKE) -C src install
- 	$(MAKE) -C bin install
- 	$(MAKE) -C etc install
--	$(MAKE) -C init install
- 	$(MAKE) -C man install
- 	$(MAKE) -C doc install
- 	$(MKINSTALLDIRS) $(libdir)/pkgconfig
+@@ -20,9 +20,6 @@ install-bin:
+ install-etc:
+ 	cd etc $(AND) $(MAKE) install
+ 
+-install-init:
+-	cd init $(AND) $(MAKE) install
+-
+ install-man:
+ 	cd man $(AND) $(MAKE) install
+ 
diff --git a/databases/sqlrelay/patches/patch-config.mk.in b/databases/sqlrelay/patches/patch-config.mk.in
new file mode 100644
index 00000000000..44280131a5e
--- /dev/null
+++ b/databases/sqlrelay/patches/patch-config.mk.in
@@ -0,0 +1,13 @@
+$NetBSD: patch-config.mk.in,v 1.1 2015/05/20 13:26:45 ryoon Exp $
+
+--- config.mk.in.orig	2015-04-18 05:29:10.000000000 +0000
++++ config.mk.in
+@@ -778,7 +778,7 @@ MODULERENAME = $(top_builddir)/moduleren
+ 
+ 
+ # build directories
+-INSTALLSUBDIRS = install-src install-bin install-etc install-init install-man install-doc install-pkgconfig
++INSTALLSUBDIRS = install-src install-bin install-etc install-man install-doc install-pkgconfig
+ UNINSTALLSUBDIRS = uninstall-src uninstall-bin uninstall-etc uninstall-init uninstall-man uninstall-doc uninstall-pkgconfig
+ 
+ ifeq ($(SQLRELAY_ENABLE_SHARED),yes)
diff --git a/databases/sqlrelay/patches/patch-configure b/databases/sqlrelay/patches/patch-configure
index 8fcc182d003..78f432b93d2 100644
--- a/databases/sqlrelay/patches/patch-configure
+++ b/databases/sqlrelay/patches/patch-configure
@@ -1,9 +1,9 @@
-$NetBSD: patch-configure,v 1.2 2014/05/27 13:24:43 fhajny Exp $
+$NetBSD: patch-configure,v 1.3 2015/05/20 13:26:45 ryoon Exp $
 
 Look for history/readline at proper places.
---- configure.orig	2014-03-26 14:50:53.000000000 +0000
+--- configure.orig	2015-04-08 22:16:40.000000000 +0000
 +++ configure
-@@ -17557,7 +17557,7 @@ fi
+@@ -17567,7 +17567,7 @@ fi
  $as_echo_n "checking for history... " >&6; }
  
  
@@ -12,7 +12,7 @@ Look for history/readline at proper places.
  NAME=history
  HEADER=readline/history.h
  LIBNAME=history
-@@ -17893,7 +17893,7 @@ fi
+@@ -17903,7 +17903,7 @@ fi
  $as_echo_n "checking for readline... " >&6; }
  
  
@@ -21,7 +21,7 @@ Look for history/readline at proper places.
  NAME=readline
  HEADER=readline/readline.h
  LIBNAME=readline
-@@ -18501,7 +18501,7 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -18511,7 +18511,7 @@ rm -f core conftest.err conftest.$ac_obj
  
  
  
@@ -30,3 +30,12 @@ Look for history/readline at proper places.
  NAME=iconv
  HEADER=iconv.h
  LIBNAME=iconv
+@@ -32389,7 +32389,7 @@ print "arch = "
+ print CONFIG["arch"]
+ print "\n"
+ print "ruby_version = "
+-print Config::CONFIG["ruby_version"]
++print RbConfig::CONFIG["ruby_version"]
+ print "\n"
+ print "prefix = "
+ print CONFIG["prefix"].sub(drive, "")
diff --git a/databases/sqlrelay/patches/patch-etc_Makefile b/databases/sqlrelay/patches/patch-etc_Makefile
index 7eb7afeda5c..7f0049ddcd0 100644
--- a/databases/sqlrelay/patches/patch-etc_Makefile
+++ b/databases/sqlrelay/patches/patch-etc_Makefile
@@ -1,18 +1,24 @@
-$NetBSD: patch-etc_Makefile,v 1.1 2014/05/22 12:50:48 fhajny Exp $
+$NetBSD: patch-etc_Makefile,v 1.2 2015/05/20 13:26:45 ryoon Exp $
 
 Install config file examples properly.
---- etc/Makefile.orig	2012-05-21 04:54:54.000000000 +0000
+--- etc/Makefile.orig	2015-03-16 04:08:11.000000000 +0000
 +++ etc/Makefile
-@@ -5,10 +5,8 @@ include ../config.mk
- .PHONY: install uninstall
- 
+@@ -5,12 +5,12 @@ include ../config.mk
  install:
--	$(MKINSTALLDIRS) $(sysconfdir)
--	$(INSTALL) -m 644 sqlrelay.conf.example $(sysconfdir)
--	$(INSTALL) -m 644 sqlrelay.dtd $(sysconfdir)
--	$(INSTALL) -m 644 sqlrelay.xsd $(sysconfdir)
-+	$(INSTALL) -m 644 sqlrelay.dtd $(EXAMPLEDIR)
-+	$(INSTALL) -m 644 sqlrelay.xsd $(EXAMPLEDIR)
- 	$(INSTALL) -m 644 sqlrelay.conf.example $(EXAMPLEDIR)/sqlrelay.conf
+ 	$(MKINSTALLDIRS) $(sysconfdir)
+ 	$(MKINSTALLDIRS) $(sysconfdir)/sqlrelay.conf.d
+-	$(CP) sqlrelay.conf.example $(sysconfdir)
+-	$(CHMOD) 644 $(sysconfdir)/sqlrelay.conf.example
+-	$(CP) sqlrelay.dtd $(sysconfdir)
+-	$(CHMOD) 644 $(sysconfdir)/sqlrelay.dtd
+-	$(CP) sqlrelay.xsd $(sysconfdir)
+-	$(CHMOD) 644 $(sysconfdir)/sqlrelay.xsd
++	$(CP) sqlrelay.conf.example $(EXAMPLEDIR)
++	$(CHMOD) 644 $(EXAMPLEDIR)/sqlrelay.conf.example
++	$(CP) sqlrelay.dtd $(EXAMPLEDIR)
++	$(CHMOD) 644 $(EXAMPLEDIR)/sqlrelay.dtd
++	$(CP) sqlrelay.xsd $(EXAMPLEDIR)
++	$(CHMOD) 644 $(EXAMPLEDIR)/sqlrelay.xsd
+ 	$(CP) sqlrelay.conf.example $(EXAMPLEDIR)/sqlrelay.conf
+ 	$(CHMOD) 644 $(EXAMPLEDIR)/sqlrelay.conf
  
- uninstall:
diff --git a/databases/sqlrelay/patches/patch-init_rc.sqlrelay.in b/databases/sqlrelay/patches/patch-init_rc.sqlrelay.in
deleted file mode 100644
index 728a3db1171..00000000000
--- a/databases/sqlrelay/patches/patch-init_rc.sqlrelay.in
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-init_rc.sqlrelay.in,v 1.1 2014/05/22 12:50:48 fhajny Exp $
-
-Instance definition under PKG_SYSCONFDIR.
---- init/rc.sqlrelay.in.orig	2013-10-20 02:33:20.000000000 +0000
-+++ init/rc.sqlrelay.in
-@@ -119,7 +119,7 @@ fi
- 
- 
- # define instance file
--instances=/etc/sqlrelay
-+instances=${sysconfdir}/sqlrelay
- if ( test -r "/etc/sysconfig/sqlrelay" )
- then
-     instances=/etc/sysconfig/sqlrelay
diff --git a/databases/sqlrelay/patches/patch-src_api_php_sql__relay.cpp b/databases/sqlrelay/patches/patch-src_api_php_sql__relay.cpp
deleted file mode 100644
index 4298ae682b8..00000000000
--- a/databases/sqlrelay/patches/patch-src_api_php_sql__relay.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-$NetBSD: patch-src_api_php_sql__relay.cpp,v 1.1 2014/11/17 19:00:39 joerg Exp $
-
-Don't mess with system headers by pretending to be C or removing defines.
-Just expect php.h to work.
-
---- src/api/php/sql_relay.cpp.orig	2014-09-02 01:51:20.000000000 +0000
-+++ src/api/php/sql_relay.cpp
-@@ -3,39 +3,7 @@
- 
- #include <sqlrelay/sqlrclient.h>
- 
--#ifdef WIN32
--	#undef uid_t
--	#undef gid_t
--	#undef ssize_t
--	#undef socklen_t
--	#undef pid_t
--	#undef mode_t
--	#define PHP_WIN32
--	#define ZEND_WIN32
--	#define ZEND_DEBUG 0
--	#define ZTS 1
--#endif
--
--extern "C" {
--	#ifndef WIN32
--		#ifdef __cplusplus
--			#undef __cplusplus
--			#define cpluspluswasdefined
--		#endif
--		#ifndef HAVE_SOCKLEN_T
--			#define HAVE_SOCKLEN_T
--		#endif
--		#ifndef _WCHAR_T_DEFINED_
--			#define _WCHAR_T_DEFINED_
--		#endif
--	#endif
--	#include <php.h>
--	#ifndef WIN32
--		#ifdef cpluspluswasdefined
--			#define __cplusplus
--		#endif
--	#endif
--}
-+#include <php.h>
- 
- #include <config.h>
- 
diff --git a/databases/sqlrelay/patches/patch-src_api_ruby_getcflags.rb b/databases/sqlrelay/patches/patch-src_api_ruby_getcflags.rb
new file mode 100644
index 00000000000..b299156ac6f
--- /dev/null
+++ b/databases/sqlrelay/patches/patch-src_api_ruby_getcflags.rb
@@ -0,0 +1,31 @@
+$NetBSD: patch-src_api_ruby_getcflags.rb,v 1.1 2015/05/20 13:26:45 ryoon Exp $
+
+* Fix Ruby 2.2 build.
+
+--- src/api/ruby/getcflags.rb.orig	2011-07-16 00:49:53.000000000 +0000
++++ src/api/ruby/getcflags.rb
+@@ -6,19 +6,19 @@ require "mkmf"
+ drive = File::PATH_SEPARATOR == ";" ? /\A\w:/ : /\A/
+ print "\n"
+ print "arch = "
+-print CONFIG["arch"]
++print RbConfig::CONFIG["arch"]
+ print "\n"
+ print "sitearch = "
+-print CONFIG["sitearch"]
++print RbConfig::CONFIG["sitearch"]
+ print "\n"
+ print "ruby_version = "
+-print Config::CONFIG["ruby_version"]
++print RbConfig::CONFIG["ruby_version"]
+ print "\n"
+ print "prefix = "
+-print CONFIG["prefix"].sub(drive, "")
++print RbConfig::CONFIG["prefix"].sub(drive, "")
+ print "\n"
+ print "exec_prefix = "
+-print CONFIG["exec_prefix"].sub(drive, "")
++print RbConfig::CONFIG["exec_prefix"].sub(drive, "")
+ print "\n"
+ print "libdir = "
+ print $libdir.sub(drive, "")
diff --git a/databases/sqlrelay/patches/patch-src_api_ruby_getsitearchdir.rb b/databases/sqlrelay/patches/patch-src_api_ruby_getsitearchdir.rb
new file mode 100644
index 00000000000..c75105e2473
--- /dev/null
+++ b/databases/sqlrelay/patches/patch-src_api_ruby_getsitearchdir.rb
@@ -0,0 +1,31 @@
+$NetBSD: patch-src_api_ruby_getsitearchdir.rb,v 1.1 2015/05/20 13:26:45 ryoon Exp $
+
+* Fix Ruby 2.2 build.
+
+--- src/api/ruby/getsitearchdir.rb.orig	2015-04-09 01:48:10.000000000 +0000
++++ src/api/ruby/getsitearchdir.rb
+@@ -1,19 +1,19 @@
+ require "mkmf"
+ drive = File::PATH_SEPARATOR == ";" ? /\A\w:/ : /\A/
+ print "arch = "
+-print CONFIG["arch"]
++print RbConfig::CONFIG["arch"]
+ print "\n"
+ print "sitearch = "
+-print CONFIG["sitearch"]
++print RbConfig::CONFIG["sitearch"]
+ print "\n"
+ print "ruby_version = "
+-print Config::CONFIG["ruby_version"]
++print RbConfig::CONFIG["ruby_version"]
+ print "\n"
+ print "prefix = "
+-print CONFIG["prefix"].sub(drive, "").sub("$(DESTDIR)","")
++print RbConfig::CONFIG["prefix"].sub(drive, "").sub("$(DESTDIR)","")
+ print "\n"
+ print "exec_prefix = "
+-print CONFIG["exec_prefix"].sub(drive, "").sub("$(DESTDIR)","")
++print RbConfig::CONFIG["exec_prefix"].sub(drive, "").sub("$(DESTDIR)","")
+ print "\n"
+ print "libdir = "
+ print $libdir.sub(drive, "").sub("$(DESTDIR)","")