From owner-svn-ports-all@freebsd.org Tue Dec 3 14:44:32 2019 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0B6A31B1247; Tue, 3 Dec 2019 14:44:32 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47S4WM6W2yz4SHg; Tue, 3 Dec 2019 14:44:31 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A651F19401; Tue, 3 Dec 2019 14:44:31 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xB3EiVBh017481; Tue, 3 Dec 2019 14:44:31 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xB3EiUja017477; Tue, 3 Dec 2019 14:44:30 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <201912031444.xB3EiUja017477@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Tue, 3 Dec 2019 14:44:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r518941 - in branches/2019Q4/databases/mariadb103-server: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: brnrd X-SVN-Commit-Paths: in branches/2019Q4/databases/mariadb103-server: . files X-SVN-Commit-Revision: 518941 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Dec 2019 14:44:32 -0000 Author: brnrd Date: Tue Dec 3 14:44:30 2019 New Revision: 518941 URL: https://svnweb.freebsd.org/changeset/ports/518941 Log: 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) Added: branches/2019Q4/databases/mariadb103-server/files/patch-storage_mroonga_CMakeLists.txt - copied unchanged from r518787, head/databases/mariadb103-server/files/patch-storage_mroonga_CMakeLists.txt Modified: branches/2019Q4/databases/mariadb103-server/Makefile branches/2019Q4/databases/mariadb103-server/distinfo branches/2019Q4/databases/mariadb103-server/files/patch-libmariadb_plugins_auth_CMakeLists.txt branches/2019Q4/databases/mariadb103-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuThirdParty.cmake Directory Properties: branches/2019Q4/ (props changed) Modified: branches/2019Q4/databases/mariadb103-server/Makefile ============================================================================== --- branches/2019Q4/databases/mariadb103-server/Makefile Tue Dec 3 14:36:41 2019 (r518940) +++ branches/2019Q4/databases/mariadb103-server/Makefile Tue Dec 3 14:44:30 2019 (r518941) @@ -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-mir 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 Modified: branches/2019Q4/databases/mariadb103-server/distinfo ============================================================================== --- branches/2019Q4/databases/mariadb103-server/distinfo Tue Dec 3 14:36:41 2019 (r518940) +++ branches/2019Q4/databases/mariadb103-server/distinfo Tue Dec 3 14:44:30 2019 (r518941) @@ -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 Modified: branches/2019Q4/databases/mariadb103-server/files/patch-libmariadb_plugins_auth_CMakeLists.txt ============================================================================== --- branches/2019Q4/databases/mariadb103-server/files/patch-libmariadb_plugins_auth_CMakeLists.txt Tue Dec 3 14:36:41 2019 (r518940) +++ branches/2019Q4/databases/mariadb103-server/files/patch-libmariadb_plugins_auth_CMakeLists.txt Tue Dec 3 14:44:30 2019 (r518941) @@ -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() Copied: branches/2019Q4/databases/mariadb103-server/files/patch-storage_mroonga_CMakeLists.txt (from r518787, head/databases/mariadb103-server/files/patch-storage_mroonga_CMakeLists.txt) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2019Q4/databases/mariadb103-server/files/patch-storage_mroonga_CMakeLists.txt Tue Dec 3 14:44:30 2019 (r518941, copy of r518787, head/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) Modified: branches/2019Q4/databases/mariadb103-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuThirdParty.cmake ============================================================================== --- branches/2019Q4/databases/mariadb103-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuThirdParty.cmake Tue Dec 3 14:36:41 2019 (r518940) +++ branches/2019Q4/databases/mariadb103-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuThirdParty.cmake Tue Dec 3 14:44:30 2019 (r518941) @@ -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")