databases/mariadb100-server: Update to 10.0.29

 - Update to 10.0.29
 - Update mariadb100-client
 - Update patches
 - Regen patches with makepatch
 - Pet portlint
 - Add MROONGA liblz4 dependency
 - Fix MROONGA liblz4 linking
 - rm erroneously installed files

PR:             197232, 204014, 215901
MFH:            2017Q1
Security:       22373c43-d728-11e6-a9a5-b499baebfeaf

8 files changed, 33 insertions, 51 deletions

diff --git a/databases/mariadb100-server/Makefile b/databases/mariadb100-server/Makefile
index 67f59030b5a1..01b60786621f 100644
--- a/databases/mariadb100-server/Makefile
+++ b/databases/mariadb100-server/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME?=	mariadb
-PORTVERSION=	10.0.27
-PORTREVISION=	3
+PORTVERSION=	10.0.29
 CATEGORIES=	databases ipv6
 MASTER_SITES=	http://ftp.osuosl.org/pub/${SITESDIR}/ \
 		http://mirrors.supportex.net/${SITESDIR}/ \
@@ -18,6 +17,7 @@ MAINTAINER=	brnrd@FreeBSD.org
 COMMENT?=	Multithreaded SQL database (server)
 
 LICENSE=	GPLv2
+#LICENSE_FILE=	${WRKSRC}/COPYING
 LICENSE_NAME_PerconaFT=	PerconaFT patents license
 LICENSE_FILE_PerconaFT=	${WRKSRC}/storage/tokudb/PerconaFT/PATENTS
 LICENSE_PERMS_PerconaFT=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
@@ -117,6 +117,7 @@ ${ENGINE}_CMAKE_OFF=    -DWITHOUT_${ENGINE}=1
 
 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.
@@ -132,9 +133,10 @@ post-install:
 	# These are "client" components, so there should be a switch that
 	# prevents them from being installed but it's unknown right now
 .	for f in bin/msql2mysql bin/mysql_config bin/mysql_find_rows \
-		bin/mysqlaccess COPYING.AGPLv3 COPYING.GPLv2
+		bin/mysqlaccess COPYING.AGPLv3 COPYING.GPLv2 share/aclocal/mysql.m4
 		${RM} ${STAGEDIR}${PREFIX}/${f}
 .	endfor
+	${RM} -r ${STAGEDIR}${DATADIR}/SELinux
 .endif
 
 .include <bsd.port.pre.mk>
@@ -146,8 +148,8 @@ CMAKE_ARGS+=	-DWITH_JEMALLOC="no"
 .endif
 
 .if ${PORT_OPTIONS:MTOKUDB}
-NOT_FOR_ARCHS=  i386
-NOT_FOR_ARCHS_REASON=   TokuDB not supported on 32-bit platforms, see \
+NOT_FOR_ARCHS=		i386
+NOT_FOR_ARCHS_REASON=	TokuDB not supported on 32-bit platforms, see \
 			https://github.com/percona/PerconaFT/blob/master/README.md
 .endif
 
@@ -169,4 +171,8 @@ post-patch:
 	${MV} ${WRKSRC}/storage/tokudb ${WRKSRC}/skip-tokudb
 .endif
 
+post-configure-MROONGA-on:
+	${REINPLACE_CMD} 's|-llz4|-L${LOCALBASE}/lib -llz4|' \
+		${WRKSRC}/storage/mroonga/CMakeFiles/mroonga.dir/link.txt
+
 .include <bsd.port.post.mk>
diff --git a/databases/mariadb100-server/distinfo b/databases/mariadb100-server/distinfo
index 7e9ad89c13d3..7bbc5dd5d7d3 100644
--- a/databases/mariadb100-server/distinfo
+++ b/databases/mariadb100-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1472465827
-SHA256 (mariadb-10.0.27.tar.gz) = bdf3a0c25aa2bc7a22a47e994eb7c8aa782624810eb3156038cc62bc9085c0cd
-SIZE (mariadb-10.0.27.tar.gz) = 63258508
+TIMESTAMP = 1484413888
+SHA256 (mariadb-10.0.29.tar.gz) = f5f8da646f7df4b1fb21adb8d2b15e6dfbe1964ceb8cea53207d580a464350f4
+SIZE (mariadb-10.0.29.tar.gz) = 63385696
diff --git a/databases/mariadb100-server/files/patch-extra_CMakeLists.txt b/databases/mariadb100-server/files/patch-extra_CMakeLists.txt
index cd7c4a947240..aa0a7143e460 100644
--- a/databases/mariadb100-server/files/patch-extra_CMakeLists.txt
+++ b/databases/mariadb100-server/files/patch-extra_CMakeLists.txt
@@ -1,14 +1,13 @@
---- extra/CMakeLists.txt.orig	2015-06-17 14:54:11 UTC
+--- extra/CMakeLists.txt.orig	2017-01-12 01:45:16 UTC
 +++ extra/CMakeLists.txt
-@@ -78,9 +78,11 @@ IF(UNIX)
+@@ -78,8 +78,10 @@ IF(UNIX)
    MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.c)
    TARGET_LINK_LIBRARIES(resolve_stack_dump mysys)
  
 +IF(FALSE)
    MYSQL_ADD_EXECUTABLE(mysql_waitpid mysql_waitpid.c COMPONENT Client)
    TARGET_LINK_LIBRARIES(mysql_waitpid mysys)
- ENDIF()
 +ENDIF()
  
- 
-   # Add path to the InnoDB headers
+   MYSQL_ADD_EXECUTABLE(mysqld_safe_helper mysqld_safe_helper.c COMPONENT Server)
+   TARGET_LINK_LIBRARIES(mysqld_safe_helper mysys)
diff --git a/databases/mariadb100-server/files/patch-mysys_my__default.c b/databases/mariadb100-server/files/patch-mysys_my__default.c
index fbce62ffde68..70ab3073cf64 100644
--- a/databases/mariadb100-server/files/patch-mysys_my__default.c
+++ b/databases/mariadb100-server/files/patch-mysys_my__default.c
@@ -1,15 +1,6 @@
---- mysys/my_default.c.orig	2015-06-17 14:54:12 UTC
+--- mysys/my_default.c.orig	2017-01-12 01:45:18 UTC
 +++ mysys/my_default.c
-@@ -90,7 +90,7 @@ static my_bool defaults_already_read= FA
- 
- /* Which directories are searched for options (and in which order) */
- 
--#define MAX_DEFAULT_DIRS 6
-+#define MAX_DEFAULT_DIRS 7
- #define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1)  /* Terminate with NULL */
- static const char **default_directories = NULL;
- 
-@@ -785,7 +785,7 @@ static int search_default_file_with_ext(
+@@ -786,7 +786,7 @@ static int search_default_file_with_ext(
    {
      MY_STAT stat_info;
      if (!my_stat(name,&stat_info,MYF(0)))
@@ -18,22 +9,22 @@
      /*
        Ignore world-writable regular files.
        This is mainly done to protect us to not read a file created by
-@@ -803,6 +803,14 @@ static int search_default_file_with_ext(
+@@ -804,6 +804,14 @@ static int search_default_file_with_ext(
    if (!(fp= mysql_file_fopen(key_file_cnf, name, O_RDONLY, MYF(0))))
      return 1;					/* Ignore wrong files */
  
 +  if (strstr(name, "/etc") == name)
 +  {
 +    fprintf(stderr,
-+	      "error: Config file %s in invalid location, please move to or merge with /usr/local%s\n",
-+	      name,name);
++             "error: Config file %s in invalid location, please move to or merge with /usr/local%s\n",
++             name,name);
 +      goto err;
 +  }
 +
    while (mysql_file_fgets(buff, sizeof(buff) - 1, fp))
    {
      line++;
-@@ -1067,7 +1075,8 @@ void my_print_default_files(const char *
+@@ -1068,7 +1076,8 @@ void my_print_default_files(const char *
            if (name[0] == FN_HOMELIB)	/* Add . to filenames in home */
              *end++= '.';
            strxmov(end, conf_file, *ext, " ", NullS);
@@ -43,7 +34,7 @@
          }
        }
      }
-@@ -1223,13 +1232,10 @@ static const char **init_default_directo
+@@ -1229,13 +1238,10 @@ static const char **init_default_directo
  
  #else
  
diff --git a/databases/mariadb100-server/files/patch-scripts_mysqld__safe.sh b/databases/mariadb100-server/files/patch-scripts_mysqld__safe.sh
index 85ed88461ead..d6f1dcede44d 100644
--- a/databases/mariadb100-server/files/patch-scripts_mysqld__safe.sh
+++ b/databases/mariadb100-server/files/patch-scripts_mysqld__safe.sh
@@ -1,6 +1,6 @@
---- scripts/mysqld_safe.sh.orig	2015-06-17 14:54:12 UTC
+--- scripts/mysqld_safe.sh.orig	2017-01-14 17:25:20 UTC
 +++ scripts/mysqld_safe.sh
-@@ -445,10 +445,10 @@ fi
+@@ -469,10 +469,10 @@ fi
  
  if test -z "$MYSQL_HOME"
  then 
@@ -13,12 +13,12 @@
  $DATADIR/my.cnf
  IGNORING $DATADIR/my.cnf"
  
-@@ -457,7 +457,7 @@ IGNORING $DATADIR/my.cnf"
+@@ -481,7 +481,7 @@ IGNORING $DATADIR/my.cnf"
    then
      log_error "WARNING: Found $DATADIR/my.cnf
  The data directory is a deprecated location for my.cnf, please move it to
 -$MY_BASEDIR_VERSION/my.cnf"
 +$MY_BASEDIR_VERSION/etc/my.cnf"
+     unsafe_my_cnf=1
      MYSQL_HOME=$DATADIR
    else
-     MYSQL_HOME=$MY_BASEDIR_VERSION
diff --git a/databases/mariadb100-server/files/patch-storage_tokudb_PerconaFT_ft_CMakeLists.txt b/databases/mariadb100-server/files/patch-storage_tokudb_PerconaFT_ft_CMakeLists.txt
index 640ccd2263f9..d0a809928ae0 100644
--- a/databases/mariadb100-server/files/patch-storage_tokudb_PerconaFT_ft_CMakeLists.txt
+++ b/databases/mariadb100-server/files/patch-storage_tokudb_PerconaFT_ft_CMakeLists.txt
@@ -1,6 +1,6 @@
---- storage/tokudb/PerconaFT/ft/CMakeLists.txt.orig	2016-02-17 21:59:56.000000000 +0100
-+++ storage/tokudb/PerconaFT/ft/CMakeLists.txt	2016-02-21 20:51:12.317052693 +0100
-@@ -84,8 +84,8 @@ set_target_properties(ft_static PROPERTI
+--- storage/tokudb/PerconaFT/ft/CMakeLists.txt.orig	2017-01-12 01:45:22 UTC
++++ storage/tokudb/PerconaFT/ft/CMakeLists.txt
+@@ -85,8 +85,8 @@ set_target_properties(ft_static PROPERTI
  maybe_add_gcov_to_libraries(ft ft_static)
  
  ## depend on other generated targets
diff --git a/databases/mariadb100-server/files/patch-support-files_CMakeLists.txt b/databases/mariadb100-server/files/patch-support-files_CMakeLists.txt
deleted file mode 100644
index 36eadd4a4413..000000000000
--- a/databases/mariadb100-server/files/patch-support-files_CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
---- support-files/CMakeLists.txt.orig	2015-06-17 14:54:14 UTC
-+++ support-files/CMakeLists.txt
-@@ -67,10 +67,11 @@ IF(UNIX)
-   ENDFOREACH()
-   IF(INSTALL_SUPPORTFILESDIR)
-     INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)
--    INSTALL(DIRECTORY RHEL4-SElinux/ DESTINATION ${inst_location}/SELinux/RHEL4 COMPONENT SupportFiles)
-   ENDIF()
- 
-+IF(FALSE)
-   INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development)
-+ENDIF()
-   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)
-   
diff --git a/databases/mariadb100-server/pkg-plist b/databases/mariadb100-server/pkg-plist
index 2ceaa37b9723..ba5342b9769e 100644
--- a/databases/mariadb100-server/pkg-plist
+++ b/databases/mariadb100-server/pkg-plist
@@ -24,6 +24,7 @@ bin/mysql_zap
 bin/mysqlbug
 bin/mysqld_multi
 bin/mysqld_safe
+bin/mysqld_safe_helper
 bin/mysqldumpslow
 bin/mysqlhotcopy
 bin/mysqltest