diff options
| author | fhajny <fhajny> | 2014-05-22 12:50:47 +0000 |
|---|---|---|
| committer | fhajny <fhajny> | 2014-05-22 12:50:47 +0000 |
| commit | 21b96cc762de04dbfb0a4b53f631952a8d2e0a68 (patch) | |
| tree | 8592b4d7b1847e1184dca97a343a534a97d8e472 /databases/sqlrelay | |
| parent | fd5e13b077edd75a01d2cc8f376bf9d555612570 (diff) | |
| download | pkgsrc-21b96cc762de04dbfb0a4b53f631952a8d2e0a68.tar.gz | |
Update sqlrelay to 0.55.
A full refactor and split-up into separate packages for the various APIs and backends.
Changelog since 0.43 follows.
0.55 - fixed a sql translation bug related to exists clauses
added deployment projects for windows
tweaked make.batch install target to install 32-bit files under
C:\Program Files (x86)
added a timeout parameter to db2 and odbc connect strings
fixed a bug that could cause a connection's ttl to fail because a
semaphore was left signalled when another connection's ttl
expired
updated handoff="proxy" code to work with sessionhandler="thread"
replaced waitpid call in sqlrscaler with rudiments equivalent
got the server-side stuff to compile on windows
added configurable fetch buffer sizes to sybase, freetds and db2
connections re-distribute themselves periodically if the database is
behind a load balancer now
fixed a bug that caused sqlrsh to incorrectly interpret internal
commands with leading whitespace when run from a script or on
the command line
fixed a bug that caused cursors not to be completely cleaned up after
when dynamic scaling is used
fixed a bug that caused the response timeout to be handled improperly
added response timeout command to sqlrsh
added support for clobs/blobs with firebird
fixed a blob-related bug with sqlite
added support for blob input binds with db2
added support for clob/blob output binds with db2
improved clob/blob fetching with db2
inputBindClob/Blob methods work with all db's now
added -Wno-unknown-pragmas flag (if it it supported) to java build for
solaris 8
updated default item buffer sizes to 32768 for sybase, freetds, db2
and odbc
applied Gerhard Lausser's patch to improve Oracle instantclient
detection
0.54 - fixed bugs that caused problems when unopened result sets were closed
added protocol identification phase to client/server protocol
split client protocol handling out into its own class and abstracted it
updated oracle code not to relogin when dropping tables unless a
temp table with an "on commit preserve rows" was run
updated server to run table-drop and session-end queries after the
session-end commit/rollback, as some queries on some platforms (
ncluding drop-table on oracle) cause an implicit commit and
the rollback needs to be run first
replaced gettimeofday calls with calls to datetime::getSystemDateAndTime
fixed a bug in slow query logger that caused it to display the wrong
query time
a few mingw32 tweaks
fixed a few PDO driver bugs related to affected row counts and
last insert id
implemented PDO exceptions
implemented support for PDO::ATTR_EMULATE_PREPARES by using
substitution variables
added foundrows and ignorespace options to mysql connect string
fixed a bug where affectedRows() would return -1 for MySQL selects
instead of the same value as rowCount()
updated sqlr-connection code not to get db host name and ip address
at startup unless logging is enabled to work around issues
where people fail to put the db host name in dns
fixed a subtle bind format translation bug that caused errors when
translating from oracle-style binds to mysql-style if the
varaibles were out of order with the placeholders in the query
fixed bugs in the mysql and postgresql connection code that assumed
that the bind variables were bound in order, independent of
their names
resolved a paradox involved in detecting whether the current mysql
query needs to have its bind variables faked or not
added support for client-side debug-to-file
added debug-to-file support to command line clients
tweaked server processes to use process::spawn instead of system() and
process::fork()/process::exec()
added another error string to detect down mysql database
added support for a multi-threaded listener
fixed a bug that could cause a crash when logging connection-level
errors
added back x64-detection so sybase and db2 libraries will be detected
properly
added support for forward-only cursors to the PDO driver
fixed a bug that could cause one (and only one) dynamically spawned
connection daemon to ignore its ttl
added support for get/set result set buffer size to the PDO driver
updated configure test for xsubpp
updated configure test for tcl to support multi-arch
updated configure test for python to support multi-arch
added custom PDO driver attributes to access db type, version, host
name, ip address and bind format
added custom PDO driver attribute to get/set current database
added custom PDO driver attribute to set whether or not to get column
info when fetching the result set
updated db2 to re-login when it sees error -30081
0.53.1 - updated the configuration and tuning docs a bit
fixed a Makefile bug that caused "make clean" to be interrupted
extern "C"-wrapped sys/times.h for OSR500
0.53 - added support for sqlite statement api and native binds
fixed some leaks related to using sys::getHostName()
added multiarch detection
added PHP PDO driver
fixed a bind variable translation bug where output binds followed by
:= would not be detected
dropped zope support (for now)
dropped PHP Pear DB support
refactored init script - one script should work on all platforms now
updated init script installation - should work on virtually all unixes
added OS X launchd configuration
updated the sqlr-listener to clean up files related to ipc, sockets
and marking whether the db is up or down on exit
sqlr-start no longer starts the cache manager
added a second init script for the cache manager
plugins are statically linked into libsqlrserver if the platform
doesn't support shared libraries (or if --disable-shared is
specified at configure time)
the perl API should build with old versions of perl (5.00X) on older
platforms (redhat 4.2, 5.2, 6.2, etc.) now
updated postgresql bind docs
added dateyyyyddmm parameter
added yyyyddmm parameter to translatedates translation
added SQLR_MYSQL_DATE_YYYYDDMM envrionment variable to mysql drop-in
library
added SQLR_ODBC_DATE_YYYYDDMM envrionment variable to odbc driver
0.52 - sqlrsh has long reported the wrong version, fixed that
added csv support to sqlr-export and a -format xml|csv option
replaced snprintf calls with charstring::printf calls
added a test for sys/vnode.h to work around an issue with perl on
SCO OSR6
added workarounds for old versions of sqlite without sqlite3_malloc
and sqlite3_free with char * argument
fixed error with sqlserver where "describe <table>" would return
columns in alphabetical order rather than the order they
are in the table
the code freetds uses to get column names from MS SQL Server works
for temp tables now
added informix->mssqlserver translation for select into queries
added translation to convert ||'s to concat() calls or +'s
added a long-missing "delete clientsock" to sqlrlistener that could
cause a crash after enough time
various documentation tweaks
added handling for "select into" queries to
temptableslocalize/sybaseize translations
fixed various crashes that could occur when a query filter was used
updated the query routing and filtering doc
sqlrsh supports multiple commands on a single line or on the
command-line now
exit/quit in a sqlrsh script aborts the script now
improved date/time parsing for translations and result-set conversions
fixed lots of cases where const char *'s were being deleted
added 64-bit build support for windows
combined sqlrclient files for faster compiling
converted \t to actual tab in regular expressions for
posix-compatibility
0.51 - fixed minor perl DBI driver documentation issue
added support for oracle 12c
added support for db2 10.1 and 10.5
updated docs for oracle 12c, db2 10.1 and 10.5 and sybase 15.7
modernized database installation docs a little
fixed db2/sybase detection to take the system architecture into
account when searching for libs
applied various build-related patches from Ville Silventoinen
fixed rpm->rpmbuild in installation docs
added ora-00020 to list of errors that will cause the oracle
connection to attempt to re-login, per Ville Silventoinen
fixed some MS SQL Server/dateddmm parameter issues and updated docs
to explain the remaining issues
0.50 - fixed sqlrserver-config script to return data for libsqlrserver
rather than libsqlrconnection
added test for SQLROWSETSIZE for odbc that doesn't define it
updated postgresql drop-in library enough to work with psycopg2-2.4
with various caveats and tweaks
fixed NULL dereference in custom_nw logger
added support for dbversion, show tables/databases and describe for
SQL Server via freetds
fixed a subtle bug that could cause the wrong triggers to be run
fixed a reference-after-free in
sqltranslations::removeReplacementTable
fixed an uninitialized variable (sqltr) in sqlrcontroller class
updated the freetds connection to support multiple cursors correctly
added config parameters for reformatting dates in the result set
added various query translations for mssqlserver
added an mssqlserver error map for the mysql drop-in library
fixed a memory leak in the freetds version-checking code
added new search paths and default prefix for syllable
added support for null-terminated result bind lists to the mysql
drop-in library so apps can optionally bind fewer columns than
come back in the result set
added configure tests for php-config-<version>
0.49 - fixed various issues that came up when cross-compiling
fixed make uninstall to remove a few things that it missed
fixed -pthread annoyance
added -Werror to default build for most components
fixed various issues revealed by -Werror
added password encryption framework
added rot,md5 and crypt password encryption plugins
moved modules to libexec and removed the libsqlrelay_ prefix
moved modules out of the connection directory and into their own
directories under src
reorganized code tree to compile faster
updated clean targets in Makefiles to run faster
fixed a bug that could cause problems when fetching from an output
bind cursor under a very specific set of circumstances
reorganized server code into libsqlrserver
implemented the swisscomm log format as a plugin
added dbHostName and dbIpAddress methods to the client API
refactored authentication to remove a client-server round-trip
replaced handoff="reconnect" with handoff="proxy" which uses
listener-proxying to remove a client-server round-trip
disabled nagle's algorithm for all sockets
fixed a bug that could cause a hang if the db login failed
updated reading of skip and fetch parameters not to rely on buffering
refactored login error reporting
fleshed out the ODBC driver significantly
added docs for using SQL Relay from ODBC and JDBC
refactored windows make.bat script
0.48 - integrated patches from Neowiz for:
handling for oracle errors ora-01033, ora-02067 and ora-04068
bind validation when using the statement cache
optionally rejecting oracle queries with duplicate
bind variables
sqlrconnecton::setClientInfo/getClientInfo
query logging
separate authentication and response timeouts on the client-side
environment variables for setting timeouts
sqlrelay-level errors for exceeding various bounds
improved statistics gathering
refactored Oracle re-prepare logic
created a query logging framework
implemented the current slow query log as a plugin
implemented the neowiz query log format as a plugin
created a custom query framework
implemented the neowiz statistics gathering commands as custom queries
added a test program for triggers, translations and other extensions
and obscure features
fixed several bugs in the informixtooracledates translation
added a droplocalizedtemptables trigger
added support for "global temporary" to temptableslocalize translation
removed oracletemptablespreserverowsbydefault translation -
temptableslocalize is much more effective
fixed a bug that caused a "no server-side cursors" error to occur if
when a new session is started if cursors="0" in sqlrelay.conf
the client no longer aborts a result set before sending a new command,
it just sends the new command, eliminating a client/server
round-trip
replaced sqlr-connection-"dbase" with a single sqlr-connection program
that loads plugins for each database
0.47 - fixed bug that caused sqlr-export to output negative xml-entity values
fixed single-quote-escaping in sqlr-export
forced handoff="reconnect" for Cygwin and Linux<2.2
updated all command line programs to use the same command line
argument structure
added a "fields" command to sqlrsh
added a -command argument to sqlrsh so commands and queries can be
run from the command line directly
renamed query and fields to sqlr-query and sqlr-fields
improved readline detection in the configure script
added getDatabase/Table/ColumnList support to odbc and mdbtools
connections
added detection and support for openjdk
integrated patches from Neowiz for:
using -g3 if available when --enable-debug is specified
support for using the oracle statement cache
fixing an oracle column-resource-related memory leak
eliminating sqlr-start delay
"using namespace rudiments" declaration fixes
added a faq entry about common OCIEnvCreate errors
removed default id warning from sqlr-cachemanager
removed coloration from sqlrsh
updated begin, commit and rollback to return errors if they fail
updated firebird docs
added parsing of standalone constraints in a create table query
0.46 - refactored the translation framework to mimic the trigger framework
added make.batch file for building on windows
added C# API and ADO.NET adapter
added begin method to API's
added sqlrelay.xsd
added date binds
applied Georgiy Kirichenko's missing flushWriteBuffer() patch
fixed some subtle bugs in the Ruby DBI module that modern versions of
Ruby DBI reveal
fixed sql parser errors involving "not null" and union clauses
added a translation to replace double-quoted string literals with
single-quoted string literals
fixed a sql parser bug where "group" of a group by clause could be
misinterpreted as a table alias
updated the scaler to poll 10 times per second and also accept a
trigger from the listener to mitigate race conditions that
can become problematic when connections="0" is used
added C# and ADO.NET docs and updated windows documentation
updated the documentation
added support for waitfordowndatabase config parameter
applied some odbc fixes from Chae Young-ku
added explicit support for outer join operators to the sql parser
dynamic-ized triggers and translations
added a "matches" to "like" translation
added a "serial" to "autoincrement" translation
fixed debug option to query command line client
added javac compile test to configure script
fixed an __attribute__ problem that could occur if perl was compiled
with gcc>2.95 but used on a system with only gcc-2.95 available
fixed an oustanding tcl bug that caused cursors not to be created
fixed several bugs related to escaping quotes
refactored OS detection in configure script
added \n after reading from stdin on Haiku
updated docs to reflect that mysql supports ?-based bind vars
0.45 - added trigger framework
added support for getting the native database error number
added support for mapping native error numbers to MySQL error numbers
for the mysql drop-in replacement library
renamed all .C files to .cpp for windows
added msvc projects for sqlrclient, sqlrclientwrapper, sqlrutil and
sqlrsh and got them all working natively on windows
updated code so ttl="0" works as expected
updated code so dynamic scaling of cursors works as expected
documented dynamic scaling of cursors somewhat
fixed a few mdbtools errors
column aliases work as expected now with firebird
fixed a bug where if an app either enabled or disabled autocommit,
that could become the default status of autocommit rather than
what was set in the config file
added autocommit on/off to sqlrsh
fixed a bind-var-related memory leak in mysql drop-in lib
fixed return values in mysql drop-in lib
updated getTableList() to exclude system tables
applied Benno Lange's localstatedir patch to fix a case where the
localstatedir command line parameter wasn't working properly
applied Renat's listener alarm handling patch
0.44 - updated postgresql drop-in lib for postgresql 8/9 compatibility
updated mysql drop-in lib for mysql 5.2+ compatibility
applied Renat's patch to fix the client session count in the stats
added getDatabase/Table/ColumnList method/functions to API's
added string inputBind method/function with length
added bind variable translation
added transaction block emulation
Diffstat (limited to 'databases/sqlrelay')
18 files changed, 643 insertions, 348 deletions
diff --git a/databases/sqlrelay/Makefile b/databases/sqlrelay/Makefile index f67876d7e90..ed62696175b 100644 --- a/databases/sqlrelay/Makefile +++ b/databases/sqlrelay/Makefile @@ -1,66 +1,59 @@ -# $NetBSD: Makefile,v 1.35 2014/05/18 21:19:14 joerg Exp $ +# $NetBSD: Makefile,v 1.36 2014/05/22 12:50:47 fhajny Exp $ -DISTNAME= sqlrelay-0.43 -PKGREVISION= 11 -CATEGORIES= databases -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=sqlrelay/} +COMMENT= Database connection pooling middleware and API -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://sqlrelay.sourceforge.net/ -COMMENT= Enables pooling and sharing of database connections -LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2 +.include "../../databases/sqlrelay/Makefile.common" -BROKEN= Not working with newer devel/rudiments +.include "../../mk/bsd.prefs.mk" -GNU_CONFIGURE= YES -USE_LANGUAGES= c c++ -USE_TOOLS+= gmake -USE_LIBTOOL= YES - -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} -CONFIGURE_ARGS+= --localstatedir=${VARBASE} -CONFIGURE_ARGS+= --disable-db2 -CONFIGURE_ARGS+= --disable-erlang -CONFIGURE_ARGS+= --disable-firebird -CONFIGURE_ARGS+= --disable-java -CONFIGURE_ARGS+= --disable-mdbtools -CONFIGURE_ARGS+= --disable-oracle -CONFIGURE_ARGS+= --disable-php -CONFIGURE_ARGS+= --disable-python -CONFIGURE_ARGS+= --disable-ruby -CONFIGURE_ARGS+= --disable-sybase -CONFIGURE_ARGS+= --disable-tcl -CONFIGURE_ARGS+= --disable-zope -CONFIGURE_ARGS+= --with-rudiments-prefix=${BUILDLINK_PREFIX.rudiments} -MAKE_ENV+= EXAMPLESDIR=${EGDIR:Q} +CONFIGURE_ARGS+= --disable-db2 --disable-erlang --disable-firebird \ + --disable-freetds --disable-java --disable-mdbtools \ + --disable-mysql --disable-odbc --disable-oracle \ + --disable-perl --disable-php --disable-postgresql \ + --disable-python --disable-ruby --disable-sqlite \ + --disable-sybase --disable-tcl PKG_SYSCONFSUBDIR= sqlrelay EGDIR= ${PREFIX}/share/examples/sqlrelay +INSTALL_MAKE_FLAGS+= EXAMPLEDIR=${DESTDIR}${EGDIR} -CONF_FILES+= ${EGDIR}/sqlrelay.conf.example \ - ${PKG_SYSCONFDIR}/sqlrelay.conf -CONF_FILES+= ${EGDIR}/sqlrelay.dtd \ - ${PKG_SYSCONFDIR}/sqlrelay.dtd -CONF_FILES+= ${EGDIR}/sqlrelay \ - ${PKG_SYSCONFDIR}/sqlrelay - -INSTALLATION_DIRS= ${PREFIX}/share/examples/rc.d +CONF_FILES+= ${EGDIR}/sqlrelay.conf ${PKG_SYSCONFDIR}/sqlrelay.conf +CONF_FILES+= ${EGDIR}/sqlrelay.dtd ${PKG_SYSCONFDIR}/sqlrelay.dtd +CONF_FILES+= ${EGDIR}/sqlrelay ${PKG_SYSCONFDIR}/sqlrelay +SQLR_USER?= sqlrelay +SQLR_GROUP?= ${SQLR_USER} SQLR_DATA?= ${VARBASE}/sqlrelay -OWN_DIRS+= ${SQLR_DATA} -OWN_DIRS+= ${SQLR_DATA}/tmp -OWN_DIRS+= ${SQLR_DATA}/tmp/ipc -OWN_DIRS+= ${SQLR_DATA}/tmp/pids -OWN_DIRS+= ${SQLR_DATA}/tmp/sockets - -RCD_SCRIPTS+= sqlrelay -RCD_SCRIPT_SRC.sqlrelay= ${WRKSRC}/init/netbsd/rc.d/sqlrelay -.include "options.mk" +PKG_GROUPS+= ${SQLR_USER} +PKG_USERS+= ${SQLR_USER}:${SQLR_GROUP} +PKG_GECOS.${SQLR_USER}= SQL Relay daemon user +PKG_HOME.${SQLR_USER}= ${SQLR_DATA} + +OWN_DIRS_PERMS+= ${SQLR_DATA} ${SQLR_USER} ${SQLR_GROUP} 0775 +OWN_DIRS_PERMS+= ${SQLR_DATA}/tmp ${SQLR_USER} ${SQLR_GROUP} 0775 +OWN_DIRS_PERMS+= ${SQLR_DATA}/tmp/ipc ${SQLR_USER} ${SQLR_GROUP} 0775 +OWN_DIRS_PERMS+= ${SQLR_DATA}/tmp/pids ${SQLR_USER} ${SQLR_GROUP} 0775 +OWN_DIRS_PERMS+= ${SQLR_DATA}/tmp/sockets ${SQLR_USER} ${SQLR_GROUP} 0775 + +SUBST_CLASSES+= user +SUBST_STAGE.user= pre-configure +SUBST_MESSAGE.user= Fixing default nonprivileged user +SUBST_FILES.user= etc/sqlrelay.* src/common/defaults.h +SUBST_SED.user= -e '/runasuser/s/nobody/${SQLR_USER}/' +SUBST_SED.user+= -e '/runasgroup/s/nobody/${SQLR_GROUP}/' +SUBST_SED.user+= -e '/RUNASUSER/s/nobody/${SQLR_USER}/' +SUBST_SED.user+= -e '/RUNASGROUP/s/nobody/${SQLR_GROUP}/' + +FILES_SUBST+= SQLR_USER=${SQLR_USER} +FILES_SUBST+= SQLR_GROUP=${SQLR_GROUP} +FILES_SUBST+= SQLR_DATA=${SQLR_DATA} + +RCD_SCRIPTS+= sqlrelay sqlrcachemanager +RCD_SCRIPT_SRC.sqlrelay= ${WRKSRC}/init/rc.sqlrelay +RCD_SCRIPT_SRC.sqlrcachemanager= ${WRKSRC}/init/rc.sqlrcachemanager post-install: - ${INSTALL_DATA} ${WRKSRC}/init/netbsd/sqlrelay ${DESTDIR}${EGDIR}/sqlrelay + ${INSTALL_DATA} ${WRKSRC}/init/sqlrelay ${DESTDIR}${EGDIR}/sqlrelay -.include "../../mk/readline.buildlink3.mk" -.include "../../devel/rudiments/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/sqlrelay/Makefile.common b/databases/sqlrelay/Makefile.common new file mode 100644 index 00000000000..5eabf2dff8f --- /dev/null +++ b/databases/sqlrelay/Makefile.common @@ -0,0 +1,46 @@ +# $NetBSD: Makefile.common,v 1.1 2014/05/22 12:50:48 fhajny Exp $ +# used by databases/p5-sqlrelay/Makefile +# used by databases/php-sqlrelay/Makefile +# used by databases/py-sqlrelay/Makefile +# used by databases/ruby-sqlrelay/Makefile +# used by databases/sqlrelay-freetds/Makefile +# used by databases/sqlrelay-mysql/Makefile +# used by databases/sqlrelay-odbc/Makefile +# used by databases/sqlrelay-pgsql/Makefile +# used by databases/sqlrelay-sqlite/Makefile +# used by databases/sqlrelay/Makefile + +DISTNAME= sqlrelay-0.55 +CATEGORIES= databases +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=sqlrelay/} + +MAINTAINER= filip@joyent.com +HOMEPAGE= http://sqlrelay.sourceforge.net/ +LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2 + +PKG_DESTDIR_SUPPORT= user-destdir + +GNU_CONFIGURE= yes +USE_LANGUAGES= c c++ +USE_TOOLS+= gmake +USE_LIBTOOL= yes +BUILD_DEFS+= VARBASE +MAKE_JOBS_SAFE= no + +DESCR_SRC= ${.CURDIR}/../../databases/sqlrelay/DESCR +DISTINFO_FILE= ${.CURDIR}/../../databases/sqlrelay/distinfo +PATCHDIR= ${.CURDIR}/../../databases/sqlrelay/patches + +CONFIGURE_ARGS+= --localstatedir=${VARBASE} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --with-rudiments-prefix=${BUILDLINK_PREFIX.rudiments} + +PKG_SYSCONFSUBDIR= sqlrelay +EGDIR= ${PREFIX}/share/examples/sqlrelay + +.include "../../devel/pcre/buildlink3.mk" +.include "../../devel/rudiments/buildlink3.mk" +.include "../../devel/zlib/buildlink3.mk" +.include "../../security/openssl/buildlink3.mk" +.include "../../mk/pthread.buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" diff --git a/databases/sqlrelay/PLIST b/databases/sqlrelay/PLIST index 9505882c471..a94d1bcab92 100644 --- a/databases/sqlrelay/PLIST +++ b/databases/sqlrelay/PLIST @@ -1,49 +1,70 @@ -@comment $NetBSD: PLIST,v 1.9 2014/03/11 14:05:01 jperkin Exp $ +@comment $NetBSD: PLIST,v 1.10 2014/05/22 12:50:48 fhajny Exp $ bin/backupschema -bin/fields -bin/query bin/sqlr-cachemanager -${PLIST.freetds}bin/sqlr-connection-freetds -${PLIST.mysql}bin/sqlr-connection-mysql -${PLIST.odbc}bin/sqlr-connection-odbc -${PLIST.pgsql}bin/sqlr-connection-postgresql -bin/sqlr-connection-router -${PLIST.sqlite}bin/sqlr-connection-sqlite +bin/sqlr-connection bin/sqlr-export +bin/sqlr-fields bin/sqlr-import bin/sqlr-listener +bin/sqlr-pwdenc +bin/sqlr-query bin/sqlr-scaler bin/sqlr-start bin/sqlr-status bin/sqlr-stop bin/sqlrclient-config bin/sqlrclientwrapper-config +bin/sqlrserver-config bin/sqlrsh include/sqlrelay/private/bindvar.h include/sqlrelay/private/column.h +include/sqlrelay/private/dll.h include/sqlrelay/private/row.h +include/sqlrelay/private/sqlrclientwrapper.h include/sqlrelay/private/sqlrconnection.h include/sqlrelay/private/sqlrcursor.h include/sqlrelay/private/sqlrdefines.h include/sqlrelay/private/sqlrincludes.h +include/sqlrelay/private/wrapperdll.h include/sqlrelay/sqlrclient.h include/sqlrelay/sqlrclientwrapper.h -lib/libmysql3sqlrelay.la -lib/libmysql40sqlrelay.la -lib/libmysql41sqlrelay.la -lib/libmysql50sqlrelay.la -lib/libmysql51sqlrelay.la -lib/libpqsqlrelay.la +include/sqlrelay/sqlrpwdenc.h +lib/libmysql3${PKGNAME}.so.1 +lib/libmysql3${PKGNAME}.so.1.0.0 +lib/libmysql3sqlrelay.so +lib/libmysql40${PKGNAME}.so.1 +lib/libmysql40${PKGNAME}.so.1.0.0 +lib/libmysql40sqlrelay.so +lib/libmysql41${PKGNAME}.so.1 +lib/libmysql41${PKGNAME}.so.1.0.0 +lib/libmysql41sqlrelay.so +lib/libmysql50${PKGNAME}.so.1 +lib/libmysql50${PKGNAME}.so.1.0.0 +lib/libmysql50sqlrelay.so +lib/libmysql51${PKGNAME}.so.1 +lib/libmysql51${PKGNAME}.so.1.0.0 +lib/libmysql51sqlrelay.so +lib/libpq${PKGNAME}.so.1 +lib/libpq${PKGNAME}.so.1.0.0 +lib/libpqsqlrelay.so lib/libsqlrclient.la lib/libsqlrclientwrapper.la -lib/libsqlrconnection.la -${PLIST.odbc}lib/libsqlrodbc.la +lib/libsqlrserver.la lib/libsqlrutil.la lib/pkgconfig/sqlrelay-c++.pc lib/pkgconfig/sqlrelay-c.pc -man/man1/fields.1 -man/man1/query.1 -man/man1/query.py.1 +libexec/sqlrelay/sqlrconnection_router.so +libexec/sqlrelay/sqlrlogger_custom_nw.so +libexec/sqlrelay/sqlrlogger_custom_sc.so +libexec/sqlrelay/sqlrlogger_debug.so +libexec/sqlrelay/sqlrlogger_slowqueries.so +libexec/sqlrelay/sqlrpwdenc_crypt.so +libexec/sqlrelay/sqlrpwdenc_md5.so +libexec/sqlrelay/sqlrpwdenc_rot.so +libexec/sqlrelay/sqlrquery_sqlrcmdcstat.so +libexec/sqlrelay/sqlrquery_sqlrcmdgstat.so +man/man1/sqlr-fields.1 +man/man1/sqlr-query.1 man/man1/sqlrsh.1 man/man8/sqlr-cachemanager.8 man/man8/sqlr-connection.8 @@ -52,14 +73,111 @@ man/man8/sqlr-listener.8 man/man8/sqlr-scaler.8 man/man8/sqlr-start.8 man/man8/sqlr-stop.8 -${PLIST.perl}${PERL5_SUB_INSTALLVENDORMAN3DIR}/SQLRelay::Connection.3 -${PLIST.perl}${PERL5_SUB_INSTALLVENDORMAN3DIR}/SQLRelay::Cursor.3 -${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/SQLRelay/Connection.pm -${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/SQLRelay/Cursor.pm -${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/auto/SQLRelay/Connection/Connection.so -${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/auto/SQLRelay/Cursor/Cursor.so -share/doc/sqlrelay/api/c++/sqlrclient.h.html -share/doc/sqlrelay/api/c/sqlrclientwrapper.h.html +share/doc/sqlrelay/admin/configuring.html +share/doc/sqlrelay/admin/installing.html +share/doc/sqlrelay/admin/loadbalfailover.html +share/doc/sqlrelay/admin/oraclentier.html +share/doc/sqlrelay/admin/router.html +share/doc/sqlrelay/admin/router.png +share/doc/sqlrelay/admin/running.html +share/doc/sqlrelay/admin/tuning.html +share/doc/sqlrelay/api/c++/html/annotated.html +share/doc/sqlrelay/api/c++/html/bc_s.png +share/doc/sqlrelay/api/c++/html/bdwn.png +share/doc/sqlrelay/api/c++/html/classes.html +share/doc/sqlrelay/api/c++/html/classsqlrconnection-members.html +share/doc/sqlrelay/api/c++/html/classsqlrconnection.html +share/doc/sqlrelay/api/c++/html/classsqlrcursor-members.html +share/doc/sqlrelay/api/c++/html/classsqlrcursor.html +share/doc/sqlrelay/api/c++/html/closed.png +share/doc/sqlrelay/api/c++/html/dir_02092e011f41b1efe6b3468ebe92cde9.html +share/doc/sqlrelay/api/c++/html/dir_0912e6c65b091fa41da70873249342a4.html +share/doc/sqlrelay/api/c++/html/dir_440cbb352fefbdb83d89768c287ae784.html +share/doc/sqlrelay/api/c++/html/dir_68267d1309a1af8e8297ef4c3efbcdba.html +share/doc/sqlrelay/api/c++/html/dir_da61e3e9a357748887e3ca8d7c5a0c16.html +share/doc/sqlrelay/api/c++/html/doxygen.css +share/doc/sqlrelay/api/c++/html/doxygen.png +share/doc/sqlrelay/api/c++/html/dynsections.js +share/doc/sqlrelay/api/c++/html/files.html +share/doc/sqlrelay/api/c++/html/ftv2blank.png +share/doc/sqlrelay/api/c++/html/ftv2cl.png +share/doc/sqlrelay/api/c++/html/ftv2doc.png +share/doc/sqlrelay/api/c++/html/ftv2folderclosed.png +share/doc/sqlrelay/api/c++/html/ftv2folderopen.png +share/doc/sqlrelay/api/c++/html/ftv2lastnode.png +share/doc/sqlrelay/api/c++/html/ftv2link.png +share/doc/sqlrelay/api/c++/html/ftv2mlastnode.png +share/doc/sqlrelay/api/c++/html/ftv2mnode.png +share/doc/sqlrelay/api/c++/html/ftv2mo.png +share/doc/sqlrelay/api/c++/html/ftv2node.png +share/doc/sqlrelay/api/c++/html/ftv2ns.png +share/doc/sqlrelay/api/c++/html/ftv2plastnode.png +share/doc/sqlrelay/api/c++/html/ftv2pnode.png +share/doc/sqlrelay/api/c++/html/ftv2splitbar.png +share/doc/sqlrelay/api/c++/html/ftv2vertline.png +share/doc/sqlrelay/api/c++/html/functions.html +share/doc/sqlrelay/api/c++/html/functions_func.html +share/doc/sqlrelay/api/c++/html/index.html +share/doc/sqlrelay/api/c++/html/jquery.js +share/doc/sqlrelay/api/c++/html/nav_f.png +share/doc/sqlrelay/api/c++/html/nav_g.png +share/doc/sqlrelay/api/c++/html/nav_h.png +share/doc/sqlrelay/api/c++/html/open.png +share/doc/sqlrelay/api/c++/html/sqlrclient_8h_source.html +share/doc/sqlrelay/api/c++/html/sync_off.png +share/doc/sqlrelay/api/c++/html/sync_on.png +share/doc/sqlrelay/api/c++/html/tab_a.png +share/doc/sqlrelay/api/c++/html/tab_b.png +share/doc/sqlrelay/api/c++/html/tab_h.png +share/doc/sqlrelay/api/c++/html/tab_s.png +share/doc/sqlrelay/api/c++/html/tabs.css +share/doc/sqlrelay/api/c/html/bc_s.png +share/doc/sqlrelay/api/c/html/bdwn.png +share/doc/sqlrelay/api/c/html/closed.png +share/doc/sqlrelay/api/c/html/dir_364b2640bd7349a10e593fb505dc3717.html +share/doc/sqlrelay/api/c/html/dir_68267d1309a1af8e8297ef4c3efbcdba.html +share/doc/sqlrelay/api/c/html/dir_7bb915b94a9886845d4043db4913a3c0.html +share/doc/sqlrelay/api/c/html/dir_b9c8ab2e387146131f9b9e79af70de42.html +share/doc/sqlrelay/api/c/html/dir_da61e3e9a357748887e3ca8d7c5a0c16.html +share/doc/sqlrelay/api/c/html/dir_e8d73255ec7feed8fb64227e7a4ab864.html +share/doc/sqlrelay/api/c/html/doxygen.css +share/doc/sqlrelay/api/c/html/doxygen.png +share/doc/sqlrelay/api/c/html/dynsections.js +share/doc/sqlrelay/api/c/html/files.html +share/doc/sqlrelay/api/c/html/ftv2blank.png +share/doc/sqlrelay/api/c/html/ftv2cl.png +share/doc/sqlrelay/api/c/html/ftv2doc.png +share/doc/sqlrelay/api/c/html/ftv2folderclosed.png +share/doc/sqlrelay/api/c/html/ftv2folderopen.png +share/doc/sqlrelay/api/c/html/ftv2lastnode.png +share/doc/sqlrelay/api/c/html/ftv2link.png +share/doc/sqlrelay/api/c/html/ftv2mlastnode.png +share/doc/sqlrelay/api/c/html/ftv2mnode.png +share/doc/sqlrelay/api/c/html/ftv2mo.png +share/doc/sqlrelay/api/c/html/ftv2node.png +share/doc/sqlrelay/api/c/html/ftv2ns.png +share/doc/sqlrelay/api/c/html/ftv2plastnode.png +share/doc/sqlrelay/api/c/html/ftv2pnode.png +share/doc/sqlrelay/api/c/html/ftv2splitbar.png +share/doc/sqlrelay/api/c/html/ftv2vertline.png +share/doc/sqlrelay/api/c/html/group__sqlrclientwrapper.html +share/doc/sqlrelay/api/c/html/index.html +share/doc/sqlrelay/api/c/html/jquery.js +share/doc/sqlrelay/api/c/html/modules.html +share/doc/sqlrelay/api/c/html/nav_f.png +share/doc/sqlrelay/api/c/html/nav_g.png +share/doc/sqlrelay/api/c/html/nav_h.png +share/doc/sqlrelay/api/c/html/open.png +share/doc/sqlrelay/api/c/html/private_2sqlrclientwrapper_8h_source.html +share/doc/sqlrelay/api/c/html/sqlrclientwrapper_8h_source.html +share/doc/sqlrelay/api/c/html/sync_off.png +share/doc/sqlrelay/api/c/html/sync_on.png +share/doc/sqlrelay/api/c/html/tab_a.png +share/doc/sqlrelay/api/c/html/tab_b.png +share/doc/sqlrelay/api/c/html/tab_h.png +share/doc/sqlrelay/api/c/html/tab_s.png +share/doc/sqlrelay/api/c/html/tabs.css +share/doc/sqlrelay/api/c/html/wrapperdll_8h_source.html share/doc/sqlrelay/api/java/allclasses-frame.html share/doc/sqlrelay/api/java/allclasses-noframe.html share/doc/sqlrelay/api/java/com/firstworks/sqlrelay/SQLRConnection.html @@ -80,16 +198,220 @@ share/doc/sqlrelay/api/perl/Connection.html share/doc/sqlrelay/api/perl/Cursor.html share/doc/sqlrelay/api/perl/SQLRelay.html share/doc/sqlrelay/api/perl/perl.html -share/doc/sqlrelay/api/php/doc.html +share/doc/sqlrelay/api/php/blank.html +share/doc/sqlrelay/api/php/classtrees_default.html +share/doc/sqlrelay/api/php/classtrees_sql_relay.html +share/doc/sqlrelay/api/php/elementindex.html +share/doc/sqlrelay/api/php/elementindex_default.html +share/doc/sqlrelay/api/php/elementindex_sql_relay.html +share/doc/sqlrelay/api/php/errors.html +share/doc/sqlrelay/api/php/index.html +share/doc/sqlrelay/api/php/li_default.html +share/doc/sqlrelay/api/php/li_sql_relay.html +share/doc/sqlrelay/api/php/media/banner.css +share/doc/sqlrelay/api/php/media/stylesheet.css +share/doc/sqlrelay/api/php/packages.html +share/doc/sqlrelay/api/php/sql_relay/_sql_relay.doc.php.html share/doc/sqlrelay/api/python/PySQLRClient.py.html share/doc/sqlrelay/api/python/PySQLRDB.py.html -share/doc/sqlrelay/api/ruby/ruby.html -share/doc/sqlrelay/api/ruby/rubydbi.html -share/doc/sqlrelay/configuring.html +share/doc/sqlrelay/api/ruby/dbidoc/DBI.html +share/doc/sqlrelay/api/ruby/dbidoc/classes/DBI.html +share/doc/sqlrelay/api/ruby/dbidoc/classes/DBI/DBD.html +share/doc/sqlrelay/api/ruby/dbidoc/classes/DBI/DBD/SQLRelay.html +share/doc/sqlrelay/api/ruby/dbidoc/classes/DBI/DBD/SQLRelay/Database.html +share/doc/sqlrelay/api/ruby/dbidoc/classes/DBI/DBD/SQLRelay/Database.src/M000011.html +share/doc/sqlrelay/api/ruby/dbidoc/classes/DBI/DBD/SQLRelay/Database.src/M000012.html +share/doc/sqlrelay/api/ruby/dbidoc/classes/DBI/DBD/SQLRelay/Database.src/M000013.html +share/doc/sqlrelay/api/ruby/dbidoc/classes/DBI/DBD/SQLRelay/Database.src/M000014.html +share/doc/sqlrelay/api/ruby/dbidoc/classes/DBI/DBD/SQLRelay/Database.src/M000015.html +share/doc/sqlrelay/api/ruby/dbidoc/classes/DBI/DBD/SQLRelay/Database.src/M000016.html +share/doc/sqlrelay/api/ruby/dbidoc/classes/DBI/DBD/SQLRelay/Database.src/M000017.html +share/doc/sqlrelay/api/ruby/dbidoc/classes/DBI/DBD/SQLRelay/Driver.html +share/doc/sqlrelay/api/ruby/dbidoc/classes/DBI/DBD/SQLRelay/Driver.src/M000017.html +share/doc/sqlrelay/api/ruby/dbidoc/classes/DBI/DBD/SQLRelay/Driver.src/M000018.html +share/doc/sqlrelay/api/ruby/dbidoc/classes/DBI/DBD/SQLRelay/Driver.src/M000019.html +share/doc/sqlrelay/api/ruby/dbidoc/classes/DBI/DBD/SQLRelay/Driver.src/M000020.html +share/doc/sqlrelay/api/ruby/dbidoc/classes/DBI/DBD/SQLRelay/Statement.html +share/doc/sqlrelay/api/ruby/dbidoc/classes/DBI/DBD/SQLRelay/Statement.src/M000001.html +share/doc/sqlrelay/api/ruby/dbidoc/classes/DBI/DBD/SQLRelay/Statement.src/M000002.html +share/doc/sqlrelay/api/ruby/dbidoc/classes/DBI/DBD/SQLRelay/Statement.src/M000003.html +share/doc/sqlrelay/api/ruby/dbidoc/classes/DBI/DBD/SQLRelay/Statement.src/M000004.html +share/doc/sqlrelay/api/ruby/dbidoc/classes/DBI/DBD/SQLRelay/Statement.src/M000005.html +share/doc/sqlrelay/api/ruby/dbidoc/classes/DBI/DBD/SQLRelay/Statement.src/M000006.html +share/doc/sqlrelay/api/ruby/dbidoc/classes/DBI/DBD/SQLRelay/Statement.src/M000007.html +share/doc/sqlrelay/api/ruby/dbidoc/classes/DBI/DBD/SQLRelay/Statement.src/M000008.html +share/doc/sqlrelay/api/ruby/dbidoc/classes/DBI/DBD/SQLRelay/Statement.src/M000009.html +share/doc/sqlrelay/api/ruby/dbidoc/classes/DBI/DBD/SQLRelay/Statement.src/M000010.html +share/doc/sqlrelay/api/ruby/dbidoc/classes/DBI/DBD/SQLRelay/Statement.src/M000011.html +share/doc/sqlrelay/api/ruby/dbidoc/files/SQLRelay_rb.html +share/doc/sqlrelay/api/ruby/dbidoc/fr_class_index.html +share/doc/sqlrelay/api/ruby/dbidoc/fr_file_index.html +share/doc/sqlrelay/api/ruby/dbidoc/fr_method_index.html +share/doc/sqlrelay/api/ruby/dbidoc/index.html +share/doc/sqlrelay/api/ruby/dbidoc/rdoc-style.css +share/doc/sqlrelay/api/ruby/dbidoc/rdoc.css +share/doc/sqlrelay/api/ruby/dbidoc/table_of_contents.html +share/doc/sqlrelay/api/ruby/doc/SQLRConnection.html +share/doc/sqlrelay/api/ruby/doc/SQLRCursor.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRConnection.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRConnection.src/M000084.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRConnection.src/M000085.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRConnection.src/M000086.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRConnection.src/M000087.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRConnection.src/M000088.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRConnection.src/M000089.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRConnection.src/M000090.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRConnection.src/M000091.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRConnection.src/M000092.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRConnection.src/M000093.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRConnection.src/M000094.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRConnection.src/M000095.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRConnection.src/M000096.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRConnection.src/M000097.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRConnection.src/M000098.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRConnection.src/M000099.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRConnection.src/M000100.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRConnection.src/M000101.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRConnection.src/M000102.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRConnection.src/M000103.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRConnection.src/M000104.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRConnection.src/M000105.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRConnection.src/M000106.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRConnection.src/M000107.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRConnection.src/M000108.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRConnection.src/M000109.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRConnection.src/M000110.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRConnection.src/M000111.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRConnection.src/M000112.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRConnection.src/M000113.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRConnection.src/M000114.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRConnection.src/M000115.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRCursor.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRCursor.src/M000001.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRCursor.src/M000002.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRCursor.src/M000003.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRCursor.src/M000004.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRCursor.src/M000005.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRCursor.src/M000006.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRCursor.src/M000007.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRCursor.src/M000008.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRCursor.src/M000009.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRCursor.src/M000010.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRCursor.src/M000011.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRCursor.src/M000012.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRCursor.src/M000013.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRCursor.src/M000014.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRCursor.src/M000015.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRCursor.src/M000016.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRCursor.src/M000017.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRCursor.src/M000018.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRCursor.src/M000019.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRCursor.src/M000020.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRCursor.src/M000021.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRCursor.src/M000022.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRCursor.src/M000023.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRCursor.src/M000024.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRCursor.src/M000025.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRCursor.src/M000026.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRCursor.src/M000027.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRCursor.src/M000028.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRCursor.src/M000029.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRCursor.src/M000030.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRCursor.src/M000031.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRCursor.src/M000032.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRCursor.src/M000033.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRCursor.src/M000034.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRCursor.src/M000035.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRCursor.src/M000036.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRCursor.src/M000037.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRCursor.src/M000038.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRCursor.src/M000039.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRCursor.src/M000040.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRCursor.src/M000041.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRCursor.src/M000042.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRCursor.src/M000043.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRCursor.src/M000044.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRCursor.src/M000045.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRCursor.src/M000046.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRCursor.src/M000047.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRCursor.src/M000048.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRCursor.src/M000049.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRCursor.src/M000050.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRCursor.src/M000051.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRCursor.src/M000052.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRCursor.src/M000053.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRCursor.src/M000054.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRCursor.src/M000055.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRCursor.src/M000056.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRCursor.src/M000057.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRCursor.src/M000058.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRCursor.src/M000059.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRCursor.src/M000060.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRCursor.src/M000061.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRCursor.src/M000062.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRCursor.src/M000063.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRCursor.src/M000064.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRCursor.src/M000065.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRCursor.src/M000066.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRCursor.src/M000067.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRCursor.src/M000068.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRCursor.src/M000069.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRCursor.src/M000070.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRCursor.src/M000071.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRCursor.src/M000072.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRCursor.src/M000073.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRCursor.src/M000074.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRCursor.src/M000075.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRCursor.src/M000076.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRCursor.src/M000077.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRCursor.src/M000078.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRCursor.src/M000079.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRCursor.src/M000080.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRCursor.src/M000081.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRCursor.src/M000082.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRCursor.src/M000083.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRCursor.src/M000084.html +share/doc/sqlrelay/api/ruby/doc/classes/SQLRCursor.src/M000085.html +share/doc/sqlrelay/api/ruby/doc/files/sqlrelay_cpp.html +share/doc/sqlrelay/api/ruby/doc/fr_class_index.html +share/doc/sqlrelay/api/ruby/doc/fr_file_index.html +share/doc/sqlrelay/api/ruby/doc/fr_method_index.html +share/doc/sqlrelay/api/ruby/doc/index.html +share/doc/sqlrelay/api/ruby/doc/rdoc-style.css +share/doc/sqlrelay/api/ruby/doc/rdoc.css +share/doc/sqlrelay/api/ruby/doc/table_of_contents.html +share/doc/sqlrelay/api/tcl/index.html +share/doc/sqlrelay/api/tcl/index_annot.html +share/doc/sqlrelay/api/tcl/index_annot_full.html +share/doc/sqlrelay/api/tcl/index_call.html +share/doc/sqlrelay/api/tcl/index_file.html +share/doc/sqlrelay/api/tcl/index_main.html +share/doc/sqlrelay/api/tcl/index_proc.html +share/doc/sqlrelay/api/tcl/sqlrconCmd.tcl-annot.html +share/doc/sqlrelay/api/tcl/sqlrconCmd.tcl.html +share/doc/sqlrelay/api/tcl/sqlrconCmd.tcl.txt +share/doc/sqlrelay/api/tcl/sqlrcurCmd.tcl-annot.html +share/doc/sqlrelay/api/tcl/sqlrcurCmd.tcl.html +share/doc/sqlrelay/api/tcl/sqlrcurCmd.tcl.txt +share/doc/sqlrelay/api/tcl/sqlrelayCmd.tcl-annot.html +share/doc/sqlrelay/api/tcl/sqlrelayCmd.tcl.html share/doc/sqlrelay/css/styles.css share/doc/sqlrelay/dropin/mysql.html share/doc/sqlrelay/dropin/postgresql.html share/doc/sqlrelay/faq.html +share/doc/sqlrelay/features/connectionpooling.html +share/doc/sqlrelay/features/databases.html +share/doc/sqlrelay/features/dbabstractionlayers.html +share/doc/sqlrelay/features/dropinreplacementlibs.html +share/doc/sqlrelay/features/languages.html +share/doc/sqlrelay/features/loadbalancing.html +share/doc/sqlrelay/features/multirowfetches.html +share/doc/sqlrelay/features/proxying.html +share/doc/sqlrelay/features/queryrouting.html +share/doc/sqlrelay/features/resultsetcaching.html +share/doc/sqlrelay/features/substitutionandbindvars.html +share/doc/sqlrelay/features/suspendedtx.html +share/doc/sqlrelay/features/throttling.html share/doc/sqlrelay/gettingstarted/blackray.html share/doc/sqlrelay/gettingstarted/db2.html share/doc/sqlrelay/gettingstarted/db2/72.html @@ -98,7 +420,7 @@ share/doc/sqlrelay/gettingstarted/db2/82.html share/doc/sqlrelay/gettingstarted/db2/824.html share/doc/sqlrelay/gettingstarted/db2/91.html share/doc/sqlrelay/gettingstarted/firebird.html -share/doc/sqlrelay/gettingstarted/mssqlserver.html +share/doc/sqlrelay/gettingstarted/msde.html share/doc/sqlrelay/gettingstarted/mysql.html share/doc/sqlrelay/gettingstarted/oracle.html share/doc/sqlrelay/gettingstarted/oracle/linux/fedoracore/1/10g.html @@ -111,9 +433,6 @@ share/doc/sqlrelay/gettingstarted/oracle/linux/redhat/6/8i.html share/doc/sqlrelay/gettingstarted/oracle/linux/redhat/7/8i.html share/doc/sqlrelay/gettingstarted/oracle/linux/redhat/8/9iR2.html share/doc/sqlrelay/gettingstarted/oracle/linux/redhat/9/9iR2.html -share/doc/sqlrelay/gettingstarted/oracle/linux/slackware/8/8i.html -share/doc/sqlrelay/gettingstarted/oracle/linux/slackware/8/9i.html -share/doc/sqlrelay/gettingstarted/oracle/linux/suse/9.0/9iR2.html share/doc/sqlrelay/gettingstarted/postgresql.html share/doc/sqlrelay/gettingstarted/sqlite.html share/doc/sqlrelay/gettingstarted/sybase.html @@ -122,12 +441,77 @@ share/doc/sqlrelay/gettingstarted/sybase/11.9.2.html share/doc/sqlrelay/gettingstarted/sybase/12.5.1.html share/doc/sqlrelay/gettingstarted/sybase/12.5.2.html share/doc/sqlrelay/gettingstarted/sybase/15.0.2.html +share/doc/sqlrelay/images/WPM_4877_1.PNG +share/doc/sqlrelay/images/app-to-db.png +share/doc/sqlrelay/images/app-to-sqlr-to-db.png +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/fetch-many.png +share/doc/sqlrelay/images/fetch-one.png +share/doc/sqlrelay/images/firebird.png +share/doc/sqlrelay/images/freebsd-i386-thumb.png +share/doc/sqlrelay/images/freebsd-i386.png +share/doc/sqlrelay/images/freetds.png +share/doc/sqlrelay/images/haiku-thumb.png +share/doc/sqlrelay/images/haiku.png +share/doc/sqlrelay/images/hurd-i386-thumb.png +share/doc/sqlrelay/images/hurd-i386.png +share/doc/sqlrelay/images/i386-linux-uclibc-thumb.png +share/doc/sqlrelay/images/i386-linux-uclibc.png +share/doc/sqlrelay/images/ibm.png +share/doc/sqlrelay/images/iodbc.png +share/doc/sqlrelay/images/mdbtools.png +share/doc/sqlrelay/images/minix-thumb.png +share/doc/sqlrelay/images/minix.png +share/doc/sqlrelay/images/mssqlserver.png +share/doc/sqlrelay/images/mysql-chain.png +share/doc/sqlrelay/images/mysql-sqlr-chain.png +share/doc/sqlrelay/images/mysql.png +share/doc/sqlrelay/images/netbsd-i386-thumb.png +share/doc/sqlrelay/images/netbsd-i386.png +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/openbsd-i386-thumb.png +share/doc/sqlrelay/images/openbsd-i386.png +share/doc/sqlrelay/images/openbsd-sparc-thumb.png +share/doc/sqlrelay/images/openbsd-sparc.png +share/doc/sqlrelay/images/oracle.png +share/doc/sqlrelay/images/postgresql-chain.png +share/doc/sqlrelay/images/postgresql-sqlr-chain.png +share/doc/sqlrelay/images/postgresql.png +share/doc/sqlrelay/images/proxying.png +share/doc/sqlrelay/images/query-allowed.png +share/doc/sqlrelay/images/query-rejected.png +share/doc/sqlrelay/images/queryrouting.png +share/doc/sqlrelay/images/redhat62-sparc-thumb.png +share/doc/sqlrelay/images/redhat62-sparc.png +share/doc/sqlrelay/images/replicated-disproportionate.png +share/doc/sqlrelay/images/replicated.png +share/doc/sqlrelay/images/sco-osr6-i386-thumb.png +share/doc/sqlrelay/images/sco-osr6-i386.png +share/doc/sqlrelay/images/sqlite.png +share/doc/sqlrelay/images/sqlr-fetch-many-return-rsbuffersize.png +share/doc/sqlrelay/images/sqlr-fetch-many-return.png +share/doc/sqlrelay/images/sqlr-fetch-many.png +share/doc/sqlrelay/images/sqlr-fetch-one-return-rsbuffersize.png +share/doc/sqlrelay/images/sqlrelay.png +share/doc/sqlrelay/images/sybase.png +share/doc/sqlrelay/images/syllable-thumb.png +share/doc/sqlrelay/images/syllable.png +share/doc/sqlrelay/images/toomanyconnections.png +share/doc/sqlrelay/images/unixodbc.png share/doc/sqlrelay/index.html -share/doc/sqlrelay/installing.html -share/doc/sqlrelay/introduction.html -share/doc/sqlrelay/introtowebdb.html -share/doc/sqlrelay/invisible.gif -share/doc/sqlrelay/oraclentier.html +share/doc/sqlrelay/js/rotate.js +share/doc/sqlrelay/modules/logger.html +share/doc/sqlrelay/modules/passwordencryption.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/programming/binds.html share/doc/sqlrelay/programming/c++.html share/doc/sqlrelay/programming/c.html @@ -137,23 +521,15 @@ share/doc/sqlrelay/programming/odbc.html share/doc/sqlrelay/programming/perl.html share/doc/sqlrelay/programming/perldbi.html share/doc/sqlrelay/programming/php.html +share/doc/sqlrelay/programming/phppdo.html share/doc/sqlrelay/programming/python.html share/doc/sqlrelay/programming/pythondb.html share/doc/sqlrelay/programming/ruby.html share/doc/sqlrelay/programming/rubydbi.html share/doc/sqlrelay/programming/tcl.html -share/doc/sqlrelay/programming/zope.html -share/doc/sqlrelay/programming/zope/instance.gif -share/doc/sqlrelay/programming/zope/management.gif -share/doc/sqlrelay/programming/zope/resultset.gif -share/doc/sqlrelay/programming/zope/sqlrelay.gif -share/doc/sqlrelay/programming/zope/test.gif -share/doc/sqlrelay/programming/zope/testzsqlmethod.gif -share/doc/sqlrelay/programming/zope/zsqlmethod.gif -share/doc/sqlrelay/programming/zope/zsqlmethodresultset.gif -share/doc/sqlrelay/running.html -share/doc/sqlrelay/tuning.html -share/doc/sqlrelay/windows.html +share/examples/sqlrelay/sample-mssqlserver-mysql-errors.map +share/examples/sqlrelay/sample-oracle-mysql-errors.map share/examples/sqlrelay/sqlrelay -share/examples/sqlrelay/sqlrelay.conf.example +share/examples/sqlrelay/sqlrelay.conf share/examples/sqlrelay/sqlrelay.dtd +share/examples/sqlrelay/sqlrelay.xsd diff --git a/databases/sqlrelay/buildlink3.mk b/databases/sqlrelay/buildlink3.mk new file mode 100644 index 00000000000..3b08f8b7f31 --- /dev/null +++ b/databases/sqlrelay/buildlink3.mk @@ -0,0 +1,19 @@ +# $NetBSD: buildlink3.mk,v 1.1 2014/05/22 12:50:48 fhajny Exp $ + +BUILDLINK_TREE+= sqlrelay + +.if !defined(SQLRELAY_BUILDLINK3_MK) +SQLRELAY_BUILDLINK3_MK:= + +BUILDLINK_API_DEPENDS.sqlrelay+= sqlrelay>=0.43 +BUILDLINK_PKGSRCDIR.sqlrelay?= ../../databases/sqlrelay + +.include "../../devel/pcre/buildlink3.mk" +.include "../../devel/rudiments/buildlink3.mk" +.include "../../devel/zlib/buildlink3.mk" +.include "../../security/openssl/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 ca6366b392c..ec81fcd4c8c 100644 --- a/databases/sqlrelay/distinfo +++ b/databases/sqlrelay/distinfo @@ -1,13 +1,9 @@ -$NetBSD: distinfo,v 1.7 2013/10/20 18:18:28 joerg Exp $ +$NetBSD: distinfo,v 1.8 2014/05/22 12:50:48 fhajny Exp $ -SHA1 (sqlrelay-0.43.tar.gz) = f645332ff0dd14edd2e44643cda651d7c1c59abe -RMD160 (sqlrelay-0.43.tar.gz) = 88638f122467c859db2fc5c8fbf983416c7f05bd -Size (sqlrelay-0.43.tar.gz) = 1743456 bytes -SHA1 (patch-ac) = e69292a2674083ffd10424e73760a0810fd629d8 -SHA1 (patch-ad) = a7e7047bcaf28de96a2baab527e4b1f607deb7c6 -SHA1 (patch-init__netbsd__rc.d__sqlrelay.in) = b10de222c99ab03a541c9a6a3929928c6936d0f4 -SHA1 (patch-src__listener__sqlrlistener.h) = 11f977c48b8e0a01779357475373af738c81d7f3 -SHA1 (patch-src_connection_sqlrcursor.h) = 7ce854ad152d2f046f32c6a2bba560e0e8531ab8 -SHA1 (patch-src_connection_sqlrcursor_queryparse.C) = 0de5f1fb2388c06fa0a130cd3813e3c6c8fbff74 -SHA1 (patch-src_connections_oracle8_oracle8connection.C) = 8e86b79313e42f835d82ed4578c37532022677d9 -SHA1 (patch-src_connections_router_routerconnection.C) = 72ae0b42fb53a188e02bfacd704040d22236cfa6 +SHA1 (sqlrelay-0.55.tar.gz) = ce47d8564e13d03b1eda8ff5d497fb056b5752e2 +RMD160 (sqlrelay-0.55.tar.gz) = 9e727d2307f471ea935b5a8831a53929f0400c98 +Size (sqlrelay-0.55.tar.gz) = 3644680 bytes +SHA1 (patch-ad) = c1c95f0938ed9efff7fd21392f7adeed80a86468 +SHA1 (patch-configure) = 4aa35512ac7d5a97f0f511ba2432dc48a1b68159 +SHA1 (patch-etc_Makefile) = 262968ad43d34d53b4fe65514c1351127660e12c +SHA1 (patch-init_rc.sqlrelay.in) = 6d358d9396339ecee8ef3b7054750100433fb271 diff --git a/databases/sqlrelay/files/smf/manifest.xml b/databases/sqlrelay/files/smf/manifest.xml new file mode 100644 index 00000000000..1f95aefc06e --- /dev/null +++ b/databases/sqlrelay/files/smf/manifest.xml @@ -0,0 +1,39 @@ +<?xml version="1.0"?> +<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1"> +<service_bundle type="manifest" name="@SMF_NAME@"> + <service name="@SMF_PREFIX@/@SMF_NAME@" type="service" version="1"> + <dependency name="network" grouping="require_all" restart_on="error" type="service"> + <service_fmri value="svc:/milestone/network:default" /> + </dependency> + <dependency name="filesystem" grouping="require_all" restart_on="error" type="service"> + <service_fmri value="svc:/system/filesystem/local" /> + </dependency> + <method_context working_directory='@SQLR_DATA@'> + <method_credential user='@SQLR_USER@' group='@SQLR_GROUP@' /> + <method_environment> + <envvar name="PATH" value="@PREFIX@/sbin:@PREFIX@/bin:/usr/sbin:/usr/bin" /> + </method_environment> + </method_context> + <exec_method type="method" name="start" exec="@PREFIX@/bin/sqlr-start -id %i" timeout_seconds="3600" /> + <exec_method type="method" name="stop" exec=":kill" timeout_seconds="60" /> + <property_group name="startd" type="framework"> + <propval name="duration" type="astring" value="contract" /> + <propval name="ignore_error" type="astring" value="core,signal" /> + </property_group> + <instance name="default" enabled="false"> + <dependency name="cachemanager" grouping="require_all" restart_on="error" type="service"> + <service_fmri value="svc:/pkgsrc/sqlrelay:cachemanager" /> + </dependency> + </instance> + <instance name="cachemanager" enabled="false"> + <exec_method type="method" name="start" exec="@PREFIX@/bin/sqlr-cachemanager" timeout_seconds="3600" /> + <exec_method type="method" name="stop" exec=":kill" timeout_seconds="3600" /> + </instance> + <stability value="Evolving" /> + <template> + <common_name> + <loctext xml:lang="C">SQL Relay</loctext> + </common_name> + </template> + </service> +</service_bundle> diff --git a/databases/sqlrelay/options.mk b/databases/sqlrelay/options.mk deleted file mode 100644 index cd717223248..00000000000 --- a/databases/sqlrelay/options.mk +++ /dev/null @@ -1,70 +0,0 @@ -# $NetBSD: options.mk,v 1.7 2011/11/02 13:59:29 fhajny Exp $ - -PKG_OPTIONS_VAR= PKG_OPTIONS.sqlrelay -PKG_SUPPORTED_OPTIONS+= mysql pgsql sqlite odbc freetds perl - -.include "../../mk/bsd.options.mk" - -PLIST_VARS+= freetds mysql odbc perl pgsql sqlite - -.if !empty(PKG_OPTIONS:Mperl) -LICENSE+= AND artistic -PERL5_PACKLIST= auto/SQLRelay/Connection/.packlist -PERL5_PACKLIST+= auto/SQLRelay/Cursor/.packlist -PERL5_PACKLIST+= auto/DBD/SQLRelay/.packlist - -CONFIGURE_ARGS+= --with-perl-site-arch=${PERL5_INSTALLVENDORARCH:Q} -CONFIGURE_ARGS+= --with-perl-site-lib=${PERL5_INSTALLVENDORLIB:Q} -CONFIGURE_ARGS+= --with-perl-install-man3-dir=${PERL5_INSTALLVENDORMAN3DIR:Q} - -USE_TOOLS+= perl -PLIST.perl= yes - -.include "../../lang/perl5/buildlink3.mk" -.include "../../lang/perl5/packlist.mk" -.include "../../lang/perl5/vars.mk" - -.else -CONFIGURE_ARGS+= --disable-perl -.endif - -.if !empty(PKG_OPTIONS:Mmysql) -CONFIGURE_ARGS+= --with-mysql-prefix=${BUILDLINK_PREFIX.mysql-client:Q} -PLIST.mysql= yes -.include "../../mk/mysql.buildlink3.mk" -.else -CONFIGURE_ARGS+= --disable-mysql -.endif - -.if !empty(PKG_OPTIONS:Mpgsql) -LICENSE+= AND postgresql-license -CONFIGURE_ARGS+= --with-postgresql-prefix=${PGSQL_PREFIX:Q} -PLIST.pgsql= yes -.include "../../mk/pgsql.buildlink3.mk" -.else -CONFIGURE_ARGS+= --disable-postgresql -.endif - -.if !empty(PKG_OPTIONS:Msqlite) -CONFIGURE_ARGS+= --with-sqlite-prefix=${BUILDLINK_PREFIX.sqlite3:Q} -PLIST.sqlite= yes -.include "../../databases/sqlite3/buildlink3.mk" -.else -CONFIGURE_ARGS+= --disable-sqlite -.endif - -.if !empty(PKG_OPTIONS:Modbc) -CONFIGURE_ARGS+= --with-odbc-prefix=${BUILDLINK_PREFIX.unixodbc:Q} -PLIST.odbc= yes -.include "../../databases/unixodbc/buildlink3.mk" -.else -CONFIGURE_ARGS+= --disable-odbc -.endif - -.if !empty(PKG_OPTIONS:Mfreetds) -CONFIGURE_ARGS+= --with-freetds-prefix=${BUILDLINK_PREFIX.freetds:Q} -PLIST.freetds= yes -.include "../../databases/freetds/buildlink3.mk" -.else -CONFIGURE_ARGS+= --disable-freetds -.endif diff --git a/databases/sqlrelay/patches/patch-ac b/databases/sqlrelay/patches/patch-ac deleted file mode 100644 index 22b088f6a64..00000000000 --- a/databases/sqlrelay/patches/patch-ac +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ac,v 1.3 2011/11/02 13:59:29 fhajny Exp $ - ---- etc/Makefile.orig 2006-07-08 03:18:01.000000000 +0000 -+++ etc/Makefile -@@ -5,12 +5,10 @@ include ../config.mk - .PHONY: install uninstall - - install: -- $(MKINSTALLDIRS) $(sysconfdir) -- $(INSTALL) -m 644 sqlrelay.conf.example $(sysconfdir) -- $(INSTALL) -m 644 sqlrelay.dtd $(sysconfdir) -- $(INSTALL) -m 644 sqlrelay.conf.example $(EXAMPLEDIR)/sqlrelay.conf -+ $(MKINSTALLDIRS) ${DESTDIR}$(EXAMPLESDIR) -+ $(INSTALL) -m 644 sqlrelay.conf.example ${DESTDIR}$(EXAMPLESDIR) -+ $(INSTALL) -m 644 sqlrelay.dtd ${DESTDIR}$(EXAMPLESDIR) - - uninstall: -- $(RM) $(sysconfdir)/sqlrelay.conf.example -- $(RM) $(sysconfdir)/sqlrelay.dtd -- $(RM) $(EXAMPLEDIR)/sqlrelay.conf -+ $(RM) ${DESTDIR}$(EXAMPLESDIR)/sqlrelay.conf.example -+ $(RM) ${DESTDIR}$(EXAMPLESDIR)/sqlrelay.dtd diff --git a/databases/sqlrelay/patches/patch-ad b/databases/sqlrelay/patches/patch-ad index 92b93e11456..15fb0e963ff 100644 --- a/databases/sqlrelay/patches/patch-ad +++ b/databases/sqlrelay/patches/patch-ad @@ -1,5 +1,6 @@ -$NetBSD: patch-ad,v 1.1 2008/10/03 18:14:46 joerg Exp $ +$NetBSD: patch-ad,v 1.2 2014/05/22 12:50:48 fhajny Exp $ +We install init scripts ourselves. --- Makefile.orig 2008-10-03 18:08:41.000000000 +0000 +++ Makefile @@ -25,7 +25,6 @@ install: diff --git a/databases/sqlrelay/patches/patch-configure b/databases/sqlrelay/patches/patch-configure new file mode 100644 index 00000000000..abfe359aa40 --- /dev/null +++ b/databases/sqlrelay/patches/patch-configure @@ -0,0 +1,23 @@ +$NetBSD: patch-configure,v 1.1 2014/05/22 12:50:48 fhajny Exp $ + +Look for history/readline at proper places. +--- configure.orig 2014-05-21 10:24:24.050393065 +0000 ++++ configure +@@ -17557,7 +17557,7 @@ fi + $as_echo_n "checking for history... " >&6; } + + +-SEARCHPATH=/usr ++SEARCHPATH=${prefix} + NAME=history + HEADER=readline/history.h + LIBNAME=history +@@ -17893,7 +17893,7 @@ fi + $as_echo_n "checking for readline... " >&6; } + + +-SEARCHPATH=/usr ++SEARCHPATH=${prefix} + NAME=readline + HEADER=readline/readline.h + LIBNAME=readline diff --git a/databases/sqlrelay/patches/patch-etc_Makefile b/databases/sqlrelay/patches/patch-etc_Makefile new file mode 100644 index 00000000000..7eb7afeda5c --- /dev/null +++ b/databases/sqlrelay/patches/patch-etc_Makefile @@ -0,0 +1,18 @@ +$NetBSD: patch-etc_Makefile,v 1.1 2014/05/22 12:50:48 fhajny Exp $ + +Install config file examples properly. +--- etc/Makefile.orig 2012-05-21 04:54:54.000000000 +0000 ++++ etc/Makefile +@@ -5,10 +5,8 @@ include ../config.mk + .PHONY: install uninstall + + 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 + + uninstall: diff --git a/databases/sqlrelay/patches/patch-init__netbsd__rc.d__sqlrelay.in b/databases/sqlrelay/patches/patch-init__netbsd__rc.d__sqlrelay.in deleted file mode 100644 index a2e692c05aa..00000000000 --- a/databases/sqlrelay/patches/patch-init__netbsd__rc.d__sqlrelay.in +++ /dev/null @@ -1,37 +0,0 @@ -$NetBSD: patch-init__netbsd__rc.d__sqlrelay.in,v 1.1 2011/11/02 13:59:29 fhajny Exp $ - ---- init/netbsd/rc.d/sqlrelay.in.orig 2007-05-29 20:09:18.000000000 +0000 -+++ init/netbsd/rc.d/sqlrelay.in -@@ -31,7 +31,7 @@ cleanup(){ - if ( test -r "$i" ) - then - PID=`cat $i` -- if ( test -z "`ps -p $PID | egrep -E 'sqlr-cachemana|sqlr-connectio|sqlr-listener'`" ) -+ if ( test -z "`ps -p $PID | egrep -E 'sqlr-cachemana|sqlr-connectio|sqlr-listener|sqlr-scaler'`" ) - then - echo "$PID is not sqlr! removing pidfile ..." - rm $i -@@ -42,9 +42,9 @@ cleanup(){ - - start(){ - echo -n $"Starting SQL Relay: " -- if ( test -r "/etc/sqlrelay" ); then -+ if ( test -r "@sysconfdir@/sqlrelay" ); then - launched=0 -- for connid in `grep -v ^# /etc/sqlrelay`; do -+ for connid in `grep -v ^# @sysconfdir@/sqlrelay`; do - echo - echo -n $"Launching instance with id '${connid}':" - sqlr-start -id ${connid} 0<&- 1>&- 2>&- -@@ -69,9 +69,9 @@ start(){ - - stop(){ - echo -n $"Stopping SQL Relay: " -- if ( test -r "/etc/sqlrelay" ); then -+ if ( test -r "@sysconfdir@/sqlrelay" ); then - launched=0 -- for connid in `grep -v ^# /etc/sqlrelay`; do -+ for connid in `grep -v ^# @sysconfdir@/sqlrelay`; do - echo - echo -n $"Launching instance with id '${connid}':" - sqlr-stop ${connid} 0<&- 1>&- 2>&- diff --git a/databases/sqlrelay/patches/patch-init_rc.sqlrelay.in b/databases/sqlrelay/patches/patch-init_rc.sqlrelay.in new file mode 100644 index 00000000000..728a3db1171 --- /dev/null +++ b/databases/sqlrelay/patches/patch-init_rc.sqlrelay.in @@ -0,0 +1,14 @@ +$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__listener__sqlrlistener.h b/databases/sqlrelay/patches/patch-src__listener__sqlrlistener.h deleted file mode 100644 index cb647c19eb5..00000000000 --- a/databases/sqlrelay/patches/patch-src__listener__sqlrlistener.h +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-src__listener__sqlrlistener.h,v 1.1 2011/11/02 13:59:29 fhajny Exp $ - ---- src/listener/sqlrlistener.h.orig 2011-06-28 20:38:49.000000000 +0000 -+++ src/listener/sqlrlistener.h -@@ -26,6 +26,8 @@ - - #include <defines.h> - -+#include <cstring> -+ - #ifdef RUDIMENTS_NAMESPACE - using namespace rudiments; - #endif diff --git a/databases/sqlrelay/patches/patch-src_connection_sqlrcursor.h b/databases/sqlrelay/patches/patch-src_connection_sqlrcursor.h deleted file mode 100644 index 2a24b0b71eb..00000000000 --- a/databases/sqlrelay/patches/patch-src_connection_sqlrcursor.h +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-src_connection_sqlrcursor.h,v 1.1 2013/10/20 18:18:28 joerg Exp $ - ---- src/connection/sqlrcursor.h.orig 2013-10-17 12:20:42.000000000 +0000 -+++ src/connection/sqlrcursor.h -@@ -167,9 +167,9 @@ class sqlrcursor_svr { - // methods/variables used by derived classes - stringbuffer *fakeInputBinds(const char *query); - -- bool skipComment(char **ptr, const char *endptr); -- bool skipWhitespace(char **ptr, const char *endptr); -- bool advance(char **ptr, const char *endptr, -+ bool skipComment(const char **ptr, const char *endptr); -+ bool skipWhitespace(const char **ptr, const char *endptr); -+ bool advance(const char **ptr, const char *endptr, - uint16_t steps); - - sqlrconnection_svr *conn; diff --git a/databases/sqlrelay/patches/patch-src_connection_sqlrcursor_queryparse.C b/databases/sqlrelay/patches/patch-src_connection_sqlrcursor_queryparse.C deleted file mode 100644 index 21800bf0ec6..00000000000 --- a/databases/sqlrelay/patches/patch-src_connection_sqlrcursor_queryparse.C +++ /dev/null @@ -1,41 +0,0 @@ -$NetBSD: patch-src_connection_sqlrcursor_queryparse.C,v 1.1 2013/10/20 18:18:28 joerg Exp $ - ---- src/connection/sqlrcursor/queryparse.C.orig 2013-10-17 12:19:25.000000000 +0000 -+++ src/connection/sqlrcursor/queryparse.C -@@ -49,8 +49,8 @@ char *sqlrcursor_svr::skipWhitespaceAndC - - void sqlrcursor_svr::checkForTempTable(const char *query, uint32_t length) { - -- char *ptr=(char *)query; -- char *endptr=(char *)query+length; -+ const char *ptr=query; -+ const char *endptr=query+length; - - // skip any leading comments - if (!skipWhitespace(&ptr,endptr) || !skipComment(&ptr,endptr) || -@@ -78,7 +78,7 @@ void sqlrcursor_svr::checkForTempTable(c - conn->addSessionTempTableForDrop(tablename.getString()); - } - --bool sqlrcursor_svr::skipComment(char **ptr, const char *endptr) { -+bool sqlrcursor_svr::skipComment(const char **ptr, const char *endptr) { - while (*ptr<endptr && !charstring::compare(*ptr,"--",2)) { - while (**ptr && **ptr!='\n') { - (*ptr)++; -@@ -87,14 +87,14 @@ bool sqlrcursor_svr::skipComment(char ** - return *ptr!=endptr; - } - --bool sqlrcursor_svr::skipWhitespace(char **ptr, const char *endptr) { -+bool sqlrcursor_svr::skipWhitespace(const char **ptr, const char *endptr) { - while ((**ptr==' ' || **ptr=='\n' || **ptr==' ') && *ptr<endptr) { - (*ptr)++; - } - return *ptr!=endptr; - } - --bool sqlrcursor_svr::advance(char **ptr, const char *endptr, uint16_t steps) { -+bool sqlrcursor_svr::advance(const char **ptr, const char *endptr, uint16_t steps) { - for (uint16_t i=0; i<steps && *ptr<endptr; i++) { - (*ptr)++; - } diff --git a/databases/sqlrelay/patches/patch-src_connections_oracle8_oracle8connection.C b/databases/sqlrelay/patches/patch-src_connections_oracle8_oracle8connection.C deleted file mode 100644 index 2c06f9c9208..00000000000 --- a/databases/sqlrelay/patches/patch-src_connections_oracle8_oracle8connection.C +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-src_connections_oracle8_oracle8connection.C,v 1.1 2013/10/20 18:18:28 joerg Exp $ - ---- src/connections/oracle8/oracle8connection.C.orig 2013-10-17 12:22:31.000000000 +0000 -+++ src/connections/oracle8/oracle8connection.C -@@ -1076,8 +1076,8 @@ void oracle8cursor::returnOutputBindClob - - void oracle8cursor::checkForTempTable(const char *query, uint32_t length) { - -- char *ptr=(char *)query; -- char *endptr=(char *)query+length; -+ const char *ptr=query; -+ const char *endptr=query+length; - - // skip any leading comments - if (!skipWhitespace(&ptr,endptr) || !skipComment(&ptr,endptr) || diff --git a/databases/sqlrelay/patches/patch-src_connections_router_routerconnection.C b/databases/sqlrelay/patches/patch-src_connections_router_routerconnection.C deleted file mode 100644 index a52b7340a58..00000000000 --- a/databases/sqlrelay/patches/patch-src_connections_router_routerconnection.C +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-src_connections_router_routerconnection.C,v 1.1 2013/10/20 18:18:28 joerg Exp $ - ---- src/connections/router/routerconnection.C.orig 2013-10-17 12:22:33.000000000 +0000 -+++ src/connections/router/routerconnection.C -@@ -600,8 +600,8 @@ void routercursor::checkForTempTable(con - - // for oracle db's... - -- char *ptr=(char *)query; -- char *endptr=(char *)query+length; -+ const char *ptr=query; -+ const char *endptr=query+length; - - // skip any leading comments - if (!skipWhitespace(&ptr,endptr) || !skipComment(&ptr,endptr) || |