From nobody Sun Dec 31 00:08:53 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T2fbp0L6Fz55br5; Sun, 31 Dec 2023 00:08:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T2fbn6TdZz3CXC; Sun, 31 Dec 2023 00:08:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703981333; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UWGBerQqOTUjp952SaI7R69BM/u8YtauLwZFqQaHmm0=; b=Bb/r1zpt39Zx0v3U38ejlk62RMWnD7ZIkVxVBGi0zhQcaCRG8cMFQQvzFKmarRjNHS+aq2 UPdXWDYZN7nL6O71YgG/CSSYBGZYNDQ3ppJ6d0osn4gE1LQNGp1tyeFTz3rjb+MQCDkZ3f Wz8mstT6qIL3mSWg05mREoyaHgbJPId8kCoGlvJtHYMGU+HJaSt49dLORCFevE3kCk7vn6 6vCa21E2GtSgvO+8hARPfVLLiDGdTESkOs21Av0a1uo868CuSTeIzVWbd+IvY+42JvyLsJ l5veWRIpKt0MWY1GjZOo0mTNQFkipjoDtY6eSfTc+RYpu69UjF5Tl+tMAskhyA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703981333; a=rsa-sha256; cv=none; b=hfvFEfzsLp4KHprfiqGPKKG6dTlS2E5HAAAfM2LjtC+Ks2khiN21jUQhlhDD5Y8N/vPla7 wqGXkjWxfGxkeRQxPkmUhlV4BPte239ffecyt4VNTL7lBD4pn9oOp9LRUeWFjDOnT7ONge KAYcB3+VPP42ZiZCevU3ImfwtZlrbX6GBPNnXZCNmHUKu9qJPxc7yoboqs0u5+rh+mW6Ki /i2A3rkR+ErvUtWOLg8Q1UXopDmBahEvV1nPZzSNB3DVwqmOZ7kIhI/TtDz0vY/MOj9TYd ZbOfHbRRqaacqUvvX1q25Q7FCTYYKllFbFKj3bZPb9bvSfAnOIUp1seZdZtXlA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703981333; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UWGBerQqOTUjp952SaI7R69BM/u8YtauLwZFqQaHmm0=; b=dyzk2WTbD52+/1sf+Hdh1PkN0zTz2fJ3CUNm6Pc8nk32ZJSe/+yJiyX0UTBVLhtaXJ9WOl 91ckDWjKnQQcY2BwF+fFsR2LRr9lYJc/LwAvwxcB/sD3AoEfIhq0Z6nDL54ItmhncKuDSs Om2r9lmGN5cuOKdNFKeJmqjgZcx5FXqWeU7BHMKiD9qwFvFQ0p6rot0gMByVIqhT3C0cqp gQsT23GPfAv+L2qEVHiOGN7vMQntTtkJNHagCkHq05QCkzKkdt1qmzcWfk5EThLrAvNFnC 1n7Wd2O9t4vGdvOhyE7psIFrKXHoKC75zh1vM3QsZuHyGi11pzsoo7aZKgA5MA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T2fbn5ZgRz19sM; Sun, 31 Dec 2023 00:08:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BV08ri9097177; Sun, 31 Dec 2023 00:08:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BV08rDe097174; Sun, 31 Dec 2023 00:08:53 GMT (envelope-from git) Date: Sun, 31 Dec 2023 00:08:53 GMT Message-Id: <202312310008.3BV08rDe097174@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: e716c4e0ead4 - main - databases/mysql57-*: Remove expired port List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e716c4e0ead482d5823056ddbb895d69bf3132da Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=e716c4e0ead482d5823056ddbb895d69bf3132da commit e716c4e0ead482d5823056ddbb895d69bf3132da Author: Muhammad Moinur Rahman AuthorDate: 2023-12-30 07:12:05 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2023-12-31 00:06:36 +0000 databases/mysql57-*: Remove expired port --- MOVED | 2 + Mk/Uses/mysql.mk | 19 +-- Mk/bsd.default-versions.mk | 2 +- databases/Makefile | 2 - databases/mysql-connector-odbc-80/Makefile | 1 - databases/mysql57-client/Makefile | 47 ------ .../mysql57-client/files/patch-CMakeLists.txt | 46 ----- .../files/patch-client_CMakeLists.txt | 54 ------ ...e_build__configurations_compiler__options.cmake | 20 --- .../files/patch-cmake_os_DragonFly.cmake | 27 --- .../files/patch-cmake_os_FreeBSD.cmake | 32 ---- .../mysql57-client/files/patch-cmake_plugin.cmake | 25 --- .../mysql57-client/files/patch-cmake_ssl.cmake | 30 ---- .../mysql57-client/files/patch-configure.cmake | 15 -- .../files/patch-extra_CMakeLists.txt | 33 ---- .../files/patch-include_CMakeLists.txt | 10 -- .../files/patch-include_my__compare.h | 11 -- .../files/patch-include_my_openssl.h | 11 -- .../mysql57-client/files/patch-include_myisam.h | 11 -- .../files/patch-libmysql_CMakeLists.txt | 11 -- .../mysql57-client/files/patch-man_CMakeLists.txt | 13 -- .../files/patch-mysys__ssl_my__default.cc | 61 ------- .../files/patch-mysys__ssl_my__kdf.cc | 20 --- .../files/patch-mysys__ssl_my__kdf.h | 11 -- .../files/patch-mysys_mf__iocache2.c | 10 -- .../mysql57-client/files/patch-mysys_my__symlink.c | 10 -- .../files/patch-scripts_CMakeLists.txt | 64 ------- .../files/patch-sql_auth_sha2_password_common.cc | 12 -- .../files/patch-storage_myisam_mi__dynrec.c | 23 --- .../files/patch-support-files_CMakeLists.txt | 27 --- databases/mysql57-client/pkg-message | 8 - databases/mysql57-client/pkg-plist | 140 ---------------- databases/mysql57-server/Makefile | 185 --------------------- databases/mysql57-server/distinfo | 3 - .../files/extra-patch-config.h.cmake | 12 -- databases/mysql57-server/files/my.cnf.sample.in | 62 ------- databases/mysql57-server/files/mysql-server.in | 79 --------- .../mysql57-server/files/patch-CMakeLists.txt | 40 ----- .../files/patch-client_CMakeLists.txt | 75 --------- ...e_build__configurations_compiler__options.cmake | 20 --- .../files/patch-cmake_os_FreeBSD.cmake | 31 ---- .../mysql57-server/files/patch-cmake_plugin.cmake | 25 --- .../mysql57-server/files/patch-cmake_ssl.cmake | 53 ------ .../files/patch-include_CMakeLists.txt | 19 --- .../files/patch-include_my__compare.h | 11 -- .../files/patch-include_my__thread__os__id.h | 15 -- .../files/patch-include_my_openssl.h | 11 -- .../mysql57-server/files/patch-include_myisam.h | 11 -- .../files/patch-libmysql_CMakeLists.txt | 30 ---- ...ch-libmysql_authentication__ldap_CMakeLists.txt | 18 -- .../files/patch-libservices_CMakeLists.txt | 9 - .../mysql57-server/files/patch-man_CMakeLists.txt | 11 -- .../files/patch-mysys__ssl_my__default.cc | 61 ------- .../files/patch-mysys__ssl_my__kdf.cc | 20 --- .../files/patch-mysys__ssl_my__kdf.h | 11 -- ...ugin_password__validation_validate__password.cc | 11 -- ...in-x-ngs-include-ngs_common-protocol_protobuf.h | 10 -- ...oup__replication_src_recovery_state_transfer.cc | 20 --- ...gcs_src_bindings_xcom_xcom_xcom_ssl_transport.c | 37 ----- .../files/patch-rapid_plugin_x_CMakeLists.txt | 19 --- .../patch-rapid_plugin_x_mysqlx__configure.cmake | 15 -- ...tch-rapid_unittest_gunit_xplugin_CMakeLists.txt | 18 -- .../files/patch-scripts_CMakeLists.txt | 45 ----- .../files/patch-scripts_mysqld__safe.txt | 19 --- .../mysql57-server/files/patch-sql_CMakeLists.txt | 11 -- .../files/patch-sql_auth_sha2_password_common.cc | 12 -- .../patch-sql_conn__handler_socket__connection.cc | 32 ---- .../files/patch-sql_locks_shared__spin__lock.cc | 11 -- databases/mysql57-server/files/patch-sql_mysqld.cc | 11 -- .../mysql57-server/files/patch-sql_sys__vars.cc | 38 ----- .../files/patch-storage_innobase_fsp_fsp0fsp.cc | 11 -- .../files/patch-storage_innobase_include_srv0mon.h | 13 -- .../files/patch-storage_myisam_mi__dynrec.c | 23 --- .../files/patch-support-files_CMakeLists.txt | 12 -- databases/mysql57-server/files/pkg-message.in | 19 --- databases/mysql57-server/pkg-descr | 2 - databases/mysql57-server/pkg-plist | 162 ------------------ graphics/digikam/Makefile | 2 +- sysutils/cfengine-devel/Makefile | 1 - sysutils/cfengine320/Makefile | 1 - sysutils/cfengine321/Makefile | 1 - sysutils/cfengine322/Makefile | 1 - sysutils/cfengine323/Makefile | 1 - www/typo3-12/Makefile | 1 - 84 files changed, 8 insertions(+), 2171 deletions(-) diff --git a/MOVED b/MOVED index 80ca6acafe27..9758dd7bd081 100644 --- a/MOVED +++ b/MOVED @@ -8283,3 +8283,5 @@ www/py-dj41-drf-yasg|www/py-dj42-drf-yasg|2023-12-31|Has expired: Extended suppo print/ghostscript9-agpl-x11|print/ghostscript10|2023-12-31|Has expired: Obsolete and unsupported upstream, consider using print/ghostscipt10 print/ghostscript9-agpl-base|print/ghostscript10|2023-12-31|Has expired: Obsolete and unsupported upstream, consider using print/ghostscipt10 www/py-dj41-django-cors-headers|www/py-dj42-django-cors-headers|2023-12-31|Has expired: Extended support of Django 4.1 ends December 2023, upgrade to the Django 4.2+ version of this port. See https://www.djangoproject.com/download/ +databases/mysql57-server|mysql80-server|2023-12-31|Has expired: Upstream support ended in October 2019 +databases/mysql57-client|mysql80-client|2023-12-31|Has expired: Upstream support ended in October 2019 diff --git a/Mk/Uses/mysql.mk b/Mk/Uses/mysql.mk index 4d14702ffc81..36d6ce454f1c 100644 --- a/Mk/Uses/mysql.mk +++ b/Mk/Uses/mysql.mk @@ -1,15 +1,14 @@ # Provide support for MySQL # Feature: mysql # Usage: USES=mysql or USES=mysql:args -# Valid ARGS: , client, server, embedded +# Valid ARGS: , client, server # # version If no version is given (by the maintainer via the port), try to # find the currently installed version. Fall back to default if # necessary (MySQL-8.0 = 80, look at bsd.default-versions.mk for # possible values). # client Depends on the libmysqlclient library (default) -# server/embedded -# Depend on the server at run/build time. If none of these is +# server Depend on the server at run/build time. If none of these is # set, depends on the client. # # IGNORE_WITH_MYSQL @@ -28,16 +27,11 @@ _INCLUDE_USES_MYSQL_MK= yes . if !empty(mysql_ARGS) .undef _WANT_MYSQL_VER .undef _WANT_MYSQL_SERVER -.undef _WANT_MYSQL_EMBEDDED _MYSQL_ARGS= ${mysql_ARGS:S/,/ /g} . if ${_MYSQL_ARGS:Mserver} _WANT_MYSQL_SERVER= yes _MYSQL_ARGS:= ${_MYSQL_ARGS:Nserver} . endif -. if ${_MYSQL_ARGS:Membedded} -_WANT_MYSQL_EMBEDDED= yes -_MYSQL_ARGS:= ${_MYSQL_ARGS:Nembedded} -. endif . if ${_MYSQL_ARGS:Mclient} _WANT_MYSQL_CLIENT= yes _MYSQL_ARGS:= ${_MYSQL_ARGS:Nclient} @@ -62,7 +56,6 @@ DEFAULT_MYSQL_VER?= ${MYSQL_DEFAULT:S/.//} # MySQL client version currently supported. # When adding a version, please keep the comment in # Mk/bsd.default-versions.mk in sync. -MYSQL57_LIBVER= 20 MYSQL80_LIBVER= 21 MYSQL81_LIBVER= 22 . for v in 5 6 11 @@ -139,14 +132,10 @@ IGNORE= cannot install: does not work with MySQL version ${MYSQL_VER} (MySQL ${ . endif . endfor . endif # IGNORE_WITH_MYSQL -. if defined(_WANT_MYSQL_SERVER) || defined(_WANT_MYSQL_EMBEDDED) +. if defined(_WANT_MYSQL_SERVER) RUN_DEPENDS+= ${LOCALBASE}/libexec/mysqld:${_MYSQL_SERVER} -. if defined(_WANT_MYSQL_EMBEDDED) -BUILD_DEPENDS+= ${LOCALBASE}/lib/mysql/libmysqld.a:${_MYSQL_SERVER} -. endif . endif -. if defined(_WANT_MYSQL_CLIENT) || \ - !(defined(_WANT_MYSQL_SERVER) || defined(_WANT_MYSQL_EMBEDDED)) +. if defined(_WANT_MYSQL_CLIENT) || !defined(_WANT_MYSQL_SERVER) LIB_DEPENDS+= ${_MYSQL_SHLIB}.so.${MYSQL${MYSQL_VER}_LIBVER}:${_MYSQL_CLIENT} . endif . else diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk index cd9f3fb5e29e..c9ec72406e7f 100644 --- a/Mk/bsd.default-versions.mk +++ b/Mk/bsd.default-versions.mk @@ -105,7 +105,7 @@ LUAJIT_DEFAULT?= luajit-devel . endif # Possible values: 5.10, 5.20, 6.8 MONO_DEFAULT?= 5.20 -# Possible values: 5.7, 8.0, 8.1, 10.5m, 10.6m, 10.11m +# Possible values: 8.0, 8.1, 10.5m, 10.6m, 10.11m MYSQL_DEFAULT?= 8.0 # Possible values: ninja, samurai NINJA_DEFAULT?= ninja diff --git a/databases/Makefile b/databases/Makefile index f1b411a3c4dc..ed20fbcf0e55 100644 --- a/databases/Makefile +++ b/databases/Makefile @@ -193,8 +193,6 @@ SUBDIR += mysql-connector-java51 SUBDIR += mysql-connector-odbc-80 SUBDIR += mysql2pgsql - SUBDIR += mysql57-client - SUBDIR += mysql57-server SUBDIR += mysql80-client SUBDIR += mysql80-server SUBDIR += mysql81-client diff --git a/databases/mysql-connector-odbc-80/Makefile b/databases/mysql-connector-odbc-80/Makefile index d08228f3f0e4..501f5ea87616 100644 --- a/databases/mysql-connector-odbc-80/Makefile +++ b/databases/mysql-connector-odbc-80/Makefile @@ -17,7 +17,6 @@ LIB_DEPENDS= libodbc.so:databases/unixODBC \ libzstd.so:archivers/zstd USES= cmake compiler:c++11-lang localbase:ldflags mysql:80 ssl -IGNORE_WITH_MYSQL= 57 USE_LDCONFIG= yes CMAKE_ARGS= -DWITH_UNIXODBC=1 -DDISABLE_GUI=1 diff --git a/databases/mysql57-client/Makefile b/databases/mysql57-client/Makefile deleted file mode 100644 index 3d09cc0edbd5..000000000000 --- a/databases/mysql57-client/Makefile +++ /dev/null @@ -1,47 +0,0 @@ -PORTNAME= mysql -PORTREVISION= 2 -PKGNAMESUFFIX= 57-client - -COMMENT= Multithreaded SQL database (client) - -LICENSE+= LGPL21 - -MASTERDIR= ${.CURDIR}/../mysql57-server - -PKGMESSAGE= ${.CURDIR}/pkg-message -PATCHDIR= ${.CURDIR}/files -PLIST= ${.CURDIR}/pkg-plist - -CONFLICTS_INSTALL= mysql5[0-68-9]-client \ - mysql[0-46-9][0-9]-client \ - mariadb[0-9][0-9]-client \ - percona[0-9][0-9]-client - -CMAKE_ARGS+= -DWITHOUT_SERVER=1 \ - -DWITH_NDBCLUSTER=1 - -USE_CXXSTD= c++14 -USE_LDCONFIG+= ${PREFIX}/lib/mysql - -MMAN1= comp_err.1 msql2mysql.1 mysql.1 mysql_config.1 mysql_config_editor.1 mysql_find_rows.1 \ - mysql_waitpid.1 mysqlaccess.1 mysqladmin.1 mysqlbinlog.1 \ - mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlshow.1 mysqlslap.1 - -CLIENT_ONLY= yes - -OPTIONS_GROUP+= PLUGINS -PLUGINS_DESC= Default Client Plugins -OPTIONS_GROUP_PLUGINS= SASLCLIENT -SASLCLIENT_DESC= SASL client plugin module -SASLCLIENT_CMAKE_BOOL= WITH_AUTHENTICATION_LDAP -SASLCLIENT_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 -SASLCLIENT_USES= ldap -OPTIONS_DEFAULT+= SASLCLIENT - -# issue 166367: adding symlinks for back-compatibility with ${lib}_r -post-install: - @${LN} -s libmysqlclient.a ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.a - @${LN} -s libmysqlclient.so ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.so - @${LN} -s libmysqlclient.so.20 ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.so.20 - -.include "${MASTERDIR}/Makefile" diff --git a/databases/mysql57-client/files/patch-CMakeLists.txt b/databases/mysql57-client/files/patch-CMakeLists.txt deleted file mode 100644 index 3e1761d68ea5..000000000000 --- a/databases/mysql57-client/files/patch-CMakeLists.txt +++ /dev/null @@ -1,46 +0,0 @@ ---- CMakeLists.txt.orig 2017-06-22 14:13:19 UTC -+++ CMakeLists.txt -@@ -610,9 +610,6 @@ IF(NOT WITHOUT_SERVER) - SET (MYSQLD_STATIC_EMBEDDED_PLUGIN_LIBS "" CACHE INTERNAL "") - # Add storage engines and plugins. - CONFIGURE_PLUGINS() --ELSE() -- # We may still want Cluster client libraries, use -DWITH_NDBCLUSTER=1 -- ADD_SUBDIRECTORY(storage/ndb) - ENDIF() - - ADD_SUBDIRECTORY(include) -@@ -647,8 +644,8 @@ ENDIF() - - ADD_SUBDIRECTORY(extra) - ADD_SUBDIRECTORY(client) --ADD_SUBDIRECTORY(sql/share) - ADD_SUBDIRECTORY(libservices) -+ADD_SUBDIRECTORY(support-files) - - IF(UNIX) - ADD_SUBDIRECTORY(man) -@@ -719,14 +716,13 @@ ELSE() - SET(CPACK_GENERATOR "TGZ") - ENDIF() - ADD_SUBDIRECTORY(packaging/WiX) --ADD_SUBDIRECTORY(packaging/solaris) - - IF(UNIX) -- INSTALL(FILES Docs/mysql.info DESTINATION ${INSTALL_INFODIR} OPTIONAL COMPONENT Info) - ENDIF() - # - # RPM installs documentation directly from the source tree - # -+IF(FALSE) - IF(NOT INSTALL_LAYOUT MATCHES "RPM") - INSTALL(FILES COPYING LICENSE.mysql - DESTINATION ${INSTALL_DOCREADMEDIR} -@@ -749,6 +745,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM") - PATTERN "sp-imp-spec.txt" EXCLUDE - ) - ENDIF() -+ENDIF() - - INCLUDE(CPack) - diff --git a/databases/mysql57-client/files/patch-client_CMakeLists.txt b/databases/mysql57-client/files/patch-client_CMakeLists.txt deleted file mode 100644 index 843117b51fd6..000000000000 --- a/databases/mysql57-client/files/patch-client_CMakeLists.txt +++ /dev/null @@ -1,54 +0,0 @@ ---- client/CMakeLists.txt.orig 2016-03-28 18:06:12 UTC -+++ client/CMakeLists.txt -@@ -47,6 +47,7 @@ IF(UNIX) - TARGET_LINK_LIBRARIES(mysql ${EDITLINE_LIBRARY}) - ENDIF(UNIX) - -+IF(FALSE) - IF(NOT WITHOUT_SERVER) - MYSQL_ADD_EXECUTABLE(mysql_upgrade - upgrade/program.cc -@@ -57,10 +58,13 @@ ADD_COMPILE_FLAGS( - TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient client_base mysqlcheck_core) - ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs GenSysSchema) - ENDIF() -+ENDIF() - -+IF(FALSE) - MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test) - SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS") - TARGET_LINK_LIBRARIES(mysqltest mysqlclient regex) - ADD_DEPENDENCIES(mysqltest GenError) -+ENDIF() - - ADD_CONVENIENCE_LIBRARY(mysqlcheck_core check/mysqlcheck_core.cc) -@@ -78,8 +82,10 @@ TARGET_LINK_LIBRARIES(mysqlimport mysqlc - MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c) - TARGET_LINK_LIBRARIES(mysqlshow mysqlclient) - -+IF(FALSE) - MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c) - TARGET_LINK_LIBRARIES(mysql_plugin mysqlclient) -+ENDIF() - - MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc) - ADD_COMPILE_FLAGS( -@@ -98,8 +104,10 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlcli - MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc) - TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient) - -+IF(FALSE) - MYSQL_ADD_EXECUTABLE(mysql_secure_installation mysql_secure_installation.cc) - TARGET_LINK_LIBRARIES(mysql_secure_installation mysqlclient) -+ENDIF() - - IF(UNIX AND NOT WITHOUT_SERVER) - MYSQL_ADD_EXECUTABLE(mysql_install_db -@@ -122,7 +130,6 @@ IF(WIN32) - ENDIF(WIN32) - - SET_TARGET_PROPERTIES ( -- mysql_plugin - mysqlcheck - mysqldump - mysqlimport diff --git a/databases/mysql57-client/files/patch-cmake_build__configurations_compiler__options.cmake b/databases/mysql57-client/files/patch-cmake_build__configurations_compiler__options.cmake deleted file mode 100644 index f8c13ec7c398..000000000000 --- a/databases/mysql57-client/files/patch-cmake_build__configurations_compiler__options.cmake +++ /dev/null @@ -1,20 +0,0 @@ ---- cmake/build_configurations/compiler_options.cmake.orig 2016-08-25 11:52:06 UTC -+++ cmake/build_configurations/compiler_options.cmake -@@ -43,7 +43,7 @@ IF(UNIX) - - # Default GCC flags - IF(CMAKE_COMPILER_IS_GNUCC) -- SET(COMMON_C_FLAGS "-fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing") -+ SET(COMMON_C_FLAGS "-fno-omit-frame-pointer -fno-strict-aliasing") - # Disable inline optimizations for valgrind testing to avoid false positives - IF(WITH_VALGRIND) - STRING_PREPEND(COMMON_C_FLAGS "-fno-inline ") -@@ -68,7 +68,7 @@ IF(UNIX) - ENDIF() - ENDIF() - IF(CMAKE_COMPILER_IS_GNUCXX) -- SET(COMMON_CXX_FLAGS "-fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing") -+ SET(COMMON_CXX_FLAGS "-fno-omit-frame-pointer -fno-strict-aliasing") - # GCC 6 has C++14 as default, set it explicitly to the old default. - EXECUTE_PROCESS(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion - OUTPUT_VARIABLE GXX_VERSION) diff --git a/databases/mysql57-client/files/patch-cmake_os_DragonFly.cmake b/databases/mysql57-client/files/patch-cmake_os_DragonFly.cmake deleted file mode 100644 index 83c154ee3bcf..000000000000 --- a/databases/mysql57-client/files/patch-cmake_os_DragonFly.cmake +++ /dev/null @@ -1,27 +0,0 @@ ---- cmake/os/DragonFly.cmake.orig 2016-04-14 10:16:17 UTC -+++ cmake/os/DragonFly.cmake -@@ -0,0 +1,24 @@ -+INCLUDE(CheckCSourceRuns) -+ -+# We require at least GCC 4.4 or Clang 3.3. -+IF(NOT FORCE_UNSUPPORTED_COMPILER) -+ IF(CMAKE_COMPILER_IS_GNUCC) -+ EXECUTE_PROCESS(COMMAND ${CMAKE_C_COMPILER} -dumpversion -+ OUTPUT_VARIABLE GCC_VERSION) -+ IF(GCC_VERSION VERSION_LESS 4.4) -+ MESSAGE(FATAL_ERROR "GCC 4.4 or newer is required!") -+ ENDIF() -+ ELSEIF(CMAKE_C_COMPILER_ID MATCHES "Clang") -+ CHECK_C_SOURCE_RUNS(" -+ int main() -+ { -+ return (__clang_major__ < 3) || -+ (__clang_major__ == 3 && __clang_minor__ < 3); -+ }" HAVE_SUPPORTED_CLANG_VERSION) -+ IF(NOT HAVE_SUPPORTED_CLANG_VERSION) -+ MESSAGE(FATAL_ERROR "Clang 3.3 or newer is required!") -+ ENDIF() -+ ELSE() -+ MESSAGE(FATAL_ERROR "Unsupported compiler!") -+ ENDIF() -+ENDIF() diff --git a/databases/mysql57-client/files/patch-cmake_os_FreeBSD.cmake b/databases/mysql57-client/files/patch-cmake_os_FreeBSD.cmake deleted file mode 100644 index e2f70f193360..000000000000 --- a/databases/mysql57-client/files/patch-cmake_os_FreeBSD.cmake +++ /dev/null @@ -1,32 +0,0 @@ ---- cmake/os/FreeBSD.cmake.orig 2018-10-04 05:48:22 UTC -+++ cmake/os/FreeBSD.cmake -@@ -30,12 +30,26 @@ IF(NOT FORCE_UNSUPPORTED_COMPILER) - IF(NOT HAVE_SUPPORTED_CLANG_VERSION) - MESSAGE(FATAL_ERROR "Clang 3.3 or newer is required!") - ENDIF() -- ELSE() -- MESSAGE(FATAL_ERROR "Unsupported compiler!") -+ CHECK_C_SOURCE_RUNS(" -+ int main() -+ { -+ return (__clang_major__ >= 4); -+ }" I386_ATOMIC_BUILTINS) -+ IF((CMAKE_SYSTEM_PROCESSOR MATCHES "i386") AND (NOT I386_ATOMIC_BUILTINS)) -+ SET(HAVE_GCC_ATOMIC_BUILTINS CACHE INTERNAL "") -+ ENDIF() -+ ELSEIF(CMAKE_COMPILER_IS_GNUCC) -+ EXECUTE_PROCESS(COMMAND ${CMAKE_C_COMPILER} -dumpversion -+ OUTPUT_VARIABLE GCC_VERSION) -+ IF(GCC_VERSION VERSION_LESS 4.4) -+ MESSAGE(FATAL_ERROR "GCC 4.4 or newer is required!") -+ ENDIF() - ENDIF() - ENDIF() - - # Should not be needed any more, but kept for easy resurrection if needed - # #Legacy option, maybe not needed anymore , taken as is from autotools build - # ADD_DEFINITIONS(-DNET_RETRY_COUNT=1000000) -- -+# For GCC maybe it's also good idea to use -+# ADD_DEFINITIONS(-D_GNU_SOURCE) -+ diff --git a/databases/mysql57-client/files/patch-cmake_plugin.cmake b/databases/mysql57-client/files/patch-cmake_plugin.cmake deleted file mode 100644 index 77b38c747b61..000000000000 --- a/databases/mysql57-client/files/patch-cmake_plugin.cmake +++ /dev/null @@ -1,25 +0,0 @@ ---- cmake/plugin.cmake.orig 2017-06-22 14:13:19 UTC -+++ cmake/plugin.cmake -@@ -263,13 +270,17 @@ MACRO(MYSQL_ADD_PLUGIN) - MYSQL_INSTALL_TARGETS(${target} - DESTINATION ${INSTALL_PLUGINDIR} - COMPONENT ${INSTALL_COMPONENT}) -- INSTALL_DEBUG_TARGET(${target} -- DESTINATION ${INSTALL_PLUGINDIR}/debug -- COMPONENT ${INSTALL_COMPONENT}) -+ IF(CMAKE_BUILD_TYPE MATCHES "Debug") -+ INSTALL_DEBUG_TARGET(${target} -+ DESTINATION ${INSTALL_PLUGINDIR}/debug -+ COMPONENT ${INSTALL_COMPONENT}) -+ # Add installed files to list for RPMs -+ FILE(APPEND ${CMAKE_BINARY_DIR}/support-files/plugins.files -+ "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/debug/${ARG_MODULE_OUTPUT_NAME}.so\n") -+ ENDIF() - # Add installed files to list for RPMs - FILE(APPEND ${CMAKE_BINARY_DIR}/support-files/plugins.files -- "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/${ARG_MODULE_OUTPUT_NAME}.so\n" -- "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/debug/${ARG_MODULE_OUTPUT_NAME}.so\n") -+ "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/${ARG_MODULE_OUTPUT_NAME}.so\n") - # For internal testing in PB2, append collections files - IF(DEFINED ENV{PB2WORKDIR}) - PLUGIN_APPEND_COLLECTIONS(${plugin}) diff --git a/databases/mysql57-client/files/patch-cmake_ssl.cmake b/databases/mysql57-client/files/patch-cmake_ssl.cmake deleted file mode 100644 index 6efbcd0e492d..000000000000 --- a/databases/mysql57-client/files/patch-cmake_ssl.cmake +++ /dev/null @@ -1,30 +0,0 @@ ---- cmake/ssl.cmake.orig 2023-10-25 22:22:28.748647000 +0200 -+++ cmake/ssl.cmake 2023-10-30 19:12:39.388494000 +0100 -@@ -232,13 +232,6 @@ MACRO (MYSQL_CHECK_SSL) - MESSAGE(STATUS "OPENSSL_APPLINK_C ${OPENSSL_APPLINK_C}") - ENDIF() - -- # On mac this list is <.dylib;.so;.a> -- # We prefer static libraries, so we reverse it here. -- IF (WITH_SSL_PATH) -- LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES) -- MESSAGE(STATUS "suffixes <${CMAKE_FIND_LIBRARY_SUFFIXES}>") -- ENDIF() -- - FIND_LIBRARY(OPENSSL_LIBRARY - NAMES ssl libssl ssleay32 ssleay32MD - HINTS ${OPENSSL_ROOT_DIR}/lib) -@@ -253,9 +246,10 @@ MACRO (MYSQL_CHECK_SSL) - FIND_OPENSSL_VERSION() - ENDIF() - -- IF("${OPENSSL_VERSION}" VERSION_GREATER "1.1.0") -- ADD_DEFINITIONS(-DHAVE_TLSv13) -- SET(HAVE_TLSv13 1) -+ CHECK_SYMBOL_EXISTS(TLS1_3_VERSION "openssl/tls1.h" HAVE_TLS1_3_VERSION) -+ IF(HAVE_TLS1_3_VERSION) -+ #ADD_DEFINITIONS(-DHAVE_TLSv13) -+ #SET(HAVE_TLSv13 1) - IF(SOLARIS) - SET(FORCE_SSL_SOLARIS "-Wl,--undefined,address_of_sk_new_null") - ENDIF() diff --git a/databases/mysql57-client/files/patch-configure.cmake b/databases/mysql57-client/files/patch-configure.cmake deleted file mode 100644 index 81ab9495aac3..000000000000 --- a/databases/mysql57-client/files/patch-configure.cmake +++ /dev/null @@ -1,15 +0,0 @@ ---- configure.cmake.orig 2018-01-16 23:26:09 UTC -+++ configure.cmake -@@ -43,6 +43,12 @@ IF(UNIX) - ENDIF() - - -+IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD") -+ SET(CMAKE_SHARED_LIBRARY_C_FLAGS -+ "${CMAKE_SHARED_LIBRARY_C_FLAGS} ${CMAKE_C_FLAGS} -L%%FREEBSD_LOCAL_LIB%%") -+ENDIF() -+ -+ - IF(CMAKE_SYSTEM_NAME MATCHES "SunOS" AND CMAKE_COMPILER_IS_GNUCXX) - ## We will be using gcc to generate .so files - ## Add C flags (e.g. -m64) to CMAKE_SHARED_LIBRARY_C_FLAGS diff --git a/databases/mysql57-client/files/patch-extra_CMakeLists.txt b/databases/mysql57-client/files/patch-extra_CMakeLists.txt deleted file mode 100644 index 045b98549e41..000000000000 --- a/databases/mysql57-client/files/patch-extra_CMakeLists.txt +++ /dev/null @@ -1,33 +0,0 @@ ---- extra/CMakeLists.txt.orig 2016-03-28 18:06:12 UTC -+++ extra/CMakeLists.txt -@@ -45,6 +45,7 @@ ENDIF() - - ADD_CUSTOM_COMMAND(OUTPUT ${PROJECT_BINARY_DIR}/include/mysqld_error.h - ${PROJECT_BINARY_DIR}/sql/share/english/errmsg.sys -+ COMMAND mkdir -p ${PROJECT_BINARY_DIR}/sql/share/ - COMMAND comp_err - --charset=${PROJECT_SOURCE_DIR}/sql/share/charsets - --out-dir=${PROJECT_BINARY_DIR}/sql/share/ -@@ -73,6 +74,7 @@ IF (WIN32 AND WITH_SSL_PATH AND HAVE_CRY - ENDIF() - - -+IF(FALSE) - MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c) - TARGET_LINK_LIBRARIES(my_print_defaults mysys mysys_ssl) - SET_TARGET_PROPERTIES(my_print_defaults PROPERTIES LINKER_LANGUAGE CXX) -@@ -142,11 +144,14 @@ IF(WITH_INNOBASE_STORAGE_ENGINE) - TARGET_LINK_LIBRARIES(innochecksum mysys mysys_ssl ${LZ4_LIBRARY}) - ADD_DEPENDENCIES(innochecksum GenError) - ENDIF() -+ENDIF() - -+IF(FALSE) - IF(UNIX) - MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.cc) - TARGET_LINK_LIBRARIES(resolve_stack_dump mysys mysys_ssl) - ENDIF() -+ENDIF() - - # In published release builds on Solaris, we need to bundle gcc source. - # PB2 will take care of putting it in extra/ when needed diff --git a/databases/mysql57-client/files/patch-include_CMakeLists.txt b/databases/mysql57-client/files/patch-include_CMakeLists.txt deleted file mode 100644 index 1fc41ad15601..000000000000 --- a/databases/mysql57-client/files/patch-include_CMakeLists.txt +++ /dev/null @@ -1,10 +0,0 @@ ---- include/CMakeLists.txt.orig 2016-03-28 18:06:12 UTC -+++ include/CMakeLists.txt -@@ -38,6 +38,7 @@ SET(HEADERS_ABI - - SET(HEADERS - ${HEADERS_ABI} -+ hash.h - my_dbug.h - m_string.h - my_sys.h diff --git a/databases/mysql57-client/files/patch-include_my__compare.h b/databases/mysql57-client/files/patch-include_my__compare.h deleted file mode 100644 index 1a64142bb658..000000000000 --- a/databases/mysql57-client/files/patch-include_my__compare.h +++ /dev/null @@ -1,11 +0,0 @@ ---- include/my_compare.h.orig 2016-03-28 18:06:12 UTC -+++ include/my_compare.h -@@ -40,7 +40,7 @@ extern "C" { - But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH. - */ - --#define HA_MAX_KEY_LENGTH 1000 /* Max length in bytes */ -+#define HA_MAX_KEY_LENGTH 4000 /* Max length in bytes */ - #define HA_MAX_KEY_SEG 16 /* Max segments for key */ - - #define HA_MAX_POSSIBLE_KEY_BUFF (HA_MAX_KEY_LENGTH + 24+ 6+6) diff --git a/databases/mysql57-client/files/patch-include_my_openssl.h b/databases/mysql57-client/files/patch-include_my_openssl.h deleted file mode 100644 index 43ddb2935038..000000000000 --- a/databases/mysql57-client/files/patch-include_my_openssl.h +++ /dev/null @@ -1,11 +0,0 @@ ---- include/my_openssl.h.orig 2020-03-23 17:35:17 UTC -+++ include/my_openssl.h -@@ -51,7 +51,7 @@ extern "C" { - */ - static inline int mysql_OPENSSL_init() - { --#if defined(HAVE_STATIC_OPENSSL) -+#if defined(HAVE_STATIC_OPENSSL) && !defined(LIBRESSL_VERSION_NUMBER) - return OPENSSL_init_crypto(OPENSSL_INIT_NO_ATEXIT, NULL); - #else - return SSL_library_init(); diff --git a/databases/mysql57-client/files/patch-include_myisam.h b/databases/mysql57-client/files/patch-include_myisam.h deleted file mode 100644 index 0a4b795e9426..000000000000 --- a/databases/mysql57-client/files/patch-include_myisam.h +++ /dev/null @@ -1,11 +0,0 @@ ---- include/myisam.h.orig 2016-03-28 18:06:12 UTC -+++ include/myisam.h -@@ -45,7 +45,7 @@ extern "C" { - The following defines can be increased if necessary. - But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and MI_MAX_KEY_LENGTH. - */ --#define MI_MAX_KEY_LENGTH 1000 /* Max length in bytes */ -+#define MI_MAX_KEY_LENGTH 4000 /* Max length in bytes */ - #define MI_MAX_KEY_SEG 16 /* Max segments for key */ - - #define MI_MAX_KEY_BUFF (MI_MAX_KEY_LENGTH+MI_MAX_KEY_SEG*6+8+8) diff --git a/databases/mysql57-client/files/patch-libmysql_CMakeLists.txt b/databases/mysql57-client/files/patch-libmysql_CMakeLists.txt deleted file mode 100644 index b90821a7f767..000000000000 --- a/databases/mysql57-client/files/patch-libmysql_CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- libmysql/CMakeLists.txt.orig 2016-03-28 18:06:12 UTC -+++ libmysql/CMakeLists.txt -@@ -260,7 +260,7 @@ IF(NOT DISABLE_SHARED) - COMPONENT SharedLibraries) - IF(UNIX) - # libtool compatability -- IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE) -+ IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD|DragonFly" OR APPLE) - SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}") - ELSE() - SET(OS_SHARED_LIB_VERSION diff --git a/databases/mysql57-client/files/patch-man_CMakeLists.txt b/databases/mysql57-client/files/patch-man_CMakeLists.txt deleted file mode 100644 index e02a804949d8..000000000000 --- a/databases/mysql57-client/files/patch-man_CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ ---- man/CMakeLists.txt.orig 2015-11-29 19:16:24 UTC -+++ man/CMakeLists.txt -@@ -15,10 +15,6 @@ - - # Copy man pages - FILE(GLOB MAN1_FILES *.1) --FILE(GLOB MAN1_EXCLUDE make_win_bin_dist.1) --FILE(GLOB MAN1_NDB ndb*.1) --FILE(GLOB MAN8_FILES *.8) --FILE(GLOB MAN8_NDB ndb*.8) - IF(MAN1_FILES) - IF(MAN1_EXCLUDE) - LIST(REMOVE_ITEM MAN1_FILES ${MAN1_EXCLUDE}) diff --git a/databases/mysql57-client/files/patch-mysys__ssl_my__default.cc b/databases/mysql57-client/files/patch-mysys__ssl_my__default.cc deleted file mode 100644 index ea05679341fa..000000000000 --- a/databases/mysql57-client/files/patch-mysys__ssl_my__default.cc +++ /dev/null @@ -1,61 +0,0 @@ ---- mysys_ssl/my_default.cc.orig 2016-08-25 11:52:06 UTC -+++ mysys_ssl/my_default.cc -@@ -114,7 +114,7 @@ static my_bool defaults_already_read= FA - - /* Which directories are searched for options (and in which order) */ - --#define MAX_DEFAULT_DIRS 6 -+#define MAX_DEFAULT_DIRS 7 - #define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1) /* Terminate with NULL */ - static const char **default_directories = NULL; - -@@ -914,6 +914,14 @@ static int search_default_file_with_ext( - return 1; /* Ignore wrong files */ - } - -+ if (strstr(name, "/etc") == name) -+ { -+ fprintf(stderr, -+ "error: Config file %s in invalid location, please move to or merge with /usr/local%s\n", -+ name,name); -+ goto err; -+ } -+ - while (mysql_file_getline(buff, sizeof(buff) - 1, fp, is_login_file)) - { - line++; -@@ -1252,7 +1260,8 @@ void my_print_default_files(const char * - end[(strlen(end)-1)] = ' '; - else - strxmov(end, conf_file, *ext , " ", NullS); -- fputs(name, stdout); -+ if (strstr(name, "/etc") != name) -+ fputs(name, stdout); - } - } - } -@@ -1411,13 +1420,8 @@ static const char **init_default_directo - - #else - -- errors += add_directory(alloc, "/etc/", dirs); -- errors += add_directory(alloc, "/etc/mysql/", dirs); -- --#if defined(DEFAULT_SYSCONFDIR) -- if (DEFAULT_SYSCONFDIR[0]) -- errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs); --#endif /* DEFAULT_SYSCONFDIR */ -+ errors += add_directory(alloc, "/usr/local/etc/", dirs); -+ errors += add_directory(alloc, "/usr/local/etc/mysql/", dirs); - - #endif - -@@ -1488,7 +1492,7 @@ int check_file_permissions(const char *f - MY_STAT stat_info; - - if (!my_stat(file_name,&stat_info,MYF(0))) -- return 1; -+ return 0; - /* - Ignore .mylogin.cnf file if not exclusively readable/writable - by current user. diff --git a/databases/mysql57-client/files/patch-mysys__ssl_my__kdf.cc b/databases/mysql57-client/files/patch-mysys__ssl_my__kdf.cc deleted file mode 100644 index f01df5434093..000000000000 --- a/databases/mysql57-client/files/patch-mysys__ssl_my__kdf.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- mysys_ssl/my_kdf.cc.orig 2022-11-04 07:31:17 UTC -+++ mysys_ssl/my_kdf.cc -@@ -59,7 +59,7 @@ int create_kdf_key(const unsigned char *key, const uns - Key_derivation_function *kdf_function = NULL; - - if (kdf_name == "hkdf") { --#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) - kdf_function = new Key_hkdf_function(kdf_options); - #else - return 1; -@@ -87,7 +87,7 @@ Key_derivation_function::Key_derivation_function() { - options_valid_ = false; - } - --#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) - Key_hkdf_function::Key_hkdf_function(vector *kdf_options) { - kdf_options_ = kdf_options; - } diff --git a/databases/mysql57-client/files/patch-mysys__ssl_my__kdf.h b/databases/mysql57-client/files/patch-mysys__ssl_my__kdf.h deleted file mode 100644 index 5366bfbe1d32..000000000000 --- a/databases/mysql57-client/files/patch-mysys__ssl_my__kdf.h +++ /dev/null @@ -1,11 +0,0 @@ ---- mysys_ssl/my_kdf.h.orig 2022-11-04 07:35:11 UTC -+++ mysys_ssl/my_kdf.h -@@ -61,7 +61,7 @@ class Key_derivation_function { - bool options_valid_; - }; - --#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) - - /** Class to implement KDF method hkdf. */ - class Key_hkdf_function : public Key_derivation_function { diff --git a/databases/mysql57-client/files/patch-mysys_mf__iocache2.c b/databases/mysql57-client/files/patch-mysys_mf__iocache2.c deleted file mode 100644 index 10663953a1d5..000000000000 --- a/databases/mysql57-client/files/patch-mysys_mf__iocache2.c +++ /dev/null @@ -1,10 +0,0 @@ ---- mysys/mf_iocache2.c.orig 2018-10-28 11:22:04 UTC -+++ mysys/mf_iocache2.c -@@ -19,6 +19,7 @@ - - #include "mysys_priv.h" - #include "my_sys.h" -+#include "mysql/psi/mysql_file.h" - #include - #include - #include diff --git a/databases/mysql57-client/files/patch-mysys_my__symlink.c b/databases/mysql57-client/files/patch-mysys_my__symlink.c deleted file mode 100644 index 1a392a41660c..000000000000 --- a/databases/mysql57-client/files/patch-mysys_my__symlink.c +++ /dev/null @@ -1,10 +0,0 @@ ---- mysys/my_symlink.c.orig 2017-07-19 12:10:42 UTC -+++ mysys/my_symlink.c -@@ -23,6 +23,7 @@ - #include - #include - #endif -+#include "my_dir.h" - - /* - Reads the content of a symbolic link diff --git a/databases/mysql57-client/files/patch-scripts_CMakeLists.txt b/databases/mysql57-client/files/patch-scripts_CMakeLists.txt deleted file mode 100644 index 493e407cbff5..000000000000 --- a/databases/mysql57-client/files/patch-scripts_CMakeLists.txt +++ /dev/null @@ -1,64 +0,0 @@ ---- scripts/CMakeLists.txt.orig 2019-06-10 10:43:20.000000000 -0400 -+++ scripts/CMakeLists.txt 2019-08-01 10:59:24.177559000 -0400 -@@ -46,6 +46,7 @@ - MESSAGE(FATAL_ERROR "Cannot concatenate files") - ENDIF() - -+IF(FALSE) - # Build mysql_fix_privilege_tables.c - ADD_CUSTOM_COMMAND( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/mysql_fix_privilege_tables_sql.c -@@ -66,6 +67,7 @@ - DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/mysql_fix_privilege_tables_sql.c - ${CMAKE_CURRENT_BINARY_DIR}/sql_commands_sys_schema.h - ) -+ENDIF() - - # If we do not have performance schema compiled in then sys will not work, - # so only create an empty sys database with an auto-generated file, -@@ -146,6 +148,7 @@ - ) - ENDIF() - -+IF(FALSE) - IF(UNIX) - FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/make_binary_distribution - "cd ${CMAKE_BINARY_DIR} && '${CMAKE_CPACK_COMMAND}' -G TGZ --config CPackConfig.cmake\n" ) -@@ -153,6 +156,7 @@ - COMMAND chmod +x ${CMAKE_CURRENT_BINARY_DIR}/make_binary_distribution - ) - ENDIF() -+ENDIF() - - IF(NOT WITHOUT_SERVER) - INSTALL(FILES -@@ -326,6 +330,8 @@ - GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE) - STRING(REGEX REPLACE "^lib" "" lib "${lib}") - SET(${var} "${${var}}-l${lib} " ) -+ ELSEIF(lib STREQUAL "-pthread") -+ SET(${var} "${${var}}-pthread " ) - ELSE() - SET(${var} "${${var}}-l${lib} " ) - ENDIF() -@@ -411,19 +417,7 @@ - # On Unix, most of the files end up in the bin directory - SET(mysql_config_COMPONENT COMPONENT Development) - -- IF(WITH_SYSTEMD) -- SET(BIN_SCRIPTS -- mysql_config -- mysqldumpslow -- ) -- ELSE() -- SET(BIN_SCRIPTS -- mysql_config -- mysqldumpslow -- mysqld_multi -- mysqld_safe -- ) -- ENDIF() -+ SET(BIN_SCRIPTS mysql_config) - - SET(PKGCONFIG_FILE ${LIBMYSQL_OS_OUTPUT_NAME}.pc) - STRING(REGEX REPLACE "/mysql$" "" PKGCONFIG_DIR "${INSTALL_LIBDIR}") diff --git a/databases/mysql57-client/files/patch-sql_auth_sha2_password_common.cc b/databases/mysql57-client/files/patch-sql_auth_sha2_password_common.cc deleted file mode 100644 index 567a7da1628c..000000000000 --- a/databases/mysql57-client/files/patch-sql_auth_sha2_password_common.cc +++ /dev/null @@ -1,12 +0,0 @@ ---- sql/auth/sha2_password_common.cc -+++ sql/auth/sha2_password_common.cc -@@ -116,7 +116,8 @@ bool SHA256_digest::retrieve_digest(unsigned char *digest, - DBUG_RETURN(true); - } - m_ok= EVP_DigestFinal_ex(md_context, m_digest, NULL); --#if defined(HAVE_WOLFSSL) || OPENSSL_VERSION_NUMBER < 0x10100000L -+#if defined(HAVE_WOLFSSL) || OPENSSL_VERSION_NUMBER < 0x10100000L || \ -+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x02090000fL) - EVP_MD_CTX_cleanup(md_context); - #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */ - EVP_MD_CTX_reset(md_context); diff --git a/databases/mysql57-client/files/patch-storage_myisam_mi__dynrec.c b/databases/mysql57-client/files/patch-storage_myisam_mi__dynrec.c deleted file mode 100644 index 282cffdbcbc5..000000000000 --- a/databases/mysql57-client/files/patch-storage_myisam_mi__dynrec.c +++ /dev/null @@ -1,23 +0,0 @@ ---- storage/myisam/mi_dynrec.c.orig 2016-03-28 18:06:12 UTC -+++ storage/myisam/mi_dynrec.c -@@ -65,18 +65,13 @@ my_bool mi_dynmap_file(MI_INFO *info, my - DBUG_RETURN(1); - } - /* -- I wonder if it is good to use MAP_NORESERVE. From the Linux man page: -- MAP_NORESERVE -- Do not reserve swap space for this mapping. When swap space is -- reserved, one has the guarantee that it is possible to modify the -- mapping. When swap space is not reserved one might get SIGSEGV -- upon a write if no physical memory is available. -+ MAP_NORESERVE is unimplemented in FreeBSD - */ - info->s->file_map= (uchar*) - my_mmap(0, (size_t) size, - info->s->mode==O_RDONLY ? PROT_READ : - PROT_READ | PROT_WRITE, -- MAP_SHARED | MAP_NORESERVE, -+ MAP_SHARED, - info->dfile, 0L); - if (info->s->file_map == (uchar*) MAP_FAILED) - { diff --git a/databases/mysql57-client/files/patch-support-files_CMakeLists.txt b/databases/mysql57-client/files/patch-support-files_CMakeLists.txt deleted file mode 100644 index 405d4f734914..000000000000 --- a/databases/mysql57-client/files/patch-support-files_CMakeLists.txt +++ /dev/null @@ -1,27 +0,0 @@ ---- support-files/CMakeLists.txt.orig 2017-03-18 07:45:14 UTC -+++ support-files/CMakeLists.txt -@@ -47,6 +47,7 @@ IF(UNIX) - SET (PIDOF "pgrep -d' ' -f") - ENDIF() - SET(prefix ${CMAKE_INSTALL_PREFIX}) -+IF (FALSE) - FOREACH(script mysqld_multi.server mysql-log-rotate) - CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh - ${CMAKE_CURRENT_BINARY_DIR}/${script} @ONLY ) -@@ -59,9 +60,11 @@ IF(UNIX) - IF(INSTALL_SUPPORTFILESDIR) - INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles) - ENDIF() -+ENDIF() - - INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development) - -+IF(FALSE) *** 1886 LINES SKIPPED ***