svn commit: r469236 - in branches/2018Q2/databases: mysql57-client mysql57-client/files mysql57-server
Mahdi Mokhtari
mmokhi at FreeBSD.org
Sun May 6 16:03:05 UTC 2018
Author: mmokhi
Date: Sun May 6 16:03:04 2018
New Revision: 469236
URL: https://svnweb.freebsd.org/changeset/ports/469236
Log:
MFH: r467819 r468035
mysql57-{client, server}: Update port to 5.7.22
This update includes fixes for multiple CVEs including:
CVE-2018-2755 in replication component, MySQL protocol
CVE-2018-2805 in GIS extention
CVE-2018-2782 in InnoDB
and more info on http://www.oracle.com/technetwork/security-advisory/cpuapr2018-3678067.html#AppendixMSQL
PR: 227621
Reported by: Markus Kohlmeyer <rootservice at gmail.com>
Sponsored by: Netzkommune GmbH
databases/mysql57-client: Fix build with 10.x default compiler/linker
The upstream seems merged our local-patches but
added a -R flag to its `c++` [actually ld] command.
The -R $DIR is like -rpath on 11.x and CURRENT bases but not on 10.x
We then use -rpath to make sure it works on all supported bases.
Reported by: John W. O'Brien <john at saltant.com>
Sponsored by: Netzkommune GmbH
Approved by: ports-secteam (feld)
Added:
branches/2018Q2/databases/mysql57-client/files/patch-libmysql_authentication__ldap_CMakeLists.txt
- copied unchanged from r468035, head/databases/mysql57-client/files/patch-libmysql_authentication__ldap_CMakeLists.txt
Modified:
branches/2018Q2/databases/mysql57-client/Makefile
branches/2018Q2/databases/mysql57-server/Makefile
branches/2018Q2/databases/mysql57-server/distinfo
branches/2018Q2/databases/mysql57-server/pkg-plist
Directory Properties:
branches/2018Q2/ (props changed)
Modified: branches/2018Q2/databases/mysql57-client/Makefile
==============================================================================
--- branches/2018Q2/databases/mysql57-client/Makefile Sun May 6 16:00:01 2018 (r469235)
+++ branches/2018Q2/databases/mysql57-client/Makefile Sun May 6 16:03:04 2018 (r469236)
@@ -2,6 +2,7 @@
# $FreeBSD$
PORTNAME= mysql
+PORTREVISION= 1
PKGNAMESUFFIX= 57-client
COMMENT= Multithreaded SQL database (client)
Copied: branches/2018Q2/databases/mysql57-client/files/patch-libmysql_authentication__ldap_CMakeLists.txt (from r468035, head/databases/mysql57-client/files/patch-libmysql_authentication__ldap_CMakeLists.txt)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2018Q2/databases/mysql57-client/files/patch-libmysql_authentication__ldap_CMakeLists.txt Sun May 6 16:03:04 2018 (r469236, copy of r468035, head/databases/mysql57-client/files/patch-libmysql_authentication__ldap_CMakeLists.txt)
@@ -0,0 +1,11 @@
+--- libmysql/authentication_ldap/CMakeLists.txt.orig 2018-03-04 13:40:40 UTC
++++ libmysql/authentication_ldap/CMakeLists.txt
+@@ -54,7 +54,7 @@ ENDIF()
+ IF (CMAKE_SYSTEM_NAME MATCHES "SunOS")
+ SET(SASL_LIBRARY "sasl")
+ ELSEIF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
+- SET(SASL_LIBRARY "-L/usr/local/lib -R/usr/local/lib -lsasl2")
++ SET(SASL_LIBRARY "-L/usr/local/lib -rpath /usr/local/lib -lsasl2")
+ ELSE()
+ SET(SASL_LIBRARY "sasl2")
+ ENDIF ()
Modified: branches/2018Q2/databases/mysql57-server/Makefile
==============================================================================
--- branches/2018Q2/databases/mysql57-server/Makefile Sun May 6 16:00:01 2018 (r469235)
+++ branches/2018Q2/databases/mysql57-server/Makefile Sun May 6 16:03:04 2018 (r469236)
@@ -2,8 +2,8 @@
# $FreeBSD$
PORTNAME?= mysql
-PORTVERSION= 5.7.21
-PORTREVISION?= 1
+PORTVERSION= 5.7.22
+PORTREVISION?= 0
CATEGORIES= databases ipv6
MASTER_SITES= MYSQL/MySQL-5.7
PKGNAMESUFFIX?= 57-server
Modified: branches/2018Q2/databases/mysql57-server/distinfo
==============================================================================
--- branches/2018Q2/databases/mysql57-server/distinfo Sun May 6 16:00:01 2018 (r469235)
+++ branches/2018Q2/databases/mysql57-server/distinfo Sun May 6 16:03:04 2018 (r469236)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1516137476
-SHA256 (mysql-boost-5.7.21.tar.gz) = ad29ecb6fb3c3571394fe231633a2d1d188d49e9eb749daa4e8799b7630daa09
-SIZE (mysql-boost-5.7.21.tar.gz) = 48931457
+TIMESTAMP = 1524221054
+SHA256 (mysql-boost-5.7.22.tar.gz) = 5b2a61700af7c99f5630a7dfdb099af9283c3029843cddd9e123bcdbcc4aad03
+SIZE (mysql-boost-5.7.22.tar.gz) = 48985783
Modified: branches/2018Q2/databases/mysql57-server/pkg-plist
==============================================================================
--- branches/2018Q2/databases/mysql57-server/pkg-plist Sun May 6 16:00:01 2018 (r469235)
+++ branches/2018Q2/databases/mysql57-server/pkg-plist Sun May 6 16:03:04 2018 (r469236)
@@ -85,7 +85,6 @@ man/man1/mysqld_multi.1.gz
man/man1/mysqld_safe.1.gz
man/man1/mysqldumpslow.1.gz
man/man1/mysqlman.1.gz
-man/man1/mysqltest.1.gz
man/man1/perror.1.gz
man/man1/replace.1.gz
man/man1/resolve_stack_dump.1.gz
More information about the svn-ports-all
mailing list