databases/mariadb104-server: Security update to 10.4.21

databases/mariadb105-server: Update to 10.5.12

 * Update/fix i386 build [1]

PR:		257047 [1]
Reported by:	Raymond Quakkelaar <r quakkelaar quaras nl>
Security:	38a4a043-e937-11eb-9b84-d4c9ef517024
MFH:		2021Q3

(cherry picked from commit 7d6e883166c711066f5621b106d2615523a2afe7)

6 files changed, 48 insertions, 60 deletions

diff --git a/databases/mariadb104-server/Makefile b/databases/mariadb104-server/Makefile
index 474b8c133db6..df85b463fda6 100644
--- a/databases/mariadb104-server/Makefile
+++ b/databases/mariadb104-server/Makefile
@@ -1,7 +1,7 @@
 # Created by: Bernard Spil <brnrd@FreeBSD.org>
 
 PORTNAME?=	mariadb
-PORTVERSION=	10.4.20
+PORTVERSION=	10.4.21
 CATEGORIES=	databases
 MASTER_SITES=	http://mirrors.supportex.net/${SITESDIR}/ \
 		http://mirror2.hs-esslingen.de/pub/Mirrors/${SITESDIR}/ \
@@ -205,6 +205,11 @@ GSSAPI_BASE_IGNORE=	BASE_GSSAPI is not compatible with OpenSSL from ports. Use o
 PLIST_SUB+=	WSREP="@comment "
 .endif
 
+.if ${ARCH} == i386
+USE_GCC=       yes
+CFLAGS+=       -latomic -fasynchronous-unwind-tables
+.endif
+
 .if ${OPSYS} == DragonFly
 CMAKE_OFF+=	WITH_TOKUDB
 .endif
@@ -213,7 +218,6 @@ post-patch:
 	${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake
 	${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/mysys/my_default.c
-	${MV} ${WRKSRC}/storage/mroonga/version ${WRKSRC}/storage/mroonga/version_txt
 .if ${OPSYS} == DragonFly
 	${CP} ${WRKSRC}/cmake/os/FreeBSD.cmake \
 		${WRKSRC}/cmake/os/DragonFly.cmake
diff --git a/databases/mariadb104-server/distinfo b/databases/mariadb104-server/distinfo
index ca5fdaed7c2f..ae780beace2f 100644
--- a/databases/mariadb104-server/distinfo
+++ b/databases/mariadb104-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1625063243
-SHA256 (mariadb-10.4.20.tar.gz) = 87d5e29ee1f18de153266ec658138607703ed2a05b3ffb1f89091d33f4abf545
-SIZE (mariadb-10.4.20.tar.gz) = 82043644
+TIMESTAMP = 1628423421
+SHA256 (mariadb-10.4.21.tar.gz) = 94dd2e6f5d286de8a7dccffe984015d4253a0568281c7440e772cfbe098a291d
+SIZE (mariadb-10.4.21.tar.gz) = 84809537
diff --git a/databases/mariadb104-server/files/patch-storage_innobase_lz4.cmake b/databases/mariadb104-server/files/patch-storage_innobase_lz4.cmake
index 096529fae9f5..83080ef8386f 100644
--- a/databases/mariadb104-server/files/patch-storage_innobase_lz4.cmake
+++ b/databases/mariadb104-server/files/patch-storage_innobase_lz4.cmake
@@ -1,36 +1,44 @@
---- storage/innobase/lz4.cmake.orig	2017-05-14 23:13:18 UTC
+--- storage/innobase/lz4.cmake.orig	2021-08-02 18:07:03 UTC
 +++ storage/innobase/lz4.cmake
-@@ -17,21 +17,29 @@ SET(WITH_INNODB_LZ4 AUTO CACHE STRING
+@@ -17,20 +17,28 @@ SET(WITH_INNODB_LZ4 AUTO CACHE STRING
  
  MACRO (MYSQL_CHECK_LZ4)
    IF (WITH_INNODB_LZ4 STREQUAL "ON" OR WITH_INNODB_LZ4 STREQUAL "AUTO")
 -    CHECK_INCLUDE_FILES(lz4.h HAVE_LZ4_H)
 -    CHECK_LIBRARY_EXISTS(lz4 LZ4_compress_limitedOutput "" HAVE_LZ4_SHARED_LIB)
 -    CHECK_LIBRARY_EXISTS(lz4 LZ4_compress_default "" HAVE_LZ4_COMPRESS_DEFAULT)
+-
+-    IF (HAVE_LZ4_SHARED_LIB AND HAVE_LZ4_H)
+-      SET(HAVE_INNODB_LZ4 TRUE)
+-      ADD_DEFINITIONS(-DHAVE_LZ4=1)
+-      IF (HAVE_LZ4_COMPRESS_DEFAULT)
+-        ADD_DEFINITIONS(-DHAVE_LZ4_COMPRESS_DEFAULT=1)
 +    find_path(LZ4_INCLUDE_DIR NAMES lz4.h)
 +    find_library(LZ4_LIBRARY NAMES lz4)
 +    IF (LZ4_LIBRARY)
-+    get_filename_component(LZ4_LIBDIR ${LZ4_LIBRARY} DIRECTORY)
-+#MESSAGE(STATUS "LZ4_INCLUDE_DIR=${LZ4_INCLUDE_DIR} LZ4_LIBRARY=${LZ4_LIBRARY} LZ4_LIBDIR=${LZ4_LIBDIR}")
-+    IF (LZ4_INCLUDE_DIR)
-+      SET(HAVE_LZ4_H YES)
-+    ENDIF()
-+    CHECK_LIBRARY_EXISTS(lz4 LZ4_compress_limitedOutput ${LZ4_LIBDIR} HAVE_LZ4_SHARED_LIB)
-+    CHECK_LIBRARY_EXISTS(lz4 LZ4_compress_default ${LZ4_LIBDIR} HAVE_LZ4_COMPRESS_DEFAULT)
- 
-     IF (HAVE_LZ4_SHARED_LIB AND HAVE_LZ4_H)
-       ADD_DEFINITIONS(-DHAVE_LZ4=1)
-       IF (HAVE_LZ4_COMPRESS_DEFAULT)
- 	ADD_DEFINITIONS(-DHAVE_LZ4_COMPRESS_DEFAULT=1)
++      get_filename_component(LZ4_LIBDIR ${LZ4_LIBRARY} DIRECTORY)
++#  MESSAGE(STATUS "LZ4_INCLUDE_DIR=${LZ4_INCLUDE_DIR} LZ4_LIBRARY=${LZ4_LIBRARY} LZ4_LIBDIR=${LZ4_LIBDIR}")
++      IF (LZ4_INCLUDE_DIR)
++        SET(HAVE_LZ4_H YES)
        ENDIF()
 -      LINK_LIBRARIES(lz4)
-+      LINK_LIBRARIES(innobase ${LZ4_LIBRARY})
-     ELSE()
-       IF (WITH_INNODB_LZ4 STREQUAL "ON")
- 	MESSAGE(FATAL_ERROR "Required lz4 library is not found")
+-    ELSE()
+-      IF (WITH_INNODB_LZ4 STREQUAL "ON")
+-        MESSAGE(FATAL_ERROR "Required lz4 library is not found")
++      CHECK_LIBRARY_EXISTS(lz4 LZ4_compress_limitedOutput ${LZ4_LIBDIR} HAVE_LZ4_SHARED_LIB)
++      CHECK_LIBRARY_EXISTS(lz4 LZ4_compress_default ${LZ4_LIBDIR} HAVE_LZ4_COMPRESS_DEFAULT)
++
++      IF (HAVE_LZ4_SHARED_LIB AND HAVE_LZ4_H)
++        SET(HAVE_INNODB_LZ4 TRUE)
++        ADD_DEFINITIONS(-DHAVE_LZ4=1)
++        IF (HAVE_LZ4_COMPRESS_DEFAULT)
++          ADD_DEFINITIONS(-DHAVE_LZ4_COMPRESS_DEFAULT=1)
++        ENDIF()
++        LINK_LIBRARIES(innobase ${LZ4_LIBRARY})
++      ELSE()
++        IF (WITH_INNODB_LZ4 STREQUAL "ON")
++          MESSAGE(FATAL_ERROR "Required lz4 library is not found")
++        ENDIF()
        ENDIF()
      ENDIF()
-+    ENDIF()
    ENDIF()
- ENDMACRO()
- 
diff --git a/databases/mariadb104-server/files/patch-storage_innobase_lzo.cmake b/databases/mariadb104-server/files/patch-storage_innobase_lzo.cmake
index afabe8542926..291a8af8346a 100644
--- a/databases/mariadb104-server/files/patch-storage_innobase_lzo.cmake
+++ b/databases/mariadb104-server/files/patch-storage_innobase_lzo.cmake
@@ -1,21 +1,6 @@
---- storage/innobase/lzo.cmake.orig	2017-05-14 23:13:18 UTC
+--- storage/innobase/lzo.cmake.orig	2021-08-02 18:07:03 UTC
 +++ storage/innobase/lzo.cmake
-@@ -17,12 +17,10 @@ SET(WITH_INNODB_LZO AUTO CACHE STRING
- 
- MACRO (MYSQL_CHECK_LZO_STATIC)
-   IF (WITH_INNODB_LZO STREQUAL "ON" OR WITH_INNODB_LZO STREQUAL "AUTO")
--    CHECK_INCLUDE_FILES(lzo/lzo1x.h HAVE_LZO_H)
--    CHECK_LIBRARY_EXISTS(liblzo2.a lzo1x_1_compress "" HAVE_LZO_LIB)
--
-+    CHECK_LIBRARY_EXISTS(lzo2 lzo1x_1_compress "${LZO_LIBDIR}" HAVE_LZO_LIB)
-     IF(HAVE_LZO_LIB AND HAVE_LZO_H)
-       ADD_DEFINITIONS(-DHAVE_LZO=1)
--      LINK_LIBRARIES(liblzo2.a)
-+      LINK_LIBRARIES(lzo2)
-     ELSE()
-       IF (WITH_INNODB_LZO STREQUAL "ON")
- 	MESSAGE(FATAL_ERROR "Required lzo library is not found")
-@@ -33,12 +31,16 @@ ENDMACRO()
+@@ -17,13 +17,17 @@ SET(WITH_INNODB_LZO AUTO CACHE STRING
  
  MACRO (MYSQL_CHECK_LZO)
    IF (WITH_INNODB_LZO STREQUAL "ON" OR WITH_INNODB_LZO STREQUAL "AUTO")
@@ -30,9 +15,10 @@
 +    ENDIF()
 +    CHECK_LIBRARY_EXISTS(lzo2 lzo1x_1_compress ${LZO_LIBDIR} HAVE_LZO_SHARED_LIB)
      IF(HAVE_LZO_SHARED_LIB AND HAVE_LZO_H)
+       SET(HAVE_INNODB_LZO TRUE)
        ADD_DEFINITIONS(-DHAVE_LZO=1)
 -      LINK_LIBRARIES(lzo2)
 +      LINK_LIBRARIES(${LZO_LIBRARY})
      ELSE()
        IF (WITH_INNODB_LZO STREQUAL "ON")
- 	MESSAGE(FATAL_ERROR "Required lzo library is not found")
+         MESSAGE(FATAL_ERROR "Required lzo library is not found")
diff --git a/databases/mariadb104-server/files/patch-storage_innobase_snappy.cmake b/databases/mariadb104-server/files/patch-storage_innobase_snappy.cmake
index 42c80e08d04a..b1e5ed595b5f 100644
--- a/databases/mariadb104-server/files/patch-storage_innobase_snappy.cmake
+++ b/databases/mariadb104-server/files/patch-storage_innobase_snappy.cmake
@@ -1,12 +1,11 @@
---- storage/innobase/snappy.cmake.orig	2017-05-14 23:13:18 UTC
+--- storage/innobase/snappy.cmake.orig	2021-08-02 18:07:03 UTC
 +++ storage/innobase/snappy.cmake
-@@ -17,12 +17,17 @@ SET(WITH_INNODB_SNAPPY AUTO CACHE STRING
+@@ -17,13 +17,19 @@ SET(WITH_INNODB_SNAPPY AUTO CACHE STRING
  
  MACRO (MYSQL_CHECK_SNAPPY)
    IF (WITH_INNODB_SNAPPY STREQUAL "ON" OR WITH_INNODB_SNAPPY STREQUAL "AUTO")
 -    CHECK_INCLUDE_FILES(snappy-c.h HAVE_SNAPPY_H)
 -    CHECK_LIBRARY_EXISTS(snappy snappy_uncompress "" HAVE_SNAPPY_SHARED_LIB)
--
 +    find_path(SNAPPY_INCLUDE_DIR NAMES snappy-c.h)
 +    find_library(SNAPPY_LIBRARY NAMES snappy)
 +    get_filename_component(SNAPPY_LIBDIR ${SNAPPY_LIBRARY} DIRECTORY)
@@ -14,11 +13,13 @@
 +      SET(HAVE_SNAPPY_H 1)
 +    ENDIF()
 +    CHECK_LIBRARY_EXISTS(snappy snappy_uncompress ${SNAPPY_LIBDIR} HAVE_SNAPPY_SHARED_LIB)
-+MESSAGE(STATUS "HAVE_SNAPPY_H=${HAVE_SNAPPY_H} HAVE_SNAPPY_SHARED_LIB=${HAVE_SNAPPY_SHARED_LIB} SNAPPY_LIBDIR=${SNAPPY_LIBDIR} ")
++#MESSAGE(STATUS "HAVE_SNAPPY_H=${HAVE_SNAPPY_H} HAVE_SNAPPY_SHARED_LIB=${HAVE_SNAPPY_SHARED_LIB} SNAPPY_LIBDIR=${SNAPPY_LIBDIR} ")
+ 
      IF(HAVE_SNAPPY_SHARED_LIB AND HAVE_SNAPPY_H)
+       SET(HAVE_INNODB_SNAPPY TRUE)
        ADD_DEFINITIONS(-DHAVE_SNAPPY=1)
 -      LINK_LIBRARIES(snappy)
 +      LINK_LIBRARIES(${SNAPPY_LIBRARY})
      ELSE()
        IF (WITH_INNODB_SNAPPY STREQUAL "ON")
- 	MESSAGE(FATAL_ERROR "Required snappy library is not found")
+         MESSAGE(FATAL_ERROR "Required snappy library is not found")
diff --git a/databases/mariadb104-server/files/patch-storage_mroonga_CMakeLists.txt b/databases/mariadb104-server/files/patch-storage_mroonga_CMakeLists.txt
deleted file mode 100644
index 3a9984980272..000000000000
--- a/databases/mariadb104-server/files/patch-storage_mroonga_CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- storage/mroonga/CMakeLists.txt.orig	2019-11-06 16:01:58 UTC
-+++ storage/mroonga/CMakeLists.txt
-@@ -80,7 +80,7 @@ else()
-   set(MRN_SOURCE_DIR ${CMAKE_SOURCE_DIR})
- endif()
- 
--file(READ ${MRN_SOURCE_DIR}/version        MRN_VERSION)
-+file(READ ${MRN_SOURCE_DIR}/version_txt    MRN_VERSION)
- file(READ ${MRN_SOURCE_DIR}/version_major  MRN_VERSION_MAJOR)
- file(READ ${MRN_SOURCE_DIR}/version_minor  MRN_VERSION_MINOR)
- file(READ ${MRN_SOURCE_DIR}/version_micro  MRN_VERSION_MICRO)