databases/mariadb100-server: Security update to 10.0.36

MFH:		2018Q3
Security:	909be51b-9b3b-11e8-add2-b499baebfeaf

7 files changed, 16 insertions, 203 deletions

diff --git a/databases/mariadb100-client/files/patch-scripts_CMakeLists.txt b/databases/mariadb100-client/files/patch-scripts_CMakeLists.txt
deleted file mode 100644
index 1464eba1f8e2..000000000000
--- a/databases/mariadb100-client/files/patch-scripts_CMakeLists.txt
+++ /dev/null
@@ -1,78 +0,0 @@
---- scripts/CMakeLists.txt.orig	2017-01-12 01:45:19 UTC
-+++ scripts/CMakeLists.txt
-@@ -73,6 +73,7 @@ IF(UNIX)
- )
- ENDIF()
- 
-+IF(FALSE)
- INSTALL(FILES 
-   ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables.sql 
-   ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables_data.sql
-@@ -82,6 +83,7 @@ INSTALL(FILES 
-   ${FIX_PRIVILEGES_SQL}
-   DESTINATION ${INSTALL_MYSQLSHAREDIR} COMPONENT Server
- )
-+ENDIF()
- 
- # TCMalloc hacks
- IF(MALLOC_LIB)
-@@ -134,6 +136,7 @@ ENDIF()
- SET(HOSTNAME "hostname")
- SET(MYSQLD_USER "mysql")
- 
-+IF(FALSE)
- # Required for mysqlbug until autotools are deprecated, once done remove these
- # and expand default cmake variables
- SET(CC ${CMAKE_C_COMPILER})
-@@ -168,6 +171,7 @@ INSTALL_SCRIPT(${CMAKE_CURRENT_BINARY_DI
-   DESTINATION ${INSTALL_BINDIR}
-   COMPONENT Server
-   )
-+ENDIF()
- 
- ENDIF(UNIX)
- 
-@@ -192,6 +196,7 @@ ELSE()
-   SET(localstatedir ${MYSQL_DATADIR})
- ENDIF()
- 
-+IF()
- IF(UNIX)
- CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_install_db.sh
-   ${CMAKE_CURRENT_BINARY_DIR}/mysql_install_db ESCAPE_QUOTES @ONLY)
-@@ -207,6 +212,7 @@ INSTALL_SCRIPT(
-   COMPONENT Server
-   )
- ENDIF()
-+ENDIF()
- 
- SET(prefix "${CMAKE_INSTALL_PREFIX}")
- IF(INSTALL_SYSCONFDIR)
-@@ -269,6 +275,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
-             STRING(REGEX REPLACE "^lib" "" lib "${lib}")
-             SET(${var} "${${var}}-l${lib} " ) 
-           ENDIF()
-+        ELSEIF(lib STREQUAL "-pthread")
-+          SET(${var} "${${var}}-pthread " )
-         ELSE()
-           SET(${var} "${${var}}-l${lib} " ) 
-         ENDIF()
-@@ -327,18 +335,8 @@ ELSE()
-   SET(BIN_SCRIPTS
-     msql2mysql
-     mysql_config
--    mysql_fix_extensions
--    mysql_setpermission
--    mysql_secure_installation
--    mysql_zap
-     mysqlaccess
--    mysql_convert_table_format
-     mysql_find_rows
--    mytop
--    mysqlhotcopy
--    mysqldumpslow
--    mysqld_multi
--    mysqld_safe
-   )
-   FOREACH(file ${BIN_SCRIPTS})
-     IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh)
diff --git a/databases/mariadb100-client/files/patch-support-files_CMakeLists.txt b/databases/mariadb100-client/files/patch-support-files_CMakeLists.txt
deleted file mode 100644
index a001da40a730..000000000000
--- a/databases/mariadb100-client/files/patch-support-files_CMakeLists.txt
+++ /dev/null
@@ -1,48 +0,0 @@
---- support-files/CMakeLists.txt.orig	2017-01-12 01:45:23 UTC
-+++ support-files/CMakeLists.txt
-@@ -41,15 +41,18 @@ ELSE()
-   SET(inst_location ${INSTALL_SUPPORTFILESDIR})
- ENDIF()
- 
-+IF(FALSE)
- FOREACH(inifile my-huge my-innodb-heavy-4G my-large my-medium my-small)
-   CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${inifile}.cnf.sh 
-                  ${CMAKE_CURRENT_BINARY_DIR}/${inifile}.${ini_file_extension} @ONLY)
-   INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${inifile}.${ini_file_extension}
-           DESTINATION ${inst_location} COMPONENT IniFiles)
- ENDFOREACH()
-+ENDIF()
- 
- IF(UNIX)
-   SET(prefix ${CMAKE_INSTALL_PREFIX})
-+  IF(FALSE)
-   FOREACH(script  mysqld_multi.server mysql-log-rotate binary-configure)
-     CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh 
-                    ${CMAKE_CURRENT_BINARY_DIR}/${script} @ONLY )
-@@ -69,8 +72,10 @@ IF(UNIX)
-     INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)
-     ADD_SUBDIRECTORY(SELinux)
-   ENDIF()
-+  ENDIF()
- 
-   INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development)
-+  IF(FALSE)
-   CONFIGURE_FILE(MySQL-shared-compat.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/MySQL-shared-compat.spec @ONLY)
-   CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql.spec @ONLY)
-   
-@@ -94,6 +99,7 @@ IF(UNIX)
-     DESTINATION ${inst_location} COMPONENT SupportFiles
-     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ 
-     GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
-+  
- 
-   IF (INSTALL_SYSCONFDIR)
-     INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mysql-log-rotate DESTINATION ${INSTALL_SYSCONFDIR}/logrotate.d
-@@ -103,6 +109,7 @@ IF(UNIX)
-             RENAME mysql COMPONENT SupportFiles
-             PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ 
-             GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
-+ ENDIF()
- 
-     INSTALL(FILES rpm/my.cnf DESTINATION ${INSTALL_SYSCONFDIR}
-             COMPONENT Common)
diff --git a/databases/mariadb100-client/pkg-plist b/databases/mariadb100-client/pkg-plist
index f098dab1aea5..ba56d5f41131 100644
--- a/databases/mariadb100-client/pkg-plist
+++ b/databases/mariadb100-client/pkg-plist
@@ -102,3 +102,12 @@ man/man1/mysqldump.1.gz
 man/man1/mysqlimport.1.gz
 man/man1/mysqlshow.1.gz
 man/man1/mysqlslap.1.gz
+@comment bin/mytop
+@comment %%DATADIR%%/SELinux/mariadb.te
+@comment %%DATADIR%%/SELinux/rhel4-mysql.fc
+@comment %%DATADIR%%/SELinux/rhel4-mysql.te
+@comment %%DATADIR%%/binary-configure
+@comment %%DATADIR%%/magic
+@comment %%DATADIR%%/mysql-log-rotate
+@comment %%DATADIR%%/mysql.server
+@comment %%DATADIR%%/mysqld_multi.server
diff --git a/databases/mariadb100-server/Makefile b/databases/mariadb100-server/Makefile
index 88f0cbbcb39e..5e19cfe1d175 100644
--- a/databases/mariadb100-server/Makefile
+++ b/databases/mariadb100-server/Makefile
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
 PORTNAME?=	mariadb
-PORTVERSION=	10.0.35
-PORTREVISION?=	1
+PORTVERSION=	10.0.36
+PORTREVISION?=	0
 CATEGORIES=	databases ipv6
 MASTER_SITES=	http://ftp.osuosl.org/pub/${SITESDIR}/ \
 		http://mirrors.supportex.net/${SITESDIR}/ \
diff --git a/databases/mariadb100-server/distinfo b/databases/mariadb100-server/distinfo
index 91c0383d7878..c3f1f0f49bc5 100644
--- a/databases/mariadb100-server/distinfo
+++ b/databases/mariadb100-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1524825442
-SHA256 (mariadb-10.0.35.tar.gz) = 401edb2c1e6be0badb94813b3db606ce8e57b6751a7e89f41127b943195ea828
-SIZE (mariadb-10.0.35.tar.gz) = 66551964
+TIMESTAMP = 1533756534
+SHA256 (mariadb-10.0.36.tar.gz) = edf5c73b171ebdd0ef1d847c16f6702e831c351662515bf570bdf025d727f1ce
+SIZE (mariadb-10.0.36.tar.gz) = 66577105
diff --git a/databases/mariadb100-server/files/patch-MDEV-15768 b/databases/mariadb100-server/files/patch-MDEV-15768
deleted file mode 100644
index af5d15864d61..000000000000
--- a/databases/mariadb100-server/files/patch-MDEV-15768
+++ /dev/null
@@ -1,72 +0,0 @@
---- storage/connect/tabjson.cpp.orig	2018-04-26 19:47:48 UTC
-+++ storage/connect/tabjson.cpp
-@@ -195,7 +195,7 @@ int JSONDISC::GetColumns(PGLOBAL g, PCSZ
- 	tdp->Fn = GetStringTableOption(g, topt, "Filename", NULL);
- 
- 	if (!(tdp->Database = SetPath(g, db)))
--		return NULL;
-+		return 0;
- 
- 	tdp->Objname = GetStringTableOption(g, topt, "Object", NULL);
- 	tdp->Base = GetIntegerTableOption(g, topt, "Base", 0) ? 1 : 0;
-@@ -243,14 +243,14 @@ int JSONDISC::GetColumns(PGLOBAL g, PCSZ
- 			tjsp = new(g) TDBJSON(tdp, new(g) MAPFAM(tdp));
- 
- 		if (tjsp->MakeDocument(g))
--			return NULL;
-+			return 0;
- 
- 		jsp = (tjsp->GetDoc()) ? tjsp->GetDoc()->GetValue(0) : NULL;
- 	}	else {
- 		if (!(tdp->Lrecl = GetIntegerTableOption(g, topt, "Lrecl", 0)))
- 			if (!mgo) {
- 				sprintf(g->Message, "LRECL must be specified for pretty=%d", tdp->Pretty);
--				return NULL;
-+				return 0;
- 			}	else
- 				tdp->Lrecl = 8192;			 // Should be enough
- 
-@@ -261,7 +261,7 @@ int JSONDISC::GetColumns(PGLOBAL g, PCSZ
- 			tjnp = new(g)TDBJSN(tdp, new(g) UNZFAM(tdp));
- #else   // !ZIP_SUPPORT
- 			sprintf(g->Message, MSG(NO_FEAT_SUPPORT), "ZIP");
--			return NULL;
-+			return 0;
- #endif  // !ZIP_SUPPORT
- 		}	else if (tdp->Uri) {
- 			if (tdp->Driver && toupper(*tdp->Driver) == 'C') {
-@@ -269,14 +269,14 @@ int JSONDISC::GetColumns(PGLOBAL g, PCSZ
- 				tjnp = new(g) TDBJSN(tdp, new(g) CMGFAM(tdp));
- #else
- 				sprintf(g->Message, "Mongo %s Driver not available", "C");
--				return NULL;
-+				return 0;
- #endif
- 			}	else if (tdp->Driver && toupper(*tdp->Driver) == 'J') {
- #if defined(JAVA_SUPPORT)
- 				tjnp = new(g) TDBJSN(tdp, new(g) JMGFAM(tdp));
- #else
- 				sprintf(g->Message, "Mongo %s Driver not available", "Java");
--				return NULL;
-+				return 0;
- #endif
- 			}	else {						 // Driver not specified
- #if defined(CMGO_SUPPORT)
-@@ -285,7 +285,7 @@ int JSONDISC::GetColumns(PGLOBAL g, PCSZ
- 				tjnp = new(g) TDBJSN(tdp, new(g) JMGFAM(tdp));
- #else
- 				sprintf(g->Message, MSG(NO_FEAT_SUPPORT), "MONGO");
--				return NULL;
-+				return 0;
- #endif
- 			}	// endif Driver
- 
-@@ -304,7 +304,7 @@ int JSONDISC::GetColumns(PGLOBAL g, PCSZ
- 		tjnp->SetG(G);
- 
- 		if (tjnp->OpenDB(g))
--			return NULL;
-+			return 0;
- 
- 		switch (tjnp->ReadDB(g)) {
- 		case RC_EF:
diff --git a/databases/mariadb100-server/files/patch-mysys_stacktrace.c b/databases/mariadb100-server/files/patch-mysys_stacktrace.c
index 1f3bf5d5bc5a..93d636d4cdce 100644
--- a/databases/mariadb100-server/files/patch-mysys_stacktrace.c
+++ b/databases/mariadb100-server/files/patch-mysys_stacktrace.c
@@ -1,3 +1,5 @@
+https://jira.mariadb.org/browse/MDEV-15961
+
 --- mysys/stacktrace.c.orig	2018-01-27 18:40:37 UTC
 +++ mysys/stacktrace.c
 @@ -34,19 +34,19 @@