From nobody Sun May 28 11:51:29 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 4QTcSd4m4fz4XHRq; Sun, 28 May 2023 11:51:29 +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 4QTcSd4G2fz3wrv; Sun, 28 May 2023 11:51:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685274689; 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=LuB9KwRtI5xDc4oKIfR2kk1dfQo/XTyVdjWy2OCai0Y=; b=TqLmbQwgor4+HwWdqYq7xjYnQhH+LDTzndZqlGf7RDtgHuNdiJ6MkR72g4Lq3rGM3DBLhP D7zTqS/3Swxhteb9RjZ0OO8ZbKaao3TM/GTIuio1DiRU5PZSBQ4mwSJ5yKqr7mNqGLaoPO 6AdNZCjl6X7+Bw0Mbo5y21r+KUoUW2uP7zo0KpLhaGQCyl6//V0bGRseULoGNifqEMzrmB 2Q5wmBZ03uNKgz0hT+y5T5QP1Tl6kaT/lGkTKFJSZ8rqIDU+uxiy5VErDBNqPJurGwuAKe utoOnkL0xJJkVjr7DhN0Bgt9envn0hrjGhZz0GwLgELibKYSr79uWTkYMPHqXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685274689; 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=LuB9KwRtI5xDc4oKIfR2kk1dfQo/XTyVdjWy2OCai0Y=; b=KMNhCwCCLjdU7xDJIKaCPg6NsiODLs6kwj5i07ro6ZqV5cQO+bgZQUjnV5vacA2qSbOf9q rWDAQI3LAIrwKc322cFFUdZoiXKX7XrMydVGHKY2/omhGkZO2LEGOI82K4y4HmVVn3P2OJ MZANCoswqYaYHgLSCAZC0I8bdJeb/S9FaaMPeUIJk6projT1J12HzK7oJF7t524lALEs0R ApZkDfnjh0b89T/RLBSSqiF8YAhP/pETQs9diSm1rX7AaWglyAr2tXUpwR+x3slJfYfs9m Z7sSEv8akVPhTI5kRnYogLN8FIVDnt5lrMfzdaQCx3Q2Bhp5Z99DLp/mVzCiog== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685274689; a=rsa-sha256; cv=none; b=STgPAf8btdpapPydrr/pGl/6J8odOtPNIQwfl+AwvBlztOmMF0RFtNPndsAK71oGUO4f6p AsBGFCYKkC2Z9oolekbSVyP1K2osB4RcDFk7v+CNTf2NbHrnWX1F0E6SaeZ5yRIJGFBwYV SwiEQnP/0RMlHd+GRBmjynnEntB2ZQnBKDn3YTB6SSVYvcBN6qyoFY5oNaDmfrmr55AKdI En1H7b2NDm5TPiG/hCBbTFEHPIYgOB+U/JuklU4avh3XSypV58XNXZjUW2KrMUpNSp9Kpl x3Hun+v4Ge5JqL+dtBOdrOkvjAK3Huk8DHQGiT0gAeIIXgpKx2tvbAYPZtJoUA== 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 4QTcSd3KNqzTHg; Sun, 28 May 2023 11:51:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 34SBpTBH045136; Sun, 28 May 2023 11:51:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34SBpTLB045135; Sun, 28 May 2023 11:51:29 GMT (envelope-from git) Date: Sun, 28 May 2023 11:51:29 GMT Message-Id: <202305281151.34SBpTLB045135@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Rene Ladan Subject: git: 8c5ba4973645 - main - cleanup: Remove expired ports: 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: rene X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8c5ba4973645b9625212628e8b115e65dc8878b0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rene: URL: https://cgit.FreeBSD.org/ports/commit/?id=8c5ba4973645b9625212628e8b115e65dc8878b0 commit 8c5ba4973645b9625212628e8b115e65dc8878b0 Author: Rene Ladan AuthorDate: 2023-05-28 11:00:28 +0000 Commit: Rene Ladan CommitDate: 2023-05-28 11:00:28 +0000 cleanup: Remove expired ports: 2023-05-25 databases/mariadb103-server: Use databases/mariadb106-server 2023-05-25 databases/mariadb103-client: Use databases/mariadb106-server --- MOVED | 2 + databases/Makefile | 2 - databases/mariadb103-client/Makefile | 14 - .../mariadb103-client/files/patch-CMakeLists.txt | 19 -- databases/mariadb103-client/files/patch-MDEV-11790 | 46 --- .../files/patch-include_my__cpu.h | 48 --- databases/mariadb103-client/files/pkg-message.in | 9 - databases/mariadb103-client/pkg-plist | 130 -------- databases/mariadb103-server/Makefile | 229 ------------- databases/mariadb103-server/distinfo | 3 - databases/mariadb103-server/files/mysql-server.in | 126 -------- .../mariadb103-server/files/patch-CMakeLists.txt | 19 -- databases/mariadb103-server/files/patch-MDEV-11790 | 46 --- databases/mariadb103-server/files/patch-MDEV-20248 | 13 - .../files/patch-cmake_install__layout.cmake | 13 - .../files/patch-extra_CMakeLists.txt | 16 - .../files/patch-extra_mariabackup_CMakeLists.txt | 10 - .../files/patch-include_my__cpu.h | 48 --- .../files/patch-include_ssl__compat.h | 11 - .../files/patch-libmariadb_CMakeLists.txt | 11 - .../files/patch-libmariadb_include_CMakeLists.txt | 15 - .../patch-libmariadb_libmariadb_CMakeLists.txt | 19 -- .../patch-libmariadb_plugins_auth_CMakeLists.txt | 30 -- .../files/patch-libservices_CMakeLists.txt | 11 - .../files/patch-man_CMakeLists.txt | 14 - .../files/patch-mysys_my__default.c | 52 --- .../files/patch-oqgraph-MDEV-15291 | 40 --- .../files/patch-pcre_CMakeLists.txt | 11 - .../files/patch-scripts_mysql__config.sh | 12 - .../files/patch-scripts_mysqld__safe.sh | 16 - .../files/patch-scripts_wsrep__sst__mariabackup.sh | 11 - .../mariadb103-server/files/patch-sql_mysqld.cc | 31 -- .../files/patch-storage_innobase_lz4.cmake | 36 --- .../files/patch-storage_innobase_lzo.cmake | 24 -- .../files/patch-storage_innobase_snappy.cmake | 25 -- ...h-storage_mroonga_vendor_groonga_CMakeLists.txt | 15 - .../files/patch-storage_tokudb_CMakeLists.txt | 9 - .../patch-storage_tokudb_PerconaFT_CMakeLists.txt | 11 - ...b_PerconaFT_cmake__modules_TokuThirdParty.cmake | 36 --- ...-storage_tokudb_PerconaFT_portability_memory.cc | 16 - .../files/patch-support-files_CMakeLists.txt | 14 - databases/mariadb103-server/files/pkg-message.in | 20 -- databases/mariadb103-server/pkg-descr | 12 - databases/mariadb103-server/pkg-plist | 357 --------------------- 44 files changed, 2 insertions(+), 1650 deletions(-) diff --git a/MOVED b/MOVED index 098254edc73a..a0afb357b73e 100644 --- a/MOVED +++ b/MOVED @@ -7572,3 +7572,5 @@ www/rubygem-asana0|www/rubygem-asana|2023-05-27|Remove obsoleted port. Use www/r www/rubygem-jwt25|www/rubygem-jwt|2023-05-27|Remove obsoleted port. Use www/rubygem-jwt instead www/rubygem-webrick17|www/rubygem-webrick|2023-05-27|Remove obsoleted port. Use www/rubygem-webrick instead textproc/rtf2html||2023-05-28|Has expired: Abandonware, please use something modern like markdown +databases/mariadb103-server|databases/mariadb106-server|2023-05-28|Has expired: Use databases/mariadb106-server +databases/mariadb103-client|databases/mariadb106-client|2023-05-28|Has expired: Use databases/mariadb106-server diff --git a/databases/Makefile b/databases/Makefile index 232259469f98..b8ff199d6db4 100644 --- a/databases/Makefile +++ b/databases/Makefile @@ -177,8 +177,6 @@ SUBDIR += mariadb-connector-odbc SUBDIR += mariadb1011-client SUBDIR += mariadb1011-server - SUBDIR += mariadb103-client - SUBDIR += mariadb103-server SUBDIR += mariadb104-client SUBDIR += mariadb104-server SUBDIR += mariadb105-client diff --git a/databases/mariadb103-client/Makefile b/databases/mariadb103-client/Makefile deleted file mode 100644 index dc2d02b7baf2..000000000000 --- a/databases/mariadb103-client/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -PORTNAME= mariadb -PKGNAMESUFFIX= 103-client - -COMMENT= Multithreaded SQL database (client) - -MASTERDIR= ${.CURDIR}/../mariadb103-server - -FILESDIR= ${.CURDIR}/files -PATCHDIR= ${.CURDIR}/files -PLIST= ${.CURDIR}/pkg-plist - -CONFLICTS_INSTALL= databases/mytop - -.include "${MASTERDIR}/Makefile" diff --git a/databases/mariadb103-client/files/patch-CMakeLists.txt b/databases/mariadb103-client/files/patch-CMakeLists.txt deleted file mode 100644 index 7122c9289f07..000000000000 --- a/databases/mariadb103-client/files/patch-CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ ---- CMakeLists.txt.orig 2021-05-08 08:36:42.000000000 +0200 -+++ CMakeLists.txt 2021-05-08 08:40:29.000000000 +0200 -@@ -517,13 +517,15 @@ - WORKING_DIRECTORY ${CMAKE_BINARY_DIR} - ) - -+IF(FALSE) - INSTALL_DOCUMENTATION(README.md CREDITS COPYING THIRDPARTY COMPONENT Readme) -+ENDIF() - - # MDEV-6526 these files are not installed anymore - #INSTALL_DOCUMENTATION(${CMAKE_BINARY_DIR}/Docs/INFO_SRC - # ${CMAKE_BINARY_DIR}/Docs/INFO_BIN) - --IF(UNIX) -+IF(FALSE) - INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY Docs/README-wsrep COMPONENT Readme) - ENDIF() - diff --git a/databases/mariadb103-client/files/patch-MDEV-11790 b/databases/mariadb103-client/files/patch-MDEV-11790 deleted file mode 100644 index 1794bcf44da7..000000000000 --- a/databases/mariadb103-client/files/patch-MDEV-11790 +++ /dev/null @@ -1,46 +0,0 @@ -WITHOUT_SERVER installs server-only files - -https://jira.mariadb.org/browse/MDEV-11790 ---- extra/CMakeLists.txt.orig 2018-10-02 09:45:40 UTC -+++ extra/CMakeLists.txt -@@ -99,7 +99,7 @@ IF(WITH_INNOBASE_STORAGE_ENGINE) - ADD_DEPENDENCIES(innochecksum GenError) - ENDIF() - --MYSQL_ADD_EXECUTABLE(replace replace.c COMPONENT Server) -+MYSQL_ADD_EXECUTABLE(replace replace.c COMPONENT Client) - TARGET_LINK_LIBRARIES(replace mysys) - - IF(UNIX) ---- scripts/CMakeLists.txt.orig 2018-10-02 09:45:42 UTC -+++ scripts/CMakeLists.txt -@@ -241,7 +241,10 @@ ENDIF() - SET(mysql_config_COMPONENT COMPONENT Development) - SET(msql2mysql_COMPONENT COMPONENT Client) - SET(mysqlaccess_COMPONENT COMPONENT Client) -+SET(mysqlhotcopy_COMPONENT COMPONENT Client) -+SET(mysql_convert_table_format_COMPONENT COMPONENT Client) - SET(mysql_find_rows_COMPONENT COMPONENT Client) -+SET(mysql_setpermission_COMPONENT COMPONENT Client) - SET(mytop_COMPONENT Mytop) - - IF(WIN32) -@@ -298,14 +301,14 @@ ELSE() - # On Unix, most of the files end up in the bin directory - SET(BIN_SCRIPTS - msql2mysql -- mysql_config -- mysql_setpermission -- mysql_secure_installation - mysqlaccess -+ mysqlhotcopy -+ mysql_config - mysql_convert_table_format - mysql_find_rows -+ mysql_secure_installation -+ mysql_setpermission - mytop -- mysqlhotcopy - ${SERVER_SCRIPTS} - ${WSREP_SCRIPTS} - ${SYSTEMD_SCRIPTS} diff --git a/databases/mariadb103-client/files/patch-include_my__cpu.h b/databases/mariadb103-client/files/patch-include_my__cpu.h deleted file mode 100644 index 36a374bb7cc6..000000000000 --- a/databases/mariadb103-client/files/patch-include_my__cpu.h +++ /dev/null @@ -1,48 +0,0 @@ ---- include/my_cpu.h.orig 2021-08-02 10:58:56 UTC -+++ include/my_cpu.h -@@ -23,7 +23,8 @@ - The defines are the same ones used by the linux kernel - */ - --#ifdef _ARCH_PWR8 -+#if defined(_ARCH_PWR8) -+#if defined(linux) - #include - /* Very low priority */ - #define HMT_very_low() __ppc_set_ppr_very_low() -@@ -37,6 +38,22 @@ - #define HMT_medium_high() __ppc_set_ppr_med_high() - /* High priority */ - #define HMT_high() asm volatile("or 3,3,3") -+#elif defined(__FreeBSD__) -+#include -+#include -+/* Very low priority */ -+#define HMT_very_low() __asm__ volatile ("or 31,31,31") -+/* Low priority */ -+#define HMT_low() __asm__ volatile ("or 1,1,1") -+/* Medium low priority */ -+#define HMT_medium_low() __asm__ volatile ("or 6,6,6") -+/* Medium priority */ -+#define HMT_medium() __asm__ volatile ("or 2,2,2") -+/* Medium high priority */ -+#define HMT_medium_high() __asm__ volatile ("or 5,5,5") -+/* High priority */ -+#define HMT_high() asm volatile("or 3,3,3") -+#endif - #else - #define HMT_very_low() - #define HMT_low() -@@ -72,7 +89,12 @@ static inline void MY_RELAX_CPU(void) - __asm__ __volatile__ ("pause"); - #endif - #elif defined(_ARCH_PWR8) -+#if defined(linux) - __ppc_get_timebase(); -+#elif defined(__FreeBSD__) -+ uint64_t __tb; -+ __asm__ volatile ("mfspr %0, 268" : "=r" (__tb)); -+#endif - #else - int32 var, oldval = 0; - my_atomic_cas32_strong_explicit(&var, &oldval, 1, MY_MEMORY_ORDER_RELAXED, diff --git a/databases/mariadb103-client/files/pkg-message.in b/databases/mariadb103-client/files/pkg-message.in deleted file mode 100644 index 00ac47038607..000000000000 --- a/databases/mariadb103-client/files/pkg-message.in +++ /dev/null @@ -1,9 +0,0 @@ -[ -{ type: install - message: < - -.for PLUGIN in ${DISABLED_PLUGINS} -CMAKE_ARGS+= -DPLUGIN_${PLUGIN}=NO -.endfor - -.endif # ${PKGNAMESUFFIX:M*-client} - -.if defined(WITH_OPENSSL_PORT) -GSSAPI_BASE_IGNORE= BASE_GSSAPI is not compatible with OpenSSL from ports. Use other GSSAPI options or OpenSSL from base system -.endif - -.include - -.if ${ARCH} != amd64 -PLIST_SUB+= WSREP="@comment " -.endif - -.if ${OPSYS} == DragonFly -CMAKE_OFF+= WITH_TOKUDB -.endif - -post-patch: - ${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/mysys/my_default.c - ${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' \ - ${WRKSRC}/storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake - ${REINPLACE_CMD} 's|/etc/my.cnf.d|${LOCALBASE}/etc/mysql/conf.d|' \ - ${WRKSRC}/support-files/rpm/my.cnf -.if ${OPSYS} == DragonFly - ${CP} ${WRKSRC}/cmake/os/FreeBSD.cmake \ - ${WRKSRC}/cmake/os/DragonFly.cmake -.endif - -.if ${PKGNAMESUFFIX:M*-client} -post-install: - ${MV} ${STAGEDIR}${PREFIX}/lib/mysql/pkgconfig/mariadb.pc \ - ${STAGEDIR}${PREFIX}/libdata/pkgconfig/mariadb.pc - ${RM} -r ${STAGEDIR}${DATADIR} \ - ${STAGEDIR}${PREFIX}/include/mysql/server \ - ${STAGEDIR}${PREFIX}/lib/mysql/pkgconfig - ${MV} ${STAGEDIR}${PREFIX}/etc/my.cnf ${STAGEDIR}${PREFIX}/etc/my.cnf.sample - ${MKDIR} -p ${STAGEDIR}${PREFIX}/etc/mysql/conf.d - -post-install-GSSAPI_NONE-off: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mysql/plugin/auth_gssapi_client.so - -.else # ! ${PKGNAMESUFFIX:M*-client} -post-install: - ${RM} -r ${STAGEDIR}${PREFIX}/share/mysql/policy \ - ${STAGEDIR}${PREFIX}/include/mysql/server/private \ - ${STAGEDIR}${PREFIX}/lib/mysql/pkgconfig \ - ${STAGEDIR}${PREFIX}/libexec/rcmysql - ${MV} ${STAGEDIR}${PREFIX}/etc/mysql/user_map.conf \ - ${STAGEDIR}${PREFIX}/etc/mysql/user_map.conf.sample -.endif # ${PKGNAMESUFFIX:M*-client} - -.include diff --git a/databases/mariadb103-server/distinfo b/databases/mariadb103-server/distinfo deleted file mode 100644 index a14bd3dbc9ef..000000000000 --- a/databases/mariadb103-server/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1676836096 -SHA256 (mariadb-10.3.38.tar.gz) = 4afbeff86d996475bb2324db9845c0746ea6e128c129b86a4a0163e4dc93293c -SIZE (mariadb-10.3.38.tar.gz) = 74376545 diff --git a/databases/mariadb103-server/files/mysql-server.in b/databases/mariadb103-server/files/mysql-server.in deleted file mode 100644 index 8722aef18b47..000000000000 --- a/databases/mariadb103-server/files/mysql-server.in +++ /dev/null @@ -1,126 +0,0 @@ -#!/bin/sh - -# PROVIDE: mysql -# REQUIRE: LOGIN -# KEYWORD: shutdown -# -# Add the following line to /etc/rc.conf to enable mysql: -# mysql_(instance_)?enable (bool): Set to "NO" by default. -# Set it to "YES" to enable MySQL. -# mysql_(instance_)?dbdir (str): Default to "/var/db/mysql" -# Base database directory. -# mysql_(instance_)?args (str): Custom additional arguments to be passed -# to mysqld_safe (default empty). -# mysql_(instance_)?pidfile (str): Custom PID file path and name. -# Default to "${mysql_dbdir}/${hostname}.pid". -# mysql_(instance_)?user (str): User to run mysqld as -# Default to "mysql" created by the port -# mysql_(instance_)?optfile (str): Server-specific option file. -# Default to "${mysql_dbdir}/my.cnf". -# mysql_instances (str): Set to "" by default. -# If defined, list of instances to enable - -. /etc/rc.subr - -name="mysql" -rcvar=mysql_enable - -load_rc_config $name - -: ${mysql_enable="NO"} -: ${mysql_user="mysql"} -: ${mysql_dbdir="/var/db/mysql"} -: ${mysql_optfile="${mysql_dbdir}/my.cnf"} - -command="/usr/sbin/daemon" -procname="%%PREFIX%%/libexec/mysqld" -start_precmd="${name}_prestart" -start_postcmd="${name}_poststart" - -if [ -n "$2" ]; then - instance="$2" - load_rc_config ${name}_${instance} - case "$mysql_instances" in - "$2 "*|*" $2 "*|*" $2"|"$2") - eval mysql_args="\${mysql_${instance}_args:-\"${mysql_args}\"}" - eval mysql_dbdir="\${mysql_${instance}_dbdir:-\"/var/db/mysql_${instance}\"}" - eval mysql_user="\${mysql_${instance}_user:-\"${mysql_user}\"}" - eval mysql_optfile="\${mysql_${instance}_optfile:-\"${mysql_dbdir}/my.cnf\"}" - eval mysql_pidfile="\${mysql_${instance}_pidfile:-\"${mysql_dbdir}/`/bin/hostname`.pid\"}" - ;; - *) - err 1 "$2 not found in mysql_instances" ;; - esac -else - if [ -n "${mysql_instances}" -a -n "$1" ]; then - for instance in ${mysql_instances}; do - eval _enable="\${mysql_${instance}_enable}" - case "${_enable:-${mysql_enable}}" in - [Nn][Oo]|[Ff][Aa][Ll][Ss][Ee]|[Oo][Ff][Ff]|0) - continue - ;; - [Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1) - ;; - *) - if [ -z "$_enable" ]; then - _var=mysql_enable - else - _var=mysql_${instance}_enable - fi - warn "Bad value" \ - "'${_enable:-${mysql_enable}}'" \ - "for ${_var}. " \ - "Instance ${instance} skipped." - continue - ;; - esac - echo "===> mysql instance: ${instance}" - if %%PREFIX%%/etc/rc.d/mysql-server $1 ${instance}; then - success="${instance} ${success}" - else - failed="${instance} (${retcode}) ${failed}" - fi - done - exit 0 - else - mysql_pidfile=${mysql_pidfile:-"${mysql_dbdir}/`/bin/hostname`.pid"} - fi -fi - -pidfile=$mysql_pidfile -mysql_install_db="%%PREFIX%%/bin/mysql_install_db" -mysql_install_db_args="--basedir=%%PREFIX%% --datadir=${mysql_dbdir} --force" -command_args="-c -f %%PREFIX%%/bin/mysqld_safe --defaults-extra-file=${mysql_optfile} --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_args}" - -mysql_create_auth_tables() -{ - eval $mysql_install_db $mysql_install_db_args - [ $? -eq 0 ] && chown -R ${mysql_user}:$(id -gn $mysql_user) ${mysql_dbdir} -} - -mysql_prestart() -{ - local dir - for dir in /etc /etc/mysql; do - if [ -f "${dir}/my.cnf" ]; then - echo "Please move existing my.cnf file from ${dir} to %%PREFIX%%${dir}" - return 1 - fi - done - if [ ! -d "${mysql_dbdir}/mysql/." ]; then - mysql_create_auth_tables || return 1 - fi - return 0 -} - -mysql_poststart() -{ - local timeout=15 - while [ ! -f "${pidfile}" -a ${timeout} -gt 0 ]; do - timeout=$(( timeout - 1 )) - sleep 1 - done - return 0 -} - -run_rc_command "$1" diff --git a/databases/mariadb103-server/files/patch-CMakeLists.txt b/databases/mariadb103-server/files/patch-CMakeLists.txt deleted file mode 100644 index 7122c9289f07..000000000000 --- a/databases/mariadb103-server/files/patch-CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ ---- CMakeLists.txt.orig 2021-05-08 08:36:42.000000000 +0200 -+++ CMakeLists.txt 2021-05-08 08:40:29.000000000 +0200 -@@ -517,13 +517,15 @@ - WORKING_DIRECTORY ${CMAKE_BINARY_DIR} - ) - -+IF(FALSE) - INSTALL_DOCUMENTATION(README.md CREDITS COPYING THIRDPARTY COMPONENT Readme) -+ENDIF() - - # MDEV-6526 these files are not installed anymore - #INSTALL_DOCUMENTATION(${CMAKE_BINARY_DIR}/Docs/INFO_SRC - # ${CMAKE_BINARY_DIR}/Docs/INFO_BIN) - --IF(UNIX) -+IF(FALSE) - INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY Docs/README-wsrep COMPONENT Readme) - ENDIF() - diff --git a/databases/mariadb103-server/files/patch-MDEV-11790 b/databases/mariadb103-server/files/patch-MDEV-11790 deleted file mode 100644 index 1794bcf44da7..000000000000 --- a/databases/mariadb103-server/files/patch-MDEV-11790 +++ /dev/null @@ -1,46 +0,0 @@ -WITHOUT_SERVER installs server-only files - -https://jira.mariadb.org/browse/MDEV-11790 ---- extra/CMakeLists.txt.orig 2018-10-02 09:45:40 UTC -+++ extra/CMakeLists.txt -@@ -99,7 +99,7 @@ IF(WITH_INNOBASE_STORAGE_ENGINE) - ADD_DEPENDENCIES(innochecksum GenError) - ENDIF() - --MYSQL_ADD_EXECUTABLE(replace replace.c COMPONENT Server) -+MYSQL_ADD_EXECUTABLE(replace replace.c COMPONENT Client) - TARGET_LINK_LIBRARIES(replace mysys) - - IF(UNIX) ---- scripts/CMakeLists.txt.orig 2018-10-02 09:45:42 UTC -+++ scripts/CMakeLists.txt -@@ -241,7 +241,10 @@ ENDIF() - SET(mysql_config_COMPONENT COMPONENT Development) - SET(msql2mysql_COMPONENT COMPONENT Client) - SET(mysqlaccess_COMPONENT COMPONENT Client) -+SET(mysqlhotcopy_COMPONENT COMPONENT Client) -+SET(mysql_convert_table_format_COMPONENT COMPONENT Client) - SET(mysql_find_rows_COMPONENT COMPONENT Client) -+SET(mysql_setpermission_COMPONENT COMPONENT Client) - SET(mytop_COMPONENT Mytop) - - IF(WIN32) -@@ -298,14 +301,14 @@ ELSE() - # On Unix, most of the files end up in the bin directory - SET(BIN_SCRIPTS - msql2mysql -- mysql_config -- mysql_setpermission -- mysql_secure_installation - mysqlaccess -+ mysqlhotcopy -+ mysql_config - mysql_convert_table_format - mysql_find_rows -+ mysql_secure_installation -+ mysql_setpermission - mytop -- mysqlhotcopy - ${SERVER_SCRIPTS} - ${WSREP_SCRIPTS} - ${SYSTEMD_SCRIPTS} diff --git a/databases/mariadb103-server/files/patch-MDEV-20248 b/databases/mariadb103-server/files/patch-MDEV-20248 deleted file mode 100644 index ef0d97b17225..000000000000 --- a/databases/mariadb103-server/files/patch-MDEV-20248 +++ /dev/null @@ -1,13 +0,0 @@ ---- storage/rocksdb/rocksdb/port/jemalloc_helper.h.orig 2019-07-30 11:32:15 UTC -+++ storage/rocksdb/rocksdb/port/jemalloc_helper.h -@@ -12,6 +12,10 @@ - #include - #endif - -+#ifdef __FreeBSD__ -+#define JEMALLOC_USABLE_SIZE_CONST const -+#endif -+ - #ifndef JEMALLOC_CXX_THROW - #define JEMALLOC_CXX_THROW - #endif diff --git a/databases/mariadb103-server/files/patch-cmake_install__layout.cmake b/databases/mariadb103-server/files/patch-cmake_install__layout.cmake deleted file mode 100644 index 2f6b38ffa45d..000000000000 --- a/databases/mariadb103-server/files/patch-cmake_install__layout.cmake +++ /dev/null @@ -1,13 +0,0 @@ ---- cmake/install_layout.cmake.orig 2020-05-09 19:27:56 UTC -+++ cmake/install_layout.cmake -@@ -128,8 +128,8 @@ SET(INSTALL_SUPPORTFILESDIR_STANDALONE "support-files - SET(INSTALL_MYSQLDATADIR_STANDALONE "data") - - SET(INSTALL_UNIX_ADDRDIR_STANDALONE "/tmp/mysql.sock") --SET(INSTALL_PAMDIR_STANDALONE "share") --SET(INSTALL_PAMDATADIR_STANDALONE "share") -+SET(INSTALL_PAMDIR_STANDALONE "lib/mysql/plugin") -+SET(INSTALL_PAMDATADIR_STANDALONE "etc/mysql") - # - # RPM layout - # diff --git a/databases/mariadb103-server/files/patch-extra_CMakeLists.txt b/databases/mariadb103-server/files/patch-extra_CMakeLists.txt deleted file mode 100644 index e083792cd77c..000000000000 --- a/databases/mariadb103-server/files/patch-extra_CMakeLists.txt +++ /dev/null @@ -1,16 +0,0 @@ -Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options - ---- extra/CMakeLists.txt.orig 2017-05-14 23:13:15 UTC -+++ extra/CMakeLists.txt -@@ -96,9 +96,11 @@ IF(UNIX) - MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.c) - TARGET_LINK_LIBRARIES(resolve_stack_dump mysys) - -+IF(FALSE) - MYSQL_ADD_EXECUTABLE(mysql_waitpid mysql_waitpid.c COMPONENT Client) - TARGET_LINK_LIBRARIES(mysql_waitpid mysys) -+ENDIF() - - MYSQL_ADD_EXECUTABLE(mysqld_safe_helper mysqld_safe_helper.c COMPONENT Server) - TARGET_LINK_LIBRARIES(mysqld_safe_helper mysys) - ENDIF() diff --git a/databases/mariadb103-server/files/patch-extra_mariabackup_CMakeLists.txt b/databases/mariadb103-server/files/patch-extra_mariabackup_CMakeLists.txt deleted file mode 100644 index 4a4abfc53dc0..000000000000 --- a/databases/mariadb103-server/files/patch-extra_mariabackup_CMakeLists.txt +++ /dev/null @@ -1,10 +0,0 @@ ---- extra/mariabackup/CMakeLists.txt.orig 2019-12-05 22:22:27 UTC -+++ extra/mariabackup/CMakeLists.txt -@@ -114,6 +114,7 @@ MYSQL_ADD_EXECUTABLE(mbstream - TARGET_LINK_LIBRARIES(mbstream - mysys - crc -+ sql - ) - ADD_DEPENDENCIES(mbstream GenError) - diff --git a/databases/mariadb103-server/files/patch-include_my__cpu.h b/databases/mariadb103-server/files/patch-include_my__cpu.h deleted file mode 100644 index 36a374bb7cc6..000000000000 --- a/databases/mariadb103-server/files/patch-include_my__cpu.h +++ /dev/null @@ -1,48 +0,0 @@ ---- include/my_cpu.h.orig 2021-08-02 10:58:56 UTC -+++ include/my_cpu.h -@@ -23,7 +23,8 @@ - The defines are the same ones used by the linux kernel - */ - --#ifdef _ARCH_PWR8 -+#if defined(_ARCH_PWR8) -+#if defined(linux) - #include - /* Very low priority */ - #define HMT_very_low() __ppc_set_ppr_very_low() -@@ -37,6 +38,22 @@ - #define HMT_medium_high() __ppc_set_ppr_med_high() - /* High priority */ - #define HMT_high() asm volatile("or 3,3,3") -+#elif defined(__FreeBSD__) -+#include -+#include -+/* Very low priority */ -+#define HMT_very_low() __asm__ volatile ("or 31,31,31") -+/* Low priority */ -+#define HMT_low() __asm__ volatile ("or 1,1,1") -+/* Medium low priority */ -+#define HMT_medium_low() __asm__ volatile ("or 6,6,6") -+/* Medium priority */ -+#define HMT_medium() __asm__ volatile ("or 2,2,2") -+/* Medium high priority */ -+#define HMT_medium_high() __asm__ volatile ("or 5,5,5") -+/* High priority */ -+#define HMT_high() asm volatile("or 3,3,3") -+#endif - #else - #define HMT_very_low() - #define HMT_low() -@@ -72,7 +89,12 @@ static inline void MY_RELAX_CPU(void) - __asm__ __volatile__ ("pause"); - #endif - #elif defined(_ARCH_PWR8) -+#if defined(linux) - __ppc_get_timebase(); -+#elif defined(__FreeBSD__) -+ uint64_t __tb; -+ __asm__ volatile ("mfspr %0, 268" : "=r" (__tb)); -+#endif - #else - int32 var, oldval = 0; - my_atomic_cas32_strong_explicit(&var, &oldval, 1, MY_MEMORY_ORDER_RELAXED, diff --git a/databases/mariadb103-server/files/patch-include_ssl__compat.h b/databases/mariadb103-server/files/patch-include_ssl__compat.h deleted file mode 100644 index 30d695673280..000000000000 --- a/databases/mariadb103-server/files/patch-include_ssl__compat.h +++ /dev/null @@ -1,11 +0,0 @@ ---- include/ssl_compat.h.orig 2022-11-02 12:18:48 UTC -+++ include/ssl_compat.h -@@ -19,7 +19,7 @@ - /* OpenSSL version specific definitions */ - #if defined(OPENSSL_VERSION_NUMBER) - --#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L) - #define HAVE_OPENSSL11 1 - #define SSL_LIBRARY OpenSSL_version(OPENSSL_VERSION) - #define ERR_remove_state(X) ERR_clear_error() diff --git a/databases/mariadb103-server/files/patch-libmariadb_CMakeLists.txt b/databases/mariadb103-server/files/patch-libmariadb_CMakeLists.txt *** 997 LINES SKIPPED ***