Date: Tue, 27 Jul 2021 16:20:48 GMT From: Jochen Neumeister <joneum@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 853341f7473b - main - databases/mysql57-*: update to 5.7.35 Message-ID: <202107271620.16RGKmtd039295@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by joneum: URL: https://cgit.FreeBSD.org/ports/commit/?id=853341f7473b9ae1a3698bfb4e078f468f6e1f1d commit 853341f7473b9ae1a3698bfb4e078f468f6e1f1d Author: Jochen Neumeister <joneum@FreeBSD.org> AuthorDate: 2021-07-27 16:17:18 +0000 Commit: Jochen Neumeister <joneum@FreeBSD.org> CommitDate: 2021-07-27 16:20:46 +0000 databases/mysql57-*: update to 5.7.35 Full Changelog: https://dev.mysql.com/doc/relnotes/mysql/5.7/en/news-5-7-35.html Sponsored by: Netzkommune GmbH --- databases/mysql57-client/Makefile | 2 +- databases/mysql57-server/Makefile | 4 ++-- databases/mysql57-server/distinfo | 6 +++--- databases/mysql57-server/files/patch-CMakeLists.txt | 20 ++++++++++---------- .../mysql57-server/files/patch-sql_CMakeLists.txt | 10 +++++----- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/databases/mysql57-client/Makefile b/databases/mysql57-client/Makefile index aa6328737788..fd339d57dd4b 100644 --- a/databases/mysql57-client/Makefile +++ b/databases/mysql57-client/Makefile @@ -1,7 +1,7 @@ # Created by: "Mahdi Mokhtari <mokhi64@gmail.com>" PORTNAME= mysql -PORTREVISION= 1 +PORTREVISION= 0 PKGNAMESUFFIX= 57-client COMMENT= Multithreaded SQL database (client) diff --git a/databases/mysql57-server/Makefile b/databases/mysql57-server/Makefile index 1776659f3414..cce6845e0fb2 100644 --- a/databases/mysql57-server/Makefile +++ b/databases/mysql57-server/Makefile @@ -1,8 +1,8 @@ # Created by: Mahdi Mokhtari <mokhi64@gmail.com> PORTNAME?= mysql -PORTVERSION= 5.7.34 -PORTREVISION?= 1 +PORTVERSION= 5.7.35 +PORTREVISION?= 0 CATEGORIES= databases MASTER_SITES= MYSQL/MySQL-5.7 PKGNAMESUFFIX?= 57-server diff --git a/databases/mysql57-server/distinfo b/databases/mysql57-server/distinfo index 1eab4b5543c1..16aa72c286a0 100644 --- a/databases/mysql57-server/distinfo +++ b/databases/mysql57-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1621509617 -SHA256 (mysql-boost-5.7.34.tar.gz) = 5bc2c7c0bb944b5bb219480dde3c1caeb049e7351b5bba94c3b00ac207929c7b -SIZE (mysql-boost-5.7.34.tar.gz) = 52891142 +TIMESTAMP = 1627053937 +SHA256 (mysql-boost-5.7.35.tar.gz) = 6b30c93e5927857e31769bf5356eb23a5cff59c0a0205e5772b51b09bf3f9e12 +SIZE (mysql-boost-5.7.35.tar.gz) = 52959014 diff --git a/databases/mysql57-server/files/patch-CMakeLists.txt b/databases/mysql57-server/files/patch-CMakeLists.txt index fe05a9c83935..e9f84fa8f474 100644 --- a/databases/mysql57-server/files/patch-CMakeLists.txt +++ b/databases/mysql57-server/files/patch-CMakeLists.txt @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2016-03-28 18:06:12 UTC -+++ CMakeLists.txt -@@ -614,12 +614,10 @@ IF(UNIX) +--- CMakeLists.txt.orig 2021-07-26 19:43:45.021975000 +0200 ++++ CMakeLists.txt 2021-07-26 19:49:38.318138000 +0200 +@@ -715,12 +715,10 @@ IF(UNIX) ENDIF() IF(NOT WITHOUT_SERVER) @@ -13,7 +13,7 @@ ENDIF(WITH_EMBEDDED_SERVER) ENDIF() -@@ -628,8 +626,6 @@ ENDIF() +@@ -729,8 +727,6 @@ ENDIF() ADD_SUBDIRECTORY(scripts) IF(NOT WITHOUT_SERVER) @@ -22,19 +22,19 @@ ADD_SUBDIRECTORY(support-files) IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt) ADD_SUBDIRECTORY(internal) -@@ -684,6 +680,7 @@ ENDIF() +@@ -789,6 +785,7 @@ ENDIF() # # RPM installs documentation directly from the source tree # +IF(FALSE) IF(NOT INSTALL_LAYOUT MATCHES "RPM") - INSTALL(FILES COPYING LICENSE.mysql - DESTINATION ${INSTALL_DOCREADMEDIR} -@@ -706,6 +703,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM") + INSTALL(FILES + README +@@ -808,6 +805,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM") + PATTERN "mysql.info" EXCLUDE PATTERN "sp-imp-spec.txt" EXCLUDE ) - ENDIF() +ENDIF() + ENDIF() INCLUDE(CPack) - diff --git a/databases/mysql57-server/files/patch-sql_CMakeLists.txt b/databases/mysql57-server/files/patch-sql_CMakeLists.txt index 033958f32efb..e29d4fc10a8e 100644 --- a/databases/mysql57-server/files/patch-sql_CMakeLists.txt +++ b/databases/mysql57-server/files/patch-sql_CMakeLists.txt @@ -1,11 +1,11 @@ ---- sql/CMakeLists.txt.orig 2016-08-25 11:52:06 UTC -+++ sql/CMakeLists.txt -@@ -24,6 +24,8 @@ INCLUDE_DIRECTORIES( - ${ZLIB_INCLUDE_DIR} +--- sql/CMakeLists.txt.orig 2021-07-26 19:53:15.028262000 +0200 ++++ sql/CMakeLists.txt 2021-07-26 19:55:42.226384000 +0200 +@@ -30,6 +30,8 @@ INCLUDE_DIRECTORIES( + ${CMAKE_SOURCE_DIR}/regex ${SSL_INCLUDE_DIRS} ${CMAKE_BINARY_DIR}/sql + ${CMAKE_BINARY_DIR}/include + ${CMAKE_BINARY_DIR} - ${LZ4_INCLUDE_DIR} ) + SET(CONF_SOURCES
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202107271620.16RGKmtd039295>