Attachment #209052 for bug #241877

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

Lines 2-8 Link Here

(-)Makefile (-1 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME?= mariadb	4	PORTNAME?= mariadb
5	PORTVERSION= 10.3.17	5	PORTVERSION= 10.3.20
6	PORTREVISION?= 0	6	PORTREVISION?= 0
7	CATEGORIES= databases	7	CATEGORIES= databases
8	MASTER_SITES= http://mirrors.supportex.net/${SITESDIR}/ \	8	MASTER_SITES= http://mirrors.supportex.net/${SITESDIR}/ \

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1564591845	1	TIMESTAMP = 1573444587
2	SHA256 (mariadb-10.3.17.tar.gz) = 20a1ea4fc59aae89dcc82aff0d4907b036daf9bfbd252f08162399f055097097	2	SHA256 (mariadb-10.3.20.tar.gz) = 53818f2d684e060143b4d8293da44c7f09cc676d71959405f84e6dc8affbc492
3	SIZE (mariadb-10.3.17.tar.gz) = 71894997	3	SIZE (mariadb-10.3.20.tar.gz) = 71990355




--- CMakeLists.txt.orig	2019-11-06 16:01:56 UTC
+++ CMakeLists.txt
@@ -511,8 +511,10 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL
   WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
 )
 

 
 # MDEV-6526 these files are not installed anymore
 #INSTALL_DOCUMENTATION(${CMAKE_BINARY_DIR}/Docs/INFO_SRC
 #                      ${CMAKE_BINARY_DIR}/Docs/INFO_BIN)
 
-IF(UNIX)
+IF(FALSE)
   INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY Docs/README-wsrep COMPONENT Readme)
 ENDIF()
 




--- libmariadb/plugins/auth/CMakeLists.txt.orig	2019-11-11 05:31:43 UTC
+++ libmariadb/plugins/auth/CMakeLists.txt
@@ -75,6 +75,7 @@ IF(CRYPTO_PLUGIN)
                         ${CRYPT_SOURCE}
                 LIBRARIES ${CRYPT_LIBS})
 
+  IF(NOT WITHOUT_CLIENT)
   IF(WITH_SSL STREQUAL "GNUTLS" AND NOT WIN32)
     MESSAGE1(STATUS "sha256_password not supported by GnuTLS due to missing OAEP padding")
   ELSE()
@@ -85,6 +86,7 @@ IF(CRYPTO_PLUGIN)
                     SOURCES ${AUTH_DIR}/sha256_pw.c
                     LIBRARIES ${CRYPT_LIBS})
   ENDIF()
+  ENDIF()  
 ENDIF()
+ENDIF()
 
 #GSSAPI client authentication plugin
@@ -119,9 +121,11 @@ REGISTER_PLUGIN(TARGET mysql_old_password
                 DEFAULT STATIC
                 SOURCES ${AUTH_DIR}/old_password.c)
 
 
+IF(NOT WITHOUT_CLIENT)
 # Cleartext
 REGISTER_PLUGIN(TARGET mysql_clear_password

                 CONFIGURATIONS DYNAMIC STATIC OFF
                 DEFAULT DYNAMIC
                 SOURCES ${AUTH_DIR}/mariadb_cleartext.c)
-
+ENDIF()

Lines 1-6 Link Here

(-)files/patch-storage_rocksdb_build__rocksdb.cmake (-2 / +2 lines)
1	--- storage/rocksdb/build_rocksdb.cmake.orig 2018-10-02 09:45:43 UTC	1	--- storage/rocksdb/build_rocksdb.cmake.orig 2019-11-06 16:01:58 UTC
2	+++ storage/rocksdb/build_rocksdb.cmake	2	+++ storage/rocksdb/build_rocksdb.cmake
3	@@ -69,10 +69,6 @@ if(ZSTD_FOUND AND (NOT WITH_ROCKSDB_ZSTD	3	@@ -71,10 +71,6 @@ if(ZSTD_FOUND AND (NOT WITH_ROCKSDB_ZSTD STREQUAL "OFF
4	SET(CMAKE_REQUIRED_LIBRARIES zstd)	4	SET(CMAKE_REQUIRED_LIBRARIES zstd)
5	CHECK_FUNCTION_EXISTS(ZDICT_trainFromBuffer ZSTD_VALID)	5	CHECK_FUNCTION_EXISTS(ZDICT_trainFromBuffer ZSTD_VALID)
6	UNSET(CMAKE_REQUIRED_LIBRARIES)	6	UNSET(CMAKE_REQUIRED_LIBRARIES)




--- storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake.orig	2019-11-06 16:01:58 UTC

--- storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake.orig	2017-05-14 23:13:20 UTC
+++ storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake
@@ -1,5 +1,12 @@
 include(ExternalProject)
 endif ()
 
+IF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
+  include_directories("/usr/include")

 ## add lzma with an external project
 set(xz_configure_opts --with-pic --enable-static)
 if (APPLE)
@@ -71,8 +78,15 @@ add_library(lzma STATIC IMPORTED)
 set_target_properties(lzma PROPERTIES IMPORTED_LOCATION
   "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/xz/lib/liblzma.a")
 add_dependencies(lzma build_lzma)

 ## add snappy with an external project
 set(SNAPPY_SOURCE_DIR "${TokuDB_SOURCE_DIR}/third_party/snappy-1.1.2" CACHE FILEPATH "Where to find sources for snappy.")
 if (NOT EXISTS "${SNAPPY_SOURCE_DIR}/CMakeLists.txt")
@@ -109,3 +123,4 @@ add_library(snappy STATIC IMPORTED)
 set_target_properties(snappy PROPERTIES IMPORTED_LOCATION
   "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/snappy/lib/libsnappy.a")
 add_dependencies(snappy build_snappy)

Return to bug 241877

Lines 1-6 Link Here

(-)files/patch-CMakeLists.txt (-9 / +2 lines)
1	--- CMakeLists.txt.orig 2019-05-13 18:13:05 UTC	1	--- CMakeLists.txt.orig 2019-11-06 16:01:56 UTC
2	+++ CMakeLists.txt	2	+++ CMakeLists.txt
3	@@ -491,14 +491,16 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL	3	@@ -511,8 +511,10 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL
4	WORKING_DIRECTORY ${CMAKE_BINARY_DIR}	4	WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
5	)	5	)
6		6
Lines 11-20 Link Here
11		11
12	# MDEV-6526 these files are not installed anymore	12	# MDEV-6526 these files are not installed anymore
13	#INSTALL_DOCUMENTATION(${CMAKE_BINARY_DIR}/Docs/INFO_SRC	13	#INSTALL_DOCUMENTATION(${CMAKE_BINARY_DIR}/Docs/INFO_SRC
14	# ${CMAKE_BINARY_DIR}/Docs/INFO_BIN)
15
16	-IF(UNIX)
17	+IF(FALSE)
18	INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY Docs/README-wsrep COMPONENT Readme)
19	ENDIF()
20

Lines 1-25 Link Here

(-)files/patch-libmariadb_plugins_auth_CMakeLists.txt (-17 / +16 lines)
1	--- libmariadb/plugins/auth/CMakeLists.txt.orig 2018-05-23 20:38:41 UTC	1	--- libmariadb/plugins/auth/CMakeLists.txt.orig 2019-11-11 05:31:43 UTC
2	+++ libmariadb/plugins/auth/CMakeLists.txt	2	+++ libmariadb/plugins/auth/CMakeLists.txt
3	@@ -38,6 +38,7 @@ IF(GSSAPI_SOURCES)	3	@@ -75,6 +75,7 @@ IF(CRYPTO_PLUGIN)
4	LIBRARIES ${GSSAPI_LIBS})	4	${CRYPT_SOURCE}
5	ENDIF()	5	LIBRARIES ${CRYPT_LIBS})
6		6
7	+IF(NOT WITHOUT_CLIENT)	7	+ IF(NOT WITHOUT_CLIENT)
8	IF(${WITH_SSL} STREQUAL "OPENSSL" OR ${WITH_SSL} STREQUAL "SCHANNEL")	8	IF(WITH_SSL STREQUAL "GNUTLS" AND NOT WIN32)
9	IF(WIN32)	9	MESSAGE1(STATUS "sha256_password not supported by GnuTLS due to missing OAEP padding")
10	SET(SHA256_LIBS crypt32)	10	ELSE()
11	@@ -51,6 +52,7 @@ IF(${WITH_SSL} STREQUAL "OPENSSL" OR ${W	11	@@ -85,6 +86,7 @@ IF(CRYPTO_PLUGIN)
12	SOURCES ${AUTH_DIR}/sha256_pw.c	12	SOURCES ${AUTH_DIR}/sha256_pw.c
13	LIBRARIES ${SHA256_LIBS})	13	LIBRARIES ${CRYPT_LIBS})
		14	ENDIF()
		15	+ ENDIF()
14	ENDIF()	16	ENDIF()
15	+ENDIF()
16		17
17	# old_password plugin	18	#GSSAPI client authentication plugin
18	REGISTER_PLUGIN(TARGET mysql_old_password	19	@@ -119,9 +121,11 @@ REGISTER_PLUGIN(TARGET mysql_old_password
19	@@ -60,10 +62,11 @@ REGISTER_PLUGIN(TARGET mysql_old_passwor	20	DEFAULT STATIC
20	SOURCES ${AUTH_DIR}/old_password.c)	21	SOURCES ${AUTH_DIR}/old_password.c)
21		22
22
23	+IF(NOT WITHOUT_CLIENT)	23	+IF(NOT WITHOUT_CLIENT)
24	# Cleartext	24	# Cleartext
25	REGISTER_PLUGIN(TARGET mysql_clear_password	25	REGISTER_PLUGIN(TARGET mysql_clear_password
Lines 27-31 Link Here
27	CONFIGURATIONS DYNAMIC STATIC OFF	27	CONFIGURATIONS DYNAMIC STATIC OFF
28	DEFAULT DYNAMIC	28	DEFAULT DYNAMIC
29	SOURCES ${AUTH_DIR}/mariadb_cleartext.c)	29	SOURCES ${AUTH_DIR}/mariadb_cleartext.c)
30	-
31	+ENDIF()	30	+ENDIF()

Lines 1-10 Link Here

(-)files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuThirdParty.cmake (-8 / +5 lines)
1	Do NOT use bundled libs, use xz/lzma from base and archivers/snappy from ports	1	--- storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake.orig 2019-11-06 16:01:58 UTC
2
3	--- storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake.orig 2017-05-14 23:13:20 UTC
4	+++ storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake	2	+++ storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake
5	@@ -34,6 +34,13 @@ if (CMAKE_PROJECT_NAME STREQUAL TokuDB)	3	@@ -1,5 +1,12 @@
6	endif ()	4	include(ExternalProject)
7	endif ()
8		5
9	+IF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")	6	+IF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
10	+ include_directories("/usr/include")	7	+ include_directories("/usr/include")
Lines 16-22 Link Here
16	## add lzma with an external project	13	## add lzma with an external project
17	set(xz_configure_opts --with-pic --enable-static)	14	set(xz_configure_opts --with-pic --enable-static)
18	if (APPLE)	15	if (APPLE)
19	@@ -105,8 +112,15 @@ add_library(lzma STATIC IMPORTED)	16	@@ -71,8 +78,15 @@ add_library(lzma STATIC IMPORTED)
20	set_target_properties(lzma PROPERTIES IMPORTED_LOCATION	17	set_target_properties(lzma PROPERTIES IMPORTED_LOCATION
21	"${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/xz/lib/liblzma.a")	18	"${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/xz/lib/liblzma.a")
22	add_dependencies(lzma build_lzma)	19	add_dependencies(lzma build_lzma)
Lines 32-38 Link Here
32	## add snappy with an external project	29	## add snappy with an external project
33	set(SNAPPY_SOURCE_DIR "${TokuDB_SOURCE_DIR}/third_party/snappy-1.1.2" CACHE FILEPATH "Where to find sources for snappy.")	30	set(SNAPPY_SOURCE_DIR "${TokuDB_SOURCE_DIR}/third_party/snappy-1.1.2" CACHE FILEPATH "Where to find sources for snappy.")
34	if (NOT EXISTS "${SNAPPY_SOURCE_DIR}/CMakeLists.txt")	31	if (NOT EXISTS "${SNAPPY_SOURCE_DIR}/CMakeLists.txt")
35	@@ -140,3 +154,4 @@ add_library(snappy STATIC IMPORTED)	32	@@ -109,3 +123,4 @@ add_library(snappy STATIC IMPORTED)
36	set_target_properties(snappy PROPERTIES IMPORTED_LOCATION	33	set_target_properties(snappy PROPERTIES IMPORTED_LOCATION
37	"${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/snappy/lib/libsnappy.a")	34	"${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/snappy/lib/libsnappy.a")
38	add_dependencies(snappy build_snappy)	35	add_dependencies(snappy build_snappy)