zabbix: minor updates

zabbix/make.conf

@@ -3,4 +3,4 @@ CXXFLAGS="-O2 -pipe"
 USE="hardened justify pie ssp urandom xattr -fortran -jit -orc -pch -pic -prelink -profile -tcc"
 MAKEOPTS="-j5"
 PYTHON_TARGETS="python2_7 python3_6"
-PHP_TARGETS="php7-0 php7-1"
+PHP_TARGETS="php7-1"

zabbix/mariadb/my.cnf

@@ -1,5 +1,4 @@
 # /etc/mysql/my.cnf: The global mysql configuration file.
-# $Id$
 
 # The following options will be passed to all MySQL clients
 [client]
@@ -8,34 +7,38 @@ port						= 3306
 socket						= /var/run/mysqld/mysqld.sock
 
 [mysql]
-character-sets-dir=/usr/share/mysql/charsets
+character-sets-dir=/usr/share/mariadb/charsets
 default-character-set=utf8
 
 [mysqladmin]
-character-sets-dir=/usr/share/mysql/charsets
+character-sets-dir=/usr/share/mariadb/charsets
 default-character-set=utf8
 
 [mysqlcheck]
-character-sets-dir=/usr/share/mysql/charsets
+character-sets-dir=/usr/share/mariadb/charsets
 default-character-set=utf8
 
 [mysqldump]
-character-sets-dir=/usr/share/mysql/charsets
+character-sets-dir=/usr/share/mariadb/charsets
 default-character-set=utf8
 
 [mysqlimport]
-character-sets-dir=/usr/share/mysql/charsets
+character-sets-dir=/usr/share/mariadb/charsets
 default-character-set=utf8
 
 [mysqlshow]
-character-sets-dir=/usr/share/mysql/charsets
+character-sets-dir=/usr/share/mariadb/charsets
 default-character-set=utf8
 
 [myisamchk]
-character-sets-dir=/usr/share/mysql/charsets
+character-sets-dir=/usr/share/mariadb/charsets
 
 [myisampack]
-character-sets-dir=/usr/share/mysql/charsets
+character-sets-dir=/usr/share/mariadb/charsets
+
+# use [safe_mysqld] with mysql-3
+[mysqld_safe]
+err-log						= /var/log/mysql/mysql.err
 
 # add a section [mysqld-4.1] or [mysqld-5.0] for specific configurations
 [mysqld]
@@ -56,7 +59,7 @@ net_buffer_length 			= 16K
 read_buffer_size 			= 256K
 read_rnd_buffer_size 		= 512K
 myisam_sort_buffer_size 	= 8M
-lc_messages_dir			= /usr/share/mysql
+lc_messages_dir			= /usr/share/mariadb
 #Set this to your desired error message language
 lc_messages			= en_US