svn commit: r461658 - in branches/2018Q1/databases/mariadb100-server: . files

[Bernard Spil]

Author: brnrd
Date: Mon Feb 12 22:03:18 2018
New Revision: 461658
URL: https://svnweb.freebsd.org/changeset/ports/461658

Log:
  MFH: r461610
  
  databases/mariadb100-server: Security update to 10.0.34
  
  Security:	e3445736-fd01-11e7-ac58-b499baebfeaf
  
  Approved by:	ports-secteam (riggs)

Added:
  branches/2018Q1/databases/mariadb100-server/files/extra-patch-MDEV-15288
     - copied unchanged from r461610, head/databases/mariadb100-server/files/extra-patch-MDEV-15288
Deleted:
  branches/2018Q1/databases/mariadb100-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuSetupCompiler.cmake
Modified:
  branches/2018Q1/databases/mariadb100-server/Makefile
  branches/2018Q1/databases/mariadb100-server/distinfo
  branches/2018Q1/databases/mariadb100-server/files/patch-CMakeLists.txt
  branches/2018Q1/databases/mariadb100-server/pkg-plist
Directory Properties:
  branches/2018Q1/   (props changed)

Modified: branches/2018Q1/databases/mariadb100-server/Makefile
==============================================================================
--- branches/2018Q1/databases/mariadb100-server/Makefile	Mon Feb 12 21:53:04 2018	(r461657)
+++ branches/2018Q1/databases/mariadb100-server/Makefile	Mon Feb 12 22:03:18 2018	(r461658)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME?=	mariadb
-PORTVERSION=	10.0.33
+PORTVERSION=	10.0.34
 PORTREVISION?=	0
 CATEGORIES=	databases ipv6
 MASTER_SITES=	http://ftp.osuosl.org/pub/${SITESDIR}/ \
@@ -56,7 +56,6 @@ CMAKE_ARGS+=	-DINSTALL_DOCDIR="share/doc/mariadb" \
 		-DINSTALL_SQLBENCHDIR= \
 		-DINSTALL_SUPPORTFILESDIR="share/mysql" \
 		-DWITH_UNIT_TESTS=0 \
-		-DWITH_LIBEDIT=0 \
 		-DWITH_SSL=${OPENSSLBASE} \
 		-DWITH_LIBWRAP=1 \
 		-DCOMPILATION_COMMENT="FreeBSD Ports"
@@ -114,14 +113,13 @@ CMAKE_ARGS+=	-DWITH_EMBEDDED_SERVER="ON" \
 ${ENGINE}_CMAKE_OFF=    -DWITHOUT_${ENGINE}=1
 .endfor
 
+INNOBASE_EXTRA_PATCHES_OFF=	${FILESDIR}/extra-patch-MDEV-15288
 MAXKEY_EXTRA_PATCHES+=	${FILESDIR}/extra-patch-include_my__compare.h
 MROONGA_CMAKE_OFF=	-DWITHOUT_MROONGA=1
 MROONGA_LIB_DEPENDS=	liblz4.so:archivers/liblz4
 OQGRAPH_LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 			libJudy.so:devel/judy
-# Currently OQGraph does not build using clang.
-# See See https://mariadb.atlassian.net/browse/MDEV-8051.
-OQGRAPH_USE=		gcc
+# See https://mariadb.atlassian.net/browse/MDEV-15291.
 OQGRAPH_BROKEN=		OQGraph does not build
 TOKUDB_LIB_DEPENDS=	libsnappy.so:archivers/snappy
 TOKUDB_PORTDOCS=	PATENTS README.md

Modified: branches/2018Q1/databases/mariadb100-server/distinfo
==============================================================================
--- branches/2018Q1/databases/mariadb100-server/distinfo	Mon Feb 12 21:53:04 2018	(r461657)
+++ branches/2018Q1/databases/mariadb100-server/distinfo	Mon Feb 12 22:03:18 2018	(r461658)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1509742954
-SHA256 (mariadb-10.0.33.tar.gz) = e3e3d583c51761aee2fcd0e51bfa7d592c1299cf5eb977e61ea9dc72932e8870
-SIZE (mariadb-10.0.33.tar.gz) = 69211872
+TIMESTAMP = 1517385452
+SHA256 (mariadb-10.0.34.tar.gz) = c5bb2a67dcce84ef39b59a63728a3d2a0196226041416491f0bc22d3388173ac
+SIZE (mariadb-10.0.34.tar.gz) = 69266294

Copied: branches/2018Q1/databases/mariadb100-server/files/extra-patch-MDEV-15288 (from r461610, head/databases/mariadb100-server/files/extra-patch-MDEV-15288)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2018Q1/databases/mariadb100-server/files/extra-patch-MDEV-15288	Mon Feb 12 22:03:18 2018	(r461658, copy of r461610, head/databases/mariadb100-server/files/extra-patch-MDEV-15288)
@@ -0,0 +1,7 @@
+--- storage/innobase/CMakeLists.txt.orig        2018-01-27 18:40:38 UTC
++++ storage/innobase/CMakeLists.txt
+@@ -489,4 +489,3 @@ MYSQL_ADD_PLUGIN(innobase ${INNOBASE_SOU
+   MODULE_OUTPUT_NAME ha_innodb
+   LINK_LIBRARIES ${ZLIB_LIBRARY} ${LINKER_SCRIPT})
+
+-ADD_DEPENDENCIES(innobase GenError)

Modified: branches/2018Q1/databases/mariadb100-server/files/patch-CMakeLists.txt
==============================================================================
--- branches/2018Q1/databases/mariadb100-server/files/patch-CMakeLists.txt	Mon Feb 12 21:53:04 2018	(r461657)
+++ branches/2018Q1/databases/mariadb100-server/files/patch-CMakeLists.txt	Mon Feb 12 22:03:18 2018	(r461658)
@@ -1,6 +1,14 @@
---- CMakeLists.txt.orig	2017-05-20 01:04:09.000000000 +0200
-+++ CMakeLists.txt	2017-05-23 20:53:22.017238000 +0200
-@@ -480,6 +480,7 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL
+--- CMakeLists.txt.orig	2018-01-27 18:40:35 UTC
++++ CMakeLists.txt
+@@ -409,7 +409,6 @@ ADD_SUBDIRECTORY(sql/share)
+ ADD_SUBDIRECTORY(support-files)
+ 
+ IF(NOT WITHOUT_SERVER)
+-  ADD_SUBDIRECTORY(tests)
+   ADD_SUBDIRECTORY(sql)
+   OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF)
+   IF(WITH_EMBEDDED_SERVER) 
+@@ -480,6 +479,7 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL
    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
  )
  
@@ -8,7 +16,7 @@
  INSTALL_DOCUMENTATION(README CREDITS COPYING EXCEPTIONS-CLIENT COMPONENT Readme)
  
  # MDEV-6526 these files are not installed anymore
-@@ -489,6 +490,7 @@ INSTALL_DOCUMENTATION(README CREDITS COP
+@@ -489,6 +489,7 @@ INSTALL_DOCUMENTATION(README CREDITS COP
  IF(UNIX)
    INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme)
  ENDIF()

Modified: branches/2018Q1/databases/mariadb100-server/pkg-plist
==============================================================================
--- branches/2018Q1/databases/mariadb100-server/pkg-plist	Mon Feb 12 21:53:04 2018	(r461657)
+++ branches/2018Q1/databases/mariadb100-server/pkg-plist	Mon Feb 12 22:03:18 2018	(r461658)
@@ -9,7 +9,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