From owner-svn-ports-branches@freebsd.org Sun Feb 24 20:11:00 2019 Return-Path: Delivered-To: svn-ports-branches@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 6BCDC1509C30; Sun, 24 Feb 2019 20:11:00 +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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) 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 0D4E084B76; Sun, 24 Feb 2019 20:11:00 +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 00D6AA398; Sun, 24 Feb 2019 20:11:00 +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 x1OKAx13011930; Sun, 24 Feb 2019 20:10:59 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x1OKAwZ2011925; Sun, 24 Feb 2019 20:10:58 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <201902242010.x1OKAwZ2011925@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Sun, 24 Feb 2019 20:10:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r493806 - in branches/2019Q1/databases: mariadb103-client mariadb103-server mariadb103-server/files X-SVN-Group: ports-branches X-SVN-Commit-Author: brnrd X-SVN-Commit-Paths: in branches/2019Q1/databases: mariadb103-client mariadb103-server mariadb103-server/files X-SVN-Commit-Revision: 493806 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 0D4E084B76 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.996,0]; NEURAL_HAM_SHORT(-0.95)[-0.955,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Feb 2019 20:11:00 -0000 Author: brnrd Date: Sun Feb 24 20:10:58 2019 New Revision: 493806 URL: https://svnweb.freebsd.org/changeset/ports/493806 Log: MFH: r493658 databases/mariadb103-server: Security update to 10.3.13 PR: 235945 Submitted by: Miroslav Lachman <000.fbsd quip cz> Security: d3d02d3a-2242-11e9-b95c-b499baebfeaf Approved by: ports-secteam (joneum) Modified: branches/2019Q1/databases/mariadb103-client/pkg-plist branches/2019Q1/databases/mariadb103-server/Makefile branches/2019Q1/databases/mariadb103-server/distinfo branches/2019Q1/databases/mariadb103-server/files/patch-client_CMakeLists.txt branches/2019Q1/databases/mariadb103-server/pkg-plist Directory Properties: branches/2019Q1/ (props changed) Modified: branches/2019Q1/databases/mariadb103-client/pkg-plist ============================================================================== --- branches/2019Q1/databases/mariadb103-client/pkg-plist Sun Feb 24 19:59:55 2019 (r493805) +++ branches/2019Q1/databases/mariadb103-client/pkg-plist Sun Feb 24 20:10:58 2019 (r493806) @@ -49,7 +49,8 @@ lib/mysql/libmysqlclient.a lib/mysql/libmysqlclient.so lib/mysql/libmysqlclient_r.a lib/mysql/libmysqlclient_r.so -@comment lib/mysql/plugin/client_ed25519.so +@comment lib/mysql/plugin/caching_sha2_password.so +lib/mysql/plugin/client_ed25519.so lib/mysql/plugin/daemon_example.ini lib/mysql/plugin/dialog.so lib/mysql/plugin/mysql_clear_password.so Modified: branches/2019Q1/databases/mariadb103-server/Makefile ============================================================================== --- branches/2019Q1/databases/mariadb103-server/Makefile Sun Feb 24 19:59:55 2019 (r493805) +++ branches/2019Q1/databases/mariadb103-server/Makefile Sun Feb 24 20:10:58 2019 (r493806) @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME?= mariadb -PORTVERSION= 10.3.11 -PORTREVISION?= 2 +PORTVERSION= 10.3.13 +PORTREVISION?= 0 CATEGORIES= databases ipv6 MASTER_SITES= http://mirrors.supportex.net/${SITESDIR}/ \ http://mirror2.hs-esslingen.de/pub/Mirrors/${SITESDIR}/ \ Modified: branches/2019Q1/databases/mariadb103-server/distinfo ============================================================================== --- branches/2019Q1/databases/mariadb103-server/distinfo Sun Feb 24 19:59:55 2019 (r493805) +++ branches/2019Q1/databases/mariadb103-server/distinfo Sun Feb 24 20:10:58 2019 (r493806) @@ -1,3 +1,3 @@ -TIMESTAMP = 1542715300 -SHA256 (mariadb-10.3.11.tar.gz) = 211655b794c9d5397ba3be6c90737eac02e882f296268299239db47ba328f1b2 -SIZE (mariadb-10.3.11.tar.gz) = 70669435 +TIMESTAMP = 1550839720 +SHA256 (mariadb-10.3.13.tar.gz) = b2aa857ef5b84f85a7ea60a1eac7b34c0ca5151c71a0d44ce2d7fb028d71459a +SIZE (mariadb-10.3.13.tar.gz) = 70745600 Modified: branches/2019Q1/databases/mariadb103-server/files/patch-client_CMakeLists.txt ============================================================================== --- branches/2019Q1/databases/mariadb103-server/files/patch-client_CMakeLists.txt Sun Feb 24 19:59:55 2019 (r493805) +++ branches/2019Q1/databases/mariadb103-server/files/patch-client_CMakeLists.txt Sun Feb 24 20:10:58 2019 (r493806) @@ -1,6 +1,6 @@ ---- client/CMakeLists.txt.orig 2017-05-14 23:13:15 UTC +--- client/CMakeLists.txt.orig 2019-02-20 07:59:09 UTC +++ client/CMakeLists.txt -@@ -35,6 +35,8 @@ COPY_OPENSSL_DLLS(copy_openssl_client) +@@ -36,6 +36,8 @@ COPY_OPENSSL_DLLS(copy_openssl_client) SET(CLIENT_LIB mariadbclient mysys) ADD_DEFINITIONS(${SSL_DEFINES}) @@ -9,19 +9,20 @@ MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc ${CMAKE_SOURCE_DIR}/sql/sql_string.cc) TARGET_LINK_LIBRARIES(mysql ${CLIENT_LIB}) -@@ -43,11 +45,6 @@ IF(UNIX) +@@ -44,12 +46,7 @@ IF(UNIX) SET_TARGET_PROPERTIES(mysql PROPERTIES ENABLE_EXPORTS TRUE) ENDIF(UNIX) -MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test) -SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS") --TARGET_LINK_LIBRARIES(mysqltest ${CLIENT_LIB} pcre pcreposix) +-TARGET_LINK_LIBRARIES(mysqltest ${CLIENT_LIB} pcreposix pcre) -SET_TARGET_PROPERTIES(mysqltest PROPERTIES ENABLE_EXPORTS TRUE) -- +- MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c) TARGET_LINK_LIBRARIES(mysqlcheck ${CLIENT_LIB}) -@@ -60,16 +57,6 @@ MYSQL_ADD_EXECUTABLE(mysqlimport mysqlim + +@@ -61,16 +58,6 @@ MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c) SET_SOURCE_FILES_PROPERTIES(mysqlimport.c PROPERTIES COMPILE_FLAGS "-DTHREADS") TARGET_LINK_LIBRARIES(mysqlimport ${CLIENT_LIB}) @@ -38,7 +39,7 @@ MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc) TARGET_LINK_LIBRARIES(mysqlbinlog ${CLIENT_LIB}) -@@ -89,14 +76,34 @@ ENDIF(WIN32) +@@ -90,12 +77,32 @@ ENDIF(WIN32) ADD_EXECUTABLE(async_example async_example.c) TARGET_LINK_LIBRARIES(async_example ${CLIENT_LIB}) @@ -50,9 +51,9 @@ -FOREACH(t mysql mysqltest mysqltest mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysql_plugin mysqlbinlog +FOREACH(t mysql mysqlcheck mysqldump mysqlimport mysqlshow mysqlbinlog mysqladmin mysqlslap async_example) - ADD_DEPENDENCIES(${t} GenError ${CLIENT_LIB}) - ENDFOREACH() - ++ ADD_DEPENDENCIES(${t} GenError ${CLIENT_LIB}) ++ENDFOREACH() ++ +ENDIF() + +MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test) @@ -71,8 +72,6 @@ +PROPERTIES HAS_CXX TRUE) + +FOREACH(t mysqltest mysql_plugin mysql_upgrade) -+ ADD_DEPENDENCIES(${t} GenError ${CLIENT_LIB}) -+ENDFOREACH() -+ - ADD_DEFINITIONS(-DHAVE_DLOPEN) + ADD_DEPENDENCIES(${t} GenError ${CLIENT_LIB}) + ENDFOREACH() Modified: branches/2019Q1/databases/mariadb103-server/pkg-plist ============================================================================== --- branches/2019Q1/databases/mariadb103-server/pkg-plist Sun Feb 24 19:59:55 2019 (r493805) +++ branches/2019Q1/databases/mariadb103-server/pkg-plist Sun Feb 24 20:10:58 2019 (r493806) @@ -240,8 +240,6 @@ man/man1/resolveip.1.gz %%WSREP%%man/man1/wsrep_sst_mysqldump.1.gz %%WSREP%%man/man1/wsrep_sst_rsync.1.gz %%WSREP%%man/man1/wsrep_sst_rsync_wan.1.gz -%%WSREP%%man/man1/wsrep_sst_xtrabackup-v2.1.gz -%%WSREP%%man/man1/wsrep_sst_xtrabackup.1.gz man/man8/mysqld.8.gz %%DATADIR%%/binary-configure %%DATADIR%%/fill_help_tables.sql