summaryrefslogtreecommitdiff
path: root/databases/sqlrelay
diff options
context:
space:
mode:
authorfhajny <fhajny>2016-10-21 14:16:34 +0000
committerfhajny <fhajny>2016-10-21 14:16:34 +0000
commitbe20352e1b3b7eead1937894220e4b95c3ab0361 (patch)
tree3190471ce7ecf8adb25bd44a66423dc80ae92584 /databases/sqlrelay
parentf98defbb267c7b146af1fb7e3da94ddbe622a391 (diff)
downloadpkgsrc-be20352e1b3b7eead1937894220e4b95c3ab0361.tar.gz
Update databases/sqlrelay and sub-packages to 0.66.0.
New features: - Notification Modules - Connection Schedules - Query Router Modules Full changelog: - fixed mysql set isolation level query - updated mysql connection to run commit/rollback at the end of every session even if only selects were run, to make sure metadata locks are released - renamed sqlrclientexitstatus_t to clientsessionexitstatus_t - updated all db connection modules to reinit the column count during prepare rather than execute - fixed bug where server-side errors set by conn/cursor->setError() could inadverntantly be overriden during the next call to conn/cursor->errorMessage() - added several more queries to mysql stmt-api blacklist - configure option --disable-odbc-driver actually works now - filters can specify an error string and error number now - added support for systemd - fixed a memory leak by applying and updating a patch from Kasyanov Dmitry to deallocate the error message in C++ API destructor - legacy_stdio_definitions.lib is now included when building ODBC with VS2015 - added support for PHP7 - added -wait option to sqlr-start for non-Windows - disabled -disable-new-window option to sqlr-start for non-Windows - non-ascii character encodings work with the C# API now - rudiments prompt class is used instead of using readline directly now - renamed "logger-events" to just "events" - added notification framework and "events" module - added connection schedule framework and "cron" module - applied sec/usec patch from samchuck at neowiz to custom_nw logger to fix subtle time calculation error - applied a patch from samchuck at neowiz to the sqlrclient protocol module to deallocate storage for bind variables after logging the query to resolve a reference-after-free bug - added router module framework with "regex", "userlist" and "clientiplist" modules - when router detects a possible integrity violation now, it raises an event which can be logged or trigger a notification and disables the instance - router calls begin, commit, and rollback on all connections now, even if they're executed as queries rather than using the api methods - removed tls_userlist/krb_userlist auth modules and updated the userlist auth module to support tls and kerberos auth - converted most of the doc source to wikitext - fixed ODBC driver bug that could corrupt memory and trick the driver manager into thinking that some basic functions are unavailable - ODBC SQLTables works more correctly now - fixed an ODBC bug that caused the first row to be fetched twice when using SQLBindCol
Diffstat (limited to 'databases/sqlrelay')
-rw-r--r--databases/sqlrelay/Makefile5
-rw-r--r--databases/sqlrelay/Makefile.common5
-rw-r--r--databases/sqlrelay/PLIST15
-rw-r--r--databases/sqlrelay/buildlink3.mk5
-rw-r--r--databases/sqlrelay/distinfo12
-rw-r--r--databases/sqlrelay/patches/patch-configure50
6 files changed, 44 insertions, 48 deletions
diff --git a/databases/sqlrelay/Makefile b/databases/sqlrelay/Makefile
index 66bf106e1cd..6b3c3d1ef9d 100644
--- a/databases/sqlrelay/Makefile
+++ b/databases/sqlrelay/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.49 2016/10/07 18:25:31 adam Exp $
+# $NetBSD: Makefile,v 1.50 2016/10/21 14:16:34 fhajny Exp $
COMMENT= Database connection pooling middleware and API
-PKGREVISION= 2
.include "../../databases/sqlrelay/Makefile.common"
@@ -12,7 +11,7 @@ CONFIGURE_ARGS+= --disable-db2 --disable-erlang --disable-firebird \
--disable-mysql --disable-odbc --disable-oracle \
--disable-perl --disable-php --disable-postgresql \
--disable-python --disable-ruby --disable-sqlite \
- --disable-sybase --disable-tcl --disable-nodejs
+ --disable-sap --disable-tcl --disable-nodejs
INSTALL_MAKE_FLAGS+= EXAMPLEDIR=${DESTDIR}${EGDIR}
diff --git a/databases/sqlrelay/Makefile.common b/databases/sqlrelay/Makefile.common
index 3db0f86ded9..0b2e7d3308e 100644
--- a/databases/sqlrelay/Makefile.common
+++ b/databases/sqlrelay/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.12 2016/07/01 17:02:39 fhajny Exp $
+# $NetBSD: Makefile.common,v 1.13 2016/10/21 14:16:34 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.65.0
+DISTNAME= sqlrelay-0.66.0
CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=sqlrelay/}
@@ -47,4 +47,3 @@ CWRAPPERS_APPEND.cxx+= -Wno-error=overloaded-virtual
.include "../../devel/rudiments/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/readline.buildlink3.mk"
diff --git a/databases/sqlrelay/PLIST b/databases/sqlrelay/PLIST
index 8b3561941d0..0fd4436cb34 100644
--- a/databases/sqlrelay/PLIST
+++ b/databases/sqlrelay/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2016/07/01 17:02:39 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.18 2016/10/21 14:16:34 fhajny Exp $
bin/sqlr-cachemanager
bin/sqlr-connection
bin/sqlr-export
@@ -54,10 +54,8 @@ lib/libsqlrutil.la
lib/pkgconfig/sqlrelay-c++.pc
lib/pkgconfig/sqlrelay-c.pc
libexec/sqlrelay/sqlrauth_database.${SOEXT}
-libexec/sqlrelay/sqlrauth_krb_userlist.${SOEXT}
libexec/sqlrelay/sqlrauth_proxied.${SOEXT}
libexec/sqlrelay/sqlrauth_sqlrelay.${SOEXT}
-libexec/sqlrelay/sqlrauth_tls_userlist.${SOEXT}
libexec/sqlrelay/sqlrauth_userlist.${SOEXT}
libexec/sqlrelay/sqlrconfig_xmldom.${SOEXT}
libexec/sqlrelay/sqlrconnection_router.${SOEXT}
@@ -68,6 +66,7 @@ libexec/sqlrelay/sqlrlogger_custom_nw.${SOEXT}
libexec/sqlrelay/sqlrlogger_custom_sc.${SOEXT}
libexec/sqlrelay/sqlrlogger_debug.${SOEXT}
libexec/sqlrelay/sqlrlogger_slowqueries.${SOEXT}
+libexec/sqlrelay/sqlrnotification_events.${SOEXT}
libexec/sqlrelay/sqlrparser_default.${SOEXT}
libexec/sqlrelay/sqlrprotocol_sqlrclient.${SOEXT}
libexec/sqlrelay/sqlrpwdenc_crypt.${SOEXT}
@@ -76,6 +75,10 @@ libexec/sqlrelay/sqlrpwdenc_rot.${SOEXT}
libexec/sqlrelay/sqlrquery_sqlrcmdcstat.${SOEXT}
libexec/sqlrelay/sqlrquery_sqlrcmdgstat.${SOEXT}
libexec/sqlrelay/sqlrresultsettranslation_reformatdatetime.${SOEXT}
+libexec/sqlrelay/sqlrrouter_clientiplist.${SOEXT}
+libexec/sqlrelay/sqlrrouter_regex.${SOEXT}
+libexec/sqlrelay/sqlrrouter_userlist.${SOEXT}
+libexec/sqlrelay/sqlrschedule_cron_userlist.${SOEXT}
libexec/sqlrelay/sqlrtranslation_normalize.${SOEXT}
man/man1/sqlr-export.1
man/man1/sqlr-import.1
@@ -602,6 +605,7 @@ share/doc/sqlrelay/features/proxying.html
share/doc/sqlrelay/features/queryfiltering.html
share/doc/sqlrelay/features/queryrouting.html
share/doc/sqlrelay/features/resultsetcaching.html
+share/doc/sqlrelay/features/schedules.html
share/doc/sqlrelay/features/substitutionandbindvars.html
share/doc/sqlrelay/features/suspendedtx.html
share/doc/sqlrelay/features/throttling.html
@@ -614,6 +618,7 @@ share/doc/sqlrelay/images/arm-linux-uclibc-thumb.png
share/doc/sqlrelay/images/arm-linux-uclibc.png
share/doc/sqlrelay/images/blackray.png
share/doc/sqlrelay/images/cluster.png
+share/doc/sqlrelay/images/dayshift.png
share/doc/sqlrelay/images/fetch-many.png
share/doc/sqlrelay/images/fetch-one.png
share/doc/sqlrelay/images/firebird.png
@@ -642,6 +647,7 @@ share/doc/sqlrelay/images/netbsd-sparc-thumb.png
share/doc/sqlrelay/images/netbsd-sparc.png
share/doc/sqlrelay/images/netbsd-vax-thumb.png
share/doc/sqlrelay/images/netbsd-vax.png
+share/doc/sqlrelay/images/nightshift.png
share/doc/sqlrelay/images/openbsd-i386-thumb.png
share/doc/sqlrelay/images/openbsd-i386.png
share/doc/sqlrelay/images/openbsd-sparc-thumb.png
@@ -678,8 +684,11 @@ 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
diff --git a/databases/sqlrelay/buildlink3.mk b/databases/sqlrelay/buildlink3.mk
index 5a8476982ab..4a1fb28cda2 100644
--- a/databases/sqlrelay/buildlink3.mk
+++ b/databases/sqlrelay/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2016/10/07 18:25:31 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2016/10/21 14:16:34 fhajny Exp $
BUILDLINK_TREE+= sqlrelay
@@ -6,12 +6,11 @@ BUILDLINK_TREE+= sqlrelay
SQLRELAY_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.sqlrelay+= sqlrelay>=0.43
-BUILDLINK_ABI_DEPENDS.sqlrelay+= sqlrelay>=0.65.0nb2
+BUILDLINK_ABI_DEPENDS.sqlrelay+= sqlrelay>=0.66.0
BUILDLINK_PKGSRCDIR.sqlrelay?= ../../databases/sqlrelay
.include "../../devel/rudiments/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/readline.buildlink3.mk"
.endif # SQLRELAY_BUILDLINK3_MK
BUILDLINK_TREE+= -sqlrelay
diff --git a/databases/sqlrelay/distinfo b/databases/sqlrelay/distinfo
index bf11aa4cec5..b9c8c3561c1 100644
--- a/databases/sqlrelay/distinfo
+++ b/databases/sqlrelay/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.20 2016/07/01 17:02:39 fhajny Exp $
+$NetBSD: distinfo,v 1.21 2016/10/21 14:16:34 fhajny Exp $
-SHA1 (sqlrelay-0.65.0.tar.gz) = 7649fc14a95009ffaeb56f12abe70e526c4eb099
-RMD160 (sqlrelay-0.65.0.tar.gz) = f83b9372da1283bd35f62761c522c0cdd25dd536
-SHA512 (sqlrelay-0.65.0.tar.gz) = 7d5d18dbfd7b0c4bb39466489726c2d401b08e2c63af13c9bfb75f9c6839b7ac86caf3d03e3152cb73cf86d03b2de2f5880b41c40ffb5ef6c357886fb2aedcf7
-Size (sqlrelay-0.65.0.tar.gz) = 3970412 bytes
+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 (patch-ad) = cc4a94941ec737abede98bdd7b19bc902f755609
SHA1 (patch-config.mk.in) = 22e8459f49e20529289e1a99b10cebaa449af0c0
-SHA1 (patch-configure) = 29bc9087fc814d0879c99b2772632a3034bec502
+SHA1 (patch-configure) = 04affebca0556849cfbc3eb17f5b9481eb00631b
SHA1 (patch-etc_Makefile) = 28e9cac18314f1fc725603d47cb92ec6e54d7c63
SHA1 (patch-src_api_php_sql__relay.cpp) = 9e33260f4e4331874187e5b30db17d4478710385
SHA1 (patch-src_api_ruby_getcflags.rb) = 033e26ef03db4851f493d831c37ec947662d47ee
diff --git a/databases/sqlrelay/patches/patch-configure b/databases/sqlrelay/patches/patch-configure
index 1a0e12f4c03..448fce341dd 100644
--- a/databases/sqlrelay/patches/patch-configure
+++ b/databases/sqlrelay/patches/patch-configure
@@ -1,36 +1,26 @@
-$NetBSD: patch-configure,v 1.4 2015/09/02 12:39:33 fhajny Exp $
+$NetBSD: patch-configure,v 1.5 2016/10/21 14:16:34 fhajny Exp $
-Look for history/readline at proper places.
---- configure.orig 2015-08-16 02:25:15.000000000 +0000
+Fix Python 3 lookup.
+Fix Ruby support.
+
+--- configure.orig 2016-07-26 07:55:32.000000000 +0000
+++ configure
-@@ -17662,7 +17662,7 @@ fi
- $as_echo_n "checking for history... " >&6; }
-
-
--SEARCHPATH=/usr
-+SEARCHPATH=${prefix}
- NAME=history
- HEADER=readline/history.h
- LIBNAME=history
-@@ -17998,7 +17998,7 @@ fi
- $as_echo_n "checking for readline... " >&6; }
-
-
--SEARCHPATH=/usr
-+SEARCHPATH=${prefix}
- NAME=readline
- HEADER=readline/readline.h
- LIBNAME=readline
-@@ -18606,7 +18606,7 @@ rm -f core conftest.err conftest.$ac_obj
-
-
+@@ -32419,12 +32419,12 @@ then
--SEARCHPATH=/usr
-+SEARCHPATH=${prefix}
- NAME=iconv
- HEADER=iconv.h
- LIBNAME=iconv
-@@ -33144,7 +33144,7 @@ print CONFIG["arch"]
+ for i in "3.9" "3.8" "3.7" "3.6" "3.5" "3.4" "3.3" "3.2" "3.1" "3.0"
+ do
+- if ( test -d "$PYTHON3PATH/include/python$i" -a -d "$PYTHON3PATH/lib64/python$i/config" )
++ if ( test -d "$PYTHON3PATH/include/python$i" -a -d "$PYTHON3PATH/lib64/python$i/config-$i" )
+ then
+ PYTHON3INCLUDES="-I$PYTHON3PATH/include/python$i"
+ PYTHON3DIR="$PYTHON3PATH/lib64/python$i"
+ else
+- if ( test -d "$PYTHON3PATH/include/python$i" -a -d "$PYTHON3PATH/lib/python$i/config" )
++ if ( test -d "$PYTHON3PATH/include/python$i" -a -d "$PYTHON3PATH/lib/python$i/config-$i" )
+ then
+ PYTHON3INCLUDES="-I$PYTHON3PATH/include/python$i"
+ PYTHON3DIR="$PYTHON3PATH/lib/python$i"
+@@ -32914,7 +32914,7 @@ print CONFIG["arch"]
print "\n"
print "ruby_version = "
begin