diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-01-29 18:03:51 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-01-29 18:03:51 +0000 |
| commit | d7ed2b01311f15ba54fe8ea872aab7d59ab2b193 (patch) | |
| tree | 1814dd2b5bbf2e7639fdafbeef48d228cfaf5e9b /dev-db/mysql-connector-c | |
| parent | abaa75b10f899ada8dd05b23cc03205064394bc6 (diff) | |
gentoo resync : 29.01.2021
Diffstat (limited to 'dev-db/mysql-connector-c')
3 files changed, 0 insertions, 54 deletions
diff --git a/dev-db/mysql-connector-c/Manifest b/dev-db/mysql-connector-c/Manifest index 2b2fd7e95a15..0167c36c4567 100644 --- a/dev-db/mysql-connector-c/Manifest +++ b/dev-db/mysql-connector-c/Manifest @@ -1,7 +1,5 @@ -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.21-libressl.patch 13288 BLAKE2B 5aad519f99103e579356d89ae92dda1e2496268cebdfe8dd3797138a5efe03370365225581399bb2373b847f61e2b4be726d940cde624d3cdda94b5c69904a3a SHA512 f4d057ce159153133e100c71c65f75bd558ba1ea914cd878023dc4e4a628d63b60d0ac671a97d26863b3f48c3dc8984317bb09362378c3b96b8ed47f08c1f6ea -AUX mysql-connector-c-8.0.21-survive-malformed-charset-files.patch 580 BLAKE2B 76ea04058e14dce1cdd057b51e17d358ff582c82f27a537fb47aa66d58c88327231ca10755a6e02d0c1dab5c67d6eb92d9e9d5d74038595a203b65d3372d4577 SHA512 d8075a712bf12697499b1da2df7f43662bcce073113193e4b29261f965f10af43b1d529f1fe14ffed6c7c9bda3d3b0a61a2b3462e865724496d3d80f10c5264e AUX mysql-connector-c-8.0.22-always-build-decompress-utilities.patch 534 BLAKE2B 15bef04f750b5f373d8c5f39690e90be482bfea66430234befc777e9d84d0060d20e1290798ddacbf0e9f0f8db45ba0318d88b61aec3fd1e859285cefff446ef SHA512 7ae81f4fe020c12e45eba041dcca921fa93f42a12d8c8d840b1bec819c00de8b780a792e99cdc3cae55eef74c911de3087b6583d6213913b36428b96f0e1c3af AUX mysql-connector-c-8.0.23-libressl.patch 13374 BLAKE2B 991f1e921c3f06937c682ed5f111f1cc94a763010120c5b779bed3f4246b598e6cc7d514c6c7ce0e1783b160afd27b081ab13cfd94aa99dd43d6c4b3f32a6164 SHA512 936a9b5861c08afc4ab7db069a0dbe586ce364b0581508d726a4fb98a687badcf027f45805e0dfe82cc007f0c6c380f7f4436cb3d9023a01d797bbcf71646616 DIST mysql-boost-8.0.22.tar.gz 285934450 BLAKE2B 1ba0c9bb9a0cb74af4842d3b746f8b690c122cfbf2c6d5201ce95e59a257427a8683dd8d5c2be31dfe9ece4761366c1287fa7b841c45db222725bf76b0639bc6 SHA512 792f2ada93ec67a4679228478c6b798e81d9e9f6d13c7f4977cb7682738a4aae3cb483294edc6b2fde16c3960e51af8786216c063ab500840afd39a609e4b612 diff --git a/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.18-always-build-decompress-utilities.patch b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.18-always-build-decompress-utilities.patch deleted file mode 100644 index af0b31e89a3e..000000000000 --- a/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.18-always-build-decompress-utilities.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- a/utilities/CMakeLists.txt -+++ b/utilities/CMakeLists.txt -@@ -110,21 +110,16 @@ MYSQL_ADD_EXECUTABLE(perror - DEPENDENCIES GenError - LINK_LIBRARIES mysys - ) --IF(BUILD_BUNDLED_LZ4) -- MYSQL_ADD_EXECUTABLE(lz4_decompress -- lz4_decompress.cc -- COMPONENT Server -- LINK_LIBRARIES ${LZ4_LIBRARY} mysys -- ) --ENDIF() -- --IF(BUILD_BUNDLED_ZLIB OR NOT OPENSSL_EXECUTABLE_HAS_ZLIB) -- MYSQL_ADD_EXECUTABLE(zlib_decompress -- zlib_decompress.cc -- COMPONENT Server -- LINK_LIBRARIES ${ZLIB_LIBRARY} mysys -- ) --ENDIF() -+MYSQL_ADD_EXECUTABLE(lz4_decompress -+ lz4_decompress.cc -+ COMPONENT Server -+ LINK_LIBRARIES ${LZ4_LIBRARY} mysys -+ ) -+MYSQL_ADD_EXECUTABLE(zlib_decompress -+ zlib_decompress.cc -+ COMPONENT Server -+ LINK_LIBRARIES ${ZLIB_LIBRARY} mysys -+ ) - - # All targets below belong to COMPONENT Server and depend on InnoDB. - IF(WITHOUT_SERVER) diff --git a/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.21-survive-malformed-charset-files.patch b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.21-survive-malformed-charset-files.patch deleted file mode 100644 index 72799f009c89..000000000000 --- a/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.21-survive-malformed-charset-files.patch +++ /dev/null @@ -1,18 +0,0 @@ -Description: don't crash on malformed charset files -Origin: https://bugs.launchpad.net/ubuntu/+source/mysql-8.0/+bug/1877504/comments/19 -Bug: https://bugs.launchpad.net/ubuntu/+source/mysql-8.0/+bug/1884809 -Bug: https://bugs.gentoo.org/737002 -Forwarded: workaround, not needed - ---- a/mysys/charset.cc -+++ b/mysys/charset.cc -@@ -922,7 +922,7 @@ size_t escape_quotes_for_mysql(CHARSET_I - - void charset_uninit() { - for (CHARSET_INFO *cs : all_charsets) { -- if (cs && cs->coll->uninit) { -+ if (cs && cs->coll && cs->coll->uninit) { - cs->coll->uninit(cs); - } - } - |