databases/mariadb102-server: Security update to 10.2.17

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

4 files changed, 41 insertions, 19 deletions

diff --git a/databases/mariadb102-server/Makefile b/databases/mariadb102-server/Makefile
index 0621f2665251..22d12d7cadc5 100644
--- a/databases/mariadb102-server/Makefile
+++ b/databases/mariadb102-server/Makefile
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
 PORTNAME?=	mariadb
-PORTVERSION=	10.2.16
-PORTREVISION?=	2
+PORTVERSION=	10.2.17
+PORTREVISION?=	0
 CATEGORIES=	databases ipv6
 MASTER_SITES=	http://mirrors.supportex.net/${SITESDIR}/ \
 		http://mirror2.hs-esslingen.de/pub/Mirrors/${SITESDIR}/ \
diff --git a/databases/mariadb102-server/distinfo b/databases/mariadb102-server/distinfo
index 174b98934b60..7c7af876361a 100644
--- a/databases/mariadb102-server/distinfo
+++ b/databases/mariadb102-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1530034863
-SHA256 (mariadb-10.2.16.tar.gz) = c182ee93bacee9c1395a4cece56acfc433bc5153ec627c4898927b93eee54dc4
-SIZE (mariadb-10.2.16.tar.gz) = 73363798
+TIMESTAMP = 1534231063
+SHA256 (mariadb-10.2.17.tar.gz) = e7b3078f8de874a4d451242a8a3eed49bf6f916dcd52fc3efa55886f5f35be27
+SIZE (mariadb-10.2.17.tar.gz) = 73409162
diff --git a/databases/mariadb102-server/files/patch-sql_share_CMakeLists.txt b/databases/mariadb102-server/files/patch-sql_share_CMakeLists.txt
index 3d0dab9820c2..b0479f8337c7 100644
--- a/databases/mariadb102-server/files/patch-sql_share_CMakeLists.txt
+++ b/databases/mariadb102-server/files/patch-sql_share_CMakeLists.txt
@@ -1,17 +1,14 @@
---- sql/share/CMakeLists.txt.orig	2017-05-14 23:13:18 UTC
+--- sql/share/CMakeLists.txt.orig	2018-08-12 11:29:50 UTC
 +++ sql/share/CMakeLists.txt
-@@ -14,6 +14,8 @@
- # along with this program; if not, write to the Free Software
- # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- 
-+IF(FALSE)
-+
- SET (dirs 
- danish
- german 
-@@ -53,3 +55,5 @@ INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE
+@@ -45,9 +45,11 @@ SET(files 
+  errmsg-utf8.txt
  )
  
- INSTALL(FILES ${files} DESTINATION ${INSTALL_MYSQLSHAREDIR} COMPONENT Server)
-+
++IF (NOT WITHOUT_CLIENT)
+ INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/charsets DESTINATION ${INSTALL_MYSQLSHAREDIR}
+   COMPONENT Common PATTERN "languages.html" EXCLUDE
+ )
 +ENDIF()
+ 
+ IF (NOT WITHOUT_SERVER)
+   FOREACH (dir ${dirs})
diff --git a/databases/mariadb102-server/pkg-plist b/databases/mariadb102-server/pkg-plist
index 8605c827465c..a9a48392a71e 100644
--- a/databases/mariadb102-server/pkg-plist
+++ b/databases/mariadb102-server/pkg-plist
@@ -136,9 +136,23 @@ man/man1/wsrep_sst_xtrabackup-v2.1.gz
 man/man1/wsrep_sst_xtrabackup.1.gz
 man/man8/mysqld.8.gz
 %%DATADIR%%/binary-configure
+%%DATADIR%%/czech/errmsg.sys
+%%DATADIR%%/danish/errmsg.sys
+%%DATADIR%%/dutch/errmsg.sys
+%%DATADIR%%/english/errmsg.sys
+%%DATADIR%%/errmsg-utf8.txt
+%%DATADIR%%/estonian/errmsg.sys
 %%DATADIR%%/fill_help_tables.sql
-%%DATADIR%%/magic
+%%DATADIR%%/french/errmsg.sys
+%%DATADIR%%/german/errmsg.sys
+%%DATADIR%%/greek/errmsg.sys
+%%DATADIR%%/hindi/errmsg.sys
+%%DATADIR%%/hungarian/errmsg.sys
 %%SPIDER%%%%DATADIR%%/install_spider.sql
+%%DATADIR%%/italian/errmsg.sys
+%%DATADIR%%/japanese/errmsg.sys
+%%DATADIR%%/korean/errmsg.sys
+%%DATADIR%%/magic
 %%DATADIR%%/maria_add_gis_sp.sql
 %%DATADIR%%/maria_add_gis_sp_bootstrap.sql
 %%MROONGA%%%%DATADIR%%/mroonga/install.sql
@@ -157,6 +171,17 @@ man/man8/mysqld.8.gz
 %%DATADIR%%/mysql_test_data_timezone.sql
 %%DATADIR%%/mysql_to_mariadb.sql
 %%DATADIR%%/mysqld_multi.server
+%%DATADIR%%/norwegian-ny/errmsg.sys
+%%DATADIR%%/norwegian/errmsg.sys
+%%DATADIR%%/polish/errmsg.sys
+%%DATADIR%%/portuguese/errmsg.sys
+%%DATADIR%%/romanian/errmsg.sys
+%%DATADIR%%/russian/errmsg.sys
+%%DATADIR%%/serbian/errmsg.sys
+%%DATADIR%%/slovak/errmsg.sys
+%%DATADIR%%/spanish/errmsg.sys
+%%DATADIR%%/swedish/errmsg.sys
+%%DATADIR%%/ukrainian/errmsg.sys
 %%DATADIR%%/wsrep.cnf
 %%DATADIR%%/wsrep_notify
 %%MROONGA%%share/groonga-normalizer-mysql/README.md