cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to mariadb-client-10.8.3, from Brad Smith (maintainer)

Browse Source
This commit is contained in:
sthen 2022-06-06 08:21:02 +00:00
parent e38f849e4a
commit 8d25188596
8 changed files with 422 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
databases/mariadb/Makefile
View File

@ -2,17 +2,16 @@ COMMENT-main= multithreaded SQL database (client)
COMMENT-server= multithreaded SQL database (server)
COMMENT-tests= multithreaded SQL database (regression test suite/benchmark)
VERSION= 10.6.7
VERSION= 10.8.3
DISTNAME= mariadb-${VERSION}
PKGNAME-main= mariadb-client-${VERSION}
EPOCH= 1
REVISION= 0
CATEGORIES= databases
MASTER_SITES= https://downloads.mariadb.com/MariaDB/${DISTNAME}/source/ \
https://ftp.osuosl.org/pub/mariadb/${DISTNAME}/source/
LIB_VERSION= 29
LIB_VERSION= 30
SHARED_LIBS= mysqlclient_r ${LIB_VERSION}.0 \
mysqlclient ${LIB_VERSION}.0 \
mariadb ${LIB_VERSION}.0
@ -26,7 +25,7 @@ PERMIT_PACKAGE= Yes
WANTLIB= ${COMPILER_LIBCXX} c crypto execinfo m pthread ssl z
WANTLIB-main= ${WANTLIB} curses readline
WANTLIB-server= ${WANTLIB} bz2 curl lz4 lzma lzo2 pcre2-8 snappy xml2
WANTLIB-server= ${WANTLIB} bz2 curl lz4 lzma lzo2 pcre2-8 snappy xml2 zstd
WANTLIB-tests= ${WANTLIB} pcre2-8 pcre2-posix
MULTI_PACKAGES= -main -server -tests
@ -42,7 +41,7 @@ MODULES= devel/cmake
BUILD_DEPENDS= devel/bison
LIB_DEPENDS-main= ${LIB_DEPENDS}
RUN_DEPENDS-server= ${BASE_PKGPATH},-main>=10.6v1,<10.7v1 \
RUN_DEPENDS-server= ${BASE_PKGPATH},-main>=10.8v1,<10.9v1 \
databases/p5-DBD-MariaDB
LIB_DEPENDS-server= ${LIB_DEPENDS} \
archivers/bzip2 \
@ -50,10 +49,11 @@ LIB_DEPENDS-server= ${LIB_DEPENDS} \
archivers/lzo2 \
archivers/snappy \
archivers/xz \
archivers/zstd \
devel/pcre2 \
net/curl \
textproc/libxml
RUN_DEPENDS-tests= ${BASE_PKGPATH},-main>=10.6v1,<10.7v1
RUN_DEPENDS-tests= ${BASE_PKGPATH},-main>=10.8v1,<10.9v1
LIB_DEPENDS-tests= ${LIB_DEPENDS} \
devel/pcre2

4
databases/mariadb/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (mariadb-10.6.7.tar.gz) = de4PH4Zadl/EYasWVBlBenGeMI+rp4SyyX7L6eS0ssU=
SIZE (mariadb-10.6.7.tar.gz) = 85882896
SHA256 (mariadb-10.8.3.tar.gz) = iH6txVF2rB6tH8z8ia3ktZkO8ZJ0WtTc2HmstBwFCJI=
SIZE (mariadb-10.8.3.tar.gz) = 89719616

2
databases/mariadb/patches/patch-include_ssl_compat_h
View File

@ -20,7 +20,7 @@ Index: include/ssl_compat.h
#ifdef HAVE_WOLFSSL
#define EVP_MD_CTX_SIZE sizeof(wc_Md5)
#endif
@@ -87,6 +94,7 @@
@@ -86,6 +93,7 @@
#define EVP_CIPHER_CTX_reset(X) EVP_CIPHER_CTX_cleanup(X)
#define X509_get0_notBefore(X) X509_get_notBefore(X)
#define X509_get0_notAfter(X) X509_get_notAfter(X)

2
databases/mariadb/patches/patch-libmariadb_libmariadb_CMakeLists_txt
View File

@ -1,7 +1,7 @@
Index: libmariadb/libmariadb/CMakeLists.txt
--- libmariadb/libmariadb/CMakeLists.txt.orig
+++ libmariadb/libmariadb/CMakeLists.txt
@@ -439,15 +439,6 @@ INCLUDE(${CC_SOURCE_DIR}/cmake/symlink.cmake)
@@ -451,15 +451,6 @@ INCLUDE(${CC_SOURCE_DIR}/cmake/symlink.cmake)
# of the config program. To make sure these programs can
# use mariadb client library we provide libmysql symlinks

29
databases/mariadb/patches/patch-scripts_mysql_install_db_sh
View File

@ -1,8 +1,3 @@
Remove --group command-line handling as the option is not valid for
mariadbd.
https://jira.mariadb.org/browse/MDEV-27823
Index: scripts/mysql_install_db.sh
--- scripts/mysql_install_db.sh.orig
+++ scripts/mysql_install_db.sh
@ -17,7 +12,7 @@ Index: scripts/mysql_install_db.sh
silent_startup="--silent-startup"
force=0
@@ -334,7 +334,6 @@ then
@@ -339,7 +339,6 @@ then
srcpkgdatadir="$srcdir/scripts"
buildpkgdatadir="$builddir/scripts"
plugindir="$builddir/plugin/auth_socket"
@ -25,7 +20,7 @@ Index: scripts/mysql_install_db.sh
elif test -n "$basedir"
then
bindir="$basedir/bin" # only used in the help text
@@ -363,8 +362,7 @@ then
@@ -368,8 +367,7 @@ then
cannot_find_file fill_help_tables.sql @pkgdata_locations@
exit 1
fi
@ -35,7 +30,7 @@ Index: scripts/mysql_install_db.sh
# relative from where the script was run for a relocatable install
elif test -n "$dirname0" -a -x "$rel_mysqld" -a ! "$rel_mysqld" -ef "@sbindir@/mariadbd"
then
@@ -375,7 +373,6 @@ then
@@ -380,7 +378,6 @@ then
srcpkgdatadir="$basedir/@INSTALL_MYSQLSHAREDIR@"
buildpkgdatadir="$basedir/@INSTALL_MYSQLSHAREDIR@"
plugindir="$basedir/@INSTALL_PLUGINDIR@"
@ -43,7 +38,7 @@ Index: scripts/mysql_install_db.sh
else
basedir="@prefix@"
bindir="@bindir@"
@@ -384,7 +381,6 @@ else
@@ -389,7 +386,6 @@ else
srcpkgdatadir="@pkgdatadir@"
buildpkgdatadir="@pkgdatadir@"
plugindir="@pkgplugindir@"
@ -51,7 +46,7 @@ Index: scripts/mysql_install_db.sh
fi
# Set up paths to SQL scripts required for bootstrap
@@ -476,13 +472,13 @@ do
@@ -488,13 +484,13 @@ do
then
if test -z "$group"
then
@ -68,7 +63,7 @@ Index: scripts/mysql_install_db.sh
echo "user. Check that you have the necessary permissions and try again."
exit 1
fi
@@ -491,33 +487,9 @@ done
@@ -503,25 +499,6 @@ done
if test -n "$user"
then
@ -94,15 +89,7 @@ Index: scripts/mysql_install_db.sh
args="$args --user=$user"
fi
-if test -n "$group"
-then
- args="$args --group=$group"
-fi
-
if test -f "$ldata/mysql/user.frm"
then
echo "mysql.user table already exists!"
@@ -620,10 +592,6 @@ fi
@@ -639,10 +616,6 @@ fi
# the screen.
if test "$cross_bootstrap" -eq 0 && test -z "$srcdir"
then
@ -113,7 +100,7 @@ Index: scripts/mysql_install_db.sh
if test "$auth_root_authentication_method" = normal
then
echo
@@ -655,10 +623,7 @@ then
@@ -674,10 +647,7 @@ then
then
echo
echo "You can start the MariaDB daemon with:"

2
databases/mariadb/patches/patch-scripts_mysqld_safe_sh
View File

@ -12,7 +12,7 @@ Index: scripts/mysqld_safe.sh
pid_file=
err_log=
err_log_base=
@@ -733,7 +733,7 @@ then
@@ -734,7 +734,7 @@ then
[ "$user" ] && chown $user $mysql_unix_port_dir
[ "$group" ] && chgrp $group $mysql_unix_port_dir
fi

25
databases/mariadb/pkg/PLIST-server
View File

@ -43,6 +43,7 @@ bin/mysqlhotcopy
@bin bin/replace
@bin bin/resolve_stack_dump
@bin bin/resolveip
bin/wsrep_sst_backup
bin/wsrep_sst_common
bin/wsrep_sst_mariabackup
bin/wsrep_sst_mysqldump
@ -125,6 +126,7 @@ include/mysql/server/mysql/service_my_snprintf.h
include/mysql/server/mysql/service_progress_report.h
include/mysql/server/mysql/service_sha1.h
include/mysql/server/mysql/service_sha2.h
include/mysql/server/mysql/service_sql.h
include/mysql/server/mysql/service_thd_alloc.h
include/mysql/server/mysql/service_thd_autoinc.h
include/mysql/server/mysql/service_thd_error_context.h
@ -265,6 +267,7 @@ include/mysql/server/private/mysqld.h
include/mysql/server/private/mysqld_default_groups.h
include/mysql/server/private/mysqld_suffix.h
include/mysql/server/private/mysys_err.h
include/mysql/server/private/opt_histogram_json.h
include/mysql/server/private/opt_range.h
include/mysql/server/private/opt_subselect.h
include/mysql/server/private/opt_trace.h
@ -288,6 +291,13 @@ include/mysql/server/private/probes_mysql.h
include/mysql/server/private/probes_mysql_nodtrace.h
include/mysql/server/private/procedure.h
include/mysql/server/private/protocol.h
include/mysql/server/private/providers/
include/mysql/server/private/providers/bzlib.h
include/mysql/server/private/providers/lz4.h
include/mysql/server/private/providers/lzma.h
include/mysql/server/private/providers/lzo/
include/mysql/server/private/providers/lzo/lzo1x.h
include/mysql/server/private/providers/snappy-c.h
include/mysql/server/private/proxy_protocol.h
include/mysql/server/private/queues.h
include/mysql/server/private/records.h
@ -394,13 +404,14 @@ include/mysql/server/private/sql_sort.h
include/mysql/server/private/sql_statistics.h
include/mysql/server/private/sql_string.h
include/mysql/server/private/sql_table.h
include/mysql/server/private/sql_tablespace.h
include/mysql/server/private/sql_test.h
include/mysql/server/private/sql_time.h
include/mysql/server/private/sql_trigger.h
include/mysql/server/private/sql_truncate.h
include/mysql/server/private/sql_tvc.h
include/mysql/server/private/sql_type.h
include/mysql/server/private/sql_type_fixedbin.h
include/mysql/server/private/sql_type_fixedbin_storage.h
include/mysql/server/private/sql_type_geom.h
include/mysql/server/private/sql_type_int.h
include/mysql/server/private/sql_type_json.h
@ -496,6 +507,12 @@ lib/mysql/plugin/daemon_example.ini
@so lib/mysql/plugin/metadata_lock_info.so
@so lib/mysql/plugin/mypluglib.so
@so lib/mysql/plugin/mysql_clear_password.so
@so lib/mysql/plugin/password_reuse_check.so
@so lib/mysql/plugin/provider_bzip2.so
@so lib/mysql/plugin/provider_lz4.so
@so lib/mysql/plugin/provider_lzma.so
@so lib/mysql/plugin/provider_lzo.so
@so lib/mysql/plugin/provider_snappy.so
@so lib/mysql/plugin/qa_auth_client.so
@so lib/mysql/plugin/qa_auth_interface.so
@so lib/mysql/plugin/qa_auth_server.so
@ -507,6 +524,7 @@ lib/mysql/plugin/daemon_example.ini
@so lib/mysql/plugin/sql_errlog.so
@so lib/mysql/plugin/type_mysql_json.so
@so lib/mysql/plugin/wsrep_info.so
@so lib/mysql/plugin/zstd.so
@bin libexec/mariadbd
libexec/mysqld
@man man/man1/aria_chk.1
@ -567,6 +585,7 @@ share/examples/login.conf.d/mysqld
share/examples/mysql/
share/examples/mysql/binary-configure
share/examples/mysql/magic
share/examples/mysql/mini-benchmark
share/examples/mysql/my.cnf
@sample ${SYSCONFDIR}/my.cnf
share/examples/mysql/mysql-log-rotate
@ -585,6 +604,8 @@ share/examples/mysql/policy/selinux/mariadb.te
share/examples/mysql/wsrep.cnf
share/examples/mysql/wsrep_notify
share/mysql/
share/mysql/bulgarian/
share/mysql/bulgarian/errmsg.sys
share/mysql/charsets/
share/mysql/charsets/Index.xml
share/mysql/charsets/README
@ -612,6 +633,8 @@ share/mysql/charsets/latin7.xml
share/mysql/charsets/macce.xml
share/mysql/charsets/macroman.xml
share/mysql/charsets/swe7.xml
share/mysql/chinese/
share/mysql/chinese/errmsg.sys
share/mysql/czech/
share/mysql/czech/errmsg.sys
share/mysql/danish/

459
databases/mariadb/pkg/PLIST-tests
View File

File diff suppressed because it is too large Load Diff