From a1f0f704b53c10c6008a7546ac31df360d108563 Mon Sep 17 00:00:00 2001 From: Bernard Spil Date: Tue, 3 Dec 2019 14:44:30 +0000 Subject: MFH: r518787 databases/mariadb103-server: Security update to 10.3.20 PR: 241877 Submitted by: fox Security: fc91f2ef-fd7b-11e9-a1c7-b499baebfeaf Approved by: ports-secteam (joneum) --- databases/mariadb103-server/Makefile | 4 +-- databases/mariadb103-server/distinfo | 6 ++-- .../patch-libmariadb_plugins_auth_CMakeLists.txt | 33 +++++++++++----------- .../files/patch-storage_mroonga_CMakeLists.txt | 11 ++++++++ ...b_PerconaFT_cmake__modules_TokuThirdParty.cmake | 9 ++---- 5 files changed, 35 insertions(+), 28 deletions(-) create mode 100644 databases/mariadb103-server/files/patch-storage_mroonga_CMakeLists.txt diff --git a/databases/mariadb103-server/Makefile b/databases/mariadb103-server/Makefile index 1162d2976d57..f1b1e3eea634 100644 --- a/databases/mariadb103-server/Makefile +++ b/databases/mariadb103-server/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME?= mariadb -PORTVERSION= 10.3.17 +PORTVERSION= 10.3.20 PORTREVISION?= 0 CATEGORIES= databases ipv6 MASTER_SITES= http://mirrors.supportex.net/${SITESDIR}/ \ @@ -26,7 +26,6 @@ LICENSE_PERMS_PerconaFT= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept SUB_FILES= pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message -SLAVEDIRS= databases/mariadb102-client USES= bison:build cmake:insource,noninja compiler:c++11-lib cpe iconv:translit libedit ncurses shebangfix ssl USE_LDCONFIG= ${PREFIX}/lib/mysql SHEBANG_FILES= scripts/*.sh @@ -189,6 +188,7 @@ post-patch: ${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/mysys/my_default.c ${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/scripts/mysql_config.sh \ ${WRKSRC}/storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake + ${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/mariadb103-server/distinfo b/databases/mariadb103-server/distinfo index 94de74089384..3661fa370840 100644 --- a/databases/mariadb103-server/distinfo +++ b/databases/mariadb103-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1564591845 -SHA256 (mariadb-10.3.17.tar.gz) = 20a1ea4fc59aae89dcc82aff0d4907b036daf9bfbd252f08162399f055097097 -SIZE (mariadb-10.3.17.tar.gz) = 71894997 +TIMESTAMP = 1575013477 +SHA256 (mariadb-10.3.20.tar.gz) = 53818f2d684e060143b4d8293da44c7f09cc676d71959405f84e6dc8affbc492 +SIZE (mariadb-10.3.20.tar.gz) = 71990355 diff --git a/databases/mariadb103-server/files/patch-libmariadb_plugins_auth_CMakeLists.txt b/databases/mariadb103-server/files/patch-libmariadb_plugins_auth_CMakeLists.txt index 196ced2e7ddb..aa01e9d54190 100644 --- a/databases/mariadb103-server/files/patch-libmariadb_plugins_auth_CMakeLists.txt +++ b/databases/mariadb103-server/files/patch-libmariadb_plugins_auth_CMakeLists.txt @@ -1,25 +1,25 @@ ---- libmariadb/plugins/auth/CMakeLists.txt.orig 2018-05-23 20:38:41 UTC +--- libmariadb/plugins/auth/CMakeLists.txt.orig 2019-11-11 05:31:43 UTC +++ libmariadb/plugins/auth/CMakeLists.txt -@@ -38,6 +38,7 @@ IF(GSSAPI_SOURCES) - LIBRARIES ${GSSAPI_LIBS}) - ENDIF() +@@ -75,6 +75,7 @@ IF(CRYPTO_PLUGIN) + ${CRYPT_SOURCE} + LIBRARIES ${CRYPT_LIBS}) -+IF(NOT WITHOUT_CLIENT) - IF(${WITH_SSL} STREQUAL "OPENSSL" OR ${WITH_SSL} STREQUAL "SCHANNEL") - IF(WIN32) - SET(SHA256_LIBS crypt32) -@@ -51,6 +52,7 @@ IF(${WITH_SSL} STREQUAL "OPENSSL" OR ${W - SOURCES ${AUTH_DIR}/sha256_pw.c - LIBRARIES ${SHA256_LIBS}) ++ IF(NOT WITHOUT_CLIENT) + IF(WITH_SSL STREQUAL "GNUTLS" AND NOT WIN32) + MESSAGE1(STATUS "sha256_password not supported by GnuTLS due to missing OAEP padding") + ELSE() +@@ -85,6 +86,7 @@ IF(CRYPTO_PLUGIN) + SOURCES ${AUTH_DIR}/sha256_pw.c + LIBRARIES ${CRYPT_LIBS}) + ENDIF() ++ ENDIF() ENDIF() -+ENDIF() - # old_password plugin - REGISTER_PLUGIN(TARGET mysql_old_password -@@ -60,10 +62,11 @@ REGISTER_PLUGIN(TARGET mysql_old_passwor + #GSSAPI client authentication plugin +@@ -119,9 +121,11 @@ REGISTER_PLUGIN(TARGET mysql_old_password + DEFAULT STATIC SOURCES ${AUTH_DIR}/old_password.c) - +IF(NOT WITHOUT_CLIENT) # Cleartext REGISTER_PLUGIN(TARGET mysql_clear_password @@ -27,5 +27,4 @@ CONFIGURATIONS DYNAMIC STATIC OFF DEFAULT DYNAMIC SOURCES ${AUTH_DIR}/mariadb_cleartext.c) -- +ENDIF() diff --git a/databases/mariadb103-server/files/patch-storage_mroonga_CMakeLists.txt b/databases/mariadb103-server/files/patch-storage_mroonga_CMakeLists.txt new file mode 100644 index 000000000000..3a9984980272 --- /dev/null +++ b/databases/mariadb103-server/files/patch-storage_mroonga_CMakeLists.txt @@ -0,0 +1,11 @@ +--- 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) diff --git a/databases/mariadb103-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuThirdParty.cmake b/databases/mariadb103-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuThirdParty.cmake index 1ba52dbe8853..5bd9971c69da 100644 --- a/databases/mariadb103-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuThirdParty.cmake +++ b/databases/mariadb103-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuThirdParty.cmake @@ -1,10 +1,7 @@ -Do NOT use bundled libs, use xz/lzma from base and archivers/snappy from ports - ---- storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake.orig 2017-05-14 23:13:20 UTC +--- storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake.orig 2019-11-06 16:01:58 UTC +++ storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake -@@ -34,6 +34,13 @@ if (CMAKE_PROJECT_NAME STREQUAL TokuDB) - endif () - endif () +@@ -1,5 +1,12 @@ + include(ExternalProject) +IF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") + include_directories("/usr/include") -- cgit v1.2.3