diff options
| author | Mahdi Mokhtari <mmokhi@FreeBSD.org> | 2018-05-07 00:03:04 +0800 |
|---|---|---|
| committer | Mahdi Mokhtari <mmokhi@FreeBSD.org> | 2018-05-07 00:03:04 +0800 |
| commit | c4a319df181d0d5691d83ce3c0474eeacac33e40 (patch) | |
| tree | 706caf984ba5fb5b09e645fba7390fbfb129dd64 | |
| parent | 9cc74080176f3f2bde1396f04d83562b295843e9 (diff) | |
| download | freebsd-ports-c4a319df181d0d5691d83ce3c0474eeacac33e40.tar.gz freebsd-ports-c4a319df181d0d5691d83ce3c0474eeacac33e40.tar.zst freebsd-ports-c4a319df181d0d5691d83ce3c0474eeacac33e40.zip | |
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@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@saltant.com>
Sponsored by: Netzkommune GmbH
Approved by: ports-secteam (feld)
Notes
Notes:
svn path=/branches/2018Q2/; revision=469236
| -rw-r--r-- | databases/mysql57-client/Makefile | 1 | ||||
| -rw-r--r-- | databases/mysql57-client/files/patch-libmysql_authentication__ldap_CMakeLists.txt | 11 | ||||
| -rw-r--r-- | databases/mysql57-server/Makefile | 4 | ||||
| -rw-r--r-- | databases/mysql57-server/distinfo | 6 | ||||
| -rw-r--r-- | databases/mysql57-server/pkg-plist | 1 |
5 files changed, 17 insertions, 6 deletions
diff --git a/databases/mysql57-client/Makefile b/databases/mysql57-client/Makefile index 0a428e846560..75a0e5c3557e 100644 --- a/databases/mysql57-client/Makefile +++ b/databases/mysql57-client/Makefile @@ -2,6 +2,7 @@ # $FreeBSD$ PORTNAME= mysql +PORTREVISION= 1 PKGNAMESUFFIX= 57-client COMMENT= Multithreaded SQL database (client) diff --git a/databases/mysql57-client/files/patch-libmysql_authentication__ldap_CMakeLists.txt b/databases/mysql57-client/files/patch-libmysql_authentication__ldap_CMakeLists.txt new file mode 100644 index 000000000000..843885b37cc7 --- /dev/null +++ b/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 () diff --git a/databases/mysql57-server/Makefile b/databases/mysql57-server/Makefile index a9399568005a..8db374b46130 100644 --- a/databases/mysql57-server/Makefile +++ b/databases/mysql57-server/Makefile @@ -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 diff --git a/databases/mysql57-server/distinfo b/databases/mysql57-server/distinfo index 4843e9965c47..9f3540d6b8b4 100644 --- a/databases/mysql57-server/distinfo +++ b/databases/mysql57-server/distinfo @@ -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 diff --git a/databases/mysql57-server/pkg-plist b/databases/mysql57-server/pkg-plist index 0956b4f3af3d..a28f18d82a42 100644 --- a/databases/mysql57-server/pkg-plist +++ b/databases/mysql57-server/pkg-plist @@ -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 |