From owner-svn-ports-head@freebsd.org Sat Aug 8 12:11:30 2015 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 18ABC9B6D3C; Sat, 8 Aug 2015 12:11:30 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EA41332C; Sat, 8 Aug 2015 12:11:29 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t78CBTKQ023669; Sat, 8 Aug 2015 12:11:29 GMT (envelope-from pi@FreeBSD.org) Received: (from pi@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t78CBSLS023664; Sat, 8 Aug 2015 12:11:28 GMT (envelope-from pi@FreeBSD.org) Message-Id: <201508081211.t78CBSLS023664@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pi set sender to pi@FreeBSD.org using -f From: Kurt Jaeger Date: Sat, 8 Aug 2015 12:11:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r393725 - in head/databases/sqlrelay: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Aug 2015 12:11:30 -0000 Author: pi Date: Sat Aug 8 12:11:27 2015 New Revision: 393725 URL: https://svnweb.freebsd.org/changeset/ports/393725 Log: databases/sqlrelay: 0.60 -> 0.62 - added query filter plugin framework - added regex, string and pattern filters - added normalization translation - added reformatdatetime result set translation - fixed error in sqlrconfigfile class that could cause sqlr-start to - crash if one instance defines addresses but the next doesn't - added query status flag to sqlrservercursor - tweaked odbc driver's SQLGetTypeInfo() - field name is passed into runResultSetTranslations() now - added support for maxitembuffersize, maxselectlistsize, - and maxbindcount for firebird - added native api for node.js - added recognition of bigint, ubigint and uniqueidentifier fields in - freetds/sybase - added nullsasnulls command to sqlrsh - added workaround for freetds empty (but non-null) text fields not getting properly converted to null-terminated empty strings - fetchatonce, maxitembuffersize and maxselectlistsize are set to defaulting values if invalid values are given for them - added lazyconnect option to PHP PDO and Perl DBI drivers (defaults to 1) - direct Transact SQL which returns a result set is now supported with Sybase/SAP/MSSQLServer/FreeTDS - added docs for authentication, query translation, query filter and result set translation modules - added -fPIC to sqlrserver-config --cflags, if supported - the "default" auth module is now called "userlist" - added database auth module that is analagous to authtier="database" - replaced passwordencryption attribute with passwordencryptionid - added --disable-postgresql8-api configure option - tweaked -Werror detection in configure script - refactored sqlr-bench build to work on windows Modified: head/databases/sqlrelay/Makefile head/databases/sqlrelay/Makefile.common head/databases/sqlrelay/distinfo head/databases/sqlrelay/files/patch-Makefile head/databases/sqlrelay/pkg-plist Modified: head/databases/sqlrelay/Makefile ============================================================================== --- head/databases/sqlrelay/Makefile Sat Aug 8 11:26:39 2015 (r393724) +++ head/databases/sqlrelay/Makefile Sat Aug 8 12:11:27 2015 (r393725) @@ -9,6 +9,8 @@ MASTER_SITES= SF MAINTAINER= pi@FreeBSD.org COMMENT= Persistent DB connection pooling/proxying/load balancing system +LICENSE= LGPL20 + LIB_DEPENDS= librudiments.so:${PORTSDIR}/devel/rudiments WANT_GNOME= yes @@ -19,6 +21,7 @@ CONFIGURE_ARGS= ${SQLRELAY_CONFIGURE_AR --disable-tcl \ --disable-java \ --disable-msql \ + --disable-nodejs \ --disable-perl \ --disable-php \ --disable-python \ @@ -43,6 +46,7 @@ TOSTRIP= bin/sqlr-start \ bin/sqlr-pwdenc \ bin/sqlr-status \ bin/sqlrsh \ + lib/libsqlrodbc-${SQLRELAY_PORTVERSION}.so.1.0.0 \ lib/libsqlrutil-${SQLRELAY_PORTVERSION}.so.1.0.0 \ lib/libsqlrclient-${SQLRELAY_PORTVERSION}.so.1.0.0 \ lib/libsqlrclientwrapper-${SQLRELAY_PORTVERSION}.so.1.0.0 \ @@ -53,9 +57,13 @@ TOSTRIP= bin/sqlr-start \ lib/libmysql50sqlrelay-${SQLRELAY_PORTVERSION}.so.1.0.0 \ lib/libmysql51sqlrelay-${SQLRELAY_PORTVERSION}.so.1.0.0 \ lib/libsqlrserver-${SQLRELAY_PORTVERSION}.so.1.0.0 \ - libexec/sqlrelay/sqlrauth_default.so \ + libexec/sqlrelay/sqlrauth_database.so \ libexec/sqlrelay/sqlrauth_sqlrelay.so \ + libexec/sqlrelay/sqlrauth_userlist.so \ libexec/sqlrelay/sqlrconnection_router.so \ + libexec/sqlrelay/sqlrfilter_patterns.so \ + libexec/sqlrelay/sqlrfilter_regex.so \ + libexec/sqlrelay/sqlrfilter_string.so \ libexec/sqlrelay/sqlrlogger_custom_nw.so \ libexec/sqlrelay/sqlrlogger_custom_sc.so \ libexec/sqlrelay/sqlrlogger_debug.so \ @@ -66,7 +74,9 @@ TOSTRIP= bin/sqlr-start \ libexec/sqlrelay/sqlrpwdenc_md5.so \ libexec/sqlrelay/sqlrpwdenc_rot.so \ libexec/sqlrelay/sqlrquery_sqlrcmdcstat.so \ - libexec/sqlrelay/sqlrquery_sqlrcmdgstat.so + libexec/sqlrelay/sqlrquery_sqlrcmdgstat.so \ + libexec/sqlrelay/sqlrresultsettranslation_reformatdatetime.so \ + libexec/sqlrelay/sqlrtranslation_normalize.so .include "${.CURDIR}/Makefile.common" @@ -82,6 +92,7 @@ LIB_DEPENDS+= libgdbm.so:${PORTSDIR}/da libsqlite3.so:${PORTSDIR}/databases/sqlite3 CONFIGURE_ARGS+= --with-gdbm-prefix="${LOCALBASE}" \ --with-sqlite-prefix="${LOCALBASE}" +TOSTRIP+= libexec/sqlrelay/sqlrconnection_sqlite.so .else CONFIGURE_ARGS+= --without-gdbm-prefix \ --disable-sqlite @@ -98,6 +109,7 @@ CONFIGURE_ARGS+= --disable-mysql .if ${PORT_OPTIONS:MFIREBIRD} USE_FIREBIRD= yes CONFIGURE_ARGS+= --with-firebird-prefix="${LOCALBASE}" +TOSTRIP+= libexec/sqlrelay/sqlrconnection_firebird.so .else CONFIGURE_ARGS+= --disable-firebird .endif @@ -105,6 +117,7 @@ CONFIGURE_ARGS+= --disable-firebird .if ${PORT_OPTIONS:MPGSQL} USES+= pgsql CONFIGURE_ARGS+= --with-postgresql-prefix="${LOCALBASE}" +TOSTRIP+= libexec/sqlrelay/sqlrconnection_postgresql.so .else CONFIGURE_ARGS+= --disable-postgresql .endif @@ -112,13 +125,15 @@ CONFIGURE_ARGS+= --disable-postgresql .if ${PORT_OPTIONS:MODBC} LIB_DEPENDS+= libodbc.so:${PORTSDIR}/databases/unixODBC CONFIGURE_ARGS+= --with-odbc-prefix="${LOCALBASE}" +TOSTRIP+= libexec/sqlrelay/sqlrconnection_odbc.so .else CONFIGURE_ARGS+= --disable-odbc .endif .if ${PORT_OPTIONS:MFREETDS} -LIB_DEPENDS+= libtds.so:${PORTSDIR}/databases/freetds +LIB_DEPENDS+= libtdsodbc.so:${PORTSDIR}/databases/freetds CONFIGURE_ARGS+= --with-freetds-prefix="${LOCALBASE}" +TOSTRIP+= libexec/sqlrelay/sqlrconnection_freetds.so .else CONFIGURE_ARGS+= --disable-freetds .endif Modified: head/databases/sqlrelay/Makefile.common ============================================================================== --- head/databases/sqlrelay/Makefile.common Sat Aug 8 11:26:39 2015 (r393724) +++ head/databases/sqlrelay/Makefile.common Sat Aug 8 12:11:27 2015 (r393725) @@ -1,7 +1,7 @@ # $FreeBSD$ SQLRELAY_PORTNAME= sqlrelay -SQLRELAY_PORTVERSION= 0.60 +SQLRELAY_PORTVERSION= 0.62 SQLRELAY_PORTDIR= ${PORTSDIR}/databases/${SQLRELAY_PORTNAME} SQLRELAY_WRKSRC_CMD= cd ${SQLRELAY_PORTDIR} && ${MAKE} -V WRKSRC Modified: head/databases/sqlrelay/distinfo ============================================================================== --- head/databases/sqlrelay/distinfo Sat Aug 8 11:26:39 2015 (r393724) +++ head/databases/sqlrelay/distinfo Sat Aug 8 12:11:27 2015 (r393725) @@ -1,2 +1,2 @@ -SHA256 (sqlrelay-0.60.tar.gz) = aa7dc9a11d99d51f4104ee0e5d5040b1bb16034878303336aec75933d12ce06a -SIZE (sqlrelay-0.60.tar.gz) = 3224288 +SHA256 (sqlrelay-0.62.tar.gz) = fd4f590ce73aef39030a7a37984b25c8235ae5a04050a7b9c43ec73e791d7d93 +SIZE (sqlrelay-0.62.tar.gz) = 3462899 Modified: head/databases/sqlrelay/files/patch-Makefile ============================================================================== --- head/databases/sqlrelay/files/patch-Makefile Sat Aug 8 11:26:39 2015 (r393724) +++ head/databases/sqlrelay/files/patch-Makefile Sat Aug 8 12:11:27 2015 (r393725) @@ -1,13 +1,18 @@ ---- Makefile.orig 2015-03-31 20:50:58 UTC +--- Makefile.orig 2015-08-05 21:07:34 UTC +++ Makefile -@@ -30,11 +30,11 @@ install-doc: +@@ -30,16 +30,13 @@ install-doc: cd doc $(AND) $(MAKE) install + install-license: +- $(MKINSTALLDIRS) $(licensedir) +- $(CP) COPYING $(licensedir) +- $(CHMOD) 0644 $(licensedir)/COPYING + install-pkgconfig: - $(MKINSTALLDIRS) $(libdir)/pkgconfig -- $(CP) sqlrelay-c.pc $(libdir)/pkgconfig/sqlrelay-c.pc +- $(CP) sqlrelay-c.pc $(libdir)/pkgconfig - $(CHMOD) 0644 $(libdir)/pkgconfig/sqlrelay-c.pc -- $(CP) sqlrelay-c++.pc $(libdir)/pkgconfig/sqlrelay-c++.pc +- $(CP) sqlrelay-c++.pc $(libdir)/pkgconfig - $(CHMOD) 0644 $(libdir)/pkgconfig/sqlrelay-c++.pc + $(MKINSTALLDIRS) $(prefix)/libdata/pkgconfig + $(CP) sqlrelay-c.pc $(prefix)/libdata/pkgconfig/sqlrelay-c.pc @@ -17,3 +22,11 @@ uninstall: $(UNINSTALLSUBDIRS) $(RMTREE) $(libexecdir) +@@ -63,7 +60,6 @@ uninstall-doc: + cd doc $(AND) $(MAKE) uninstall + + uninstall-license: +- $(RMTREE) $(licensedir) + + uninstall-pkgconfig: + $(RM) $(libdir)/pkgconfig/sqlrelay-c.pc \ Modified: head/databases/sqlrelay/pkg-plist ============================================================================== --- head/databases/sqlrelay/pkg-plist Sat Aug 8 11:26:39 2015 (r393724) +++ head/databases/sqlrelay/pkg-plist Sat Aug 8 12:11:27 2015 (r393725) @@ -43,52 +43,57 @@ include/sqlrelay/sqlrclientwrapper.h include/sqlrelay/sqlrserver.h include/sqlrelay/sqlrutil.h lib/libmysql3sqlrelay.so -lib/libmysql3sqlrelay-0.60.so.1 -lib/libmysql3sqlrelay-0.60.so.1.0.0 +lib/libmysql3sqlrelay-0.62.so.1 +lib/libmysql3sqlrelay-0.62.so.1.0.0 lib/libmysql40sqlrelay.so -lib/libmysql40sqlrelay-0.60.so.1 -lib/libmysql40sqlrelay-0.60.so.1.0.0 +lib/libmysql40sqlrelay-0.62.so.1 +lib/libmysql40sqlrelay-0.62.so.1.0.0 lib/libmysql41sqlrelay.so -lib/libmysql41sqlrelay-0.60.so.1 -lib/libmysql41sqlrelay-0.60.so.1.0.0 +lib/libmysql41sqlrelay-0.62.so.1 +lib/libmysql41sqlrelay-0.62.so.1.0.0 lib/libmysql50sqlrelay.so -lib/libmysql50sqlrelay-0.60.so.1 -lib/libmysql50sqlrelay-0.60.so.1.0.0 +lib/libmysql50sqlrelay-0.62.so.1 +lib/libmysql50sqlrelay-0.62.so.1.0.0 lib/libmysql51sqlrelay.so -lib/libmysql51sqlrelay-0.60.so.1 -lib/libmysql51sqlrelay-0.60.so.1.0.0 +lib/libmysql51sqlrelay-0.62.so.1 +lib/libmysql51sqlrelay-0.62.so.1.0.0 lib/libpqsqlrelay.so -lib/libpqsqlrelay-0.60.so.1 -lib/libpqsqlrelay-0.60.so.1.0.0 +lib/libpqsqlrelay-0.62.so.1 +lib/libpqsqlrelay-0.62.so.1.0.0 lib/libsqlrclient.a lib/libsqlrclient.so -lib/libsqlrclient-0.60.so.1 -lib/libsqlrclient-0.60.so.1.0.0 +lib/libsqlrclient-0.62.so.1 +lib/libsqlrclient-0.62.so.1.0.0 lib/libsqlrclientwrapper.a lib/libsqlrclientwrapper.so -lib/libsqlrclientwrapper-0.60.so.1 -lib/libsqlrclientwrapper-0.60.so.1.0.0 -%%ODBC%%lib/libsqlrodbc.a +lib/libsqlrclientwrapper-0.62.so.1 +lib/libsqlrclientwrapper-0.62.so.1.0.0 %%ODBC%%lib/libsqlrodbc.so -%%ODBC%%lib/libsqlrodbc-0.60.so.1 -%%ODBC%%lib/libsqlrodbc-0.60.so.1.0.0 +%%ODBC%%lib/libsqlrodbc-0.62.so.1 +%%ODBC%%lib/libsqlrodbc-0.62.so.1.0.0 lib/libsqlrserver.a lib/libsqlrserver.so -lib/libsqlrserver-0.60.so.1 -lib/libsqlrserver-0.60.so.1.0.0 +lib/libsqlrserver-0.62.so.1 +lib/libsqlrserver-0.62.so.1.0.0 lib/libsqlrutil.a lib/libsqlrutil.so -lib/libsqlrutil-0.60.so.1 -lib/libsqlrutil-0.60.so.1.0.0 +lib/libsqlrutil-0.62.so.1 +lib/libsqlrutil-0.62.so.1.0.0 libdata/pkgconfig/sqlrelay-c++.pc libdata/pkgconfig/sqlrelay-c.pc +libexec/sqlrelay/sqlrauth_database.so +libexec/sqlrelay/sqlrauth_userlist.so +libexec/sqlrelay/sqlrfilter_patterns.so +libexec/sqlrelay/sqlrfilter_regex.so +libexec/sqlrelay/sqlrfilter_string.so +libexec/sqlrelay/sqlrresultsettranslation_reformatdatetime.so +libexec/sqlrelay/sqlrtranslation_normalize.so %%FIREBIRD%%libexec/sqlrelay/sqlrconnection_firebird.so %%FREETDS%%libexec/sqlrelay/sqlrconnection_freetds.so %%MYSQL%%libexec/sqlrelay/sqlrconnection_mysql.so %%ODBC%%libexec/sqlrelay/sqlrconnection_odbc.so %%PGSQL%%libexec/sqlrelay/sqlrconnection_postgresql.so %%SQLITE3%%libexec/sqlrelay/sqlrconnection_sqlite.so -libexec/sqlrelay/sqlrauth_default.so libexec/sqlrelay/sqlrauth_sqlrelay.so libexec/sqlrelay/sqlrconnection_router.so libexec/sqlrelay/sqlrlogger_custom_nw.so