From owner-svn-ports-head@freebsd.org Sat Nov 24 19:17:07 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EFB651136236; Sat, 24 Nov 2018 19:17:06 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 942C6888AF; Sat, 24 Nov 2018 19:17:06 +0000 (UTC) (envelope-from brnrd@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 752D71228B; Sat, 24 Nov 2018 19:17:06 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wAOJH62m076805; Sat, 24 Nov 2018 19:17:06 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wAOJH5k1076799; Sat, 24 Nov 2018 19:17:05 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <201811241917.wAOJH5k1076799@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Sat, 24 Nov 2018 19:17:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r485783 - in head/databases: mariadb103-client mariadb103-server X-SVN-Group: ports-head X-SVN-Commit-Author: brnrd X-SVN-Commit-Paths: in head/databases: mariadb103-client mariadb103-server X-SVN-Commit-Revision: 485783 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 942C6888AF X-Spamd-Result: default: False [1.99 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_SPAM_LONG(0.66)[0.661,0]; NEURAL_SPAM_SHORT(0.60)[0.599,0]; NEURAL_SPAM_MEDIUM(0.73)[0.730,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 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, 24 Nov 2018 19:17:07 -0000 Author: brnrd Date: Sat Nov 24 19:17:05 2018 New Revision: 485783 URL: https://svnweb.freebsd.org/changeset/ports/485783 Log: databases/mariadb103-server: Security update to 10.3.11 - Add workaround for LZ4, SNAPPY build issues [1] PR: 233212 [1] Reported by: Peter Putzer MFH: 2018Q4 Security: ec5072b0-d43a-11e8-a6d2-b499baebfeaf Modified: head/databases/mariadb103-client/Makefile head/databases/mariadb103-client/pkg-plist head/databases/mariadb103-server/Makefile head/databases/mariadb103-server/distinfo Modified: head/databases/mariadb103-client/Makefile ============================================================================== --- head/databases/mariadb103-client/Makefile Sat Nov 24 19:08:49 2018 (r485782) +++ head/databases/mariadb103-client/Makefile Sat Nov 24 19:17:05 2018 (r485783) @@ -2,7 +2,6 @@ # $FreeBSD$ PORTNAME= mariadb -PORTREVISION= 2 PKGNAMESUFFIX= 103-client COMMENT= Multithreaded SQL database (client) Modified: head/databases/mariadb103-client/pkg-plist ============================================================================== --- head/databases/mariadb103-client/pkg-plist Sat Nov 24 19:08:49 2018 (r485782) +++ head/databases/mariadb103-client/pkg-plist Sat Nov 24 19:17:05 2018 (r485783) @@ -54,6 +54,7 @@ lib/mysql/plugin/daemon_example.ini lib/mysql/plugin/dialog.so lib/mysql/plugin/mysql_clear_password.so lib/mysql/plugin/sha256_password.so +libdata/pkgconfig/libmariadb.pc @comment man/man1/aria_chk.1.gz @comment man/man1/aria_dump_log.1.gz @comment man/man1/aria_ftdump.1.gz Modified: head/databases/mariadb103-server/Makefile ============================================================================== --- head/databases/mariadb103-server/Makefile Sat Nov 24 19:08:49 2018 (r485782) +++ head/databases/mariadb103-server/Makefile Sat Nov 24 19:17:05 2018 (r485783) @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME?= mariadb -PORTVERSION= 10.3.10 -PORTREVISION?= 1 +PORTVERSION= 10.3.11 +PORTREVISION?= 0 CATEGORIES= databases ipv6 MASTER_SITES= http://mirrors.supportex.net/${SITESDIR}/ \ http://mirror2.hs-esslingen.de/pub/Mirrors/${SITESDIR}/ \ @@ -139,6 +139,7 @@ INNOBASE_CMAKE_OFF= -DPLUGIN_INNOBASE=NO CONNECT_EXTRA_LIB_DEPENDS= libodbc.so:databases/unixODBC CONNECT_EXTRA_USE= gnome=libxml2 +CONNECT_EXTRA_USES= gnome GSSAPI_NONE_CMAKE_ON= -DPLUGIN_AUTH_GSSAPI=NO -DPLUGIN_AUTH_GSSAPI_CLIENT=NO LZ4_CMAKE_OFF= -DGRN_WITH_LZ4=OFF -DWITH_INNODB_LZ4=OFF -DWITH_ROCKSDB_LZ4=OFF LZ4_CMAKE_ON= -DGRN_WITH_LZ4=ON -DWITH_INNODB_LZ4=ON -DWITH_ROCKSDB_LZ4=ON @@ -198,5 +199,13 @@ post-patch: ${CP} ${WRKSRC}/cmake/os/FreeBSD.cmake \ ${WRKSRC}/cmake/os/DragonFly.cmake .endif + +# Fix build failure in mbstream, see https://jira.mariadb.org/browse/MDEV-14072 +post-configure-INNOBASE-on: + ${REINPLACE_CMD} -e 's| ${PREFIX}/lib/liblz4.so\(.* ${PREFIX}/lib/liblz4.so.*\)|\1|' \ + -e 's| ${PREFIX}/lib/liblzo2.so\(.* ${PREFIX}/lib/liblzo2.so.*\)|\1|' \ + -e 's| ${PREFIX}/lib/libsnappy.so\(.* ${PREFIX}/lib/libsnappy.so\)|\1|' \ + -e 's| -llzma\(.* -llzma\)|\1|;s| -lbz2\(.* -lbz2\)|\1|;' \ + ${WRKSRC}/extra/mariabackup/CMakeFiles/mbstream.dir/link.txt .include Modified: head/databases/mariadb103-server/distinfo ============================================================================== --- head/databases/mariadb103-server/distinfo Sat Nov 24 19:08:49 2018 (r485782) +++ head/databases/mariadb103-server/distinfo Sat Nov 24 19:17:05 2018 (r485783) @@ -1,3 +1,3 @@ -TIMESTAMP = 1538732181 -SHA256 (mariadb-10.3.10.tar.gz) = 57767c048982811c7ab21d8527f6f36aa897386e8c7235f11b5505a924d68eda -SIZE (mariadb-10.3.10.tar.gz) = 70493771 +TIMESTAMP = 1542715300 +SHA256 (mariadb-10.3.11.tar.gz) = 211655b794c9d5397ba3be6c90737eac02e882f296268299239db47ba328f1b2 +SIZE (mariadb-10.3.11.tar.gz) = 70669435