From owner-svn-ports-all@freebsd.org Sun Jun 14 14:51:23 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5F35933C94B; Sun, 14 Jun 2020 14:51:23 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49lHTl1tvzz4XVL; Sun, 14 Jun 2020 14:51:23 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 23158E0BF; Sun, 14 Jun 2020 14:51:23 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 05EEpNSJ013424; Sun, 14 Jun 2020 14:51:23 GMT (envelope-from pi@FreeBSD.org) Received: (from pi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05EEpK8L013414; Sun, 14 Jun 2020 14:51:20 GMT (envelope-from pi@FreeBSD.org) Message-Id: <202006141451.05EEpK8L013414@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pi set sender to pi@FreeBSD.org using -f From: Kurt Jaeger Date: Sun, 14 Jun 2020 14:51:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r538808 - in head: databases/sqlrelay databases/sqlrelay/files devel/rudiments X-SVN-Group: ports-head X-SVN-Commit-Author: pi X-SVN-Commit-Paths: in head: databases/sqlrelay databases/sqlrelay/files devel/rudiments X-SVN-Commit-Revision: 538808 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Jun 2020 14:51:23 -0000 Author: pi Date: Sun Jun 14 14:51:20 2020 New Revision: 538808 URL: https://svnweb.freebsd.org/changeset/ports/538808 Log: devel/rudiments: upgrade 1.1.0 -> 1.2.2 databases/sqlrelay: upgrade 1.4.0 -> 1.7.0 http://software.firstworks.com/2019/03/rudiments-120-release-announcement.html http://software.firstworks.com/2019/08/rudiments-121-release-announcement.html http://software.firstworks.com/2020/01/rudiments-122-release-announcement.html http://software.firstworks.com/2019/03/sql-relay-150-release-announcement.html http://software.firstworks.com/2019/04/sql-relay-151-release-announcement.html http://software.firstworks.com/2019/08/sql-relay-160-release-announcement.html http://software.firstworks.com/2020/01/sql-relay-170-release-announcement.html Modified: head/databases/sqlrelay/Makefile head/databases/sqlrelay/Makefile.common head/databases/sqlrelay/distinfo head/databases/sqlrelay/files/patch-Makefile head/databases/sqlrelay/files/patch-config.mk.in head/databases/sqlrelay/files/patch-etc_Makefile head/databases/sqlrelay/pkg-plist head/devel/rudiments/Makefile head/devel/rudiments/distinfo head/devel/rudiments/pkg-plist Modified: head/databases/sqlrelay/Makefile ============================================================================== --- head/databases/sqlrelay/Makefile Sun Jun 14 14:44:26 2020 (r538807) +++ head/databases/sqlrelay/Makefile Sun Jun 14 14:51:20 2020 (r538808) @@ -3,7 +3,6 @@ PORTNAME= ${SQLRELAY_PORTNAME} PORTVERSION= ${SQLRELAY_PORTVERSION} -PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= SF @@ -12,6 +11,9 @@ COMMENT= Persistent DB connection pooling/proxying/loa LICENSE= LGPL20 +ONLY_FOR_ARCHS= aarch64 amd64 powerpc64 +ONLY_FOR_ARCHS_REASON= For i386 some depends like mysql fail to build + LIB_DEPENDS= librudiments.so:devel/rudiments \ libkrb5.so:security/krb5 \ libcurl.so:ftp/curl \ @@ -161,7 +163,7 @@ post-patch: -e 's#-release \$$\(SQLR_VERSION\)##g;' post-configure: - @${REINPLACE_CMD} 's,-Werror,,' ${WRKSRC}/config.mk + ${REINPLACE_CMD} 's,-Werror,,' ${WRKSRC}/config.mk post-install: .for f in ${TOSTRIP} Modified: head/databases/sqlrelay/Makefile.common ============================================================================== --- head/databases/sqlrelay/Makefile.common Sun Jun 14 14:44:26 2020 (r538807) +++ head/databases/sqlrelay/Makefile.common Sun Jun 14 14:51:20 2020 (r538808) @@ -1,7 +1,7 @@ # $FreeBSD$ SQLRELAY_PORTNAME= sqlrelay -SQLRELAY_PORTVERSION= 1.4.0 +SQLRELAY_PORTVERSION= 1.7.0 SQLRELAY_PORTDIR= databases/${SQLRELAY_PORTNAME} SQLRELAY_WRKSRC_CMD= cd ${PORTSDIR}/${SQLRELAY_PORTDIR} && ${MAKE} -V WRKSRC Modified: head/databases/sqlrelay/distinfo ============================================================================== --- head/databases/sqlrelay/distinfo Sun Jun 14 14:44:26 2020 (r538807) +++ head/databases/sqlrelay/distinfo Sun Jun 14 14:51:20 2020 (r538808) @@ -1,3 +1,3 @@ -TIMESTAMP = 1545557205 -SHA256 (sqlrelay-1.4.0.tar.gz) = a242ab9bc894594f8722d8cd0b032859637c130c84e430208af2e77b26c90a0c -SIZE (sqlrelay-1.4.0.tar.gz) = 87347311 +TIMESTAMP = 1592142050 +SHA256 (sqlrelay-1.7.0.tar.gz) = db2d16e1ef627888f95c3814b116e822340d8c2631cd2d663a2d6f49a2be1a2b +SIZE (sqlrelay-1.7.0.tar.gz) = 4644728 Modified: head/databases/sqlrelay/files/patch-Makefile ============================================================================== --- head/databases/sqlrelay/files/patch-Makefile Sun Jun 14 14:44:26 2020 (r538807) +++ head/databases/sqlrelay/files/patch-Makefile Sun Jun 14 14:51:20 2020 (r538808) @@ -1,6 +1,6 @@ ---- Makefile.orig 2016-01-17 07:20:04 UTC +--- Makefile.orig 2020-06-14 14:27:43 UTC +++ Makefile -@@ -30,9 +30,6 @@ install-doc: +@@ -31,9 +31,6 @@ install-doc: cd doc $(AND) $(MAKE) install install-license: @@ -9,12 +9,12 @@ - $(CHMOD) 0644 $(licensedir)/COPYING install-pkgconfig: - $(MKINSTALLDIRS) $(libdir)/pkgconfig -@@ -63,7 +60,6 @@ uninstall-doc: + $(MKINSTALLDIRS) $(prefix)/libdata/pkgconfig +@@ -64,7 +61,6 @@ uninstall-doc: cd doc $(AND) $(MAKE) uninstall uninstall-license: - $(RMTREE) $(licensedir) uninstall-pkgconfig: - $(RM) $(libdir)/pkgconfig/$(SQLRELAY)-c.pc \ + $(RM) $(prefix)/libdata/pkgconfig/$(SQLRELAY)-c.pc \ Modified: head/databases/sqlrelay/files/patch-config.mk.in ============================================================================== --- head/databases/sqlrelay/files/patch-config.mk.in Sun Jun 14 14:44:26 2020 (r538807) +++ head/databases/sqlrelay/files/patch-config.mk.in Sun Jun 14 14:51:20 2020 (r538808) @@ -1,6 +1,6 @@ ---- config.mk.in.orig 2016-03-24 00:59:48 UTC +--- config.mk.in.orig 2020-01-06 19:19:46 UTC +++ config.mk.in -@@ -11,7 +11,7 @@ prefix = @prefix@ +@@ -12,7 +12,7 @@ prefix = @prefix@ exec_prefix= @exec_prefix@ includedir = @includedir@ libdir = @libdir@ Modified: head/databases/sqlrelay/files/patch-etc_Makefile ============================================================================== --- head/databases/sqlrelay/files/patch-etc_Makefile Sun Jun 14 14:44:26 2020 (r538807) +++ head/databases/sqlrelay/files/patch-etc_Makefile Sun Jun 14 14:51:20 2020 (r538808) @@ -1,16 +1,16 @@ ---- etc/Makefile.orig 2016-01-28 19:28:21 UTC +--- etc/Makefile.orig 2020-06-14 14:27:43 UTC +++ etc/Makefile -@@ -3,12 +3,13 @@ top_builddir = .. +@@ -3,12 +3,14 @@ top_builddir = .. include ../config.mk install: - $(MKINSTALLDIRS) $(sysconfdir)/$(SQLRELAY).conf.d - $(CP) sqlrelay.xsd $(sysconfdir)/$(SQLRELAY).xsd - $(CHMOD) 644 $(sysconfdir)/$(SQLRELAY).xsd -- $(MKINSTALLDIRS) $(EXAMPLEDIR) ++ $(MKINSTALLDIRS) $(sysconfdir)/$(SQLRELAY) + $(MKINSTALLDIRS) $(EXAMPLEDIR) - $(CP) sqlrelay.conf $(EXAMPLEDIR)/$(SQLRELAY).conf - $(CHMOD) 644 $(EXAMPLEDIR)/$(SQLRELAY).conf -+ $(MKINSTALLDIRS) $(sysconfdir)/$(SQLRELAY) + $(CP) sqlrelay.conf $(sysconfdir)/$(SQLRELAY)/conf.sample + $(CHMOD) 644 $(sysconfdir)/$(SQLRELAY)/conf.sample + $(CP) sqlrelay.xsd $(sysconfdir)/$(SQLRELAY)/ Modified: head/databases/sqlrelay/pkg-plist ============================================================================== --- head/databases/sqlrelay/pkg-plist Sun Jun 14 14:44:26 2020 (r538807) +++ head/databases/sqlrelay/pkg-plist Sun Jun 14 14:51:20 2020 (r538808) @@ -1,25 +1,11 @@ -%%DATADIR%%/examples/sample-mssqlserver-mysql-errors.map -%%DATADIR%%/examples/sample-oracle-mysql-errors.map %%DATADIR%%/examples/sqlrelay.conf %%FIREBIRD%%libexec/sqlrelay/sqlrconnection_firebird.so %%FREETDS%%libexec/sqlrelay/sqlrconnection_freetds.so -%%MYSQL%%lib/libmysql3sqlrelay.so.5 -%%MYSQL%%lib/libmysql3sqlrelay.so.5.0.0 -%%MYSQL%%lib/libmysql40sqlrelay.so.5 -%%MYSQL%%lib/libmysql40sqlrelay.so.5.0.0 -%%MYSQL%%lib/libmysql41sqlrelay.so.5 -%%MYSQL%%lib/libmysql41sqlrelay.so.5.0.0 -%%MYSQL%%lib/libmysql50sqlrelay.so.5 -%%MYSQL%%lib/libmysql50sqlrelay.so.5.0.0 -%%MYSQL%%lib/libmysql51sqlrelay.so.5 -%%MYSQL%%lib/libmysql51sqlrelay.so.5.0.0 %%MYSQL%%libexec/sqlrelay/sqlrconnection_mysql.so %%ODBC%%lib/libsqlrodbc.so %%ODBC%%lib/libsqlrodbc.so.5 %%ODBC%%lib/libsqlrodbc.so.5.0.0 %%ODBC%%libexec/sqlrelay/sqlrconnection_odbc.so -%%PGSQL%%lib/libpqsqlrelay.so.5 -%%PGSQL%%lib/libpqsqlrelay.so.5.0.0 %%PGSQL%%libexec/sqlrelay/sqlrconnection_postgresql.so %%SQLITE3%%libexec/sqlrelay/sqlrconnection_sqlite.so @dir %%ETCDIR%% @@ -47,6 +33,8 @@ etc/rc.d/sqlrelay etc/sqlrelay/sqlrelay.xsd include/sqlrelay/private/sqlrauth.h include/sqlrelay/private/sqlrauths.h +include/sqlrelay/private/sqlrbindvariabletranslation.h +include/sqlrelay/private/sqlrbindvariabletranslations.h include/sqlrelay/private/sqlrclientincludes.h include/sqlrelay/private/sqlrclientwrapper.h include/sqlrelay/private/sqlrclientwrapperincludes.h @@ -60,9 +48,14 @@ include/sqlrelay/private/sqlrgsscredentials.h include/sqlrelay/private/sqlrlistener.h include/sqlrelay/private/sqlrlogger.h include/sqlrelay/private/sqlrloggers.h +include/sqlrelay/private/sqlrmoduledata.h +include/sqlrelay/private/sqlrmoduledata_tag.h +include/sqlrelay/private/sqlrmoduledatas.h +include/sqlrelay/private/sqlrmysqlcredentials.h include/sqlrelay/private/sqlrnotification.h include/sqlrelay/private/sqlrnotifications.h include/sqlrelay/private/sqlrparser.h +include/sqlrelay/private/sqlrpostgresqlcredentials.h include/sqlrelay/private/sqlrprotocol.h include/sqlrelay/private/sqlrprotocols.h include/sqlrelay/private/sqlrpwdenc.h @@ -109,35 +102,47 @@ lib/libsqlrclientwrapper.so.5 lib/libsqlrclientwrapper.so.5.0.0 lib/libsqlrserver.a lib/libsqlrserver.so -lib/libsqlrserver.so.8 -lib/libsqlrserver.so.8.0.0 +lib/libsqlrserver.so.10 +lib/libsqlrserver.so.10.0.0 lib/libsqlrutil.a lib/libsqlrutil.so -lib/libsqlrutil.so.8 -lib/libsqlrutil.so.8.0.0 +lib/libsqlrutil.so.10 +lib/libsqlrutil.so.10.0.0 libdata/pkgconfig/sqlrelay-c++.pc libdata/pkgconfig/sqlrelay-c.pc libexec/sqlrelay/sqlrauth_database.so +libexec/sqlrelay/sqlrauth_mysql_database.so +libexec/sqlrelay/sqlrauth_mysql_userlist.so +libexec/sqlrelay/sqlrauth_postgresql_userlist.so libexec/sqlrelay/sqlrauth_proxied.so libexec/sqlrelay/sqlrauth_sqlrelay.so libexec/sqlrelay/sqlrauth_userlist.so +libexec/sqlrelay/sqlrbindvariabletranslation_test.so libexec/sqlrelay/sqlrconfig_xmldom.so libexec/sqlrelay/sqlrconnection_router.so +libexec/sqlrelay/sqlrdirective_crash.so libexec/sqlrelay/sqlrdirective_custom_wf.so libexec/sqlrelay/sqlrfilter_patterns.so libexec/sqlrelay/sqlrfilter_regex.so libexec/sqlrelay/sqlrfilter_string.so +libexec/sqlrelay/sqlrfilter_tag.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/sqlrlogger_sql.so libexec/sqlrelay/sqlrlogger_stalecursors.so +libexec/sqlrelay/sqlrmoduledata_tag.so libexec/sqlrelay/sqlrnotification_events.so libexec/sqlrelay/sqlrparser_default.so +libexec/sqlrelay/sqlrprotocol_mysql.so +libexec/sqlrelay/sqlrprotocol_postgresql.so libexec/sqlrelay/sqlrprotocol_sqlrclient.so libexec/sqlrelay/sqlrpwdenc_crypt.so libexec/sqlrelay/sqlrpwdenc_md5.so libexec/sqlrelay/sqlrpwdenc_rot.so +libexec/sqlrelay/sqlrpwdenc_sha1.so +libexec/sqlrelay/sqlrpwdenc_sha256.so libexec/sqlrelay/sqlrquery_sqlrcmdcstat.so libexec/sqlrelay/sqlrquery_sqlrcmdgstat.so libexec/sqlrelay/sqlrresultsettranslation_reformatdatetime.so @@ -149,6 +154,7 @@ libexec/sqlrelay/sqlrrouter_userlist.so libexec/sqlrelay/sqlrschedule_cron_userlist.so libexec/sqlrelay/sqlrtranslation_normalize.so libexec/sqlrelay/sqlrtranslation_patterns.so +libexec/sqlrelay/sqlrtrigger_replay.so man/man1/sqlr-export.1.gz man/man1/sqlr-import.1.gz man/man1/sqlrsh.1.gz Modified: head/devel/rudiments/Makefile ============================================================================== --- head/devel/rudiments/Makefile Sun Jun 14 14:44:26 2020 (r538807) +++ head/devel/rudiments/Makefile Sun Jun 14 14:51:20 2020 (r538808) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= rudiments -PORTVERSION= 1.1.0 -PORTREVISION= 1 +PORTVERSION= 1.2.2 CATEGORIES= devel MASTER_SITES= SF @@ -35,6 +34,6 @@ SSL_CONFIGURE_ON= --with-ssl-includes=-I${OPENSSLINC} --with-ssl-libs=-L${OPENSSLLIB} post-install: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/librudiments.so.5.0.0 + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/librudiments.so.6.0.1 .include Modified: head/devel/rudiments/distinfo ============================================================================== --- head/devel/rudiments/distinfo Sun Jun 14 14:44:26 2020 (r538807) +++ head/devel/rudiments/distinfo Sun Jun 14 14:51:20 2020 (r538808) @@ -1,3 +1,3 @@ -TIMESTAMP = 1545556691 -SHA256 (rudiments-1.1.0.tar.gz) = 2d22f2fec06fbc22da67920c231ddd9a52294b3c4499d546a2f4e17e2a314ade -SIZE (rudiments-1.1.0.tar.gz) = 27675667 +TIMESTAMP = 1592141146 +SHA256 (rudiments-1.2.2.tar.gz) = ad2dbf7cb2a5cbaca38073fef55ead89f40887d21524cab620379c7c2c1f1138 +SIZE (rudiments-1.2.2.tar.gz) = 2400561 Modified: head/devel/rudiments/pkg-plist ============================================================================== --- head/devel/rudiments/pkg-plist Sun Jun 14 14:44:26 2020 (r538807) +++ head/devel/rudiments/pkg-plist Sun Jun 14 14:51:20 2020 (r538808) @@ -173,6 +173,8 @@ include/rudiments/private/serviceentry.h include/rudiments/private/serviceentryincludes.h include/rudiments/private/sha1.h include/rudiments/private/sha1includes.h +include/rudiments/private/sha256.h +include/rudiments/private/sha256includes.h include/rudiments/private/sharedmemory.h include/rudiments/private/sharedmemoryincludes.h include/rudiments/private/signalclassesincludes.h @@ -218,6 +220,8 @@ include/rudiments/private/url.h include/rudiments/private/urlincludes.h include/rudiments/private/userentry.h include/rudiments/private/userentryincludes.h +include/rudiments/private/websocket.h +include/rudiments/private/websocketincludes.h include/rudiments/private/winsock.h include/rudiments/private/xmldom.h include/rudiments/private/xmldomincludes.h @@ -235,6 +239,7 @@ include/rudiments/semaphoreset.h include/rudiments/server.h include/rudiments/serviceentry.h include/rudiments/sha1.h +include/rudiments/sha256.h include/rudiments/sharedmemory.h include/rudiments/signalclasses.h include/rudiments/singlylinkedlist.h @@ -254,11 +259,12 @@ include/rudiments/unixsocketserver.h include/rudiments/unixsocketutil.h include/rudiments/url.h include/rudiments/userentry.h +include/rudiments/websocket.h include/rudiments/xmldom.h include/rudiments/xmlsax.h lib/librudiments.a lib/librudiments.so -lib/librudiments.so.5 -lib/librudiments.so.5.0.0 +lib/librudiments.so.6 +lib/librudiments.so.6.0.1 libdata/pkgconfig/rudiments.pc man/man1/rudiments-config.1.gz