svn commit: r461657 - in branches/2018Q1/databases/mariadb101-server: . files
Bernard Spil
brnrd at FreeBSD.org
Mon Feb 12 21:53:06 UTC 2018
Author: brnrd
Date: Mon Feb 12 21:53:04 2018
New Revision: 461657
URL: https://svnweb.freebsd.org/changeset/ports/461657
Log:
MFH: r461590
databases/mariadb101-server: Security update to 10.1.31
PR: 225758
Reported by: Pascal Christen <pascal christen hostpoint.ch>
Security: e3445736-fd01-11e7-ac58-b499baebfeaf
Approved by: ports-secteam (riggs)
Added:
branches/2018Q1/databases/mariadb101-server/files/extra-patch-MDEV-15288
- copied unchanged from r461590, head/databases/mariadb101-server/files/extra-patch-MDEV-15288
Modified:
branches/2018Q1/databases/mariadb101-server/Makefile
branches/2018Q1/databases/mariadb101-server/distinfo
branches/2018Q1/databases/mariadb101-server/files/patch-CMakeLists.txt
branches/2018Q1/databases/mariadb101-server/files/patch-mysys__ssl_my__crypt.cc
branches/2018Q1/databases/mariadb101-server/pkg-plist
Directory Properties:
branches/2018Q1/ (props changed)
Modified: branches/2018Q1/databases/mariadb101-server/Makefile
==============================================================================
--- branches/2018Q1/databases/mariadb101-server/Makefile Mon Feb 12 21:51:57 2018 (r461656)
+++ branches/2018Q1/databases/mariadb101-server/Makefile Mon Feb 12 21:53:04 2018 (r461657)
@@ -1,8 +1,8 @@
# $FreeBSD$
PORTNAME?= mariadb
-PORTVERSION= 10.1.30
-PORTREVISION?= 2
+PORTVERSION= 10.1.31
+PORTREVISION?= 0
CATEGORIES= databases ipv6
MASTER_SITES= http://ftp.osuosl.org/pub/${SITESDIR}/ \
http://mirrors.supportex.net/${SITESDIR}/ \
@@ -114,6 +114,7 @@ GSSAPI_NONE_CMAKE_ON= -DPLUGIN_AUTH_GSSAPI_CLIENT=NO
.else
# MySQL-Server part
BROKEN_powerpc64= Does not build: fatal error: sys/platform/ppc.h: No such file or directory
+#LIB_DEPENDS= libevent.so:devel/libevent
USES+= mysql:101m
USE_GNOME= libxml2
USE_LDCONFIG+= ${PREFIX}/lib/mysql/plugin
@@ -126,13 +127,14 @@ CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER="ON" \
-DWITHOUT_EXAMPLE_STORAGE_ENGINE=1
.for ENGINE in ${OPTIONS_GROUP_ENGINES}
-${ENGINE}_CMAKE_OFF= -DPLUGIN_${ENGINE}=NO \
- -DWITHOUT_${ENGINE}=1
+${ENGINE}_CMAKE_OFF= -DPLUGIN_${ENGINE}=NO
+${ENGINE}_CMAKE_ON= -DPLUGIN_${ENGINE}=DYNAMIC
.endfor
CONNECT_EXTRA_LIB_DEPENDS= libodbc.so:databases/unixODBC
CONNECT_EXTRA_USE= gnome=libxml2
GSSAPI_NONE_CMAKE_ON= -DPLUGIN_AUTH_GSSAPI=NO
+INNOBASE_EXTRA_PATCHES_OFF= ${FILESDIR}/extra-patch-MDEV-15288
LZ4_CMAKE_OFF= -DGRN_WITH_LZ4=OFF -DWITH_INNODB_LZ4=OFF
LZ4_CMAKE_ON= -DGRN_WITH_LZ4=${LOCALBASE}/lib -DWITH_INNODB_LZ4=${LOCALBASE}/lib
LZ4_LIB_DEPENDS= liblz4.so:archivers/liblz4
Modified: branches/2018Q1/databases/mariadb101-server/distinfo
==============================================================================
--- branches/2018Q1/databases/mariadb101-server/distinfo Mon Feb 12 21:51:57 2018 (r461656)
+++ branches/2018Q1/databases/mariadb101-server/distinfo Mon Feb 12 21:53:04 2018 (r461657)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1514018044
-SHA256 (mariadb-10.1.30.tar.gz) = 173a5e5a24819e0a469c3bd09b5c98491676c37c6095882a2ea34c5af0996c88
-SIZE (mariadb-10.1.30.tar.gz) = 67930015
+TIMESTAMP = 1518260559
+SHA256 (mariadb-10.1.31.tar.gz) = ab7641c2fe4e5289da6141766a9c3350e013def56fafd6f1377080bc8048b2e6
+SIZE (mariadb-10.1.31.tar.gz) = 67982786
Copied: branches/2018Q1/databases/mariadb101-server/files/extra-patch-MDEV-15288 (from r461590, head/databases/mariadb101-server/files/extra-patch-MDEV-15288)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2018Q1/databases/mariadb101-server/files/extra-patch-MDEV-15288 Mon Feb 12 21:53:04 2018 (r461657, copy of r461590, head/databases/mariadb101-server/files/extra-patch-MDEV-15288)
@@ -0,0 +1,7 @@
+--- storage/innobase/CMakeLists.txt.orig 2018-02-04 02:30:31 UTC
++++ storage/innobase/CMakeLists.txt
+@@ -520,4 +520,3 @@ MYSQL_ADD_PLUGIN(innobase ${INNOBASE_SOU
+ MODULE_OUTPUT_NAME ha_innodb
+ LINK_LIBRARIES ${ZLIB_LIBRARY} ${LIBSYSTEMD} ${LINKER_SCRIPT})
+
+-ADD_DEPENDENCIES(innobase GenError)
Modified: branches/2018Q1/databases/mariadb101-server/files/patch-CMakeLists.txt
==============================================================================
--- branches/2018Q1/databases/mariadb101-server/files/patch-CMakeLists.txt Mon Feb 12 21:51:57 2018 (r461656)
+++ branches/2018Q1/databases/mariadb101-server/files/patch-CMakeLists.txt Mon Feb 12 21:53:04 2018 (r461657)
@@ -1,5 +1,13 @@
--- CMakeLists.txt.orig 2017-05-02 05:13:38 UTC
+++ CMakeLists.txt
+@@ -388,7 +388,6 @@ ADD_SUBDIRECTORY(libservices)
+ ADD_SUBDIRECTORY(sql/share)
+
+ IF(NOT WITHOUT_SERVER)
+- ADD_SUBDIRECTORY(tests)
+ ADD_SUBDIRECTORY(sql)
+ OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF)
+ IF(WITH_EMBEDDED_SERVER)
@@ -465,6 +465,7 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
)
Modified: branches/2018Q1/databases/mariadb101-server/files/patch-mysys__ssl_my__crypt.cc
==============================================================================
--- branches/2018Q1/databases/mariadb101-server/files/patch-mysys__ssl_my__crypt.cc Mon Feb 12 21:51:57 2018 (r461656)
+++ branches/2018Q1/databases/mariadb101-server/files/patch-mysys__ssl_my__crypt.cc Mon Feb 12 21:53:04 2018 (r461657)
@@ -1,25 +1,20 @@
---- mysys_ssl/my_crypt.cc.orig 2017-01-17 19:38:25 UTC
+--- mysys_ssl/my_crypt.cc.orig 2018-02-04 02:30:31 UTC
+++ mysys_ssl/my_crypt.cc
-@@ -275,10 +275,14 @@ int my_random_bytes(uchar* buf, int num)
- return MY_AES_OK;
- }
- #else
-+#include <openssl/opensslv.h>
+@@ -27,6 +27,7 @@
+ #include <openssl/aes.h>
+ #include <openssl/err.h>
#include <openssl/rand.h>
++#include <openssl/opensslv.h>
+ #ifdef HAVE_ERR_remove_thread_state
+ #define ERR_remove_state(X) ERR_remove_thread_state(NULL)
+@@ -295,6 +296,9 @@ unsigned int my_aes_ctx_size(enum my_aes
+
int my_random_bytes(uchar *buf, int num)
{
-+#if defined(LIBRESSL_VERSION_NUMBER)
++#ifdef LIBRESSL_VERSION_NUMBER
+ arc4random_buf(buf, num);
-+#else
- /*
- Unfortunately RAND_bytes manual page does not provide any guarantees
- in relation to blocking behavior. Here we explicitly use SSLeay random
-@@ -288,6 +292,7 @@ int my_random_bytes(uchar *buf, int num)
- RAND_METHOD *rand = RAND_SSLeay();
- if (rand == NULL || rand->bytes(buf, num) != 1)
- return MY_AES_OPENSSL_ERROR;
+#endif
+ if (RAND_bytes(buf, num) != 1)
+ return MY_AES_OPENSSL_ERROR;
return MY_AES_OK;
- }
- #endif
Modified: branches/2018Q1/databases/mariadb101-server/pkg-plist
==============================================================================
--- branches/2018Q1/databases/mariadb101-server/pkg-plist Mon Feb 12 21:51:57 2018 (r461656)
+++ branches/2018Q1/databases/mariadb101-server/pkg-plist Mon Feb 12 21:53:04 2018 (r461657)
@@ -11,7 +11,6 @@ bin/myisam_ftdump
bin/myisamchk
bin/myisamlog
bin/myisampack
-bin/mysql_client_test
bin/mysql_client_test_embedded
bin/mysql_convert_table_format
bin/mysql_embedded
More information about the svn-ports-branches
mailing list