svn commit: r453757 - in branches/2017Q4/databases/mariadb100-server: . files

[Bernard Spil]

Author: brnrd
Date: Wed Nov  8 17:55:18 2017
New Revision: 453757
URL: https://svnweb.freebsd.org/changeset/ports/453757

Log:
  MFH: r453435
  
  databases/mariadb100-server: Security update to 10.0.33
  
  Security:	c41bedfd-b3f9-11e7-ac58-b499baebfeaf
  
  Approved by:	ports-secteam (swills)

Added:
  branches/2017Q4/databases/mariadb100-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuSetupCompiler.cmake
     - copied unchanged from r453435, head/databases/mariadb100-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuSetupCompiler.cmake
Modified:
  branches/2017Q4/databases/mariadb100-server/Makefile
  branches/2017Q4/databases/mariadb100-server/distinfo
Directory Properties:
  branches/2017Q4/   (props changed)

Modified: branches/2017Q4/databases/mariadb100-server/Makefile
==============================================================================
--- branches/2017Q4/databases/mariadb100-server/Makefile	Wed Nov  8 17:53:07 2017	(r453756)
+++ branches/2017Q4/databases/mariadb100-server/Makefile	Wed Nov  8 17:55:18 2017	(r453757)
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
 PORTNAME?=	mariadb
-PORTVERSION=	10.0.32
-PORTREVISION?=	4
+PORTVERSION=	10.0.33
+PORTREVISION?=	0
 CATEGORIES=	databases ipv6
 MASTER_SITES=	http://ftp.osuosl.org/pub/${SITESDIR}/ \
 		http://mirrors.supportex.net/${SITESDIR}/ \

Modified: branches/2017Q4/databases/mariadb100-server/distinfo
==============================================================================
--- branches/2017Q4/databases/mariadb100-server/distinfo	Wed Nov  8 17:53:07 2017	(r453756)
+++ branches/2017Q4/databases/mariadb100-server/distinfo	Wed Nov  8 17:55:18 2017	(r453757)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1502136321
-SHA256 (mariadb-10.0.32.tar.gz) = f7a8d9ba88b01d426f5d69e5044e505e444a5ce73e22c9c50913dade43725936
-SIZE (mariadb-10.0.32.tar.gz) = 63567828
+TIMESTAMP = 1509742954
+SHA256 (mariadb-10.0.33.tar.gz) = e3e3d583c51761aee2fcd0e51bfa7d592c1299cf5eb977e61ea9dc72932e8870
+SIZE (mariadb-10.0.33.tar.gz) = 69211872

Copied: branches/2017Q4/databases/mariadb100-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuSetupCompiler.cmake (from r453435, head/databases/mariadb100-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuSetupCompiler.cmake)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2017Q4/databases/mariadb100-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuSetupCompiler.cmake	Wed Nov  8 17:55:18 2017	(r453757, copy of r453435, head/databases/mariadb100-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuSetupCompiler.cmake)
@@ -0,0 +1,26 @@
+From c4c48e974013a1a3d62ae6b2fc9a705c3bdd1689 Mon Sep 17 00:00:00 2001
+From: Sergei Golubchik <serg at mariadb.org>
+Date: Tue, 7 Mar 2017 19:21:42 +0100
+Subject: [PATCH] MDEV-11965 -Werror should not appear in released tarballs
+
+---
+ storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake b/storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake
+index 769bdffa5d99..c17e119d1cdc 100644
+--- storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake.orig
++++ storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake
+@@ -196,9 +196,9 @@ if (NOT CMAKE_CXX_COMPILER_ID STREQUAL Clang)
+   set_cflags_if_supported(-Wcast-align)
+ endif ()
+ 
+-## always want these
+-set(CMAKE_C_FLAGS "-Wall -Werror ${CMAKE_C_FLAGS}")
+-set(CMAKE_CXX_FLAGS "-Wall -Werror ${CMAKE_CXX_FLAGS}")
++## always want these in debug builds
++set(CMAKE_C_FLAGS_DEBUG "-Wall -Werror ${CMAKE_C_FLAGS_DEBUG}")
++set(CMAKE_CXX_FLAGS_DEBUG "-Wall -Werror ${CMAKE_CXX_FLAGS_DEBUG}")
+ 
+ # pick language dialect
+ set(CMAKE_C_FLAGS "-std=c99 ${CMAKE_C_FLAGS}")