aboutsummaryrefslogtreecommitdiffstats
path: root/databases
diff options
context:
space:
mode:
authormmokhi <mmokhi@FreeBSD.org>2018-01-18 06:35:49 +0800
committermmokhi <mmokhi@FreeBSD.org>2018-01-18 06:35:49 +0800
commit2645d7e44e4bf28cc9793b825a1640c07a2edf50 (patch)
treeb277d863e2f9ae710a704fe4c226c1d715d341f3 /databases
parent88fdfc382aa277dee7bbe43cd3b14f2ad6f916a0 (diff)
downloadfreebsd-ports-gnome-2645d7e44e4bf28cc9793b825a1640c07a2edf50.tar.gz
freebsd-ports-gnome-2645d7e44e4bf28cc9793b825a1640c07a2edf50.tar.zst
freebsd-ports-gnome-2645d7e44e4bf28cc9793b825a1640c07a2edf50.zip
databases/mysql56-{client, server}: Update to 5.6.39
This update fixes bugs like CVE-2018-2696, CVE-2018-2562, and CVE-2018-2583 in MySQL protocol by upstream PR: 225240 Sponsored by: Netzkommune GmbH
Diffstat (limited to 'databases')
-rw-r--r--databases/mysql56-client/files/patch-client_CMakeLists.txt2
-rw-r--r--databases/mysql56-server/Makefile3
-rw-r--r--databases/mysql56-server/distinfo6
-rw-r--r--databases/mysql56-server/files/patch-client_CMakeLists.txt2
4 files changed, 6 insertions, 7 deletions
diff --git a/databases/mysql56-client/files/patch-client_CMakeLists.txt b/databases/mysql56-client/files/patch-client_CMakeLists.txt
index 05e5d327f7c5..f9abf51f399c 100644
--- a/databases/mysql56-client/files/patch-client_CMakeLists.txt
+++ b/databases/mysql56-client/files/patch-client_CMakeLists.txt
@@ -8,9 +8,9 @@
MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)
SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")
TARGET_LINK_LIBRARIES(mysqltest mysqlclient regex)
+ ADD_DEPENDENCIES(mysqltest GenError)
+ENDIF()
-
MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)
@@ -52,15 +54,19 @@ MYSQL_ADD_EXECUTABLE(mysqlimport mysqlim
SET_SOURCE_FILES_PROPERTIES(mysqlimport.c PROPERTIES COMPILE_FLAGS "-DTHREADS")
diff --git a/databases/mysql56-server/Makefile b/databases/mysql56-server/Makefile
index b97d26000950..adddd6660c5f 100644
--- a/databases/mysql56-server/Makefile
+++ b/databases/mysql56-server/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME?= mysql
-PORTVERSION= 5.6.38
-PORTREVISION= 1
+PORTVERSION= 5.6.39
CATEGORIES= databases ipv6
MASTER_SITES= MYSQL/MySQL-5.6
PKGNAMESUFFIX?= 56-server
diff --git a/databases/mysql56-server/distinfo b/databases/mysql56-server/distinfo
index 3fe2fed3501c..ca36eb178e5e 100644
--- a/databases/mysql56-server/distinfo
+++ b/databases/mysql56-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1508414750
-SHA256 (mysql-5.6.38.tar.gz) = 18f249752f6c64af6e39c5b99c89ee1c86d6eb7fac853707603453cf584c54f3
-SIZE (mysql-5.6.38.tar.gz) = 32197625
+TIMESTAMP = 1516106681
+SHA256 (mysql-5.6.39.tar.gz) = ab1814b03af77bf88dc381eff558ed2e73e19e8e5a4170a78ba3370cd5da434d
+SIZE (mysql-5.6.39.tar.gz) = 32110958
diff --git a/databases/mysql56-server/files/patch-client_CMakeLists.txt b/databases/mysql56-server/files/patch-client_CMakeLists.txt
index 3acc651e0544..1714bbfadb6a 100644
--- a/databases/mysql56-server/files/patch-client_CMakeLists.txt
+++ b/databases/mysql56-server/files/patch-client_CMakeLists.txt
@@ -15,7 +15,7 @@
MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)
SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")
TARGET_LINK_LIBRARIES(mysqltest mysqlclient regex)
-
+ ADD_DEPENDENCIES(mysqltest GenError)
+IF(FALSE)
MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)