Attachment #209389 for bug #241920

View | Details | Raw Unified | Return to bug 241920
Collapse All | Expand All

Lines 2-8 Link Here

(-)Makefile (-1 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME?= mysql	4	PORTNAME?= mysql
5	PORTVERSION= 5.7.27	5	PORTVERSION= 5.7.28
6	PORTREVISION?= 0	6	PORTREVISION?= 0
7	CATEGORIES= databases	7	CATEGORIES= databases
8	MASTER_SITES= MYSQL/MySQL-5.7	8	MASTER_SITES= MYSQL/MySQL-5.7

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1565043969	1	TIMESTAMP = 1574613665
2	SHA256 (mysql-boost-5.7.27.tar.gz) = 036ab46a8a1216cfc1e87374bd1cba12e2208c02cf328a31851be7e1c7f57a2b	2	SHA256 (mysql-boost-5.7.28.tar.gz) = f16399315212117c08f9bdf8a0d682728b2ce82d691bcfbf25a770f413b6f2da
3	SIZE (mysql-boost-5.7.27.tar.gz) = 51436383	3	SIZE (mysql-boost-5.7.28.tar.gz) = 51409668




--- client/CMakeLists.txt.orig	2019-09-27 09:00:15.000000000 +0200
+++ client/CMakeLists.txt	2019-11-24 17:42:52.649644000 +0100
@@ -38,17 +38,17 @@
 
 ## Subdirectory with common client code.
 ADD_SUBDIRECTORY(base)

-## Subdirectory for mysqlpump code.
-ADD_SUBDIRECTORY(dump)
 
 ## We will need libeay32.dll and ssleay32.dll when running client executables.
 COPY_OPENSSL_DLLS(copy_openssl_client)
@@ -41,11 +39,13 @@ COPY_OPENSSL_DLLS(copy_openssl_client)
 INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
 
 ADD_DEFINITIONS(${SSL_DEFINES})

 
 IF(NOT WITHOUT_SERVER)
   MYSQL_ADD_EXECUTABLE(mysql_upgrade
@@ -69,6 +69,7 @@
 ADD_CONVENIENCE_LIBRARY(mysqlcheck_core check/mysqlcheck_core.cc)
 TARGET_LINK_LIBRARIES(mysqlcheck_core mysqlclient)
 

 MYSQL_ADD_EXECUTABLE(mysqlcheck check/mysqlcheck.cc)
 TARGET_LINK_LIBRARIES(mysqlcheck mysqlcheck_core)
 
@@ -81,10 +82,12 @@
 
 MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
 TARGET_LINK_LIBRARIES(mysqlshow mysqlclient)

 MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
 ADD_COMPILE_FLAGS(
   mysqlbinlog.cc
@@ -101,6 +104,7 @@
 
 MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc)
 TARGET_LINK_LIBRARIES(mysql_config_editor ${FORCE_SSL_SOLARIS} mysqlclient)
+ENDIF()
 
 MYSQL_ADD_EXECUTABLE(mysql_secure_installation mysql_secure_installation.cc)
 TARGET_LINK_LIBRARIES(mysql_secure_installation mysqlclient)
@@ -116,9 +120,11 @@
   ADD_DEPENDENCIES(mysql_install_db GenBootstrapPriv GenSysSchema)
 ENDIF()
 

 
 # "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/".
 IF(WIN32)
@@ -127,11 +133,6 @@
 
 SET_TARGET_PROPERTIES (
   mysql_plugin




--- libmysql/CMakeLists.txt.orig	2019-09-27 09:00:15.000000000 +0200
+++ libmysql/CMakeLists.txt	2019-11-24 17:45:54.008082000 +0100
@@ -266,7 +266,7 @@
 ADD_SUBDIRECTORY(authentication_ldap)
   
 # Merge several convenience libraries into one big mysqlclient
-MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS_TO_MERGE} COMPONENT Development)
+MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS_TO_MERGE} COMPONENT Development SKIP_INSTALL)
 TARGET_LINK_LIBRARIES(mysqlclient ${LIBS_TO_LINK})
 
 # Visual Studio users need debug  static library for debug projects
@@ -312,8 +312,9 @@
@@ -257,7 +257,8 @@ IF(NOT DISABLE_SHARED)
   # and link them together into shared library.
   MERGE_LIBRARIES_SHARED(libmysql ${LIBS_TO_MERGE}
     EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_FUNCTIONS_UNDOCUMENTED}
-    COMPONENT SharedLibraries)
+    COMPONENT SharedLibraries SKIP_INSTALL)
   TARGET_LINK_LIBRARIES(libmysql ${LIBS_TO_LINK})
+IF(FALSE)
   IF(UNIX)
     # libtool compatability
     IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)
@@ -369,6 +370,7 @@
 # to initialize api_calls[] array in api_test.c
 #
 SET(CLIENT_API_FUNCTION_LIST "")

Lines 1-9 Link Here

(-)files/patch-sql_mysqld.cc (-4 / +4 lines)
1	--- sql/mysqld.cc.orig 2018-06-08 11:56:29.000000000 +0200	1	--- sql/mysqld.cc.orig 2019-09-27 09:00:15.000000000 +0200
2	+++ sql/mysqld.cc 2018-08-11 13:38:48.782595000 +0200	2	+++ sql/mysqld.cc 2019-11-24 17:47:52.395539000 +0100
3	@@ -3408,7 +3408,7 @@	3	@@ -3419,7 +3419,7 @@
		4	static int init_ssl()
4	{	5	{
5	#ifdef HAVE_OPENSSL	6	#ifdef HAVE_OPENSSL
6	#ifndef HAVE_YASSL
7	-#if OPENSSL_VERSION_NUMBER < 0x10100000L	7	-#if OPENSSL_VERSION_NUMBER < 0x10100000L
8	+#if OPENSSL_VERSION_NUMBER < 0x10100000L \|\| defined(LIBRESSL_VERSION_NUMBER)	8	+#if OPENSSL_VERSION_NUMBER < 0x10100000L \|\| defined(LIBRESSL_VERSION_NUMBER)
9	CRYPTO_malloc_init();	9	CRYPTO_malloc_init();

Return to bug 241920

Lines 1-6 Link Here

(-)files/patch-client_CMakeLists.txt (-12 / +9 lines)
1	--- client/CMakeLists.txt.orig 2016-03-28 18:06:12 UTC	1	--- client/CMakeLists.txt.orig 2019-09-27 09:00:15.000000000 +0200
2	+++ client/CMakeLists.txt	2	+++ client/CMakeLists.txt 2019-11-24 17:42:52.649644000 +0100
3	@@ -32,8 +32,6 @@ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compil	3	@@ -38,17 +38,17 @@
4		4
5	## Subdirectory with common client code.	5	## Subdirectory with common client code.
6	ADD_SUBDIRECTORY(base)	6	ADD_SUBDIRECTORY(base)
Lines 7-15 Link Here
7	-## Subdirectory for mysqlpump code.	7	-## Subdirectory for mysqlpump code.
8	-ADD_SUBDIRECTORY(dump)	8	-ADD_SUBDIRECTORY(dump)
9		9
10	## We will need libeay32.dll and ssleay32.dll when running client executables.
11	COPY_OPENSSL_DLLS(copy_openssl_client)
12	@@ -41,11 +39,13 @@ COPY_OPENSSL_DLLS(copy_openssl_client)
13	INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)	10	INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
14		11
15	ADD_DEFINITIONS(${SSL_DEFINES})	12	ADD_DEFINITIONS(${SSL_DEFINES})
Lines 23-29 Link Here
23		20
24	IF(NOT WITHOUT_SERVER)	21	IF(NOT WITHOUT_SERVER)
25	MYSQL_ADD_EXECUTABLE(mysql_upgrade	22	MYSQL_ADD_EXECUTABLE(mysql_upgrade
26	@@ -65,6 +65,7 @@ TARGET_LINK_LIBRARIES(mysqltest mysqlcli	23	@@ -69,6 +69,7 @@
27	ADD_CONVENIENCE_LIBRARY(mysqlcheck_core check/mysqlcheck_core.cc)	24	ADD_CONVENIENCE_LIBRARY(mysqlcheck_core check/mysqlcheck_core.cc)
28	TARGET_LINK_LIBRARIES(mysqlcheck_core mysqlclient)	25	TARGET_LINK_LIBRARIES(mysqlcheck_core mysqlclient)
29		26
Lines 31-37 Link Here
31	MYSQL_ADD_EXECUTABLE(mysqlcheck check/mysqlcheck.cc)	28	MYSQL_ADD_EXECUTABLE(mysqlcheck check/mysqlcheck.cc)
32	TARGET_LINK_LIBRARIES(mysqlcheck mysqlcheck_core)	29	TARGET_LINK_LIBRARIES(mysqlcheck mysqlcheck_core)
33		30
34	@@ -77,10 +78,12 @@ TARGET_LINK_LIBRARIES(mysqlimport mysqlc	31	@@ -81,10 +82,12 @@
35		32
36	MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)	33	MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
37	TARGET_LINK_LIBRARIES(mysqlshow mysqlclient)	34	TARGET_LINK_LIBRARIES(mysqlshow mysqlclient)
Lines 44-58 Link Here
44	MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)	41	MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
45	ADD_COMPILE_FLAGS(	42	ADD_COMPILE_FLAGS(
46	mysqlbinlog.cc	43	mysqlbinlog.cc
47	@@ -97,6 +100,7 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlcli	44	@@ -101,6 +104,7 @@
48		45
49	MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc)	46	MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc)
50	TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient)	47	TARGET_LINK_LIBRARIES(mysql_config_editor ${FORCE_SSL_SOLARIS} mysqlclient)
51	+ENDIF()	48	+ENDIF()
52		49
53	MYSQL_ADD_EXECUTABLE(mysql_secure_installation mysql_secure_installation.cc)	50	MYSQL_ADD_EXECUTABLE(mysql_secure_installation mysql_secure_installation.cc)
54	TARGET_LINK_LIBRARIES(mysql_secure_installation mysqlclient)	51	TARGET_LINK_LIBRARIES(mysql_secure_installation mysqlclient)
55	@@ -112,9 +116,11 @@ IF(UNIX AND NOT WITHOUT_SERVER)	52	@@ -116,9 +120,11 @@
56	ADD_DEPENDENCIES(mysql_install_db GenBootstrapPriv GenSysSchema)	53	ADD_DEPENDENCIES(mysql_install_db GenBootstrapPriv GenSysSchema)
57	ENDIF()	54	ENDIF()
58		55
Lines 64-70 Link Here
64		61
65	# "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/".	62	# "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/".
66	IF(WIN32)	63	IF(WIN32)
67	@@ -123,11 +129,6 @@ ENDIF(WIN32)	64	@@ -127,11 +133,6 @@
68		65
69	SET_TARGET_PROPERTIES (	66	SET_TARGET_PROPERTIES (
70	mysql_plugin	67	mysql_plugin

Lines 1-25 Link Here

(-)files/patch-libmysql_CMakeLists.txt (-10 / +11 lines)
1	--- libmysql/CMakeLists.txt.orig 2016-03-28 18:06:12 UTC	1	--- libmysql/CMakeLists.txt.orig 2019-09-27 09:00:15.000000000 +0200
2	+++ libmysql/CMakeLists.txt	2	+++ libmysql/CMakeLists.txt 2019-11-24 17:45:54.008082000 +0100
3	@@ -235,7 +235,7 @@ MESSAGE(STATUS	3	@@ -266,7 +266,7 @@
4	ADD_SUBDIRECTORY(authentication_ldap)	4	ADD_SUBDIRECTORY(authentication_ldap)
5		5
6	# Merge several convenience libraries into one big mysqlclient	6	# Merge several convenience libraries into one big mysqlclient
7	-MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS} COMPONENT Development)	7	-MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS_TO_MERGE} COMPONENT Development)
8	+MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS} COMPONENT Development SKIP_INSTALL)	8	+MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS_TO_MERGE} COMPONENT Development SKIP_INSTALL)
		9	TARGET_LINK_LIBRARIES(mysqlclient ${LIBS_TO_LINK})
9		10
10	# Visual Studio users need debug static library for debug projects	11	# Visual Studio users need debug static library for debug projects
11	IF(MSVC)	12	@@ -312,8 +312,9 @@
12	@@ -257,7 +257,8 @@ IF(NOT DISABLE_SHARED)
13	# and link them together into shared library.	13	# and link them together into shared library.
14	MERGE_LIBRARIES(libmysql SHARED ${LIBS}	14	MERGE_LIBRARIES_SHARED(libmysql ${LIBS_TO_MERGE}
15	EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_FUNCTIONS_UNDOCUMENTED}	15	EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_FUNCTIONS_UNDOCUMENTED}
16	- COMPONENT SharedLibraries)	16	- COMPONENT SharedLibraries)
17	+ COMPONENT SharedLibraries SKIP_INSTALL)	17	+ COMPONENT SharedLibraries SKIP_INSTALL)
		18	TARGET_LINK_LIBRARIES(libmysql ${LIBS_TO_LINK})
18	+IF(FALSE)	19	+IF(FALSE)
19	IF(UNIX)	20	IF(UNIX)
20	# libtool compatability	21	# libtool compatability
21	IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)	22	IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)
22	@@ -313,6 +314,7 @@ ENDIF()	23	@@ -369,6 +370,7 @@
23	# to initialize api_calls[] array in api_test.c	24	# to initialize api_calls[] array in api_test.c
24	#	25	#
25	SET(CLIENT_API_FUNCTION_LIST "")	26	SET(CLIENT_API_FUNCTION_LIST "")