1 # Buildsheet autogenerated by ravenadm tool -- Do not edit.
7 SDESC[standard]= Fast SQL database server, derived from MySQL
8 HOMEPAGE= https://mariadb.org/
12 SITES[main]= https://downloads.mariadb.com/MariaDB/mariadb-10.7.1/source/
13 DISTFILE[1]= mariadb-10.7.1.tar.gz:main
15 SPKGS[standard]= complete
20 OPTIONS_AVAILABLE= none
21 OPTIONS_STANDARD= none
23 BUILD_DEPENDS= bison:primary:standard
24 BUILDRUN_DEPENDS= boost-libraries:rest:python_used
25 snappy:single:standard
26 msgpack:single:standard
30 pcre2:primary:standard
31 BR_DEPS[netbsd]= openpam:single:standard
35 USERGROUP_SPKG= server
37 USES= cmake zlib ssl readline ncurses shebangfix cpe
38 python:build perl:build pkgconfig iconv:translit
39 zstd lz4 lzo bz2 execinfo
40 GNOME_COMPONENTS= libxml2
42 DISTNAME= mariadb-10.7.1
45 LICENSE_TERMS= server:{{WRKDIR}}/TERMS
46 LICENSE_FILE= GPLv2:{{WRKSRC}}/COPYING
47 LICENSE_AWK= TERMS:"^\#include"
48 LICENSE_SOURCE= TERMS:{{WRKSRC}}/libmysqld/libmysqld.c
53 FPC_EQUIVALENT= databases/mariadb104-server
54 SHEBANG_FILES= scripts/*.sh
56 INSTALL_REQ_TOOLCHAIN= yes
57 PLIST_SUB= PORTNAME=mariadb107
58 AUTHSOCKET={{AUTHSOCKET}}
59 PAM={{PAM:U"@comment "}}
61 CMAKE_ARGS= -DCOMPILATION_COMMENT="Ravenports"
62 -DINSTALL_INCLUDEDIR=include/mysql
63 -DINSTALL_PLUGINDIR=lib/mysql/plugin
64 -DINSTALL_SHAREDIR=share
65 -DINSTALL_SUPPORTFILESDIR=share/mysql
66 -DINSTALL_MYSQLSHAREDIR=share/mysql
67 -DINSTALL_DOCREADMEDIR=share/doc/mariadb107
68 -DINSTALL_DOCDIR=share/doc/mariadb107
69 -DINSTALL_LIBDIR=lib/mysql
70 -DINSTALL_MANDIR=share/man
71 -DINSTALL_SCRIPTDIR=bin
72 -DINSTALL_MYSQLTESTDIR=
73 -DINSTALL_SQLBENCHDIR=
74 -DDEFAULT_CHARSET=utf8mb4
75 -DDEFAULT_COLLATION=utf8mb4_unicode_ci
76 -DDEFAULT_SYSCONFDIR="{{PREFIX}}/etc"
77 -DENABLED_LOCAL_INFILE=ON
81 -DWITH_EMBEDDED_SERVER=ON
82 -DWITH_EXTRA_CHARSETS=complex
87 -DWITH_READLINE=system
88 -DWITH_SSL="{{OPENSSLBASE}}"
92 VAR_OPSYS[freebsd]= CXXFLAGS=-DHAVE_POSIX_MEMALIGN=1
93 VAR_OPSYS[netbsd]= MAKEFILE_LINE=AUTHSOCKET="@comment "
97 ${CP} ${WRKSRC}/cmake/os/FreeBSD.cmake \
98 ${WRKSRC}/cmake/os/DragonFly.cmake
101 ${RM} ${STAGEDIR}${STD_DOCDIR}/COPYING
102 ${MV} ${STAGEDIR}${PREFIX}/lib/mysql/pkgconfig/mariadb.pc \
103 ${STAGEDIR}${PREFIX}/lib/pkgconfig/
104 ${RMDIR} ${STAGEDIR}${PREFIX}/lib/mysql/pkgconfig
105 # strip plugins and libraries
106 ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mysql/libmariadb.so
107 ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mysql/libmariadbd.so
108 ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mysql/*/*.so
110 @flist=$$(${FIND} ${STAGEDIR}${PREFIX}/bin -type f -perm /111 -print) ;\
111 for f in $$flist; do \
112 (${FILE} $$f | ${GREP} -Fq ", not stripped")\
113 && ${ECHO_CMD} "Auto-stripping $$f"\
114 && ${STRIP_CMD} $$f || ${TRUE} ;\
116 # if pam config file exists, set it as a sample
117 # remove testsuite files too
118 if [ -f "${STAGEDIR}${PREFIX}/etc/mariadb/user_map.conf" ]; then \
119 (cd ${STAGEDIR}${PREFIX}/etc/mariadb && \
120 ${MV} user_map.conf user_map.conf.sample) ;\
121 ${RM} -r ${STAGEDIR}/suite ;\
125 ${REINPLACE_CMD} 's|/usr/bin/env python|${PYTHON_CMD}|' \
126 ${WRKSRC}/CMakeLists.txt
127 ${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' \
128 ${WRKSRC}/mysys/my_default.c
129 ${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' \
130 ${WRKSRC}/scripts/mysql_config.sh \
131 ${WRKSRC}/scripts/CMakeLists.txt
134 ${REINPLACE_CMD} -Ee 's|(#define INCLUDE.*)"$$|\1 -I${PREFIX}/include"|' \
135 -e 's|(#define LIBS .*)"$$|\1 -L${PREFIX}/lib"|' \
136 ${BUILD_WRKSRC}/libmariadb/mariadb_config/mariadb_config.c
137 # Fix build failure in mbstream, see https://jira.mariadb.org/browse/MDEV-14072
138 ${REINPLACE_CMD} -e 's| ${PREFIX}/lib/liblz4.so\(.* ${PREFIX}/lib/liblz4.so.*\)|\1|' \
139 -e 's| ${PREFIX}/lib/liblzo2.so\(.* ${PREFIX}/lib/liblzo2.so.*\)|\1|' \
140 -e 's| ${PREFIX}/lib/libsnappy.so\(.* ${PREFIX}/lib/libsnappy.so\)|\1|' \
141 -e 's| -llzma\(.* -llzma\)|\1|;s| -lbz2\(.* -lbz2\)|\1|;' \
142 ${BUILD_WRKSRC}/extra/mariabackup/CMakeFiles/mbstream.dir/link.txt
144 [FILE:807:descriptions/desc.server]
145 MariaDB Server is one of the most popular database servers in the world.
146 It's made by the original developers of MySQL and guaranteed to stay open
147 source. Notable users include Wikipedia, WordPress.com and Google.
149 MariaDB turns data into structured information in a wide array of
150 applications, ranging from banking to websites. It is an enhanced, drop-in
151 replacement for MySQL. MariaDB is used because it is fast, scalable and
152 robust, with a rich ecosystem of storage engines, plugins and many other
153 tools make it very versatile for a wide variety of use cases.
155 MariaDB is developed as open source software and as a relational database
156 it provides an SQL interface for accessing data. The latest versions of
157 MariaDB also include GIS and JSON features.
159 This package contains the server and related files.
162 [FILE:267:descriptions/desc.client]
163 MariaDB Server is one of the most popular database servers in the world.
164 It's made by the original developers of MySQL and guaranteed to stay open
165 source. Notable users include Wikipedia, WordPress.com and Google.
167 This package contains the client and related files.
171 ec70e24a1ee42087b1187c734dad5ae8b36a4ce6e3635ec76112bd07d819d6be 85213695 mariadb-10.7.1.tar.gz
174 [FILE:12098:manifests/plist.server]
175 %%PAM%%@sample etc/mariadb/user_map.conf.sample
176 %%PAM%%lib/mysql/plugin/
179 %%PAM%%lib/mysql/plugin/auth_pam_tool_dir/auth_pam_tool
180 %%PAM%%lib/mysql/security/pam_user_map.so
192 mariadb-client-test-embedded
197 mariadb-fix-extensions
200 mariadb-secure-installation
202 mariadb-test-embedded
203 mariadb-tzinfo-to-sql
218 mysql_client_test_embedded
224 mysql_secure_installation
241 wsrep_sst_mariabackup
245 include/mysql/server/
248 byte_order_generic_x86.h
249 byte_order_generic_x86_64.h
291 include/mysql/server/mysql/
302 plugin_password_validation.h
306 service_encryption_scheme.h
308 service_kill_statement.h
312 service_my_print_error.h
313 service_my_snprintf.h
314 service_progress_report.h
319 service_thd_autoinc.h
320 service_thd_error_context.h
323 service_thd_specifics.h
324 service_thd_timezone.h
328 include/mysql/server/mysql/psi/
347 include/mysql/server/private/
371 event_db_repository.h
388 handle_connections_win.h
463 mysqld_default_groups.h
476 pfs_memory_provider.h
477 pfs_metadata_provider.h
478 pfs_socket_provider.h
480 pfs_statement_provider.h
482 pfs_thread_provider.h
483 pfs_transaction_provider.h
486 probes_mysql_nodtrace.h
513 semisync_master_ack_receiver.h
557 sql_expression_cache.h
558 sql_get_diagnostics.h
575 sql_partition_admin.h
602 sql_type_fixedbin_storage.h
627 threadpool_winsockets.h
636 welcome_copyright_notice.h
643 wsrep_client_service.h
645 wsrep_condition_variable.h
646 wsrep_high_priority_service.h
652 wsrep_server_service.h
655 wsrep_storage_service.h
657 wsrep_trans_observer.h
663 include/mysql/server/private/atomic/
667 include/mysql/server/private/providers/
672 include/mysql/server/private/providers/lzo/lzo1x.h
684 auth_gssapi_client.so
686 caching_sha2_password.so
687 debug_key_management.so
689 example_key_management.so
690 file_key_management.so
703 ha_test_sql_discovery.so
707 metadata_lock_info.so
709 password_reuse_check.so
719 query_response_time.so
721 simple_password_check.so
728 share/aclocal/mysql.m4
732 share/groonga-normalizer-mysql/
742 galera_new_cluster.1.gz
747 mariadb-client-test-embedded.1.gz
748 mariadb-client-test.1.gz
750 mariadb-dumpslow.1.gz
751 mariadb-embedded.1.gz
752 mariadb-fix-extensions.1.gz
753 mariadb-install-db.1.gz
755 mariadb-secure-installation.1.gz
756 mariadb-service-convert.1.gz
757 mariadb-test-embedded.1.gz
759 mariadb-tzinfo-to-sql.1.gz
764 mariadbd-safe-helper.1.gz
767 my_print_defaults.1.gz
772 myrocks_hotbackup.1.gz
774 mysql_client_test.1.gz
775 mysql_client_test_embedded.1.gz
777 mysql_fix_extensions.1.gz
778 mysql_install_db.1.gz
780 mysql_secure_installation.1.gz
781 mysql_tzinfo_to_sql.1.gz
785 mysqld_safe_helper.1.gz
788 mysqltest_embedded.1.gz
791 resolve_stack_dump.1.gz
793 wsrep_sst_common.1.gz
794 wsrep_sst_mariabackup.1.gz
795 wsrep_sst_mysqldump.1.gz
797 wsrep_sst_rsync_wan.1.gz
807 maria_add_gis_sp_bootstrap.sql
810 mysql_performance_tables.sql
812 mysql_system_tables.sql
813 mysql_system_tables_data.sql
814 mysql_test_data_timezone.sql
819 share/mysql/charsets/
846 share/mysql/czech/errmsg.sys
847 share/mysql/danish/errmsg.sys
848 share/mysql/dutch/errmsg.sys
849 share/mysql/english/errmsg.sys
850 share/mysql/estonian/errmsg.sys
851 share/mysql/french/errmsg.sys
852 share/mysql/german/errmsg.sys
853 share/mysql/greek/errmsg.sys
854 share/mysql/hindi/errmsg.sys
855 share/mysql/hungarian/errmsg.sys
856 share/mysql/italian/errmsg.sys
857 share/mysql/japanese/errmsg.sys
858 share/mysql/korean/errmsg.sys
864 share/mysql/norwegian/errmsg.sys
865 share/mysql/norwegian-ny/errmsg.sys
866 share/mysql/policy/apparmor/
869 usr.sbin.mysqld.local
870 share/mysql/policy/selinux/
875 share/mysql/polish/errmsg.sys
876 share/mysql/portuguese/errmsg.sys
877 share/mysql/romanian/errmsg.sys
878 share/mysql/russian/errmsg.sys
879 share/mysql/serbian/errmsg.sys
880 share/mysql/slovak/errmsg.sys
881 share/mysql/spanish/errmsg.sys
882 share/mysql/swedish/errmsg.sys
883 share/mysql/ukrainian/errmsg.sys
886 [FILE:5012:manifests/plist.client]
893 mariadb-convert-table-format
899 mariadb-setpermission
906 mysql_convert_table_format
938 include/mysql/mariadb/ma_io.h
956 mysql_clear_password.so
966 mariadb-convert-table-format.1.gz
968 mariadb-find-rows.1.gz
972 mariadb-setpermission.1.gz
978 mysql-stress-test.pl.1.gz
979 mysql-test-run.pl.1.gz
982 mysql_convert_table_format.1.gz
985 mysql_setpermission.1.gz
999 mariadb_connection.3.gz
1000 mariadb_dyncol_check.3.gz
1001 mariadb_dyncol_column_cmp_named.3.gz
1002 mariadb_dyncol_column_count.3.gz
1003 mariadb_dyncol_create_many_named.3.gz
1004 mariadb_dyncol_create_many_num.3.gz
1005 mariadb_dyncol_exists_named.3.gz
1006 mariadb_dyncol_exists_num.3.gz
1007 mariadb_dyncol_free.3.gz
1008 mariadb_dyncol_list_named.3.gz
1009 mariadb_dyncol_list_num.3.gz
1010 mariadb_dyncol_unpack.3.gz
1011 mariadb_dyncol_update_many_named.3.gz
1012 mariadb_dyncol_update_many_num.3.gz
1013 mariadb_get_infov.3.gz
1014 mariadb_reconnect.3.gz
1015 mariadb_rpl_close.3.gz
1016 mariadb_rpl_fetch.3.gz
1017 mariadb_rpl_get_optionsv.3.gz
1018 mariadb_rpl_open.3.gz
1019 mariadb_rpl_optionsv.3.gz
1020 mariadb_stmt_execute_direct.3.gz
1021 mariadb_stmt_fetch_fields.3.gz
1022 mysql_affected_rows.3.gz
1023 mysql_autocommit.3.gz
1024 mysql_change_user.3.gz
1027 mysql_data_seek.3.gz
1030 mysql_fetch_field.3.gz
1031 mysql_fetch_field_direct.3.gz
1032 mysql_fetch_fields.3.gz
1033 mysql_fetch_lengths.3.gz
1034 mysql_fetch_row.3.gz
1035 mysql_field_count.3.gz
1036 mysql_field_seek.3.gz
1037 mysql_field_tell.3.gz
1038 mysql_free_result.3.gz
1039 mysql_get_character_set_info.3.gz
1040 mysql_get_client_info.3.gz
1041 mysql_get_client_version.3.gz
1042 mysql_get_host_info.3.gz
1043 mysql_get_proto_info.3.gz
1044 mysql_get_server_info.3.gz
1045 mysql_get_server_version.3.gz
1046 mysql_get_socket.3.gz
1047 mysql_get_ssl_cipher.3.gz
1048 mysql_hex_string.3.gz
1052 mysql_more_results.3.gz
1053 mysql_next_result.3.gz
1054 mysql_num_fields.3.gz
1061 mysql_read_query_result.3.gz
1062 mysql_real_connect.3.gz
1063 mysql_real_escape_string.3.gz
1064 mysql_real_query.3.gz
1066 mysql_reset_connection.3.gz
1070 mysql_select_db.3.gz
1071 mysql_send_query.3.gz
1072 mysql_server_end.3.gz
1073 mysql_server_init.3.gz
1074 mysql_session_track_get_first.3.gz
1075 mysql_session_track_get_next.3.gz
1076 mysql_set_character_set.3.gz
1077 mysql_set_server_option.3.gz
1082 mysql_stmt_affected_rows.3.gz
1083 mysql_stmt_attr_get.3.gz
1084 mysql_stmt_attr_set.3.gz
1085 mysql_stmt_bind_param.3.gz
1086 mysql_stmt_bind_result.3.gz
1087 mysql_stmt_close.3.gz
1088 mysql_stmt_data_seek.3.gz
1089 mysql_stmt_errno.3.gz
1090 mysql_stmt_error.3.gz
1091 mysql_stmt_execute.3.gz
1092 mysql_stmt_fetch.3.gz
1093 mysql_stmt_fetch_column.3.gz
1094 mysql_stmt_field_count.3.gz
1095 mysql_stmt_free_result.3.gz
1096 mysql_stmt_init.3.gz
1097 mysql_stmt_insert_id.3.gz
1098 mysql_stmt_more_results.3.gz
1099 mysql_stmt_next_result.3.gz
1100 mysql_stmt_num_rows.3.gz
1101 mysql_stmt_param_count.3.gz
1102 mysql_stmt_param_metadata.3.gz
1103 mysql_stmt_prepare.3.gz
1104 mysql_stmt_reset.3.gz
1105 mysql_stmt_result_metadata.3.gz
1106 mysql_stmt_row_seek.3.gz
1107 mysql_stmt_row_tell.3.gz
1108 mysql_stmt_send_long_data.3.gz
1109 mysql_stmt_sqlstate.3.gz
1110 mysql_stmt_store_result.3.gz
1111 mysql_stmt_warning_count.3.gz
1112 mysql_store_result.3.gz
1113 mysql_thread_end.3.gz
1114 mysql_thread_id.3.gz
1115 mysql_thread_init.3.gz
1116 mysql_use_result.3.gz
1117 mysql_warning_count.3.gz
1120 [FILE:86:manifests/plist.docs]
1121 share/doc/%%PORTNAME%%/
1129 [FILE:572:patches/patch-client_mysql.cc]
1130 --- client/mysql.cc.orig 2021-11-05 20:29:26 UTC
1132 @@ -62,8 +62,8 @@ static char *server_version= NULL;
1135 #if defined(HAVE_CURSES_H) && defined(HAVE_TERM_H)
1136 -#include <curses.h>
1138 +#include <ncurses/curses.h>
1139 +#include <ncurses/term.h>
1141 #if defined(HAVE_TERMIOS_H)
1142 #include <termios.h>
1143 @@ -82,7 +82,7 @@ extern "C" {
1145 #undef SYSV // hack to avoid syntax error
1148 +#include <ncurses/term.h>
1151 #endif /* defined(HAVE_CURSES_H) && defined(HAVE_TERM_H) */
1154 [FILE:500:patches/patch-cmake_install__layout.cmake]
1155 --- cmake/install_layout.cmake.orig 2021-11-05 20:29:26 UTC
1156 +++ cmake/install_layout.cmake
1157 @@ -126,8 +126,8 @@ SET(INSTALL_SUPPORTFILESDIR_STANDALONE
1158 SET(INSTALL_MYSQLDATADIR_STANDALONE "data")
1160 SET(INSTALL_UNIX_ADDRDIR_STANDALONE "/tmp/mysql.sock")
1161 -SET(INSTALL_PAMDIR_STANDALONE "share")
1162 -SET(INSTALL_PAMDATADIR_STANDALONE "share")
1163 +SET(INSTALL_PAMDIR_STANDALONE "lib/mysql/security")
1164 +SET(INSTALL_PAMDATADIR_STANDALONE "etc/mariadb")
1170 [FILE:1966:patches/patch-cmake_readline.cmake]
1171 --- cmake/readline.cmake.orig 2021-11-05 20:29:26 UTC
1172 +++ cmake/readline.cmake
1173 @@ -52,40 +52,17 @@ MACRO (MYSQL_CHECK_MULTIBYTE)
1177 + SET(CURSES_NEED_NCURSES True)
1178 FIND_PACKAGE(Curses REQUIRED)
1179 MARK_AS_ADVANCED(CURSES_CURSES_H_PATH CURSES_FORM_LIBRARY CURSES_HAVE_CURSES_H)
1180 IF(NOT CURSES_FOUND)
1181 SET(ERRORMSG "Curses library not found. Please install appropriate package,
1182 remove CMakeCache.txt and rerun cmake.")
1183 - IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
1184 - SET(ERRORMSG ${ERRORMSG}
1185 - "On Debian/Ubuntu, package name is libncurses5-dev, on Redhat and derivates "
1186 - "it is ncurses-devel.")
1188 MESSAGE(FATAL_ERROR ${ERRORMSG})
1191 - IF(CURSES_HAVE_CURSES_H)
1192 - SET(HAVE_CURSES_H 1 CACHE INTERNAL "")
1194 - IF(CMAKE_SYSTEM_NAME MATCHES "HP")
1195 - # CMake uses full path to library /lib/libcurses.sl
1196 - # On Itanium, it results into architecture mismatch+
1197 - # the library is for PA-RISC
1198 - SET(CURSES_LIBRARY "curses" CACHE INTERNAL "" FORCE)
1200 + SET(HAVE_CURSES_H 1 CACHE INTERNAL "")
1202 - IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
1203 - # -Wl,--as-needed breaks linking with -lcurses, e.g on Fedora
1204 - # Lower-level libcurses calls are exposed by libtinfo
1205 - CHECK_LIBRARY_EXISTS(${CURSES_LIBRARY} tputs "" HAVE_TPUTS_IN_CURSES)
1206 - IF(NOT HAVE_TPUTS_IN_CURSES)
1207 - CHECK_LIBRARY_EXISTS(tinfo tputs "" HAVE_TPUTS_IN_TINFO)
1208 - IF(HAVE_TPUTS_IN_TINFO)
1209 - SET(CURSES_LIBRARY tinfo)
1213 CHECK_LIBRARY_EXISTS(${CURSES_LIBRARY} setupterm "" HAVE_SETUPTERM)
1214 CHECK_LIBRARY_EXISTS(${CURSES_LIBRARY} vidattr "" HAVE_VIDATTR)
1216 @@ -220,6 +197,8 @@ MACRO (MYSQL_CHECK_READLINE)
1217 SET(CMAKE_REQUIRED_LIBRARIES)
1218 SET(CMAKE_REQUIRED_INCLUDES)
1220 + SET(CMAKE_REQUIRED_INCLUDES ${CURSES_INCLUDE_DIR}/ncurses)
1221 CHECK_INCLUDE_FILES ("curses.h;term.h" HAVE_TERM_H)
1222 + SET(CMAKE_REQUIRED_INCLUDES)
1227 [FILE:349:patches/patch-extra_readline_CMakeLists.txt]
1228 --- extra/readline/CMakeLists.txt.orig 2021-11-05 20:29:26 UTC
1229 +++ extra/readline/CMakeLists.txt
1230 @@ -56,4 +56,4 @@ ADD_LIBRARY(readline STATIC
1232 # Declare dependency
1233 # so every executable that links with readline links with curses as well
1234 -TARGET_LINK_LIBRARIES(readline ${CURSES_LIBRARY})
1235 +TARGET_LINK_LIBRARIES(readline ${CURSES_LIBRARY} tinfo)
1238 [FILE:1605:patches/patch-mysys_my__default.c]
1239 --- mysys/my_default.c.orig 2021-11-05 20:29:29 UTC
1240 +++ mysys/my_default.c
1241 @@ -624,7 +624,7 @@ static int search_default_file_with_ext(
1244 if (!my_stat(name,&stat_info,MYF(0)))
1248 Ignore world-writable regular files.
1249 This is mainly done to protect us to not read a file created by
1250 @@ -647,6 +647,14 @@ static int search_default_file_with_ext(
1251 add_option(ctx, name))
1254 + if (strstr(name, "/etc") == name)
1257 + "error: Config file %s in invalid location, please move to or merge with %%PREFIX%%%s\n",
1262 while (mysql_file_fgets(buff, sizeof(buff) - 1, fp))
1265 @@ -914,7 +922,8 @@ void my_print_default_files(const char *
1266 if (name[0] == FN_HOMELIB) /* Add . to filenames in home */
1268 strxmov(end, conf_file, *ext, " ", NullS);
1269 - fputs(name, stdout);
1270 + if (strstr(name, "/etc") != name)
1271 + fputs(name, stdout);
1275 @@ -1041,13 +1050,10 @@ static const char **init_default_directo
1279 -#if defined(DEFAULT_SYSCONFDIR)
1280 - if (DEFAULT_SYSCONFDIR[0])
1281 - errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
1283 errors += add_directory(alloc, "/etc/", dirs);
1284 errors += add_directory(alloc, "/etc/mysql/", dirs);
1285 -#endif /* DEFAULT_SYSCONFDIR */
1286 + errors += add_directory(alloc, "%%PREFIX%%/etc/", dirs);
1287 + errors += add_directory(alloc, "%%PREFIX%%/etc/mysql/", dirs);
1293 [FILE:1167:patches/patch-oqgraph-MDEV-15291]
1294 --- storage/oqgraph/oqgraph_judy.cc.orig 2021-11-05 20:29:30 UTC
1295 +++ storage/oqgraph/oqgraph_judy.cc
1298 Currently the only active code that can return error is:
1299 judy_bitset::reset()/J1U()
1300 - judy_bitset::setbit()/J1S()
1301 + judy_bitset::jsetbit()/J1S()
1303 In most cases errors are either about wrong parameters passed to Judy
1304 functions or internal structures corruption. These definitely deserve
1305 @@ -60,7 +60,7 @@ bool open_query::judy_bitset::test(size_
1309 -open_query::judy_bitset& open_query::judy_bitset::setbit(size_type n)
1310 +open_query::judy_bitset& open_query::judy_bitset::jsetbit(size_type n)
1314 --- storage/oqgraph/oqgraph_judy.h.orig 2021-11-05 20:29:30 UTC
1315 +++ storage/oqgraph/oqgraph_judy.h
1316 @@ -63,7 +63,7 @@ namespace open_query
1321 + return jsetbit(n);
1324 judy_bitset& set(const judy_bitset& src);
1325 @@ -115,7 +115,7 @@ namespace open_query
1327 mutable void* array;
1329 - judy_bitset& setbit(size_type n);
1330 + judy_bitset& jsetbit(size_type n);
1336 [FILE:413:patches/patch-scripts_CMakeLists.txt]
1337 --- scripts/CMakeLists.txt.orig 2021-11-05 20:29:29 UTC
1338 +++ scripts/CMakeLists.txt
1339 @@ -136,11 +136,7 @@ IF(CMAKE_GENERATOR MATCHES "Makefiles|Ni
1343 -IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
1344 - SET (PERL_PATH "/usr/local/bin/perl")
1346 - SET (PERL_PATH "/usr/bin/perl")
1348 +SET (PERL_PATH "%%LOCALBASE%%/bin/perl")
1351 # FIND_PROC and CHECK_PID are used by mysqld_safe
1354 [FILE:403:patches/patch-scripts_mysql__config.sh]
1355 --- scripts/mysql_config.sh.orig 2021-11-05 20:29:29 UTC
1356 +++ scripts/mysql_config.sh
1357 @@ -87,7 +87,9 @@ fi
1360 libs="-L$pkglibdir @RPATH_OPTION@ @LIBS_FOR_CLIENTS@"
1361 +libs="$libs -L%%LOCALBASE%%/lib "
1362 embedded_libs="-L$pkglibdir @RPATH_OPTION@ @EMB_LIBS_FOR_CLIENTS@"
1363 +embedded_libs="$embedded_libs -L%%LOCALBASE%%/lib "
1365 include="-I$pkgincludedir"
1366 if [ "$basedir" != "/usr" ]; then
1369 [FILE:445:patches/patch-scripts_mysqld__safe.sh]
1370 --- scripts/mysqld_safe.sh.orig 2021-11-05 20:29:29 UTC
1371 +++ scripts/mysqld_safe.sh
1372 @@ -558,11 +558,11 @@ fi
1374 if test -z "$MYSQL_HOME"
1376 - if test -r "$DATADIR/my.cnf"
1377 + if test -r "$DATADIR/etc/my.cnf"
1379 log_error "WARNING: Found $DATADIR/my.cnf
1380 The data directory is not a valid location for my.cnf, please move it to
1381 -$MY_BASEDIR_VERSION/my.cnf"
1382 +$MY_BASEDIR_VERSION/etc/my.cnf"
1384 MYSQL_HOME=$MY_BASEDIR_VERSION
1388 [FILE:484:patches/patch-scripts_wsrep__sst__mariabackup.sh]
1389 --- scripts/wsrep_sst_mariabackup.sh.orig 2021-11-05 20:29:29 UTC
1390 +++ scripts/wsrep_sst_mariabackup.sh
1391 @@ -739,7 +739,7 @@ recv_joiner()
1393 if [ $tmt -gt 0 ]; then
1394 if [ -n "$(command -v timeout)" ]; then
1395 - if timeout --help | grep -qw -- '-k'; then
1396 + if timeout --help 2>&1 | grep -qw -- '-k'; then
1397 ltcmd="timeout -k $(( tmt+10 )) $tmt $tcmd"
1399 ltcmd="timeout -s9 $tmt $tcmd"
1402 [FILE:250:patches/patch-sql_mysqld.cc]
1403 --- sql/mysqld.cc.orig 2021-11-05 20:29:29 UTC
1405 @@ -4597,8 +4597,9 @@ static void init_ssl()
1406 sql_print_warning("SSL error: %s",buf);
1411 ERR_remove_state(0);
1418 [FILE:495:patches/patch-storage_innobase_include_buf0types.h]
1419 --- storage/innobase/include/buf0types.h.orig 2021-11-05 20:29:29 UTC
1420 +++ storage/innobase/include/buf0types.h
1421 @@ -189,10 +189,8 @@ public:
1422 /** Acquire an exclusive lock */
1426 /** @return whether an exclusive lock is being held by any thread */
1427 bool is_write_locked() const { return rw_lock::is_write_locked(); }
1430 /** @return whether any lock is being held by any thread */
1431 bool is_locked() const { return rw_lock::is_locked(); }
1434 [FILE:1855:patches/patch-storage_rocksdb_ha__rocksdb.cc]
1435 --- storage/rocksdb/ha_rocksdb.cc.orig 2021-11-05 20:29:30 UTC
1436 +++ storage/rocksdb/ha_rocksdb.cc
1437 @@ -266,7 +266,7 @@ Rdb_cf_manager cf_manager;
1438 Rdb_ddl_manager ddl_manager;
1439 Rdb_binlog_manager binlog_manager;
1441 -#if !defined(_WIN32) && !defined(__APPLE__)
1442 +#if defined(HAVE_TIMER_DELETE) && !defined(_WIN32) && !defined(__APPLE__)
1443 Rdb_io_watchdog *io_watchdog = nullptr;
1446 @@ -848,7 +848,7 @@ static void rocksdb_set_io_write_timeout
1447 void *const var_ptr MY_ATTRIBUTE((__unused__)), const void *const save) {
1448 DBUG_ASSERT(save != nullptr);
1449 DBUG_ASSERT(rdb != nullptr);
1450 -#if !defined(_WIN32) && !defined(__APPLE__)
1451 +#if defined(HAVE_TIMER_DELETE) && !defined(_WIN32) && !defined(__APPLE__)
1452 DBUG_ASSERT(io_watchdog != nullptr);
1455 @@ -857,7 +857,7 @@ static void rocksdb_set_io_write_timeout
1456 const uint32_t new_val = *static_cast<const uint32_t *>(save);
1458 rocksdb_io_write_timeout_secs = new_val;
1459 -#if !defined(_WIN32) && !defined(__APPLE__)
1460 +#if defined(HAVE_TIMER_DELETE) && !defined(_WIN32) && !defined(__APPLE__)
1461 io_watchdog->reset_timeout(rocksdb_io_write_timeout_secs);
1463 RDB_MUTEX_UNLOCK_CHECK(rdb_sysvars_mutex);
1464 @@ -5760,7 +5760,7 @@ static int rocksdb_init_func(void *const
1465 directories.push_back(myrocks::rocksdb_wal_dir);
1468 -#if !defined(_WIN32) && !defined(__APPLE__)
1469 +#if defined(HAVE_TIMER_DELETE) && !defined(_WIN32) && !defined(__APPLE__)
1470 io_watchdog = new Rdb_io_watchdog(std::move(directories));
1471 io_watchdog->reset_timeout(rocksdb_io_write_timeout_secs);
1473 @@ -5859,7 +5859,7 @@ static int rocksdb_done_func(void *const
1474 delete commit_latency_stats;
1475 commit_latency_stats = nullptr;
1477 -#if !defined(_WIN32) && !defined(__APPLE__)
1478 +#if defined(HAVE_TIMER_DELETE) && !defined(_WIN32) && !defined(__APPLE__)
1480 io_watchdog = nullptr;
1484 [FILE:249:patches/patch-storage_rocksdb_rdb__buff.h]
1485 --- storage/rocksdb/rdb_buff.h.orig 2021-11-05 20:29:30 UTC
1486 +++ storage/rocksdb/rdb_buff.h
1488 #define be16toh(x) OSSwapBigToHostInt16(x)
1491 +#include "port/port_posix.h"
1493 /* MySQL header files */
1494 #include "./my_global.h"
1498 [FILE:474:patches/patch-storage_rocksdb_rdb__io__watchdog.cc]
1499 If timer_t is an integer type, setting it to nullptr fails.
1501 --- storage/rocksdb/rdb_io_watchdog.cc.orig 2021-11-05 20:29:30 UTC
1502 +++ storage/rocksdb/rdb_io_watchdog.cc
1503 @@ -111,7 +111,11 @@ void Rdb_io_watchdog::io_check_callback(
1504 sql_print_warning("Deleting the watchdog I/O timer failed with %d.", errno);
1508 + m_io_check_watchdog_timer = 0;
1510 m_io_check_watchdog_timer = nullptr;
1513 RDB_MUTEX_UNLOCK_CHECK(m_reset_mutex);
1517 [FILE:1227:patches/patch-storage_rocksdb_rdb__io__watchdog.h]
1518 If timer_t is an integer type, setting it to nullptr fails.
1520 --- storage/rocksdb/rdb_io_watchdog.h.orig 2021-11-05 20:29:30 UTC
1521 +++ storage/rocksdb/rdb_io_watchdog.h
1523 /* MyRocks header files */
1524 #include "./rdb_utils.h"
1527 +#define NULLTIMER 0
1529 +#define NULLTIMER nullptr
1534 // Rdb_io_watchdog does not support Windows ATM.
1535 @@ -60,7 +66,7 @@ class Rdb_io_watchdog {
1536 ret = timer_delete(m_io_check_watchdog_timer);
1539 - m_io_check_watchdog_timer = nullptr;
1540 + m_io_check_watchdog_timer = NULLTIMER;
1544 @@ -68,7 +74,7 @@ class Rdb_io_watchdog {
1545 ret = timer_delete(m_io_check_timer);
1548 - m_io_check_timer = nullptr;
1549 + m_io_check_timer = NULLTIMER;
1553 @@ -93,8 +99,8 @@ class Rdb_io_watchdog {
1556 explicit Rdb_io_watchdog(std::vector<std::string> &&directories)
1557 - : m_io_check_timer(nullptr),
1558 - m_io_check_watchdog_timer(nullptr),
1559 + : m_io_check_timer(NULLTIMER),
1560 + m_io_check_watchdog_timer(NULLTIMER),
1561 m_io_in_progress(false),
1562 m_dirs_to_check(std::move(directories)),
1566 [FILE:328:patches/patch-storage_rocksdb_rocksdb_port_jemalloc__helper.h]
1567 --- storage/rocksdb/rocksdb/port/jemalloc_helper.h.orig 2021-11-05 20:29:32 UTC
1568 +++ storage/rocksdb/rocksdb/port/jemalloc_helper.h
1570 #include <jemalloc/jemalloc.h>
1574 +#define JEMALLOC_USABLE_SIZE_CONST const
1577 #ifndef JEMALLOC_CXX_THROW
1578 #define JEMALLOC_CXX_THROW
1582 [FILE:492:patches/patch-storage_rocksdb_ut0counter.h]
1583 --- storage/rocksdb/ut0counter.h.orig 2021-11-05 20:29:30 UTC
1584 +++ storage/rocksdb/ut0counter.h
1585 @@ -30,6 +30,12 @@ Created 2012/04/12 by Sunny Bains
1588 #define get_curr_thread_id() GetCurrentThreadId()
1589 +#elif defined __FreeBSD__
1590 +#include <pthread_np.h>
1591 +#define get_curr_thread_id() pthread_getthreadid_np()
1592 +#elif defined __DragonFly__
1593 +#include <sys/syscall.h>
1594 +#define get_curr_thread_id() syscall(SYS_lwp_gettid)
1596 #define get_curr_thread_id() pthread_self()