Attachment #166705 for bug #206998

View | Details | Raw Unified | Return to bug 206998 | Differences between

and this patch

Lines 2-9 Link Here

(-)mysql57-server/Makefile (-2 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= mysql	4	PORTNAME= mysql
5	PORTVERSION= 5.7.10	5	PORTVERSION= 5.7.11
6	PORTREVISION?= 3
7	CATEGORIES= databases ipv6	6	CATEGORIES= databases ipv6
8	MASTER_SITES= MYSQL/MySQL-5.7:MySQL SF/boost/boost/1.59.0:boost	7	MASTER_SITES= MYSQL/MySQL-5.7:MySQL SF/boost/boost/1.59.0:boost
9	PKGNAMESUFFIX?= 57-server	8	PKGNAMESUFFIX?= 57-server

Lines 1-4 Link Here

(-)mysql57-server/distinfo (-2 / +2 lines)
1	SHA256 (mysql-5.7.10.tar.gz) = 1ea1644884d086a23eafd8ccb04d517fbd43da3a6a06036f23c5c3a111e25c74	1	SHA256 (mysql-5.7.11.tar.gz) = 54f8c7af87d3d8084419bde2b9f0d8970b3dada0757b015981b02f35a3681f0e
2	SIZE (mysql-5.7.10.tar.gz) = 48919371	2	SIZE (mysql-5.7.11.tar.gz) = 49195786
3	SHA256 (boost_1_59_0.tar.gz) = 47f11c8844e579d02691a607fbd32540104a9ac7a2534a8ddaef50daf502baac	3	SHA256 (boost_1_59_0.tar.gz) = 47f11c8844e579d02691a607fbd32540104a9ac7a2534a8ddaef50daf502baac
4	SIZE (boost_1_59_0.tar.gz) = 83709983	4	SIZE (boost_1_59_0.tar.gz) = 83709983




--- CMakeLists.txt.orig	2016-02-01 23:31:58 UTC
+++ CMakeLists.txt
@@ -587,12 +587,10 @@ IF(UNIX)
 ENDIF()
 
 IF(NOT WITHOUT_SERVER)

   ENDIF(WITH_EMBEDDED_SERVER)
 ENDIF()
 
@@ -601,8 +599,6 @@ ENDIF()
 ADD_SUBDIRECTORY(scripts)
 
 IF(NOT WITHOUT_SERVER)

   ADD_SUBDIRECTORY(support-files)
   IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)
     ADD_SUBDIRECTORY(internal)
@@ -661,6 +657,7 @@ ENDIF()
 #
 # RPM installs documentation directly from the source tree
 #

 IF(NOT INSTALL_LAYOUT MATCHES "RPM")
   INSTALL(FILES COPYING LICENSE.mysql 
   DESTINATION ${INSTALL_DOCREADMEDIR} 
@@ -683,6 +680,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
     PATTERN "sp-imp-spec.txt" EXCLUDE
   )
 ENDIF()




--- client/CMakeLists.txt.orig	2016-02-01 23:31:58 UTC
+++ client/CMakeLists.txt
@@ -32,8 +32,6 @@ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compil
 
 ## Subdirectory with common client code.
 ADD_SUBDIRECTORY(base)

 
 ## 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(FALSE)

 
 IF(NOT WITHOUT_SERVER)
   MYSQL_ADD_EXECUTABLE(mysql_upgrade
@@ -65,6 +65,7 @@ TARGET_LINK_LIBRARIES(mysqltest mysqlcli
 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)
 
@@ -77,10 +78,12 @@ TARGET_LINK_LIBRARIES(mysqlimport mysqlc
 
 MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
 TARGET_LINK_LIBRARIES(mysqlshow mysqlclient)

 MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
 ADD_COMPILE_FLAGS(
   mysqlbinlog.cc
@@ -97,6 +100,7 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlcli
 
 MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc)
 TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient)

 
 MYSQL_ADD_EXECUTABLE(mysql_secure_installation mysql_secure_installation.cc)
 TARGET_LINK_LIBRARIES(mysql_secure_installation mysqlclient)
@@ -112,9 +116,11 @@ IF(UNIX AND NOT WITHOUT_SERVER)
   ADD_DEPENDENCIES(mysql_install_db GenBootstrapPriv GenSysSchema)
 ENDIF()
 

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




--- include/CMakeLists.txt.orig	2016-02-01 23:31:58 UTC
+++ include/CMakeLists.txt
@@ -69,6 +69,7 @@ SET(HEADERS 
   ${HEADERS_GEN_CONFIGURE}
 )
 
+IF(FALSE) 
 INSTALL(FILES
   ../libbinlogevents/export/binary_log_types.h
   DESTINATION ${INSTALL_INCLUDEDIR}
@@ -78,5 +79,6 @@ INSTALL(DIRECTORY mysql/ DESTINATION ${I
  PATTERN "*.h"
  PATTERN "psi_abi*" EXCLUDE
 )

Lines 25-30 Link Here

(-)mysql57-server/pkg-plist (+1 lines)
25	lib/mysql/plugin/auth_test_plugin.so	25	lib/mysql/plugin/auth_test_plugin.so
26	lib/mysql/plugin/daemon_example.ini	26	lib/mysql/plugin/daemon_example.ini
27	%%NO_EXAMPLE%%lib/mysql/plugin/ha_example.so	27	%%NO_EXAMPLE%%lib/mysql/plugin/ha_example.so
		28	lib/mysql/plugin/keyring_file.so
28	lib/mysql/plugin/libdaemon_example.so	29	lib/mysql/plugin/libdaemon_example.so
29	lib/mysql/plugin/libtest_framework.so	30	lib/mysql/plugin/libtest_framework.so
30	lib/mysql/plugin/libtest_services.so	31	lib/mysql/plugin/libtest_services.so

Return to bug 206998

Lines 53-58 Link Here

(-)mysql57-client/pkg-plist (+4 lines)
53	include/mysql/mysql/plugin_ftparser.h	53	include/mysql/mysql/plugin_ftparser.h
54	include/mysql/mysql/plugin_ftparser.h.pp	54	include/mysql/mysql/plugin_ftparser.h.pp
55	include/mysql/mysql/plugin_group_replication.h	55	include/mysql/mysql/plugin_group_replication.h
		56	include/mysql/mysql/plugin_keyring.h
		57	include/mysql/mysql/plugin_keyring.h.pp
56	include/mysql/mysql/plugin_trace.h	58	include/mysql/mysql/plugin_trace.h
57	include/mysql/mysql/plugin_validate_password.h	59	include/mysql/mysql/plugin_validate_password.h
58	include/mysql/mysql/psi/mysql_file.h	60	include/mysql/mysql/psi/mysql_file.h
Lines 75-80 Link Here
75	include/mysql/mysql/service_my_plugin_log.h	77	include/mysql/mysql/service_my_plugin_log.h
76	include/mysql/mysql/service_my_snprintf.h	78	include/mysql/mysql/service_my_snprintf.h
77	include/mysql/mysql/service_mysql_alloc.h	79	include/mysql/mysql/service_mysql_alloc.h
		80	include/mysql/mysql/service_mysql_keyring.h
78	include/mysql/mysql/service_mysql_password_policy.h	81	include/mysql/mysql/service_mysql_password_policy.h
79	include/mysql/mysql/service_mysql_string.h	82	include/mysql/mysql/service_mysql_string.h
80	include/mysql/mysql/service_parser.h	83	include/mysql/mysql/service_parser.h
Lines 103-108 Link Here
103	include/mysql/plugin_audit.h	106	include/mysql/plugin_audit.h
104	include/mysql/plugin_ftparser.h	107	include/mysql/plugin_ftparser.h
105	include/mysql/plugin_group_replication.h	108	include/mysql/plugin_group_replication.h
		109	include/mysql/plugin_keyring.h
106	include/mysql/plugin_validate_password.h	110	include/mysql/plugin_validate_password.h
107	include/mysql/sql_common.h	111	include/mysql/sql_common.h
108	include/mysql/sql_state.h	112	include/mysql/sql_state.h

Lines 1-6 Link Here

(-)mysql57-server/files/patch-CMakeLists.txt (-5 / +5 lines)
1	--- CMakeLists.txt.orig 2015-11-29 19:16:24 UTC	1	--- CMakeLists.txt.orig 2016-02-01 23:31:58 UTC
2	+++ CMakeLists.txt	2	+++ CMakeLists.txt
3	@@ -577,12 +577,10 @@ IF(UNIX)	3	@@ -587,12 +587,10 @@ IF(UNIX)
4	ENDIF()	4	ENDIF()
5		5
6	IF(NOT WITHOUT_SERVER)	6	IF(NOT WITHOUT_SERVER)
Lines 13-19 Link Here
13	ENDIF(WITH_EMBEDDED_SERVER)	13	ENDIF(WITH_EMBEDDED_SERVER)
14	ENDIF()	14	ENDIF()
15		15
16	@@ -591,8 +589,6 @@ ENDIF()	16	@@ -601,8 +599,6 @@ ENDIF()
17	ADD_SUBDIRECTORY(scripts)	17	ADD_SUBDIRECTORY(scripts)
18		18
19	IF(NOT WITHOUT_SERVER)	19	IF(NOT WITHOUT_SERVER)
Lines 22-28 Link Here
22	ADD_SUBDIRECTORY(support-files)	22	ADD_SUBDIRECTORY(support-files)
23	IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)	23	IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)
24	ADD_SUBDIRECTORY(internal)	24	ADD_SUBDIRECTORY(internal)
25	@@ -647,6 +643,7 @@ ENDIF()	25	@@ -661,6 +657,7 @@ ENDIF()
26	#	26	#
27	# RPM installs documentation directly from the source tree	27	# RPM installs documentation directly from the source tree
28	#	28	#
Lines 30-36 Link Here
30	IF(NOT INSTALL_LAYOUT MATCHES "RPM")	30	IF(NOT INSTALL_LAYOUT MATCHES "RPM")
31	INSTALL(FILES COPYING LICENSE.mysql	31	INSTALL(FILES COPYING LICENSE.mysql
32	DESTINATION ${INSTALL_DOCREADMEDIR}	32	DESTINATION ${INSTALL_DOCREADMEDIR}
33	@@ -673,6 +670,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")	33	@@ -683,6 +680,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
34	PATTERN "sp-imp-spec.txt" EXCLUDE	34	PATTERN "sp-imp-spec.txt" EXCLUDE
35	)	35	)
36	ENDIF()	36	ENDIF()

Lines 1-6 Link Here

(-)mysql57-server/files/patch-client_CMakeLists.txt (-9 / +9 lines)
1	--- client/CMakeLists.txt.orig 2015-11-29 19:16:24 UTC	1	--- client/CMakeLists.txt.orig 2016-02-01 23:31:58 UTC
2	+++ client/CMakeLists.txt	2	+++ client/CMakeLists.txt
3	@@ -38,8 +38,6 @@ ADD_DEFINITIONS(	3	@@ -32,8 +32,6 @@ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compil
4		4
5	## Subdirectory with common client code.	5	## Subdirectory with common client code.
6	ADD_SUBDIRECTORY(base)	6	ADD_SUBDIRECTORY(base)
Lines 9-16 Link Here
9		9
10	## We will need libeay32.dll and ssleay32.dll when running client executables.	10	## We will need libeay32.dll and ssleay32.dll when running client executables.
11	COPY_OPENSSL_DLLS(copy_openssl_client)	11	COPY_OPENSSL_DLLS(copy_openssl_client)
12	@@ -115,11 +113,13 @@ IF(CMAKE_USE_PTHREADS_INIT AND CMAKE_C_F	12	@@ -41,11 +39,13 @@ COPY_OPENSSL_DLLS(copy_openssl_client)
13	ENDIF()	13	INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
14		14
15	ADD_DEFINITIONS(${SSL_DEFINES})	15	ADD_DEFINITIONS(${SSL_DEFINES})
16	+IF(FALSE)	16	+IF(FALSE)
Lines 23-29 Link Here
23		23
24	IF(NOT WITHOUT_SERVER)	24	IF(NOT WITHOUT_SERVER)
25	MYSQL_ADD_EXECUTABLE(mysql_upgrade	25	MYSQL_ADD_EXECUTABLE(mysql_upgrade
26	@@ -139,6 +139,7 @@ TARGET_LINK_LIBRARIES(mysqltest mysqlcli	26	@@ -65,6 +65,7 @@ TARGET_LINK_LIBRARIES(mysqltest mysqlcli
27	ADD_CONVENIENCE_LIBRARY(mysqlcheck_core check/mysqlcheck_core.cc)	27	ADD_CONVENIENCE_LIBRARY(mysqlcheck_core check/mysqlcheck_core.cc)
28	TARGET_LINK_LIBRARIES(mysqlcheck_core mysqlclient)	28	TARGET_LINK_LIBRARIES(mysqlcheck_core mysqlclient)
29		29
Lines 31-37 Link Here
31	MYSQL_ADD_EXECUTABLE(mysqlcheck check/mysqlcheck.cc)	31	MYSQL_ADD_EXECUTABLE(mysqlcheck check/mysqlcheck.cc)
32	TARGET_LINK_LIBRARIES(mysqlcheck mysqlcheck_core)	32	TARGET_LINK_LIBRARIES(mysqlcheck mysqlcheck_core)
33		33
34	@@ -151,10 +152,12 @@ TARGET_LINK_LIBRARIES(mysqlimport mysqlc	34	@@ -77,10 +78,12 @@ TARGET_LINK_LIBRARIES(mysqlimport mysqlc
35		35
36	MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)	36	MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
37	TARGET_LINK_LIBRARIES(mysqlshow mysqlclient)	37	TARGET_LINK_LIBRARIES(mysqlshow mysqlclient)
Lines 44-50 Link Here
44	MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)	44	MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
45	ADD_COMPILE_FLAGS(	45	ADD_COMPILE_FLAGS(
46	mysqlbinlog.cc	46	mysqlbinlog.cc
47	@@ -171,6 +174,7 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlcli	47	@@ -97,6 +100,7 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlcli
48		48
49	MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc)	49	MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc)
50	TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient)	50	TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient)
Lines 52-58 Link Here
52		52
53	MYSQL_ADD_EXECUTABLE(mysql_secure_installation mysql_secure_installation.cc)	53	MYSQL_ADD_EXECUTABLE(mysql_secure_installation mysql_secure_installation.cc)
54	TARGET_LINK_LIBRARIES(mysql_secure_installation mysqlclient)	54	TARGET_LINK_LIBRARIES(mysql_secure_installation mysqlclient)
55	@@ -186,9 +190,11 @@ IF(UNIX AND NOT WITHOUT_SERVER)	55	@@ -112,9 +116,11 @@ IF(UNIX AND NOT WITHOUT_SERVER)
56	ADD_DEPENDENCIES(mysql_install_db GenBootstrapPriv GenSysSchema)	56	ADD_DEPENDENCIES(mysql_install_db GenBootstrapPriv GenSysSchema)
57	ENDIF()	57	ENDIF()
58		58
Lines 64-70 Link Here
64		64
65	# "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/".	65	# "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/".
66	IF(WIN32)	66	IF(WIN32)
67	@@ -197,11 +203,6 @@ ENDIF(WIN32)	67	@@ -123,11 +129,6 @@ ENDIF(WIN32)
68		68
69	SET_TARGET_PROPERTIES (	69	SET_TARGET_PROPERTIES (
70	mysql_plugin	70	mysql_plugin

Lines 1-12 Link Here

(-)mysql57-server/files/patch-include_CMakeLists.txt (-6 / +8 lines)
1	--- include/CMakeLists.txt.orig 2015-11-29 19:16:24 UTC	1	--- include/CMakeLists.txt.orig 2016-02-01 23:31:58 UTC
2	+++ include/CMakeLists.txt	2	+++ include/CMakeLists.txt
3	@@ -69,10 +69,12 @@ SET(HEADERS	3	@@ -69,6 +69,7 @@ SET(HEADERS
		4	${HEADERS_GEN_CONFIGURE}
4	)	5	)
5		6
6	+IF(FALSE)	7	+IF(FALSE)
7	INSTALL(FILES ../libbinlogevents/export/binary_log_types.h DESTINATION ${INSTALL_INCLUDEDIR})	8	INSTALL(FILES
8	INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development)	9	../libbinlogevents/export/binary_log_types.h
9	INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR}/mysql COMPONENT Development	10	DESTINATION ${INSTALL_INCLUDEDIR}
		11	@@ -78,5 +79,6 @@ INSTALL(DIRECTORY mysql/ DESTINATION ${I
10	PATTERN "*.h"	12	PATTERN "*.h"
11	PATTERN "psi_abi*" EXCLUDE	13	PATTERN "psi_abi*" EXCLUDE
12	)	14	)