diff options
Diffstat (limited to 'dev-db')
21 files changed, 324 insertions, 823 deletions
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz Binary files differindex bc2f3a98eba4..ec9f9192753d 100644 --- a/dev-db/Manifest.gz +++ b/dev-db/Manifest.gz diff --git a/dev-db/kyotocabinet/Manifest b/dev-db/kyotocabinet/Manifest index c257fe47a620..6001b0ccb4ba 100644 --- a/dev-db/kyotocabinet/Manifest +++ b/dev-db/kyotocabinet/Manifest @@ -2,5 +2,5 @@ AUX fix_configure-1.2.62.patch 1668 BLAKE2B 5a572607b5c848c3616fcccac1e936f9218a AUX kyotocabinet-1.2.76-configure-8-byte-atomics.patch 1250 BLAKE2B 882c4897a40609bbfa1183cb97e80e5ed6d95d0035c30c836e3f252962db822249f8b48934923e816a720d3cbf64a6f47f80cef77528216f3171f332ca3a350b SHA512 4833cecd6c67515e0c59d7161be6891df290ae816593de1bf35718e9c9d8691db221bec5078c5dc7cf56e55b0086d61c415e148a7ee63b2a47ac4885f6d0960e AUX kyotocabinet-1.2.76-flags.patch 894 BLAKE2B 50efb4b21f0101a942eb758213cf703460056a951617298057567d08b116c7e0a631d631eace992ff447bed5b74940d2b60a8adad373cb77fe42b8c40bfcc9fd SHA512 60a15c54994a5f338cf168feb831d858fdd2cadd16ea0c8001ef652e8502797f5920d3fed0a3ec4a6a2d817381b4690410878a18c7c859df34e26b033f48fe03 DIST kyotocabinet-1.2.77.tar.gz 949326 BLAKE2B faacde57e8c7fed3fb232ea6fd12b668f2d2ee352cd357d5e16e0d1740cd8f73e223964249efeae50f3ea5d0672117b2410b91ba557ebe1ac7ba4075ac28deab SHA512 f38794c11faa3f4b64097a2e314307e1a6b75ddc495103647ebe52786a689336754496e7083697417ea90436e7fad681f16440975abec9ae917874aa25153e0f -EBUILD kyotocabinet-1.2.77.ebuild 1530 BLAKE2B a1abca816e16ff3738f1cdd3d93238f5182db60fc189097cf63097141d8879f417226305ac3e40842ec9aaffab3f6aef24cc0fe8a9d8a71705eb7a1a37fb29c3 SHA512 ba0a50310eeb5b73872974f4d5917649e08e7a1618b54460ab6b60b2180acd51311d05150dd0224f656ed22da0240cfb5d333e24e7cf6fd9e48ae84739663a3c +EBUILD kyotocabinet-1.2.77.ebuild 1529 BLAKE2B 589021c8a06e22a6ac3beb2609f50c42feeb4f86e9281dee68b8ca1bc1104a2a109665fe66f15f1e314a7d1aa9cab9c4ac4f4361fc6228e9596e48bdd28d4bb3 SHA512 6b792121518910ca86efacffd2391c922df8f595f6e8759282c61edf2dadbefc76bc2b5c9a6c07fb318d8f802842e1bbc905a8b16da485dbd668d641701d52b5 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33 diff --git a/dev-db/kyotocabinet/kyotocabinet-1.2.77.ebuild b/dev-db/kyotocabinet/kyotocabinet-1.2.77.ebuild index b8d4c86ff2ef..0b831df71e97 100644 --- a/dev-db/kyotocabinet/kyotocabinet-1.2.77.ebuild +++ b/dev-db/kyotocabinet/kyotocabinet-1.2.77.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -11,7 +11,7 @@ SRC_URI="https://fallabs.com/kyotocabinet/pkg/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris" IUSE="debug doc examples +lzma +lzo static-libs" DEPEND="sys-libs/zlib[static-libs?] diff --git a/dev-db/mysql-connector-c++/Manifest b/dev-db/mysql-connector-c++/Manifest index d9d3bb62f097..982b1c37c488 100644 --- a/dev-db/mysql-connector-c++/Manifest +++ b/dev-db/mysql-connector-c++/Manifest @@ -1,17 +1,9 @@ -AUX mysql-connector-c++-1.1.11-fix-cpp-linking.patch 440 BLAKE2B 2b78f683c8e4645df7a306783ec3e61263682688b0069fff61cb3a85575d41aa33de481314bc1d18f8a5181c5e2dbb29cfb8c89d6a36b44c11f27340b4f7921c SHA512 f941e32d4f1e52d603958bb01d17e75c8fb89738d20f5af29d4c30bbe77ba82af4b25cc27f1e2df934d1b309f6c75faf2fb0fc88fb250770a0669f867cc16e1c AUX mysql-connector-c++-1.1.11-fix-mariadb.patch 1939 BLAKE2B 4ca552777bfcb8671e5dc0213c411f9e1e8fbcbeb0f9f3369572c82ba03304a9df2ab98725b1fb3a365a63e4c8ed9d3d86332c54ffcb14210469b3d6078d89da SHA512 3d02972b57a0c2a544edef9ec5050c82f9214a7013e941cdc13a8f0742b7608812f33bc0c84367e70ea556562efb653297730ce5fc8d928458c5af1d71f3f60a AUX mysql-connector-c++-1.1.6-fix-cmake.patch 762 BLAKE2B 4cecebd2cb075c6e1af7ab74a84132f41beeeb202d4d286038b05cbbb202cef709e7114563bdbee12aab4e6a738a9e23bbb9455fc1ce0f906d952af4e0042f05 SHA512 c4c89b398aa88a9e7b4ed4cf42b055b79670dc70685775afd1ef2d683e5b3754575c831a6083ef0d097431e796513597e1daf7737e3ade710abad917f63ed32f -AUX mysql-connector-c++-1.1.8-fix-mariadb.patch 1939 BLAKE2B f2d2528cacfa4457c20587557e5125f9d642ce162319ba6b077173b5407319d8d07e6b525a5fb95e797d43a3ad4e9ceb111ebd07a52cf38df1db71b9b4f2ab4c SHA512 66e4783b2ad2db463b243d2fcd7c4f89f1ddbb02f6c5711adb09b402bb448e4ee69b50f635c60201cf63048aebaea25b5db6a18f46b35b25e8d7920dbcfde9bd -AUX mysql-connector-c++-8.0.15-fix-build.patch 10052 BLAKE2B 11c37dcfaf64783bddb05f15a4a31a41123904bbdc39d7bff3f314f30c5e6fb56bf4890fd6aefc824bee2b39e9c8ac28f42c96d4a752695109ff9a1fd0176773 SHA512 fdc38272ff584d7ec3cfb2b014693102654b59f4864b68866455fdfaca171d1e4cbe800a06d2dd2c5975d47cb8d88211219c8201fbd571177c8c35c5e9055840 -AUX mysql-connector-c++-8.0.18-fix-build.patch 8968 BLAKE2B 1a738d7ca5e291e5dc17ddcf0f316e0b4588a0e01a4b3fe2b4961e7d082aca6a61870c43f4821a69aca1bfc5ae5777b837440d5863fd6a45d190b425adde20e4 SHA512 ef226d90d2d968e4e7aed3852c8ae8e608b383adbdc81818d1ca8ea1646b5d034db2fa8fb62ab6ffa3095362d326d2a11519782d5541965bacea3ecddb475a2b -DIST mysql-connector-c++-1.1.11.tar.gz 504872 BLAKE2B 16a265ce291d18d3e76f6654b42271d8c6cc9329f047d9eb0c6cdfaea37e1c13f04932e595e4333882b26154f0940949bc9bdab9d8af8e25d2bfff43be0030fa SHA512 d6839ecda12d1f088f24b20c08f3e9a757e9907d3375dba39e0f247b6a11de59817739644201e74d782d4c900aa18bf60910fe60a9ee98a2c0138104fb55dc22 +AUX mysql-connector-c++-8.0.19-fix-build.patch 9695 BLAKE2B c3334f74160a9b1148a588c7190db6f3a79fe70530d921428b7d86ec02f01324cf02c4130cd8d0cf42ecc4ccaccbecf90ffe0ac1cf8b265ea5cd9dea1046f30f SHA512 3d726b70a270e56ab38e8cebe5eb0186c4d0293dbd72844914ca9ef20674f20bc0fb4d2f0c449da77e4e6a81cc3ae454447a7983468d386e73f946dccd4a20cc +AUX mysql-connector-c++-8.0.19-fix-libressl-support.patch 3358 BLAKE2B 795c9f313d2495c3fee01066c7116fa3272a162b7401359657256d1adfb24d236049bbad6016e763de2a62ec9b6ccc93546eccffc457ae0bafca29b2c7e21b5d SHA512 d7b4b1424a6fd237ad0e7bd5648b156f770e352ec8fb3edfa6dfb767ebbe73e8ebc186b327e8543aa7bc12b7bc6081fae225a6ff0e153e25bb76900142adaa31 DIST mysql-connector-c++-1.1.12.tar.gz 518615 BLAKE2B 386a4753ca3f03999a49a89507da1b1172b3db89797c38403fee4eea86e7108a5e4f91f24a17de86d585c2a3d9e5742a117fa84d9b14aad649f938a597f3dae9 SHA512 d7e132dbc2efda4a77f8ae00c24006a1ade1d0a50f22d89ece453505e6d206427ee7988df29c0d6ef8b396ad6b8d326b6d263a1d4fa08ef5db0966fb4f1479f4 -DIST mysql-connector-c++-1.1.9.tar.gz 508255 BLAKE2B e2cd300946a873a94beab13d9d1cb64ecb5bd9a9a56ef2217b1f7aff1643adc9afc0aa22c2ff1e0f6b8318cd34d12a7fe95f0584c96c212307fa9bd0cb54a2a1 SHA512 ec4d6cb7f21d52e786de3bff951e65ea5ad7391ba097b599d0094d3e8356cf17f700dee618e38e79d7a9e562684a6c51cca95fb8e2e225942766d33f8d0a5646 -DIST mysql-connector-c++-8.0.15-src.tar.gz 2210243 BLAKE2B 45e0ffa2134c9df5a7e311963c7f2c58b5d7cfc0eefd80a5dc323bbe34ba60d40c79154f932e19c5f8e18ae45d0b61d304b7b7daba4955f92f830cf20c718931 SHA512 9a217b8f61babe5dac405be19b12d34b22673e779433d880a3aa31ea2e128f93434599a3fe0c1150b3f7b8c4d03f595d545d8cc33342a60561a2f60bff71ef14 -DIST mysql-connector-c++-8.0.18-src.tar.gz 3115736 BLAKE2B f28229593d20f4a401a3e9d0e636ee896a90fb7573f06d9b60340540d6c4d577b4f44daa287c7896a03a60d75dec343413cba981e63a22607ce60eb20f4de122 SHA512 f5b202677392bcf5c5bdd4c3433332e57aa20c1a140de81b57ce3ce69709661d572e2466ae022926fc220b20159c90f09f15b5e44f384529103a24fd592de60d -EBUILD mysql-connector-c++-1.1.11-r1.ebuild 1621 BLAKE2B fdf824ec8993976294bbc03467c63da10206bd04ed066ec33a2d7ce9310e654a0cdd1440e57517bcb22c37851310da0fb2e8e8c48696a99800da3e45cdc0c47a SHA512 7c05b18bac4af342c9feab9622e63afc916bd408a8f2b88dcf59c6192b5a62fba481b3e3f5cbca6826f61d092e7c91e9ef8f20f29b7272c11454c28a836fb15c +DIST mysql-connector-c++-8.0.19-src.tar.gz 3137484 BLAKE2B 82a2900b0daa00bcfd72d562818ada25fe15901991a896a46ecdd9304e03066c4e7a3804287540559df1c74dbd1b3983b450ab783ee8cb7f0d7ec152f3cdc6b0 SHA512 5987ae31cda3a5db18ceded201ccbe66263b8ab7665ceacf70af6bb6b99130377b40514b96644b0768fd809b36ee02580520923c11c1edecccc75da15d7bb0bd EBUILD mysql-connector-c++-1.1.12-r1.ebuild 1642 BLAKE2B 6e6fa755a9c7f51fc9ddd4310664b7f1a9dfa1e348ea033006195ae9ef7d1f6cbbfa82c13394ea3355fb15bca3d05baa5bee43a287b7c63d9fcbe5240d0a59ab SHA512 0a0d2ec5bd5231f708baa1d605c8d24118d2bf3ca8583d5f22e3b9cbdcbd55c6a2fc3f5aa53bc3e4858884d5f7ad4d70221dbe57d2dc60df68cc3c27fceb16d4 -EBUILD mysql-connector-c++-1.1.9-r1.ebuild 1570 BLAKE2B 2f5d17177fe53a0ab0a70efe13d225a6982746819191719d1378b072881037ce81b0d63beb1e0e3dd9106dc04d17ef29b6ac010831734fca2f184901568ba2b2 SHA512 ce9598a2a5f8924cb24822dec8b5349f1655148ba7aba234e324912999d7a5df054a3b3d78c7e9c33c909d046d28bceb9322dc1848370fbed00b27941d49d387 -EBUILD mysql-connector-c++-8.0.15.ebuild 909 BLAKE2B 3a0fa261424e3ce299cf1d10ff5ace8e8bedc4e91fd0eb098916ca1b2d2353562a21d4aaf3fb73c119a665ad64da113036fba6ad9a02a6199306cece67b1f835 SHA512 32c8692e66ed3805c3e01ad5b4e66b04bc0a750e1fd270fc52f70777242abd21d5f11acdff27210b9194190e2ea1bfb3d203e264986c985f0d13210618e51047 -EBUILD mysql-connector-c++-8.0.18.ebuild 1015 BLAKE2B e14bf0abe5da065ff96a350c16ce5e90bd8f2190665d0fc45d29a3c6cfe447987733a9b10bb42671cc6c9ccdef485070a3ab265880b256739958cd46a4f7b186 SHA512 3b53b586627adeb2567d275a1a7f8f1787dc9d01d996015bf273e2fed9b387666793eba0add85961fc1eae2c011d8ce11b359f400217154a2029ea67c2783de1 +EBUILD mysql-connector-c++-8.0.19.ebuild 1070 BLAKE2B 1a42cb615fb70dccb3be62cbb4430770220534fe8bad1a69d828ec1342e0fb5c003034130320d0e7838416b1a1fb12063b3f0953a8af45c95698a968bbf5a45a SHA512 81ed1cc863ee4f5a8b30fffbceb2821f9fd59379c7ac6b382392526670649f3fe858fa54191fb7304db6a4611632752c09fecb5f4c5b5f58df3145836a5a4cbc MISC metadata.xml 378 BLAKE2B 43fdbbc8d3b6ef99e51da96ddfefbdeaa70ef5fcb2fc6067305f75f75b7ee2fd21b79ca76704d8752bf59ae057b28efb187b063770964246f93fea629b58b467 SHA512 c6e545fb60d306792421ea26a937aaa6aea53d2a4100c9cafe78cf695c9dd0620cf3e770d43ff42749ae42bbe3a35212407ea84edee9af2dcb0255c2b763ddfc diff --git a/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.11-fix-cpp-linking.patch b/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.11-fix-cpp-linking.patch deleted file mode 100644 index 4b8a4a983096..000000000000 --- a/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.11-fix-cpp-linking.patch +++ /dev/null @@ -1,15 +0,0 @@ -https://bugs.mysql.com/bug.php?id=90727 - ---- a/FindMySQL.cmake -+++ b/FindMySQL.cmake -@@ -700,8 +700,10 @@ endif() - - # For dynamic linking use the built-in sys and strings - if(NOT MYSQLCLIENT_STATIC_LINKING) -+IF(CMAKE_SYSTEM_NAME MATCHES "SunOS") - list(APPEND SYS_LIBRARIES "mysql_sys") - list(APPEND SYS_LIBRARIES "mysql_strings") -+endif() - list(APPEND SYS_LIBRARIES ${MYSQL_LIBRARIES}) - SET(MYSQL_LIBRARIES ${SYS_LIBRARIES}) - diff --git a/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.8-fix-mariadb.patch b/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.8-fix-mariadb.patch deleted file mode 100644 index 35ed218e18dc..000000000000 --- a/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.8-fix-mariadb.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff -aurN a/driver/mysql_connection.cpp b/driver/mysql_connection.cpp ---- a/driver/mysql_connection.cpp 2016-12-14 04:58:54.000000000 -0500 -+++ b/driver/mysql_connection.cpp 2017-01-26 16:33:58.086005627 -0500 -@@ -1023,6 +1023,7 @@ - proxy->get_character_set_info(&cs); - *(static_cast<int *>(optionValue)) = cs.mbmaxlen; - /* mysql_get_option() was added in mysql 5.7.3 version */ -+#if !defined( MARIADB_BASE_VERSION ) && !defined ( MARIADB_VERSION_ID ) - } else if ( proxy->get_server_version() >= 50703 ) { - try { - if (GET_CONN_OPTION(optionName, optionValue, intOptions)) { -@@ -1036,6 +1037,7 @@ - CPP_ERR_FMT("Unsupported option : %d:(%s) %s", proxy->errNo(), proxy->sqlstate().c_str(), proxy->error().c_str()); - throw e; - } -+#endif - } - } - /* }}} */ -@@ -1053,11 +1055,13 @@ - MY_CHARSET_INFO cs; - proxy->get_character_set_info(&cs); - return cs.dir ? sql::SQLString(cs.dir) : ""; -+#if !defined( MARIADB_BASE_VERSION ) && !defined ( MARIADB_VERSION_ID ) - } else if ( proxy->get_server_version() >= 50703 ) { - const char* optionValue= NULL; - if (GET_CONN_OPTION(optionName, &optionValue, stringOptions)) { - return optionValue ? sql::SQLString(optionValue) : ""; - } -+#endif - } - return ""; - } -diff -aurN a/driver/nativeapi/libmysql_static_proxy.cpp b/driver/nativeapi/libmysql_static_proxy.cpp ---- a/driver/nativeapi/libmysql_static_proxy.cpp 2017-01-26 16:35:46.256038741 -0500 -+++ b/driver/nativeapi/libmysql_static_proxy.cpp 2017-01-26 16:28:34.114915809 -0500 -@@ -319,7 +319,7 @@ - int - LibmysqlStaticProxy::get_option(MYSQL * mysql, enum mysql_option option, const void *arg) - { --#if MYSQL_VERSION_ID >= 50703 -+#if MYSQL_VERSION_ID >= 50703 && !defined( MARIADB_BASE_VERSION ) && !defined ( MARIADB_VERSION_ID ) - if (::mysql_get_option(mysql, option, arg)) { - throw sql::InvalidArgumentException("Unsupported option provided to mysql_get_option()"); - } else { diff --git a/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.15-fix-build.patch b/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.15-fix-build.patch deleted file mode 100644 index 4e3996914109..000000000000 --- a/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.15-fix-build.patch +++ /dev/null @@ -1,307 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -666,7 +666,7 @@ set_target_properties(connector PROPERTIES - - - install(TARGETS connector -- CONFIGURATIONS Release RelWithDebInfo -+ CONFIGURATIONS Release RelWithDebInfo Gentoo - ARCHIVE DESTINATION "${INSTALL_LIB_DIR_STATIC}" COMPONENT XDevAPIDev - RUNTIME DESTINATION "${INSTALL_LIB_DIR}" COMPONENT XDevAPIDll - LIBRARY DESTINATION "${INSTALL_LIB_DIR}" COMPONENT XDevAPIDll -@@ -737,6 +737,12 @@ TARGET_LINK_LIBRARIES(try connector) - SET_INTERFACE_OPTIONS(try devapi) - # ADD_GCOV(try) - -+IF(WITH_SSL STREQUAL "system") -+ find_package(OpenSSL REQUIRED) -+ TARGET_LINK_LIBRARIES(try ${OPENSSL_LIBRARIES}) -+ENDIF() -+ -+ - if(WITH_JDBC) - - add_executable(try_jdbc EXCLUDE_FROM_ALL try_jdbc.cc) ---- a/cdk/cmake/install_macros.cmake -+++ b/cdk/cmake/install_macros.cmake -@@ -327,7 +327,7 @@ FUNCTION(INSTALL_DEBUG_TARGET target) - DESTINATION ${ARG_DESTINATION} - ${RENAME_PARAM} - ${PERMISSIONS_${target_type}} -- CONFIGURATIONS Release RelWithDebInfo -+ CONFIGURATIONS Release RelWithDebInfo Gentoo - COMPONENT ${ARG_COMPONENT} - OPTIONAL) - -@@ -346,7 +346,7 @@ FUNCTION(INSTALL_DEBUG_TARGET target) - INSTALL(FILES ${debug_pdb_target_location} - DESTINATION ${ARG_PDB_DESTINATION} - ${PDB_RENAME_PARAM} -- CONFIGURATIONS Release RelWithDebInfo -+ CONFIGURATIONS Release RelWithDebInfo Gentoo - COMPONENT ${ARG_COMPONENT} - OPTIONAL) - ENDIF() ---- a/cdk/cmake/libutils.cmake -+++ b/cdk/cmake/libutils.cmake -@@ -282,14 +282,7 @@ function(add_library_ex TARGET) - endforeach() - - if(libs) -- -- if(${type} STREQUAL "STATIC") -- merge_static_libraries(${TARGET} ${libs}) -- add_dependencies(${TARGET} ${libs}) -- else() - target_link_libraries(${TARGET} PRIVATE ${libs}) -- endif() -- - endif() - - # ---- a/cdk/cmake/protobuf.cmake -+++ b/cdk/cmake/protobuf.cmake -@@ -26,201 +26,8 @@ - # along with this program; if not, write to the Free Software Foundation, Inc., - # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - --# --# Usage: --# --# INCLUDE(protobuf) --# [USE_FULL_PROTOBUF()] --# --# MYSQLX_PROTOBUF_GENERATE_CPP(SRCS HDRS <protobuf definitions>) --# ADD_LIBRARY(target ... ${SRCS}) --# -- --if(DEFINED WITH_PROTOBUF) -- -- # -- # If WITH_PROTOBUF is defined, it should point at external location where -- # protobuf libraries were built using our CMakeLists.txt (so that -- # exports.cmake was produced). -- # -- -- if (NOT EXISTS "${WITH_PROTOBUF}/exports.cmake") -- message(FATAL_ERROR -- "Valid protobuf build not found at the given location" -- " (could not find exports.cmake): ${WITH_PROTOBUF}" -- ) -- endif() -- -- message("Using protobuf build at: ${WITH_PROTOBUF}") -- --else(DEFINED WITH_PROTOBUF) -- -- # -- # If external WITH_PROTOBUF location is not given, then we arrange for -- # building of protbuf from bundled sources in ${PROJECT_BINARY_DIR}/protobuf. -- # -- -- message("Configuring Protobuf build using cmake generator: ${CMAKE_GENERATOR}") -- file(REMOVE "${PROJECT_BINARY_DIR}/protobuf/CMakeCache.txt") -- file(MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/protobuf") -- -- # -- # Pick build configuration for the protobuf build. Normally we build using the -- # same build configuration that is used for building CDK (Release/Debug/etc.). -- # But we also support building CDK under non-standard build configuration -- # named 'Static' (this is a dirty trick we use to simplify building our MSIs). -- # Since protobuf does not know 'Static' build configuration, we build protobuf -- # under 'Release' configuration in that case. -- # -- # We need to handle two cases. For some build systems, like Makefiles, -- # the build configuration is specified at cmake time using CMAKE_BUILD_TYPE -- # variable. In that case we also set it during protobuf build configuration. -- # Another case is a multi-configuration build system like MSVC. In this case -- # we use generator expression to pick correct configuration when the build -- # command is invoked below. -- # -- -- if(CMAKE_BUILD_TYPE) -- if(CMAKE_BUILD_TYPE MATCHES "[Ss][Tt][Aa][Tt][Ii][Cc]") -- set(set_build_type -DCMAKE_BUILD_TYPE=Release) -- else() -- set(set_build_type -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}) -- endif() -- endif() -- -- set(CONFIG_EXPR -- $<$<CONFIG:Static>:Release>$<$<NOT:$<CONFIG:Static>>:$<CONFIG>> -- ) -- -- execute_process( -- COMMAND ${CMAKE_COMMAND} -- -G "${CMAKE_GENERATOR}" -- ${set_build_type} -- -DSTATIC_MSVCRT=${STATIC_MSVCRT} -- -DCMAKE_POSITION_INDEPENDENT_CODE=${CMAKE_POSITION_INDEPENDENT_CODE} -- -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} -- -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} -- -DCMAKE_CXX_FLAGS_DEBUG=${CMAKE_CXX_FLAGS_DEBUG} -- -DCMAKE_CXX_FLAGS_RELEASE=${CMAKE_CXX_FLAGS_RELEASE} -- -DCMAKE_CXX_FLAGS_RELWITHDEBINFO=${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -- -DCMAKE_CXX_FLAGS_MINSIZEREL=${CMAKE_CXX_FLAGS_MINSIZEREL} -- -DCMAKE_STATIC_LINKER_FLAGS=${CMAKE_STATIC_LINKER_FLAGS} -- ${PROJECT_SOURCE_DIR}/protobuf -- WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/protobuf -- RESULT_VARIABLE protobuf_config -- ) -- -- if(protobuf_config) -- message(FATAL_ERROR "Could not configure Protobuf build: ${protobuf_config}") -- endif() -- -- set(WITH_PROTOBUF "${PROJECT_BINARY_DIR}/protobuf") -- --endif(DEFINED WITH_PROTOBUF) -- --# Import targets exported by protobuf -- --include(${WITH_PROTOBUF}/exports.cmake) -- --# --# Protobuf library targets imported above (pb_protobuf --# and pb_protobuf-lite) are local to the directory from which --# they were imported. This is not good if cdk is used as --# a sub-project of a parent project, because the parent project --# must have access to these targets. --# --# For that reason below we create global protobuf/protobuf-lite targets --# and copy their locations from the imported targets. --# --# Note: we can't use ALIAS library because it does not work with imported --# targets --# -- --add_library(protobuf STATIC IMPORTED GLOBAL) --add_library(protobuf-lite STATIC IMPORTED GLOBAL) -- --foreach(lib protobuf protobuf-lite) -- #message("processing: ${lib}") -- -- foreach(CONF NOCONFIG DEBUG RELEASE MINSIZEREL RELWITHDEBINFO) -- #message("- CONF: ${CONF}") -- -- get_target_property(LOC pb_${lib} IMPORTED_LOCATION_${CONF}) -- if(LOC) -- #message("- setting imported location to: ${LOC}") -- set_target_properties(${lib} PROPERTIES -- IMPORTED_LOCATION_${CONF} "${LOC}" -- ) -- set_property(TARGET ${lib} APPEND PROPERTY -- IMPORTED_CONFIGURATIONS ${CONF} -- ) -- endif() -- -- endforeach(CONF) -- --endforeach(lib) -- --# --# To support 'Static' build configuration the targets imported from the --# Protobuf project need to have IMPORTED_LOCATION_STATIC defined. We use --# 'Release' locations as Protobuf is built using 'Release' configuration in --# that case. --# -- --foreach(tgt protobuf protobuf-lite pb_protoc) -- -- get_target_property(LOC ${tgt} IMPORTED_LOCATION_RELEASE) -- set_property(TARGET ${tgt} PROPERTY IMPORTED_LOCATION_STATIC ${LOC}) -- --endforeach(tgt) -- -- --# protobuf depends on protobuf-lite -- --set_target_properties(protobuf PROPERTIES -- INTERFACE_LINK_LIBRARIES "protobuf-lite" --) -- -- --message("Protobuf include path: ${PROTOBUF_INCLUDE_DIR}") -- --set(PROTOBUF_INCLUDE_DIRS ${PROTOBUF_INCLUDE_DIR} -- CACHE INTERNAL "Protobuf include path" FORCE) --set(PROTOBUF_PROTOC_EXECUTABLE pb_protoc -- CACHE INTERNAL "Protobuf compiler" FORCE) -- --# --# Custom target build_protobuf ensures that Protobuf project is built. --# --# Note: this depends on Protobuf project generating the stamp file --# -- --if(NOT DEFINED PROTOBUF_BUILD_STAMP) -- message(FATAL_ERROR "Protobuf build stamp file not defined") --endif() -- -- --if(CMAKE_VERSION VERSION_LESS 3.0) -- add_custom_command(OUTPUT ${PROTOBUF_BUILD_STAMP} -- COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIGURATION> -- WORKING_DIRECTORY ${WITH_PROTOBUF} -- COMMENT "Building protobuf using configuration: $(Configuration)" -- ) --else() -- add_custom_command(OUTPUT ${PROTOBUF_BUILD_STAMP} -- COMMAND ${CMAKE_COMMAND} --build . --config ${CONFIG_EXPR} -- WORKING_DIRECTORY ${WITH_PROTOBUF} -- COMMENT "Building protobuf using configuration: $(Configuration)" -- ) --endif() -- --add_custom_target(build_protobuf -- DEPENDS ${PROTOBUF_BUILD_STAMP} --) -- --add_dependencies(protobuf build_protobuf) --add_dependencies(protobuf-lite build_protobuf) --add_dependencies(pb_protoc build_protobuf) -+#SET(Protobuf_USE_STATIC_LIBS ON) -+find_package(Protobuf REQUIRED) - - # - # Choice between full and lite version of the library. ---- a/cdk/protocol/mysqlx/crud.cc -+++ b/cdk/protocol/mysqlx/crud.cc -@@ -295,7 +295,7 @@ public: - class Placeholder_conv_imp - : public Args_conv - { -- map<string, unsigned> m_map; -+ std::map<string, unsigned> m_map; - - public: - -@@ -303,7 +303,7 @@ public: - - unsigned conv_placeholder(const string &name) - { -- map<string, unsigned>::const_iterator it = m_map.find(name); -+ std::map<string, unsigned>::const_iterator it = m_map.find(name); - if (it == m_map.end()) - throw_error("Placeholder converter: Placeholder was not defined on args"); - //throw Generic_error((boost::format("Placeholder %s was not defined on args.") -@@ -314,7 +314,7 @@ public: - - void add_placeholder(const string &name) - { -- map<string, unsigned>::const_iterator it = m_map.find(name); -+ std::map<string, unsigned>::const_iterator it = m_map.find(name); - if (it != m_map.end()) - throw_error("Placeholder converter: Redefined placeholder"); - //throw Generic_error((boost::format("Redifined placeholder %s.") ---- a/jdbc.cmake -+++ b/jdbc.cmake -@@ -66,7 +66,7 @@ if(MYSQL_CONFIG_EXECUTABLE) - list(APPEND jdbc_cmake_opts -DMYSQL_CONFIG_EXECUTABLE=${MYSQL_CONFIG_EXECUTABLE}) - endif() - --list(APPEND jdbc_cmake_opts -DMYSQLCLIENT_STATIC_LINKING=ON) -+list(APPEND jdbc_cmake_opts -DMYSQLCLIENT_STATIC_LINKING=OFF) - - if(CMAKE_BUILD_TYPE) - if(CMAKE_BUILD_TYPE MATCHES "[Ss][Tt][Aa][Tt][Ii][Cc]") diff --git a/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.18-fix-build.patch b/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.19-fix-build.patch index 484220442ab8..b8976199afc5 100644 --- a/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.18-fix-build.patch +++ b/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.19-fix-build.patch @@ -1,6 +1,6 @@ --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -463,7 +463,7 @@ set_target_properties(connector PROPERTIES +@@ -475,7 +475,7 @@ set_target_properties(connector PROPERTIES install(TARGETS connector @@ -11,7 +11,7 @@ LIBRARY DESTINATION "${INSTALL_LIB_DIR}" COMPONENT XDevAPIDll --- a/cdk/cmake/DepFindProtobuf.cmake +++ b/cdk/cmake/DepFindProtobuf.cmake -@@ -48,197 +48,7 @@ if(TARGET Protobuf::pb) +@@ -48,229 +48,7 @@ if(TARGET Protobuf::pb) return() endif() @@ -52,10 +52,19 @@ - $<$<CONFIG:Static>:Release>$<$<NOT:$<CONFIG:Static>>:$<CONFIG>> -) - +-set(set_arch) +-if(CMAKE_GENERATOR_PLATFORM) +- set(set_arch -A ${CMAKE_GENERATOR_PLATFORM}) +-endif() +- +-set(set_toolset) +-if(CMAKE_GENERATOR_TOOLSET) +- set(set_toolset -T ${CMAKE_GENERATOR_TOOLSET}) +-endif() - -if(NOT EXISTS "${PB_BINARY_DIR}/exports.cmake") - -- message("==== Configuring Protobuf build using cmake generator: ${CMAKE_GENERATOR}") +- message("==== Configuring Protobuf build using cmake generator: ${CMAKE_GENERATOR} ${set_arch} ${set_toolset}") - - file(REMOVE "${PB_BINARY_DIR}/CMakeCache.txt") - file(MAKE_DIRECTORY "${PB_BINARY_DIR}") @@ -69,6 +78,8 @@ - execute_process( - COMMAND ${CMAKE_COMMAND} - -G "${CMAKE_GENERATOR}" +- ${set_arch} +- ${set_toolset} - ${set_build_type} - -DSTATIC_MSVCRT=${STATIC_MSVCRT} - -DCMAKE_POSITION_INDEPENDENT_CODE=${CMAKE_POSITION_INDEPENDENT_CODE} @@ -188,9 +199,27 @@ - ) -endif() - +-# +-# Try using parallel builds for protobuf. +-# +- +-include(ProcessorCount) +-ProcessorCount(N) +- +-MESSAGE("Processor Count: ${N}") +- +-set(opt_build) +-set(opt_tool) +-if(NOT N EQUAL 0) +- if(NOT CMAKE_VERSION VERSION_LESS 3.12) +- set(opt_build --parallel ${N}) +- elseif(CMAKE_MAKE_PROGRAM MATCHES "make") +- set(opt_tool -j${N}) +- endif() +-endif() - -add_custom_command(OUTPUT "${build_stamp}" -- COMMAND ${CMAKE_COMMAND} --build . --config ${CONFIG_EXPR} +- COMMAND ${CMAKE_COMMAND} --build . ${opt_build} --config ${CONFIG_EXPR} -- ${opt_tool} - COMMAND ${CMAKE_COMMAND} -E touch "${build_stamp}" - WORKING_DIRECTORY "${PB_BINARY_DIR}" - COMMENT "Building protobuf" @@ -200,17 +229,20 @@ - SOURCES "${build_stamp}" -) - +-set_target_properties(build_protobuf PROPERTIES FOLDER "Misc") +- -add_dependencies(Protobuf::pb-full build_protobuf) -add_dependencies(Protobuf::pb-lite build_protobuf) -add_dependencies(Protobuf::protoc build_protobuf) - -# TODO: Handle lite/full version - +- +find_package(Protobuf REQUIRED) - # Standard PROTOBUF_GENERATE_CPP modified to our usage -@@ -268,11 +78,11 @@ function(mysqlx_protobuf_generate_cpp SRCS HDRS) + +@@ -299,11 +77,11 @@ function(mysqlx_protobuf_generate_cpp SRCS HDRS) "${CMAKE_CURRENT_BINARY_DIR}/protobuf/${FIL_WE}.pb.h" COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_CURRENT_BINARY_DIR}/protobuf" @@ -238,7 +270,7 @@ add_coverage(cdk) --- a/cdk/protocol/mysqlx/CMakeLists.txt +++ b/cdk/protocol/mysqlx/CMakeLists.txt -@@ -125,11 +125,7 @@ target_include_directories(cdk_proto_mysqlx PRIVATE +@@ -126,11 +126,7 @@ target_include_directories(cdk_proto_mysqlx PRIVATE ${CMAKE_CURRENT_BINARY_DIR} ) diff --git a/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.19-fix-libressl-support.patch b/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.19-fix-libressl-support.patch new file mode 100644 index 000000000000..fc6eb777063e --- /dev/null +++ b/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.19-fix-libressl-support.patch @@ -0,0 +1,89 @@ +--- a/cdk/cmake/DepFindSSL.cmake ++++ b/cdk/cmake/DepFindSSL.cmake +@@ -88,7 +88,7 @@ function(main) + + set(OPENSSL_LIB_DIR "${OPENSSL_LIB_DIR}" CACHE INTERNAL "") + +- if(NOT OPENSSL_VERSION_MAJOR EQUAL 1) ++ if(NOT OPENSSL_VERSION_MAJOR VERSION_GREATER_EQUAL 1) + message(SEND_ERROR "OpenSSL version 1.x is required but version ${OPENSSL_VERSION} was found") + else() + message(STATUS "Using OpenSSL version: ${OPENSSL_VERSION}") +@@ -182,42 +182,33 @@ function(find_openssl) + set(OPENSSL_INCLUDE_DIR "${OPENSSL_INCLUDE_DIR}" PARENT_SCOPE) + message("-- found OpenSSL headers at: ${OPENSSL_INCLUDE_DIR}") + +- + # Verify version number. Version information looks like: +- # #define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1a 20 Nov 2018" +- ++ # #define OPENSSL_VERSION_NUMBER 0x1000103fL ++ # Encoded as MNNFFPPS: major minor fix patch status + FILE(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h" + OPENSSL_VERSION_NUMBER +- REGEX "#[ ]*define[\t ]+OPENSSL_VERSION_TEXT" ++ REGEX "^#[ ]*define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x[0-9].*" + ) +- +- #message("== OPENSSL_VERSION_NUMBER: ${OPENSSL_VERSION_NUMBER}") + STRING(REGEX REPLACE +- "^.*OPENSSL_VERSION_TEXT[\t ]+\"OpenSSL[\t ]([0-9]+)\\.([0-9]+)\\.([0-9]+)([a-z]*)[\t ].*$" +- "\\1;\\2;\\3;\\4" +- version_list "${OPENSSL_VERSION_NUMBER}" ++ "^.*OPENSSL_VERSION_NUMBER[\t ]+0x([0-9]).*$" "\\1" ++ OPENSSL_VERSION_MAJOR "${OPENSSL_VERSION_NUMBER}" ++ ) ++ STRING(REGEX REPLACE ++ "^.*OPENSSL_VERSION_NUMBER[\t ]+0x[0-9]([0-9][0-9]).*$" "\\1" ++ OPENSSL_VERSION_MINOR "${OPENSSL_VERSION_NUMBER}" ++ ) ++ STRING(REGEX REPLACE ++ "^.*OPENSSL_VERSION_NUMBER[\t ]+0x[0-9][0-9][0-9]([0-9][0-9]).*$" "\\1" ++ OPENSSL_VERSION_FIX "${OPENSSL_VERSION_NUMBER}" + ) +- #message("-- OPENSSL_VERSION: ${version_list}") +- +- list(GET version_list 0 OPENSSL_VERSION_MAJOR) +- math(EXPR OPENSSL_VERSION_MAJOR ${OPENSSL_VERSION_MAJOR}) +- +- list(GET version_list 1 OPENSSL_VERSION_MINOR) +- math(EXPR OPENSSL_VERSION_MINOR ${OPENSSL_VERSION_MINOR}) +- +- list(GET version_list 2 OPENSSL_VERSION_FIX) +- math(EXPR OPENSSL_VERSION_FIX ${OPENSSL_VERSION_FIX}) +- +- list(GET version_list 3 OPENSSL_VERSION_PATCH) +- +- + + set(OPENSSL_VERSION +- "${OPENSSL_VERSION_MAJOR}.${OPENSSL_VERSION_MINOR}.${OPENSSL_VERSION_FIX}${OPENSSL_VERSION_PATCH}" ++ "${OPENSSL_VERSION_MAJOR}.${OPENSSL_VERSION_MINOR}.${OPENSSL_VERSION_FIX}" + PARENT_SCOPE + ) + set(OPENSSL_VERSION_MAJOR ${OPENSSL_VERSION_MAJOR} PARENT_SCOPE) + ++ CHECK_SYMBOL_EXISTS(TLS1_3_VERSION "openssl/tls1.h" HAVE_TLS1_3_VERSION) + + find_library(OPENSSL_LIBRARY + NAMES ssl ssleay32 ssleay32MD libssl +--- a/cdk/foundation/connection_openssl.cc ++++ b/cdk/foundation/connection_openssl.cc +@@ -211,7 +211,7 @@ static void throw_ssl_error(SSL* tls, int err) + case SSL_ERROR_WANT_CONNECT: + case SSL_ERROR_WANT_ACCEPT: + case SSL_ERROR_WANT_X509_LOOKUP: +-# if OPENSSL_VERSION_NUMBER >= 0x10100000L ++# if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) + case SSL_ERROR_WANT_ASYNC: + case SSL_ERROR_WANT_ASYNC_JOB: + # endif +@@ -387,7 +387,7 @@ void TLS_helper::setup(SSL_CTX *ctx) + + SSL_CTX_set_cipher_list(ctx, m_cipher_list.c_str()); + +-#if OPENSSL_VERSION_NUMBER>=0x1010100fL ++#if HAVE_TLS1_3_VERSION + + /* + Note: If TLSv1.3 is not enabled, there is no need to restrict diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.11-r1.ebuild b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.11-r1.ebuild deleted file mode 100644 index 812af80237d4..000000000000 --- a/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.11-r1.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit cmake-utils flag-o-matic - -DESCRIPTION="MySQL database connector for C++ (mimics JDBC 4.0 API)" -HOMEPAGE="https://dev.mysql.com/downloads/connector/cpp/" -URI_DIR="Connector-C++" -SRC_URI="https://dev.mysql.com/get/Downloads/${URI_DIR}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 arm ~arm64 ppc ppc64 sparc x86" -IUSE="debug examples gcov static-libs" - -DEPEND="dev-db/mysql-connector-c:= - dev-libs/boost:= - dev-libs/openssl:0= - !<dev-db/mysql-connector-c-6.1.8" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/${PN}-1.1.6-fix-cmake.patch" - "${FILESDIR}/${PN}-1.1.11-fix-mariadb.patch" - "${FILESDIR}/${PN}-1.1.11-fix-cpp-linking.patch" -) - -src_configure() { - # native lib/wrapper needs this! - append-flags "-fno-strict-aliasing" - - local mycmakeargs=( - -DMYSQLCPPCONN_BUILD_EXAMPLES=OFF - -DMYSQLCPPCONN_ICU_ENABLE=OFF - -DMYSQLCPPCONN_TRACE_ENABLE=$(usex debug ON OFF) - -DMYSQLCPPCONN_GCOV_ENABLE=$(usex gcov ON OFF) - -DINSTALL_DOCS="/usr/share/doc/${PF}" - -DMYSQL_CXX_LINKAGE=0 - -DMYSQL_INCLUDE_DIR=$(mysql_config --variable=pkgincludedir) - ) - - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - - # static lib has wrong name so we need to rename it - if use static-libs; then - mv "${ED%/}"/usr/$(get_libdir)/libmysqlcppconn-static.a \ - "${ED%/}"/usr/$(get_libdir)/libmysqlcppconn.a || die - else - rm -f "${ED%/}"/usr/$(get_libdir)/libmysqlcppconn-static.a - fi - - # examples - if use examples; then - insinto /usr/share/doc/${PF}/examples - doins "${S}"/examples/* - fi -} diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.9-r1.ebuild b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.9-r1.ebuild deleted file mode 100644 index 3f908d77fd3b..000000000000 --- a/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.9-r1.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils flag-o-matic - -DESCRIPTION="MySQL database connector for C++ (mimics JDBC 4.0 API)" -HOMEPAGE="https://dev.mysql.com/downloads/connector/cpp/" -URI_DIR="Connector-C++" -SRC_URI="https://dev.mysql.com/get/Downloads/${URI_DIR}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 arm ~arm64 ppc ppc64 sparc x86" -IUSE="debug examples gcov static-libs" - -DEPEND="dev-db/mysql-connector-c:= - dev-libs/boost:= - dev-libs/openssl:0= - !<dev-db/mysql-connector-c-6.1.8" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/${PN}-1.1.6-fix-cmake.patch" - "${FILESDIR}/${PN}-1.1.8-fix-mariadb.patch" -) - -src_configure() { - # native lib/wrapper needs this! - append-flags "-fno-strict-aliasing" - - local mycmakeargs=( - -DMYSQLCPPCONN_BUILD_EXAMPLES=OFF - -DMYSQLCPPCONN_ICU_ENABLE=OFF - -DUSE_MYSQLCPPCONN_TRACE_ENABLE=$(usex debug ON OFF) - -DUSE_MYSQLCPPCONN_GCOV_ENABLE=$(usex gcov ON OFF) - -DINSTALL_DOCS="/usr/share/doc/${PF}" - -DMYSQL_CXX_LINKAGE=0 - -DMYSQL_INCLUDE_DIR=$(mysql_config --variable=pkgincludedir) - ) - - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - - # static lib has wrong name so we need to rename it - if use static-libs; then - mv "${ED}"/usr/$(get_libdir)/libmysqlcppconn-static.a \ - "${ED}"/usr/$(get_libdir)/libmysqlcppconn.a || die - else - rm -f "${ED}"/usr/$(get_libdir)/libmysqlcppconn-static.a - fi - - # examples - if use examples; then - insinto /usr/share/doc/${PF}/examples - doins "${S}"/examples/* - fi -} diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.15.ebuild b/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.15.ebuild deleted file mode 100644 index 2b7374017ca9..000000000000 --- a/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.15.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -CMAKE_MAKEFILE_GENERATOR=emake -inherit cmake-utils - -DESCRIPTION="MySQL database connector for C++ (mimics JDBC 4.0 API)" -HOMEPAGE="https://dev.mysql.com/downloads/connector/cpp/" -URI_DIR="Connector-C++" -SRC_URI="https://dev.mysql.com/get/Downloads/${URI_DIR}/${P}-src.tar.gz" - -LICENSE="Artistic GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="+legacy libressl" - -RDEPEND=" - dev-libs/protobuf:= - legacy? ( - dev-libs/boost:= - >=dev-db/mysql-connector-c-6.1.8:= - ) - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= )" -DEPEND="${RDEPEND}" -S="${WORKDIR}/${P}-src" - -PATCHES=( - "${FILESDIR}/${PN}-8.0.15-fix-build.patch" -) - -src_configure() { - local mycmakeargs=( - -DWITH_SSL=system - -DWITH_JDBC=$(usex legacy ON OFF) - ) - - cmake-utils_src_configure -} diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.18.ebuild b/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.19.ebuild index bc937af3de44..fb1898b6062c 100644 --- a/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.18.ebuild +++ b/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.19.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -28,7 +28,8 @@ DEPEND="${RDEPEND}" S="${WORKDIR}/${P}-src" PATCHES=( - "${FILESDIR}/${PN}-8.0.18-fix-build.patch" + "${FILESDIR}"/${PN}-8.0.19-fix-build.patch + "${FILESDIR}"/${PN}-8.0.19-fix-libressl-support.patch ) src_configure() { diff --git a/dev-db/mysql-connector-c/Manifest b/dev-db/mysql-connector-c/Manifest index 047c69e54ad9..3c2cf0ca88d1 100644 --- a/dev-db/mysql-connector-c/Manifest +++ b/dev-db/mysql-connector-c/Manifest @@ -1,14 +1,12 @@ AUX 20028_all_mysql-5.6-gcc7.patch 603 BLAKE2B f03dc2e39dca4496cc084b427daa60014464876df456bf290a5de3431b481691a35ac9ac00d71cc86931efe3bca70dae012bedefc6d29ad7fec2feeb07cce014 SHA512 f9dab813418f38f3a877b8672cdec153d6f0f289144c35277e8275cc7a58195f974b7bf76b74f8dd2403643b1199f5e6d6bcde661ce5f79f614ff10347b52278 AUX 6.1.11-openssl-1.1.patch 8987 BLAKE2B 8bd00bb778e086cbdcd04b6ac904f36bd64bbbb332f913129eb3acbaf6da4d044fdc65523626a9fed47d6bf5859826af489bd9ae7ae51664c613c966a88708ba SHA512 46af56504ed2a69ce74a5e2040ee8b3355f5ac48fb80e4668b635f01a2650d07f50dd098ad43239e8b35a80e975a5a9549bd1b1a9c1a0612ed9e4750b537bb76 -AUX mysql-connector-c-8.0.17-always-build-decompress-utilities.patch 819 BLAKE2B 424a30a5217aa4b1005d1991e90e75f033092c87cfadf0d2298d8f2a6819bafa24f5f1149d00ea252afb71f004069e9b4b406e801438d0f15a8077d5bcbc1561 SHA512 bf839e2a126066b78a64a7876b319507fd049cdc3a8b2855d8df27ae0c74a93f4b66d7d1db534552107cbe293a1913d51bd25ce945a6bdc47e785b3a6c3608df -AUX mysql-connector-c-8.0.17-libressl.patch 10106 BLAKE2B 5ed9b5f77f35c5079ac13d855ec9de0f67769d9de20029876026064986a7c79671b607a19c6afe3cbcdc9ab14527e5618a213b4aa8953f10349e80b0ef7c21ea SHA512 7e692de4260f2a846008eca3bf8f4f59b61d2780743ded9a08d2245baf73ece360cb8b25ab4a3518b706b7dcc2915f3628122930b973ab27ec3e7bfbf120c3ed AUX mysql-connector-c-8.0.17-use-relative-include-path-for-udf_registration_types-h.patch 684 BLAKE2B 10007011b38462ffa8b539f9ac531c715fcead4e6bb1d1c04ea8055decc0aa6eda8b22e3967d91773316d04062ca231cf8561ce72ab2b5aaeaf37a0bb425c7f5 SHA512 d0e60dff5faa7b6c71878803d598b46266021029c874c8f6834d496de10ddf42d3b806fae3c6d532c1890cb5f491bbd69235bd1ac919848011a9ca57c465ce1c AUX mysql-connector-c-8.0.18-always-build-decompress-utilities.patch 874 BLAKE2B 1622ba22ebb68d8b72499efec3075bbbe157b1ceaab5651dbc6dea996c831159161878a859972119dd4d5c20bb631681efb00b8d9715b3097890def8016898f4 SHA512 02ae005e8ac710dcc75f07011006df63a6d22f030b4eff0c6d28f78b083b1d7385190c9080812b5c9c2a84ad66972594b7d79a1485285c9ad76245577d42e528 +AUX mysql-connector-c-8.0.19-do-not-install-comp_err.patch 307 BLAKE2B 864c07e9d4fb9a38ac418476f4b7738caa1f2a5dc633ad5921859793983c7b42acd87263ce2703df5a8c7d3bc3d7a60efb28a3ff17c311d89cc7b12edd22574f SHA512 cbb9be24a67a649b68230fe3482063d2d16fb629233e070289eb1ab0011bd8c43b0c056e4b6ca430a62ce0e8f47bb9490cb6746b7dc3fe06a05670b078cd084f +AUX mysql-connector-c-8.0.19-libressl.patch 10501 BLAKE2B 73a31afdbbb591cadd45f158ca16c39344f540459b20683e5998f0e0f0d593dfd06e7198d3d8a5e06f8e65ff6b7a5f79435a1face9997f3316e487ef1e081459 SHA512 1d8e75e8ba6866ff4d0dced7211607e41033bbdfabd0f8a670ac221e7366e272cfc2b9c4d0f259e5d33ed486e9697bcefbdb0e6a0cd65ed2811b63e9cf1610f3 AUX mysql_com.patch 1787 BLAKE2B 4fbd40325f400586926072927b3f07231d577f18c1e30951c34c36ded9b9e42b7c3dc47ca51df974265c28b40116e30274d8a73d6a843e5d9d0074430bc17b08 SHA512 340365b05d72045af0ef12fd5c260a796be547d9abb97a6ef3d6aaf30aecf29368c1dfa28f1284da544a81656f0436f11ada2f8c5cb481540d1f1c90dd354b49 -DIST mysql-boost-8.0.17.tar.gz 189322239 BLAKE2B f9f46e5fdc3e9869b203626bc09edfbcdbabcd68eba43f9c6a33b9a52cffb3a32f39704c6d22a66899aac16fa2efb271c5dc7af7522768b45542ac8dc615cd8a SHA512 a278ee263670cb1f79d67c4b87c4b88632569c3b20a4297a6e77d550155db20902f22992ea851cf59ea523bb97d5e08707e3457f71a678e9f1ac2fa4ca5b7a2d -DIST mysql-boost-8.0.18.tar.gz 194953221 BLAKE2B e3622cccd8f60487a5e643e522e9cdc763d63ad2a5eda86a7a7db37f48a4e1288fea88ef7097c6c4b51bd5e8fd8ba26a5b8aea3501ae847180066e2d0aa2b5dc SHA512 180091ad3e74e2afa28ecb914850e6b4e8c92b8981f32b161f53381b92120d87dbd2c2fc073feb2543bb71702bac7368e9fb992821cfd3e3ca888019423b89f5 +DIST mysql-boost-8.0.19.tar.gz 264147972 BLAKE2B 61a5ccbef1a7a675c85e4e6bda8e5285bdb931e6ee14d4710bf13dfd9157d1095200db2886dc93ea7251d3d59245f35c0bef5ba88ba6aac209b1e080f3b07dc4 SHA512 5ffc03f005ab2585694902e926b6cb2b10059b2b030549eccd3949f9c3b2f02626d02529f940dec003f2d69683856fd1c720ff12f89dfbdc48befaf24a9c4d01 DIST mysql-connector-c-6.1.11-src.tar.gz 3489345 BLAKE2B 813512520ef660521221565a4466e81d902629d0ee731f746b68eed2b9129ea8361fcabe184537ec8ba91aed5a4b02dfb3450b36524c2e98f81fba148eee0cf1 SHA512 271395c888a93b833e0bbe1840b9987ecdb37d0f1cf89904207cc9aa99ed32e538aee8c9529ff39b6533947159776a8f5aa079da86ed51b1d26b086f4ffdd7c6 EBUILD mysql-connector-c-6.1.11-r2.ebuild 2289 BLAKE2B edce26b9fea987ad0d3ba93388303f62dfe004779989c6e21ac154275cd9b7e0b3f0749e19375290d625f9a17384853b63a02f4742703030aa7c8dcf863f7ade SHA512 c33ea5754eae88f1628d9d53a81db4aaea2598ebca10f2158617b2a2cd9ac3d7cd34dfc9b0314bd096ba0f531dd27fbe8c42a61727dea91fc21852ee601f409e -EBUILD mysql-connector-c-8.0.17-r3.ebuild 2910 BLAKE2B c84d7fd272718626f63ff5f7978d97b04f9b0ef0c621d7bd25d0fff3250fb00b3876bf5d83100c842a5536cbd6fc4533b87519669e3908ad3015e9799dc4739a SHA512 ffae48bad3697161efd56cea71c42fc4a3cc9ff97e17cb91bc6337dad69dd03cd86bf41b241fda0f8809f2ddff3e6137f7d10a67a7ba4a6e1aaaff81a787197c -EBUILD mysql-connector-c-8.0.18.ebuild 2883 BLAKE2B 17085cc4b61b0dd64c04401f2af637e23084d575fc1a2e7e1d04d75d34a5b51e84e3e3c8cdcd5660560179962f85baf72be6e36180e450dfeba3e6bfbf5a97e8 SHA512 719067e3f5c5adedf878d1888ebe67c53fb327124d041a6ad5ab6416be52b369aaa709168983f68541071b033f254667a2038c3b114bf04880af7f24a1bbfa2d +EBUILD mysql-connector-c-8.0.19.ebuild 2940 BLAKE2B 1d3e09ba7ac64d868e9668623ae9e76b4ff8f7694ca1c816c523203a9b2ef2360b60334359695bd469fe1bba329e6c919bba2983031970ffd02303aa97140295 SHA512 6ecb4d9a98948c11d60a95931f040177912d9e5bae44be6f3d05eca22b11fcaeff84cc4d35924e32f973ce2af694e5a059b7196ca5ef724b7222dcf621d4d735 MISC metadata.xml 239 BLAKE2B c4d6706d083b72927d239f41a644a4009c054c1c1a388af7733d3a2daf47d354009eb472573304a6be272601f05535297bcd9ceaea811a741cd905577ffe53d1 SHA512 e6e2fafe2f503db1d12e3d2368a99631ee8d014b7ea802d9879e7e3e2c0f9378675fffccd78ed09b914ae781ac3902567b1a53a721906e3ea63ceb51d0a1654b diff --git a/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.17-always-build-decompress-utilities.patch b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.17-always-build-decompress-utilities.patch deleted file mode 100644 index 927662705aa3..000000000000 --- a/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.17-always-build-decompress-utilities.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/utilities/CMakeLists.txt -+++ b/utilities/CMakeLists.txt -@@ -101,15 +101,11 @@ MYSQL_ADD_EXECUTABLE(perror perror.cc) - ADD_DEPENDENCIES(perror GenError) - TARGET_LINK_LIBRARIES(perror mysys) - --IF (BUILD_BUNDLED_LZ4) -- MYSQL_ADD_EXECUTABLE(lz4_decompress lz4_decompress.cc) -- TARGET_LINK_LIBRARIES(lz4_decompress ${LZ4_LIBRARY} mysys) --ENDIF() -+MYSQL_ADD_EXECUTABLE(lz4_decompress lz4_decompress.cc) -+TARGET_LINK_LIBRARIES(lz4_decompress ${LZ4_LIBRARY} mysys) - --IF (BUILD_BUNDLED_ZLIB OR NOT OPENSSL_EXECUTABLE_HAS_ZLIB) -- MYSQL_ADD_EXECUTABLE(zlib_decompress zlib_decompress.cc) -- TARGET_LINK_LIBRARIES(zlib_decompress ${ZLIB_LIBRARY} mysys) --ENDIF() -+MYSQL_ADD_EXECUTABLE(zlib_decompress zlib_decompress.cc) -+TARGET_LINK_LIBRARIES(zlib_decompress ${ZLIB_LIBRARY} mysys) - - IF(WITH_INNOBASE_STORAGE_ENGINE) - diff --git a/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.19-do-not-install-comp_err.patch b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.19-do-not-install-comp_err.patch new file mode 100644 index 000000000000..94329eeeb3c7 --- /dev/null +++ b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.19-do-not-install-comp_err.patch @@ -0,0 +1,12 @@ +diff --git a/utilities/CMakeLists.txt b/utilities/CMakeLists.txt +index c855f8ab..0ebef451 100644 +--- a/utilities/CMakeLists.txt ++++ b/utilities/CMakeLists.txt +@@ -27,6 +27,7 @@ IF(NOT CMAKE_CROSSCOMPILING) + comp_err.cc + COMPONENT Server + LINK_LIBRARIES mysys ++ SKIP_INSTALL + ) + ENDIF() + diff --git a/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.17-libressl.patch b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.19-libressl.patch index 340f894a895f..1fc949ae8564 100644 --- a/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.17-libressl.patch +++ b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.19-libressl.patch @@ -1,17 +1,6 @@ -From: Stefan Strogin <steils@gentoo.org> -Date: Sat, 8 Jun 2019 15:52:26 +0300 -Subject: [PATCH] Fix build with LibreSSL - -- Fix version checks as OPENSSL_VERSION_NUMBER in OpenSSL is always - 0x20000000L. -- FIPS support is removed from LibreSSL, do not use it. -- Check for TLS1_3_VERSION define, not OpenSSL/LibreSSL version. - Theoretically even OpenSSL >=1.1.1 can be built with TLS 1.3 disabled. - - --- a/cmake/ssl.cmake +++ b/cmake/ssl.cmake -@@ -304,13 +304,14 @@ MACRO (MYSQL_CHECK_SSL) +@@ -229,13 +229,14 @@ MACRO (MYSQL_CHECK_SSL) OPENSSL_FIX_VERSION "${OPENSSL_VERSION_NUMBER}" ) ENDIF() @@ -28,76 +17,91 @@ Subject: [PATCH] Fix build with LibreSSL ) SET(OPENSSL_FOUND TRUE) FIND_PROGRAM(OPENSSL_EXECUTABLE openssl ---- a/extra/libevent/openssl-compat.h -+++ b/extra/libevent/openssl-compat.h -@@ -24,7 +24,6 @@ static inline BIO_METHOD *BIO_meth_new(int type, const char *name) - #define BIO_set_init(b, val) (b)->init = (val) - #define BIO_set_data(b, val) (b)->ptr = (val) - #define BIO_set_shutdown(b, val) (b)->shutdown = (val) --#define BIO_get_init(b) (b)->init - #define BIO_get_data(b) (b)->ptr - #define BIO_get_shutdown(b) (b)->shutdown - -@@ -32,4 +31,8 @@ static inline BIO_METHOD *BIO_meth_new(int type, const char *name) - - #endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */ - -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) -+#define BIO_get_init(b) (b)->init -+#endif -+ - #endif /* OPENSSL_COMPAT_H */ --- a/mysys/my_md5.cc +++ b/mysys/my_md5.cc -@@ -56,7 +56,7 @@ static void my_md5_hash(unsigned char *digest, unsigned const char *buf, +@@ -56,7 +56,9 @@ static void my_md5_hash(unsigned char *digest, unsigned const char *buf, int compute_md5_hash(char *digest, const char *buf, int len) { int retval = 0; int fips_mode = 0; --#if !defined(HAVE_WOLFSSL) -+#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER) ++#ifndef LIBRESSL_VERSION_NUMBER fips_mode = FIPS_mode(); - #endif /* HAVE_WOLFSSL */ ++#endif /* If fips mode is ON/STRICT restricted method calls will result into abort, + * skipping call. */ + if (fips_mode == 0) { --- a/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_ssl_transport.c +++ b/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_ssl_transport.c -@@ -297,7 +297,7 @@ error: +@@ -329,6 +329,7 @@ error: return 1; } --#ifndef HAVE_WOLFSSL -+#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER) ++#ifndef LIBRESSL_VERSION_NUMBER #define OPENSSL_ERROR_LENGTH 512 static int configure_ssl_fips_mode(const uint fips_mode) { int rc = -1; -@@ -521,7 +521,7 @@ int xcom_init_ssl(const char *server_key_file, const char *server_cert_file, +@@ -352,6 +353,7 @@ static int configure_ssl_fips_mode(const uint fips_mode) { + EXIT: + return rc; + } ++#endif + + static int configure_ssl_ca(SSL_CTX *ssl_ctx, const char *ca_file, + const char *ca_path) { +@@ -555,10 +557,12 @@ int xcom_init_ssl(const char *server_key_file, const char *server_cert_file, int verify_server = SSL_VERIFY_NONE; int verify_client = SSL_VERIFY_NONE; --#ifndef HAVE_WOLFSSL -+#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER) ++#ifndef LIBRESSL_VERSION_NUMBER if (configure_ssl_fips_mode(ssl_fips_mode) != 1) { G_ERROR("Error setting the ssl fips mode"); goto error; + } ++#endif + + SSL_library_init(); + SSL_load_error_strings(); +@@ -622,7 +626,7 @@ error: + void xcom_cleanup_ssl() { + if (!xcom_use_ssl()) return; + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + ERR_remove_thread_state(0); + #endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */ + } --- a/plugin/x/client/xconnection_impl.cc +++ b/plugin/x/client/xconnection_impl.cc -@@ -523,7 +523,7 @@ XError Connection_impl::get_ssl_error(const int error_id) { +@@ -520,6 +520,7 @@ XError Connection_impl::get_ssl_error(const int error_id) { return XError(CR_SSL_CONNECTION_ERROR, buffer); } --#ifndef HAVE_WOLFSSL -+#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER) ++#ifndef LIBRESSL_VERSION_NUMBER /** Set fips mode in openssl library, When we set fips mode ON/STRICT, it will perform following operations: -@@ -573,7 +573,7 @@ XError Connection_impl::activate_tls() { +@@ -559,6 +560,7 @@ int set_fips_mode(const uint32_t fips_mode, + EXIT: + return rc; + } ++#endif + + XError Connection_impl::activate_tls() { + if (nullptr == m_vio) return get_socket_error(SOCKET_ECONNRESET); +@@ -569,12 +571,14 @@ XError Connection_impl::activate_tls() { if (!m_context->m_ssl_config.is_configured()) - return XError{CR_SSL_CONNECTION_ERROR, ER_TEXT_TLS_NOT_CONFIGURATED}; + return XError{CR_SSL_CONNECTION_ERROR, ER_TEXT_TLS_NOT_CONFIGURATED, true}; --#ifndef HAVE_WOLFSSL -+#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER) ++#ifndef LIBRESSL_VERSION_NUMBER char err_string[OPENSSL_ERROR_LENGTH] = {'\0'}; - if (set_fips_mode((int)m_context->m_ssl_config.m_ssl_fips_mode, err_string) != - 1) { + if (set_fips_mode( + static_cast<uint32_t>(m_context->m_ssl_config.m_ssl_fips_mode), + err_string) != 1) { + return XError{CR_SSL_CONNECTION_ERROR, err_string, true}; + } ++#endif + auto ssl_ctx_flags = process_tls_version( + details::null_when_empty(m_context->m_ssl_config.m_tls_version)); + --- a/router/src/http/src/tls_client_context.cc +++ b/router/src/http/src/tls_client_context.cc @@ -54,7 +54,7 @@ void TlsClientContext::verify(TlsVerify verify) { @@ -111,7 +115,7 @@ Subject: [PATCH] Fix build with LibreSSL } --- a/router/src/http/src/tls_context.cc +++ b/router/src/http/src/tls_context.cc -@@ -93,7 +93,7 @@ static constexpr int o11x_version(TlsVersion version) { +@@ -91,7 +91,7 @@ static int o11x_version(TlsVersion version) { return TLS1_1_VERSION; case TlsVersion::TLS_1_2: return TLS1_2_VERSION; @@ -120,19 +124,19 @@ Subject: [PATCH] Fix build with LibreSSL case TlsVersion::TLS_1_3: return TLS1_3_VERSION; #endif -@@ -123,9 +123,11 @@ void TlsContext::version_range(TlsVersion min_version, TlsVersion max_version) { +@@ -120,9 +120,11 @@ void TlsContext::version_range(TlsVersion min_version, TlsVersion max_version) { + switch (min_version) { default: // unknown, leave all disabled - // fallthrough +#ifdef TLS1_3_VERSION + // fallthrough case TlsVersion::TLS_1_3: opts |= SSL_OP_NO_TLSv1_2; - // fallthrough +#endif + // fallthrough case TlsVersion::TLS_1_2: opts |= SSL_OP_NO_TLSv1_1; - // fallthrough -@@ -172,8 +174,10 @@ TlsVersion TlsContext::min_version() const { +@@ -170,8 +172,10 @@ TlsVersion TlsContext::min_version() const { return TlsVersion::TLS_1_1; case TLS1_2_VERSION: return TlsVersion::TLS_1_2; @@ -143,9 +147,19 @@ Subject: [PATCH] Fix build with LibreSSL case 0: return TlsVersion::AUTO; default: +@@ -230,7 +234,8 @@ TlsContext::InfoCallback TlsContext::info_callback() const { + } + + int TlsContext::security_level() const { +-#if OPENSSL_VERSION_NUMBER >= ROUTER_OPENSSL_VERSION(1, 1, 0) ++#if OPENSSL_VERSION_NUMBER >= ROUTER_OPENSSL_VERSION(1, 1, 0) && \ ++ !defined(LIBRESSL_VERSION_NUMBER) + return SSL_CTX_get_security_level(ssl_ctx_.get()); + #else + return 0; --- a/router/src/http/src/tls_server_context.cc +++ b/router/src/http/src/tls_server_context.cc -@@ -170,7 +170,8 @@ void TlsServerContext::init_tmp_dh(const std::string &dh_params) { +@@ -166,7 +166,8 @@ void TlsServerContext::init_tmp_dh(const std::string &dh_params) { } } else { @@ -157,19 +171,18 @@ Subject: [PATCH] Fix build with LibreSSL /* --- a/sql-common/client.cc +++ b/sql-common/client.cc -@@ -7602,7 +7602,8 @@ int STDCALL mysql_options(MYSQL *mysql, enum mysql_option option, +@@ -7730,7 +7730,7 @@ int STDCALL mysql_options(MYSQL *mysql, enum mysql_option option, #endif break; case MYSQL_OPT_SSL_FIPS_MODE: { --#if defined(HAVE_OPENSSL) && !defined(HAVE_WOLFSSL) -+#if defined(HAVE_OPENSSL) && \ -+ !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER) +-#if defined(HAVE_OPENSSL) ++#if defined(HAVE_OPENSSL) && !defined(LIBRESSL_VERSION_NUMBER) char ssl_err_string[OPENSSL_ERROR_LENGTH] = {'\0'}; ENSURE_EXTENSIONS_PRESENT(&mysql->options); mysql->options.extension->ssl_fips_mode = *static_cast<const uint *>(arg); --- a/sql/mysqld.cc +++ b/sql/mysqld.cc -@@ -4795,7 +4795,7 @@ static int init_thread_environment() { +@@ -4818,7 +4818,7 @@ static int init_thread_environment() { static PSI_memory_key key_memory_openssl = PSI_NOT_INSTRUMENTED; @@ -178,57 +191,76 @@ Subject: [PATCH] Fix build with LibreSSL #define FILE_LINE_ARGS #else #define FILE_LINE_ARGS , const char *, int -@@ -4831,7 +4831,7 @@ static void init_ssl() { +@@ -4854,12 +4854,14 @@ static void init_ssl() { } static int init_ssl_communication() { --#ifndef HAVE_WOLFSSL -+#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER) ++#ifndef LIBRESSL_VERSION_NUMBER char ssl_err_string[OPENSSL_ERROR_LENGTH] = {'\0'}; int ret_fips_mode = set_fips_mode(opt_ssl_fips_mode, ssl_err_string); if (ret_fips_mode != 1) { + LogErr(ERROR_LEVEL, ER_SSL_FIPS_MODE_ERROR, ssl_err_string); + return 1; + } ++#endif + if (SslAcceptorContext::singleton_init(opt_use_ssl)) return 1; + + #if OPENSSL_VERSION_NUMBER < 0x10100000L --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc -@@ -4377,7 +4377,7 @@ static Sys_var_ulong Sys_max_execution_time( +@@ -4417,6 +4417,7 @@ static Sys_var_ulong Sys_max_execution_time( HINT_UPDATEABLE SESSION_VAR(max_execution_time), CMD_LINE(REQUIRED_ARG), VALID_RANGE(0, ULONG_MAX), DEFAULT(0), BLOCK_SIZE(1)); --#ifndef HAVE_WOLFSSL -+#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER) ++#ifndef LIBRESSL_VERSION_NUMBER static bool update_fips_mode(sys_var *, THD *, enum_var_type) { char ssl_err_string[OPENSSL_ERROR_LENGTH] = {'\0'}; if (set_fips_mode(opt_ssl_fips_mode, ssl_err_string) != 1) { -@@ -4390,7 +4390,7 @@ static bool update_fips_mode(sys_var *, THD *, enum_var_type) { +@@ -4427,15 +4428,30 @@ static bool update_fips_mode(sys_var *, THD *, enum_var_type) { + return false; + } } - #endif ++#endif --#ifdef HAVE_WOLFSSL -+#if defined(HAVE_WOLFSSL) || defined(LIBRESSL_VERSION_NUMBER) - static const char *ssl_fips_mode_names[] = {"OFF", 0}; - #else ++#if defined(LIBRESSL_VERSION_NUMBER) ++static const char *ssl_fips_mode_names[] = {"OFF", 0}; ++#else static const char *ssl_fips_mode_names[] = {"OFF", "ON", "STRICT", 0}; -@@ -4398,7 +4398,7 @@ static const char *ssl_fips_mode_names[] = {"OFF", "ON", "STRICT", 0}; ++#endif static Sys_var_enum Sys_ssl_fips_mode( "ssl_fips_mode", "SSL FIPS mode (applies only for OpenSSL); " --#ifndef HAVE_WOLFSSL -+#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER) ++#ifndef LIBRESSL_VERSION_NUMBER "permitted values are: OFF, ON, STRICT", - #else - "permitted values are: OFF", -@@ -4406,7 +4406,7 @@ static Sys_var_enum Sys_ssl_fips_mode( ++#else ++ "permitted values are: OFF", ++#endif GLOBAL_VAR(opt_ssl_fips_mode), CMD_LINE(REQUIRED_ARG, OPT_SSL_FIPS_MODE), ssl_fips_mode_names, DEFAULT(0), NO_MUTEX_GUARD, NOT_IN_BINLOG, - ON_CHECK(NULL), --#ifndef HAVE_WOLFSSL -+#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER) - ON_UPDATE(update_fips_mode), - #else - ON_UPDATE(NULL), +- ON_CHECK(NULL), ON_UPDATE(update_fips_mode), NULL); ++ ON_CHECK(NULL), ++#ifndef LIBRESSL_VERSION_NUMBER ++ ON_UPDATE(update_fips_mode), ++#else ++ ON_UPDATE(NULL), ++#endif ++ NULL); + + #if defined(HAVE_OPENSSL) + static Sys_var_bool Sys_auto_generate_certs( --- a/vio/viossl.cc +++ b/vio/viossl.cc -@@ -507,7 +507,7 @@ static int ssl_do(struct st_VioSSLFd *ptr, Vio *vio, long timeout, - #if !defined(HAVE_WOLFSSL) && !defined(DBUG_OFF) +@@ -45,7 +45,7 @@ + BIO_set_callback_ex was added in openSSL 1.1.1 + For older openSSL, use the deprecated BIO_set_callback. + */ +-#if OPENSSL_VERSION_NUMBER >= 0x10101000L ++#if OPENSSL_VERSION_NUMBER >= 0x10101000L && !defined(LIBRESSL_VERSION_NUMBER) + #define HAVE_BIO_SET_CALLBACK_EX + #endif + +@@ -637,7 +637,7 @@ static int ssl_do(struct st_VioSSLFd *ptr, Vio *vio, long timeout, + #if !defined(DBUG_OFF) { STACK_OF(SSL_COMP) *ssl_comp_methods = NULL; - ssl_comp_methods = SSL_COMP_get_compression_methods(); @@ -236,7 +268,7 @@ Subject: [PATCH] Fix build with LibreSSL n = sk_SSL_COMP_num(ssl_comp_methods); DBUG_PRINT("info", ("Available compression methods:\n")); if (n == 0) -@@ -515,7 +515,7 @@ static int ssl_do(struct st_VioSSLFd *ptr, Vio *vio, long timeout, +@@ -645,7 +645,7 @@ static int ssl_do(struct st_VioSSLFd *ptr, Vio *vio, long timeout, else for (j = 0; j < n; j++) { SSL_COMP *c = sk_SSL_COMP_value(ssl_comp_methods, j); @@ -247,12 +279,19 @@ Subject: [PATCH] Fix build with LibreSSL DBUG_PRINT("info", --- a/vio/viosslfactories.cc +++ b/vio/viosslfactories.cc -@@ -429,7 +429,7 @@ void ssl_start() { +@@ -420,6 +420,7 @@ void ssl_start() { } } --#ifndef HAVE_WOLFSSL -+#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER) ++#ifndef LIBRESSL_VERSION_NUMBER /** Set fips mode in openssl library, When we set fips mode ON/STRICT, it will perform following operations: +@@ -473,6 +474,7 @@ EXIT: + @returns openssl current fips mode + */ + uint get_fips_mode() { return FIPS_mode(); } ++#endif + + long process_tls_version(const char *tls_version) { + const char *separator = ","; diff --git a/dev-db/mysql-connector-c/mysql-connector-c-8.0.17-r3.ebuild b/dev-db/mysql-connector-c/mysql-connector-c-8.0.17-r3.ebuild deleted file mode 100644 index 3c047b80fc20..000000000000 --- a/dev-db/mysql-connector-c/mysql-connector-c-8.0.17-r3.ebuild +++ /dev/null @@ -1,111 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake-multilib - -# wrap the config script -MULTILIB_CHOST_TOOLS=( /usr/bin/mysql_config ) - -DESCRIPTION="C client library for MariaDB/MySQL" -HOMEPAGE="https://dev.mysql.com/downloads/" -LICENSE="GPL-2" - -SRC_URI="https://dev.mysql.com/get/Downloads/MySQL-8.0/mysql-boost-${PV}.tar.gz" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" - -SLOT="0/21" -IUSE="ldap libressl static-libs" - -RDEPEND=" - >=app-arch/lz4-0_p131:= - sys-libs/zlib:=[${MULTILIB_USEDEP}] - ldap? ( dev-libs/cyrus-sasl:=[${MULTILIB_USEDEP}] ) - libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) - !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) - " -DEPEND="${RDEPEND}" - -# Avoid file collisions, #692580 -RDEPEND+=" !<dev-db/mysql-5.6.45-r1" -RDEPEND+=" !=dev-db/mysql-5.7.23*" -RDEPEND+=" !=dev-db/mysql-5.7.24*" -RDEPEND+=" !=dev-db/mysql-5.7.25*" -RDEPEND+=" !=dev-db/mysql-5.7.26-r0" -RDEPEND+=" !=dev-db/mysql-5.7.27-r0" -RDEPEND+=" !<dev-db/percona-server-5.7.26.29-r1" - -DOCS=( README ) - -S="${WORKDIR}/mysql-${PV}" - -PATCHES=( - "${FILESDIR}"/${PN}-8.0.17-always-build-decompress-utilities.patch - "${FILESDIR}"/${PN}-8.0.17-use-relative-include-path-for-udf_registration_types-h.patch - "${FILESDIR}"/${PN}-8.0.17-libressl.patch -) - -src_prepare() { - sed -i -e 's/CLIENT_LIBS/CONFIG_CLIENT_LIBS/' "${S}/scripts/CMakeLists.txt" || die - - # All these are for the server only. - # Disable rpm call which would trigger sandbox, #692368 - sed -i \ - -e '/MYSQL_CHECK_LIBEVENT/d' \ - -e '/MYSQL_CHECK_RAPIDJSON/d' \ - -e '/MYSQL_CHECK_ICU/d' \ - -e '/MYSQL_CHECK_RE2/d' \ - -e '/MYSQL_CHECK_EDITLINE/d' \ - -e '/MYSQL_CHECK_CURL/d' \ - -e '/ADD_SUBDIRECTORY(man)/d' \ - -e '/ADD_SUBDIRECTORY(share)/d' \ - -e '/INCLUDE(cmake\/boost/d' \ - -e 's/MY_RPM rpm/MY_RPM rpmNOTEXISTENT/' \ - CMakeLists.txt || die - - # Skip building clients - echo > client/CMakeLists.txt || die - - # Forcefully disable auth plugin - if ! use ldap ; then - sed -i -e '/MYSQL_CHECK_SASL/d' CMakeLists.txt || die - echo > libmysql/authentication_ldap/CMakeLists.txt || die - fi - - cmake-utils_src_prepare -} - -multilib_src_configure() { - local mycmakeargs=( - -DINSTALL_LAYOUT=RPM - -DINSTALL_LIBDIR=$(get_libdir) - -DWITH_DEFAULT_COMPILER_OPTIONS=OFF - -DWITH_DEFAULT_FEATURE_SET=OFF - -DENABLED_LOCAL_INFILE=ON - -DMYSQL_UNIX_ADDR="${EPREFIX}/run/mysqld/mysqld.sock" - -DWITH_ZLIB=system - -DWITH_SSL=system - -DWITH_NUMA=OFF - -DLIBMYSQL_OS_OUTPUT_NAME=mysqlclient - -DSHARED_LIB_PATCH_VERSION="0" - -DCMAKE_POSITION_INDEPENDENT_CODE=ON - -DWITHOUT_SERVER=ON - ) - cmake-utils_src_configure -} - -multilib_src_install() { - cmake-utils_src_install -} - -multilib_src_install_all() { - doman \ - man/my_print_defaults.1 \ - man/perror.1 \ - man/zlib_decompress.1 - - if ! use static-libs ; then - find "${ED}" -name "*.a" -delete || die - fi -} diff --git a/dev-db/mysql-connector-c/mysql-connector-c-8.0.18.ebuild b/dev-db/mysql-connector-c/mysql-connector-c-8.0.19.ebuild index 6f10fa81b8bf..4064f2093f98 100644 --- a/dev-db/mysql-connector-c/mysql-connector-c-8.0.18.ebuild +++ b/dev-db/mysql-connector-c/mysql-connector-c-8.0.19.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -43,7 +43,8 @@ S="${WORKDIR}/mysql-${PV}" PATCHES=( "${FILESDIR}"/${PN}-8.0.18-always-build-decompress-utilities.patch "${FILESDIR}"/${PN}-8.0.17-use-relative-include-path-for-udf_registration_types-h.patch - #"${FILESDIR}"/${PN}-8.0.17-libressl.patch + "${FILESDIR}"/${PN}-8.0.19-do-not-install-comp_err.patch + "${FILESDIR}"/${PN}-8.0.19-libressl.patch ) src_prepare() { diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest index 62204d424309..0b3957fda50f 100644 --- a/dev-db/mysql/Manifest +++ b/dev-db/mysql/Manifest @@ -8,13 +8,13 @@ DIST mysql-5.6.44.tar.gz 32531507 BLAKE2B 28fbf49f699eb9f43223ffa186671b119d1601 DIST mysql-5.6.45.tar.gz 32525559 BLAKE2B 3c629aed1de808acdea6654c7413e6851507c9c5be939ca4b4f5e2796da317e9b518a749bfc03d2b0ef05bd604b39f72e24b751076b9f206b462d21fa5db4f50 SHA512 f9d8bb72e96cc83f1064fe7df2e5fe8317ca9d44c4e776cf7827a61292fbcfccec716806c80d565958383d78fef93a19d61c726687b57680d5f93299291ff168 DIST mysql-boost-5.7.26.tar.gz 51098338 BLAKE2B 1263cd75814a7293b26b0f44fd2b7d20d983f3c6a62725df9515ecac2ef252f6644810cb4bf0d6f36b98e55317f1c67ea7541228cb38d896dfedc476a5755f26 SHA512 a5f9871dc5a8e5fffc1467c3dd542533a63fe553c029120475f8fd5530d884c76ab0c33ad260daf317faf318ccef01464f6ac2dc3468efceb6bf2b6c06c54cfd DIST mysql-boost-5.7.27.tar.gz 51436383 BLAKE2B 6db64ab5fa659aae9baa3725a0de9465e48c37618ffd69f34809880c06a00ce55dce77f507810c6fa52d86901facfa42d3d1bd8db1914a779fbc88a69be82497 SHA512 573f4555f3d62bcd3dc2228bcfba023518d462bb6689114a3505ccf7c7c3061d2775a8e7a37ec3c8b9dea6e8fbc56ba599610f237abc38cedff58e75799bdc52 -DIST mysql-boost-8.0.18.tar.gz 194953221 BLAKE2B e3622cccd8f60487a5e643e522e9cdc763d63ad2a5eda86a7a7db37f48a4e1288fea88ef7097c6c4b51bd5e8fd8ba26a5b8aea3501ae847180066e2d0aa2b5dc SHA512 180091ad3e74e2afa28ecb914850e6b4e8c92b8981f32b161f53381b92120d87dbd2c2fc073feb2543bb71702bac7368e9fb992821cfd3e3ca888019423b89f5 +DIST mysql-boost-8.0.19.tar.gz 264147972 BLAKE2B 61a5ccbef1a7a675c85e4e6bda8e5285bdb931e6ee14d4710bf13dfd9157d1095200db2886dc93ea7251d3d59245f35c0bef5ba88ba6aac209b1e080f3b07dc4 SHA512 5ffc03f005ab2585694902e926b6cb2b10059b2b030549eccd3949f9c3b2f02626d02529f940dec003f2d69683856fd1c720ff12f89dfbdc48befaf24a9c4d01 DIST mysql-extras-20190817-0024Z.tar.bz2 337793 BLAKE2B dfd51a708654aff5bdbbaf2acad7ef966869a8e3adcba544ee15f217d2ba942827445841e73981bccc6c1f145b6225bfa7245114219f0cf52f0dfb85494a6830 SHA512 c2ff81be1c55636f0a2700033af030149f312f0383217054a4b8c65aef174626299fcb4539eaae967ea7d096a5bb09f5b5122dce344b44b0a135d886ba0fdf28 DIST mysql-extras-20190822-1908Z.tar.bz2 338830 BLAKE2B bc197f8e541206548d8982814e82e028d699ba9c41aec8d5191bcc46581f7880ed2741dbe2206fde44a5e8d8d54bbcf40efbd0709b357636c4c8fdb2ccc3a7bb SHA512 be469e55f7e9966638600d6836a44258c74e5600240fafe2d79eaeebe7d1695b043678184b5d18ee9946f28154bc2529586a7f860b510180a30c82454ed575c8 -DIST mysql-extras-20191016-1722Z.tar.bz2 340442 BLAKE2B fa38fc455693b940cfb96f69a35c190f7edb3fdfa7bf0e3f4e444032843ca1ad1d4767fecaf3b080f7f8885335ffe81f2355e9fe0fdebe77ac90d7fb1a0d2121 SHA512 1b4d3fb1cda63471807e37ecdd6a663672149a9eac9497d6b864a9ecdd57d179950176da2db0668892567994bd2fc1e98ea499f16dc689738331a1e319c9131c +DIST mysql-extras-20200120-1919Z.tar.bz2 342474 BLAKE2B 9c75ec0cb05fc8f86d46bc9308f07c4105c3ab228ef94c0e9e2ab9b83d03362e4ef07c4dac866350ea012c03c111e7012e0b12270b30304a988b9b54bad74864 SHA512 2739c193e9595781b742af9fdb6e0f9c9a5fde87ca652c355d3f630c8c0b45b45967e5c8cf7635fb8615174775e34ae3270b149de7ba8a9d778979c2c66069ef EBUILD mysql-5.6.44-r1.ebuild 27146 BLAKE2B f8afe1efcdaf08bf6529f931486e1ad97aef88169a9ae301ebb25888c173f799cfced4c70569ff9aa565a71c15bf26e5129de8b2e4226e2b1fe6abfe7e010ba5 SHA512 dc5d3e62fe4f47126228594a0b1b79bf191f70c6158a33890e49d0826dadf890512a604968a57cdb4ee9ead4fd9c9c3c10eebea8603f3323bf01aa1b9a1d4608 EBUILD mysql-5.6.45-r2.ebuild 27096 BLAKE2B 4185eba92b1d3455b2c9d718249a55e0a95b45f02f25ae5d65a9c3e01ad5de9bfe66793e63a2f577e3e7a9e295f40d7576070b356f6e2efcf493599f8569817e SHA512 faed98d09a85757cf2cede77fc21d83e059fcee33cfffd739f2dabe34ec905101840244f45c4bdf97f945abd79202c78b40f3b1dcc2f9edf10173741a3ea5b13 EBUILD mysql-5.7.26-r1.ebuild 31733 BLAKE2B d6e6f240727daae94a5d08773f1ec5046831c9b7faa605bcf685aac69c1a23b046a0bfba942e36779d9cbdfb616c9b847a2547b25673af7dcefc8839c6752710 SHA512 6dfe6baf03cf35e006677b7879d4c60705d57dc759608f17ac34eb0c747aa99844f7efe69c8d660dfb9863353d0ef390230972153e5901e7b527b8e59d9b4084 EBUILD mysql-5.7.27-r1.ebuild 31759 BLAKE2B 865bf492634cb00a3a373497501beeda472b477219960f012dcd74d5951e218904390039c17e5ff999a562cc12cb6bd58f0e2b0aa6efdb2e29f203171f04cecc SHA512 c0c7393a70d3be0129cba16694437f3017e97aa5f6cf8db63eb460d62ba06f5d3af8edbcb472d009f560e29ab837038dce4306bf2c2eb94f9ce026cae2204678 -EBUILD mysql-8.0.18.ebuild 36490 BLAKE2B 684a8100b4ea47fea430b5abadded1a9ebfbb4fe147ec22c622a38d5f54d735c8c38620e36da25ac75c203b318d71cce346ec411c978454833031f5996ca4b4b SHA512 3b8a79e99a0e03c557684a840717a6b91c172a9a02642e6ab1ee8e701d9b9551460bc5cafa3bc32c06516e78c2e89b0b7b9c833187a4a8348ffe5ef0fae37d13 +EBUILD mysql-8.0.19.ebuild 36657 BLAKE2B 582e2845f196809ce1561c91c481d824af0d93ea969315ed9f0d89bfe4f21a80d69553d2714ff392bbde4c4ea44cd88581a82f96ab2def19147995c04a34620a SHA512 179a409bc1bad200a6a77a03997a1b576ee0a085637e360596f27d3364f4e795ff9a01bc784cce2450b54781f216f8a9f9971c2672bbdc7a5dbc2e07f22136e0 MISC metadata.xml 1470 BLAKE2B 09754bc9a1cf5584588c4f69700919fd72a860175ae1c045ce90a644a1360d5abccedd5b2649e16fcd189e82df659ceb96fd71ab2aeccdac6256af4f80e46a0d SHA512 d96f6a133611f50b80116221e2586eff899210255efac58d9f6ef7ccd0ee0854a3322b4d4d1db15b3b2e410525f5d73e43f52a833f3ce358f6708b88b3cf00c7 diff --git a/dev-db/mysql/mysql-8.0.18.ebuild b/dev-db/mysql/mysql-8.0.19.ebuild index 6b067a6f004f..9d486bdb84a2 100644 --- a/dev-db/mysql/mysql-8.0.18.ebuild +++ b/dev-db/mysql/mysql-8.0.19.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" -MY_EXTRAS_VER="20191016-1722Z" +MY_EXTRAS_VER="20200120-1919Z" CMAKE_MAKEFILE_GENERATOR=emake @@ -35,7 +35,13 @@ IUSE="cjk cracklib debug jemalloc latin1 libressl numa +perl profiling # Tests always fail when libressl is enabled due to hard-coded ciphers in the tests RESTRICT="!test? ( test ) libressl? ( test )" -REQUIRED_USE="?? ( tcmalloc jemalloc )" +REQUIRED_USE="?? ( tcmalloc jemalloc ) + cjk? ( server ) + jemalloc? ( server ) + numa? ( server ) + profiling? ( server ) + router? ( server ) + tcmalloc? ( server )" KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" @@ -57,36 +63,38 @@ PATCHES=( "${MY_PATCH_DIR}"/20001_all_fix-minimal-build-cmake-mysql-8.0.17.patch "${MY_PATCH_DIR}"/20007_all_cmake-debug-werror-8.0.18.patch "${MY_PATCH_DIR}"/20018_all_mysql-5.7.23-fix-grant_user_lock-a-root.patch - "${MY_PATCH_DIR}"/20018_all_mysql-8.0.18-without-clientlibs-tools.patch - "${MY_PATCH_DIR}"/20018_all_mysql-8.0.17-add-protobuf-3.8+-support.patch - "${MY_PATCH_DIR}"/20018_all_mysql-8.0.18-fix-libressl-support.patch + "${MY_PATCH_DIR}"/20018_all_mysql-8.0.19-without-clientlibs-tools.patch + "${MY_PATCH_DIR}"/20018_all_mysql-8.0.19-fix-libressl-support.patch + "${MY_PATCH_DIR}"/20018_all_mysql-8.0.19-fix-events_bugs-test.patch ) # Be warned, *DEPEND are version-dependant # These are used for both runtime and compiletime COMMON_DEPEND=" >=app-arch/lz4-0_p131:= - dev-libs/icu:= dev-libs/libedit - >=dev-libs/protobuf-3.8:= - dev-libs/libevent:= - net-libs/libtirpc:= >=sys-libs/zlib-1.2.3:0= - cjk? ( app-text/mecab:= ) - jemalloc? ( dev-libs/jemalloc:0= ) - kernel_linux? ( - dev-libs/libaio:0= - sys-process/procps:0= - ) libressl? ( dev-libs/libressl:0= ) !libressl? ( >=dev-libs/openssl-1.0.0:0= ) - numa? ( sys-process/numactl ) - tcmalloc? ( dev-util/google-perftools:0= ) + server? ( + dev-libs/icu:= + dev-libs/libevent:= + >=dev-libs/protobuf-3.8:= + net-libs/libtirpc:= + cjk? ( app-text/mecab:= ) + kernel_linux? ( + dev-libs/libaio:0= + sys-process/procps:0= + ) + numa? ( sys-process/numactl ) + jemalloc? ( dev-libs/jemalloc:0= ) + tcmalloc? ( dev-util/google-perftools:0= ) + ) " DEPEND="${COMMON_DEPEND} || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) - net-libs/rpcsvc-proto virtual/yacc + server? ( net-libs/rpcsvc-proto ) test? ( acct-group/mysql acct-user/mysql dev-perl/JSON @@ -255,20 +263,9 @@ src_configure(){ mycmakeargs+=( -DWITHOUT_CLIENTLIBS=YES ) - # client/mysql.cc:1131:16: error: redefinition of ‘struct _hist_entry’ - mycmakeargs+=( - -DUSE_LIBEDIT_INTERFACE=0 - -DUSE_NEW_EDITLINE_INTERFACE=1 - -DHAVE_HIST_ENTRY=1 - ) - mycmakeargs+=( -DWITH_ICU=system - -DWITH_LIBEVENT=system -DWITH_LZ4=system - -DWITH_PROTOBUF=system - -DWITH_MECAB=$(usex cjk system OFF) - -DWITH_NUMA=$(usex numa ON OFF) # Our dev-libs/rapidjson doesn't carry necessary fixes for std::regex -DWITH_RAPIDJSON=bundled ) @@ -299,6 +296,10 @@ src_configure(){ mycmakeargs+=( -DWITH_EXTRA_CHARSETS=all -DWITH_DEBUG=$(usex debug) + -DWITH_MECAB=$(usex cjk system OFF) + -DWITH_LIBEVENT=system + -DWITH_PROTOBUF=system + -DWITH_NUMA=$(usex numa ON OFF) ) if use profiling ; then @@ -404,6 +405,8 @@ src_test() { disabled_tests+=( "sys_vars.myisam_data_pointer_size_func;87935;Test will fail on slow hardware") disabled_tests+=( "x.connection;0;Known failure - no upstream bug yet" ) disabled_tests+=( "main.mysqlpump_basic_lz4;0;Extra tool output causes false positive" ) + disabled_tests+=( "x.message_compressed_payload;0;False positive caused by protobuff-3.11+" ) + disabled_tests+=( "x.message_protobuf_nested;0;False positive caused by protobuff-3.11+" ) local test_ds for test_infos_str in "${disabled_tests[@]}" ; do |