Here is an update to MariaDB 10.0.38.
CVE-2019-2529, CVE-2019-2537
Index: Makefile
===================================================================
RCS file: /home/cvs/ports/databases/mariadb/Makefile,v
retrieving revision 1.71
diff -u -p -u -p -r1.71 Makefile
--- Makefile 31 Jan 2019 11:14:33 -0000 1.71
+++ Makefile 4 Feb 2019 22:30:58 -0000
@@ -8,13 +8,11 @@ COMMENT-main= multithreaded SQL database
COMMENT-server= multithreaded SQL database (server)
COMMENT-tests= multithreaded SQL database (regression test suite/benchmark)
-VERSION= 10.0.37
+VERSION= 10.0.38
DISTNAME= mariadb-${VERSION}
PKGNAME-main= mariadb-client-${VERSION}
PKGNAME-server= mariadb-server-${VERSION}
PKGNAME-tests= mariadb-tests-${VERSION}
-REVISION-server=0
-REVISION-tests= 0
EPOCH= 1
CATEGORIES= databases
Index: distinfo
===================================================================
RCS file: /home/cvs/ports/databases/mariadb/distinfo,v
retrieving revision 1.32
diff -u -p -u -p -r1.32 distinfo
--- distinfo 2 Nov 2018 00:19:32 -0000 1.32
+++ distinfo 5 Feb 2019 14:20:32 -0000
@@ -1,2 +1,2 @@
-SHA256 (mariadb-10.0.37.tar.gz) = tJAhmJu4UBY8WkekqUlgAWYbZNf4ebEjejewfUCQpBM=
-SIZE (mariadb-10.0.37.tar.gz) = 64728382
+SHA256 (mariadb-10.0.38.tar.gz) = AiYg6+tPs3RNEB5yRD7FW0WF59mj2MkqqEa8MOaAisE=
+SIZE (mariadb-10.0.38.tar.gz) = 64755921
Index: patches/patch-client_CMakeLists_txt
===================================================================
RCS file:
/home/cvs/ports/databases/mariadb/patches/patch-client_CMakeLists_txt,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 patch-client_CMakeLists_txt
--- patches/patch-client_CMakeLists_txt 2 Nov 2018 00:19:32 -0000 1.8
+++ patches/patch-client_CMakeLists_txt 8 Feb 2019 14:58:51 -0000
@@ -15,8 +15,8 @@ Index: client/CMakeLists.txt
MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)
SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")
--TARGET_LINK_LIBRARIES(mysqltest mysqlclient pcre pcreposix)
-+TARGET_LINK_LIBRARIES(mysqltest clientlib libmysql mysys pcre pcreposix
${SSL_LIBRARIES})
+-TARGET_LINK_LIBRARIES(mysqltest mysqlclient pcreposix pcre)
++TARGET_LINK_LIBRARIES(mysqltest clientlib libmysql mysys pcreposix pcre
${SSL_LIBRARIES})
SET_TARGET_PROPERTIES(mysqltest PROPERTIES ENABLE_EXPORTS TRUE)
Index: patches/patch-scripts_mysql_install_db_sh
===================================================================
RCS file:
/home/cvs/ports/databases/mariadb/patches/patch-scripts_mysql_install_db_sh,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 patch-scripts_mysql_install_db_sh
--- patches/patch-scripts_mysql_install_db_sh 9 Aug 2018 10:58:52 -0000
1.10
+++ patches/patch-scripts_mysql_install_db_sh 8 Feb 2019 14:58:46 -0000
@@ -12,7 +12,7 @@ Index: scripts/mysql_install_db.sh
force=0
in_rpm=0
-@@ -127,6 +128,8 @@ parse_arguments()
+@@ -130,6 +131,8 @@ parse_arguments()
# as 'user' (crucial e.g. if log-bin=/some_other_path/
# where a chown of datadir won't help)
user=`parse_arg "$arg"` ;;
@@ -21,7 +21,7 @@ Index: scripts/mysql_install_db.sh
--skip-name-resolve) ip_only=1 ;;
--verbose) verbose=1 ;; # Obsolete
--rpm) in_rpm=1 ;;
-@@ -401,11 +404,11 @@ do
+@@ -410,11 +413,11 @@ do
fi
if test -n "$user"
then
@@ -36,7 +36,7 @@ Index: scripts/mysql_install_db.sh
exit 1
fi
fi
-@@ -489,10 +492,6 @@ fi
+@@ -498,10 +501,6 @@ fi
# the screen.
if test "$cross_bootstrap" -eq 0 && test -z "$srcdir"
then
@@ -47,7 +47,7 @@ Index: scripts/mysql_install_db.sh
echo
echo "PLEASE REMEMBER TO SET A PASSWORD FOR THE MariaDB root USER !"
echo "To do so, start the server, then issue the following commands:"
-@@ -514,10 +513,7 @@ then
+@@ -523,10 +522,7 @@ then
then
echo
echo "You can start the MariaDB daemon with:"
Index: patches/patch-storage_connect_reldef_cpp
===================================================================
RCS file:
/home/cvs/ports/databases/mariadb/patches/patch-storage_connect_reldef_cpp,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 patch-storage_connect_reldef_cpp
--- patches/patch-storage_connect_reldef_cpp 11 Aug 2017 19:04:49 -0000
1.9
+++ patches/patch-storage_connect_reldef_cpp 8 Feb 2019 14:58:46 -0000
@@ -2,7 +2,7 @@ $OpenBSD: patch-storage_connect_reldef_c
Index: storage/connect/reldef.cpp
--- storage/connect/reldef.cpp.orig
+++ storage/connect/reldef.cpp
-@@ -529,6 +529,10 @@ PTABDEF OEMDEF::GetXdef(PGLOBAL g)
+@@ -536,6 +536,10 @@ PTABDEF OEMDEF::GetXdef(PGLOBAL g)
#else // !__WIN__
const char *error = NULL;
Index: pkg/PLIST-tests
===================================================================
RCS file: /home/cvs/ports/databases/mariadb/pkg/PLIST-tests,v
retrieving revision 1.34
diff -u -p -u -p -r1.34 PLIST-tests
--- pkg/PLIST-tests 24 Nov 2018 08:54:46 -0000 1.34
+++ pkg/PLIST-tests 8 Feb 2019 15:17:20 -0000
@@ -4428,6 +4428,7 @@ share/mysql-test/suite/innodb/include/in
share/mysql-test/suite/innodb/include/restart_and_reinit.inc
share/mysql-test/suite/innodb/r/
share/mysql-test/suite/innodb/r/add_constraint.result
+share/mysql-test/suite/innodb/r/alter_candidate_key.result
share/mysql-test/suite/innodb/r/alter_inplace_perfschema.result
share/mysql-test/suite/innodb/r/alter_key_block_size-11757.result
share/mysql-test/suite/innodb/r/alter_partitioned_xa.result
@@ -4514,6 +4515,7 @@ share/mysql-test/suite/innodb/r/innodb-w
share/mysql-test/suite/innodb/r/innodb-wl5980-alter.result
share/mysql-test/suite/innodb/r/innodb-xa.result
share/mysql-test/suite/innodb/r/innodb.result
+share/mysql-test/suite/innodb/r/innodb_28867993.result
share/mysql-test/suite/innodb/r/innodb_autoinc_lock_mode_zero.result
share/mysql-test/suite/innodb/r/innodb_blob_unrecoverable_crash.result
share/mysql-test/suite/innodb/r/innodb_bug11754376.result
@@ -4631,6 +4633,7 @@ share/mysql-test/suite/innodb/r/undo_log
share/mysql-test/suite/innodb/r/xa_recovery.result
share/mysql-test/suite/innodb/t/
share/mysql-test/suite/innodb/t/add_constraint.test
+share/mysql-test/suite/innodb/t/alter_candidate_key.test
share/mysql-test/suite/innodb/t/alter_inplace_perfschema.opt
share/mysql-test/suite/innodb/t/alter_inplace_perfschema.test
share/mysql-test/suite/innodb/t/alter_key_block_size-11757.test
@@ -4744,6 +4747,7 @@ share/mysql-test/suite/innodb/t/innodb-w
share/mysql-test/suite/innodb/t/innodb-wl5980-alter.test
share/mysql-test/suite/innodb/t/innodb-xa.test
share/mysql-test/suite/innodb/t/innodb.test
+share/mysql-test/suite/innodb/t/innodb_28867993.test
share/mysql-test/suite/innodb/t/innodb_autoinc_lock_mode_zero-master.opt
share/mysql-test/suite/innodb/t/innodb_autoinc_lock_mode_zero.test
share/mysql-test/suite/innodb/t/innodb_blob_unrecoverable_crash.test
@@ -6860,6 +6864,8 @@ share/mysql-test/suite/roles/drop_routin
share/mysql-test/suite/roles/drop_routines.test
share/mysql-test/suite/roles/flush_roles-12366.result
share/mysql-test/suite/roles/flush_roles-12366.test
+share/mysql-test/suite/roles/flush_roles-17898.result
+share/mysql-test/suite/roles/flush_roles-17898.test
share/mysql-test/suite/roles/grant-5771.result
share/mysql-test/suite/roles/grant-5771.test
share/mysql-test/suite/roles/grant_empty.result
@@ -7190,6 +7196,8 @@ share/mysql-test/suite/rpl/r/rpl_row_bas
share/mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result
share/mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result
share/mysql-test/suite/rpl/r/rpl_row_basic_8partition.result
+share/mysql-test/suite/rpl/r/rpl_row_big_table_id_32bit.result
+share/mysql-test/suite/rpl/r/rpl_row_big_table_id_64bit.result
share/mysql-test/suite/rpl/r/rpl_row_binlog_max_cache_size.result
share/mysql-test/suite/rpl/r/rpl_row_blob_innodb.result
share/mysql-test/suite/rpl/r/rpl_row_blob_myisam.result
@@ -7692,6 +7700,9 @@ share/mysql-test/suite/rpl/t/rpl_row_bas
share/mysql-test/suite/rpl/t/rpl_row_basic_2myisam.test
share/mysql-test/suite/rpl/t/rpl_row_basic_3innodb.test
share/mysql-test/suite/rpl/t/rpl_row_basic_8partition.test
+share/mysql-test/suite/rpl/t/rpl_row_big_table_id.inc
+share/mysql-test/suite/rpl/t/rpl_row_big_table_id_32bit.test
+share/mysql-test/suite/rpl/t/rpl_row_big_table_id_64bit.test
share/mysql-test/suite/rpl/t/rpl_row_binlog_max_cache_size.test
share/mysql-test/suite/rpl/t/rpl_row_blob_innodb.test
share/mysql-test/suite/rpl/t/rpl_row_blob_myisam.test
