From owner-dev-commits-ports-all@freebsd.org Thu May 13 16:35:32 2021 Return-Path: Delivered-To: dev-commits-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 C2D646478A5; Thu, 13 May 2021 16:35:32 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Fgy2D43zQz3P7L; Thu, 13 May 2021 16:35:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6BC9C2248A; Thu, 13 May 2021 16:35:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 14DGZWgS008530; Thu, 13 May 2021 16:35:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14DGZWWq008529; Thu, 13 May 2021 16:35:32 GMT (envelope-from git) Date: Thu, 13 May 2021 16:35:32 GMT Message-Id: <202105131635.14DGZWWq008529@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Bernard Spil Subject: git: d94a3f91ff71 - main - databases/mariadb104-server: Security update to 10.4.19 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brnrd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d94a3f91ff717fbed25b89ebd57c6ca4f3f4b793 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 May 2021 16:35:32 -0000 The branch main has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=d94a3f91ff717fbed25b89ebd57c6ca4f3f4b793 commit d94a3f91ff717fbed25b89ebd57c6ca4f3f4b793 Author: Bernard Spil AuthorDate: 2021-05-13 16:16:22 +0000 Commit: Bernard Spil CommitDate: 2021-05-13 16:32:42 +0000 databases/mariadb104-server: Security update to 10.4.19 Security: 56ba4513-a1be-11eb-9072-d4c9ef517024 MFH: 2021Q2 --- databases/mariadb104-server/Makefile | 2 +- databases/mariadb104-server/distinfo | 6 +++--- databases/mariadb104-server/files/patch-CMakeLists.txt | 5 ++--- .../files/patch-libmariadb_cmake_ConnectorName.cmake | 11 ----------- databases/mariadb104-server/pkg-plist | 1 - 5 files changed, 6 insertions(+), 19 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 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/files/patch-libmariadb_cmake_ConnectorName.cmake b/databases/mariadb104-server/files/patch-libmariadb_cmake_ConnectorName.cmake deleted file mode 100644 index b052c93a494a..000000000000 --- a/databases/mariadb104-server/files/patch-libmariadb_cmake_ConnectorName.cmake +++ /dev/null @@ -1,11 +0,0 @@ ---- libmariadb/cmake/ConnectorName.cmake.orig 2021-04-02 09:49:25 UTC -+++ libmariadb/cmake/ConnectorName.cmake -@@ -22,7 +22,7 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Windows") - SET(MACHINE_NAME "x64") - ELSE() - SET(MACHINE_NAME "32") -- END() -+ ENDIF() - ENDIF() - - SET(product_name "mysql-connector-c-${CPACK_PACKAGE_VERSION}-${PLATFORM_NAME}${CONCAT_SIGN}${MACHINE_NAME}") 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