Date: Fri, 1 Feb 2019 15:10:41 +0000 (UTC) From: Bernard Spil <brnrd@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r491826 - in head/databases: mariadb100-client/files mariadb100-server Message-ID: <201902011510.x11FAfl4003300@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brnrd Date: Fri Feb 1 15:10:41 2019 New Revision: 491826 URL: https://svnweb.freebsd.org/changeset/ports/491826 Log: databases/mariadb100-server: Security update to 10.0.38 - Unbreak: Uses bundled yaSSL if OpenSSL 1.1 detected MFH: 2019Q1 Security: d3d02d3a-2242-11e9-b95c-b499baebfeaf Modified: head/databases/mariadb100-client/files/patch-client_CMakeLists.txt head/databases/mariadb100-server/Makefile head/databases/mariadb100-server/distinfo Modified: head/databases/mariadb100-client/files/patch-client_CMakeLists.txt ============================================================================== --- head/databases/mariadb100-client/files/patch-client_CMakeLists.txt Fri Feb 1 15:09:02 2019 (r491825) +++ head/databases/mariadb100-client/files/patch-client_CMakeLists.txt Fri Feb 1 15:10:41 2019 (r491826) @@ -1,20 +1,21 @@ ---- client/CMakeLists.txt.orig 2017-01-12 01:45:16 UTC +--- client/CMakeLists.txt.orig 2019-01-29 18:39:34 UTC +++ client/CMakeLists.txt -@@ -38,11 +38,12 @@ IF(UNIX) +@@ -39,12 +39,13 @@ IF(UNIX) SET_TARGET_PROPERTIES(mysql PROPERTIES ENABLE_EXPORTS TRUE) ENDIF(UNIX) +IF(FALSE) MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test) SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS") - TARGET_LINK_LIBRARIES(mysqltest mysqlclient pcre pcreposix) + TARGET_LINK_LIBRARIES(mysqltest mysqlclient pcreposix pcre) SET_TARGET_PROPERTIES(mysqltest PROPERTIES ENABLE_EXPORTS TRUE) -- +ENDIF() +- MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c) TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient) -@@ -54,21 +55,25 @@ MYSQL_ADD_EXECUTABLE(mysqlimport mysqlim + +@@ -55,21 +56,25 @@ MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c) SET_SOURCE_FILES_PROPERTIES(mysqlimport.c PROPERTIES COMPILE_FLAGS "-DTHREADS") TARGET_LINK_LIBRARIES(mysqlimport mysqlclient) @@ -41,7 +42,7 @@ MYSQL_ADD_EXECUTABLE(mysqlslap mysqlslap.c) SET_SOURCE_FILES_PROPERTIES(mysqlslap.c PROPERTIES COMPILE_FLAGS "-DTHREADS") -@@ -80,10 +85,12 @@ IF(WIN32) +@@ -81,10 +86,12 @@ IF(WIN32) ENDIF(WIN32) # async_example is just a code example, do not install it. Modified: head/databases/mariadb100-server/Makefile ============================================================================== --- head/databases/mariadb100-server/Makefile Fri Feb 1 15:09:02 2019 (r491825) +++ head/databases/mariadb100-server/Makefile Fri Feb 1 15:10:41 2019 (r491826) @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME?= mariadb -PORTVERSION= 10.0.37 -PORTREVISION?= 2 +PORTVERSION= 10.0.38 +PORTREVISION?= 0 CATEGORIES= databases ipv6 MASTER_SITES= http://ftp.osuosl.org/pub/${SITESDIR}/ \ http://mirrors.supportex.net/${SITESDIR}/ \ @@ -25,9 +25,6 @@ LICENSE_NAME_PerconaFT= PerconaFT patents license LICENSE_FILE_PerconaFT= ${WRKSRC}/storage/tokudb/PerconaFT/PATENTS LICENSE_PERMS_PerconaFT= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -BROKEN_SSL= openssl111 -BROKEN_SSL_REASON_openssl111= Does not support OpenSSL 1.1, use MariaDB 10.2 or 10.3 - SUB_FILES= pkg-message SLAVEDIRS= databases/mariadb100-client @@ -145,9 +142,6 @@ post-install-TOKUDB-on: .include <bsd.port.pre.mk> .if ${OPSYS} == FreeBSD -. if ${OSVERSION} >= 1200085 && ${SSL_DEFAULT} == base -BROKEN= ${BROKEN_SSL_REASON_openssl111} -. endif CMAKE_ARGS+= -DWITH_JEMALLOC="system" .else CMAKE_ARGS+= -DWITH_JEMALLOC="no" Modified: head/databases/mariadb100-server/distinfo ============================================================================== --- head/databases/mariadb100-server/distinfo Fri Feb 1 15:09:02 2019 (r491825) +++ head/databases/mariadb100-server/distinfo Fri Feb 1 15:10:41 2019 (r491826) @@ -1,3 +1,3 @@ -TIMESTAMP = 1541062882 -SHA256 (mariadb-10.0.37.tar.gz) = b49021989bb850163c5a47a4a9496001661b64d7f879b1237a37b07d4090a413 -SIZE (mariadb-10.0.37.tar.gz) = 64728382 +TIMESTAMP = 1549017629 +SHA256 (mariadb-10.0.38.tar.gz) = 022620ebeb4fb3744d101e72443ec55b4585e7d9a3d8c92aa846bc30e6808ac1 +SIZE (mariadb-10.0.38.tar.gz) = 64755921
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201902011510.x11FAfl4003300>