From owner-dev-commits-ports-all@freebsd.org Thu May 13 16:35:31 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 64C666477B9; Thu, 13 May 2021 16:35:31 +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 4Fgy2C2TPwz3P7G; Thu, 13 May 2021 16:35:31 +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 47F072218E; Thu, 13 May 2021 16:35:31 +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 14DGZVok008509; Thu, 13 May 2021 16:35:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14DGZV6P008508; Thu, 13 May 2021 16:35:31 GMT (envelope-from git) Date: Thu, 13 May 2021 16:35:31 GMT Message-Id: <202105131635.14DGZV6P008508@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: 9cbe5566f7e0 - main - databases/mariadb103-server: Security update to 10.3.29 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: 9cbe5566f7e0a34fc5931510cad334c08c5fd23c 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:31 -0000 The branch main has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=9cbe5566f7e0a34fc5931510cad334c08c5fd23c commit 9cbe5566f7e0a34fc5931510cad334c08c5fd23c Author: Bernard Spil AuthorDate: 2021-05-13 16:26:49 +0000 Commit: Bernard Spil CommitDate: 2021-05-13 16:32:39 +0000 databases/mariadb103-server: Security update to 10.3.29 Reported by: Security: 56ba4513-a1be-11eb-9072-d4c9ef517024 MFH: 2021Q2 --- databases/mariadb103-client/Makefile | 1 - databases/mariadb103-client/files/patch-CMakeLists.txt | 9 ++++----- .../files/patch-libmariadb_cmake_ConnectorName.cmake | 11 ----------- databases/mariadb103-server/Makefile | 2 +- databases/mariadb103-server/distinfo | 6 +++--- databases/mariadb103-server/files/patch-CMakeLists.txt | 9 ++++----- .../files/patch-libmariadb_cmake_ConnectorName.cmake | 11 ----------- databases/mariadb103-server/pkg-plist | 1 - 8 files changed, 12 insertions(+), 38 deletions(-) diff --git a/databases/mariadb103-client/Makefile b/databases/mariadb103-client/Makefile index cee1cc0297a5..d79f7096c9af 100644 --- a/databases/mariadb103-client/Makefile +++ b/databases/mariadb103-client/Makefile @@ -1,7 +1,6 @@ # Created by: Bernard Spil PORTNAME= mariadb -PORTREVISION= 1 PKGNAMESUFFIX= 103-client COMMENT= Multithreaded SQL database (client) diff --git a/databases/mariadb103-client/files/patch-CMakeLists.txt b/databases/mariadb103-client/files/patch-CMakeLists.txt index 29db2065e7cb..7122c9289f07 100644 --- a/databases/mariadb103-client/files/patch-CMakeLists.txt +++ b/databases/mariadb103-client/files/patch-CMakeLists.txt @@ -1,12 +1,11 @@ ---- CMakeLists.txt.orig 2019-05-13 18:13:05 UTC -+++ CMakeLists.txt -@@ -491,14 +491,16 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL +--- CMakeLists.txt.orig 2021-05-08 08:36:42.000000000 +0200 ++++ CMakeLists.txt 2021-05-08 08:40:29.000000000 +0200 +@@ -517,13 +517,15 @@ 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/mariadb103-client/files/patch-libmariadb_cmake_ConnectorName.cmake b/databases/mariadb103-client/files/patch-libmariadb_cmake_ConnectorName.cmake index b052c93a494a..e69de29bb2d1 100644 --- a/databases/mariadb103-client/files/patch-libmariadb_cmake_ConnectorName.cmake +++ b/databases/mariadb103-client/files/patch-libmariadb_cmake_ConnectorName.cmake @@ -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/mariadb103-server/Makefile b/databases/mariadb103-server/Makefile index b8c3e1d5eef7..8e7d31926ace 100644 --- a/databases/mariadb103-server/Makefile +++ b/databases/mariadb103-server/Makefile @@ -1,7 +1,7 @@ # Created by: Bernard Spil PORTNAME?= mariadb -PORTVERSION= 10.3.28 +PORTVERSION= 10.3.29 PORTREVISION?= 0 CATEGORIES= databases MASTER_SITES= http://mirrors.supportex.net/${SITESDIR}/ \ diff --git a/databases/mariadb103-server/distinfo b/databases/mariadb103-server/distinfo index 6f76180f35e8..b80ff666403f 100644 --- a/databases/mariadb103-server/distinfo +++ b/databases/mariadb103-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1614533978 -SHA256 (mariadb-10.3.28.tar.gz) = e8c912cae2e5800d0da364cc23437907ed4be767f2cbdf198cf3afc03db6a6a3 -SIZE (mariadb-10.3.28.tar.gz) = 73040177 +TIMESTAMP = 1620455361 +SHA256 (mariadb-10.3.29.tar.gz) = 304a9e94c50636b591ac7cbfe459cb341d345c4bd0ef5e45fb9a692268e6db38 +SIZE (mariadb-10.3.29.tar.gz) = 73261682 diff --git a/databases/mariadb103-server/files/patch-CMakeLists.txt b/databases/mariadb103-server/files/patch-CMakeLists.txt index 29db2065e7cb..7122c9289f07 100644 --- a/databases/mariadb103-server/files/patch-CMakeLists.txt +++ b/databases/mariadb103-server/files/patch-CMakeLists.txt @@ -1,12 +1,11 @@ ---- CMakeLists.txt.orig 2019-05-13 18:13:05 UTC -+++ CMakeLists.txt -@@ -491,14 +491,16 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL +--- CMakeLists.txt.orig 2021-05-08 08:36:42.000000000 +0200 ++++ CMakeLists.txt 2021-05-08 08:40:29.000000000 +0200 +@@ -517,13 +517,15 @@ 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/mariadb103-server/files/patch-libmariadb_cmake_ConnectorName.cmake b/databases/mariadb103-server/files/patch-libmariadb_cmake_ConnectorName.cmake index b052c93a494a..e69de29bb2d1 100644 --- a/databases/mariadb103-server/files/patch-libmariadb_cmake_ConnectorName.cmake +++ b/databases/mariadb103-server/files/patch-libmariadb_cmake_ConnectorName.cmake @@ -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/mariadb103-server/pkg-plist b/databases/mariadb103-server/pkg-plist index 84812a14303d..8ec9d7fffce5 100644 --- a/databases/mariadb103-server/pkg-plist +++ b/databases/mariadb103-server/pkg-plist @@ -260,7 +260,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%%/charsets/Index.xml %%DATADIR%%/charsets/README