git: cd56aefb376f - 2021Q2 - databases/mariadb104-server: Security update to 10.4.19

[Bernard Spil]

The branch 2021Q2 has been updated by brnrd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=cd56aefb376fe673d640dcf2509689000f37b24a

commit cd56aefb376fe673d640dcf2509689000f37b24a
Author:     Bernard Spil <brnrd at FreeBSD.org>
AuthorDate: 2021-05-13 16:16:22 +0000
Commit:     Bernard Spil <brnrd at FreeBSD.org>
CommitDate: 2021-05-13 16:43:13 +0000

    databases/mariadb104-server: Security update to 10.4.19
    
    Security:       56ba4513-a1be-11eb-9072-d4c9ef517024
    MFH:            2021Q2
    (cherry picked from commit a6d83062ce3d42fd591d4688d1e374a145b347f4)
---
 databases/mariadb104-server/Makefile                   | 2 +-
 databases/mariadb104-server/distinfo                   | 6 +++---
 databases/mariadb104-server/files/patch-CMakeLists.txt | 5 ++---
 databases/mariadb104-server/pkg-plist                  | 1 -
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/databases/mariadb104-server/Makefile b/databases/mariadb104-server/Makefile
index 5278825076c6..afac272ac180 100644
--- a/databases/mariadb104-server/Makefile
+++ b/databases/mariadb104-server/Makefile
@@ -1,7 +1,7 @@
 # Created by: Bernard Spil <brnrd at FreeBSD.org>
 
 PORTNAME?=	mariadb
-PORTVERSION=	10.4.18
+PORTVERSION=	10.4.19
 PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	http://mirrors.supportex.net/${SITESDIR}/ \
diff --git a/databases/mariadb104-server/distinfo b/databases/mariadb104-server/distinfo
index 58ac0d871050..cd993dbc8071 100644
--- a/databases/mariadb104-server/distinfo
+++ b/databases/mariadb104-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1614531201
-SHA256 (mariadb-10.4.18.tar.gz) = 330d9e8273002fc92f0f3f3f9b08157a3cab1265a0f114adeb6235e4283a0d3e
-SIZE (mariadb-10.4.18.tar.gz) = 81733656
+TIMESTAMP = 1620481669
+SHA256 (mariadb-10.4.19.tar.gz) = ac4fcfeaaaf24a2d4aac8662be7b7da42de045a680fc1d5836263405341f3975
+SIZE (mariadb-10.4.19.tar.gz) = 82042449
diff --git a/databases/mariadb104-server/files/patch-CMakeLists.txt b/databases/mariadb104-server/files/patch-CMakeLists.txt
index 01667993c332..567e4df8a720 100644
--- a/databases/mariadb104-server/files/patch-CMakeLists.txt
+++ b/databases/mariadb104-server/files/patch-CMakeLists.txt
@@ -1,12 +1,11 @@
 --- CMakeLists.txt.orig	2019-11-07 05:52:21 UTC
 +++ CMakeLists.txt
-@@ -498,8 +498,10 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL
+@@ -504,7 +504,9 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL
    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
  )
  
 +IF(FALSE)
- INSTALL_DOCUMENTATION(README.md CREDITS COPYING THIRDPARTY
-                       EXCEPTIONS-CLIENT COMPONENT Readme)
+ INSTALL_DOCUMENTATION(README.md CREDITS COPYING THIRDPARTY COMPONENT Readme)
 +ENDIF()
  
  # MDEV-6526 these files are not installed anymore
diff --git a/databases/mariadb104-server/pkg-plist b/databases/mariadb104-server/pkg-plist
index 589c663f9322..ac3a50adb345 100644
--- a/databases/mariadb104-server/pkg-plist
+++ b/databases/mariadb104-server/pkg-plist
@@ -298,7 +298,6 @@ man/man8/mysqld.8.gz
 %%DATADIR%%/mysql_system_tables_data.sql
 %%DATADIR%%/mysql_test_data_timezone.sql
 %%DATADIR%%/mysql_test_db.sql
-%%DATADIR%%/mysql_to_mariadb.sql
 %%DATADIR%%/mysqld_multi.server
 %%DATADIR%%/norwegian-ny/errmsg.sys
 %%DATADIR%%/norwegian/errmsg.sys