From d7ed2b01311f15ba54fe8ea872aab7d59ab2b193 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Fri, 29 Jan 2021 18:03:51 +0000
Subject: gentoo resync : 29.01.2021

---
 ...-8.0.18-always-build-decompress-utilities.patch | 34 ----------------------
 ...-c-8.0.21-survive-malformed-charset-files.patch | 18 ------------
 2 files changed, 52 deletions(-)
 delete mode 100644 dev-db/mysql-connector-c/files/mysql-connector-c-8.0.18-always-build-decompress-utilities.patch
 delete mode 100644 dev-db/mysql-connector-c/files/mysql-connector-c-8.0.21-survive-malformed-charset-files.patch

(limited to 'dev-db/mysql-connector-c/files')

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);
-     }
-   }
- 
-- 
cgit v1.2.3